Changeset 1007 for trunk/include

Timestamp:

Sep 22, 1999, 11:46:52 AM (26 years ago)

Author:

sandervl

Message:

Yuri Dario's VAC 3.6.5 changes

Location:

trunk/include

Files:

• odin.h (modified) (2 diffs)
• pdwin32.vac3.dbg (modified) (2 diffs)
• pdwin32.vac3.rel (modified) (2 diffs)
• pdwin32.vac36.dbg (modified) (2 diffs)
• pdwin32.vac36.rel (modified) (2 diffs)
• pefile.h (modified) (2 diffs)
• win/gdi.h (modified) (2 diffs)
• win/shellapi.h (modified) (2 diffs)
• win/windef.h (modified) (2 diffs)
• win/wingdi.h (modified) (9 diffs)

trunk/include/odin.h

@@ -1 @@
-/* $Id: odin.h,v 1.9 1999-09-08 19:34:51 sandervl Exp $ */
+/* $Id: odin.h,v 1.10 1999-09-22 09:46:18 sandervl Exp $ */
 /*
  * ODIN - Build Environment Definition
@@ -77 +77 @@
   #define PASCAL    _Pascal
   #define UNALIGNED
+  #define __inline__ inline
+
   #if (__IBMCPP__ == 300) || (__IBMC__ == 300)
   #define NONAMELESSUNION

trunk/include/pdwin32.vac3.dbg

@@ -1 @@
-# $Id: pdwin32.vac3.dbg,v 1.11 1999-09-07 18:57:54 sandervl Exp $
+# $Id: pdwin32.vac3.dbg,v 1.12 1999-09-22 09:46:18 sandervl Exp $
 # ODIN / win32os2 Project
 #
@@ -23 +23 @@
 # Tool Flags
 #
-CFLAGS           = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -D__WIN32OS2__  -D__WINE__ -DDEBUG
-CXXFLAGS         = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -D__WIN32OS2__ -D__WINE__ -DDEBUG
-CXXFLAGS_ODINCRT = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -D__WIN32OS2__ -D__WINE__ -DDEBUG
+CFLAGS           = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__  -D__WINE__ -DDEBUG
+CXXFLAGS         = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__ -DDEBUG
+CXXFLAGS_ODINCRT = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__ -DDEBUG
 ASFLAGS          = -Sc -Sv:ALP +Od
 LDFLAGS          = -Q  -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe /NOD /dbgpack /packcode /packdata /exepack"

trunk/include/pdwin32.vac3.rel

@@ -1 @@
-# $Id: pdwin32.vac3.rel,v 1.10 1999-09-07 18:57:54 sandervl Exp $
+# $Id: pdwin32.vac3.rel,v 1.11 1999-09-22 09:46:18 sandervl Exp $
 # ODIN / win32os2 Project
 #
@@ -24 +24 @@
 # Tool Flags
 #
-CFLAGS           = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -D__WIN32OS2__ -D__WINE__
-CXXFLAGS         = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -D__WIN32OS2__ -D__WINE__
-CXXFLAGS_ODINCRT = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -D__WIN32OS2__ -D__WINE__
+CFLAGS           = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__
+CXXFLAGS         = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__
+CXXFLAGS_ODINCRT = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__
 ASFLAGS          = -Sc -Sv:ALP
 LDFLAGS          = -Q -Si -G5 -O+ -Ge- -Ss+ -W3 -Gm+ /B"/noe /NOD /packcode /packdata /exepack"

trunk/include/pdwin32.vac36.dbg

@@ -1 @@
-# $Id: pdwin32.vac36.dbg,v 1.4 1999-09-07 18:57:54 sandervl Exp $
+# $Id: pdwin32.vac36.dbg,v 1.5 1999-09-22 09:46:18 sandervl Exp $
 # ODIN / win32os2 Project
 #
@@ -23 +23 @@
 # Tool Flags
 #
-CFLAGS           = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -D__WIN32OS2__  -D__WINE__ -DDEBUG
-CXXFLAGS         = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -D__WIN32OS2__ -D__WINE__ -DDEBUG
-CXXFLAGS_ODINCRT = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -D__WIN32OS2__ -D__WINE__ -DDEBUG
+CFLAGS           = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__  -D__WINE__ -DDEBUG
+CXXFLAGS         = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__ -DDEBUG
+CXXFLAGS_ODINCRT = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__ -DDEBUG
 ASFLAGS          = -Sc -Sv:ALP
 LDFLAGS          = -Q  -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe /NOD /dbgpack"

trunk/include/pdwin32.vac36.rel

@@ -1 @@
-# $Id: pdwin32.vac36.rel,v 1.3 1999-09-07 18:57:54 sandervl Exp $
+# $Id: pdwin32.vac36.rel,v 1.4 1999-09-22 09:46:18 sandervl Exp $
 # ODIN / win32os2 Project
 #
@@ -23 +23 @@
 # Tool Flags
 #
-CFLAGS           = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -D__WIN32OS2__ -D__WINE__
-CXXFLAGS         = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -D__WIN32OS2__ -D__WINE__
-CXXFLAGS_ODINCRT = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -D__WIN32OS2__ -D__WINE__
+CFLAGS           = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__
+CXXFLAGS         = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__
+CXXFLAGS_ODINCRT = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__
 ASFLAGS          = -Sc -Sv:ALP
 LDFLAGS          = -Q -Si -G5 -O+ -Ge- -Ss+ -W3 -Gm+ /B"/noe /NOD"

trunk/include/pefile.h

@@ -1 @@
-/* $Id: pefile.h,v 1.2 1999-05-27 15:17:58 phaller Exp $ */
+/* $Id: pefile.h,v 1.3 1999-09-22 09:46:18 sandervl Exp $ */
 
 /*
@@ -13 +13 @@
 #include <win32type.h>
 #include <peexe.h>
-
-#ifndef max
-#define max(a,b)        ((a>b) ? a : b)
-#endif
+#include <stdlib.h> //min & max
 
 #define LOWORD(a)   (a & 0xFFFF)

trunk/include/win/gdi.h

@@ -1 @@
-/* $Id: gdi.h,v 1.1 1999-05-24 20:19:12 ktk Exp $ */
+/* $Id: gdi.h,v 1.2 1999-09-22 09:46:18 sandervl Exp $ */
 
 /*
@@ -13 +13 @@
 #include "wingdi.h"
 #include "ldt.h"
-#include "local.h"
 #include "path.h"
 #include <math.h>
+#include "local.h"
 
   /* GDI objects magic numbers */

trunk/include/win/shellapi.h

@@ -1 @@
-/* $Id: shellapi.h,v 1.5 1999-09-02 18:54:58 phaller Exp $ */
+/* $Id: shellapi.h,v 1.6 1999-09-22 09:46:19 sandervl Exp $ */
 
 #ifndef _WINE_SHELLAPI_H
@@ -210 +210 @@
 HINSTANCE       WINAPI ShellExecuteA(HWND,LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT);
 HINSTANCE       WINAPI ShellExecuteW(HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT);
+#define ShellExecute WINELIB_NAME_AW(ShellExecute)
+
 HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation,
                                    LPCSTR lpFile, LPCSTR lpParameters,

trunk/include/win/windef.h

@@ -1 @@
-/* $Id: windef.h,v 1.12 1999-09-18 15:55:45 sandervl Exp $ */
+/* $Id: windef.h,v 1.13 1999-09-22 09:46:19 sandervl Exp $ */
 
 /*
@@ -512 +512 @@
 #define __max(a,b) MAX(a,b)
 #define __min(a,b) MIN(a,b)
-#ifndef max
-#define max(a,b)   MAX(a,b)
-#endif
-
-#ifndef min
-#define min(a,b)   MIN(a,b)
-#endif
+#include <stdlib.h>
 
 #define _MAX_PATH  260

trunk/include/win/wingdi.h

@@ -1 @@
-/* $Id: wingdi.h,v 1.5 1999-09-08 12:12:28 sandervl Exp $ */
+/* $Id: wingdi.h,v 1.6 1999-09-22 09:46:19 sandervl Exp $ */
 
 #ifndef __WINE_WINGDI_H
@@ -2729 +2729 @@
 BOOL      WINAPI CreateScalableFontResourceA(DWORD,LPCSTR,LPCSTR,LPCSTR);
 BOOL      WINAPI CreateScalableFontResourceW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR);
-#define CreateScalableFontResource WINELIB_NAME(CreateScalableFontResource)
+#define CreateScalableFontResource WINELIB_NAME_AW(CreateScalableFontResource)
 
 HBRUSH    WINAPI CreateSolidBrush(COLORREF);
@@ -2742 +2742 @@
 INT       WINAPI EnumFontFamiliesA(HDC,LPCSTR,FONTENUMPROCA,LPARAM);
 INT       WINAPI EnumFontFamiliesW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM);
-#define EnumFontFamilies WINELIB_NAME(EnumFontFamilies)
+#define EnumFontFamilies WINELIB_NAME_AW(EnumFontFamilies)
 
 INT       WINAPI EnumFontFamiliesExA(HDC,LPLOGFONTA,FONTENUMPROCEXA,LPARAM,DWORD);
 INT       WINAPI EnumFontFamiliesExW(HDC,LPLOGFONTW,FONTENUMPROCEXW,LPARAM,DWORD);
-#define EnumFontFamiliesEx WINELIB_NAME(EnumFontFamiliesEx)
+#define EnumFontFamiliesEx WINELIB_NAME_AW(EnumFontFamiliesEx)
 
 INT       WINAPI EnumFontsA(HDC,LPCSTR,FONTENUMPROCA,LPARAM);
 INT       WINAPI EnumFontsW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM);
-#define EnumFonts WINELIB_NAME(EnumFonts)
+#define EnumFonts WINELIB_NAME_AW(EnumFonts)
 
 BOOL      WINAPI EnumMetaFile(HDC,HMETAFILE,MFENUMPROC,LPARAM);
@@ -2761 +2761 @@
 BOOL      WINAPI ExtTextOutA(HDC,INT,INT,UINT,const RECT*,LPCSTR,UINT,const INT*);
 BOOL      WINAPI ExtTextOutW(HDC,INT,INT,UINT,const RECT*,LPCWSTR,UINT,const INT*);
+#define ExtTextOut WINELIB_NAME_AW(ExtTextOut)
+
 BOOL      WINAPI FillPath(HDC);
 BOOL      WINAPI FillRgn(HDC,HRGN,HBRUSH);
@@ -2776 +2778 @@
 BOOL      WINAPI GetCharABCWidthsA(HDC,UINT,UINT,LPABC);
 BOOL      WINAPI GetCharABCWidthsW(HDC,UINT,UINT,LPABC);
+#define GetCharWidth WINELIB_NAME_AW(GetCharWidth)
+#define     GetCharWidthA GetCharWidth32A
+#define     GetCharWidthW GetCharWidth32W
+
 DWORD       WINAPI GetCharacterPlacementA(HDC,LPCSTR,INT,INT,GCP_RESULTSA*,DWORD);
 DWORD       WINAPI GetCharacterPlacementW(HDC,LPCWSTR,INT,INT,GCP_RESULTSW*,DWORD);
-#define GetCharacterPlacement WINELIB_NAME(GetCharacterPlacement)
-
-BOOL      WINAPI GetCharWidth32A(HDC,UINT,UINT,LPINT);
-BOOL      WINAPI GetCharWidth32W(HDC,UINT,UINT,LPINT);
-#define     GetCharWidthA GetCharWidth32A
-#define     GetCharWidthW GetCharWidth32W
+#define GetCharacterPlacement WINELIB_NAME_AW(GetCharacterPlacement)
+
+BOOL      WINAPI GetCharWidthA(HDC,UINT,UINT,LPINT);
+BOOL      WINAPI GetCharWidthW(HDC,UINT,UINT,LPINT);
+#define GetCharWidth WINELIB_NAME_AW(GetCharWidth)
+
 INT       WINAPI GetClipBox(HDC,LPRECT);
 INT       WINAPI GetClipRgn(HDC,HRGN);
@@ -2794 +2800 @@
 DWORD       WINAPI GetGlyphOutlineA(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*);
 DWORD       WINAPI GetGlyphOutlineW(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*);
-#define GetGlyphOutline WINELIB_NAME(GetGlyphOutline)
+#define GetGlyphOutline WINELIB_NAME_AW(GetGlyphOutline)
 
 DWORD       WINAPI GetKerningPairsA(HDC,DWORD,LPKERNINGPAIR);
 DWORD       WINAPI GetKerningPairsW(HDC,DWORD,LPKERNINGPAIR);
-#define GetKerningPairs WINELIB_NAME(GetKerningPairs)
+#define GetKerningPairs WINELIB_NAME_AW(GetKerningPairs)
 
 INT       WINAPI GetMapMode(HDC);
@@ -2807 +2813 @@
 INT       WINAPI GetObjectA(HANDLE,INT,LPVOID);
 INT       WINAPI GetObjectW(HANDLE,INT,LPVOID);
-#define GetObject WINELIB_NAME(GetObject)
+#define GetObject WINELIB_NAME_AW(GetObject)
 
 UINT      WINAPI GetOutlineTextMetricsA(HDC,UINT,LPOUTLINETEXTMETRICA);
 UINT      WINAPI GetOutlineTextMetricsW(HDC,UINT,LPOUTLINETEXTMETRICW);
-#define GetOutlineTextMetrics WINELIB_NAME(GetOutlineTextMetrics)
+#define GetOutlineTextMetrics WINELIB_NAME_AW(GetOutlineTextMetrics)
 
 UINT      WINAPI GetPaletteEntries(HPALETTE,UINT,UINT,LPPALETTEENTRY);
@@ -2833 +2839 @@
 BOOL        WINAPI GetTextExtentPointA(HDC,LPCSTR,INT,LPSIZE);
 BOOL        WINAPI GetTextExtentPointW(HDC,LPCWSTR,INT,LPSIZE);
-#define GetTextExtentPoint WINELIB_NAME(GetTextExtentPoint)
+#define GetTextExtentPoint WINELIB_NAME_AW(GetTextExtentPoint)
 
 BOOL        WINAPI GetTextExtentPoint32A(HDC,LPCSTR,INT,LPSIZE);
 BOOL        WINAPI GetTextExtentPoint32W(HDC,LPCWSTR,INT,LPSIZE);
-#define GetTextExtentPoint32 WINELIB_NAME(GetTextExtentPoint32)
+#define GetTextExtentPoint32 WINELIB_NAME_AW(GetTextExtentPoint32)
 
 INT       WINAPI GetTextFaceA(HDC,INT,LPSTR);
 INT       WINAPI GetTextFaceW(HDC,INT,LPWSTR);
-#define GetTextFace WINELIB_NAME(GetTextFace)
+#define GetTextFace WINELIB_NAME_AW(GetTextFace)
 
 BOOL      WINAPI GetTextMetricsA(HDC,LPTEXTMETRICA);
 BOOL      WINAPI GetTextMetricsW(HDC,LPTEXTMETRICW);
-#define GetTextMetrics WINELIB_NAME(GetTextMetrics)
+#define GetTextMetrics WINELIB_NAME_AW(GetTextMetrics)
 
 BOOL      WINAPI GetViewportExtEx(HDC,LPSIZE);
@@ -2939 +2945 @@
 BOOL      WINAPI TextOutA(HDC,INT,INT,LPCSTR,INT);
 BOOL      WINAPI TextOutW(HDC,INT,INT,LPCWSTR,INT);
-#define TextOut WINELIB_NAME(TextOut)
+#define TextOut WINELIB_NAME_AW(TextOut)
 
 BOOL      WINAPI UnrealizeObject(HGDIOBJ);