Changeset 874 for trunk/include/win

Timestamp:

Sep 8, 1999, 2:12:28 PM (26 years ago)

Author:

sandervl

Message:

header fixes

Location:

trunk/include/win

Files:

• windowsx.h (modified) (2 diffs)
• wingdi.h (modified) (9 diffs)
• winuser.h (modified) (3 diffs)

trunk/include/win/windowsx.h

@@ -1 @@
-/* $Id: windowsx.h,v 1.4 1999-09-08 07:46:53 sandervl Exp $ */
+/* $Id: windowsx.h,v 1.5 1999-09-08 12:12:28 sandervl Exp $ */
 
 /* Copyright (C) 1999 Corel Corporation (Paul Quinn) */
@@ -1096 +1096 @@
 /****** C runtime porting macros ****************************************/
 
-#if (__IBMC__ > 300) || (__IBMCPP__ > 300)
+#if (__IBMC__ >= 300) || (__IBMCPP__ >= 300)
    // defines already in compiler includes
 #else

trunk/include/win/wingdi.h

@@ -1 @@
-/* $Id: wingdi.h,v 1.4 1999-09-02 17:39:36 phaller Exp $ */
+/* $Id: wingdi.h,v 1.5 1999-09-08 12:12:28 sandervl Exp $ */
 
 #ifndef __WINE_WINGDI_H
@@ -2704 +2704 @@
 HFONT     WINAPI CreateFontA(INT,INT,INT,INT,INT,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCSTR);
 HFONT     WINAPI CreateFontW(INT,INT,INT,INT,INT,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCWSTR);
+#define  CreateFont WINELIB_NAME_AW(CreateFont)
 HFONT     WINAPI CreateFontIndirectA(const LOGFONTA*);
 HFONT     WINAPI CreateFontIndirectW(const LOGFONTW*);
+#define  CreateFontIndirect WINELIB_NAME_AW(CreateFontIndirect)
+
 HBRUSH    WINAPI CreateHatchBrush(INT,COLORREF);
 HDC       WINAPI CreateICA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*);
 HDC       WINAPI CreateICW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
 #define     CreateIC WINELIB_NAME_AW(CreateIC)
+
 HDC       WINAPI CreateMetaFileA(LPCSTR);
 HDC       WINAPI CreateMetaFileW(LPCWSTR);
+#define     CreateMetaFile WINELIB_NAME_AW(CreateMetaFile)
+
 HPALETTE  WINAPI CreatePalette(const LOGPALETTE*);
 HBRUSH    WINAPI CreatePatternBrush(HBITMAP);
@@ -2723 +2729 @@
 BOOL      WINAPI CreateScalableFontResourceA(DWORD,LPCSTR,LPCSTR,LPCSTR);
 BOOL      WINAPI CreateScalableFontResourceW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR);
+#define CreateScalableFontResource WINELIB_NAME(CreateScalableFontResource)
+
 HBRUSH    WINAPI CreateSolidBrush(COLORREF);
 BOOL      WINAPI DeleteDC(HDC);
@@ -2734 +2742 @@
 INT       WINAPI EnumFontFamiliesA(HDC,LPCSTR,FONTENUMPROCA,LPARAM);
 INT       WINAPI EnumFontFamiliesW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM);
+#define EnumFontFamilies WINELIB_NAME(EnumFontFamilies)
+
 INT       WINAPI EnumFontFamiliesExA(HDC,LPLOGFONTA,FONTENUMPROCEXA,LPARAM,DWORD);
 INT       WINAPI EnumFontFamiliesExW(HDC,LPLOGFONTW,FONTENUMPROCEXW,LPARAM,DWORD);
+#define EnumFontFamiliesEx WINELIB_NAME(EnumFontFamiliesEx)
+
 INT       WINAPI EnumFontsA(HDC,LPCSTR,FONTENUMPROCA,LPARAM);
 INT       WINAPI EnumFontsW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM);
+#define EnumFonts WINELIB_NAME(EnumFonts)
+
 BOOL      WINAPI EnumMetaFile(HDC,HMETAFILE,MFENUMPROC,LPARAM);
 INT       WINAPI EnumObjects(HDC,INT,GOBJENUMPROC,LPARAM);
@@ -2764 +2778 @@
 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);
@@ -2778 +2794 @@
 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)
+
 DWORD       WINAPI GetKerningPairsA(HDC,DWORD,LPKERNINGPAIR);
 DWORD       WINAPI GetKerningPairsW(HDC,DWORD,LPKERNINGPAIR);
+#define GetKerningPairs WINELIB_NAME(GetKerningPairs)
+
 INT       WINAPI GetMapMode(HDC);
 HMETAFILE WINAPI GetMetaFileA(LPCSTR);
@@ -2787 +2807 @@
 INT       WINAPI GetObjectA(HANDLE,INT,LPVOID);
 INT       WINAPI GetObjectW(HANDLE,INT,LPVOID);
+#define GetObject WINELIB_NAME(GetObject)
+
 UINT      WINAPI GetOutlineTextMetricsA(HDC,UINT,LPOUTLINETEXTMETRICA);
 UINT      WINAPI GetOutlineTextMetricsW(HDC,UINT,LPOUTLINETEXTMETRICW);
+#define GetOutlineTextMetrics WINELIB_NAME(GetOutlineTextMetrics)
+
 UINT      WINAPI GetPaletteEntries(HPALETTE,UINT,UINT,LPPALETTEENTRY);
 INT       WINAPI GetPath(HDC,LPPOINT,LPBYTE,INT);
@@ -2809 +2833 @@
 BOOL        WINAPI GetTextExtentPointA(HDC,LPCSTR,INT,LPSIZE);
 BOOL        WINAPI GetTextExtentPointW(HDC,LPCWSTR,INT,LPSIZE);
+#define GetTextExtentPoint WINELIB_NAME(GetTextExtentPoint)
+
 BOOL        WINAPI GetTextExtentPoint32A(HDC,LPCSTR,INT,LPSIZE);
 BOOL        WINAPI GetTextExtentPoint32W(HDC,LPCWSTR,INT,LPSIZE);
+#define GetTextExtentPoint32 WINELIB_NAME(GetTextExtentPoint32)
+
 INT       WINAPI GetTextFaceA(HDC,INT,LPSTR);
 INT       WINAPI GetTextFaceW(HDC,INT,LPWSTR);
+#define GetTextFace WINELIB_NAME(GetTextFace)
+
 BOOL      WINAPI GetTextMetricsA(HDC,LPTEXTMETRICA);
 BOOL      WINAPI GetTextMetricsW(HDC,LPTEXTMETRICW);
+#define GetTextMetrics WINELIB_NAME(GetTextMetrics)
+
 BOOL      WINAPI GetViewportExtEx(HDC,LPSIZE);
 BOOL      WINAPI GetViewportOrgEx(HDC,LPPOINT);
@@ -2907 +2939 @@
 BOOL      WINAPI TextOutA(HDC,INT,INT,LPCSTR,INT);
 BOOL      WINAPI TextOutW(HDC,INT,INT,LPCWSTR,INT);
+#define TextOut WINELIB_NAME(TextOut)
+
 BOOL      WINAPI UnrealizeObject(HGDIOBJ);
 BOOL      WINAPI UpdateColors(HDC);

trunk/include/win/winuser.h

@@ -1 @@
-/* $Id: winuser.h,v 1.7 1999-09-02 19:07:17 phaller Exp $ */
+/* $Id: winuser.h,v 1.8 1999-09-08 12:12:28 sandervl Exp $ */
 
 #ifndef __INCLUDE_WINUSER_H
@@ -1226 +1226 @@
     DWORD     time;
     POINT   pt;
-} MSG, *LPMSG;
+} MSG, *PMSG, *NPMSG, *LPMSG;
 
 
@@ -1510 +1510 @@
     INT     nTrackPos;
 } SCROLLINFO, *LPSCROLLINFO;
+typedef SCROLLINFO CONST *LPCSCROLLINFO;
 
 /* GetScrollInfo() flags */