Changeset 1007 for trunk/include/win


Ignore:
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/win
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/gdi.h

    r4 r1007  
    1 /* $Id: gdi.h,v 1.1 1999-05-24 20:19:12 ktk Exp $ */
     1/* $Id: gdi.h,v 1.2 1999-09-22 09:46:18 sandervl Exp $ */
    22
    33/*
    … …  
    1313#include "wingdi.h"
    1414#include "ldt.h"
    15 #include "local.h"
    1615#include "path.h"
    1716#include <math.h>
     17#include "local.h"
    1818
    1919  /* GDI objects magic numbers */

  • trunk/include/win/shellapi.h

    r799 r1007  
    1 /* $Id: shellapi.h,v 1.5 1999-09-02 18:54:58 phaller Exp $ */
     1/* $Id: shellapi.h,v 1.6 1999-09-22 09:46:19 sandervl Exp $ */
    22
    33#ifndef _WINE_SHELLAPI_H
    … …  
    210210HINSTANCE       WINAPI ShellExecuteA(HWND,LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT);
    211211HINSTANCE       WINAPI ShellExecuteW(HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT);
     212#define ShellExecute WINELIB_NAME_AW(ShellExecute)
     213
    212214HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation,
    213215                                   LPCSTR lpFile, LPCSTR lpParameters,

  • trunk/include/win/windef.h

    r970 r1007  
    1 /* $Id: windef.h,v 1.12 1999-09-18 15:55:45 sandervl Exp $ */
     1/* $Id: windef.h,v 1.13 1999-09-22 09:46:19 sandervl Exp $ */
    22
    33/*
    … …  
    512512#define __max(a,b) MAX(a,b)
    513513#define __min(a,b) MIN(a,b)
    514 #ifndef max
    515 #define max(a,b)   MAX(a,b)
    516 #endif
    517 
    518 #ifndef min
    519 #define min(a,b)   MIN(a,b)
    520 #endif
     514#include <stdlib.h>
    521515
    522516#define _MAX_PATH  260

  • trunk/include/win/wingdi.h

    r874 r1007  
    1 /* $Id: wingdi.h,v 1.5 1999-09-08 12:12:28 sandervl Exp $ */
     1/* $Id: wingdi.h,v 1.6 1999-09-22 09:46:19 sandervl Exp $ */
    22
    33#ifndef __WINE_WINGDI_H
    … …  
    27292729BOOL      WINAPI CreateScalableFontResourceA(DWORD,LPCSTR,LPCSTR,LPCSTR);
    27302730BOOL      WINAPI CreateScalableFontResourceW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR);
    2731 #define CreateScalableFontResource WINELIB_NAME(CreateScalableFontResource)
     2731#define CreateScalableFontResource WINELIB_NAME_AW(CreateScalableFontResource)
    27322732
    27332733HBRUSH    WINAPI CreateSolidBrush(COLORREF);
    … …  
    27422742INT       WINAPI EnumFontFamiliesA(HDC,LPCSTR,FONTENUMPROCA,LPARAM);
    27432743INT       WINAPI EnumFontFamiliesW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM);
    2744 #define EnumFontFamilies WINELIB_NAME(EnumFontFamilies)
     2744#define EnumFontFamilies WINELIB_NAME_AW(EnumFontFamilies)
    27452745
    27462746INT       WINAPI EnumFontFamiliesExA(HDC,LPLOGFONTA,FONTENUMPROCEXA,LPARAM,DWORD);
    27472747INT       WINAPI EnumFontFamiliesExW(HDC,LPLOGFONTW,FONTENUMPROCEXW,LPARAM,DWORD);
    2748 #define EnumFontFamiliesEx WINELIB_NAME(EnumFontFamiliesEx)
     2748#define EnumFontFamiliesEx WINELIB_NAME_AW(EnumFontFamiliesEx)
    27492749
    27502750INT       WINAPI EnumFontsA(HDC,LPCSTR,FONTENUMPROCA,LPARAM);
    27512751INT       WINAPI EnumFontsW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM);
    2752 #define EnumFonts WINELIB_NAME(EnumFonts)
     2752#define EnumFonts WINELIB_NAME_AW(EnumFonts)
    27532753
    27542754BOOL      WINAPI EnumMetaFile(HDC,HMETAFILE,MFENUMPROC,LPARAM);
    … …  
    27612761BOOL      WINAPI ExtTextOutA(HDC,INT,INT,UINT,const RECT*,LPCSTR,UINT,const INT*);
    27622762BOOL      WINAPI ExtTextOutW(HDC,INT,INT,UINT,const RECT*,LPCWSTR,UINT,const INT*);
     2763#define ExtTextOut WINELIB_NAME_AW(ExtTextOut)
     2764
    27632765BOOL      WINAPI FillPath(HDC);
    27642766BOOL      WINAPI FillRgn(HDC,HRGN,HBRUSH);
    … …  
    27762778BOOL      WINAPI GetCharABCWidthsA(HDC,UINT,UINT,LPABC);
    27772779BOOL      WINAPI GetCharABCWidthsW(HDC,UINT,UINT,LPABC);
     2780#define GetCharWidth WINELIB_NAME_AW(GetCharWidth)
     2781#define     GetCharWidthA GetCharWidth32A
     2782#define     GetCharWidthW GetCharWidth32W
     2783
    27782784DWORD       WINAPI GetCharacterPlacementA(HDC,LPCSTR,INT,INT,GCP_RESULTSA*,DWORD);
    27792785DWORD       WINAPI GetCharacterPlacementW(HDC,LPCWSTR,INT,INT,GCP_RESULTSW*,DWORD);
    2780 #define GetCharacterPlacement WINELIB_NAME(GetCharacterPlacement)
    2781 
    2782 BOOL      WINAPI GetCharWidth32A(HDC,UINT,UINT,LPINT);
    2783 BOOL      WINAPI GetCharWidth32W(HDC,UINT,UINT,LPINT);
    2784 #define     GetCharWidthA GetCharWidth32A
    2785 #define     GetCharWidthW GetCharWidth32W
     2786#define GetCharacterPlacement WINELIB_NAME_AW(GetCharacterPlacement)
     2787
     2788BOOL      WINAPI GetCharWidthA(HDC,UINT,UINT,LPINT);
     2789BOOL      WINAPI GetCharWidthW(HDC,UINT,UINT,LPINT);
     2790#define GetCharWidth WINELIB_NAME_AW(GetCharWidth)
     2791
    27862792INT       WINAPI GetClipBox(HDC,LPRECT);
    27872793INT       WINAPI GetClipRgn(HDC,HRGN);
    … …  
    27942800DWORD       WINAPI GetGlyphOutlineA(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*);
    27952801DWORD       WINAPI GetGlyphOutlineW(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*);
    2796 #define GetGlyphOutline WINELIB_NAME(GetGlyphOutline)
     2802#define GetGlyphOutline WINELIB_NAME_AW(GetGlyphOutline)
    27972803
    27982804DWORD       WINAPI GetKerningPairsA(HDC,DWORD,LPKERNINGPAIR);
    27992805DWORD       WINAPI GetKerningPairsW(HDC,DWORD,LPKERNINGPAIR);
    2800 #define GetKerningPairs WINELIB_NAME(GetKerningPairs)
     2806#define GetKerningPairs WINELIB_NAME_AW(GetKerningPairs)
    28012807
    28022808INT       WINAPI GetMapMode(HDC);
    … …  
    28072813INT       WINAPI GetObjectA(HANDLE,INT,LPVOID);
    28082814INT       WINAPI GetObjectW(HANDLE,INT,LPVOID);
    2809 #define GetObject WINELIB_NAME(GetObject)
     2815#define GetObject WINELIB_NAME_AW(GetObject)
    28102816
    28112817UINT      WINAPI GetOutlineTextMetricsA(HDC,UINT,LPOUTLINETEXTMETRICA);
    28122818UINT      WINAPI GetOutlineTextMetricsW(HDC,UINT,LPOUTLINETEXTMETRICW);
    2813 #define GetOutlineTextMetrics WINELIB_NAME(GetOutlineTextMetrics)
     2819#define GetOutlineTextMetrics WINELIB_NAME_AW(GetOutlineTextMetrics)
    28142820
    28152821UINT      WINAPI GetPaletteEntries(HPALETTE,UINT,UINT,LPPALETTEENTRY);
    … …  
    28332839BOOL        WINAPI GetTextExtentPointA(HDC,LPCSTR,INT,LPSIZE);
    28342840BOOL        WINAPI GetTextExtentPointW(HDC,LPCWSTR,INT,LPSIZE);
    2835 #define GetTextExtentPoint WINELIB_NAME(GetTextExtentPoint)
     2841#define GetTextExtentPoint WINELIB_NAME_AW(GetTextExtentPoint)
    28362842
    28372843BOOL        WINAPI GetTextExtentPoint32A(HDC,LPCSTR,INT,LPSIZE);
    28382844BOOL        WINAPI GetTextExtentPoint32W(HDC,LPCWSTR,INT,LPSIZE);
    2839 #define GetTextExtentPoint32 WINELIB_NAME(GetTextExtentPoint32)
     2845#define GetTextExtentPoint32 WINELIB_NAME_AW(GetTextExtentPoint32)
    28402846
    28412847INT       WINAPI GetTextFaceA(HDC,INT,LPSTR);
    28422848INT       WINAPI GetTextFaceW(HDC,INT,LPWSTR);
    2843 #define GetTextFace WINELIB_NAME(GetTextFace)
     2849#define GetTextFace WINELIB_NAME_AW(GetTextFace)
    28442850
    28452851BOOL      WINAPI GetTextMetricsA(HDC,LPTEXTMETRICA);
    28462852BOOL      WINAPI GetTextMetricsW(HDC,LPTEXTMETRICW);
    2847 #define GetTextMetrics WINELIB_NAME(GetTextMetrics)
     2853#define GetTextMetrics WINELIB_NAME_AW(GetTextMetrics)
    28482854
    28492855BOOL      WINAPI GetViewportExtEx(HDC,LPSIZE);
    … …  
    29392945BOOL      WINAPI TextOutA(HDC,INT,INT,LPCSTR,INT);
    29402946BOOL      WINAPI TextOutW(HDC,INT,INT,LPCWSTR,INT);
    2941 #define TextOut WINELIB_NAME(TextOut)
     2947#define TextOut WINELIB_NAME_AW(TextOut)
    29422948
    29432949BOOL      WINAPI UnrealizeObject(HGDIOBJ);
Note: See TracChangeset for help on using the changeset viewer.