Changeset 8426 for trunk/include


Ignore:
Timestamp:
May 16, 2002, 2:13:37 PM (23 years ago)
Author:
sandervl
Message:

header updates

Location:
trunk/include
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r7999 r8426  
    1 # $Id: odin32.dbg.wat.mk,v 1.7 2002-02-23 23:51:49 bird Exp $
     1# $Id: odin32.dbg.wat.mk,v 1.8 2002-05-16 12:13:35 sandervl Exp $
    22
    33#
    … …  
    8686CDEFINES_WIN32APP= -DDEBUG -D__WIN32OS2__ -D__i386__
    8787CDEFINES_ODINCRT = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__
    88 CDEFINES         = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__ -DTCPV40HDRS -DCOMCTL32UNDOC \
     88CDEFINES         = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__ -DTCPV40HDRS -DCOMCTL32UNDOC
    8989!ifdef DEBUGALL
    90                    -DDEBUG_ENABLELOG_LEVEL2 \
     90                   -DDEBUG_ENABLELOG_LEVEL2
    9191!endif
    9292!ifdef NODEBUGINFO

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

    r6896 r8426  
    1 # $Id: odin32.tools.wat.mk,v 1.6 2001-09-30 09:46:17 bird Exp $
     1# $Id: odin32.tools.wat.mk,v 1.7 2002-05-16 12:13:36 sandervl Exp $
    22
    33#
    … …  
    5959.c.obj:   .AUTODEPEND
    6060!ifdef USERAPP
    61     $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -fo$(OBJDIR)\$^&.obj $^&.c
     61    $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -fo=$(OBJDIR)\$^&.obj $^&.c
    6262!else
    63     $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -fo$(OBJDIR)\$^&.obj $^&.c
     63    $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -fo=$(OBJDIR)\$^&.obj $^&.c
    6464!endif
    6565
    6666.cpp.obj: .AUTODEPEND
    6767!ifdef USERAPP
    68     $(CC) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -fo$(OBJDIR)\$^&.obj $^&.c
     68    $(CC) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -fo=$(OBJDIR)\$^&.obj $^&.c
    6969!else
    70     $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -fo$(OBJDIR)\$^&.obj $^&.cpp
     70    $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -fo=$(OBJDIR)\$^&.obj $^&.cpp
    7171!endif
    7272

  • trunk/include/win/config.h

    r6564 r8426  
    1 /* $Id: config.h,v 1.2 2001-08-19 14:02:56 sandervl Exp $ */
     1/* $Id: config.h,v 1.3 2002-05-16 12:13:36 sandervl Exp $ */
    22
    33#ifndef __CONFIG_H__

  • trunk/include/win/winbase.h

    r8420 r8426  
    252252            LPVOID lpLastBlock;
    253253        } Region;
    254     } Foo;
    255 } PROCESS_HEAP_ENTRY, *LPPROCESS_HEAP_ENTRY;
     254    } DUMMYUNIONNAME;
     255} PROCESS_HEAP_ENTRY, *PPROCESS_HEAP_ENTRY, *LPPROCESS_HEAP_ENTRY;
    256256
    257257#define PROCESS_HEAP_REGION                   0x0001
    … …  
    13521352} COMMCONFIG,*LPCOMMCONFIG;
    13531353
     1354typedef void (* CALLBACK PAPCFUNC)(ULONG_PTR);
     1355typedef void (* CALLBACK PTIMERAPCROUTINE)(LPVOID,DWORD,DWORD);
     1356
     1357typedef enum _COMPUTER_NAME_FORMAT
     1358{
     1359        ComputerNameNetBIOS,
     1360        ComputerNameDnsHostname,
     1361        ComputerNameDnsDomain,
     1362        ComputerNameDnsFullyQualified,
     1363        ComputerNamePhysicalNetBIOS,
     1364        ComputerNamePhysicalDnsHostname,
     1365        ComputerNamePhysicalDnsDomain,
     1366        ComputerNamePhysicalDnsFullyQualified,
     1367        ComputerNameMax
     1368} COMPUTER_NAME_FORMAT;
     1369
    13541370#include "poppack.h"
    1355 
    1356 typedef VOID (* CALLBACK PAPCFUNC)(ULONG_PTR);
    13571371
    13581372BOOL      WINAPI BuildCommDCBA(LPCSTR,LPDCB);

  • trunk/include/win/windef.h

    r8254 r8426  
    421421/* Callback function pointers types */
    422422
     423#ifdef __IBMC__
    423424typedef BOOL16  (* CALLBACK DLGPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
    424425typedef BOOL    (* CALLBACK DLGPROC)(HWND,UINT,WPARAM,LPARAM);
    … …  
    455456typedef LRESULT (* CALLBACK WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
    456457typedef LRESULT (* CALLBACK WNDPROC)(HWND,UINT,WPARAM,LPARAM);
     458#else
     459typedef BOOL16  ( CALLBACK * DLGPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
     460typedef BOOL    ( CALLBACK * DLGPROC)(HWND,UINT,WPARAM,LPARAM);
     461typedef LRESULT ( CALLBACK * DRIVERPROC16)(DWORD,HDRVR16,UINT16,LPARAM,LPARAM);
     462typedef LRESULT ( CALLBACK * DRIVERPROC)(DWORD,HDRVR,UINT,LPARAM,LPARAM);
     463typedef INT16   ( CALLBACK * EDITWORDBREAKPROC16)(LPSTR,INT16,INT16,INT16);
     464typedef INT     ( CALLBACK * EDITWORDBREAKPROCA)(LPSTR,INT,INT,INT);
     465typedef INT     ( CALLBACK * EDITWORDBREAKPROCW)(LPWSTR,INT,INT,INT);
     466DECL_WINELIB_TYPE_AW(EDITWORDBREAKPROC)
     467typedef LRESULT ( CALLBACK * FARPROC16)();
     468typedef LRESULT ( CALLBACK * FARPROC)();
     469typedef INT16   ( CALLBACK * PROC16)();
     470typedef INT     ( CALLBACK * PROC)();
     471typedef INT16   ( CALLBACK * GOBJENUMPROC16)(SEGPTR,LPARAM);
     472typedef INT     ( CALLBACK * GOBJENUMPROC)(LPVOID,LPARAM);
     473typedef BOOL16  ( CALLBACK * GRAYSTRINGPROC16)(HDC16,LPARAM,INT16);
     474typedef BOOL    ( CALLBACK * GRAYSTRINGPROC)(HDC,LPARAM,INT);
     475typedef LRESULT ( CALLBACK * HOOKPROC16)(INT16,WPARAM16,LPARAM);
     476typedef LRESULT ( CALLBACK * HOOKPROC)(INT,WPARAM,LPARAM);
     477typedef VOID    ( CALLBACK * LINEDDAPROC16)(INT16,INT16,LPARAM);
     478typedef VOID    ( CALLBACK * LINEDDAPROC)(INT,INT,LPARAM);
     479typedef BOOL16  ( CALLBACK * PROPENUMPROC16)(HWND16,SEGPTR,HANDLE16);
     480typedef BOOL    ( CALLBACK * PROPENUMPROCA)(HWND,LPCSTR,HANDLE);
     481typedef BOOL    ( CALLBACK * PROPENUMPROCW)(HWND,LPCWSTR,HANDLE);
     482DECL_WINELIB_TYPE_AW(PROPENUMPROC)
     483typedef BOOL    ( CALLBACK * PROPENUMPROCEXA)(HWND,LPCSTR,HANDLE,LPARAM);
     484typedef BOOL    ( CALLBACK * PROPENUMPROCEXW)(HWND,LPCWSTR,HANDLE,LPARAM);
     485DECL_WINELIB_TYPE_AW(PROPENUMPROCEX)
     486typedef VOID    ( CALLBACK * TIMERPROC16)(HWND16,UINT16,UINT16,DWORD);
     487typedef VOID    ( CALLBACK * TIMERPROC)(HWND,UINT,UINT,DWORD);
     488typedef LRESULT ( CALLBACK * WNDENUMPROC16)(HWND16,LPARAM);
     489typedef BOOL    ( CALLBACK * WNDENUMPROC)(HWND,LPARAM);
     490typedef LRESULT ( CALLBACK * WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
     491typedef LRESULT ( CALLBACK * WNDPROC)(HWND,UINT,WPARAM,LPARAM);
     492#endif
    457493
    458494/* TCHAR data types definitions for Winelib. */

  • trunk/include/win/winioctl.h

    r8400 r8426  
    561561} VOLUME_DISK_EXTENTS, *PVOLUME_DISK_EXTENTS;
    562562
     563/*
     564 *      NT I/O-Manager
     565 */
     566
     567/*
     568 * structures for NtQueryVolumeInformationFile
     569 * (wdm.h)
     570 */
     571
     572/* FileFsVolumeInformation = 1 */
     573typedef struct _FILE_FS_VOLUME_INFORMATION {
     574        LARGE_INTEGER   VolumeCreationTime;
     575        ULONG           VolumeSerialNumber;
     576        ULONG           VolumeLabelLength;
     577        BYTE            SupportsObjects;
     578        WCHAR           VolumeLabel[1];
     579} FILE_FS_VOLUME_INFORMATION, *PFILE_FS_VOLUME_INFORMATION;
     580
     581/* FileFsLabelInformation = 2 */
     582/*
     583 unknown
     584*/
     585
     586/* FileFsSizeInformation = 3 */
     587typedef struct _FILE_FS_SIZE_INFORMATION {
     588        LARGE_INTEGER   TotalAllocationUnits;
     589        LARGE_INTEGER   AvailableAllocationUnits;
     590        ULONG           SectorsPerAllocationUnit;
     591        ULONG           BytesPerSector;
     592} FILE_FS_SIZE_INFORMATION, *PFILE_FS_SIZE_INFORMATION;
     593
     594/* FileFsDeviceInformation = 4 */
     595typedef struct _FILE_FS_DEVICE_INFORMATION {
     596        DEVICE_TYPE DeviceType;
     597        ULONG Characteristics;
     598} FILE_FS_DEVICE_INFORMATION, *PFILE_FS_DEVICE_INFORMATION;
     599
     600/* FileFsAttributeInformation = 5 */
     601typedef struct _FILE_FS_ATTRIBUTE_INFORMATION {
     602        ULONG   FileSystemAttribute;
     603        LONG    MaximumComponentNameLength;
     604        ULONG   FileSystemNameLength;
     605        WCHAR   FileSystemName[1];
     606} FILE_FS_ATTRIBUTE_INFORMATION, *PFILE_FS_ATTRIBUTE_INFORMATION;
     607
    563608#endif

  • trunk/include/win/winnt.h

    r8208 r8426  
    118118#define HEAP_CREATE_ALIGN_16            0x00010000
    119119#define HEAP_CREATE_ENABLE_TRACING      0x00020000
    120 #define HEAP_WINE_SEGPTR                0x01000000  /* Not a Win32 flag */
    121 #define HEAP_WINE_CODESEG               0x02000000  /* Not a Win32 flag */
    122 #define HEAP_WINE_CODE16SEG             0x04000000  /* Not a Win32 flag */
     120
     121/* This flag allows it to create heaps shared by all processes under win95,
     122   FIXME: correct name */
     123#define HEAP_SHARED                     0x04000000
    123124
    124125/* Processor feature flags.  */
    … …  
    15291530 */
    15301531
    1531 typedef LONG (* CALLBACK PTOP_LEVEL_EXCEPTION_FILTER)(PEXCEPTION_POINTERS ExceptionInfo);
     1532#ifdef __IBMC__
     1533typedef LONG ( * CALLBACK PTOP_LEVEL_EXCEPTION_FILTER)(PEXCEPTION_POINTERS ExceptionInfo);
     1534#else
     1535typedef LONG ( CALLBACK * PTOP_LEVEL_EXCEPTION_FILTER)(PEXCEPTION_POINTERS ExceptionInfo);
     1536#endif
     1537
    15321538typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER;
    15331539
Note: See TracChangeset for help on using the changeset viewer.