On Sat, Jul 29, 2000 at 10:29:08AM -0700, Alexandre Julliard wrote:
> Marcus Meissner <[EMAIL PROTECTED]> writes:
>
> > Changelog:
> > We need winuser.h for wvsprintfA() prototype.
>
> No, kernel functions should not use winuser.h (nor call USER functions
> for that matter...)
Well, the Win95 kernel does ;)
However, we do not need it.
Ciao, Marcus
Changelog:
get rid of USER32 functions in KERNEL32
Index: format_msg.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/format_msg.c,v
retrieving revision 1.1
diff -u -r1.1 format_msg.c
--- format_msg.c 2000/07/25 17:53:58 1.1
+++ format_msg.c 2000/07/29 18:20:58
@@ -260,8 +260,7 @@
argliststart=(*(DWORD**)args)+insertnr-1;
/* CMF - This makes a BIG assumption
about va_list */
- /* FIXME: wvsnprintfA is a USER
function */
- while (wvsnprintfA(b, sz, fmtstr,
(va_list) argliststart) < 0) {
+ while (vsnprintf(b, sz, fmtstr,
+(va_list) argliststart) < 0) {
b =
HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, b, sz += 100);
}
for (x=b; *x; x++) ADD_TO_T(*x);
@@ -472,8 +472,7 @@
sprintfbuf=HeapAlloc(GetProcessHeap(),0,100);
/* CMF - This makes a BIG assumption
about va_list */
- /* FIXME: wvsprintfA is a USER
function */
- wvsprintfA(sprintfbuf, fmtstr,
(va_list) argliststart);
+ sprintf(sprintfbuf, fmtstr, (va_list)
+argliststart);
}
x=sprintfbuf;
while (*x) {
