Module: wine Branch: master Commit: 8268ed978389662c7b43212e008037cae3ce900e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8268ed978389662c7b43212e00...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Dec 28 22:19:31 2009 +0100
kernel32: Do not include 16-bit headers in 32-bit files.
---
dlls/kernel32/console.c | 1 - dlls/kernel32/module.c | 3 ++- dlls/kernel32/process.c | 3 +-- dlls/kernel32/resource.c | 7 ------- dlls/kernel32/thread.c | 1 - 5 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 48bcfa4..42344af 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -44,7 +44,6 @@ #include "winnls.h" #include "winerror.h" #include "wincon.h" -#include "wine/winbase16.h" #include "wine/server.h" #include "wine/exception.h" #include "wine/unicode.h" diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 2308a10..76e1b0f 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -31,7 +31,6 @@ #endif #include "ntstatus.h" #define WIN32_NO_STATUS -#include "wine/winbase16.h" #include "winerror.h" #include "windef.h" #include "winbase.h" @@ -44,6 +43,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(module);
+#define NE_FFLAGS_LIBMODULE 0x8000 + static WCHAR *dll_directory; /* extra path for SetDllDirectoryW */
static CRITICAL_SECTION dlldir_section; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index eb39f5c..e481e0c 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -43,10 +43,9 @@
#include "ntstatus.h" #define WIN32_NO_STATUS -#include "wine/winbase16.h" -#include "wine/winuser16.h" #include "winternl.h" #include "kernel_private.h" +#include "wine/library.h" #include "wine/server.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 8d52397..d364739 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -39,13 +39,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(resource);
-/* handle conversions */ -#define HRSRC_32(h16) ((HRSRC)(ULONG_PTR)(h16)) -#define HRSRC_16(h32) (LOWORD(h32)) -#define HGLOBAL_32(h16) ((HGLOBAL)(ULONG_PTR)(h16)) -#define HGLOBAL_16(h32) (LOWORD(h32)) -#define HMODULE_16(h32) (LOWORD(h32)) - /* retrieve the resource name to pass to the ntdll functions */ static NTSTATUS get_res_nameA( LPCSTR name, UNICODE_STRING *str ) { diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 17339ca..6979c36 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -35,7 +35,6 @@ #include "winbase.h" #include "winerror.h" #include "winternl.h" -#include "wine/winbase16.h" #include "wine/exception.h" #include "wine/library.h" #include "wine/server.h"