Skip to content

W
wine-winehq
Commit 62f059f6 authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard
Browse files
Options

Get rid of USER32 functions in KERNEL32.

parent d5cab2a0
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
dlls/kernel/format_msg.c
View file @ 62f059f6
...@@ -260,8 +260,7 @@ DWORD WINAPI FormatMessageA( ...@@ -260,8 +260,7 @@ DWORD WINAPI FormatMessageA(
argliststart=(*(DWORD**)args)+insertnr-1; argliststart=(*(DWORD**)args)+insertnr-1;
/* CMF - This makes a BIG assumption about va_list */ /* CMF - This makes a BIG assumption about va_list */
/* FIXME: wvsnprintfA is a USER function */ while (vsnprintf(b, sz, fmtstr, (va_list) argliststart) < 0) {
while (wvsnprintfA(b, sz, fmtstr, (va_list) argliststart) < 0) {
b = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, b, sz += 100); b = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, b, sz += 100);
} }
for (x=b; *x; x++) ADD_TO_T(*x); for (x=b; *x; x++) ADD_TO_T(*x);
...@@ -318,6 +317,7 @@ DWORD WINAPI FormatMessageA( ...@@ -318,6 +317,7 @@ DWORD WINAPI FormatMessageA(
} }
HeapFree(GetProcessHeap(),0,target); HeapFree(GetProcessHeap(),0,target);
if (from) HeapFree(GetProcessHeap(),0,from); if (from) HeapFree(GetProcessHeap(),0,from);
TRACE("-- returning %d\n", (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ? strlen(*(LPSTR*)lpBuffer):strlen(lpBuffer));
return (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ? return (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ?
strlen(*(LPSTR*)lpBuffer): strlen(*(LPSTR*)lpBuffer):
strlen(lpBuffer); strlen(lpBuffer);
...@@ -472,8 +472,7 @@ DWORD WINAPI FormatMessageW( ...@@ -472,8 +472,7 @@ DWORD WINAPI FormatMessageW(
sprintfbuf=HeapAlloc(GetProcessHeap(),0,100); sprintfbuf=HeapAlloc(GetProcessHeap(),0,100);
/* CMF - This makes a BIG assumption about va_list */ /* CMF - This makes a BIG assumption about va_list */
/* FIXME: wvsprintfA is a USER function */ vsprintf(sprintfbuf, fmtstr, (va_list) argliststart);
wvsprintfA(sprintfbuf, fmtstr, (va_list) argliststart);
} }
x=sprintfbuf; x=sprintfbuf;
while (*x) { while (*x) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment