makefiles: Disable use of Unicode macros globally for all the programs.

programs/Makeprog.rules.in

@@ -10,7 +10,7 @@
 #
 
 DLLFLAGS    = @DLLFLAGS@
-DEFS        = -DWINE_STRICT_PROTOTYPES $(EXTRADEFS)
+DEFS        = -DWINE_STRICT_PROTOTYPES -DWINE_NO_UNICODE_MACROS $(EXTRADEFS)
 ALL_LIBS    = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS)
 INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(mandir)/man$(prog_manext)
 

programs/aspnet_regiis/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = aspnet_regiis.exe
 APPMODE   = -mconsole -municode
 

programs/attrib/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = attrib.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = user32

programs/cabarc/Makefile.in

 MODULE    = cabarc.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = cabinet
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = cabarc.c
 

programs/cacls/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = cacls.exe
 APPMODE   = -mconsole
 

programs/clock/Makefile.in

 MODULE    = clock.exe
 APPMODE   = -mwindows
 IMPORTS   = comdlg32 shell32 user32 gdi32
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = \
 	main.c \

programs/cmd/Makefile.in

 MODULE    = cmd.exe
 APPMODE   = -mconsole -municode
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 IMPORTS   = shell32 user32 advapi32
 
 C_SRCS = \

programs/control/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = control.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = shell32 user32

programs/cscript/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = cscript.exe
 APPMODE   = -mwindows -municode
 

programs/dxdiag/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = dxdiag.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = dxguid ole32 oleaut32 user32

programs/eject/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = eject.exe
 APPMODE   = -mconsole
 

programs/expand/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = expand.exe
 APPMODE   = -mconsole
 IMPORTS   = setupapi

programs/explorer/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = explorer.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = rpcrt4 user32 gdi32 advapi32

programs/extrac32/Makefile.in

 MODULE    = extrac32.exe
 APPMODE   = -mwindows -municode
-EXTRADEFS = -DWINE_NO_UNICODE
 IMPORTS   = shell32 setupapi shlwapi user32
 
 C_SRCS = \

programs/hh/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = hh.exe
 APPMODE   = -mwindows
 

programs/hostname/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = hostname.exe
 APPMODE   = -mconsole -municode
 EXTRALIBS = @SOCKETLIBS@

programs/icinfo/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = icinfo.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = msvfw32

programs/iexplore/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = iexplore.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = ieframe

programs/ipconfig/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = ipconfig.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = iphlpapi ws2_32 user32

programs/mofcomp/Makefile.in

 MODULE    = mofcomp.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = kernel32
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = mofcomp.c
 

programs/mshta/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = mshta.exe
 APPMODE   = -mwindows -municode
 

programs/msiexec/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = msiexec.exe
 APPMODE   = -mwindows
 IMPORTS   = msi ole32 advapi32 user32

programs/net/Makefile.in

 MODULE    = net.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = netapi32 user32 advapi32
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = net.c
 

programs/netsh/Makefile.in

 MODULE    = netsh.exe
 APPMODE   = -mconsole -municode
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = netsh.c
 

programs/ngen/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = ngen.exe
 APPMODE   = -mconsole -municode
 

programs/notepad/Makefile.in

@@ -3,7 +3,7 @@ APPMODE   = -mwindows -mno-cygwin
 IMPORTS   = comdlg32 shell32 shlwapi user32 gdi32 advapi32
 EXTRAINCL = -I$(top_srcdir)/include/msvcrt
 MODCFLAGS = @BUILTINFLAG@
-EXTRADEFS = -DNO_LIBWINE_PORT -DWINE_NO_UNICODE_MACROS
+EXTRADEFS = -DNO_LIBWINE_PORT
 
 C_SRCS = \
 	dialog.c \

programs/oleview/Makefile.in

 MODULE    = oleview.exe
 APPMODE   = -mwindows
 IMPORTS   = uuid comdlg32 comctl32 shell32 oleaut32 ole32 user32 advapi32
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = \
 	details.c \

programs/ping/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = ping.exe
 APPMODE   = -mconsole
 

programs/plugplay/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = plugplay.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = advapi32

programs/presentationfontcache/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = presentationfontcache.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = advapi32

programs/progman/Makefile.in

 MODULE    = progman.exe
 APPMODE   = -mwindows
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 IMPORTS   = shell32 comdlg32 user32 gdi32
 
 C_SRCS = \

programs/reg/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = reg.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = advapi32

programs/regasm/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = regasm.exe
 APPMODE   = -mconsole -municode
 

programs/regedit/Makefile.in

@@ -3,7 +3,7 @@ APPMODE   = -mwindows -mno-cygwin
 IMPORTS   = advapi32
 DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32
 EXTRAINCL = -I$(top_srcdir)/include/msvcrt
-EXTRADEFS = -DNO_LIBWINE_PORT -DWINE_NO_UNICODE_MACROS
+EXTRADEFS = -DNO_LIBWINE_PORT
 MODCFLAGS = @BUILTINFLAG@
 
 C_SRCS = \

programs/regsvcs/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = regsvcs.exe
 APPMODE   = -mconsole -municode
 

programs/regsvr32/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = regsvr32.exe
 APPMODE   = -mconsole
 IMPORTS   = ole32

programs/rundll32/Makefile.in

 MODULE    = rundll32.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = user32
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = \
 	rundll32.c

programs/sc/Makefile.in

 MODULE    = sc.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = advapi32
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = sc.c
 

programs/secedit/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = secedit.exe
 APPMODE   = -mconsole
 

programs/servicemodelreg/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = servicemodelreg.exe
 APPMODE   = -mconsole -municode
 

programs/services/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = services.exe
 APPMODE   = -mconsole
 IMPORTS   = rpcrt4 advapi32 userenv

programs/spoolsv/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = spoolsv.exe
 APPMODE   = -mconsole
 IMPORTS   = advapi32

programs/start/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = start.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = shell32 user32

programs/svchost/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = svchost.exe
 APPMODE   = -municode
 IMPORTS   = advapi32

programs/taskkill/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = taskkill.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = psapi user32

programs/taskmgr/Makefile.in

@@ -2,7 +2,7 @@ MODULE    = taskmgr.exe
 APPMODE   = -mwindows -mno-cygwin
 IMPORTS   = psapi shell32 comctl32 user32 gdi32 advapi32
 EXTRAINCL = -I$(top_srcdir)/include/msvcrt
-EXTRADEFS = -DNO_LIBWINE_PORT -DWINE_NO_UNICODE_MACROS
+EXTRADEFS = -DNO_LIBWINE_PORT
 MODCFLAGS = @BUILTINFLAG@
 
 C_SRCS = \

programs/termsv/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = termsv.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = advapi32

programs/uninstaller/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = uninstaller.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = advapi32

programs/view/Makefile.in

 MODULE    = view.exe
 APPMODE   = -mwindows -municode
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 IMPORTS   = comdlg32 user32 gdi32
 
 C_SRCS = \

programs/wineboot/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = wineboot.exe
 APPMODE   = -mconsole
 IMPORTS   = uuid advapi32

programs/winebrowser/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = winebrowser.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = urlmon oleaut32 user32 advapi32

programs/winecfg/Makefile.in

 MODULE    = winecfg.exe
 APPMODE   = -mwindows
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 IMPORTS   = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32
 
 C_SRCS = \

programs/wineconsole/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = wineconsole.exe
 APPMODE   = -mwindows
 IMPORTS   = advapi32

programs/winedbg/Makefile.in

@@ -3,7 +3,6 @@ APPMODE   = -mconsole
 IMPORTS   = psapi dbghelp advapi32
 DELAYIMPORTS = comdlg32 shell32 comctl32 user32 gdi32
 EXTRALIBS = @LIBPOLL@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = \
 	be_arm.c \

programs/winedevice/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = winedevice.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = advapi32 ntoskrnl.exe

programs/winefile/Makefile.in

-EXTRADEFS = -D__WINE__ -DWINE_NO_UNICODE_MACROS
+EXTRADEFS = -D__WINE__
 MODULE    = winefile.exe
 APPMODE   = -mwindows
 IMPORTS   = uuid shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi32

programs/winemenubuilder/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = winemenubuilder.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = uuid windowscodecs shell32 shlwapi ole32 user32 advapi32

programs/winemine/Makefile.in

 MODULE    = winemine.exe
 APPMODE   = -mwindows -municode
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 IMPORTS   = user32 gdi32 advapi32
 DELAYIMPORTS = shell32
 

programs/winemsibuilder/Makefile.in

 MODULE    = winemsibuilder.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = msi ole32
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = main.c
 

programs/winepath/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = winepath.exe
 APPMODE   = -mconsole -municode
 

programs/winetest/Makefile.in

 MODULE    = winetest.exe
 APPMODE   = -mconsole
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 IMPORTS   = uuid comctl32 version user32 gdi32 advapi32 wsock32
 DELAYIMPORTS = ole32
 

programs/winevdm/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = winevdm.exe
 APPMODE   = -mconsole
 IMPORTS   = user32 kernel

programs/winhlp32/Makefile.in

 MODULE    = winhlp32.exe
 APPMODE   = -mwindows
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 IMPORTS   = user32 gdi32
 DELAYIMPORTS = shell32 comctl32 comdlg32
 

programs/winver/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = winver.exe
 APPMODE   = -mwindows
 IMPORTS   = shell32

programs/wmic/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = wmic.exe
 APPMODE   = -mconsole -municode
 

programs/wordpad/Makefile.in

@@ -2,7 +2,7 @@ MODULE    = wordpad.exe
 APPMODE   = -mwindows -mno-cygwin
 IMPORTS   = comdlg32 uuid ole32 shell32 user32 gdi32 advapi32 comctl32
 EXTRAINCL = -I$(top_srcdir)/include/msvcrt
-EXTRADEFS = -DNO_LIBWINE_PORT -DWINE_NO_UNICODE_MACROS
+EXTRADEFS = -DNO_LIBWINE_PORT
 MODCFLAGS = @BUILTINFLAG@
 
 C_SRCS = \

programs/write/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = write.exe
 APPMODE   = -mwindows
 IMPORTS   = user32 gdi32

programs/wscript/Makefile.in

 MODULE    = wscript.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = uuid shell32 oleaut32 ole32 advapi32
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 RC_SRCS = \
 	rsrc.rc

programs/xcopy/Makefile.in

-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = xcopy.exe
 APPMODE   = -mconsole -municode -mno-cygwin
 IMPORTS   = shell32 user32