Changeset 3354 for trunk/include/win


Ignore:
Timestamp:
Apr 9, 2000, 1:09:12 PM (26 years ago)
Author:
sandervl
Message:

YD: header changes/fixes

Location:
trunk/include/win
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/commctrl.h

    r3350 r3354  
    1 /* $Id: commctrl.h,v 1.27 2000-04-08 18:30:10 cbratschi Exp $ */
     1/* $Id: commctrl.h,v 1.28 2000-04-09 11:09:08 sandervl Exp $ */
    22/*
    33 * Common controls definitions
    … …  
    28182818    (BOOL)SendMessageA((hwnd), LVM_GETITEMW, 0, (LPARAM)(LVITEMW*)(pitem))
    28192819
     2820#define ListView_GetItem WINELIB_NAME_AW(ListView_GetItem)
     2821
    28202822#define ListView_SetItemA(hwnd, pitem) \
    28212823    (BOOL)SendMessageA((hwnd), LVM_SETITEMA, 0, (LPARAM)(const LVITEMA*)(pitem))
    … …  
    28242826    (BOOL)SendMessageA((hwnd), LVM_SETITEMW, 0, (LPARAM)(const LVITEMW*)(pitem))
    28252827
     2828#define  ListView_SetItem WINELIB_NAME_AW(ListView_SetItem)
     2829
    28262830#define ListView_InsertItemA(hwnd, pitem)   \
    28272831    (int)SendMessageA((hwnd), LVM_INSERTITEMA, 0, (LPARAM)(const LVITEMA*)(pitem))
    … …  
    28292833#define ListView_InsertItemW(hwnd, pitem)   \
    28302834    (int)SendMessageA((hwnd), LVM_INSERTITEMW, 0, (LPARAM)(const LVITEMW*)(pitem))
     2835
     2836#define  ListView_InsertItem WINELIB_NAME_AW(ListView_InsertItem)
    28312837
    28322838#define ListView_DeleteItem(hwnd, i) \
    … …  
    29082914#define ListView_InsertColumnW(hwnd, iCol, pcol) \
    29092915    (int)SendMessageA((hwnd), LVM_INSERTCOLUMNW, (WPARAM)(int)(iCol), (LPARAM)(const LVCOLUMNW*)(pcol))
     2916
     2917#define  ListView_InsertColumn WINELIB_NAME_AW(ListView_InsertColumn)
    29102918
    29112919#define ListView_DeleteColumn(hwnd, iCol) \

  • trunk/include/win/mmsystem.h

    r3318 r3354  
    1 /* $Id: mmsystem.h,v 1.7 2000-04-05 14:17:00 sandervl Exp $ */
     1/* $Id: mmsystem.h,v 1.8 2000-04-09 11:09:09 sandervl Exp $ */
    22/*
    33 * MMSYSTEM - Multimedia Wine Extension ... :-)
    … …  
    1717#include "pshpack1.h"
    1818
    19 //#ifndef NONAMELESSSTRUCT
    20 //#define DUMMYSTRUCTNAME
    21 //#define DUMMYSTRUCTNAME1
    22 //#define DUMMYSTRUCTNAME2
    23 //#define DUMMYSTRUCTNAME3
    24 //#define DUMMYSTRUCTNAME4
    25 //#define DUMMYSTRUCTNAME5
    26 //#else /* !defined(NONAMELESSSTRUCT) */
    27 #define DUMMYSTRUCTNAME   s
    28 #define DUMMYSTRUCTNAME1  s1
    29 #define DUMMYSTRUCTNAME2  s2
    30 #define DUMMYSTRUCTNAME3  s3
    31 #define DUMMYSTRUCTNAME4  s4
    32 #define DUMMYSTRUCTNAME5  s5
    33 #undef DUMMYUNIONNAME
    34 #undef DUMMYUNIONNAME1
    35 #undef DUMMYUNIONNAME2
    36 #undef DUMMYUNIONNAME3
    37 #undef DUMMYUNIONNAME4
    38 #undef DUMMYUNIONNAME5
     19#if defined(__cplusplus) && !defined(NONAMELESSUNION)
     20#define DUMMYUNIONNAME
     21#define DUMMYUNIONNAME1
     22#define DUMMYUNIONNAME2
     23#define DUMMYUNIONNAME3
     24#define DUMMYUNIONNAME4
     25#define DUMMYUNIONNAME5
     26#else
    3927#define DUMMYUNIONNAME   u
    4028#define DUMMYUNIONNAME1  u1
    … …  
    4331#define DUMMYUNIONNAME4  u4
    4432#define DUMMYUNIONNAME5  u5
     33#endif
     34
     35#define DUMMYSTRUCTNAME   s
     36#define DUMMYSTRUCTNAME1  s1
    4537
    4638//#endif /* !defined(NONAMELESSSTRUCT) */
    … …  
    147139
    148140#define MM_MIM_MOREDATA     0x3CC
     141
     142#define MM_MIXM_LINE_CHANGE     0x3D0
     143#define MM_MIXM_CONTROL_CHANGE  0x3D1
    149144
    150145#define MMSYSERR_BASE          0

  • trunk/include/win/shlguid.h

    r3242 r3354  
    1 /* $Id: shlguid.h,v 1.4 2000-03-26 16:29:41 cbratschi Exp $ */
     1/* $Id: shlguid.h,v 1.5 2000-04-09 11:09:10 sandervl Exp $ */
    22
    33#ifndef __WINE_SHLGUID_H
    … …  
    2020DEFINE_SHLGUID(IID_IShellIcon,          0x000214E5L, 0, 0);
    2121DEFINE_SHLGUID(IID_IShellPropSheetExt,  0x000214E9L, 0, 0);
     22DEFINE_SHLGUID(IID_IShellLinkA,         0x000214EEL, 0, 0);
    2223DEFINE_SHLGUID(IID_IShellCopyHook,      0x000214EFL, 0, 0);
    2324DEFINE_SHLGUID(IID_IFileViewer,         0x000214F0L, 0, 0);

  • trunk/include/win/shlobj.h

    r2606 r3354  
    1 /* $Id: shlobj.h,v 1.5 2000-02-03 13:26:23 sandervl Exp $ */
     1/* $Id: shlobj.h,v 1.6 2000-04-09 11:09:11 sandervl Exp $ */
    22#ifndef __WINE_SHLOBJ_H
    33#define __WINE_SHLOBJ_H
    … …  
    2323#include "commctrl.h"
    2424#include "prsht.h"
     25#include "shlguid.h"
    2526
    2627#ifdef __cplusplus

  • trunk/include/win/windows.h

    r2651 r3354  
    1 /* $Id: windows.h,v 1.5 2000-02-05 02:42:19 sandervl Exp $ */
     1/* $Id: windows.h,v 1.6 2000-04-09 11:09:11 sandervl Exp $ */
    22
    33#ifndef __WINE_WINDOWS_H
    … …  
    1010#ifdef __WIN32OS2__
    1111#include <odin.h>
     12#if defined (__IBMC__) || (__IBMCPP__ < 400)
    1213#define CINTERFACE 1
     14#endif
    1315#endif
    1416

  • trunk/include/win/windowsx.h

    r2694 r3354  
    1 /* $Id: windowsx.h,v 1.8 2000-02-09 13:40:23 sandervl Exp $ */
     1/* $Id: windowsx.h,v 1.9 2000-04-09 11:09:11 sandervl Exp $ */
    22
    33/* Copyright (C) 1999 Corel Corporation (Paul Quinn) */
    … …  
    951951                ((int)(DWORD)SendMessage((hwndCtl), CB_SETCURSEL, (WPARAM)(int)(index), 0L))
    952952
     953#define ComboBox_SelectString(hwndCtl, indexStart, lpszSelect)  ((int)(DWORD)SendMessage((hwndCtl), CB_SELECTSTRING, (WPARAM)(int)(indexStart), (LPARAM)(LPCTSTR)(lpszSelect)))
     954
    953955#define ComboBox_GetLBTextLen(hwndCtl, index) \
    954956                ((int)(DWORD)SendMessage((hwndCtl), CB_GETLBTEXTLEN, (WPARAM)(int)(index), 0L))
    … …  
    994996        ((LRESULT)(DWORD)SendMessage((hwndCtl), LB_GETITEMDATA, (WPARAM)(int)(index), 0L))
    995997
     998#define ListBox_SetItemData(hwndCtl, index, data)   ((int)(DWORD)SendMessage((hwndCtl), LB_SETITEMDATA, (WPARAM)(int)(index), (LPARAM)(data)))
     999
    9961000#define ListBox_GetCurSel(hwndCtl)        \
    9971001        ((int)(DWORD)SendMessage((hwndCtl), LB_GETCURSEL, 0L, 0L))
    … …  
    10591063#define Edit_GetTextLength(hwndCtl)             GetWindowTextLength(hwndCtl)
    10601064#define Edit_SetText(hwndCtl, lpsz)             SetWindowText((hwndCtl), (lpsz))
     1065#define Edit_LimitText(hwndCtl, cchMax)         ((void)SendMessage((hwndCtl), EM_LIMITTEXT, (WPARAM)(cchMax), 0L))
    10611066
    10621067#define Edit_Enable(hwndCtl, fEnable)           EnableWindow((hwndCtl), (fEnable))

  • trunk/include/win/wingdi.h

    r2940 r3354  
    1 /* $Id: wingdi.h,v 1.12 2000-02-29 00:55:09 sandervl Exp $ */
     1/* $Id: wingdi.h,v 1.13 2000-04-09 11:09:11 sandervl Exp $ */
    22
    33#ifndef __WINE_WINGDI_H
    … …  
    530530
    531531DECL_WINELIB_TYPE_AW(ENUMLOGFONT)
     532DECL_WINELIB_TYPE_AW(ENUMLOGFONTEX)
    532533DECL_WINELIB_TYPE_AW(LPENUMLOGFONT)
    533534DECL_WINELIB_TYPE_AW(LPENUMLOGFONTEX)
    … …  
    28272828INT       WINAPI AddFontResourceA(LPCSTR);
    28282829INT       WINAPI AddFontResourceW(LPCWSTR);
     2830#define  AddFontResource WINELIB_NAME_AW(AddFontResource)
    28292831BOOL      WINAPI AnimatePalette(HPALETTE,UINT,UINT,const PALETTEENTRY*);
    28302832BOOL      WINAPI Arc(HDC,INT,INT,INT,INT,INT,INT,INT,INT);
    … …  
    30413043BOOL      WINAPI RemoveFontResourceA(LPCSTR);
    30423044BOOL      WINAPI RemoveFontResourceW(LPCWSTR);
     3045#define RemoveFontResource WINELIB_NAME_AW(RemoveFontResource)
    30433046HDC       WINAPI ResetDCA(HDC,const DEVMODEA *);
    30443047HDC       WINAPI ResetDCW(HDC,const DEVMODEW *);
     3048#define ResetDC WINELIB_NAME_AW(ResetDC)
    30453049BOOL      WINAPI ResizePalette(HPALETTE,UINT);
    30463050BOOL      WINAPI RestoreDC(HDC,INT);

  • trunk/include/win/winuser.h

    r3085 r3354  
    1 /* $Id: winuser.h,v 1.39 2000-03-11 15:09:33 sandervl Exp $ */
     1/* $Id: winuser.h,v 1.40 2000-04-09 11:09:12 sandervl Exp $ */
    22
    33#ifndef __INCLUDE_WINUSER_H
    … …  
    20382038#define IDI_WINLOGOW     MAKEINTRESOURCEW(32517)
    20392039#define IDI_WINLOGO      WINELIB_NAME_AW(IDI_WINLOGO)
     2040#define IDI_WARNING      IDI_EXCLAMATION
     2041#define IDI_ERROR        IDI_HAND
     2042#define IDI_INFORMATION  IDI_ASTERISK
    20402043
    20412044#define IDC_BUMMERA      MAKEINTRESOURCEA(100)
Note: See TracChangeset for help on using the changeset viewer.