From 680919c2e6adde1bd26642be0de5ac642ff1e23a Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sun, 7 May 2000 18:39:28 +0000 Subject: [PATCH] Moved Load/FreeLibrary16 definition to winbase16.h. --- dlls/commdlg/cdlg32.c | 3 ++- dlls/ole32/ole2.c | 3 ++- include/winbase.h | 17 +++++++---------- include/wine/winbase16.h | 3 +++ loader/pe_image.c | 13 +++++++------ relay32/builtin32.c | 1 + windows/driver.c | 3 ++- 7 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/commdlg/cdlg32.c b/dlls/commdlg/cdlg32.c index 3c1441659b7..3035e0bceff 100644 --- a/dlls/commdlg/cdlg32.c +++ b/dlls/commdlg/cdlg32.c @@ -6,11 +6,12 @@ */ #include "winbase.h" +#include "wine/winbase16.h" #include "commdlg.h" #include "cderr.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(commdlg) +DEFAULT_DEBUG_CHANNEL(commdlg); #include "cdlg.h" diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index fbd2cdf2232..b365741918b 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -19,12 +19,13 @@ #include "process.h" #include "commctrl.h" #include "wine/obj_clientserver.h" +#include "wine/winbase16.h" #include "wine/wingdi16.h" #include "debugtools.h" #include "ole2ver.h" #include "winreg.h" -DEFAULT_DEBUG_CHANNEL(ole) +DEFAULT_DEBUG_CHANNEL(ole); /****************************************************************************** * These are static/global variables and internal data structures that the diff --git a/include/winbase.h b/include/winbase.h index a9c4e466cb6..f56ad7ff064 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -532,7 +532,7 @@ typedef struct tagMEMORYSTATUS /* Debugging support (DEBUG SYSTEM ONLY) */ typedef struct { - UINT16 flags; + WORD flags; DWORD dwOptions WINE_PACKED; DWORD dwFilter WINE_PACKED; CHAR achAllocModule[8] WINE_PACKED; @@ -750,7 +750,7 @@ typedef struct typedef struct _SYSTEM_POWER_STATUS { - BOOL16 ACLineStatus; + BYTE ACLineStatus; BYTE BatteryFlag; BYTE BatteryLifePercent; BYTE reserved; @@ -1541,8 +1541,7 @@ BOOL WINAPI FindNextFileW(HANDLE,LPWIN32_FIND_DATAW); HRSRC WINAPI FindResourceA(HMODULE,LPCSTR,LPCSTR); HRSRC WINAPI FindResourceW(HMODULE,LPCWSTR,LPCWSTR); #define FindResource WINELIB_NAME_AW(FindResource) -VOID WINAPI FreeLibrary16(HINSTANCE16); -BOOL WINAPI FreeLibrary(HMODULE); +BOOL WINAPI FreeLibrary(HMODULE); #define FreeModule(handle) FreeLibrary(handle) #define FreeProcInstance(proc) /*nothing*/ BOOL WINAPI FreeResource(HGLOBAL); @@ -1659,14 +1658,12 @@ BOOL WINAPI IsBadStringPtrW(LPCWSTR,UINT); BOOL WINAPI IsBadWritePtr(LPVOID,UINT); BOOL WINAPI IsDBCSLeadByte(BYTE); BOOL WINAPI IsDebuggerPresent(void); -HINSTANCE16 WINAPI LoadLibrary16(LPCSTR); -HMODULE WINAPI LoadLibraryA(LPCSTR); -HMODULE WINAPI LoadLibraryW(LPCWSTR); +HMODULE WINAPI LoadLibraryA(LPCSTR); +HMODULE WINAPI LoadLibraryW(LPCWSTR); #define LoadLibrary WINELIB_NAME_AW(LoadLibrary) -HMODULE WINAPI LoadLibraryExA(LPCSTR,HANDLE,DWORD); -HMODULE WINAPI LoadLibraryExW(LPCWSTR,HANDLE,DWORD); +HMODULE WINAPI LoadLibraryExA(LPCSTR,HANDLE,DWORD); +HMODULE WINAPI LoadLibraryExW(LPCWSTR,HANDLE,DWORD); #define LoadLibraryEx WINELIB_NAME_AW(LoadLibraryEx) -HINSTANCE16 WINAPI LoadModule16(LPCSTR,LPVOID); HINSTANCE WINAPI LoadModule(LPCSTR,LPVOID); HGLOBAL WINAPI LoadResource(HMODULE,HRSRC); HLOCAL WINAPI LocalAlloc(UINT,DWORD); diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 1b826a1d8a0..8e6a5c1cb22 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -112,6 +112,7 @@ void WINAPI ExitKernel16(void); void WINAPI FatalAppExit16(UINT16,LPCSTR); ATOM WINAPI FindAtom16(LPCSTR); BOOL16 WINAPI FindClose16(HANDLE16); +VOID WINAPI FreeLibrary16(HINSTANCE16); HRSRC16 WINAPI FindResource16(HINSTANCE16,SEGPTR,SEGPTR); BOOL16 WINAPI FreeModule16(HMODULE16); void WINAPI FreeProcInstance16(FARPROC16); @@ -150,6 +151,8 @@ BOOL16 WINAPI IsBadReadPtr16(SEGPTR,UINT16); BOOL16 WINAPI IsBadStringPtr16(SEGPTR,UINT16); BOOL16 WINAPI IsBadWritePtr16(SEGPTR,UINT16); BOOL16 WINAPI IsDBCSLeadByte16(BYTE); +HINSTANCE16 WINAPI LoadLibrary16(LPCSTR); +HINSTANCE16 WINAPI LoadModule16(LPCSTR,LPVOID); HGLOBAL16 WINAPI LoadResource16(HINSTANCE16,HRSRC16); HLOCAL16 WINAPI LocalAlloc16(UINT16,WORD); UINT16 WINAPI LocalCompact16(UINT16); diff --git a/loader/pe_image.c b/loader/pe_image.c index 50182361ce0..f0df822adab 100644 --- a/loader/pe_image.c +++ b/loader/pe_image.c @@ -48,6 +48,7 @@ #endif #include "windef.h" #include "winbase.h" +#include "wine/winbase16.h" #include "winerror.h" #include "callback.h" #include "file.h" @@ -63,12 +64,12 @@ #include "server.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(win32) -DECLARE_DEBUG_CHANNEL(delayhlp) -DECLARE_DEBUG_CHANNEL(fixup) -DECLARE_DEBUG_CHANNEL(module) -DECLARE_DEBUG_CHANNEL(relay) -DECLARE_DEBUG_CHANNEL(segment) +DEFAULT_DEBUG_CHANNEL(win32); +DECLARE_DEBUG_CHANNEL(delayhlp); +DECLARE_DEBUG_CHANNEL(fixup); +DECLARE_DEBUG_CHANNEL(module); +DECLARE_DEBUG_CHANNEL(relay); +DECLARE_DEBUG_CHANNEL(segment); /* convert PE image VirtualAddress to Real Address */ diff --git a/relay32/builtin32.c b/relay32/builtin32.c index e771460bd0e..636d3216189 100644 --- a/relay32/builtin32.c +++ b/relay32/builtin32.c @@ -15,6 +15,7 @@ #endif #include "windef.h" +#include "wine/winbase16.h" #include "wingdi.h" #include "winuser.h" #include "builtin32.h" diff --git a/windows/driver.c b/windows/driver.c index 402b5d73cf0..1bb6aa1026c 100644 --- a/windows/driver.c +++ b/windows/driver.c @@ -11,6 +11,7 @@ #include #include "heap.h" #include "windef.h" +#include "wine/winbase16.h" #include "wingdi.h" #include "winuser.h" #include "driver.h" @@ -19,7 +20,7 @@ #include "mmddk.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(driver) +DEFAULT_DEBUG_CHANNEL(driver); /* The following definitions are WINE internals */ /* FIXME: This is a WINE internal struct and should be moved in include/wine directory -- 2.11.4.GIT