Changeset 805


Ignore:
Timestamp:
Sep 2, 1999, 10:57:43 PM (26 years ago)
Author:
phaller
Message:

Fix: LONGLONG header problem

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/changelog

    r788 r805  
    1  /* $Id: changelog,v 1.167 1999-09-02 11:10:18 phaller Exp $ */
     1 /* $Id: changelog,v 1.168 1999-09-02 20:57:43 phaller Exp $ */
    22
    33 99-09-01: Patrick Haller <phaller@gmx.net>
    4         - *:    Cleanup of include files, some ICOM issues in particular
     4        - *:    Cleanup of include files, some ICOM issues in particular,
     5                also fixes LONGLONG problem (now names LONGLONG_W)
    56        - SHELL32\NEW:  introduction of a straight port of WINE's SHELL32 implementation
     7                18 of 22 files are ported already
    68
    79 99-09-01: Patrick Haller <phaller@gmx.net>

  • trunk/include/win/windef.h

    r780 r805  
    1 /* $Id: windef.h,v 1.8 1999-09-01 19:12:14 phaller Exp $ */
     1/* $Id: windef.h,v 1.9 1999-09-02 20:56:29 phaller Exp $ */
    22
    33/*
    … …  
    183183typedef unsigned long   ULONG_PTR;
    184184typedef double          DOUBLE;
    185 typedef double          LONGLONG;
    186 typedef double          ULONGLONG;
     185typedef double          LONGLONG_W;
     186typedef double          ULONGLONG_W;
    187187
    188188/* FIXME: Wine does not compile with strict on, therefore strict

  • trunk/include/win/wine/obj_control.h

    r641 r805  
    1 /* $Id: obj_control.h,v 1.5 1999-08-22 22:52:07 sandervl Exp $ */
     1/* $Id: obj_control.h,v 1.6 1999-09-02 20:56:30 phaller Exp $ */
    22/*
    33 * Defines the COM interfaces and APIs related to structured data storage.
    … …  
    4545        DWORD clSize;
    4646        DWORD rpcReserved;
    47         ULONGLONG ahData[1];
     47        ULONGLONG_W ahData[1];
    4848} wireVARIANT_BLOB;
    4949

  • trunk/include/win/wtypes.h

    r636 r805  
    164164#endif
    165165    } u;
    166     LONGLONG int64;
     166    LONGLONG_W int64;
    167167} CY;
    168168#endif /* _tagCY_DEFINED */

  • trunk/include/win32type.h

    r780 r805  
    1 /* $Id: win32type.h,v 1.17 1999-09-01 19:12:13 phaller Exp $ */
     1/* $Id: win32type.h,v 1.18 1999-09-02 20:56:29 phaller Exp $ */
    22
    33/*
    … …  
    252252// doubles
    253253typedef double          DOUBLE;
    254 typedef double          LONGLONG;
    255 typedef double          ULONGULONG;
    256 typedef double          DWORDLONG;
    257 typedef ULONGULONG      *PULONGULONG;
    258 typedef DWORDLONG       *PDWORDLONG;
     254typedef double          LONGLONG_W;
     255typedef double          ULONGULONG_W;
     256typedef double          DWORDLONG_W;
     257typedef ULONGULONG_W    *PULONGULONG_W;
     258typedef DWORDLONG_W     *PDWORDLONG_W;
    259259
    260260// boolean
    … …  
    418418        LONG HighPart;
    419419    } u;
    420     ULONGULONG QuadPart;
     420    //@@@PH this can't really work ...
     421    ULONGULONG_W QuadPart;
    421422} LARGE_INTEGER;
    422423

  • trunk/src/kernel32/exceptions.cpp

    r730 r805  
    1 /* $Id: exceptions.cpp,v 1.18 1999-08-28 19:33:44 sandervl Exp $ */
     1/* $Id: exceptions.cpp,v 1.19 1999-09-02 20:56:48 phaller Exp $ */
    22
    33/*
    … …  
    10071007 USHORT sel = GetFS();
    10081008
    1009     SetExceptionChain(val);   
     1009    SetExceptionChain(val);
    10101010    SetFS(sel);
    10111011}
    … …  
    10321032  PWINEXCEPTION_FRAME orgframe;
    10331033  APIRET          rc;
    1034   ULONGULONG            timerval;
     1034  ULONGULONG_W    timerval;
    10351035
    10361036  DisableFPUExceptions();
Note: See TracChangeset for help on using the changeset viewer.