Changeset 1118 for trunk/include


Ignore:
Timestamp:
Oct 4, 1999, 11:56:04 AM (26 years ago)
Author:
sandervl
Message:

Lots of changes by several people (see changelog for 4 October

Location:
trunk/include/win
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/ddeml.h

    r4 r1118  
    1 /* $Id: ddeml.h,v 1.1 1999-05-24 20:19:10 ktk Exp $ */
     1/* $Id: ddeml.h,v 1.2 1999-10-04 09:55:49 sandervl Exp $ */
    22
    33/*
    … …  
    119119#define XCLASS_NOTIFICATION     0x8000
    120120
    121 #define XTYP_ADVDATA            (0x0010 | XCLASS_FLAGS)
    122121#define XTYP_XACT_COMPLETE      (0x0080 | XCLASS_NOTIFICATION )
    123 #define XTYP_REGISTER           (0x00A0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK )
    124122#define XTYP_REQUEST            (0x00B0 | XCLASS_DATA )
    125 #define XTYP_DISCONNECT         (0x00C0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK )
    126 #define XTYP_UNREGISTER         (0x00D0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK )
     123
     124//Odin addition
     125#define XTYP_ERROR              (0x0000 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK )
     126#define XTYP_ADVDATA            (0x0010 | XCLASS_FLAGS         )
     127#define XTYP_ADVREQ             (0x0020 | XCLASS_DATA | XTYPF_NOBLOCK )
     128#define XTYP_ADVSTART           (0x0030 | XCLASS_BOOL          )
     129#define XTYP_ADVSTOP            (0x0040 | XCLASS_NOTIFICATION)
     130#define XTYP_EXECUTE            (0x0050 | XCLASS_FLAGS         )
     131#define XTYP_CONNECT            (0x0060 | XCLASS_BOOL | XTYPF_NOBLOCK)
     132#define XTYP_CONNECT_CONFIRM    (0x0070 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
     133#define XTYP_XACT_COMPLETE      (0x0080 | XCLASS_NOTIFICATION  )
     134#define XTYP_POKE               (0x0090 | XCLASS_FLAGS         )
     135#define XTYP_REGISTER           (0x00A0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
     136#define XTYP_REQUEST            (0x00B0 | XCLASS_DATA          )
     137#define XTYP_DISCONNECT         (0x00C0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
     138#define XTYP_UNREGISTER         (0x00D0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
     139#define XTYP_WILDCONNECT        (0x00E0 | XCLASS_DATA | XTYPF_NOBLOCK)
    127140
    128141/**************************************************

  • trunk/include/win/mmsystem.h

    r4 r1118  
    1 /* $Id: mmsystem.h,v 1.1 1999-05-24 20:19:14 ktk Exp $ */
     1/* $Id: mmsystem.h,v 1.2 1999-10-04 09:55:49 sandervl Exp $ */
    22
    33/*
    … …  
    190190UINT16          WINAPI  mmsystemGetVersion16(void);
    191191UINT            WINAPI  mmsystemGetVersion(void);
    192 BOOL16          WINAPI  sndPlaySound(LPCSTR lpszSoundName, UINT16 uFlags);
     192BOOL            WINAPI  sndPlaySoundA(LPCSTR pszSound, UINT fuSound);
     193BOOL            WINAPI  sndPlaySoundW(LPCWSTR pszSound, UINT fuSound);
     194#define                 sndPlaySound WINELIB_NAME_AW(sndPlaySound)
    193195BOOL            WINAPI  PlaySoundA(LPCSTR pszSound, HMODULE hmod, DWORD fdwSound);
    194196BOOL            WINAPI  PlaySoundW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound);
    … …  
    16501652
    16511653DWORD           WINAPI  mciSendCommand16(UINT16,UINT16,DWORD,DWORD);
    1652 DWORD           WINAPI  mciSendCommandA(UINT,UINT,DWORD,DWORD);
    1653 DWORD           WINAPI  mciSendCommandW(UINT,UINT,DWORD,DWORD);
     1654MCIERROR        WINAPI  mciSendCommandA(MCIDEVICEID,UINT,DWORD,DWORD);
     1655MCIERROR        WINAPI  mciSendCommandW(MCIDEVICEID,UINT,DWORD,DWORD);
    16541656#define                 mciSendCommand WINELIB_NAME_AW(mciSendCommand)
    16551657

  • trunk/include/win/shlobj.h

    r787 r1118  
    1 /* $Id: shlobj.h,v 1.2 1999-09-02 10:51:14 phaller Exp $ */
     1/* $Id: shlobj.h,v 1.3 1999-10-04 09:55:50 sandervl Exp $ */
    22
    33#ifndef __WINE_SHLOBJ_H
    44#define __WINE_SHLOBJ_H
     5
     6#ifndef DECLSPEC_IMPORT
     7#define DECLSPEC_IMPORT
     8#endif
    59
    610#include "wine/obj_base.h"
    … …  
    251255#define BFFM_SETSELECTIONA      (WM_USER+102)
    252256#define BFFM_SETSELECTIONW      (WM_USER+103)
     257#define BFFM_SETSELECTION       WINELIB_NAME_AW(BFFM_SETSELECTION)
     258
    253259#define BFFM_SETSTATUSTEXTW     (WM_USER+104)
    254260

  • trunk/include/win/winbase.h

    r796 r1118  
    1 /* $Id: winbase.h,v 1.5 1999-09-02 17:39:36 phaller Exp $ */
     1/* $Id: winbase.h,v 1.6 1999-10-04 09:55:50 sandervl Exp $ */
    22
    33#ifndef __WINE_WINBASE_H
    … …  
    17981798BOOL      WINAPI LocalUnlock(HLOCAL);
    17991799LPVOID      WINAPI LockResource(HGLOBAL);
     1800#define UnlockResource(hResData) ((hResData), 0)
     1801
    18001802#define     LockSegment(handle) GlobalFix((HANDLE)(handle))
    18011803#define     MakeProcInstance(proc,inst) (proc)

  • trunk/include/win/windef.h

    r1007 r1118  
    1 /* $Id: windef.h,v 1.13 1999-09-22 09:46:19 sandervl Exp $ */
     1/* $Id: windef.h,v 1.14 1999-10-04 09:55:51 sandervl Exp $ */
    22
    33/*
    … …  
    398398typedef VOID    (* CALLBACK TIMERPROC)(HWND,UINT,UINT,DWORD);
    399399typedef LRESULT (* CALLBACK WNDENUMPROC16)(HWND16,LPARAM);
    400 typedef LRESULT (* CALLBACK WNDENUMPROC)(HWND,LPARAM);
     400//typedef LRESULT (* CALLBACK WNDENUMPROC)(HWND,LPARAM);
     401typedef BOOL    (* CALLBACK WNDENUMPROC)(HWND,LPARAM);
    401402typedef LRESULT (* CALLBACK WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
    402403typedef LRESULT (* CALLBACK WNDPROC)(HWND,UINT,WPARAM,LPARAM);

  • trunk/include/win/windows.h

    r970 r1118  
    1 /* $Id: windows.h,v 1.3 1999-09-18 15:55:45 sandervl Exp $ */
     1/* $Id: windows.h,v 1.4 1999-10-04 09:55:51 sandervl Exp $ */
    22
    33#ifndef __WINE_WINDOWS_H
    … …  
    1919#include "shell.h"
    2020#include "winreg.h"
     21#include "ddeml.h"
    2122#include "winnetwk.h"
    2223#include "winver.h"

  • trunk/include/win/windowsx.h

    r874 r1118  
    1 /* $Id: windowsx.h,v 1.5 1999-09-08 12:12:28 sandervl Exp $ */
     1/* $Id: windowsx.h,v 1.6 1999-10-04 09:55:51 sandervl Exp $ */
    22
    33/* Copyright (C) 1999 Corel Corporation (Paul Quinn) */
    … …  
    3030#define GET_WM_CTLCOLOR_MSG(type)               (WORD)(WM_CTLCOLORMSGBOX+(type))
    3131#define GET_WM_CTLCOLOR_MPS(hdc, hwnd, type)    (WPARAM)(hdc), (LONG)(hwnd)
     32#define GET_WM_MENUSELECT_CMD(wp, lp)            LOWORD(wp)
     33#define GET_WM_MENUSELECT_FLAGS(wp, lp)         (UINT)(int)(short)HIWORD(wp)
     34#define GET_WM_MENUSELECT_HMENU(wp, lp)         (HMENU)(lp)
     35#define GET_WM_MENUSELECT_MPS(cmd, f, hmenu)    (WPARAM)MAKELONG(cmd, f), (LONG)(hmenu)
    3236
    3337#define GET_WM_VKEYTOITEM_CODE(wp, lp)          (int)(short)LOWORD(wp)
    … …  
    944948                ((int)(DWORD)SendMessage((hwndCtl), CB_GETLBTEXTLEN, (WPARAM)(int)(index), 0L))
    945949
     950#define ComboBox_GetLBText(hwndCtl, index, lpszBuffer)  ((int)(DWORD)SendMessage((hwndCtl), CB_GETLBTEXT, (WPARAM)(int)(index), (LPARAM)(LPCTSTR)(lpszBuffer)))
     951#define ComboBox_GetItemData(hwndCtl, index)        ((LRESULT)(DWORD)SendMessage((hwndCtl), CB_GETITEMDATA, (WPARAM)(int)(index), 0L))
     952#define ComboBox_SetItemData(hwndCtl, index, data)  ((int)(DWORD)SendMessage((hwndCtl), CB_SETITEMDATA, (WPARAM)(int)(index), (LPARAM)(data)))
     953
    946954#define ComboBox_DeleteString(hwndCtl, index) \
    947955                ((int)(DWORD)SendMessage((hwndCtl), CB_DELETESTRING, (WPARAM)(int)(index), 0L))
    … …  
    960968                ((int)(DWORD)SendMessage((hwndCtl), CB_GETLBTEXT, (WPARAM)(int)(index), (LPARAM)(LPCTSTR)(lpszBuffer)))
    961969
     970#define ComboBox_ShowDropdown(hwndCtl, fShow)       ((BOOL)(DWORD)SendMessage((hwndCtl), CB_SHOWDROPDOWN, (WPARAM)(BOOL)(fShow), 0L))
     971#define ComboBox_GetEditSel(hwndCtl)            ((DWORD)SendMessage((hwndCtl), CB_GETEDITSEL, 0L, 0L))
     972#define ComboBox_SetEditSel(hwndCtl, ichStart, ichEnd) ((int)(DWORD)SendMessage((hwndCtl), CB_SETEDITSEL, 0L, MAKELPARAM((ichStart), (ichEnd))))
     973
    962974#define ComboBox_GetDroppedState(hwndCtl)             \
    963975           ((BOOL)(DWORD)SendMessage((hwndCtl), CB_GETDROPPEDSTATE, 0L, 0L))
    … …  
    10381050#define Edit_GetTextLength(hwndCtl)             GetWindowTextLength(hwndCtl)
    10391051#define Edit_SetText(hwndCtl, lpsz)             SetWindowText((hwndCtl), (lpsz))
     1052
     1053#define Edit_Enable(hwndCtl, fEnable)           EnableWindow((hwndCtl), (fEnable))
     1054#define Edit_SetReadOnly(hwndCtl, fReadOnly)    ((BOOL)(DWORD)SendMessage((hwndCtl), EM_SETREADONLY, (WPARAM)(BOOL)(fReadOnly), 0L))
    10401055       
    10411056#define Edit_GetModify(hwndCtl)            \

  • trunk/include/win/wingdi.h

    r1007 r1118  
    1 /* $Id: wingdi.h,v 1.6 1999-09-22 09:46:19 sandervl Exp $ */
     1/* $Id: wingdi.h,v 1.7 1999-10-04 09:55:51 sandervl Exp $ */
    22
    33#ifndef __WINE_WINGDI_H
    … …  
    15131513} BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER;
    15141514
     1515typedef struct {
     1516        DWORD        bV4Size;
     1517        LONG         bV4Width;
     1518        LONG         bV4Height;
     1519        WORD         bV4Planes;
     1520        WORD         bV4BitCount;
     1521        DWORD        bV4V4Compression;
     1522        DWORD        bV4SizeImage;
     1523        LONG         bV4XPelsPerMeter;
     1524        LONG         bV4YPelsPerMeter;
     1525        DWORD        bV4ClrUsed;
     1526        DWORD        bV4ClrImportant;
     1527        DWORD        bV4RedMask;
     1528        DWORD        bV4GreenMask;
     1529        DWORD        bV4BlueMask;
     1530        DWORD        bV4AlphaMask;
     1531        DWORD        bV4CSType;
     1532        CIEXYZTRIPLE bV4Endpoints;
     1533        DWORD        bV4GammaRed;
     1534        DWORD        bV4GammaGreen;
     1535        DWORD        bV4GammaBlue;
     1536} BITMAPV4HEADER, *LPBITMAPV4HEADER, *PBITMAPV4HEADER;
     1537
    15151538  /* biCompression */
    15161539#define BI_RGB           0
    15171540#define BI_RLE8          1
    15181541#define BI_RLE4          2
     1542#define BI_BITFIELDS     3
    15191543
    15201544typedef struct {
    … …  
    26962720HDC       WINAPI CreateDCA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*);
    26972721HDC       WINAPI CreateDCW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
     2722#define   CreateDC WINELIB_NAME_AW(CreateDC)
    26982723HBITMAP   WINAPI CreateDIBitmap(HDC,const BITMAPINFOHEADER*,DWORD,LPCVOID,const BITMAPINFO*,UINT);
    26992724HBRUSH    WINAPI CreateDIBPatternBrush(HGLOBAL,UINT);
    … …  
    29362961INT       WINAPI StartDocA(HDC,const DOCINFOA*);
    29372962INT       WINAPI StartDocW(HDC,const DOCINFOW*);
     2963#define StartDoc WINELIB_NAME_AW(StartDoc)
    29382964INT       WINAPI StartPage(HDC);
    29392965INT       WINAPI EndPage(HDC);

  • trunk/include/win/winuser.h

    r1108 r1118  
    1 /* $Id: winuser.h,v 1.9 1999-10-02 13:55:46 cbratschi Exp $ */
     1/* $Id: winuser.h,v 1.10 1999-10-04 09:55:52 sandervl Exp $ */
    22
    33#ifndef __INCLUDE_WINUSER_H
    … …  
    684684#define WM_PRINT             0x0317
    685685#define WM_PRINTCLIENT       0x0318
     686
     687#define WM_HANDHELDFIRST     0x0358
     688#define WM_HANDHELDLAST      0x035F
     689 
     690#define WM_AFXFIRST          0x0360
     691#define WM_AFXLAST           0x037F
     692 
     693#define WM_PENWINFIRST       0x0380
     694#define WM_PENWINLAST        0x038F
     695
     696#define WM_APP               0x8000
    686697
    687698  /* FIXME: This does not belong to any libwine interface header */
    … …  
    30533064           CreateDialogIndirectParamW(inst,ptr,hwnd,dlg,0)
    30543065#define     CreateDialogIndirect WINELIB_NAME_AW(CreateDialogIndirect)
    3055 HWND      WINAPI CreateDialogIndirectParamA(HINSTANCE,DLGTEMPLATE *,HWND,
     3066HWND      WINAPI CreateDialogIndirectParamA(HINSTANCE,LPCDLGTEMPLATEA,HWND,
    30563067                                            DLGPROC,LPARAM);
    3057 HWND      WINAPI CreateDialogIndirectParamW(HINSTANCE,DLGTEMPLATE *,HWND,
     3068HWND      WINAPI CreateDialogIndirectParamW(HINSTANCE,LPCDLGTEMPLATEW,HWND,
    30583069                                            DLGPROC,LPARAM);
    30593070#define     CreateDialogIndirectParam WINELIB_NAME_AW(CreateDialogIndirectParam)
    … …  
    31163127            DialogBoxIndirectParamW(inst,template,owner,func,0)
    31173128#define     DialogBoxIndirect WINELIB_NAME_AW(DialogBoxIndirect)
    3118 INT       WINAPI DialogBoxIndirectParamA(HINSTANCE,DLGTEMPLATE *,HWND,DLGPROC,LPARAM);
    3119 INT       WINAPI DialogBoxIndirectParamW(HINSTANCE,DLGTEMPLATE *,HWND,DLGPROC,LPARAM);
     3129INT       WINAPI DialogBoxIndirectParamA(HINSTANCE,LPCDLGTEMPLATEA,HWND,DLGPROC,LPARAM);
     3130INT       WINAPI DialogBoxIndirectParamW(HINSTANCE,LPCDLGTEMPLATEW,HWND,DLGPROC,LPARAM);
    31203131#define     DialogBoxIndirectParam WINELIB_NAME_AW(DialogBoxIndirectParam)
    31213132INT       WINAPI DialogBoxParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);
Note: See TracChangeset for help on using the changeset viewer.