Changeset 780 for trunk/src


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

Fix: header file cleanup (win32type.h)

Location:
trunk/src
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • 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.