Move misc macros to version.c
Francois Gouget
fgouget at free.fr
Sun Oct 7 21:20:16 CDT 2001
I also noticed a number of other macros that are:
* not defined on Windows
* not used anywhere although they are related to WINDEBUGINFO & co
I did not want to remove them altogether so I moved them to
misc/version.c and put them in an #if 0 with a comment saying they are
here for documentation only.
WINDEBUGINFO is not defined on Windows either but is used for
GetWinDebugInfo16 and SetWinDebugInfo16. So I moved it to
wine/winbase16.h and renamed it to WINDEBUGINFO16.
Let me know if some of this should be deleted altogether, moved
elsewhere, ... I can submit a modified patch.
Changelog:
* include/winbase.h,
include/wine/winbase16.h,
misc/version.c
Move WINDEBUGINFO from winbase.h to winbase16.h and rename to WINDEBUGINFO16
Move the related macros to version.c and ifdef them out
(kept for documentation only, they are not used)
--
Francois Gouget fgouget at free.fr http://fgouget.free.fr/
La terre est une bêta...
-------------- next part --------------
Index: include/winbase.h
===================================================================
RCS file: /home/wine/wine/include/winbase.h,v
retrieving revision 1.121
diff -u -r1.121 winbase.h
--- include/winbase.h 2001/10/05 19:44:33 1.121
+++ include/winbase.h 2001/10/07 22:23:44
@@ -574,55 +432,3 @@
-
-
-/* Debugging support (DEBUG SYSTEM ONLY) */
-typedef struct
-{
- WORD flags;
- DWORD dwOptions WINE_PACKED;
- DWORD dwFilter WINE_PACKED;
- CHAR achAllocModule[8] WINE_PACKED;
- DWORD dwAllocBreak WINE_PACKED;
- DWORD dwAllocCount WINE_PACKED;
-} WINDEBUGINFO, *LPWINDEBUGINFO;
-
-/* WINDEBUGINFO flags values */
-#define WDI_OPTIONS 0x0001
-#define WDI_FILTER 0x0002
-#define WDI_ALLOCBREAK 0x0004
-
-/* dwOptions values */
-#define DBO_CHECKHEAP 0x0001
-#define DBO_BUFFERFILL 0x0004
-#define DBO_DISABLEGPTRAPPING 0x0010
-#define DBO_CHECKFREE 0x0020
-
-#define DBO_SILENT 0x8000
-
-#define DBO_TRACEBREAK 0x2000
-#define DBO_WARNINGBREAK 0x1000
-#define DBO_NOERRORBREAK 0x0800
-#define DBO_NOFATALBREAK 0x0400
-#define DBO_INT3BREAK 0x0100
-
-/* DebugOutput flags values */
-#define DBF_TRACE 0x0000
-#define DBF_WARNING 0x4000
-#define DBF_ERROR 0x8000
-#define DBF_FATAL 0xc000
-
-/* dwFilter values */
-#define DBF_KERNEL 0x1000
-#define DBF_KRN_MEMMAN 0x0001
-#define DBF_KRN_LOADMODULE 0x0002
-#define DBF_KRN_SEGMENTLOAD 0x0004
-#define DBF_USER 0x0800
-#define DBF_GDI 0x0400
-#define DBF_MMSYSTEM 0x0040
-#define DBF_PENWIN 0x0020
-#define DBF_APPLICATION 0x0008
-#define DBF_DRIVER 0x0010
-
-#endif /* NOLOGERROR */
-
typedef struct {
WORD wYear;
Index: include/wine/winbase16.h
===================================================================
RCS file: /home/wine/wine/include/wine/winbase16.h,v
retrieving revision 1.28
diff -u -r1.28 winbase16.h
--- include/wine/winbase16.h 2001/01/15 20:09:10 1.28
+++ include/wine/winbase16.h 2001/10/07 22:23:50
@@ -147,6 +147,21 @@
#define __AHSHIFT 3 /* don't change! */
#define __AHINCR (1 << __AHSHIFT)
+
+/*
+ * Debugging support (DEBUG SYSTEM ONLY)
+ */
+typedef struct
+{
+ WORD flags;
+ DWORD dwOptions WINE_PACKED;
+ DWORD dwFilter WINE_PACKED;
+ CHAR achAllocModule[8] WINE_PACKED;
+ DWORD dwAllocBreak WINE_PACKED;
+ DWORD dwAllocCount WINE_PACKED;
+} WINDEBUGINFO16, *LPWINDEBUGINFO16;
+
+
/* undocumented functions */
WORD WINAPI AllocCStoDSAlias16(WORD);
WORD WINAPI AllocDStoCSAlias16(WORD);
@@ -266,7 +281,7 @@
UINT16 WINAPI GetTempFileName16(BYTE,LPCSTR,UINT16,LPSTR);
LONG WINAPI GetVersion16(void);
BOOL16 WINAPI GetVersionEx16(OSVERSIONINFO16*);
-BOOL16 WINAPI GetWinDebugInfo16(LPWINDEBUGINFO,UINT16);
+BOOL16 WINAPI GetWinDebugInfo16(LPWINDEBUGINFO16,UINT16);
UINT16 WINAPI GetWindowsDirectory16(LPSTR,UINT16);
HGLOBAL16 WINAPI GlobalAlloc16(UINT16,DWORD);
DWORD WINAPI GlobalCompact16(DWORD);
@@ -324,7 +339,7 @@
UINT16 WINAPI SetHandleCount16(UINT16);
WORD WINAPI SetSelectorBase(WORD,DWORD);
LONG WINAPI SetSwapAreaSize16(WORD);
-BOOL16 WINAPI SetWinDebugInfo16(LPWINDEBUGINFO);
+BOOL16 WINAPI SetWinDebugInfo16(LPWINDEBUGINFO16);
DWORD WINAPI SizeofResource16(HMODULE16,HRSRC16);
void WINAPI UnlockSegment16(HGLOBAL16);
BOOL16 WINAPI WritePrivateProfileString16(LPCSTR,LPCSTR,LPCSTR,LPCSTR);
Index: misc/version.c
===================================================================
RCS file: /home/wine/wine/misc/version.c,v
retrieving revision 1.46
diff -u -r1.46 version.c
--- misc/version.c 2001/10/01 20:52:37 1.46
+++ misc/version.c 2001/10/07 22:23:51
@@ -492,10 +492,53 @@
}
+#if 0
+/* Not used at this time. This is here for documentation only */
+
+/* WINDEBUGINFO flags values */
+#define WDI_OPTIONS 0x0001
+#define WDI_FILTER 0x0002
+#define WDI_ALLOCBREAK 0x0004
+
+/* dwOptions values */
+#define DBO_CHECKHEAP 0x0001
+#define DBO_BUFFERFILL 0x0004
+#define DBO_DISABLEGPTRAPPING 0x0010
+#define DBO_CHECKFREE 0x0020
+
+#define DBO_SILENT 0x8000
+
+#define DBO_TRACEBREAK 0x2000
+#define DBO_WARNINGBREAK 0x1000
+#define DBO_NOERRORBREAK 0x0800
+#define DBO_NOFATALBREAK 0x0400
+#define DBO_INT3BREAK 0x0100
+
+/* DebugOutput flags values */
+#define DBF_TRACE 0x0000
+#define DBF_WARNING 0x4000
+#define DBF_ERROR 0x8000
+#define DBF_FATAL 0xc000
+
+/* dwFilter values */
+#define DBF_KERNEL 0x1000
+#define DBF_KRN_MEMMAN 0x0001
+#define DBF_KRN_LOADMODULE 0x0002
+#define DBF_KRN_SEGMENTLOAD 0x0004
+#define DBF_USER 0x0800
+#define DBF_GDI 0x0400
+#define DBF_MMSYSTEM 0x0040
+#define DBF_PENWIN 0x0020
+#define DBF_APPLICATION 0x0008
+#define DBF_DRIVER 0x0010
+
+#endif /* NOLOGERROR */
+
+
/***********************************************************************
* GetWinDebugInfo (KERNEL.355)
*/
-BOOL16 WINAPI GetWinDebugInfo16(WINDEBUGINFO *lpwdi, UINT16 flags)
+BOOL16 WINAPI GetWinDebugInfo16(WINDEBUGINFO16 *lpwdi, UINT16 flags)
{
FIXME("(%8lx,%d): stub returning 0\n",
(unsigned long)lpwdi, flags);
@@ -509,7 +552,7 @@
/***********************************************************************
* SetWinDebugInfo (KERNEL.356)
*/
-BOOL16 WINAPI SetWinDebugInfo16(WINDEBUGINFO *lpwdi)
+BOOL16 WINAPI SetWinDebugInfo16(WINDEBUGINFO16 *lpwdi)
{
FIXME("(%8lx): stub returning 0\n", (unsigned long)lpwdi);
/* 0 means not in debugging mode/version */
More information about the wine-patches
mailing list