wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Hans Leidekker : ntdll/tests: Fix a memory leak.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 72e7e399d5eba9a265ac9936e5b05bd04c3e4eb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e7e399d5eba9a265ac9936e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 7 10:32:03 2009 +0100 ntdll/tests: Fix a memory leak. Found by Valgrind. --- dlls/ntdll/tests/directory.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 60c0158..c16b461 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -43,6 +43,7 @@ static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PV static BOOLEAN (WINAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING,LPCSTR); static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); +static VOID (WINAPI *pRtlFreeUnicodeString)( PUNICODE_STRING ); static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPDWORD reslen, LPCSTR src, DWORD srclen ); static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirection)( BOOLEAN enable ); @@ -221,6 +222,7 @@ static void test_NtQueryDirectoryFile(void) pNtClose(dirh); done: tear_down_attribute_test(testdirA); + pRtlFreeUnicodeString(&ntdirname); } static void test_redirection(void) @@ -281,6 +283,7 @@ START_TEST(directory) pRtlCreateUnicodeStringFromAsciiz = (void *)GetProcAddress(hntdll, "RtlCreateUnicodeStringFromAsciiz"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); + pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pRtlMultiByteToUnicodeN = (void *)GetProcAddress(hntdll,"RtlMultiByteToUnicodeN"); pRtlWow64EnableFsRedirection = (void *)GetProcAddress(hntdll,"RtlWow64EnableFsRedirection"); pRtlWow64EnableFsRedirectionEx = (void *)GetProcAddress(hntdll,"RtlWow64EnableFsRedirectionEx");

1 0

Hans Leidekker : netapi32/tests: Fix a memory leak.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: d81f9006ded3378ea346f4f1a5d300d6db975a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d81f9006ded3378ea346f4f1a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 7 10:09:39 2009 +0100 netapi32/tests: Fix a memory leak. Found by Valgrind. --- dlls/netapi32/tests/apibuf.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c index 3400726..af4d39d 100644 --- a/dlls/netapi32/tests/apibuf.c +++ b/dlls/netapi32/tests/apibuf.c @@ -59,6 +59,8 @@ static void run_apibuf_tests(void) /* border reallocate cases */ ok(pNetApiBufferReallocate(0, 1500, &p) == NERR_Success, "Reallocate with OldBuffer = NULL failed\n"); ok(p != NULL, "No memory got allocated\n"); + ok(pNetApiBufferFree(p) == NERR_Success, "NetApiBufferFree failed\n"); + ok(pNetApiBufferAllocate(1024, &p) == NERR_Success, "Memory not reserved\n"); ok(pNetApiBufferReallocate(p, 0, &p) == NERR_Success, "Not freed\n"); ok(p == NULL, "Pointer not cleared\n");

1 0

Hans Leidekker : fusion: Fix some memory leaks.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 67963a76b4c3ac5faad5f106a66bc4b418041044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67963a76b4c3ac5faad5f106a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 7 09:54:38 2009 +0100 fusion: Fix some memory leaks. Found by Valgrind. --- dlls/fusion/asmname.c | 5 +++++ dlls/fusion/tests/asmenum.c | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 913674a..3c014ea 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -471,6 +471,11 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam done: HeapFree(GetProcessHeap(), 0, save); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, name->displayname); + HeapFree(GetProcessHeap(), 0, name->name); + } return hr; } diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c index 48f7b2a..cb6ea3d 100644 --- a/dlls/fusion/tests/asmenum.c +++ b/dlls/fusion/tests/asmenum.c @@ -209,6 +209,8 @@ static void test_CreateAssemblyEnum(void) ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); ok(asmenum == (IAssemblyEnum *)0xdeadbeef, "Expected asmenum to be unchanged, got %p\n", asmenum); + + IAssemblyName_Release(asmname); } typedef struct _tagASMNAME

1 0

Hans Leidekker : userenv/tests: Fix some memory leaks.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 952cd1d36addff7b3c3cf5a4c7dbe47995dccfd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=952cd1d36addff7b3c3cf5a4c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 7 09:19:23 2009 +0100 userenv/tests: Fix some memory leaks. Found by Valgrind. --- dlls/userenv/tests/userenv.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 7c1228b..9003354 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -145,6 +145,7 @@ static void test_create_env(void) todo_wine expect_env(TRUE, r, common_vars[i].name); else expect_env(TRUE, r, common_vars[i].name); + if (r) HeapFree(GetProcessHeap(), 0, st); } } @@ -164,6 +165,7 @@ static void test_create_env(void) todo_wine expect_env(TRUE, r, common_post_nt4_vars[i].name); else expect_env(TRUE, r, common_post_nt4_vars[i].name); + if (r) HeapFree(GetProcessHeap(), 0, st); } } } @@ -178,17 +180,23 @@ static void test_create_env(void) todo_wine expect_env(TRUE, r, htok_vars[i].name); else expect_env(TRUE, r, htok_vars[i].name); + if (r) HeapFree(GetProcessHeap(), 0, st); } } r = get_env(env[0], "WINE_XYZZY", &st); expect(FALSE, r); + r = get_env(env[1], "WINE_XYZZY", &st); expect(FALSE, r); + r = get_env(env[2], "WINE_XYZZY", &st); expect(TRUE, r); + if (r) HeapFree(GetProcessHeap(), 0, st); + r = get_env(env[3], "WINE_XYZZY", &st); expect(TRUE, r); + if (r) HeapFree(GetProcessHeap(), 0, st); } START_TEST(userenv)

1 0

Hans Leidekker : usp10: Fix a memory leak.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 7d3f37fcbd23e66c1822157173392573499a0f59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3f37fcbd23e66c182215717… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 7 09:18:58 2009 +0100 usp10: Fix a memory leak. Found by Valgrind. --- dlls/usp10/usp10.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index aefe6cc..523bd4f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -923,7 +923,9 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) TRACE("(%p)\n", pssa); if (!pssa || !(analysis = *pssa)) return E_INVALIDARG; + invalid = analysis->invalid; + ScriptFreeCache((SCRIPT_CACHE *)&analysis->sc); for (i = 0; i < analysis->numItems; i++) {

1 0

Hans Leidekker : msi/tests: Loosen check on kernel32 language version.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 3840de5b1e1798fadfae6a7133a200ad0283fd1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3840de5b1e1798fadfae6a713… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 7 09:18:35 2009 +0100 msi/tests: Loosen check on kernel32 language version. --- dlls/msi/tests/msi.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 8da3499..e249965 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -2517,8 +2517,7 @@ static void test_MsiGetFileVersion(void) r = MsiGetFileVersionA(path, version, &versz, lang, &langsz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); - ok(!lstrcmpA(lang, langcheck), "Expected %s, got %s\n", langcheck, lang); - ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz); + ok(strstr(lang, langcheck) != NULL, "Expected %s in %s\n", langcheck, lang); ok(!lstrcmpA(version, vercheck), "Expected %s, got %s\n", vercheck, version); @@ -2536,8 +2535,7 @@ static void test_MsiGetFileVersion(void) lstrcpyA(lang, "lang"); r = MsiGetFileVersionA(path, NULL, NULL, lang, &langsz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(lang, langcheck), "Expected %s, got %s\n", langcheck, lang); - ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz); + ok(strstr(lang, langcheck) != NULL, "Expected %s in %s\n", langcheck, lang); /* check neither version nor language */ r = MsiGetFileVersionA(path, NULL, NULL, NULL, NULL); @@ -2553,7 +2551,7 @@ static void test_MsiGetFileVersion(void) langsz = MAX_PATH; r = MsiGetFileVersionA(path, NULL, NULL, NULL, &langsz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz); + ok(langsz >= langchecksz, "Expected %d >= %d\n", langsz, langchecksz); /* pcchVersionBuf not big enough */ versz = 5; @@ -2571,7 +2569,7 @@ static void test_MsiGetFileVersion(void) ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); ok(!strncmp(lang, langcheck, 2), "Expected first character of %s, got %s\n", langcheck, lang); - ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz); + ok(langsz >= langchecksz, "Expected %d >= %d\n", langsz, langchecksz); HeapFree(GetProcessHeap(), 0, vercheck); HeapFree(GetProcessHeap(), 0, langcheck);

1 0

Hans Leidekker : wininet: Cleanup any existing cache file before creating a new one.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 4a22c88b3776e68ea8fc5b3c669be890b6e92204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a22c88b3776e68ea8fc5b3c6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 7 09:18:00 2009 +0100 wininet: Cleanup any existing cache file before creating a new one. Otherwise we leak the file name and handle when a request is sent again. Found by Valgrind. --- dlls/wininet/http.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 024d5d8..6123c5f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3638,6 +3638,9 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, b = CreateUrlCacheEntryW(url, lpwhr->dwContentLength > 0 ? lpwhr->dwContentLength : 0, NULL, cacheFileName, 0); if(b) { + HeapFree(GetProcessHeap(), 0, lpwhr->lpszCacheFile); + CloseHandle(lpwhr->hCacheFile); + lpwhr->lpszCacheFile = heap_strdupW(cacheFileName); lpwhr->hCacheFile = CreateFileW(lpwhr->lpszCacheFile, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

Marcus Meissner : reg: Fixed 2 functionality bugs in REG DELETE (Coverity).
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 552db89b06bd7d5d8f9afd126ee82ae87c54b849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=552db89b06bd7d5d8f9afd126… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Dec 6 22:45:48 2009 +0100 reg: Fixed 2 functionality bugs in REG DELETE (Coverity). --- programs/reg/reg.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index f0a8f8b..07dbdbf 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -255,7 +255,8 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, /* FIXME: Prompt for delete */ } - if (!value_name) + /* Delete subtree only if no /v* option is given */ + if (!value_name && !value_empty && !value_all) { if (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) { @@ -293,10 +294,10 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, while (1) { count = maxValue; - rc = RegEnumValueW(subkey, 0, value_name, &count, NULL, NULL, NULL, NULL); + rc = RegEnumValueW(subkey, 0, szValue, &count, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) { - rc = RegDeleteValueW(subkey,value_name); + rc = RegDeleteValueW(subkey, szValue); if (rc != ERROR_SUCCESS) break; }

1 0

Alexandre Julliard : gdi32: Avoid use of some 16-bit types.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 13608c8b18f1d85df81fb55a94d168447d77c060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13608c8b18f1d85df81fb55a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 5 11:53:37 2009 +0100 gdi32: Avoid use of some 16-bit types. --- dlls/gdi32/enhmetafile.c | 25 +++++++++---------- dlls/gdi32/metafile.c | 23 ++++++++--------- dlls/gdi32/mfdrv/graphics.c | 55 +++++++++++++++++++++---------------------- 3 files changed, 50 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13608c8b18f1d85df81fb…

1 0

Alexandre Julliard : gdi32: Don't include wingdi16.h by default.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 1ac23b9b0f905788ebcca7cc3bb34735b488d85b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac23b9b0f905788ebcca7cc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 5 11:45:31 2009 +0100 gdi32: Don't include wingdi16.h by default. --- dlls/gdi32/bidi.c | 1 + dlls/gdi32/driver.c | 1 + dlls/gdi32/enhmetafile.c | 1 + dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/freetype.c | 1 + dlls/gdi32/gdi_main.c | 1 + dlls/gdi32/gdi_private.h | 5 ++++- dlls/gdi32/gdiobj.c | 1 + dlls/gdi32/metafile.c | 2 ++ dlls/gdi32/mfdrv/graphics.c | 5 +++++ dlls/gdi32/mfdrv/init.c | 1 + dlls/gdi32/mfdrv/mapping.c | 4 ++++ dlls/gdi32/mfdrv/objects.c | 1 + dlls/gdi32/mfdrv/text.c | 1 + dlls/gdi32/printdrv.c | 1 + 15 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 9ac5e1d..7d7f6bc 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -46,6 +46,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winnls.h" #include "wine/debug.h" #include "gdi_private.h" diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 41c59c7..635eeb8 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "winreg.h" #include "ddrawgdi.h" +#include "wine/winbase16.h" #include "gdi_private.h" #include "wine/unicode.h" diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 25b3389..35fd7cf 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -43,6 +43,7 @@ #include "wingdi.h" #include "winnls.h" #include "winerror.h" +#include "wine/wingdi16.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index bc53493..115bb39 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winnls.h" #include "gdi_private.h" #include "enhmfdrv/enhmetafiledrv.h" #include "wine/debug.h" diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9b5f44f..ed37a25 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -84,6 +84,7 @@ #include "winreg.h" #include "wingdi.h" #include "gdi_private.h" +#include "wine/library.h" #include "wine/unicode.h" #include "wine/debug.h" #include "wine/list.h" diff --git a/dlls/gdi32/gdi_main.c b/dlls/gdi32/gdi_main.c index 6734ed5..b757ac0 100644 --- a/dlls/gdi32/gdi_main.c +++ b/dlls/gdi32/gdi_main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "wine/winbase16.h" #include "gdi_private.h" /*********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 7b565c9..670ef41 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -22,7 +22,10 @@ #define __WINE_GDI_PRIVATE_H #include <math.h> -#include "wine/wingdi16.h" +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" /* Metafile defines */ #define META_EOF 0x0000 diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 6ba4a4c..245b1cc 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "wingdi.h" #include "winreg.h" +#include "winnls.h" #include "winerror.h" #include "winternl.h" diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 27ce7b5..6083635 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -55,7 +55,9 @@ #include "winbase.h" #include "wingdi.h" #include "winreg.h" +#include "winnls.h" #include "winternl.h" +#include "wine/wingdi16.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 9b92f85..ea384ba 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -18,9 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> #include <stdlib.h> #include <string.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "wine/wingdi16.h" #include "mfdrv/metafiledrv.h" #include "wine/debug.h" diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 4c88ac6..f515bcf 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "gdi_private.h" #include "mfdrv/metafiledrv.h" #include "wine/debug.h" diff --git a/dlls/gdi32/mfdrv/mapping.c b/dlls/gdi32/mfdrv/mapping.c index 998a7a1..f306cc6 100644 --- a/dlls/gdi32/mfdrv/mapping.c +++ b/dlls/gdi32/mfdrv/mapping.c @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" #include "gdi_private.h" #include "mfdrv/metafiledrv.h" diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index e74cde8..a7a442b 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "wingdi.h" #include "wownt32.h" +#include "wine/wingdi16.h" #include "mfdrv/metafiledrv.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/dlls/gdi32/mfdrv/text.c b/dlls/gdi32/mfdrv/text.c index c3c182c..3ec3703 100644 --- a/dlls/gdi32/mfdrv/text.c +++ b/dlls/gdi32/mfdrv/text.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" +#include "wine/wingdi16.h" #include "mfdrv/metafiledrv.h" #include "wine/debug.h" diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index 18f9db7..cc1e61f 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winnls.h" #include "winspool.h" #include "winerror.h" #include "wine/debug.h"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009