Changeset 780


Ignore:
Timestamp:
Sep 1, 1999, 9:12:23 PM (26 years ago)
Author:
phaller
Message:

Fix: header file cleanup (win32type.h)

Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/changelog

    r779 r780  
    1  /* $Id: changelog,v 1.165 1999-09-01 18:51:01 sandervl Exp $ */
     1 /* $Id: changelog,v 1.166 1999-09-01 19:12:12 phaller Exp $ */
     2
     3 99-09-01: Patrick Haller <phaller@gmx.net>
     4        - *:    Cleanup of include files. Warning: OS/2's BOOL is ULONG, WIN32 is INT.
     5                Causes C++ compilers to complain here and there. Plus many WINE prototypes
     6                are just plain wrong.
     7                This change should help porting shell32/new.
     8
    29
    310 99-09-01: Sander van Leeuwen <sandervl@xs4all.nl>

  • trunk/include/misc.h

    r25 r780  
    1 /* $Id: misc.h,v 1.6 1999-06-01 15:46:21 phaller Exp $ */
     1/* $Id: misc.h,v 1.7 1999-09-01 19:12:13 phaller Exp $ */
    22
    33/*
    … …  
    1010#define __MISC_H__
    1111
     12#ifndef _OS2WIN_H
     13  #include <win32type.h>
     14#endif
     15
    1216#ifdef __cplusplus
    1317      extern "C" {
    1418#endif
    15 
    1619
    1720/* enable support for the _interrupt() statement */
    … …  
    4043
    4144
    42 #ifndef ULONG
    43 #  define ULONG unsigned long
     45// necessary types
     46#ifdef ULONG
     47  #error ULONG definition is bad.
     48  #define ULONG nope.
    4449#endif
    45 
    46 #ifndef HMODULE
    47 #  define HMODULE ULONG
    48 #endif
     50typedef unsigned long ULONG;
     51typedef unsigned long HMODULE;
    4952
    5053#ifndef SYSTEM
    … …  
    6366
    6467
    65 #ifndef _OS2WIN_H
    66   #include <win32type.h>
    67 #endif
    68 
    6968#include "versionos2.h"
    7069#include "unicode.h"
    7170
    72 
    7371#endif

  • trunk/include/win/shellapi.h

    r183 r780  
    1 /* $Id: shellapi.h,v 1.2 1999-06-24 19:27:48 phaller Exp $ */
     1/* $Id: shellapi.h,v 1.3 1999-09-01 19:12:13 phaller Exp $ */
    22
    33#ifndef _WINE_SHELLAPI_H
    … …  
    1212 */
    1313
    14 typedef struct _DRAGINFOA 
     14typedef struct _DRAGINFOA
    1515{       UINT uSize;
    1616        POINT pt;
    … …  
    2020} DRAGINFOA, * LPDRAGINFOA;
    2121
    22 typedef struct _DRAGINFOW 
     22typedef struct _DRAGINFOW
    2323{       UINT uSize;
    2424        POINT pt;
    … …  
    7979#define ABE_BOTTOM              3
    8080
    81 typedef struct _AppBarData 
     81typedef struct _AppBarData
    8282{       DWORD   cbSize;
    8383        HWND    hWnd;
    … …  
    113113#define SHGFI_ATTR_SPECIFIED    0x000020000     /* get only specified attributes */
    114114
    115 typedef struct tagSHFILEINFOA 
     115typedef struct tagSHFILEINFOA
    116116{       HICON   hIcon;                  /* icon */
    117117        int     iIcon;                  /* icon index */
    … …  
    121121} SHFILEINFOA;
    122122
    123 typedef struct tagSHFILEINFOW 
     123typedef struct tagSHFILEINFOW
    124124{       HICON   hIcon;                  /* icon */
    125125        int     iIcon;                  /* icon index */
    … …  
    147147#define FOF_MULTIDESTFILES         0x0001
    148148#define FOF_CONFIRMMOUSE           0x0002
    149 #define FOF_SILENT                 0x0004 
     149#define FOF_SILENT                 0x0004
    150150#define FOF_RENAMEONCOLLISION      0x0008
    151 #define FOF_NOCONFIRMATION         0x0010 
    152 #define FOF_WANTMAPPINGHANDLE      0x0020 
     151#define FOF_NOCONFIRMATION         0x0010
     152#define FOF_WANTMAPPINGHANDLE      0x0020
    153153#define FOF_ALLOWUNDO              0x0040
    154 #define FOF_FILESONLY              0x0080 
    155 #define FOF_SIMPLEPROGRESS         0x0100 
    156 #define FOF_NOCONFIRMMKDIR         0x0200 
    157 #define FOF_NOERRORUI              0x0400 
     154#define FOF_FILESONLY              0x0080
     155#define FOF_SIMPLEPROGRESS         0x0100
     156#define FOF_NOCONFIRMMKDIR         0x0200
     157#define FOF_NOERRORUI              0x0400
    158158
    159159typedef WORD FILEOP_FLAGS;
    160160
    161 #define PO_DELETE       0x0013 
    162 #define PO_RENAME       0x0014 
    163 #define PO_PORTCHANGE   0x0020 
     161#define PO_DELETE       0x0013
     162#define PO_RENAME       0x0014
     163#define PO_PORTCHANGE   0x0020
    164164
    165165typedef WORD PRINTEROP_FLAGS;
    … …  
    187187} SHFILEOPSTRUCTW, *LPSHFILEOPSTRUCTW;
    188188
    189 DWORD   WIN32API SHFileOperationA (LPSHFILEOPSTRUCTA lpFileOp); 
     189DWORD   WIN32API SHFileOperationA (LPSHFILEOPSTRUCTA lpFileOp);
    190190DWORD   WIN32API SHFileOperationW (LPSHFILEOPSTRUCTW lpFileOp);
    191191
    … …  
    300300HINSTANCE WINAPI FindExecutableW(LPCWSTR,LPCWSTR,LPWSTR);
    301301
    302 BOOL      WINAPI ShellAboutA(HWND,LPCSTR,LPCSTR,HICON);
    303 BOOL      WINAPI ShellAboutW(HWND,LPCWSTR,LPCWSTR,HICON);
     302INT WINAPI ShellAboutA(HWND,LPCSTR,LPCSTR,HICON);
     303INT WINAPI ShellAboutW(HWND,LPCWSTR,LPCWSTR,HICON);
    304304
    305305#pragma pack(4)

  • trunk/include/win/windef.h

    r746 r780  
    1 /* $Id: windef.h,v 1.7 1999-08-30 22:15:20 sandervl Exp $ */
     1/* $Id: windef.h,v 1.8 1999-09-01 19:12:14 phaller Exp $ */
    22
    33/*
    … …  
    178178typedef unsigned short  WCHAR;
    179179typedef unsigned short  BOOL16;
    180 typedef int             BOOL;
     180typedef unsigned long   BOOL;
    181181typedef double          DATE;
    182182typedef long            LONG_PTR;

  • trunk/include/win/wingdi.h

    r619 r780  
    1 /* $Id: wingdi.h,v 1.2 1999-08-22 11:39:38 sandervl Exp $ */
     1/* $Id: wingdi.h,v 1.3 1999-09-01 19:12:14 phaller Exp $ */
    22
    33#ifndef __WINE_WINGDI_H
    … …  
    319319#define COLORONCOLOR         3
    320320#define HALFTONE             4
    321 #define MAXSTRETCHBLTMODE    4 
     321#define MAXSTRETCHBLTMODE    4
    322322
    323323#define STRETCH_ANDSCANS     BLACKONWHITE
    … …  
    425425
    426426typedef struct
    427 { 
     427{
    428428    UINT16     lbStyle;
    429429    COLORREF   lbColor WINE_PACKED;
    … …  
    432432
    433433typedef struct
    434 { 
     434{
    435435    UINT     lbStyle;
    436436    COLORREF   lbColor;
    … …  
    585585 *
    586586 * fsCsb  64-bit bitmap. The low 32 bits map the Windows codepages for
    587  *        which the font provides glyphs. The high 32 bits are for 
     587 *        which the font provides glyphs. The high 32 bits are for
    588588 *        non Windows codepages.
    589589 */
    … …  
    594594} FONTSIGNATURE,*LPFONTSIGNATURE;
    595595
    596 typedef struct 
     596typedef struct
    597597{
    598598  UINT  ciCharset; /* character set */
    … …  
    626626#define OBJ_ENHMETAFILE     13
    627627
    628  
     628
    629629typedef struct
    630630{
    … …  
    637637} XFORM, *LPXFORM;
    638638
    639 typedef struct 
     639typedef struct
    640640{
    641641    INT16  txfHeight;
    … …  
    13761376#define TT_PRIM_LINE    1
    13771377#define TT_PRIM_QSPLINE 2
    1378 #define TT_POLYGON_TYPE 24 
     1378#define TT_POLYGON_TYPE 24
    13791379
    13801380/* Get/SetSystemPaletteUse() values */
    … …  
    13931393
    13941394typedef struct
    1395 { 
     1395{
    13961396    WORD           palVersion;
    13971397    WORD           palNumEntries;
    … …  
    14031403typedef struct
    14041404{
    1405     UINT16   lopnStyle; 
     1405    UINT16   lopnStyle;
    14061406    POINT16  lopnWidth WINE_PACKED;
    14071407    COLORREF lopnColor WINE_PACKED;
    … …  
    14101410typedef struct
    14111411{
    1412     UINT   lopnStyle; 
     1412    UINT   lopnStyle;
    14131413    POINT  lopnWidth WINE_PACKED;
    14141414    COLORREF lopnColor WINE_PACKED;
    … …  
    17881788#define CBM_INIT         4
    17891789
    1790 typedef struct 
     1790typedef struct
    17911791{
    17921792        BITMAP          dsBm;
    … …  
    19641964   ie. the header is just the first record in the metafile */
    19651965typedef struct {
    1966     DWORD iType; 
    1967     DWORD nSize; 
    1968     RECTL rclBounds; 
    1969     RECTL rclFrame; 
    1970     DWORD dSignature; 
    1971     DWORD nVersion; 
    1972     DWORD nBytes; 
    1973     DWORD nRecords; 
    1974     WORD  nHandles; 
    1975     WORD  sReserved; 
    1976     DWORD nDescription; 
    1977     DWORD offDescription; 
    1978     DWORD nPalEntries; 
    1979     SIZEL szlDevice; 
     1966    DWORD iType;
     1967    DWORD nSize;
     1968    RECTL rclBounds;
     1969    RECTL rclFrame;
     1970    DWORD dSignature;
     1971    DWORD nVersion;
     1972    DWORD nBytes;
     1973    DWORD nRecords;
     1974    WORD  nHandles;
     1975    WORD  sReserved;
     1976    DWORD nDescription;
     1977    DWORD offDescription;
     1978    DWORD nPalEntries;
     1979    SIZEL szlDevice;
    19801980    SIZEL szlMillimeters;
    19811981    DWORD cbPixelFormat;
    19821982    DWORD offPixelFormat;
    19831983    DWORD bOpenGL;
    1984 } ENHMETAHEADER, *LPENHMETAHEADER; 
    1985 
    1986 typedef struct {
    1987     DWORD iType; 
    1988     DWORD nSize; 
    1989     DWORD dParm[1]; 
    1990 } ENHMETARECORD, *LPENHMETARECORD; 
     1984} ENHMETAHEADER, *LPENHMETAHEADER;
     1985
     1986typedef struct {
     1987    DWORD iType;
     1988    DWORD nSize;
     1989    DWORD dParm[1];
     1990} ENHMETARECORD, *LPENHMETARECORD;
    19911991
    19921992typedef struct {
    … …  
    22882288    DWORD    offBmiMask;
    22892289    DWORD    cbBmiMask;
    2290     DWORD    offBitsMask; 
     2290    DWORD    offBitsMask;
    22912291    DWORD    cbBitsMask;
    22922292} EMRPLGBLT, *PEMRPLGBLT;
    … …  
    23202320    POINTL aptl[1];
    23212321    BYTE   abTypes[1];
    2322 } EMRPOLYDRAW, *PEMRPOLYDRAW; 
     2322} EMRPOLYDRAW, *PEMRPOLYDRAW;
    23232323
    23242324typedef struct {
    … …  
    25082508} EMRSTRETCHDIBITS, *PEMRSTRETCHDIBITS;
    25092509
    2510 typedef INT (* CALLBACK ENHMFENUMPROC)(HDC, LPHANDLETABLE, 
     2510typedef INT (* CALLBACK ENHMFENUMPROC)(HDC, LPHANDLETABLE,
    25112511                                          LPENHMETARECORD, INT, LPVOID);
    25122512
    … …  
    28442844#define DMTT_SUBDEV             3
    28452845
    2846 typedef struct 
     2846typedef struct
    28472847{
    28482848    INT16    cbSize;
    … …  
    28512851} DOCINFO16, *LPDOCINFO16;
    28522852
    2853 typedef struct 
     2853typedef struct
    28542854{
    28552855    INT    cbSize;
    … …  
    28602860} DOCINFOA, *LPDOCINFOA;
    28612861
    2862 typedef struct 
     2862typedef struct
    28632863{
    28642864    INT    cbSize;
    … …  
    29632963
    29642964BOOL      WINAPI AngleArc(HDC, INT, INT, DWORD, FLOAT, FLOAT);
    2965 BOOL      WINAPI ArcTo(HDC, INT, INT, INT, INT, INT, INT, INT, INT); 
     2965BOOL      WINAPI ArcTo(HDC, INT, INT, INT, INT, INT, INT, INT, INT);
    29662966HENHMETAFILE WINAPI CloseEnhMetaFile(HDC);
    29672967HBRUSH    WINAPI CreateDIBPatternBrushPt(const void*,UINT);
    … …  
    30663066HMETAFILE WINAPI SetMetaFileBitsEx(UINT,const BYTE*);
    30673067BOOL      WINAPI SetWorldTransform(HDC,const XFORM*);
    3068 BOOL      WINAPI TranslateCharsetInfo(LPDWORD,LPCHARSETINFO,DWORD);
     3068UINT      WINAPI TranslateCharsetInfo(LPDWORD,LPCHARSETINFO,DWORD);
    30693069
    30703070/* Declarations for functions that change between Win16 and Win32 */

  • trunk/include/win32type.h

    r698 r780  
    1 /* $Id: win32type.h,v 1.16 1999-08-25 15:47:40 sandervl Exp $ */
     1/* $Id: win32type.h,v 1.17 1999-09-01 19:12:13 phaller Exp $ */
     2
     3/*
     4 * Win32 type definitions for OS/2
     5 *
     6 * Copyright 1998 Sander van Leeuwen
     7 * Copyright 1998 Patrick Haller
     8 *
     9 * Project Odin Software License can be found in LICENSE.TXT
     10 *
     11 */
     12
    213
    314#ifndef __WIN32TYPE_H__
    … …  
    819#pragma pack(1)
    920
     21// linkage macros
    1022#define NEAR
    1123#define FAR
    1224#define UNALIGNED
    13 
    14 
    15 #ifndef VOID
    16 #  define VOID void
    17 #endif
    18 
    19 #ifndef LONG
    20 #  define LONG long
    21 #endif
    22 
    23 #ifndef ULONG
    24 #  define ULONG unsigned long
    25 #endif
    26 
    27 #ifndef SHORT
    28 #  define SHORT short
    29 #endif
    30 
    31 #ifndef USHORT
    32 #  define USHORT unsigned short
    33 #endif
    34 
    35 #ifndef CHAR
    36 #  define CHAR char
    37 #endif
    38 
    39 #ifndef UCHAR
    40 #  define UCHAR unsigned char
    41 #endif
    42 
    43 
    44 
    45 #define LPVOID  VOID *
    46 #define LPCVOID const VOID *
    47 #define DWORD   ULONG
    48 #define LPDWORD DWORD *
    49 #define LPLONG  LONG *
    50 #define PDWORD  DWORD *
    51 #define LRESULT DWORD
    52 typedef LONG    LPARAM;
    53 typedef unsigned int    UINT;
    54 typedef UINT    WPARAM;
    5525#define CONST   const
     26
     27
     28/*****************************************************************************
     29 * Base types (already defined in OS2DEF.H)                                  *
     30 *****************************************************************************/
     31
     32#ifndef OS2DEF_INCLUDED
     33// void
     34#undef VOID
     35#undef PVOID
     36typedef void            VOID;
     37typedef void*           PVOID;
     38
     39// 32 bit integers
     40#undef LONG
     41#undef PLONG
     42#undef PCLONG
     43typedef                long   LONG;
     44typedef         signed long*  PLONG;
     45typedef const   signed long*  PCLONG;
     46
     47#undef ULONG
     48#undef PULONG
     49#undef PCULONG
     50typedef       unsigned long   ULONG;
     51typedef       unsigned long*  PULONG;
     52typedef const unsigned long*  PCULONG;
     53
     54#undef INT32
     55#undef PINT32
     56#undef PCINT32
     57typedef       unsigned int    INT32;
     58typedef       unsigned int *  PINT32;
     59typedef const unsigned int *  PCINT32;
     60
     61#undef UINT32
     62#undef PUINT32
     63#undef PCUINT32
     64typedef       unsigned int    UINT32;
     65typedef       unsigned int *  PUINT32;
     66typedef const unsigned int *  PCUINT32;
     67
     68#undef UINT
     69#undef PUINT
     70#undef PCUINT
     71typedef       unsigned int    UINT;
     72typedef       unsigned int *  PUINT;
     73typedef const unsigned int *  PCUINT;
     74
     75
     76// 16 bit integers
     77#undef SHORT
     78#undef PSHORT
     79#undef PCSHORT
     80typedef                short  SHORT;
     81typedef         signed short* PSHORT;
     82typedef const   signed short* PCSHORT;
     83
     84#undef USHORT
     85#undef PUSHORT
     86#undef PCUSHORT
     87typedef       unsigned short  USHORT;
     88typedef       unsigned short* PUSHORT;
     89typedef const unsigned short* PCUSHORT;
     90
     91#undef UINT16
     92#undef PUINT16
     93#undef PCUINT16
     94typedef       unsigned short  UINT16;
     95typedef       unsigned short* PUINT16;
     96typedef const unsigned short* PCUINT16;
     97
     98
     99// 8 bit integers
     100#undef UCHAR
     101#undef PUCHAR
     102#undef PCUCHAR
     103typedef       unsigned char  UCHAR;
     104typedef       unsigned char* PUCHAR;
     105typedef const unsigned char* PCUCHAR;
     106
     107#undef UINT8
     108#undef PUINT8
     109#undef PCUINT8
     110typedef       unsigned char   UINT8;
     111typedef       unsigned char*  PUINT8;
     112typedef const unsigned char*  PCUINT8;
     113
     114#undef INT8
     115#undef PINT8
     116#undef PCINT8
     117typedef         signed char   INT8;
     118typedef         signed char*  PINT8;
     119typedef const   signed char*  PCINT8;
     120
     121#undef BYTE
     122#undef PBYTE
     123#undef PCBYTE
     124typedef       unsigned char  BYTE;
     125typedef       unsigned char* PBYTE;
     126typedef const unsigned char* PCBYTE;
     127
     128
     129#endif
     130
     131
     132/*****************************************************************************
     133 * Common types                                                              *
     134 *****************************************************************************/
     135
     136#if !(defined(__WINE_WINDEF_H) || defined(OS2DEF_INCLUDED))
     137
     138#undef INT
     139#undef PINT
     140#undef PCINT
     141typedef       unsigned int    INT;
     142typedef       unsigned int *  PINT;
     143typedef const unsigned int *  PCINT;
     144
     145#undef CHAR
     146#undef PCHAR
     147#undef PCCHAR
     148typedef                char   CHAR;
     149typedef         signed char*  PCHAR;
     150typedef const   signed char*  PCCHAR;
     151
     152
     153#endif
     154
     155/*****************************************************************************
     156 * Win32 types                                                               *
     157 *****************************************************************************/
     158
     159#ifndef __WINE_WINDEF_H
     160// void
     161#undef LPVOID
     162#undef LPCVOID
     163typedef void*           LPVOID;
     164typedef const void*     LPCVOID;
     165
     166// 32 bit integers
     167#undef LPLONG
     168#undef LPCLONG
     169typedef         signed long*  LPLONG;
     170typedef const   signed long*  LPCLONG;
     171
     172#undef LPULONG
     173#undef LPCULONG
     174typedef       unsigned long*  LPULONG;
     175typedef const unsigned long*  LPCULONG;
     176
     177#undef LPINT32
     178#undef LPCINT32
     179typedef       unsigned int *  LPINT32;
     180typedef const unsigned int *  LPCINT32;
     181
     182#undef LPINT
     183#undef LPCINT
     184typedef       unsigned int *  LPINT;
     185typedef const unsigned int *  LPCINT;
     186
     187#undef LPUINT32
     188#undef LPCUINT32
     189typedef       unsigned int *  LPUINT32;
     190typedef const unsigned int *  LPCUINT32;
     191
     192#undef LPUINT
     193#undef LPCUINT
     194typedef       unsigned int *  LPUINT;
     195typedef const unsigned int *  LPCUINT;
     196
     197
     198// 16 bit integers
     199#undef INT16
     200#undef PINT16
     201#undef PCINT16
     202typedef       unsigned short  INT16;
     203typedef       unsigned short* PINT16;
     204typedef const unsigned short* PCINT16;
     205
     206#undef LPUINT16
     207#undef LPCUINT16
     208typedef       unsigned short* LPUINT16;
     209typedef const unsigned short* LPCUINT16;
     210
     211#undef LPSHORT
     212#undef LPCSHORT
     213typedef         signed short* LPSHORT;
     214typedef const   signed short* LPCSHORT;
     215
     216#undef LPUSHORT
     217#undef LPCUSHORT
     218typedef       unsigned short* LPUSHORT;
     219typedef const unsigned short* LPCUSHORT;
     220
     221#undef LPINT16
     222#undef LPCINT16
     223typedef       unsigned short* LPINT16;
     224typedef const unsigned short* LPCINT16;
     225
     226// 8 bit integers
     227#undef LPCHAR
     228#undef LPCCHAR
     229typedef         signed char*  LPCHAR;
     230typedef const   signed char*  LPCCHAR;
     231
     232#undef LPUCHAR
     233#undef LPCUCHAR
     234typedef       unsigned char* LPUCHAR;
     235typedef const unsigned char* LPCUCHAR;
     236
     237#undef LPUINT8
     238#undef LPCUINT8
     239typedef       unsigned char*  LPUINT8;
     240typedef const unsigned char*  LPCUINT8;
     241
     242#undef LPINT8
     243#undef LPCINT8
     244typedef         signed char*  LPINT8;
     245typedef const   signed char*  LPCINT8;
     246
     247#undef LPBYTE
     248#undef LPCBYTE
     249typedef       unsigned char* LPBYTE;
     250typedef const unsigned char* LPCBYTE;
     251
     252// doubles
     253typedef double          DOUBLE;
     254typedef double          LONGLONG;
     255typedef double          ULONGULONG;
     256typedef double          DWORDLONG;
     257typedef ULONGULONG      *PULONGULONG;
     258typedef DWORDLONG       *PDWORDLONG;
     259
     260// boolean
     261typedef unsigned long   BOOL32;
     262typedef unsigned short  BOOL16;
     263typedef unsigned long   BOOL;
     264
     265
     266// calling conventions / linkage
     267#ifndef WINAPI
     268#  error Please include ODIN.H
     269#endif
     270
     271#ifndef WIN32API
     272#  error Please include ODIN.H
     273#endif
     274
     275
     276// 32 bit integer
     277#undef DWORD
     278#undef PDWORD
     279#undef LPDWORD
     280#undef PCDWORD
     281#undef LPCDWORD
     282typedef       unsigned long   DWORD;
     283typedef       unsigned long*  PDWORD;
     284typedef       unsigned long*  LPDWORD;
     285typedef const unsigned long*  PCDWORD;
     286typedef const unsigned long*  LPCDWORD;
     287
     288typedef DWORD LRESULT;
     289
     290
     291// 16 bit integer
     292#undef WORD
     293#undef PWORD
     294#undef LPWORD
     295#undef PCWORD
     296#undef LPCWORD
     297typedef       unsigned short  WORD;
     298typedef       unsigned short* PWORD;
     299typedef       unsigned short* LPWORD;
     300typedef const unsigned short* PCWORD;
     301typedef const unsigned short* LPCWORD;
     302
     303
     304
     305// strings
     306/* Some systems might have wchar_t, but we really need 16 bit characters */
     307typedef unsigned short  WCHAR;
    56308#define LPTSTR  char *
    57309#define LPSTR   char *
    58310#define LPCSTR  const char *
    59311#define LPCTSTR const char *
    60 #define LPBYTE  unsigned char *
     312#define LPWSTR  WCHAR *
     313#define LPCWSTR const WCHAR *
     314
     315// handles
    61316#define HANDLE  ULONG
    62317#define PHANDLE HANDLE *
    63 #define WORD    USHORT
    64 #define LPWORD  WORD *
    65 #define PWORD   WORD *
    66 #define LPCWORD const WORD *
    67 #define WCHAR   USHORT
    68 #define LPWSTR  WCHAR *
    69 #define LPCWSTR const WCHAR *
    70318#define HINSTANCE ULONG
    71319#define HGLOBAL DWORD
    … …  
    79327#define WNDPROC_O32 DWORD
    80328#define HRESULT DWORD
     329#define HFILE   DWORD
    81330
    82331//Wine types
    83 #define UINT16  WORD
    84 #define UINT32  DWORD
    85 #define BOOL16  WORD
    86332#define HMODULE32 HMODULE
    87333#define HWND16  WORD
    88334#define HWND32  DWORD
    89335#define LPUINT16 WORD *
    90 #define LPUINT32 DWORD *
    91336#define HTASK16  WORD
    92337#define HMMIO16  WORD
    93338#define HTASK32  DWORD
    94339#define HMMIO32  DWORD
    95 #define INT16    short int
    96 #define INT32    int
    97340#define SEGPTR   DWORD
    98341#define RECT16   RECT
    … …  
    103346#define HDRV16   WORD
    104347#define HINSTANCE16 WORD
    105 typedef double    ULONGULONG;
    106 typedef double     DWORDLONG;
    107 typedef ULONGULONG  *PULONGULONG;
    108 typedef DWORDLONG *PDWORDLONG;
    109 #define BOOL      int
     348
     349// other
     350#ifndef HWND
     351#  define HWND HWND32
     352#endif
     353
     354typedef LONG    LPARAM;
     355typedef UINT    WPARAM;
     356
     357typedef double          DATE;
     358typedef long            LONG_PTR;
     359typedef unsigned long   ULONG_PTR;
     360
    110361
    111362#define DECLSPEC_IMPORT
    112363
    113 #define DECLARE_HANDLE(x) typedef DWORD x
    114 
    115 typedef union _LARGE_INTEGER {
    116     struct {
    117         ULONG LowPart;
    118         LONG HighPart;
    119     } u;
    120     ULONGULONG QuadPart;
    121 } LARGE_INTEGER;
     364
    122365
    123366/* The security attributes structure */
    … …  
    128371    BOOL  bInheritHandle;
    129372} SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
     373
    130374
    131375#define OFS_MAXPATHNAME 128
    … …  
    138382    BYTE szPathName[OFS_MAXPATHNAME];
    139383} OFSTRUCT, *LPOFSTRUCT;
     384
    140385
    141386#ifndef _FILETIME_
    … …  
    163408} BY_HANDLE_FILE_INFORMATION ;
    164409
    165 DECLARE_HANDLE(HTASK);
    166 
    167 #ifndef WIN32API
    168 #define WIN32API __stdcall
    169 #endif
    170 
    171410#define CALLBACK WIN32API
    172411
    … …  
    174413typedef LRESULT (* CALLBACK FARPROC16)();
    175414
    176 typedef struct tagPOINT
    177 {
    178     LONG  x;
    179     LONG  y;
    180 } POINT, *PPOINT, *LPPOINT;
    181 
    182 typedef struct
    183 {
    184     HWND    hwnd;
    185     UINT    message;
    186     WPARAM  wParam;
    187     LPARAM  lParam;
    188     DWORD   time;
    189     POINT   pt;
    190 } MSG, *LPMSG;
     415typedef union _LARGE_INTEGER {
     416    struct {
     417        ULONG LowPart;
     418        LONG HighPart;
     419    } u;
     420    ULONGULONG QuadPart;
     421} LARGE_INTEGER;
     422
    191423
    192424typedef struct
    … …  
    222454} WNDCLASSEXW, *LPWNDCLASSEXW;
    223455
     456
     457typedef struct tagPOINT
     458{
     459    LONG  x;
     460    LONG  y;
     461} POINT, *PPOINT, *LPPOINT;
     462
     463
     464typedef struct
     465{
     466    HWND    hwnd;
     467    UINT    message;
     468    WPARAM  wParam;
     469    LPARAM  lParam;
     470    DWORD   time;
     471    POINT   pt;
     472} MSG, *LPMSG;
     473
     474
     475#ifndef RECT
     476//conflict with mcios2.h
     477
     478typedef struct tagRECT
     479{
     480    INT  left;
     481    INT  top;
     482    INT  right;
     483    INT  bottom;
     484} RECT, *PRECT, *LPRECT;
     485typedef const RECT *LPCRECT;
     486#endif
     487
     488
     489/* WM_WINDOWPOSCHANGING/CHANGED struct */
     490typedef struct tagWINDOWPOS
     491{
     492    HWND  hwnd;
     493    HWND  hwndInsertAfter;
     494    INT   x;
     495    INT   y;
     496    INT   cx;
     497    INT   cy;
     498    UINT  flags;
     499} WINDOWPOS, *PWINDOWPOS, *LPWINDOWPOS;
     500
     501
    224502typedef struct tagCREATESTRUCTA
    225503{
    … …  
    253531    DWORD       dwExStyle;
    254532} CREATESTRUCTW, *LPCREATESTRUCTW;
    255 
    256 #ifndef RECT
    257 //conflict with mcios2.h
    258 
    259 typedef struct tagRECT
    260 {
    261     INT  left;
    262     INT  top;
    263     INT  right;
    264     INT  bottom;
    265 } RECT, *PRECT, *LPRECT;
    266 typedef const RECT *LPCRECT;
    267 #endif
     533#endif
     534
     535
     536
     537/*****************************************************************************
     538 * Additional types                                                          *
     539 *****************************************************************************/
     540
     541//PH: Warning -- OS/2  has BOOL == unsigned long,
     542//               Win32 has BOOL == int.
     543typedef int             BOOL32_W;
     544typedef int             BOOL_W;
     545
     546
     547
     548
     549
     550
     551//@@@PH -----------------------------------------------------------------------
     552#if 0
     553
     554
     555#define DECLARE_HANDLE(x) typedef DWORD x
     556
     557DECLARE_HANDLE(HTASK);
     558
     559#ifndef WIN32API
     560#define WIN32API __stdcall
     561#endif
     562
    268563
    269564typedef struct _MEMORY_BASIC_INFORMATION
    … …  
    278573} MEMORY_BASIC_INFORMATION,*PMEMORY_BASIC_INFORMATION,*LPMEMORY_BASIC_INFORMATION;
    279574
    280 /* WM_WINDOWPOSCHANGING/CHANGED struct */
    281 typedef struct tagWINDOWPOS
    282 {
    283     HWND  hwnd;
    284     HWND  hwndInsertAfter;
    285     INT   x;
    286     INT   y;
    287     INT   cx;
    288     INT   cy;
    289     UINT  flags;
    290 } WINDOWPOS, *PWINDOWPOS, *LPWINDOWPOS;
     575#endif
    291576
    292577#pragma pack()

  • trunk/src/gdi32/gdi32.cpp

    r150 r780  
    1 /* $Id: gdi32.cpp,v 1.7 1999-06-21 18:59:21 phaller Exp $ */
     1/* $Id: gdi32.cpp,v 1.8 1999-09-01 19:12:15 phaller Exp $ */
    22
    33/*
    … …  
    22472247//******************************************************************************
    22482248//******************************************************************************
    2249 INT WIN32API TranslateCharsetInfo(DWORD *lpSrc, LPCHARSETINFO lpCs, DWORD dwFlags)
     2249UINT WIN32API TranslateCharsetInfo(DWORD *lpSrc, LPCHARSETINFO lpCs, DWORD dwFlags)
    22502250{
    22512251   dprintf(("GDI32: OS2TranslateCharsetInfo, not implemented\n"));

  • trunk/src/kernel32/HandleManager.cpp

    r769 r780  
    1 /* $Id: HandleManager.cpp,v 1.19 1999-08-31 23:48:36 phaller Exp $ */
     1/* $Id: HandleManager.cpp,v 1.20 1999-09-01 19:12:16 phaller Exp $ */
    22
    33/*
    … …  
    8383  struct _HMDEVICE *pNext;                /* pointer to next device in chain */
    8484
    85   PSZ             pszDeviceName;       /* name or alias of the pseudo-device */
     85  LPSTR           pszDeviceName;       /* name or alias of the pseudo-device */
    8686  HMDeviceHandler *pDeviceHandler;         /* handler for this pseudo-device */
    8787} HMDEVICE, *PHMDEVICE;
    … …  
    133133
    134134                        /* get appropriate device handler by the device name */
    135 static HMDeviceHandler*  _Optlink _HMDeviceFind(PSZ pszDeviceName);
     135static HMDeviceHandler*  _Optlink _HMDeviceFind(LPSTR pszDeviceName);
    136136
    137137                               /* get next free handle from the handle table */
    … …  
    156156 *****************************************************************************/
    157157
    158 static HMDeviceHandler *_HMDeviceFind (PSZ pszDeviceName)
     158static HMDeviceHandler *_HMDeviceFind (LPSTR pszDeviceName)
    159159{
    160160  PHMDEVICE pHMDevice;                     /* iterator over the device table */
    … …  
    247247 *****************************************************************************/
    248248
    249 DWORD   HMDeviceRegister(PSZ             pszDeviceName,
     249DWORD   HMDeviceRegister(LPSTR           pszDeviceName,
    250250                         HMDeviceHandler *pDeviceHandler)
    251251{
    … …  
    767767  else
    768768  {
    769     pDeviceHandler = _HMDeviceFind((PSZ)lpFileName);          /* find device */
     769    pDeviceHandler = _HMDeviceFind((LPSTR)lpFileName);        /* find device */
    770770
    771771    if (NULL == pDeviceHandler)                /* this name is unknown to us */
    … …  
    900900
    901901
    902   pDeviceHandler = _HMDeviceFind((PSZ)lpFileName);            /* find device */
     902  pDeviceHandler = _HMDeviceFind((LPSTR)lpFileName);          /* find device */
    903903  if (NULL == pDeviceHandler)                  /* this name is unknown to us */
    904904  {

  • trunk/src/kernel32/hmdevice.cpp

    r690 r780  
    1 /* $Id: hmdevice.cpp,v 1.7 1999-08-25 14:27:05 sandervl Exp $ */
     1/* $Id: hmdevice.cpp,v 1.8 1999-09-01 19:12:17 phaller Exp $ */
    22
    33/*
    … …  
    1818 *****************************************************************************/
    1919
    20 #include <os2win.h>
     20#include <odin.h>
     21#include <win32type.h>
     22#include <misc.h>
    2123#include "HandleManager.h"
    2224#include "HMDevice.h"
    … …  
    2729 *****************************************************************************/
    2830
     31#ifndef ERROR_INVALID_FUNCTION
     32#define ERROR_INVALID_FUNCTION 1
     33#endif
    2934
    3035/*****************************************************************************
    … …  
    95100 * Name      : HMDeviceHandler::DuplicateHandle
    96101 * Purpose   : dummy version
    97  * Parameters: 
     102 * Parameters:
    98103 *             various parameters as required
    99104 * Variables :

  • trunk/src/kernel32/hmdevice.h

    r690 r780  
    1 /* $Id: hmdevice.h,v 1.8 1999-08-25 14:27:06 sandervl Exp $ */
     1/* $Id: hmdevice.h,v 1.9 1999-09-01 19:12:17 phaller Exp $ */
    22
    33/*
    … …  
    288288
    289289                            /* register a new device with the handle manager */
    290 DWORD  HMDeviceRegister(PSZ             pszDeviceName,
     290DWORD  HMDeviceRegister(LPSTR           pszDeviceName,
    291291                        HMDeviceHandler *pDeviceHandler);
    292292

  • trunk/src/kernel32/virtual.cpp

    r712 r780  
    1 /* $Id: virtual.cpp,v 1.11 1999-08-27 16:51:01 sandervl Exp $ */
     1/* $Id: virtual.cpp,v 1.12 1999-09-01 19:12:18 phaller Exp $ */
    22
    33/*
    … …  
    5050 * See CreateFileMapping32A
    5151 */
    52 HANDLE WINAPI CreateFileMappingW( HFILE hFile, LPSECURITY_ATTRIBUTES attr, 
    53                                       DWORD protect, DWORD size_high, 
     52HANDLE WINAPI CreateFileMappingW( HFILE hFile, LPSECURITY_ATTRIBUTES attr,
     53                                      DWORD protect, DWORD size_high,
    5454                                      DWORD size_low, LPCWSTR name )
    5555{
    … …  
    107107              DWORD offset_low,  /* [in] Low-order 32 bits of file offset */
    108108              DWORD count        /* [in] Number of bytes to map */
    109 ) 
     109)
    110110{
    111111    return MapViewOfFileEx( mapping, access, offset_high,
    … …  
    129129              DWORD count,       /* [in] Number of bytes to map */
    130130              LPVOID addr        /* [in] Suggested starting address for mapped view */
    131 ) 
     131)
    132132{
    133133  return HMMapViewOfFileEx(handle, access, offset_high, offset_low, count, addr);
    … …  
    146146              LPCVOID base, /* [in] Start address of byte range to flush */
    147147              DWORD cbFlush /* [in] Number of bytes in range */
    148 ) 
     148)
    149149{
    150150 Win32MemMap *map;
    … …  
    177177 */
    178178BOOL WINAPI UnmapViewOfFile(LPVOID addr /* [in] Address where mapped view begins */
    179 ) 
     179)
    180180{
    181181 Win32MemMap *map;
    … …  
    201201 *
    202202 * Helper function to map a file to memory:
    203  *  name                        -       file name 
     203 *  name                        -       file name
    204204 *  [RETURN] ptr                -       pointer to mapped file
    205205 */
    … …  
    208208    HANDLE hFile, hMapping = -1;
    209209
    210     hFile = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ, NULL, 
     210    hFile = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ, NULL,
    211211                           OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, 0);
    212212    if (hFile != INVALID_HANDLE_VALUE)
    … …  
    226226 *
    227227 * Helper function to map a file to memory:
    228  *  name                        -       file name 
     228 *  name                        -       file name
    229229 *  [RETURN] ptr                -       pointer to mapped file
    230230 */
    … …  
    233233    HANDLE hFile, hMapping = -1;
    234234
    235     hFile = CreateFileA(name, GENERIC_READ, FILE_SHARE_READ, NULL, 
     235    hFile = CreateFileA(name, GENERIC_READ, FILE_SHARE_READ, NULL,
    236236                        OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, 0);
    237237    if (hFile != INVALID_HANDLE_VALUE)
    … …  
    254254 PVOID Address = lpvAddress;
    255255 ULONG flag = 0, base;
    256  APIRET rc;
     256 DWORD rc;
    257257
    258258  dprintf(("VirtualAlloc at %X; %d bytes, fAlloc %d, fProtect %d\n", (int)lpvAddress, cbSize, fdwAllocationType, fdwProtect));
    … …  
    360360BOOL WIN32API VirtualFree(LPVOID lpvAddress, DWORD cbSize, DWORD FreeType)
    361361{
    362  APIRET rc;
     362 DWORD rc;
    363363
    364364  dprintf(("VirtualFree at %d; %d bytes, freetype %d\n", (int)lpvAddress, cbSize, FreeType));
    … …  
    390390                             DWORD *pfdwOldProtect)
    391391{
    392  APIRET rc;
     392 DWORD rc;
    393393 ULONG  pageFlags = 0;
    394394 int npages;
    … …  
    460460{
    461461 ULONG  cbRangeSize, dAttr;
    462  APIRET rc;
     462 DWORD rc;
    463463
    464464  if(lpvAddress == NULL || pmbiBuffer == NULL || cbLength == 0) {
    465465        return 0;
    466466  }
    467  
     467
    468468  cbRangeSize = cbLength & ~0xFFF;
    469469  if(cbLength & 0xFFF) {

  • trunk/src/user32/dialog.cpp

    r265 r780  
    1 /* $Id: dialog.cpp,v 1.6 1999-07-04 19:02:38 sandervl Exp $ */
     1/* $Id: dialog.cpp,v 1.7 1999-09-01 19:12:18 phaller Exp $ */
    22
    33/*
    … …  
    128128//******************************************************************************
    129129//******************************************************************************
    130 BOOL WIN32API DialogBoxIndirectParamA(HINSTANCE hinst,
     130INT WIN32API DialogBoxIndirectParamA(HINSTANCE hinst,
    131131                                      DLGTEMPLATE *dlgtemplate,
    132132                                      HWND hwndParent, DLGPROC dlgproc,
    133133                                      LPARAM lParamInit)
    134134{
    135  BOOL rc;
     135 INT rc;
    136136 DLGTEMPLATE *os2dlg;
    137137
    … …  
    147147//******************************************************************************
    148148//******************************************************************************
    149 BOOL WIN32API DialogBoxIndirectParamW(HINSTANCE hinst,
     149INT WIN32API DialogBoxIndirectParamW(HINSTANCE hinst,
    150150                                      DLGTEMPLATE *dlgtemplate,
    151151                                      HWND hwndParent, DLGPROC dlgproc,
    152152                                      LPARAM lParamInit)
    153153{
    154  BOOL rc;
     154 INT rc;
    155155 DLGTEMPLATE *os2dlg;
    156156

  • trunk/src/user32/new/dialog.cpp

    r666 r780  
    1 /* $Id: dialog.cpp,v 1.6 1999-08-24 18:58:00 phaller Exp $ */
     1/* $Id: dialog.cpp,v 1.7 1999-09-01 19:12:20 phaller Exp $ */
    22
    33/*
    … …  
    1818//******************************************************************************
    1919//******************************************************************************
    20 HWND WIN32API CreateDialogParamA(HINSTANCE hinst, LPCSTR lpszTemplate, 
    21                                  HWND hwndOwner, DLGPROC dlgproc, 
     20HWND WIN32API CreateDialogParamA(HINSTANCE hinst, LPCSTR lpszTemplate,
     21                                 HWND hwndOwner, DLGPROC dlgproc,
    2222                                 LPARAM lParamInit)
    2323{
    … …  
    3838//******************************************************************************
    3939//******************************************************************************
    40 HWND WIN32API CreateDialogParamW(HINSTANCE hinst, LPCWSTR lpszTemplate, 
    41                                  HWND hwndOwner, DLGPROC dlgproc, 
     40HWND WIN32API CreateDialogParamW(HINSTANCE hinst, LPCWSTR lpszTemplate,
     41                                 HWND hwndOwner, DLGPROC dlgproc,
    4242                                 LPARAM lParamInit)
    4343{
    … …  
    6060//******************************************************************************
    6161//******************************************************************************
    62 HWND WIN32API CreateDialogIndirectParamA(HINSTANCE hinst, 
    63                                          DLGTEMPLATE *dlgtemplate, 
    64                                          HWND hwndParent, DLGPROC dlgproc, 
     62HWND WIN32API CreateDialogIndirectParamA(HINSTANCE hinst,
     63                                         DLGTEMPLATE *dlgtemplate,
     64                                         HWND hwndParent, DLGPROC dlgproc,
    6565                                         LPARAM lParamInit)
    6666{
    … …  
    7171//******************************************************************************
    7272//******************************************************************************
    73 HWND WIN32API CreateDialogIndirectParamW(HINSTANCE hinst, 
    74                                          DLGTEMPLATE *dlgtemplate, 
    75                                          HWND hwndParent, DLGPROC dlgproc, 
     73HWND WIN32API CreateDialogIndirectParamW(HINSTANCE hinst,
     74                                         DLGTEMPLATE *dlgtemplate,
     75                                         HWND hwndParent, DLGPROC dlgproc,
    7676                                         LPARAM lParamInit)
    7777{
    … …  
    8282//******************************************************************************
    8383//******************************************************************************
    84 BOOL WIN32API DialogBoxIndirectParamA(HINSTANCE hinst,
    85                                       DLGTEMPLATE *dlgtemplate, 
    86                                       HWND hwndParent, DLGPROC dlgproc, 
     84INT  WIN32API DialogBoxIndirectParamA(HINSTANCE hinst,
     85                                      DLGTEMPLATE *dlgtemplate,
     86                                      HWND hwndParent, DLGPROC dlgproc,
    8787                                      LPARAM lParamInit)
    8888{
    … …  
    9191//******************************************************************************
    9292//******************************************************************************
    93 BOOL WIN32API DialogBoxIndirectParamW(HINSTANCE hinst,
    94                                       DLGTEMPLATE *dlgtemplate, 
    95                                       HWND hwndParent, DLGPROC dlgproc, 
     93INT  WIN32API DialogBoxIndirectParamW(HINSTANCE hinst,
     94                                      DLGTEMPLATE *dlgtemplate,
     95                                      HWND hwndParent, DLGPROC dlgproc,
    9696                                      LPARAM lParamInit)
    9797{
    … …  
    117117//******************************************************************************
    118118//******************************************************************************
    119 int WIN32API DialogBoxParamW(HINSTANCE arg1, LPCWSTR arg2, HWND arg3, 
     119int WIN32API DialogBoxParamW(HINSTANCE arg1, LPCWSTR arg2, HWND arg3,
    120120                             DLGPROC arg4, LPARAM arg5)
    121121{

  • trunk/src/user32/new/msgbox.cpp

    r300 r780  
    1 /* $Id: msgbox.cpp,v 1.1 1999-07-14 08:35:35 sandervl Exp $ */
     1/* $Id: msgbox.cpp,v 1.2 1999-09-01 19:12:20 phaller Exp $ */
    22/*
    33 * Win32 message box function for OS/2
    … …  
    9898 *****************************************************************************/
    9999
    100 BOOL WIN32API MessageBoxIndirectW(LPMSGBOXPARAMSW lpMsgBoxParams)
     100// @@@PH Win32 BOOL's are casted to INTs
     101INT WIN32API MessageBoxIndirectW(LPMSGBOXPARAMSW lpMsgBoxParams)
    101102{
    102103  dprintf(("USER32:MessageBoxIndirectW (%08x) not implemented.\n",
    … …  
    122123 *****************************************************************************/
    123124
    124 BOOL WIN32API MessageBoxIndirectA(LPMSGBOXPARAMSA lpMsgBoxParams)
     125// @@@PH Win32 BOOL's are casted to INTs
     126INT  WIN32API MessageBoxIndirectA(LPMSGBOXPARAMSA lpMsgBoxParams)
    125127{
    126128  dprintf(("USER32:MessageBoxIndirectA (%08x) not implemented.\n",

  • trunk/src/user32/new/user32.cpp

    r662 r780  
    1 /* $Id: user32.cpp,v 1.15 1999-08-24 15:57:27 cbratschi Exp $ */
     1/* $Id: user32.cpp,v 1.16 1999-09-01 19:12:21 phaller Exp $ */
    22
    33/*
    … …  
    866866//******************************************************************************
    867867//******************************************************************************
    868 BOOL WIN32API ExcludeUpdateRgn( HDC arg1, HWND  arg2)
     868INT WIN32API ExcludeUpdateRgn( HDC arg1, HWND  arg2)
    869869{
    870870#ifdef DEBUG
    … …  
    22392239 *****************************************************************************/
    22402240
    2241 BOOL WIN32API GetKeyboardLayoutNameA(LPTSTR pwszKLID)
     2241// @@@PH Win32 BOOL's are casted to INTs
     2242INT WIN32API GetKeyboardLayoutNameA(LPTSTR pwszKLID)
    22422243{
    22432244  dprintf(("USER32:GetKeyboardLayoutNameA (%08x) not implemented.",
    … …  
    22632264 *****************************************************************************/
    22642265
    2265 BOOL WIN32API GetKeyboardLayoutNameW(LPWSTR pwszKLID)
     2266// @@@PH Win32 BOOL's are casted to INTs
     2267INT WIN32API GetKeyboardLayoutNameW(LPWSTR pwszKLID)
    22662268{
    22672269  dprintf(("USER32:GetKeyboardLayoutNameW (%08x) not implemented.",

  • trunk/src/user32/new/win32wbase.cpp

    r753 r780  
    1 /* $Id: win32wbase.cpp,v 1.4 1999-08-31 14:38:09 sandervl Exp $ */
     1/* $Id: win32wbase.cpp,v 1.5 1999-09-01 19:12:22 phaller Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
    … …  
    3737#include "win32wndhandle.h"
    3838#include "heapshared.h"
     39
    3940
    4041#define HAS_DLGFRAME(style,exStyle) \

  • trunk/src/user32/new/winscrollbar.cpp

    r332 r780  
    1 /* $Id: winscrollbar.cpp,v 1.2 1999-07-18 18:04:30 sandervl Exp $ */
     1/* $Id: winscrollbar.cpp,v 1.3 1999-09-01 19:12:23 phaller Exp $ */
    22/*
    33 * Win32 scrollbar functions for OS/2
    … …  
    8181//******************************************************************************
    8282//******************************************************************************
    83 BOOL WIN32API ScrollWindowEx( HWND arg1, int arg2, int arg3, const RECT * arg4, const RECT * arg5, HRGN arg6, PRECT arg7, UINT  arg8)
     83INT WIN32API ScrollWindowEx( HWND arg1, int arg2, int arg3, const RECT * arg4, const RECT * arg5, HRGN arg6, PRECT arg7, UINT  arg8)
    8484{
    8585#ifdef DEBUG

  • trunk/src/user32/user32.cpp

    r755 r780  
    1 /* $Id: user32.cpp,v 1.22 1999-08-31 14:37:27 sandervl Exp $ */
     1/* $Id: user32.cpp,v 1.23 1999-09-01 19:12:18 phaller Exp $ */
    22
    33/*
    … …  
    12831283
    12841284
    1285 HWND WIN32API ChildWindowFromPointEx (HWND hwndParent, POINT pt, UINT uFlags) 
     1285HWND WIN32API ChildWindowFromPointEx (HWND hwndParent, POINT pt, UINT uFlags)
    12861286{
    12871287        RECT rect;
    … …  
    18991899//******************************************************************************
    19001900//******************************************************************************
    1901 BOOL WIN32API ExcludeUpdateRgn( HDC arg1, HWND  arg2)
     1901INT WIN32API ExcludeUpdateRgn( HDC arg1, HWND  arg2)
    19021902{
    19031903#ifdef DEBUG
    … …  
    27632763//******************************************************************************
    27642764//******************************************************************************
    2765 BOOL WIN32API ScrollWindowEx( HWND arg1, int arg2, int arg3, const RECT * arg4, const RECT * arg5, HRGN arg6, PRECT arg7, UINT  arg8)
     2765INT WIN32API ScrollWindowEx( HWND arg1, int arg2, int arg3, const RECT * arg4, const RECT * arg5, HRGN arg6, PRECT arg7, UINT  arg8)
    27662766{
    27672767#ifdef DEBUG
    … …  
    44224422 *****************************************************************************/
    44234423
    4424 BOOL WIN32API GetKeyboardLayoutNameA(LPTSTR pwszKLID)
     4424//@@@PH Win32 BOOLs are casted to INTs.
     4425INT WIN32API GetKeyboardLayoutNameA(LPTSTR pwszKLID)
    44254426{
    44264427  dprintf(("USER32:GetKeyboardLayoutNameA (%08x) not implemented.",
    … …  
    44464447 *****************************************************************************/
    44474448
    4448 BOOL WIN32API GetKeyboardLayoutNameW(LPWSTR pwszKLID)
     4449//@@@PH Win32 BOOLs are casted to INTs.
     4450INT  WIN32API GetKeyboardLayoutNameW(LPWSTR pwszKLID)
    44494451{
    44504452  dprintf(("USER32:GetKeyboardLayoutNameW (%08x) not implemented.",
    … …  
    49064908 *****************************************************************************/
    49074909
    4908 BOOL WIN32API MessageBoxIndirectW(LPMSGBOXPARAMSW lpMsgBoxParams)
     4910//@@@PH Win32 BOOLs are casted to INTs.
     4911INT  WIN32API MessageBoxIndirectW(LPMSGBOXPARAMSW lpMsgBoxParams)
    49094912{
    49104913  dprintf(("USER32:MessageBoxIndirectW (%08x) not implemented.\n",
    … …  
    49304933 *****************************************************************************/
    49314934
    4932 BOOL WIN32API MessageBoxIndirectA(LPMSGBOXPARAMSA lpMsgBoxParams)
     4935//@@@PH Win32 BOOLs are casted to INTs.
     4936INT  WIN32API MessageBoxIndirectA(LPMSGBOXPARAMSA lpMsgBoxParams)
    49334937{
    49344938  dprintf(("USER32:MessageBoxIndirectA (%08x) not implemented.\n",

  • trunk/src/winmm/midi.cpp

    r668 r780  
    1 /* $Id: midi.cpp,v 1.5 1999-08-24 21:21:11 phaller Exp $ */
     1/* $Id: midi.cpp,v 1.6 1999-09-01 19:12:23 phaller Exp $ */
    22
    33/*
    … …  
    961961{
    962962   // Enable Appl instance to receive and the hardware instance to send
    963    iAppInstance->enableReceive( TRUE );
    964    iHwdInstance->enableSend( TRUE );
     963   iAppInstance->enableReceive( (ULONG)TRUE );
     964   iHwdInstance->enableSend( (ULONG)TRUE );
    965965
    966966   // Link the two instances
    … …  
    11121112   dprintf(( "WINMM: MidiOut::open(%s)\n",iHwdInstance->name()));
    11131113   // Enable Appl instance to send and the hwd instance to receive
    1114    iAppInstance->enableSend( TRUE );
    1115    iHwdInstance->enableReceive( TRUE );
     1114   iAppInstance->enableSend( (ULONG)TRUE );
     1115   iHwdInstance->enableReceive( (ULONG)TRUE );
    11161116
    11171117   // Link the two instances
Note: See TracChangeset for help on using the changeset viewer.