Changeset 9631 for trunk/include


Ignore:
Timestamp:
Jan 6, 2003, 2:24:23 PM (23 years ago)
Author:
sandervl
Message:

PF: header updates

Location:
trunk/include
Files:
1 added
22 edited

Legend:

Unmodified
Added
Removed

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

    r7999 r9631  
    1 # $Id: odin32.dbg.emx.mk,v 1.7 2002-02-23 23:51:48 bird Exp $
     1# $Id: odin32.dbg.emx.mk,v 1.8 2003-01-06 13:24:19 sandervl Exp $
    22
    33#
    … …  
    7474!endif
    7575CXXEXCEPTIONS    = -fhandle-exceptions
    76 CFLAGS           = -c -Zomf -mprobe -pipe -Wall -Zmt -g $(CTARGETFLAGS)
    77 CXXFLAGS         = -c -Zomf -mprobe -pipe -Wall -Zmt -g $(CXXTARGETFLAGS)
    78 CXXFLAGS_ODINCRT = -c -Zomf -mprobe -pipe -Wall -Zmt -g $(CXXTARGETFLAGS)
    79 CFLAGS_WIN32APP  = -c -Zomf -mprobe -pipe -Wall -Zmt -g $(CTARGETFLAGS)
    80 CXXFLAGS_WIN32APP= -c -Zomf -mprobe -pipe -Wall -Zmt -g $(CXXTARGETFLAGS) $(CXXEXCEPTIONS)
     76CFLAGS           = -Zomf -pipe -Wall -Zmt -g $(CTARGETFLAGS)
     77CXXFLAGS         = -Zomf -pipe -Wall -Zmt -g $(CXXTARGETFLAGS)
     78CXXFLAGS_ODINCRT = -Zomf -pipe -Wall -Zmt -g $(CXXTARGETFLAGS)
     79CFLAGS_WIN32APP  = -Zomf -pipe -Wall -Zmt -g $(CTARGETFLAGS)
     80CXXFLAGS_WIN32APP= -Zomf -pipe -Wall -Zmt -g $(CXXTARGETFLAGS) $(CXXEXCEPTIONS)
    8181CINCLUDES        = -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE)
    8282CDEFINES_WIN32APP= -DDEBUG -D__WIN32OS2__ -D__i386__
    … …  
    115115!endif
    116116!ifdef NODEBUGINFO
    117 LDFLAGS          = -Zmt -Zomf -Zmap $(LDTARGETFLAGS)  -s -ZLinker /EXEPACK:2 -ZLinker /NOD
    118 LDFLAGS_ODINCRT  = -Zmt -Zomf -Zmap $(LDTARGETFLAGS)  -s -ZLinker /EXEPACK:2
     117LDFLAGS          = -Zmt -Zomf -Zmap $(LDTARGETFLAGS) -g
     118LDFLAGS_ODINCRT  = -Zmt -Zomf -Zmap $(LDTARGETFLAGS) -g
    119119LD2FLAGS         = $(LD2TARGETFLAGS) -s -O/EXEPACK:2        -O/NOD
    120120LD2FLAGS_ODINCRT = $(LD2TARGETFLAGS) -s -O/EXEPACK:2
    … …  
    122122LD2FLAGS_ODINCRT = /nologo /noe /map /packcode /packdata /exepack:2 /nodebug      $(LD2TARGETFLAGS)
    123123!else
    124 LDFLAGS          = -Zmt -Zomf -Zmap $(LDTARGETFLAGS)  -ZLinker /NOD
    125 LDFLAGS_ODINCRT  = -Zmt -Zomf -Zmap $(LDTARGETFLAGS)
     124LDFLAGS          = -Zomf -Zmap $(LDTARGETFLAGS) -g
     125LDFLAGS_ODINCRT  = -Zso -Zsys -Zomf -Zmap $(LDTARGETFLAGS) -g
    126126LD2FLAGS         = /nologo /noe /map /packcode /packdata /exepack:2 /nod /debug $(LD2TARGETFLAGS)
    127127LD2FLAGS_ODINCRT = /nologo /noe /map /packcode /packdata /exepack:2      /debug $(LD2TARGETFLAGS)

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

    r7999 r9631  
    1 # $Id: odin32.rel.emx.mk,v 1.7 2002-02-23 23:51:50 bird Exp $
     1# $Id: odin32.rel.emx.mk,v 1.8 2003-01-06 13:24:19 sandervl Exp $
    22
    33#
    … …  
    3838CXX    = gcc
    3939AS     = alp
     40AS_EMX = as
    4041LD     = gcc
    4142LD2    = link386
    … …  
    7475!endif
    7576CXXEXCEPTIONS    = -fhandle-exceptions
    76 CFLAGS           = -c -Zomf -mprobe -pipe -Wall -Zmt -s -O2 -mcpu=i586 $(CTARGETFLAGS)
    77 CXXFLAGS         = -c -Zomf -mprobe -pipe -Wall -Zmt -s -O2 -mcpu=i586 $(CXXTARGETFLAGS)
    78 CXXFLAGS_ODINCRT = -c -Zomf -mprobe -pipe -Wall -Zmt -s -O2 -mcpu=i586 $(CXXTARGETFLAGS)
    79 CFLAGS_WIN32APP  = -c -Zomf -mprobe -pipe -Wall -Zmt -s -O2 -mcpu=i586 $(CTARGETFLAGS)
    80 CXXFLAGS_WIN32APP= -c -Zomf -mprobe -pipe -Wall -Zmt -s -O2 -mcpu=i586 $(CXXTARGETFLAGS) $(CXXEXCEPTIONS)
     77CFLAGS           = -Zomf -pipe -Wall -Zmt -s -O6 -mcpu=pentium $(CTARGETFLAGS)
     78CXXFLAGS         = -Zomf -pipe -Wall -Zmt -s -O6 -mcpu=pentium $(CXXTARGETFLAGS)
     79CXXFLAGS_ODINCRT = -Zomf -pipe -Wall -Zmt -s -O6 -mcpu=pentium $(CXXTARGETFLAGS)
     80CFLAGS_WIN32APP  = -Zomf -pipe -Wall -Zmt -s -O6 -mcpu=pentium $(CTARGETFLAGS)
     81CXXFLAGS_WIN32APP= -Zomf -pipe -Wall -Zmt -s -O6 -mcpu=pentium $(CXXTARGETFLAGS) $(CXXEXCEPTIONS)
    8182CINCLUDES        = -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE)
    82 CDEFINES_WIN32APP= -DDEBUG -D__WIN32OS2__ -D__i386__
    83 CDEFINES_ODINCRT = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__
    84 CDEFINES         = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__ -DTCPV40HDRS -DCOMCTL32UNDOC \
     83CDEFINES_WIN32APP= -D__WIN32OS2__ -D__i386__
     84CDEFINES_ODINCRT = -D__WIN32OS2__ -D__i386__ -D__WINE__
     85CDEFINES         = -D__WIN32OS2__ -D__i386__ -D__WINE__ -DTCPV40HDRS -DCOMCTL32UNDOC \
    8586!ifdef DEBUGALL
    8687                   -DDEBUG_ENABLELOG_LEVEL2 \
    … …  
    114115LD2TARGETFLAGS   = /DLL
    115116!endif
    116 LDFLAGS          = -Zmt -Zomf -Zmap $(LDTARGETFLAGS)  -s -ZLinker /EXEPACK:2 -ZLinker /NOD
    117 LDFLAGS_ODINCRT  = -Zmt -Zomf -Zmap $(LDTARGETFLAGS)  -s -ZLinker /EXEPACK:2
     117LDFLAGS          = -Zomf -Zmap $(LDTARGETFLAGS)  -s
     118LDFLAGS_ODINCRT  = -Zso -Zsys -Zomf -Zmap $(LDTARGETFLAGS)  -s
    118119LD2FLAGS         = /nologo /noe /map /packcode /packdata /exepack:2 /nodebug /nod $(LD2TARGETFLAGS)
    119120LD2FLAGS_ODINCRT = /nologo /noe /map /packcode /packdata /exepack:2 /nodebug      $(LD2TARGETFLAGS)

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

    r6896 r9631  
    1 # $Id: odin32.tools.emx.mk,v 1.5 2001-09-30 09:46:16 bird Exp $
     1# $Id: odin32.tools.emx.mk,v 1.6 2003-01-06 13:24:20 sandervl Exp $
    22
    33#
    … …  
    3939# Interference rules.
    4040#
    41 .SUFFIXES: .orc_asm .orc .pre-c .pre-cpp
     41.SUFFIXES: .orc_asm .orc .pre-c .pre-cpp .S
    4242
    4343.c{$(OBJDIR)}.obj:
    … …  
    9898    $(CMDQD_SUB) $(OS2RC) $(OS2RCFLAGS) $(CINCLUDES:-I=-i ) $< $@
    9999
     100.S{$(OBJDIR)}.obj:
     101!ifdef USERAPP
     102    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o$(OBJDIR)\$(@B).obj -c $<
     103!else
     104    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -o$(OBJDIR)\$(@B).obj -c $<
     105!endif
     106
     107

  • trunk/include/os2sel.h

    r6997 r9631  
    1 /* $Id: os2sel.h,v 1.9 2001-10-10 21:22:13 phaller Exp $ */
     1/* $Id: os2sel.h,v 1.10 2003-01-06 13:24:20 sandervl Exp $ */
    22/*
    33 *
    … …  
    3333   value [bx] \
    3434   modify nomemory exact [ax];
     35#endif
     36
     37#ifdef  __EMX__
     38extern inline unsigned short GetFS(void)
     39{
     40 asm volatile (
     41    "mov %eax, %fs      \n\t"
     42 );
     43}
     44
     45extern inline void SetFS(unsigned short sel)
     46{
     47 asm volatile (
     48        "mov    %eax,%esp       \n\t"
     49        "mov    %fs, %eax       \n\t"
     50 );
     51}
     52
     53extern inline unsigned short RestoreOS2FS(void)
     54{
     55 asm volatile (
     56        "push    0x150b         \n\t"
     57        "mov     %ax, %fs       \n\t"
     58        "pop     %fs"
     59 );
     60}
     61
    3562
    3663#else
    … …  
    4067void           _System SetFS       (unsigned short selector);
    4168unsigned short _System SetReturnFS (unsigned short selector);
     69//SvL: Checks if thread FS & exception structure are valid
     70int            _System CheckCurFS(void);
    4271#endif
    4372
    44 //SvL: Checks if thread FS & exception structure are valid
    45 int            _System CheckCurFS(void);
    4673 
    4774 

  • trunk/include/win/msvcrt/ctype.h

    r8207 r9631  
    1010#define __WINE_USE_MSVCRT
    1111
    12 #include "msvcrt/wctype.h"
    13 
     12#ifndef MSVCRT
     13# ifdef USE_MSVCRT_PREFIX
     14#  define MSVCRT(x)    MSVCRT_##x
     15# else
     16#  define MSVCRT(x)    x
     17# endif
     18#endif
    1419
    1520#ifdef __cplusplus
    1621extern "C" {
    1722#endif
     23
     24#ifndef MSVCRT_WCHAR_T_DEFINED
     25#define MSVCRT_WCHAR_T_DEFINED
     26#ifndef __cplusplus
     27typedef unsigned short MSVCRT(wchar_t);
     28#endif
     29#endif
     30
     31#ifndef USE_MSVCRT_PREFIX
     32# ifndef WEOF
     33#  define WEOF        (wint_t)(0xFFFF)
     34# endif
     35#else
     36# ifndef MSVCRT_WEOF
     37#  define MSVCRT_WEOF (MSVCRT_wint_t)(0xFFFF)
     38# endif
     39#endif /* USE_MSVCRT_PREFIX */
     40
     41#ifndef MSVCRT_WCTYPE_T_DEFINED
     42typedef MSVCRT(wchar_t) MSVCRT(wint_t);
     43typedef MSVCRT(wchar_t) MSVCRT(wctype_t);
     44#define MSVCRT_WCTYPE_T_DEFINED
     45#endif
     46
     47/* ASCII char classification table - binary compatible */
     48#define _UPPER        0x0001  /* C1_UPPER */
     49#define _LOWER        0x0002  /* C1_LOWER */
     50#define _DIGIT        0x0004  /* C1_DIGIT */
     51#define _SPACE        0x0008  /* C1_SPACE */
     52#define _PUNCT        0x0010  /* C1_PUNCT */
     53#define _CONTROL      0x0020  /* C1_CNTRL */
     54#define _BLANK        0x0040  /* C1_BLANK */
     55#define _HEX          0x0080  /* C1_XDIGIT */
     56#define _LEADBYTE     0x8000
     57#define _ALPHA       (0x0100|_UPPER|_LOWER)  /* (C1_ALPHA|_UPPER|_LOWER) */
    1858
    1959int MSVCRT(__isascii)(int);
    … …  
    3878int MSVCRT(toupper)(int);
    3979
     80#ifndef MSVCRT_WCTYPE_DEFINED
     81#define MSVCRT_WCTYPE_DEFINED
     82int MSVCRT(is_wctype)(MSVCRT(wint_t),MSVCRT(wctype_t));
     83int MSVCRT(isleadbyte)(int);
     84int MSVCRT(iswalnum)(MSVCRT(wint_t));
     85int MSVCRT(iswalpha)(MSVCRT(wint_t));
     86int MSVCRT(iswascii)(MSVCRT(wint_t));
     87int MSVCRT(iswcntrl)(MSVCRT(wint_t));
     88int MSVCRT(iswctype)(MSVCRT(wint_t),MSVCRT(wctype_t));
     89int MSVCRT(iswdigit)(MSVCRT(wint_t));
     90int MSVCRT(iswgraph)(MSVCRT(wint_t));
     91int MSVCRT(iswlower)(MSVCRT(wint_t));
     92int MSVCRT(iswprint)(MSVCRT(wint_t));
     93int MSVCRT(iswpunct)(MSVCRT(wint_t));
     94int MSVCRT(iswspace)(MSVCRT(wint_t));
     95int MSVCRT(iswupper)(MSVCRT(wint_t));
     96int MSVCRT(iswxdigit)(MSVCRT(wint_t));
     97MSVCRT(wchar_t) MSVCRT(towlower)(MSVCRT(wchar_t));
     98MSVCRT(wchar_t) MSVCRT(towupper)(MSVCRT(wchar_t));
     99#endif /* MSVCRT_WCTYPE_DEFINED */
     100
    40101#ifdef __cplusplus
    41102}

  • trunk/include/win/msvcrt/eh.h

    r8207 r9631  
    3232#endif
    3333
     34struct _EXCEPTION_POINTERS;
    3435
    3536typedef void (*terminate_handler)();
    … …  
    3738typedef void (*unexpected_handler)();
    3839typedef void (*unexpected_function)();
    39 
     40typedef void (*_se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info);
    4041
    4142terminate_function MSVCRT(set_terminate)(terminate_function func);
    4243unexpected_function MSVCRT(set_unexpected)(unexpected_function func);
     44_se_translator_function MSVCRT(_set_se_translator)(_se_translator_function func);
     45
    4346void        MSVCRT(terminate)();
    4447void        MSVCRT(unexpected)();

  • trunk/include/win/msvcrt/excpt.h

    r8207 r9631  
    2323 * Return values from the actual exception handlers
    2424 */
    25 #ifndef ExceptionContinueExecution
     25
     26#undef  ExceptionContinueExecution
     27#undef  ExceptionContinueSearch
     28#undef  ExceptionNestedException
     29#undef  ExceptionCollidedUnwind
    2630
    2731typedef enum _EXCEPTION_DISPOSITION
    … …  
    4044#define EXCEPTION_CONTINUE_EXECUTION    -1
    4145
    42 #endif
    4346
    4447

  • trunk/include/win/msvcrt/malloc.h

    r8207 r9631  
    4040#define _USEDENTRY     1
    4141
    42 
    4342#ifndef MSVCRT_SIZE_T_DEFINED
    4443typedef unsigned int MSVCRT(size_t);
    4544#define MSVCRT_SIZE_T_DEFINED
    4645#endif
     46
    4747
    4848typedef struct _heapinfo

  • trunk/include/win/msvcrt/search.h

    r8207 r9631  
    2929
    3030
    31 #ifndef MSVCRT_SIZE_T_DEFINED
    32 typedef unsigned int MSVCRT(size_t);
    33 #define MSVCRT_SIZE_T_DEFINED
    34 #endif
    35 
    36 
    3731#ifdef __cplusplus
    3832extern "C" {

  • trunk/include/win/msvcrt/stddef.h

    r8207 r9631  
    3232#endif
    3333
     34#ifndef MSVCRT_WCHAR_T_DEFINED
     35#define MSVCRT_WCHAR_T_DEFINED
     36#ifndef __cplusplus
     37typedef unsigned short MSVCRT(wchar_t);
     38#endif
     39#endif
     40
    3441/* Best to leave this one alone: wchar_t */
    3542

  • trunk/include/win/msvcrt/stdio.h

    r8207 r9631  
    1313#include <stdarg.h>
    1414#endif
    15 #include "msvcrt/wctype.h"         /* For wint_t */
    16 
     15
     16#ifndef MSVCRT
     17# ifdef USE_MSVCRT_PREFIX
     18#  define MSVCRT(x)    MSVCRT_##x
     19# else
     20#  define MSVCRT(x)    x
     21# endif
     22#endif
    1723
    1824/* file._flag flags */
    … …  
    2733#define _IOAPPEND        0x0200
    2834#else
    29 #define MSVCRT__IOREAD   0x0001 
    30 #define MSVCRT__IOWRT    0x0002 
    31 #define MSVCRT__IOMYBUF  0x0008 
    32 #define MSVCRT__IOEOF    0x0010 
    33 #define MSVCRT__IOERR    0x0020 
    34 #define MSVCRT__IOSTRG   0x0040 
    35 #define MSVCRT__IORW     0x0080 
    36 #define MSVCRT__IOAPPEND 0x0200 
     35#define MSVCRT__IOREAD   0x0001
     36#define MSVCRT__IOWRT    0x0002
     37#define MSVCRT__IOMYBUF  0x0008
     38#define MSVCRT__IOEOF    0x0010
     39#define MSVCRT__IOERR    0x0020
     40#define MSVCRT__IOSTRG   0x0040
     41#define MSVCRT__IORW     0x0080
     42#define MSVCRT__IOAPPEND 0x0200
    3743#endif /* USE_MSVCRT_PREFIX */
    3844
     45#ifndef NULL
     46#ifdef  __cplusplus
     47#define NULL  0
     48#else
     49#define NULL  ((void *)0)
     50#endif
     51#endif
    3952
    4053#ifndef USE_MSVCRT_PREFIX
    … …  
    7790#endif /* USE_MSVCRT_PREFIX */
    7891
     92#ifndef MSVCRT_FILE_DEFINED
     93#define MSVCRT_FILE_DEFINED
    7994typedef struct MSVCRT(_iobuf)
    8095{
    … …  
    88103  char* _tmpfname;
    89104} MSVCRT(FILE);
    90 
     105#endif  /* MSVCRT_FILE_DEFINED */
     106
     107#ifndef MSVCRT_FPOS_T_DEFINED
    91108typedef long MSVCRT(fpos_t);
     109#define MSVCRT_FPOS_T_DEFINED
     110#endif
    92111
    93112#ifndef MSVCRT_SIZE_T_DEFINED
    … …  
    96115#endif
    97116
     117#ifndef MSVCRT_WCHAR_T_DEFINED
     118#define MSVCRT_WCHAR_T_DEFINED
     119#ifndef __cplusplus
     120typedef unsigned short MSVCRT(wchar_t);
     121#endif
     122#endif
     123
     124#ifndef MSVCRT_WCTYPE_T_DEFINED
     125typedef MSVCRT(wchar_t) MSVCRT(wint_t);
     126typedef MSVCRT(wchar_t) MSVCRT(wctype_t);
     127#define MSVCRT_WCTYPE_T_DEFINED
     128#endif
    98129
    99130#ifdef __cplusplus
    … …  
    101132#endif
    102133
     134#ifndef MSVCRT_STDIO_DEFINED
    103135MSVCRT(FILE)*        MSVCRT(__p__iob)(void);
    104136#define _iob               (__p__iob())
     137#endif /* MSVCRT_STDIO_DEFINED */
     138
    105139#ifndef USE_MSVCRT_PREFIX
    106140#define stdin              (_iob+STDIN_FILENO)
    … …  
    113147#endif /* USE_MSVCRT_PREFIX, __WINE__ */
    114148
    115 
     149#ifndef MSVCRT_STDIO_DEFINED
     150#define MSVCRT_STDIO_DEFINED
    116151int         _fcloseall(void);
    117152MSVCRT(FILE)* _fdopen(int,const char*);
    … …  
    177212int         MSVCRT(vsprintf)(char*,const char*,va_list);
    178213
    179 MSVCRT(wint_t) _fgetwchar(void);
    180 MSVCRT(wint_t) _fputwchar(MSVCRT(wint_t));
    181 WCHAR*      _getws(WCHAR*);
    182 int         _putws(const WCHAR*);
    183 int         _snwprintf(WCHAR*,MSVCRT(size_t),const WCHAR*,...);
    184 int         _vsnwprintf(WCHAR*,MSVCRT(size_t),const WCHAR*,va_list);
    185 MSVCRT(FILE)* _wfdopen(int,const WCHAR*);
    186 MSVCRT(FILE)* _wfopen(const WCHAR*,const WCHAR*);
    187 MSVCRT(FILE)* _wfreopen(const WCHAR*,const WCHAR*,MSVCRT(FILE)*);
    188 MSVCRT(FILE)* _wfsopen(const WCHAR*,const WCHAR*,int);
    189 void        _wperror(const WCHAR*);
    190 MSVCRT(FILE)* _wpopen(const WCHAR*,const WCHAR*);
    191 int         _wremove(const WCHAR*);
    192 WCHAR*      _wtempnam(const WCHAR*,const WCHAR*);
    193 WCHAR*      _wtmpnam(WCHAR*);
    194 
    195 MSVCRT(wint_t) MSVCRT(fgetwc)(MSVCRT(FILE)*);
    196 WCHAR*      MSVCRT(fgetws)(WCHAR*,int,MSVCRT(FILE)*);
    197 MSVCRT(wint_t) MSVCRT(fputwc)(MSVCRT(wint_t),MSVCRT(FILE)*);
    198 int         MSVCRT(fputws)(const WCHAR*,MSVCRT(FILE)*);
    199 int         MSVCRT(fwprintf)(MSVCRT(FILE)*,const WCHAR*,...);
    200 int         MSVCRT(fputws)(const WCHAR*,MSVCRT(FILE)*);
    201 int         MSVCRT(fwscanf)(MSVCRT(FILE)*,const WCHAR*,...);
    202 MSVCRT(wint_t) MSVCRT(getwc)(MSVCRT(FILE)*);
    203 MSVCRT(wint_t) MSVCRT(getwchar)(void);
    204 WCHAR*      MSVCRT(getws)(WCHAR*);
    205 MSVCRT(wint_t) MSVCRT(putwc)(MSVCRT(wint_t),MSVCRT(FILE)*);
    206 MSVCRT(wint_t) MSVCRT(putwchar)(MSVCRT(wint_t));
    207 int         MSVCRT(putws)(const WCHAR*);
    208 int         MSVCRT(swprintf)(WCHAR*,const WCHAR*,...);
    209 int         MSVCRT(swscanf)(WCHAR*,const WCHAR*,...);
    210 MSVCRT(wint_t) MSVCRT(ungetwc)(MSVCRT(wint_t),MSVCRT(FILE)*);
    211 int         MSVCRT(vfwprintf)(MSVCRT(FILE)*,const WCHAR*,va_list);
    212 int         MSVCRT(vswprintf)(WCHAR*,const WCHAR*,va_list);
    213 int         MSVCRT(vwprintf)(const WCHAR*,va_list);
    214 int         MSVCRT(wprintf)(const WCHAR*,...);
    215 int         MSVCRT(wscanf)(const WCHAR*,...);
     214#ifndef MSVCRT_WSTDIO_DEFINED
     215#define MSVCRT_WSTDIO_DEFINED
     216MSVCRT(wint_t)  _fgetwchar(void);
     217MSVCRT(wint_t)  _fputwchar(MSVCRT(wint_t));
     218MSVCRT(wchar_t)*_getws(MSVCRT(wchar_t)*);
     219int             _putws(const MSVCRT(wchar_t)*);
     220int             _snwprintf(MSVCRT(wchar_t)*,MSVCRT(size_t),const MSVCRT(wchar_t)*,...);
     221int             _vsnwprintf(MSVCRT(wchar_t)*,MSVCRT(size_t),const MSVCRT(wchar_t)*,va_list);
     222MSVCRT(FILE)*   _wfdopen(int,const MSVCRT(wchar_t)*);
     223MSVCRT(FILE)*   _wfopen(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*);
     224MSVCRT(FILE)*   _wfreopen(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,MSVCRT(FILE)*);
     225MSVCRT(FILE)*   _wfsopen(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,int);
     226void            _wperror(const MSVCRT(wchar_t)*);
     227MSVCRT(FILE)*   _wpopen(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*);
     228int             _wremove(const MSVCRT(wchar_t)*);
     229MSVCRT(wchar_t)*_wtempnam(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*);
     230MSVCRT(wchar_t)*_wtmpnam(MSVCRT(wchar_t)*);
     231
     232MSVCRT(wint_t)  MSVCRT(fgetwc)(MSVCRT(FILE)*);
     233MSVCRT(wchar_t)*MSVCRT(fgetws)(MSVCRT(wchar_t)*,int,MSVCRT(FILE)*);
     234MSVCRT(wint_t)  MSVCRT(fputwc)(MSVCRT(wint_t),MSVCRT(FILE)*);
     235int             MSVCRT(fputws)(const MSVCRT(wchar_t)*,MSVCRT(FILE)*);
     236int             MSVCRT(fwprintf)(MSVCRT(FILE)*,const MSVCRT(wchar_t)*,...);
     237int             MSVCRT(fputws)(const MSVCRT(wchar_t)*,MSVCRT(FILE)*);
     238int             MSVCRT(fwscanf)(MSVCRT(FILE)*,const MSVCRT(wchar_t)*,...);
     239MSVCRT(wint_t)  MSVCRT(getwc)(MSVCRT(FILE)*);
     240MSVCRT(wint_t)  MSVCRT(getwchar)(void);
     241MSVCRT(wchar_t)*MSVCRT(getws)(MSVCRT(wchar_t)*);
     242MSVCRT(wint_t)  MSVCRT(putwc)(MSVCRT(wint_t),MSVCRT(FILE)*);
     243MSVCRT(wint_t)  MSVCRT(putwchar)(MSVCRT(wint_t));
     244int             MSVCRT(putws)(const MSVCRT(wchar_t)*);
     245int             MSVCRT(swprintf)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...);
     246int             MSVCRT(swscanf)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...);
     247MSVCRT(wint_t)  MSVCRT(ungetwc)(MSVCRT(wint_t),MSVCRT(FILE)*);
     248int             MSVCRT(vfwprintf)(MSVCRT(FILE)*,const MSVCRT(wchar_t)*,va_list);
     249int             MSVCRT(vswprintf)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,va_list);
     250int             MSVCRT(vwprintf)(const MSVCRT(wchar_t)*,va_list);
     251int             MSVCRT(wprintf)(const MSVCRT(wchar_t)*,...);
     252int             MSVCRT(wscanf)(const MSVCRT(wchar_t)*,...);
     253#endif /* MSVCRT_WSTDIO_DEFINED */
     254
     255#endif /* MSVCRT_STDIO_DEFINED */
    216256
    217257#ifdef __cplusplus

  • trunk/include/win/msvcrt/stdlib.h

    r8207 r9631  
    2626#define _MAX_DRIVE          3
    2727#define _MAX_FNAME          256
     28
     29#ifndef _MAX_DIR
    2830#define _MAX_DIR            _MAX_FNAME
     31#endif
     32
     33#ifndef _MAX_EXT
    2934#define _MAX_EXT            _MAX_FNAME
     35#endif
     36
    3037#define _MAX_PATH           260
    3138#endif
    … …  
    4350
    4451
     52#ifdef __min /* watcom stdlib.h defines this */
     53#undef __min
     54#endif
     55
     56#ifdef __max /* watcom stdlib.h defines this */
     57#undef __max
     58#endif
     59
    4560#define __max(a,b) (((a) > (b)) ? (a) : (b))
    4661#define __min(a,b) (((a) < (b)) ? (a) : (b))
     62
    4763#ifndef __cplusplus
    4864#define max(a,b)   (((a) > (b)) ? (a) : (b))
    … …  
    167183WCHAR*      _ui64tow(unsigned __int64,WCHAR*,int);
    168184WCHAR*      _ultow(unsigned long,WCHAR*,int);
    169 WCHAR*      _wfullpath(WCHAR*,const WCHAR*,size_t);
     185WCHAR*      _wfullpath(WCHAR*,const WCHAR*,MSVCRT(size_t));
    170186WCHAR*      _wgetenv(const WCHAR*);
    171187void        _wmakepath(WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*);

  • trunk/include/win/msvcrt/sys/stat.h

    r8207 r9631  
    1010#define __WINE_USE_MSVCRT
    1111
    12 #include "msvcrt/sys/types.h"
     12#include "sys/types.h"
    1313
     14#ifndef MSVCRT
     15# ifdef USE_MSVCRT_PREFIX
     16#  define MSVCRT(x)    MSVCRT_##x
     17# else
     18#  define MSVCRT(x)    x
     19# endif
     20#endif
     21
     22#ifndef MSVCRT_WCHAR_T_DEFINED
     23#define MSVCRT_WCHAR_T_DEFINED
     24#ifndef __cplusplus
     25typedef unsigned short MSVCRT(wchar_t);
     26#endif
     27#endif
     28
     29#ifndef _MSC_VER
     30# ifndef __int64
     31#  define __int64 long long
     32# endif
     33#endif
     34
     35#ifndef MSVCRT_DEV_T_DEFINED
     36typedef unsigned int   _dev_t;
     37#define MSVCRT_DEV_T_DEFINED
     38#endif
     39
     40#ifndef MSVCRT_INO_T_DEFINED
     41typedef unsigned short _ino_t;
     42#define MSVCRT_INO_T_DEFINED
     43#endif
     44
     45#ifndef MSVCRT_TIME_T_DEFINED
     46typedef long MSVCRT(time_t);
     47#define MSVCRT_TIME_T_DEFINED
     48#endif
     49
     50#ifndef MSVCRT_OFF_T_DEFINED
     51typedef int MSVCRT(_off_t);
     52#define MSVCRT_OFF_T_DEFINED
     53#endif
    1454
    1555#define _S_IEXEC  0x0040
    … …  
    2262#define _S_IFMT   0xF000
    2363
     64/* for FreeBSD */
     65#undef st_atime
     66#undef st_ctime
     67#undef st_mtime
     68
     69#ifndef MSVCRT_STAT_DEFINED
     70#define MSVCRT_STAT_DEFINED
    2471
    2572struct _stat {
    … …  
    3178  short          st_gid;
    3279  _dev_t         st_rdev;
    33   _off_t        st_size;
     80  MSVCRT(_off_t) st_size;
    3481  MSVCRT(time_t) st_atime;
    3582  MSVCRT(time_t) st_mtime;
    … …  
    5097  MSVCRT(time_t) st_ctime;
    5198};
    52 
     99#endif /* MSVCRT_STAT_DEFINED */
    53100
    54101#ifdef __cplusplus
    … …  
    56103#endif
    57104
    58 int _fstat(int,struct _stat*);
     105int MSVCRT(_fstat)(int,struct _stat*);
     106int MSVCRT(_stat)(const char*,struct _stat*);
    59107int _fstati64(int,struct _stati64*);
    60 int _stat(const char*,struct _stat*);
    61108int _stati64(const char*,struct _stati64*);
    62109
    63 int _wstat(const WCHAR*,struct _stat*);
    64 int _wstati64(const WCHAR*,struct _stati64*);
     110#ifndef MSVCRT_WSTAT_DEFINED
     111#define MSVCRT_WSTAT_DEFINED
     112int _wstat(const MSVCRT(wchar_t)*,struct _stat*);
     113int _wstati64(const MSVCRT(wchar_t)*,struct _stati64*);
     114#endif /* MSVCRT_WSTAT_DEFINED */
    65115
    66116#ifdef __cplusplus

  • trunk/include/win/msvcrt/sys/timeb.h

    r8207 r9631  
    2222#define __WINE_USE_MSVCRT
    2323
    24 #include "msvcrt/sys/types.h"      /* For time_t */
     24#ifndef MSVCRT
     25# ifdef USE_MSVCRT_PREFIX
     26#  define MSVCRT(x)    MSVCRT_##x
     27# else
     28#  define MSVCRT(x)    x
     29# endif
     30#endif
    2531
     32#ifndef MSVCRT_TIME_T_DEFINED
     33typedef long MSVCRT(time_t);
     34#define MSVCRT_TIME_T_DEFINED
     35#endif
    2636
     37#ifndef MSVCRT_TIMEB_DEFINED
     38#define MSVCRT_TIMEB_DEFINED
    2739struct _timeb
    2840{
    … …  
    3244    short          dstflag;
    3345};
     46#endif /* MSVCRT_TIMEB_DEFINED */
    3447
    3548

  • trunk/include/win/msvcrt/sys/types.h

    r8207 r9631  
    2222#define __WINE_USE_MSVCRT
    2323
    24 
    25 #ifdef USE_MSVCRT_PREFIX
    26 #define MSVCRT(x)    MSVCRT_##x
    27 #else
    28 #define MSVCRT(x)    x
     24#ifndef MSVCRT
     25# ifdef USE_MSVCRT_PREFIX
     26#  define MSVCRT(x)    MSVCRT_##x
     27# else
     28#  define MSVCRT(x)    x
     29# endif
    2930#endif
    3031
     32#ifndef MSVCRT_DEV_T_DEFINED
     33typedef unsigned int   _dev_t;
     34#define MSVCRT_DEV_T_DEFINED
     35#endif
    3136
    32 typedef unsigned int   _dev_t;
     37#ifndef MSVCRT_INO_T_DEFINED
    3338typedef unsigned short _ino_t;
    34 typedef int            _off_t;
    35 typedef long           MSVCRT(time_t);
     39#define MSVCRT_INO_T_DEFINED
     40#endif
     41
     42#ifndef MSVCRT_OFF_T_DEFINED
     43typedef int MSVCRT(_off_t);
     44#define MSVCRT_OFF_T_DEFINED
     45#endif
     46
     47#ifndef MSVCRT_TIME_T_DEFINED
     48typedef long MSVCRT(time_t);
     49#define MSVCRT_TIME_T_DEFINED
     50#endif
    3651
    3752

  • trunk/include/win/msvcrt/sys/utime.h

    r8207 r9631  
    2222#define __WINE_USE_MSVCRT
    2323
    24 #include "winnt.h"
    25 #include "msvcrt/sys/types.h"      /* For time_t */
     24#ifndef MSVCRT
     25# ifdef USE_MSVCRT_PREFIX
     26#  define MSVCRT(x)    MSVCRT_##x
     27# else
     28#  define MSVCRT(x)    x
     29# endif
     30#endif
    2631
     32#ifndef MSVCRT_WCHAR_T_DEFINED
     33#define MSVCRT_WCHAR_T_DEFINED
     34#ifndef __cplusplus
     35typedef unsigned short MSVCRT(wchar_t);
     36#endif
     37#endif
    2738
     39#ifndef MSVCRT_TIME_T_DEFINED
     40typedef long MSVCRT(time_t);
     41#define MSVCRT_TIME_T_DEFINED
     42#endif
     43
     44#ifndef MSVCRT_UTIMBUF_DEFINED
     45#define MSVCRT_UTIMBUF_DEFINED
    2846struct _utimbuf
    2947{
    … …  
    3149    MSVCRT(time_t) modtime;
    3250};
    33 
     51#endif /* MSVCRT_UTIMBUF_DEFINED */
    3452
    3553#ifdef __cplusplus
    … …  
    4058int         _utime(const char*,struct _utimbuf*);
    4159
    42 int         _wutime(const WCHAR*,struct _utimbuf*);
     60int         _wutime(const MSVCRT(wchar_t)*,struct _utimbuf*);
    4361
    4462#ifdef __cplusplus

  • trunk/include/win/msvcrt/time.h

    r8207 r9631  
    2222#define __WINE_USE_MSVCRT
    2323
    24 #include "winnt.h"
    25 #include "msvcrt/sys/types.h"      /* For time_t */
     24#ifndef MSVCRT
     25# ifdef USE_MSVCRT_PREFIX
     26#  define MSVCRT(x)    MSVCRT_##x
     27# else
     28#  define MSVCRT(x)    x
     29# endif
     30#endif
    2631
     32#ifndef MSVCRT_WCHAR_T_DEFINED
     33#define MSVCRT_WCHAR_T_DEFINED
     34#ifndef __cplusplus
     35typedef unsigned short MSVCRT(wchar_t);
     36#endif
     37#endif
    2738
    2839#ifndef MSVCRT_SIZE_T_DEFINED
    … …  
    3142#endif
    3243
     44#ifndef MSVCRT_TIME_T_DEFINED
     45typedef long MSVCRT(time_t);
     46#define MSVCRT_TIME_T_DEFINED
     47#endif
     48
     49#ifndef MSVCRT_CLOCK_T_DEFINED
    3350typedef long MSVCRT(clock_t);
     51#define MSVCRT_CLOCK_T_DEFINED
     52#endif
    3453
     54#ifndef NULL
     55#ifdef __cplusplus
     56#define NULL  0
     57#else
     58#define NULL  ((void *)0)
     59#endif
     60#endif
     61
     62#ifndef MSVCRT_TM_DEFINED
     63#define MSVCRT_TM_DEFINED
    3564struct MSVCRT(tm) {
    3665    int tm_sec;
    … …  
    4473    int tm_isdst;
    4574};
    46 
     75#endif /* MSVCRT_TM_DEFINED */
    4776
    4877#ifdef __cplusplus
    … …  
    6998MSVCRT(time_t) MSVCRT(time)(MSVCRT(time_t)*);
    7099
    71 WCHAR*      _wasctime(const struct MSVCRT(tm)*);
    72 MSVCRT(size_t) wcsftime(WCHAR*,MSVCRT(size_t),const WCHAR*,const struct MSVCRT(tm)*);
    73 WCHAR*      _wctime(const MSVCRT(time_t)*);
    74 WCHAR*      _wstrdate(WCHAR*);
    75 WCHAR*      _wstrtime(WCHAR*);
     100#ifndef MSVCRT_WTIME_DEFINED
     101#define MSVCRT_WTIME_DEFINED
     102MSVCRT(wchar_t)*_wasctime(const struct MSVCRT(tm)*);
     103MSVCRT(size_t)  wcsftime(MSVCRT(wchar_t)*,MSVCRT(size_t),const MSVCRT(wchar_t)*,const struct MSVCRT(tm)*);
     104MSVCRT(wchar_t)*_wctime(const MSVCRT(time_t)*);
     105MSVCRT(wchar_t)*_wstrdate(MSVCRT(wchar_t)*);
     106MSVCRT(wchar_t)*_wstrtime(MSVCRT(wchar_t)*);
     107#endif /* MSVCRT_WTIME_DEFINED */
    76108
    77109#ifdef __cplusplus

  • trunk/include/win/msvcrt/wctype.h

    r8207 r9631  
    2222#define __WINE_USE_MSVCRT
    2323
    24 
    25 /* FIXME: winnt.h includes 'ctype.h' which includes 'wctype.h'. So we get
    26  * there but WCHAR is not defined.
    27  */
    28 /* Some systems might have wchar_t, but we really need 16 bit characters */
    29 #ifndef WINE_WCHAR_DEFINED
    30 #ifdef WINE_UNICODE_NATIVE
    31 typedef wchar_t         WCHAR,      *PWCHAR;
    32 #else
    33 typedef unsigned short  WCHAR,      *PWCHAR;
    34 #endif
    35 #define WINE_WCHAR_DEFINED
     24#ifndef MSVCRT
     25# ifdef USE_MSVCRT_PREFIX
     26#  define MSVCRT(x)    MSVCRT_##x
     27# else
     28#  define MSVCRT(x)    x
     29# endif
    3630#endif
    3731
    38 #ifdef USE_MSVCRT_PREFIX
    39 #define MSVCRT(x)    MSVCRT_##x
    40 #else
    41 #define MSVCRT(x)    x
     32#ifndef MSVCRT_WCHAR_T_DEFINED
     33#define MSVCRT_WCHAR_T_DEFINED
     34#ifndef __cplusplus
     35typedef unsigned short MSVCRT(wchar_t);
     36#endif
    4237#endif
    4338
    44 
    4539/* ASCII char classification table - binary compatible */
    46 #define _UPPER        C1_UPPER
    47 #define _LOWER        C1_LOWER
    48 #define _DIGIT        C1_DIGIT
    49 #define _SPACE        C1_SPACE
    50 #define _PUNCT        C1_PUNCT
    51 #define _CONTROL      C1_CNTRL
    52 #define _BLANK        C1_BLANK
    53 #define _HEX          C1_XDIGIT
     40#define _UPPER        0x0001  /* C1_UPPER */
     41#define _LOWER        0x0002  /* C1_LOWER */
     42#define _DIGIT        0x0004  /* C1_DIGIT */
     43#define _SPACE        0x0008  /* C1_SPACE */
     44#define _PUNCT        0x0010  /* C1_PUNCT */
     45#define _CONTROL      0x0020  /* C1_CNTRL */
     46#define _BLANK        0x0040  /* C1_BLANK */
     47#define _HEX          0x0080  /* C1_XDIGIT */
    5448#define _LEADBYTE     0x8000
    55 #define _ALPHA       (C1_ALPHA|_UPPER|_LOWER)
     49#define _ALPHA       (0x0100|_UPPER|_LOWER)  /* (C1_ALPHA|_UPPER|_LOWER) */
    5650
    5751#ifndef USE_MSVCRT_PREFIX
    5852# ifndef WEOF
    59 #  define WEOF        (WCHAR)(0xFFFF)
     53#  define WEOF        (wint_t)(0xFFFF)
    6054# endif
    6155#else
    6256# ifndef MSVCRT_WEOF
    63 #  define MSVCRT_WEOF (WCHAR)(0xFFFF)
     57#  define MSVCRT_WEOF (MSVCRT_wint_t)(0xFFFF)
    6458# endif
    6559#endif /* USE_MSVCRT_PREFIX */
    6660
    67 typedef WCHAR MSVCRT(wctype_t);
    68 typedef WCHAR MSVCRT(wint_t);
     61#ifndef MSVCRT_WCTYPE_T_DEFINED
     62typedef MSVCRT(wchar_t) MSVCRT(wint_t);
     63typedef MSVCRT(wchar_t) MSVCRT(wctype_t);
     64#define MSVCRT_WCTYPE_T_DEFINED
     65#endif
    6966
    7067/* FIXME: there's something to do with __p__pctype and __p__pwctype */
    … …  
    7572#endif
    7673
     74#ifndef MSVCRT_WCTYPE_DEFINED
     75#define MSVCRT_WCTYPE_DEFINED
    7776int MSVCRT(is_wctype)(MSVCRT(wint_t),MSVCRT(wctype_t));
    7877int MSVCRT(isleadbyte)(int);
    … …  
    9089int MSVCRT(iswupper)(MSVCRT(wint_t));
    9190int MSVCRT(iswxdigit)(MSVCRT(wint_t));
    92 WCHAR MSVCRT(towlower)(WCHAR);
    93 WCHAR MSVCRT(towupper)(WCHAR);
     91MSVCRT(wchar_t) MSVCRT(towlower)(MSVCRT(wchar_t));
     92MSVCRT(wchar_t) MSVCRT(towupper)(MSVCRT(wchar_t));
     93#endif /* MSVCRT_WCTYPE_DEFINED */
    9494
    9595#ifdef __cplusplus

  • trunk/include/win/ntddk.h

    r8444 r9631  
    822822void    WINAPI RtlSecondsSince1980ToTime( DWORD time, FILETIME *res );
    823823
     824typedef struct tagRTL_BITMAP {
     825    ULONG  SizeOfBitMap; /* Number of bits in the bitmap */
     826    LPBYTE BitMapBuffer; /* Bitmap data, assumed sized to a DWORD boundary */
     827} RTL_BITMAP, *PRTL_BITMAP;
     828
     829typedef const RTL_BITMAP *PCRTL_BITMAP;
     830
     831typedef struct tagRTL_BITMAP_RUN {
     832    ULONG StartOfRun; /* Bit position at which run starts - FIXME: Name? */
     833    ULONG SizeOfRun;  /* Size of the run in bits - FIXME: Name? */
     834} RTL_BITMAP_RUN, *PRTL_BITMAP_RUN;
     835
     836typedef const RTL_BITMAP_RUN *PCRTL_BITMAP_RUN;
     837
    824838/*      heap functions */
    825839

  • trunk/include/win/winbase.h

    r9591 r9631  
    263263#define INVALID_HANDLE_VALUE16  ((HANDLE16) -1)
    264264#define INVALID_HANDLE_VALUE  ((HANDLE) -1)
     265#define INVALID_SET_FILE_POINTER ((DWORD)-1)
    265266
    266267/* comm */

  • trunk/include/win/windef.h

    r9521 r9631  
    235235typedef unsigned long   ULONG_PTR;
    236236typedef double          DOUBLE;
    237 #if (__IBMC__ < 360) && (__IBMCPP__ < 360)
     237#if (__IBMC__ < 360) && (__IBMCPP__ < 360) && !defined (__EMX__)
    238238typedef double          LONGLONG;
    239239typedef double          ULONGLONG;
    240240typedef double          ULONGULONG;
    241241typedef double          DWORDLONG;
     242#elif defined (__EMX__)
     243typedef long long                 int64_t; /* LONGLONG */
     244typedef unsigned long long      u_int64_t; /* LONGLONG */
     245typedef unsigned long long       uint64_t; /* LONGLONG */
     246typedef int64_t         LONGLONG;
     247typedef uint64_t        ULONGLONG;
     248typedef uint64_t        ULONGULONG;
     249typedef uint64_t        DWORDLONG;
    242250#else
    243251#include <inttypes.h>

  • trunk/include/win/winnt.h

    r9521 r9631  
    9393#define TEXT(quote) __TEXT(quote)
    9494
    95 typedef BYTE     BOOLEAN;
    96 typedef BOOLEAN *PBOOLEAN;
     95typedef char            CCHAR;
     96typedef BYTE            BOOLEAN;
     97typedef BOOLEAN         *PBOOLEAN;
    9798typedef DWORD           EXECUTION_STATE;
    9899
Note: See TracChangeset for help on using the changeset viewer.