Link against libwine_unicode everywhere we use Unicode functions.

dlls/avifil32/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = avifil32.dll
 IMPORTLIB = libavifil32.$(IMPLIBEXT)
 IMPORTS   = msacm32 msvfw32 winmm ole32 user32 advapi32 kernel32 ntdll
-EXTRALIBS = -luuid
+EXTRALIBS = $(LIBUNICODE) -luuid
 
 C_SRCS = \
 	acmstream.c \

dlls/comdlg32/Makefile.in

@@ -6,7 +6,7 @@ MODULE    = comdlg32.dll
 IMPORTLIB = libcomdlg32.$(IMPLIBEXT)
 IMPORTS   = shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 kernel32 ntdll
 DELAYIMPORTS = ole32
-EXTRALIBS = -luuid
+EXTRALIBS = $(LIBUNICODE) -luuid
 
 C_SRCS = \
 	cdlg32.c \

dlls/dmloader/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmloader.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid
 
 C_SRCS = \
 	classfactory.c \

dlls/dmusic/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmusic.dll
 IMPORTS   = winmm ole32 msacm32 dsound rpcrt4 user32 advapi32 kernel32 ntdll
-EXTRALIBS = -ldxguid -luuid
+EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid
 
 C_SRCS = \
 	buffer.c \

dlls/dplayx/Makefile.in

@@ -6,7 +6,7 @@ VPATH     = @srcdir@
 MODULE    = dplayx.dll
 IMPORTLIB = libdplayx.$(IMPLIBEXT)
 IMPORTS   = winmm ole32 user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid
 
 C_SRCS = \
 	dpclassfactory.c \

dlls/hhctrl.ocx/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = hhctrl.ocx
 IMPORTS   = advapi32 comctl32 shell32 ole32 oleaut32 user32 gdi32 kernel32
-EXTRALIBS = -luuid
+EXTRALIBS = $(LIBUNICODE) -luuid
 
 C_SRCS = \
 	chm.c \

dlls/mciavi32/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciavi32.dll
 IMPORTS   = msvfw32 winmm user32 gdi32 kernel32
+EXTRALIBS = $(LIBUNICODE)
 
 C_SRCS = \
 	info.c \

dlls/mciseq/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciseq.dll
 IMPORTS   = winmm user32 kernel32
+EXTRALIBS = $(LIBUNICODE)
 
 C_SRCS = \
 	mcimidi.c

dlls/mciwave/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciwave.dll
 IMPORTS   = winmm user32 kernel32
+EXTRALIBS = $(LIBUNICODE)
 
 C_SRCS = \
 	mciwave.c

dlls/midimap/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = midimap.dll
 IMPORTS   = winmm user32 advapi32 kernel32
+EXTRALIBS = $(LIBUNICODE)
 
 C_SRCS = \
 	midimap.c

dlls/msacm32.drv/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm32.drv
 IMPORTS   = msacm32 winmm user32 kernel32
+EXTRALIBS = $(LIBUNICODE)
 
 C_SRCS = \
 	wavemap.c

dlls/msdmo/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = msdmo.dll
 IMPORTLIB = libmsdmo.$(IMPLIBEXT)
 IMPORTS   = ole32 user32 advapi32 kernel32 
-EXTRALIBS = -luuid
+EXTRALIBS = $(LIBUNICODE) -luuid
 
 C_SRCS = \
 	dmoreg.c \

dlls/odbc32/Makefile.in

@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = odbc32.dll
 IMPORTLIB = libodbc32.$(IMPLIBEXT)
 IMPORTS   = advapi32 kernel32
+EXTRALIBS = $(LIBUNICODE)
 
 C_SRCS = \
 	proxyodbc.c

dlls/rpcrt4/Makefile.in

@@ -7,7 +7,7 @@ MODULE    = rpcrt4.dll
 IMPORTLIB = librpcrt4.$(IMPLIBEXT)
 IMPORTS   = iphlpapi advapi32 kernel32 ntdll
 DELAYIMPORTS = secur32
-EXTRALIBS = -luuid
+EXTRALIBS = $(LIBUNICODE) -luuid
 
 C_SRCS = \
 	cproxy.c \

dlls/shdocvw/Makefile.in

@@ -7,7 +7,7 @@ MODULE    = shdocvw.dll
 IMPORTLIB = libshdocvw.$(IMPLIBEXT)
 IMPORTS   = shell32 shlwapi user32 advapi32 kernel32
 DELAYIMPORTS = urlmon ole32 oleaut32
-EXTRALIBS = -luuid
+EXTRALIBS = $(LIBUNICODE) -luuid
 
 C_SRCS = \
 	classinfo.c \

dlls/urlmon/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = urlmon.dll
 IMPORTLIB = liburlmon.$(IMPLIBEXT)
 IMPORTS   = cabinet ole32 shlwapi wininet user32 advapi32 kernel32 ntdll
-EXTRALIBS = -luuid
+EXTRALIBS = $(LIBUNICODE) -luuid
 
 C_SRCS = \
 	binding.c \

dlls/winmm/winearts/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = winearts.drv
 IMPORTS   = winmm user32 kernel32 ntdll
 EXTRAINCL = @ARTSINCL@
-EXTRALIBS = @ARTSLIBS@ -ldxguid -luuid
+EXTRALIBS = @ARTSLIBS@ $(LIBUNICODE) -ldxguid -luuid
 
 C_SRCS = \
 	arts.c \

dlls/winmm/winenas/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = winenas.drv
 IMPORTS   = winmm user32 kernel32
 EXTRAINCL = @X_CFLAGS@
-EXTRALIBS = -ldxguid -luuid @NASLIBS@
+EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid @NASLIBS@
 
 C_SRCS = \
 	audio.c \

dlls/winmm/wineoss/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineoss.drv
 IMPORTS   = winmm user32 kernel32
-EXTRALIBS = -ldxguid -luuid
+EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid
 
 C_SRCS = \
 	audio.c \

programs/msiexec/Makefile.in

@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = msiexec.exe
 APPMODE   = -mconsole
 IMPORTS   = msi ole32 advapi32 user32 kernel32
+EXTRALIBS = $(LIBUNICODE)
 
 C_SRCS = \
 	msiexec.c

programs/rundll32/Makefile.in

@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = rundll32.exe
 APPMODE   = -mconsole
 IMPORTS   = user32 kernel32
+EXTRALIBS = $(LIBUNICODE)
 
 C_SRCS = \
 	rundll32.c

programs/winemenubuilder/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = winemenubuilder.exe
 APPMODE   = -mwindows
 IMPORTS   = shell32 ole32 user32 advapi32 kernel32
-EXTRALIBS = -luuid
+EXTRALIBS = $(LIBUNICODE) -luuid
 
 C_SRCS = \
 	winemenubuilder.c