Changeset 4133 for trunk/include


Ignore:
Timestamp:
Aug 31, 2000, 2:46:05 PM (25 years ago)
Author:
sandervl
Message:

header updates

Location:
trunk/include/win
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/commctrl.h

    r3955 r4133  
    1 /* $Id: commctrl.h,v 1.34 2000-08-06 09:30:47 sandervl Exp $ */
     1/* $Id: commctrl.h,v 1.35 2000-08-31 12:46:02 sandervl Exp $ */
    22/*
    33 * Common controls definitions
    … …  
    22642264 (BOOL)SendMessageW((hwnd), TVM_GETITEMA, 0, (LPARAM) (TVITEMA *)(pitem))
    22652265
     2266#define TreeView_GetItem   WINELIB_NAME_AW(TreeView_GetItem)
     2267
    22662268#define TreeView_SetItemA(hwnd, pitem) \
    22672269 (BOOL)SendMessageA((hwnd), TVM_SETITEMA, 0, (LPARAM)(const TVITEMA *)(pitem))
    22682270#define TreeView_SetItemW(hwnd, pitem) \
    22692271 (BOOL)SendMessageW((hwnd), TVM_SETITEMA, 0, (LPARAM)(const TVITEMA *)(pitem))
     2272
     2273#define TreeView_SetItem   WINELIB_NAME_AW(TreeView_SetItem)
    22702274
    22712275#define TreeView_EditLabel(hwnd, hitem) \

  • trunk/include/win/d3d.h

    r280 r4133  
    1 /* $Id: d3d.h,v 1.3 1999-07-07 07:57:36 phaller Exp $ */
     1/* $Id: d3d.h,v 1.4 2000-08-31 12:46:04 sandervl Exp $ */
    22
    33#ifndef __WINE_D3D_H
    … …  
    335335#define D3DLIGHTINGMODEL_MONO   0x00000002
    336336
    337 #define D3DLIGHTCAPS_POINT    0x00000001
    338 #define D3DLIGHTCAPS_SPOT   0x00000002
    339 #define D3DLIGHTCAPS_DIRECTIONAL  0x00000004
     337#define D3DLIGHTCAPS_POINT          0x00000001
     338#define D3DLIGHTCAPS_SPOT           0x00000002
     339#define D3DLIGHTCAPS_DIRECTIONAL    0x00000004
    340340#define D3DLIGHTCAPS_PARALLELPOINT  0x00000008
     341#define D3DLIGHTCAPS_GLSPOT         0x00000010
    341342
    342343
    … …  
    526527} D3DDEVICEDESC,*LPD3DDEVICEDESC;
    527528
    528 typedef HRESULT (CALLBACK * LPD3DENUMDEVICESCALLBACK)(LPGUID lpGuid,LPSTR lpDeviceDescription,LPSTR lpDeviceName,LPD3DDEVICEDESC,LPD3DDEVICEDESC,LPVOID);
    529 typedef HRESULT (CALLBACK* LPD3DVALIDATECALLBACK)(LPVOID lpUserArg, DWORD dwOffset);
     529typedef HRESULT (* CALLBACK LPD3DENUMDEVICESCALLBACK)(LPGUID lpGuid,LPSTR lpDeviceDescription,LPSTR lpDeviceName,LPD3DDEVICEDESC,LPD3DDEVICEDESC,LPVOID);
     530typedef HRESULT (* CALLBACK LPD3DVALIDATECALLBACK)(LPVOID lpUserArg, DWORD dwOffset);
    530531
    531532
    … …  
    769770
    770771/* Textures */
    771 typedef HRESULT (CALLBACK* LPD3DENUMTEXTUREFORMATSCALLBACK)(LPDDSURFACEDESC lpDdsd, LPVOID lpContext);
     772typedef HRESULT (* CALLBACK LPD3DENUMTEXTUREFORMATSCALLBACK)(LPDDSURFACEDESC lpDdsd, LPVOID lpContext);
    772773
    773774

  • trunk/include/win/ddraw.h

    r586 r4133  
    1 /* $Id: ddraw.h,v 1.4 1999-08-19 18:05:57 phaller Exp $ */
     1/* $Id: ddraw.h,v 1.5 2000-08-31 12:46:04 sandervl Exp $ */
    22
    33#ifndef __WINE_DDRAW_H
    … …  
    66  #include "winnt.h" /* LARGE_INTEGER ... */
    77  #include "wingdi.h" /* PALETTE stuff ... */
     8#ifndef __WINE_OBJBASE_H
    89  #include "wine/dd_obj_base.h"
     10#endif
    911
    1012  #ifndef DIRECTDRAW_VERSION
    … …  
    217219/* DDSCAPS.dwCaps */
    218220/* reserved1, was 3d capable */
     221#define DDSCAPS_3D                      0x00000001
    219222#define DDSCAPS_RESERVED1               0x00000001
    220223/* surface contains alpha information */
    … …  
    890893} DDCOLORCONTROL,*LPDDCOLORCONTROL;
    891894
    892 typedef DWORD  (CALLBACK *LPCLIPPERCALLBACK)(LPDIRECTDRAWCLIPPER , HWND , DWORD , LPVOID );
     895typedef DWORD  (* CALLBACK LPCLIPPERCALLBACK)(LPDIRECTDRAWCLIPPER , HWND , DWORD , LPVOID );
    893896#ifdef STREAMING
    894   typedef DWORD  (CALLBACK *LPSURFACESTREAMINGCALLBACK)(DWORD);
     897  typedef DWORD  (* CALLBACK LPSURFACESTREAMINGCALLBACK)(DWORD);
    895898#endif
    896899
    897900
    898 typedef BOOL (CALLBACK * LPDDENUMCALLBACKA)(GUID *, LPSTR, LPSTR, LPVOID);
    899 typedef BOOL (CALLBACK * LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID);
     901typedef BOOL (* CALLBACK LPDDENUMCALLBACKA)(GUID *, LPSTR, LPSTR, LPVOID);
     902typedef BOOL (* CALLBACK LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID);
    900903DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK)
    901904
    902 typedef HRESULT (CALLBACK * LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID);
    903 typedef HRESULT (CALLBACK * LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID);
    904 typedef HRESULT (CALLBACK * LPDDENUMMODESCALLBACK2)(LPDDSURFACEDESC2, LPVOID);
    905 typedef HRESULT (CALLBACK * LPDDENUMSURFACESCALLBACK2)(LPDIRECTDRAWSURFACE4, LPDDSURFACEDESC2, LPVOID);
    906 
    907 typedef BOOL (CALLBACK * LPDDENUMCALLBACKEXA)(GUID *, LPSTR, LPSTR, LPVOID, HMONITOR);
    908 typedef BOOL (CALLBACK * LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR);
     905typedef HRESULT (* CALLBACK LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID);
     906typedef HRESULT (* CALLBACK LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID);
     907typedef HRESULT (* CALLBACK LPDDENUMMODESCALLBACK2)(LPDDSURFACEDESC2, LPVOID);
     908typedef HRESULT (* CALLBACK LPDDENUMSURFACESCALLBACK2)(LPDIRECTDRAWSURFACE4, LPDDSURFACEDESC2, LPVOID);
     909
     910typedef BOOL (* CALLBACK LPDDENUMCALLBACKEXA)(GUID *, LPSTR, LPSTR, LPVOID, HMONITOR);
     911typedef BOOL (* CALLBACK LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR);
    909912
    910913DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX)
    … …  
    912915HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags);
    913916HRESULT WINAPI DirectDrawEnumerateExW( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags);
     917#define DirectDrawEnumerateEx WINELIB_NAME_AW(DirectDrawEnumerateEx)
     918
    914919#ifndef SM_CMONITORS
    915920  #define HMONITOR    HANDLE

  • trunk/include/win/dplay.h

    r945 r4133  
    127127#define DPID_UNKNOWN            0xFFFFFFFF  /* Player ID is unknown */
    128128
     129#define DPOPEN_OPENSESSION          0x00000001
     130#define DPOPEN_CREATESESSION        0x00000002
     131
     132#define DPSEND_GUARANTEE            0x00000001
     133#define DPSEND_HIGHPRIORITY         0x00000002
     134#define DPSEND_TRYONCE              0x00000004
     135
     136#define DPRECEIVE_ALL               0x00000001
     137#define DPRECEIVE_TOPLAYER          0x00000002
     138#define DPRECEIVE_FROMPLAYER        0x00000004
     139#define DPRECEIVE_PEEK              0x00000008
     140
     141#define DPCAPS_NAMESERVICE          0x00000001
     142#define DPCAPS_NAMESERVER           0x00000002
     143#define DPCAPS_GUARANTEED           0x00000004
     144
     145#define DPENUMSESSIONS_AVAILABLE    0x00000001
     146#define DPENUMSESSIONS_ALL          0x00000002
     147#define DPENUMSESSIONS_PREVIOUS     0x00000004
     148
     149#define DPENUMPLAYERS_ALL           0x00000000
     150#define DPENUMPLAYERS_PREVIOUS      0x00000004
     151#define DPENUMPLAYERS_LOCAL         0x00000008
     152#define DPENUMPLAYERS_REMOTE        0x00000010
     153#define DPENUMPLAYERS_GROUP         0x00000020
     154#define DPENUMPLAYERS_SESSION       0x00000080
     155
     156#define DPESC_TIMEDOUT              0x00000001
     157
    129158/*  DPCAPS -  Used to obtain the capabilities of a DirectPlay object */
    130159typedef struct tagDPCAPS
    … …  
    311340
    312341
    313 typedef BOOL (CALLBACK* LPDPENUMDPCALLBACKW)(
     342typedef BOOL (* CALLBACK LPDPENUMDPCALLBACKW)(
    314343    LPGUID      lpguidSP,
    315344    LPWSTR      lpSPName,
    … …  
    318347    LPVOID      lpContext);
    319348
    320 typedef BOOL (CALLBACK* LPDPENUMDPCALLBACKA)(
     349typedef BOOL (* CALLBACK LPDPENUMDPCALLBACKA)(
    321350    LPGUID      lpguidSP,
    322351    LPSTR       lpSPName,       /* ptr to str w/ driver description */
    … …  
    328357typedef const DPNAME *LPCDPNAME;
    329358
    330 typedef BOOL (CALLBACK* LPDPENUMCONNECTIONSCALLBACK)(
     359typedef BOOL (* CALLBACK LPDPENUMCONNECTIONSCALLBACK)(
    331360    LPCGUID     lpguidSP,
    332361    LPVOID      lpConnection,
    … …  
    336365    LPVOID      lpContext);
    337366
    338 typedef BOOL (CALLBACK* LPDPENUMSESSIONSCALLBACK)(
     367typedef BOOL (* CALLBACK LPDPENUMSESSIONSCALLBACK)(
    339368    LPDPSESSIONDESC lpDPSessionDesc,
    340369    LPVOID      lpContext,
    … …  
    345374extern HRESULT WINAPI DirectPlayEnumerateA( LPDPENUMDPCALLBACKA, LPVOID );
    346375extern HRESULT WINAPI DirectPlayEnumerateW( LPDPENUMDPCALLBACKW, LPVOID );
     376#define DirectPlayEnumerate WINELIB_NAME_AW(DirectPlayEnumerate)
     377
    347378extern HRESULT WINAPI DirectPlayCreate( LPGUID lpGUID, LPDIRECTPLAY2 *lplpDP, IUnknown *pUnk);
    348379
    349 typedef BOOL (CALLBACK* LPDPENUMPLAYERSCALLBACK)(
     380typedef BOOL (* CALLBACK LPDPENUMPLAYERSCALLBACK)(
    350381    DPID   dpId,
    351382    LPSTR  lpFriendlyName,
    … …  
    354385    LPVOID          lpContext );
    355386
    356 typedef BOOL (CALLBACK* LPDPENUMPLAYERSCALLBACK2)(
     387typedef BOOL (* CALLBACK LPDPENUMPLAYERSCALLBACK2)(
    357388    DPID            dpId,
    358389    DWORD           dwPlayerType,
    … …  
    361392    LPVOID          lpContext );
    362393
    363 typedef BOOL (CALLBACK* LPDPENUMSESSIONSCALLBACK2)(
     394typedef BOOL (* CALLBACK LPDPENUMSESSIONSCALLBACK2)(
    364395    LPCDPSESSIONDESC2   lpThisSD,
    365396    LPDWORD             lpdwTimeOut,

  • trunk/include/win/dsound.h

    r2633 r4133  
    1 /* $Id: dsound.h,v 1.3 2000-02-03 23:55:07 sandervl Exp $ */
     1/* $Id: dsound.h,v 1.4 2000-08-31 12:46:05 sandervl Exp $ */
    22
    33#ifndef __WINE_DSOUND_H
    … …  
    181181typedef LPVOID* LPLPVOID;
    182182
    183 typedef BOOL (CALLBACK *LPDSENUMCALLBACKW)(LPGUID,LPWSTR,LPWSTR,LPVOID);
    184 typedef BOOL (CALLBACK *LPDSENUMCALLBACKA)(LPGUID,LPSTR,LPSTR,LPVOID);
     183typedef BOOL (* CALLBACK LPDSENUMCALLBACKW)(LPGUID,LPWSTR,LPWSTR,LPVOID);
     184typedef BOOL (* CALLBACK LPDSENUMCALLBACKA)(LPGUID,LPSTR,LPSTR,LPVOID);
     185
     186extern HRESULT WINAPI DirectSoundEnumerateW(LPDSENUMCALLBACKW lpCallback, LPVOID lpContext );
     187extern HRESULT WINAPI DirectSoundEnumerateA(LPDSENUMCALLBACKA lpCallback, LPVOID lpContext );
     188
     189#ifdef UNICODE
     190#define LPDSENUMCALLBACK        LPDSENUMCALLBACKW
     191#define DirectSoundEnumerate    DirectSoundEnumerateW
     192#else
     193#define LPDSENUMCALLBACK        LPDSENUMCALLBACKA
     194#define DirectSoundEnumerate    DirectSoundEnumerateA
     195#endif
    185196
    186197extern HRESULT WINAPI DirectSoundCreate(REFGUID lpGUID,LPDIRECTSOUND * ppDS,IUnknown *pUnkOuter );
Note: See TracChangeset for help on using the changeset viewer.