Alexandre Julliard : include: Move undocumented Win9x function definitions to winbase16.h.
Alexandre Julliard
julliard at winehq.org
Mon Dec 28 09:16:02 CST 2009
Module: wine
Branch: master
Commit: 21ddb9f48e219ddb073c9874bc64222635a11902
URL: http://source.winehq.org/git/wine.git/?a=commit;h=21ddb9f48e219ddb073c9874bc64222635a11902
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Dec 24 20:28:12 2009 +0100
include: Move undocumented Win9x function definitions to winbase16.h.
---
dlls/ddeml.dll16/ddeml.c | 1 +
dlls/msvideo.dll16/msvideo16.c | 1 +
dlls/ole2disp.dll16/ole2disp.c | 3 +-
dlls/olecli.dll16/olecli.c | 1 +
dlls/setupx.dll16/devinst16.c | 1 +
dlls/winaspi.dll16/winaspi.c | 1 +
include/winbase.h | 42 ----------------------------------------
include/wine/winbase16.h | 39 +++++++++++++++++++++++++++++++++++++
8 files changed, 46 insertions(+), 43 deletions(-)
diff --git a/dlls/ddeml.dll16/ddeml.c b/dlls/ddeml.dll16/ddeml.c
index 874c456..e0a9dda 100644
--- a/dlls/ddeml.dll16/ddeml.c
+++ b/dlls/ddeml.dll16/ddeml.c
@@ -30,6 +30,7 @@
#include "windef.h"
#include "winbase.h"
#include "wine/windef16.h"
+#include "wine/winbase16.h"
#include "wownt32.h"
#include "dde.h"
#include "ddeml.h"
diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c
index 6970278..e157808 100644
--- a/dlls/msvideo.dll16/msvideo16.c
+++ b/dlls/msvideo.dll16/msvideo16.c
@@ -29,6 +29,7 @@
#include "winnls.h"
#include "winreg.h"
#include "winuser.h"
+#include "wine/winbase16.h"
#include "vfw16.h"
#include "wine/debug.h"
diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c
index a09ef7c..081683e 100644
--- a/dlls/ole2disp.dll16/ole2disp.c
+++ b/dlls/ole2disp.dll16/ole2disp.c
@@ -23,7 +23,6 @@
#include <stdarg.h>
#include <string.h>
-#include "wine/windef16.h"
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
@@ -31,6 +30,8 @@
#include "ole2.h"
#include "oleauto.h"
#include "winerror.h"
+#include "wine/windef16.h"
+#include "wine/winbase16.h"
#include "ole2disp.h"
diff --git a/dlls/olecli.dll16/olecli.c b/dlls/olecli.dll16/olecli.c
index a37254b..ad59fa3 100644
--- a/dlls/olecli.dll16/olecli.c
+++ b/dlls/olecli.dll16/olecli.c
@@ -27,6 +27,7 @@
#include "windef.h"
#include "wine/windef16.h"
+#include "wine/winbase16.h"
#include "winbase.h"
#include "wingdi.h"
#include "wownt32.h"
diff --git a/dlls/setupx.dll16/devinst16.c b/dlls/setupx.dll16/devinst16.c
index 6c78aec..fb98f42 100644
--- a/dlls/setupx.dll16/devinst16.c
+++ b/dlls/setupx.dll16/devinst16.c
@@ -22,6 +22,7 @@
#include "windef.h"
#include "winbase.h"
+#include "wine/winbase16.h"
#include "setupx16.h"
#include "wine/debug.h"
diff --git a/dlls/winaspi.dll16/winaspi.c b/dlls/winaspi.dll16/winaspi.c
index 9ef9974..aceef36 100644
--- a/dlls/winaspi.dll16/winaspi.c
+++ b/dlls/winaspi.dll16/winaspi.c
@@ -34,6 +34,7 @@
#include "windef.h"
#include "winbase.h"
#include "wine/windef16.h"
+#include "wine/winbase16.h"
#include "winreg.h"
#include "wownt32.h"
#include "aspi.h"
diff --git a/include/winbase.h b/include/winbase.h
index 8298cbd..1cd26f5 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -2304,48 +2304,6 @@ WINBASEAPI UINT WINAPI _lwrite(HFILE,LPCSTR,UINT);
#define ZeroMemory RtlZeroMemory
#define CopyMemory RtlCopyMemory
-/* undocumented functions */
-
-typedef struct tagSYSLEVEL
-{
- CRITICAL_SECTION crst;
- INT level;
-} SYSLEVEL;
-
-/* [GS]etProcessDword offsets */
-#define GPD_APP_COMPAT_FLAGS (-56)
-#define GPD_LOAD_DONE_EVENT (-52)
-#define GPD_HINSTANCE16 (-48)
-#define GPD_WINDOWS_VERSION (-44)
-#define GPD_THDB (-40)
-#define GPD_PDB (-36)
-#define GPD_STARTF_SHELLDATA (-32)
-#define GPD_STARTF_HOTKEY (-28)
-#define GPD_STARTF_SHOWWINDOW (-24)
-#define GPD_STARTF_SIZE (-20)
-#define GPD_STARTF_POSITION (-16)
-#define GPD_STARTF_FLAGS (-12)
-#define GPD_PARENT (- 8)
-#define GPD_FLAGS (- 4)
-#define GPD_USERDATA ( 0)
-
-WINBASEAPI void WINAPI DisposeLZ32Handle(HANDLE);
-WINBASEAPI HANDLE WINAPI DosFileHandleToWin32Handle(HFILE);
-WINBASEAPI DWORD WINAPI GetProcessDword(DWORD,INT);
-WINBASEAPI VOID WINAPI GetpWin16Lock(SYSLEVEL**);
-WINBASEAPI DWORD WINAPI MapLS(LPCVOID);
-WINBASEAPI LPVOID WINAPI MapSL(DWORD);
-WINBASEAPI VOID WINAPI ReleaseThunkLock(DWORD*);
-WINBASEAPI VOID WINAPI RestoreThunkLock(DWORD);
-WINBASEAPI VOID WINAPI UnMapLS(DWORD);
-WINBASEAPI HFILE WINAPI Win32HandleToDosFileHandle(HANDLE);
-WINBASEAPI VOID WINAPI _CheckNotSysLevel(SYSLEVEL *lock);
-WINBASEAPI DWORD WINAPI _ConfirmWin16Lock(void);
-WINBASEAPI DWORD WINAPI _ConfirmSysLevel(SYSLEVEL*);
-WINBASEAPI VOID WINAPI _EnterSysLevel(SYSLEVEL*);
-WINBASEAPI VOID WINAPI _LeaveSysLevel(SYSLEVEL*);
-
-
/* Wine internal functions */
extern char * CDECL wine_get_unix_file_name( LPCWSTR dos );
diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h
index 0e41cba..aaa3336 100644
--- a/include/wine/winbase16.h
+++ b/include/wine/winbase16.h
@@ -320,6 +320,30 @@ typedef struct
#define __AHINCR (1 << __AHSHIFT)
/* undocumented functions */
+
+typedef struct tagSYSLEVEL
+{
+ CRITICAL_SECTION crst;
+ INT level;
+} SYSLEVEL;
+
+/* [GS]etProcessDword offsets */
+#define GPD_APP_COMPAT_FLAGS (-56)
+#define GPD_LOAD_DONE_EVENT (-52)
+#define GPD_HINSTANCE16 (-48)
+#define GPD_WINDOWS_VERSION (-44)
+#define GPD_THDB (-40)
+#define GPD_PDB (-36)
+#define GPD_STARTF_SHELLDATA (-32)
+#define GPD_STARTF_HOTKEY (-28)
+#define GPD_STARTF_SHOWWINDOW (-24)
+#define GPD_STARTF_SIZE (-20)
+#define GPD_STARTF_POSITION (-16)
+#define GPD_STARTF_FLAGS (-12)
+#define GPD_PARENT (- 8)
+#define GPD_FLAGS (- 4)
+#define GPD_USERDATA ( 0)
+
WORD WINAPI AllocCStoDSAlias16(WORD);
WORD WINAPI AllocDStoCSAlias16(WORD);
HGLOBAL16 WINAPI AllocResource16(HINSTANCE16,HRSRC16,DWORD);
@@ -327,6 +351,8 @@ WORD WINAPI AllocSelector16(WORD);
WORD WINAPI AllocSelectorArray16(WORD);
VOID WINAPI DirectedYield16(HTASK16);
HGLOBAL16 WINAPI DirectResAlloc16(HINSTANCE16,WORD,UINT16);
+void WINAPI DisposeLZ32Handle(HANDLE);
+HANDLE WINAPI DosFileHandleToWin32Handle(HFILE);
HANDLE16 WINAPI FarGetOwner16(HGLOBAL16);
VOID WINAPI FarSetOwner16(HGLOBAL16,HANDLE16);
FARPROC16 WINAPI FileCDR16(FARPROC16);
@@ -346,7 +372,9 @@ INT16 WINAPI GetInstanceData16(HINSTANCE16,WORD,INT16);
BOOL16 WINAPI GetModuleName16(HINSTANCE16,LPSTR,INT16);
INT16 WINAPI GetModuleUsage16(HINSTANCE16);
UINT16 WINAPI GetNumTasks16(void);
+VOID WINAPI GetpWin16Lock(SYSLEVEL**);
SEGPTR WINAPI GetpWin16Lock16(void);
+DWORD WINAPI GetProcessDword(DWORD,INT);
DWORD WINAPI GetSelectorLimit16(WORD);
FARPROC16 WINAPI GetSetKernelDOSProc16(FARPROC16 DosProc);
HINSTANCE16 WINAPI GetTaskDS16(void);
@@ -375,10 +403,14 @@ WORD WINAPI LocalHeapSize16(void);
BOOL16 WINAPI LocalInit16(HANDLE16,WORD,WORD);
FARPROC16 WINAPI LocalNotify16(FARPROC16);
HTASK16 WINAPI LockCurrentTask16(BOOL16);
+DWORD WINAPI MapLS(LPCVOID);
+LPVOID WINAPI MapSL(DWORD);
VOID WINAPI OldYield16(void);
VOID WINAPI WIN32_OldYield16(void);
VOID WINAPI PostEvent16(HTASK16);
WORD WINAPI PrestoChangoSelector16(WORD,WORD);
+VOID WINAPI ReleaseThunkLock(DWORD*);
+VOID WINAPI RestoreThunkLock(DWORD);
WORD WINAPI SelectorAccessRights16(WORD,WORD,WORD);
void WINAPI SetFastQueue16(DWORD,HQUEUE16);
VOID WINAPI SetPriority16(HTASK16,INT16);
@@ -387,11 +419,18 @@ WORD WINAPI SetSelectorLimit16(WORD,DWORD);
HQUEUE16 WINAPI SetTaskQueue16(HTASK16,HQUEUE16);
HQUEUE16 WINAPI SetThreadQueue16(DWORD,HQUEUE16);
VOID WINAPI SwitchStackTo16(WORD,WORD,WORD);
+VOID WINAPI UnMapLS(DWORD);
BOOL16 WINAPI WaitEvent16(HTASK16);
+HFILE WINAPI Win32HandleToDosFileHandle(HANDLE);
VOID WINAPI WriteOutProfiles16(void);
VOID WINAPI hmemcpy16(LPVOID,LPCVOID,LONG);
+VOID WINAPI _CheckNotSysLevel(SYSLEVEL *lock);
+DWORD WINAPI _ConfirmSysLevel(SYSLEVEL*);
+DWORD WINAPI _ConfirmWin16Lock(void);
VOID WINAPI _CreateSysLevel(SYSLEVEL*,INT);
+VOID WINAPI _EnterSysLevel(SYSLEVEL*);
VOID WINAPI _EnterWin16Lock(void);
+VOID WINAPI _LeaveSysLevel(SYSLEVEL*);
VOID WINAPI _LeaveWin16Lock(void);
More information about the wine-cvs
mailing list