get rid of unnecessary libunicode dependencies in some more places
Thomas Weidenmueller
wine-patches at reactsoft.com
Tue Feb 15 18:13:53 CST 2005
This patch should make comctl32, msi, oleaut32 and setupapi without
unnecessary dependencies to libunicode.
Best Regards
Thomas
-------------- next part --------------
Index: dlls/comctl32/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/Makefile.in,v
retrieving revision 1.38
diff -u -r1.38 Makefile.in
--- dlls/comctl32/Makefile.in 7 Sep 2004 20:43:30 -0000 1.38
+++ dlls/comctl32/Makefile.in 15 Feb 2005 23:37:31 -0000
@@ -6,7 +6,7 @@
MODULE = comctl32.dll
IMPORTS = user32 gdi32 advapi32 kernel32
DELAYIMPORTS = winmm
-EXTRALIBS = $(LIBUNICODE)
+EXTRALIBS =
C_SRCS = \
animate.c \
Index: dlls/msi/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/msi/Makefile.in,v
retrieving revision 1.24
diff -u -r1.24 Makefile.in
--- dlls/msi/Makefile.in 14 Feb 2005 11:07:13 -0000 1.24
+++ dlls/msi/Makefile.in 15 Feb 2005 23:36:48 -0000
@@ -4,7 +4,7 @@
VPATH = @srcdir@
MODULE = msi.dll
IMPORTS = shell32 cabinet oleaut32 ole32 version user32 gdi32 advapi32 kernel32
-EXTRALIBS = -luuid $(LIBUNICODE)
+EXTRALIBS = -luuid
C_SRCS = \
action.c \
Index: dlls/msi/msiquery.c
===================================================================
RCS file: /home/wine/wine/dlls/msi/msiquery.c,v
retrieving revision 1.23
diff -u -r1.23 msiquery.c
--- dlls/msi/msiquery.c 8 Feb 2005 13:44:25 -0000 1.23
+++ dlls/msi/msiquery.c 15 Feb 2005 23:36:38 -0000
@@ -26,7 +26,6 @@
#include "winbase.h"
#include "winerror.h"
#include "wine/debug.h"
-#include "wine/unicode.h"
#include "msi.h"
#include "msiquery.h"
#include "objbase.h"
@@ -143,18 +142,18 @@
/* figure out how much space we need to allocate */
va_start(va, fmt);
- sz = strlenW(fmt) + 1;
+ sz = wcslen(fmt) + 1;
p = fmt;
while (*p)
{
- p = strchrW(p, '%');
+ p = wcschr(p, '%');
if (!p)
break;
p++;
switch (*p)
{
case 's': /* a string */
- sz += strlenW(va_arg(va,LPCWSTR));
+ sz += wcslen(va_arg(va,LPCWSTR));
break;
case 'd':
case 'i': /* an integer -2147483648 seems to be longest */
Index: dlls/oleaut32/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/Makefile.in,v
retrieving revision 1.57
diff -u -r1.57 Makefile.in
--- dlls/oleaut32/Makefile.in 27 Oct 2004 00:47:53 -0000 1.57
+++ dlls/oleaut32/Makefile.in 15 Feb 2005 23:45:53 -0000
@@ -6,7 +6,7 @@
MODULE = oleaut32.dll
IMPORTS = ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS = comctl32
-EXTRALIBS = $(LIBUNICODE) -luuid
+EXTRALIBS = -luuid
C_SRCS = \
connpt.c \
Index: dlls/oleaut32/vartype.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/vartype.c,v
retrieving revision 1.11
diff -u -r1.11 vartype.c
--- dlls/oleaut32/vartype.c 7 Oct 2004 02:59:45 -0000 1.11
+++ dlls/oleaut32/vartype.c 15 Feb 2005 23:45:22 -0000
@@ -6192,7 +6192,7 @@
if (isdigitW(*strIn))
{
- dp.dwValues[dp.dwCount] = strtoulW(strIn, &strIn, 10);
+ dp.dwValues[dp.dwCount] = wcstoul(strIn, &strIn, 10);
dp.dwCount++;
strIn--;
}
Index: dlls/setupapi/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/setupapi/Makefile.in,v
retrieving revision 1.29
diff -u -r1.29 Makefile.in
--- dlls/setupapi/Makefile.in 24 Jan 2005 13:32:26 -0000 1.29
+++ dlls/setupapi/Makefile.in 15 Feb 2005 23:54:04 -0000
@@ -6,7 +6,7 @@
MODULE = setupapi.dll
IMPORTS = user32 version advapi32 rpcrt4 kernel32 ntdll
DELAYIMPORTS = shell32
-EXTRALIBS = $(LIBUNICODE)
+EXTRALIBS =
C_SRCS = \
devinst.c \
Index: dlls/setupapi/install.c
===================================================================
RCS file: /home/wine/wine/dlls/setupapi/install.c,v
retrieving revision 1.12
diff -u -r1.12 install.c
--- dlls/setupapi/install.c 30 Nov 2004 21:38:59 -0000 1.12
+++ dlls/setupapi/install.c 15 Feb 2005 23:53:54 -0000
@@ -334,7 +334,7 @@
if (type == REG_DWORD)
{
- DWORD dw = str ? strtoulW( str, NULL, 16 ) : 0;
+ DWORD dw = str ? wcstoul( str, NULL, 16 ) : 0;
TRACE( "setting dword %s to %lx\n", debugstr_w(value), dw );
RegSetValueExW( hkey, value, 0, type, (BYTE *)&dw, sizeof(dw) );
}
More information about the wine-patches
mailing list