Changeset 5438 for trunk/include


Ignore:
Timestamp:
Apr 2, 2001, 11:54:45 AM (24 years ago)
Author:
sandervl
Message:

header update

Location:
trunk/include
Files:
1 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/odin32.dbg.emx.mk

    r4991 r5438  
    1 # $Id: odin32.dbg.emx.mk,v 1.2 2001-01-20 18:17:36 bird Exp $
     1# $Id: odin32.dbg.emx.mk,v 1.3 2001-04-02 09:54:45 sandervl Exp $
    22
    33#
    … …  
    4242IMPLIBFLAGS      = -o
    4343ILIBFLAGS        = rcv
    44 RCFLAGS          = -s -I. -I$(CPPMAIN)\include
     44RCFLAGS          = -s -I. -I$(CPPMAIN)\include  -D__WIN32OS2__
    4545OS2RCFLAGS       = -r -n
    4646OS2RCLFLAGS      = -x2 -n

  • trunk/include/odin32.dbg.vac3.mk

    r4798 r5438  
    1 # $Id: odin32.dbg.vac3.mk,v 1.2 2000-12-16 15:39:54 sandervl Exp $
     1# $Id: odin32.dbg.vac3.mk,v 1.3 2001-04-02 09:54:45 sandervl Exp $
    22
    33#
    … …  
    3939IMPLIBFLAGS      = /nologo
    4040ILIBFLAGS        = /quiet /nologo
    41 RCFLAGS          = -s -I. -I$(CPPMAIN)\include
     41RCFLAGS          = -s -I. -I$(CPPMAIN)\include -D__WIN32OS2__
    4242OS2RCFLAGS       = -r -n
    4343OS2RCLFLAGS      = -x2 -n

  • trunk/include/odin32.dbg.vac36.mk

    r4798 r5438  
    1 # $Id: odin32.dbg.vac36.mk,v 1.2 2000-12-16 15:39:55 sandervl Exp $
     1# $Id: odin32.dbg.vac36.mk,v 1.3 2001-04-02 09:54:45 sandervl Exp $
    22
    33#
    … …  
    4545IMPLIBFLAGS      = /nologo
    4646ILIBFLAGS        = /nofree /quiet /nologo
    47 RCFLAGS          = -s -I. -I$(CPPMAIN)\include
     47RCFLAGS          = -s -I. -I$(CPPMAIN)\include -D__WIN32OS2__
    4848OS2RCFLAGS       = -r -n
    4949OS2RCLFLAGS      = -x2 -n

  • trunk/include/odin32.dbg.wat.mk

    r5331 r5438  
    1 # $Id: odin32.dbg.wat.mk,v 1.4 2001-03-19 18:56:56 mike Exp $
     1# $Id: odin32.dbg.wat.mk,v 1.5 2001-04-02 09:54:45 sandervl Exp $
    22
    33#
    … …  
    5050IMPLIBFLAGS      = /nologo
    5151ILIBFLAGS        = /quiet /nologo
    52 RCFLAGS          = -s -I. -I$(%WATCOM)\include
     52RCFLAGS          = -s -I. -I$(%WATCOM)\include -D__WIN32OS2__
    5353OS2RCFLAGS       = -r -n
    5454OS2RCLFLAGS      = -x2 -n

  • trunk/include/odin32.rel.emx.mk

    r4991 r5438  
    1 # $Id: odin32.rel.emx.mk,v 1.2 2001-01-20 18:17:36 bird Exp $
     1# $Id: odin32.rel.emx.mk,v 1.3 2001-04-02 09:54:45 sandervl Exp $
    22
    33#
    … …  
    4242IMPLIBFLAGS      = -o
    4343ILIBFLAGS        = rcv
    44 RCFLAGS          = -s -I. -I$(CPPMAIN)\include
     44RCFLAGS          = -s -I. -I$(CPPMAIN)\include -D__WIN32OS2__
    4545OS2RCFLAGS       = -r -n
    4646OS2RCLFLAGS      = -x2 -n

  • trunk/include/odin32.rel.vac3.mk

    r4798 r5438  
    1 # $Id: odin32.rel.vac3.mk,v 1.2 2000-12-16 15:39:56 sandervl Exp $
     1# $Id: odin32.rel.vac3.mk,v 1.3 2001-04-02 09:54:45 sandervl Exp $
    22
    33#
    … …  
    4545IMPLIBFLAGS      = /nologo
    4646ILIBFLAGS        = /quiet /nologo
    47 RCFLAGS          = -s -I. -I$(CPPMAIN)\include
     47RCFLAGS          = -s -I. -I$(CPPMAIN)\include -D__WIN32OS2__
    4848OS2RCFLAGS       = -r -n
    4949OS2RCLFLAGS      = -x2 -n

  • trunk/include/odin32.rel.vac36.mk

    r4798 r5438  
    1 # $Id: odin32.rel.vac36.mk,v 1.2 2000-12-16 15:39:56 sandervl Exp $
     1# $Id: odin32.rel.vac36.mk,v 1.3 2001-04-02 09:54:45 sandervl Exp $
    22
    33#
    … …  
    4545IMPLIBFLAGS      = /nologo
    4646ILIBFLAGS        = /nofree /quiet /nologo
    47 RCFLAGS          = -s -I. -I$(CPPMAIN)\include
     47RCFLAGS          = -s -I. -I$(CPPMAIN)\include -D__WIN32OS2__
    4848OS2RCFLAGS       = -r -n
    4949OS2RCLFLAGS      = -x2 -n

  • trunk/include/odin32.rel.wat.mk

    r5288 r5438  
    1 # $Id: odin32.rel.wat.mk,v 1.4 2001-03-06 21:44:39 mike Exp $
     1# $Id: odin32.rel.wat.mk,v 1.5 2001-04-02 09:54:45 sandervl Exp $
    22
    33#
    … …  
    5050IMPLIBFLAGS      = /nologo
    5151ILIBFLAGS        = /quiet /nologo
    52 RCFLAGS          = -s -I. -I$(%WATCOM)\include
     52RCFLAGS          = -s -I. -I$(%WATCOM)\include -D__WIN32OS2__
    5353OS2RCFLAGS       = -r -n
    5454OS2RCLFLAGS      = -x2 -n

  • trunk/include/odininst.h

    r4851 r5438  
    1 /* $Id: odininst.h,v 1.2 2000-12-30 10:17:45 sandervl Exp $ */
     1/* $Id: odininst.h,v 1.3 2001-04-02 09:54:45 sandervl Exp $ */
    22
    33/*
    … …  
    1515#define ODINFONTSECTION "Font Mapping"
    1616
    17 //******************************************************************************
    18 //Called from the WarpIn install program to create the desktop directories and
    19 //to setup the registry
    20 //******************************************************************************
    21 BOOL InitSystemAndRegistry();
     17#define DDRAW_CLASSID           "{D7B70EE0-4340-11CF-B063-0020AFC2CD35}"
     18#define DDRAW_DEFAULT           "DirectDraw Object"
     19#define DDRAW_CLIPPER_CLASSID   "{593817A0-7DB3-11CF-A2DE-00AA00B93356}"
     20#define DDRAW_CLIPPER_DEFAULT   "DirectDraw Clipper Object"
     21#define DDRAW_DLL               "ddraw.dll"
     22#define DSOUND_CLASSID          "{47D4D946-62E8-11cf-93BC-444553540000}"
     23#define DSOUND_DEFAULT          "DirectSound Object"
     24#define DSOUND_DLL              "dsound.dll"
     25#define DPLAYX_CLASSID          "{D1EB6D20-8923-11d0-9D97-00A0C90A43CB}"
     26#define DPLAYX_DEFAULT          "DirectPlay Object"
     27#define DPLAYX_DLL              "dplayx.dll"
     28#define DPLAYX_LOBBY_CLASSID    "{2FE8F810-B2A5-11d0-A787-0000F803ABFC}"
     29#define DPLAYX_LOBBY_DEFAULT    "DirectPlayLobby Object"
     30#define DPLAYX_LOBBY_DLL        DPLAYX_DLL
     31
     32#define CLASS_DESKTOP           "Desktop"
     33#define CLASS_SHORTCUT          "Shortcut"
     34#define CLASS_SHELL32DLL        "shell32.dll"
     35#define CLASS_SHDOCVW           "shdocvw.dll"
     36#define COM_CLASS_ID            "CLSID"
     37#define COM_INPROCSERVER        "InprocServer32"
     38#define COM_THREADMODEL         "ThreadingModel"
     39#define COM_THREAD_APARTMENT    "Apartment"
     40#define THREAD_BOTH             "Both"
     41#define INITREG_ERROR           "InitRegistry: Unable to register system information"
     42#define DIR_PROGRAM             "ProgramFilesDir"
     43#define DIR_PROGRAM_COMMON      "CommonFilesDir"
     44#define DIR_SHARED              "SharedDir"
     45#define HARDWARE_VIDEO_GRADD    "\\REGISTRY\\Machine\\System\\CurrentControlSet\\Services\\Gradd\\Device0"
     46#define HARDWARE_VIDEO_GRADD_DESCRIPTION "OS/2 Display driver"
     47#define HARDWARE_VIDEO_VGA      "\\REGISTRY\\Machine\\System\\CurrentControlSet\\Services\\VgaSave\\Device0"
     48#define HARDWARE_VIDEO_VGA_DESCRIPTION   "OS/2 VGA Display driver"
     49#define HARDWARE_VIDEO_COMPATIBLE "\\Device\\Video1"
     50#define DIRECTX_RC              "0"
     51#define DIRECTX_VERSION         "4.04.1381.276"
     52#define DIRECTX_INSTALLED_VERSION 0x0004
     53#define ODIN_WINMM_PLAYBACK     "OS/2 Dart Audio Playback"
     54#define ODIN_WINMM_RECORD       "OS/2 Dart Audio Record"
     55
     56#define KEY_DEVICE_TYPE         "Type"
     57#define KEY_DEVICE_START        "Start"
     58#define KEY_DEVICE_GROUP        "Group"
     59#define KEY_DEVICE_ERRORCONTROL "ErrorControl"
     60#define KEY_DEVICE_AUTORUN      "Autorun"
     61#define KEY_DEVICE_TAG          "Tag"
     62#define DEVICE_GROUP_FILESYSTEM "File system"
     63#define DEVICE_GROUP_SCSICDROM  "SCSI CDROM Class"
     64
     65const char szMci[] = "mci";
     66const char szCDAudio[] = "cdaudio";
     67const char szMciCDA[] = "mcicda.drv";
    2268
    2369#endif //__ODININST_H__

  • trunk/include/win/dplay.h

    r5311 r5438  
    1 // $Id: dplay.h,v 1.7 2001-03-13 23:13:26 hugh Exp $
     1// $Id: dplay.h,v 1.8 2001-04-02 09:54:19 sandervl Exp $
    22#ifndef __WINE_DPLAY_H
    33#define __WINE_DPLAY_H
    … …  
    378378extern HRESULT WINAPI DirectPlayEnumerateA( LPDPENUMDPCALLBACKA, LPVOID );
    379379extern HRESULT WINAPI DirectPlayEnumerateW( LPDPENUMDPCALLBACKW, LPVOID );
     380#define     DirectPlayEnumerate WINELIB_NAME_AW(DirectPlayEnumerate)
     381
    380382extern HRESULT WINAPI DirectPlayCreate( LPGUID lpGUID, LPDIRECTPLAY2 *lplpDP, IUnknown *pUnk);
    381383

  • trunk/include/win/dsound.h

    r4133 r5438  
    1 /* $Id: dsound.h,v 1.4 2000-08-31 12:46:05 sandervl Exp $ */
     1/* $Id: dsound.h,v 1.5 2001-04-02 09:54:20 sandervl Exp $ */
    22
    33#ifndef __WINE_DSOUND_H
    … …  
    273273#define IDirectSoundBuffer_GetCaps(p,a)                ICOM_CALL1(GetCaps,p,a)
    274274#define IDirectSoundBuffer_GetCurrentPosition16(p,a,b) ICOM_CALL2(GetCurrentPosition16,p,a,b)
     275#define IDirectSoundBuffer_GetCurrentPosition(p,a,b)   ICOM_CALL2(GetCurrentPosition,p,a,b)
    275276#define IDirectSoundBuffer_GetFormat(p,a,b,c)          ICOM_CALL3(GetFormat,p,a,b,c)
    276277#define IDirectSoundBuffer_GetVolume(p,a)              ICOM_CALL1(GetVolume,p,a)
    277278#define IDirectSoundBuffer_GetPan(p,a)                 ICOM_CALL1(GetPan,p,a)
    278279#define IDirectSoundBuffer_GetFrequency(p,a)           ICOM_CALL1(GetFrequency,p,a)
    279 #define IDirectSoundBuffer_GetStatus(p,a)              ICOM_CALL1(GetStatus,p,a
     280#define IDirectSoundBuffer_GetStatus(p,a)              ICOM_CALL1(GetStatus,p,a)
    280281#define IDirectSoundBuffer_Initialize(p,a,b)           ICOM_CALL2(Initialize,p,a,b)
    281282#define IDirectSoundBuffer_Lock(p,a,b,c,d,e,f,g)       ICOM_CALL7(Lock,p,a,b,c,d,e,f,g)
    … …  
    287288#define IDirectSoundBuffer_SetFrequency(p,a)           ICOM_CALL1(SetFrequency,p,a)
    288289#define IDirectSoundBuffer_Stop(p)                     ICOM_CALL (Stop,p)
    289 #define IDirectSoundBuffer_Unlock(p,a,b,c,d)           ICOM_CALL4(Unlock,p,a,b,c,)
     290#define IDirectSoundBuffer_Unlock(p,a,b,c,d)           ICOM_CALL4(Unlock,p,a,b,c,d)
    290291#define IDirectSoundBuffer_Restore(p)                  ICOM_CALL (Restore,p)
    291292#endif

  • trunk/include/win/msacm.h

    r4632 r5438  
    1 /* $Id: msacm.h,v 1.3 2000-11-19 13:09:14 sandervl Exp $ */
    21/*
    32 *      msacm.h   -       Declarations for MSACM
    … …  
    87
    98#include "windef.h"
    10 ////#include "driver.h"
    119#include "mmsystem.h"
    1210#include "mmreg.h"
    … …  
    1614#endif /* defined(__cplusplus) */
    1715
     16#define ACMAPI              WINAPI
     17
    1818/***********************************************************************
    1919 * Defines/Enums
    2020 */
    21 
    2221#define ACMERR_BASE        512
    2322#define ACMERR_NOTPOSSIBLE (ACMERR_BASE + 0)
    … …  
    9392
    9493#define ACMHELPMSGSTRINGA       "acmchoose_help"
    95 #define ACMHELPMSGSTRINGW       L"acmchoose_help"
    96 #define ACMHELPMSGSTRING16       "acmchoose_help"
     94static const WCHAR ACMHELPMSGSTRINGW[] = { 'a','c','m',
     95  'c','h','o','o','s','e','_','h','e','l','p',0 };
     96#define ACMHELPMSGSTRING WINELIB_NAME_AW(ACMHELPMSGSTRING)
    9797
    9898#define ACMHELPMSGCONTEXTMENUA  "acmchoose_contextmenu"
    99 #define ACMHELPMSGCONTEXTMENUW  L"acmchoose_contextmenu"
    100 #define ACMHELPMSGCONTEXTMENU16   "acmchoose_contextmenu"
     99static const WCHAR ACMHELPMSGCONTEXTMENUW[] = { 'a','c','m',
     100  'c','h','o','o','s','e','_','c','o','n','t','e','x','t','m','e','n','u',0 };
     101#define ACMHELPMSGCONTEXTMENU WINELIB_NAME_AW(ACMHELPMSGCONTEXTMENU)
    101102
    102103#define ACMHELPMSGCONTEXTHELPA  "acmchoose_contexthelp"
    103 #define ACMHELPMSGCONTEXTHELPW  L"acmchoose_contexthelp"
    104 #define ACMHELPMSGCONTEXTHELP16   "acmchoose_contexthelp"
     104static const WCHAR ACMHELPMSGCONTEXTHELPW[] = { 'a','c','m',
     105  'c','h','o','o','s','e','_','c','o','n','t','e','x','t','h','e','l','p',0 };
     106#define ACMHELPMSGCONTEXTHELP WINELIB_NAME_AW(ACMHELPMSGCONTEXTHELP)
    105107
    106108#define MM_ACM_FORMATCHOOSE 0x8000
    … …  
    193195 */
    194196
    195 typedef BOOL (CALLBACK *ACMDRIVERENUMCB)(
     197typedef BOOL (* CALLBACK ACMDRIVERENUMCB)(
    196198  HACMDRIVERID hadid, DWORD dwInstance, DWORD fdwSupport
    197199);
    198200
    199 typedef BOOL16 (CALLBACK *ACMDRIVERENUMCB16)(
    200   HACMDRIVERID16 hadid, DWORD dwInstance, DWORD fdwSupport
    201 );
    202 
    203 typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROCA)(
     201typedef UINT (* CALLBACK ACMFILTERCHOOSEHOOKPROCA)(
    204202  HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
    205203);
    206204
    207 typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROCW)(
     205typedef UINT (* CALLBACK ACMFILTERCHOOSEHOOKPROCW)(
    208206  HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
    209207);
    210 
    211 typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROC16)(
     208#define ACMFILTERCHOOSEHOOKPROC WINELIB_NAME_AW(ACMFILTERCHOOSEHOOKPROC)
     209
     210typedef UINT (* CALLBACK ACMFORMATCHOOSEHOOKPROCA)(
    212211  HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
    213212);
    214213
    215 typedef UINT (CALLBACK *ACMFORMATCHOOSEHOOKPROCA)(
     214typedef UINT (* CALLBACK ACMFORMATCHOOSEHOOKPROCW)(
    216215  HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
    217216);
    218 
    219 typedef UINT (CALLBACK *ACMFORMATCHOOSEHOOKPROCW)(
    220   HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
    221 );
    222 
    223 typedef UINT16 (CALLBACK *ACMFORMATCHOOSEHOOKPROC16)(
    224   HWND16 hwnd, UINT16 uMsg, WPARAM16 wParam, LPARAM lParam
    225 );
     217#define ACMFORMATCHOOSEHOOKPROC WINELIB_NAME_AW(ACMFORMATCHOOSEHOOKPROC)
    226218
    227219/***********************************************************************
    … …  
    253245  CHAR     szLicensing[ACMDRIVERDETAILS_LICENSING_CHARS];
    254246  CHAR     szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
    255 } ACMDRIVERDETAILSA, *PACMDRIVERDETAILSA;
     247} ACMDRIVERDETAILSA, *PACMDRIVERDETAILSA, *LPACMDRIVERDETAILSA;
    256248
    257249typedef struct _ACMDRIVERDETAILSW
    … …  
    279271  WCHAR    szLicensing[ACMDRIVERDETAILS_LICENSING_CHARS];
    280272  WCHAR    szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
    281 } ACMDRIVERDETAILSW, *PACMDRIVERDETAILSW;
    282 
    283 typedef struct _ACMDRIVERDETAILS16
    284 {
    285   DWORD   cbStruct;
    286 
    287   FOURCC  fccType;
    288   FOURCC  fccComp;
    289 
    290   WORD    wMid;
    291   WORD    wPid;
    292 
    293   DWORD   vdwACM;
    294   DWORD   vdwDriver;
    295 
    296   DWORD   fdwSupport;
    297   DWORD   cFormatTags;
    298   DWORD   cFilterTags;
    299 
    300   HICON16 hicon;
    301 
    302   CHAR    szShortName[ACMDRIVERDETAILS_SHORTNAME_CHARS];
    303   CHAR    szLongName[ACMDRIVERDETAILS_LONGNAME_CHARS];
    304   CHAR    szCopyright[ACMDRIVERDETAILS_COPYRIGHT_CHARS];
    305   CHAR    szLicensing[ACMDRIVERDETAILS_LICENSING_CHARS];
    306   CHAR    szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
    307 } ACMDRIVERDETAILS16, *NPACMDRIVERDETAILS16, *LPACMDRIVERDETAILS16;
     273} ACMDRIVERDETAILSW, *PACMDRIVERDETAILSW, *LPACMDRIVERDETAILSW;
     274
     275DECL_WINELIB_TYPE_AW(ACMDRIVERDETAILS)
     276DECL_WINELIB_TYPE_AW(PACMDRIVERDETAILS)
     277DECL_WINELIB_TYPE_AW(LPACMDRIVERDETAILS)
    308278
    309279typedef struct _ACMFILTERCHOOSEA
    … …  
    331301  LPARAM        lCustData;
    332302  ACMFILTERCHOOSEHOOKPROCA pfnHook;
    333 } ACMFILTERCHOOSEA, *PACMFILTERCHOOSEA;
     303} ACMFILTERCHOOSEA, *PACMFILTERCHOOSEA, *LPACMFILTERCHOOSEA;
    334304
    335305typedef struct _ACMFILTERCHOOSEW
    … …  
    357327  LPARAM        lCustData;
    358328  ACMFILTERCHOOSEHOOKPROCW pfnHook;
    359 } ACMFILTERCHOOSEW, *PACMFILTERCHOOSEW;
    360 
    361 typedef struct _ACMFILTERCHOOSE16
    362 {
    363   DWORD          cbStruct;
    364   DWORD          fdwStyle;
    365 
    366   HWND16         hwndOwner;
    367 
    368   LPWAVEFILTER   pwfltr;
    369   DWORD          cbwfltr;
    370 
    371   LPCSTR         pszTitle;
    372 
    373   char           szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
    374   char           szFilter[ACMFILTERDETAILS_FILTER_CHARS];
    375   LPSTR          pszName;
    376   DWORD          cchName;
    377 
    378   DWORD          fdwEnum;
    379   LPWAVEFILTER   pwfltrEnum;
    380    
    381   HINSTANCE16    hInstance;
    382   LPCSTR         pszTemplateName;
    383   LPARAM         lCustData;
    384   ACMFILTERCHOOSEHOOKPROC16 pfnHook;
    385 } ACMFILTERCHOOSE16, *NPACMFILTERCHOOSE16, *LPACMFILTERCHOOSE16;
     329} ACMFILTERCHOOSEW, *PACMFILTERCHOOSEW, *LPACMFILTERCHOOSEW;
     330
     331DECL_WINELIB_TYPE_AW(ACMFILTERCHOOSE)
     332DECL_WINELIB_TYPE_AW(PACMFILTERCHOOSE)
     333DECL_WINELIB_TYPE_AW(LPACMFILTERCHOOSE)
    386334
    387335typedef struct _ACMFILTERDETAILSA
    … …  
    394342  DWORD           cbwfltr;
    395343  CHAR            szFilter[ACMFILTERDETAILS_FILTER_CHARS];
    396 } ACMFILTERDETAILSA, *PACMFILTERDETAILSA;
     344} ACMFILTERDETAILSA, *PACMFILTERDETAILSA, *LPACMFILTERDETAILSA;
    397345
    398346typedef struct _ACMFILTERDETAILSW
    … …  
    405353  DWORD          cbwfltr;
    406354  WCHAR          szFilter[ACMFILTERDETAILS_FILTER_CHARS];
    407 } ACMFILTERDETAILSW, *PACMFILTERDETAILSW;
    408 
    409 typedef struct _ACMFILTERDETAILS16
    410 {
    411   DWORD          cbStruct;
    412   DWORD          dwFilterIndex;
    413   DWORD          dwFilterTag;
    414   DWORD          fdwSupport;
    415   LPWAVEFILTER   pwfltr;
    416   DWORD          cbwfltr;
    417   CHAR           szFilter[ACMFILTERDETAILS_FILTER_CHARS];
    418 } ACMFILTERDETAILS16, *NPACMFILTERDETAILS16, *LPACMFILTERDETAILS16;
     355} ACMFILTERDETAILSW, *PACMFILTERDETAILSW, *LPACMFILTERDETAILSW;
     356
     357DECL_WINELIB_TYPE_AW(ACMFILTERDETAILS)
     358DECL_WINELIB_TYPE_AW(PACMFILTERDETAILS)
     359DECL_WINELIB_TYPE_AW(LPACMFILTERDETAILS)
    419360
    420361typedef struct _ACMFILTERTAGDETAILSA
    … …  
    427368  DWORD cStandardFilters;
    428369  CHAR  szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
    429 } ACMFILTERTAGDETAILSA, *PACMFILTERTAGDETAILSA;
     370} ACMFILTERTAGDETAILSA, *PACMFILTERTAGDETAILSA, *LPACMFILTERTAGDETAILSA;
    430371
    431372typedef struct _ACMFILTERTAGDETAILSW
    … …  
    438379  DWORD cStandardFilters;
    439380  WCHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
    440 } ACMFILTERTAGDETAILSW, *PACMFILTERTAGDETAILSW;
    441 
    442 typedef struct _ACMFILTERTAGDETAILS16
    443 {
    444   DWORD cbStruct;
    445   DWORD dwFilterTagIndex;
    446   DWORD dwFilterTag;
    447   DWORD cbFilterSize;
    448   DWORD fdwSupport;
    449   DWORD cStandardFilters;
    450   CHAR  szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
    451 } ACMFILTERTAGDETAILS16, *NPACMFILTERTAGDETAILS16, *LPACMFILTERTAGDETAILS16;
     381} ACMFILTERTAGDETAILSW, *PACMFILTERTAGDETAILSW, *LPACMFILTERTAGDETAILSW;
     382
     383DECL_WINELIB_TYPE_AW(ACMFILTERTAGDETAILS)
     384DECL_WINELIB_TYPE_AW(PACMFILTERTAGDETAILS)
     385DECL_WINELIB_TYPE_AW(LPACMFILTERTAGDETAILS)
    452386
    453387typedef struct _ACMFORMATCHOOSEA
    … …  
    475409  LPARAM          lCustData;
    476410  ACMFORMATCHOOSEHOOKPROCA pfnHook;
    477 } ACMFORMATCHOOSEA, *PACMFORMATCHOOSEA;
     411} ACMFORMATCHOOSEA, *PACMFORMATCHOOSEA, *LPACMFORMATCHOOSEA;
    478412
    479413typedef struct _ACMFORMATCHOOSEW
    … …  
    501435  LPARAM          lCustData;
    502436  ACMFORMATCHOOSEHOOKPROCW pfnHook;
    503 } ACMFORMATCHOOSEW, *PACMFORMATCHOOSEW;
    504 
    505 typedef struct _ACMFORMATCHOOSE16
    506 {
    507   DWORD            cbStruct;
    508   DWORD            fdwStyle;
    509    
    510   HWND16           hwndOwner;
    511 
    512   LPWAVEFORMATEX   pwfx;
    513   DWORD            cbwfx;
    514   LPCSTR           pszTitle;
    515    
    516   CHAR             szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
    517   CHAR             szFormat[ACMFORMATDETAILS_FORMAT_CHARS];   
    518 
    519   LPSTR            pszName;
    520   DWORD            cchName;
    521 
    522   DWORD            fdwEnum;
    523   LPWAVEFORMATEX   pwfxEnum;
    524    
    525   HINSTANCE16      hInstance;
    526   LPCSTR           pszTemplateName;
    527   LPARAM           lCustData;
    528   ACMFORMATCHOOSEHOOKPROC16 pfnHook;
    529 } ACMFORMATCHOOSE16, *NPACMFORMATCHOOSE16, *LPACMFORMATCHOOSE16;
     437} ACMFORMATCHOOSEW, *PACMFORMATCHOOSEW, *LPACMFORMATCHOOSEW;
     438
     439DECL_WINELIB_TYPE_AW(ACMFORMATCHOOSE)
     440DECL_WINELIB_TYPE_AW(PACMFORMATCHOOSE)
     441DECL_WINELIB_TYPE_AW(LPACMFORMATCHOOSE)
    530442
    531443typedef struct _ACMFORMATDETAILSA
    … …  
    538450  DWORD           cbwfx;
    539451  CHAR            szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
    540 } ACMFORMATDETAILSA, *PACMFORMATDETAILSA;
     452} ACMFORMATDETAILSA, *PACMFORMATDETAILSA, *LPACMFORMATDETAILSA;
    541453
    542454typedef struct _ACMFORMATDETAILSW
    … …  
    549461    DWORD           cbwfx;
    550462    WCHAR           szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
    551 } ACMFORMATDETAILSW, *PACMFORMATDETAILSW;
    552 
    553 typedef struct _ACMFORMATDETAILS16
    554 {
    555     DWORD            cbStruct;
    556     DWORD            dwFormatIndex;
    557     DWORD            dwFormatTag;
    558     DWORD            fdwSupport;
    559     LPWAVEFORMATEX   pwfx;
    560     DWORD            cbwfx;
    561     CHAR             szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
    562 } ACMFORMATDETAILS16, *NPACMFORMATDETAILS16, *LPACMFORMATDETAILS16;
     463} ACMFORMATDETAILSW, *PACMFORMATDETAILSW, *LPACMFORMATDETAILSW;
     464
     465DECL_WINELIB_TYPE_AW(ACMFORMATDETAILS)
     466DECL_WINELIB_TYPE_AW(PACMFORMATDETAILS)
     467DECL_WINELIB_TYPE_AW(LPACMFORMATDETAILS)
    563468
    564469typedef struct _ACMFORMATTAGDETAILSA
    … …  
    571476  DWORD cStandardFormats;
    572477  CHAR  szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
    573 } ACMFORMATTAGDETAILSA, *PACMFORMATTAGDETAILSA;
     478} ACMFORMATTAGDETAILSA, *PACMFORMATTAGDETAILSA, *LPACMFORMATTAGDETAILSA;
    574479
    575480typedef struct _ACMFORMATTAGDETAILSW
    … …  
    582487  DWORD cStandardFormats;
    583488  WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
    584 } ACMFORMATTAGDETAILSW, *PACMFORMATTAGDETAILSW;
    585 
    586 typedef struct _ACMFORMATTAGDETAILS16
    587 {
    588   DWORD cbStruct;
    589   DWORD dwFormatTagIndex;
    590   DWORD dwFormatTag;
    591   DWORD cbFormatSize;
    592   DWORD fdwSupport;
    593   DWORD cStandardFormats;
    594   CHAR  szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
    595 } ACMFORMATTAGDETAILS16, *NPACMFORMATTAGDETAILS16, *LPACMFORMATTAGDETAILS16;
     489} ACMFORMATTAGDETAILSW, *PACMFORMATTAGDETAILSW, *LPACMFORMATTAGDETAILSW;
     490
     491DECL_WINELIB_TYPE_AW(ACMFORMATTAGDETAILS)
     492DECL_WINELIB_TYPE_AW(PACMFORMATTAGDETAILS)
     493DECL_WINELIB_TYPE_AW(LPACMFORMATTAGDETAILS)
    596494
    597495typedef struct _ACMSTREAMHEADER
    … …  
    609507  DWORD  dwDstUser;
    610508  DWORD  dwReservedDriver[10];
    611 } ACMSTREAMHEADER16, *NPACMSTREAMHEADER16, *LPACMSTREAMHEADER16,
    612   ACMSTREAMHEADER, *PACMSTREAMHEADER;
     509} ACMSTREAMHEADER, *PACMSTREAMHEADER, *LPACMSTREAMHEADER;
    613510
    614511/***********************************************************************
    … …  
    616513 */
    617514
    618 typedef BOOL (CALLBACK *ACMFILTERENUMCBA)(
     515typedef BOOL (* CALLBACK ACMFILTERENUMCBA)(
    619516  HACMDRIVERID hadid, PACMFILTERDETAILSA pafd,
    620517  DWORD dwInstance, DWORD fdwSupport
    621518);
    622519
    623 typedef BOOL (CALLBACK *ACMFILTERENUMCBW)(
     520typedef BOOL (* CALLBACK ACMFILTERENUMCBW)(
    624521  HACMDRIVERID hadid, PACMFILTERDETAILSW pafd,
    625522  DWORD dwInstance, DWORD fdwSupport
    626523);
    627524
    628 typedef BOOL16 (CALLBACK *ACMFILTERENUMCB16)(
    629  HACMDRIVERID16 hadid, LPACMFILTERDETAILS16 pafd,
    630  DWORD dwInstance, DWORD fdwSupport
    631 );
    632 
    633 typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBA)(
     525#define ACMFILTERENUMCB WINELIB_NAME_AW(ACMFILTERENUMCB)
     526
     527typedef BOOL (* CALLBACK ACMFILTERTAGENUMCBA)(
    634528  HACMDRIVERID hadid, PACMFILTERTAGDETAILSA paftd,
    635529  DWORD dwInstance, DWORD fdwSupport
    636530);
    637531
    638 typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBW)(
     532typedef BOOL (* CALLBACK ACMFILTERTAGENUMCBW)(
    639533  HACMDRIVERID hadid, PACMFILTERTAGDETAILSW paftd,
    640534  DWORD dwInstance, DWORD fdwSupport
    641535);
    642536
    643 typedef BOOL16 (CALLBACK *ACMFILTERTAGENUMCB16)(
    644   HACMDRIVERID16 hadid, LPACMFILTERTAGDETAILS16 paftd,
    645   DWORD dwInstance, DWORD fdwSupport
    646 );
    647 
    648 typedef BOOL (CALLBACK *ACMFORMATENUMCBA)(
     537#define ACMFILTERTAGENUMCB WINELIB_NAME_AW(ACMFILTERTAGENUMCB)
     538
     539typedef BOOL (* CALLBACK ACMFORMATENUMCBA)(
    649540  HACMDRIVERID hadid, PACMFORMATDETAILSA pafd,
    650541  DWORD dwInstance, DWORD fdwSupport
    651542);
    652543
    653 typedef BOOL (CALLBACK *ACMFORMATENUMCBW)(
     544typedef BOOL (* CALLBACK ACMFORMATENUMCBW)(
    654545  HACMDRIVERID hadid, PACMFORMATDETAILSW pafd,
    655546  DWORD dwInstance, DWORD fdwSupport
    656547);
    657548
    658 typedef BOOL16 (CALLBACK *ACMFORMATENUMCB16)(
    659   HACMDRIVERID16 hadid, LPACMFORMATDETAILS16 pafd,
    660   DWORD dwInstance, DWORD fdwSupport
    661 );
    662 
    663 typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBA)(
     549#define ACMFORMATENUMCB WINELIB_NAME_AW(ACMFORMATENUMCB)
     550
     551typedef BOOL (* CALLBACK ACMFORMATTAGENUMCBA)(
    664552  HACMDRIVERID hadid, PACMFORMATTAGDETAILSA paftd,
    665553  DWORD dwInstance, DWORD fdwSupport
    666554);
    667555
    668 typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBW)(
     556typedef BOOL (* CALLBACK ACMFORMATTAGENUMCBW)(
    669557  HACMDRIVERID hadid, PACMFORMATTAGDETAILSW paftd,
    670558  DWORD dwInstance, DWORD fdwSupport
    671559);
    672560
    673 typedef BOOL16 (CALLBACK *ACMFORMATTAGENUMCB16)(
    674   HACMDRIVERID16 hadid, LPACMFORMATTAGDETAILS16 paftd,
    675   DWORD dwInstance, DWORD fdwSupport
    676 );
    677 
    678 /***********************************************************************
    679  * Functions - Win16
    680  */
    681 
    682 DWORD WINAPI acmGetVersion16(
    683 );
    684 MMRESULT16 WINAPI acmMetrics16(
    685   HACMOBJ16 hao, UINT16 uMetric, LPVOID pMetric
    686 );
    687 MMRESULT16 WINAPI acmDriverEnum16(
    688   ACMDRIVERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum
    689 );
    690 MMRESULT16 WINAPI acmDriverDetails16(
    691   HACMDRIVERID16 hadid, LPACMDRIVERDETAILS16 padd, DWORD fdwDetails
    692 );
    693 MMRESULT16 WINAPI acmDriverAdd16(
    694   LPHACMDRIVERID16 phadid, HINSTANCE16 hinstModule,
    695   LPARAM lParam, DWORD dwPriority, DWORD fdwAdd
    696 );
    697 MMRESULT16 WINAPI acmDriverRemove16(
    698   HACMDRIVERID16 hadid, DWORD fdwRemove
    699 );
    700 MMRESULT16 WINAPI acmDriverOpen16(
    701   LPHACMDRIVER16 phad, HACMDRIVERID16 hadid, DWORD fdwOpen
    702 );
    703 MMRESULT16 WINAPI acmDriverClose16(
    704   HACMDRIVER16 had, DWORD fdwClose
    705 );
    706 LRESULT WINAPI acmDriverMessage16(
    707   HACMDRIVER16 had, UINT16 uMsg, LPARAM lParam1, LPARAM lParam2
    708 );
    709 MMRESULT16 WINAPI acmDriverID16(
    710   HACMOBJ16 hao, LPHACMDRIVERID16 phadid, DWORD fdwDriverID
    711 );
    712 MMRESULT16 WINAPI acmDriverPriority16(
    713  HACMDRIVERID16 hadid, DWORD dwPriority, DWORD fdwPriority
    714 );
    715 MMRESULT16 WINAPI acmFormatTagDetails16(
    716   HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, DWORD fdwDetails
    717 );
    718 MMRESULT16 WINAPI acmFormatTagEnum16(
    719   HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd,
    720   ACMFORMATTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum
    721 );
    722 MMRESULT16 WINAPI acmFormatChoose16(
    723   LPACMFORMATCHOOSE16 pafmtc
    724 );
    725 MMRESULT16 WINAPI acmFormatDetails16(
    726   HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, DWORD fdwDetails
    727 );
    728 MMRESULT16 WINAPI acmFormatEnum16(
    729   HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd,
    730   ACMFORMATENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum
    731 );
    732 MMRESULT16 WINAPI acmFormatSuggest16(
    733   HACMDRIVER16 had, LPWAVEFORMATEX pwfxSrc,
    734   LPWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest
    735 );
    736 MMRESULT16 WINAPI acmFilterTagDetails16(
    737   HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, DWORD fdwDetails
    738 );
    739 MMRESULT16 WINAPI acmFilterTagEnum16(
    740   HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd,
    741   ACMFILTERTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum
    742 );
    743 MMRESULT16 WINAPI acmFilterChoose16(
    744   LPACMFILTERCHOOSE16 pafltrc
    745 );
    746 MMRESULT16 WINAPI acmFilterDetails16(
    747   HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, DWORD fdwDetails
    748 );
    749 MMRESULT16 WINAPI acmFilterEnum16(
    750   HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd,
    751   ACMFILTERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum
    752 );
    753 MMRESULT16 WINAPI acmStreamOpen16(
    754   LPHACMSTREAM16 phas, HACMDRIVER16 had,
    755   LPWAVEFORMATEX pwfxSrc, LPWAVEFORMATEX pwfxDst,
    756   LPWAVEFILTER pwfltr, DWORD dwCallback,
    757   DWORD dwInstance, DWORD fdwOpen
    758 );
    759 MMRESULT16 WINAPI acmStreamClose16(
    760   HACMSTREAM16 has, DWORD fdwClose
    761 );
    762 MMRESULT16 WINAPI acmStreamSize16(
    763   HACMSTREAM16 has, DWORD cbInput,
    764   LPDWORD pdwOutputBytes, DWORD fdwSize
    765 );
    766 MMRESULT16 WINAPI acmStreamConvert16(
    767   HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwConvert
    768 );
    769 MMRESULT16 WINAPI acmStreamReset16(
    770   HACMSTREAM16 has, DWORD fdwReset
    771 );
    772 MMRESULT16 WINAPI acmStreamPrepareHeader16(
    773   HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwPrepare
    774 );
    775 MMRESULT16 WINAPI acmStreamUnprepareHeader16(
    776   HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwUnprepare
    777 );
     561#define ACMFORMATTAGENUMCB WINELIB_NAME_AW(ACMFORMATTAGENUMCB)
    778562
    779563/***********************************************************************
    … …  
    789573  LPARAM lParam, DWORD dwPriority, DWORD fdwAdd
    790574);
     575#define acmDriverAdd WINELIB_NAME_AW(acmDriverAdd)
     576
    791577MMRESULT WINAPI acmDriverClose(
    792578  HACMDRIVER had, DWORD fdwClose
    … …  
    798584  HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, DWORD fdwDetails
    799585);
     586#define acmDriverDetails WINELIB_NAME_AW(acmDriverDetails)
     587
    800588MMRESULT WINAPI acmDriverEnum(
    801589  ACMDRIVERENUMCB fnCallback, DWORD dwInstance, DWORD fdwEnum
    … …  
    822610  PACMFILTERCHOOSEW pafltrc
    823611);
     612#define acmFilterChoose WINELIB_NAME_AW(acmFilterChoose)
     613
    824614MMRESULT WINAPI acmFilterDetailsA(
    825615  HACMDRIVER had, PACMFILTERDETAILSA pafd, DWORD fdwDetails
    … …  
    828618  HACMDRIVER had, PACMFILTERDETAILSW pafd, DWORD fdwDetails
    829619);
     620#define acmFilterDetails WINELIB_NAME_AW(acmFilterDetails)
     621
    830622MMRESULT WINAPI acmFilterEnumA(
    831623  HACMDRIVER had, PACMFILTERDETAILSA pafd,
    … …  
    836628  ACMFILTERENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum
    837629);
     630#define acmFilterEnum WINELIB_NAME_AW(acmFilterEnum)
     631
    838632MMRESULT WINAPI acmFilterTagDetailsA(
    839633  HACMDRIVER had, PACMFILTERTAGDETAILSA paftd, DWORD fdwDetails
    … …  
    842636  HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, DWORD fdwDetails
    843637);
     638#define acmFilterTagDetails WINELIB_NAME_AW(acmFilterTagDetails)
     639
    844640MMRESULT WINAPI acmFilterTagEnumA(
    845641  HACMDRIVER had, PACMFILTERTAGDETAILSA paftd,
    … …  
    850646  ACMFILTERTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum
    851647);
     648#define acmFilterTagEnum WINELIB_NAME_AW(acmFilterTagEnum)
     649
    852650MMRESULT WINAPI acmFormatChooseA(
    853651  PACMFORMATCHOOSEA pafmtc
    … …  
    856654  PACMFORMATCHOOSEW pafmtc
    857655);
     656#define acmFormatChoose WINELIB_NAME_AW(acmFormatChoose)
     657
    858658MMRESULT WINAPI acmFormatDetailsA(
    859659  HACMDRIVER had, PACMFORMATDETAILSA pafd, DWORD fdwDetails
    … …  
    862662  HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD fdwDetails
    863663);
     664#define acmFormatDetails WINELIB_NAME_AW(acmFormatDetails)
     665
    864666MMRESULT WINAPI acmFormatEnumA(
    865667  HACMDRIVER had, PACMFORMATDETAILSA pafd,
    … …  
    870672  ACMFORMATENUMCBW fnCallback, DWORD dwInstance,  DWORD fdwEnum
    871673);
     674#define acmFormatEnum WINELIB_NAME_AW(acmFormatEnum)
     675
    872676MMRESULT WINAPI acmFormatSuggest(
    873677  HACMDRIVER had, PWAVEFORMATEX pwfxSrc, PWAVEFORMATEX pwfxDst,
    … …  
    880684  HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, DWORD fdwDetails
    881685);
     686#define acmFormatTagDetails WINELIB_NAME_AW(acmFormatTagDetails)
     687
    882688MMRESULT WINAPI acmFormatTagEnumA(
    883689  HACMDRIVER had, PACMFORMATTAGDETAILSA paftd,
    … …  
    888694  ACMFORMATTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum
    889695);
    890 DWORD WINAPI acmGetVersion(
     696#define acmFormatTagEnum WINELIB_NAME_AW(acmFormatTagEnum)
     697
     698DWORD WINAPI acmGetVersion(void
    891699);
    892700MMRESULT WINAPI acmMetrics(

  • trunk/include/win/windows.h

    r3850 r5438  
    1 /* $Id: windows.h,v 1.7 2000-07-18 18:30:40 sandervl Exp $ */
     1/* $Id: windows.h,v 1.8 2001-04-02 09:54:20 sandervl Exp $ */
    22
    33#ifndef __WINE_WINDOWS_H
    … …  
    3232#include "objbase.h"
    3333#endif
    34 #include "winver.h"
     34#include <winver.h>
     35#include <winerror.h>
    3536
    3637#include <commdlg.h>

  • trunk/include/win32api.h

    r5403 r5438  
    148148HWND    WIN32API WindowFromPoint(POINT);
    149149INT     WIN32API MapWindowPoints(HWND,HWND,LPPOINT,UINT);
     150HWND    WIN32API GetCapture(void);
     151HWND    WIN32API SetCapture(HWND);
    150152
    151153#endif
Note: See TracChangeset for help on using the changeset viewer.