Changeset 8544 for trunk/include/win


Ignore:
Timestamp:
Jun 2, 2002, 12:10:33 PM (23 years ago)
Author:
sandervl
Message:

header updates

Location:
trunk/include/win
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/win.h

    r6445 r8544  
    8181    struct tagWND *next;
    8282    struct tagWND *owner;
     83    void          *pVScroll;      /* Vertical scroll-bar info */
     84    void          *pHScroll;      /* Horizontal scroll-bar info */
    8385    HWND           hwndSelf;      /* Handle of this window */
    8486    HINSTANCE      hInstance;     /* Window hInstance (from CreateWindow) */
    … …  
    9193    LPWSTR         text;           /* Window text */
    9294    DWORD          cbWndExtra;
     95    DWORD          flags;
    9396    DWORD          wExtra[1];
    9497} WND;
    … …  
    209212
    210213/* controls/icontitle.c */
    211 extern HWND ICONTITLE_Create( WND* );
     214extern HWND ICONTITLE_Create( HWND );
    212215extern BOOL ICONTITLE_Init( void );
    213216
    … …  
    215218extern void FOCUS_SwitchFocus( MESSAGEQUEUE *pMsgQ, HWND , HWND );
    216219
     220
     221/* Built-in class descriptor */
     222struct builtin_class_descr
     223{
     224    LPCSTR  name;    /* class name */
     225    UINT    style;   /* class style */
     226    WNDPROC procA;   /* ASCII window procedure */
     227    WNDPROC procW;   /* Unicode window procedure */
     228    INT     extra;   /* window extra bytes */
     229    LPCSTR  cursor;  /* cursor name */
     230    HBRUSH  brush;   /* brush or system color */
     231};
     232
    217233#endif  /* __WINE_WIN_H */

  • trunk/include/win/windef.h

    r8426 r8544  
    214214typedef int             INT;
    215215typedef unsigned int    UINT;
     216typedef unsigned int    INT32;
    216217typedef UINT *          UINT_PTR;
    217218typedef unsigned short  WORD;
    … …  
    730731typedef const RECTL *LPCRECTL;
    731732
    732 #define CONV_RECT16TO32(r16,r32) \
    733     ((r32)->left  = (INT)(r16)->left,  (r32)->top    = (INT)(r16)->top, \
    734      (r32)->right = (INT)(r16)->right, (r32)->bottom = (INT)(r16)->bottom)
    735 #define CONV_RECT32TO16(r32,r16) \
    736     ((r16)->left  = (INT16)(r32)->left,  (r16)->top    = (INT16)(r32)->top, \
    737      (r16)->right = (INT16)(r32)->right, (r16)->bottom = (INT16)(r32)->bottom)
    738 
    739733/*
    740734 * 8.9.99 DJR DECIMAL support

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

    r4124 r8544  
    1 /* $Id: wingdi16.h,v 1.3 2000-08-30 13:56:39 sandervl Exp $ */
     1/* $Id: wingdi16.h,v 1.4 2002-06-02 10:10:33 sandervl Exp $ */
    22#ifndef __WINE_WINE_WINGDI16_H
    33#define __WINE_WINE_WINGDI16_H
    … …  
    532532
    533533
     534#define CONV_RECT16TO32( r16, r32 )  \
     535{                                    \
     536    (r32)->left   = ((LPRECT16)r16)->left;         \
     537    (r32)->top    = ((LPRECT16)r16)->top;          \
     538    (r32)->right  = ((LPRECT16)r16)->right;        \
     539    (r32)->bottom = ((LPRECT16)r16)->bottom;       \
     540}
     541
     542#define CONV_RECT32TO16( r32, r16 )   \
     543{                                     \
     544    ((LPRECT16)r16)->left   = (INT16)(r32)->left;   \
     545    ((LPRECT16)r16)->top    = (INT16)(r32)->top;    \
     546    ((LPRECT16)r16)->right  = (INT16)(r32)->right;  \
     547    ((LPRECT16)r16)->bottom = (INT16)(r32)->bottom; \
     548}
     549
    534550#endif /* __WINE_WINE_WINGDI16_H */

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

    r4576 r8544  
    1 /* $Id: winuser16.h,v 1.7 2000-11-09 18:23:42 sandervl Exp $ */
     1/* $Id: winuser16.h,v 1.8 2002-06-02 10:10:33 sandervl Exp $ */
    22#ifndef __WINE_WINE_WINUSER16_H
    33#define __WINE_WINE_WINUSER16_H
    … …  
    825825HICON16     WINAPI LoadIcon16(HINSTANCE16,SEGPTR);
    826826HANDLE16    WINAPI LoadImage16(HINSTANCE16,LPCSTR,UINT16,INT16,INT16,UINT16);
    827 HMENU16     WINAPI LoadMenu16(HINSTANCE16,SEGPTR);
     827HMENU16     WINAPI LoadMenu16(HINSTANCE16,LPCSTR);
    828828HMENU16     WINAPI LoadMenuIndirect16(LPCVOID);
    829829INT16       WINAPI LoadString16(HINSTANCE16,UINT16,LPSTR,INT16);

  • trunk/include/win/winuser.h

    r8539 r8544  
    34383438           CreateDialogIndirectParamW(inst,ptr,hwnd,dlg,0)
    34393439#define     CreateDialogIndirect WINELIB_NAME_AW(CreateDialogIndirect)
    3440 HWND      WINAPI CreateDialogIndirectParamA(HINSTANCE,LPCDLGTEMPLATEA,HWND,
     3440HWND      WINAPI CreateDialogIndirectParamA(HINSTANCE,LPCVOID,HWND,
    34413441                                            DLGPROC,LPARAM);
    3442 HWND      WINAPI CreateDialogIndirectParamW(HINSTANCE,LPCDLGTEMPLATEW,HWND,
     3442HWND      WINAPI CreateDialogIndirectParamW(HINSTANCE,LPCVOID,HWND,
    34433443                                            DLGPROC,LPARAM);
    34443444#define     CreateDialogIndirectParam WINELIB_NAME_AW(CreateDialogIndirectParam)
    … …  
    35023502            DialogBoxIndirectParamW(inst,template,owner,func,0)
    35033503#define     DialogBoxIndirect WINELIB_NAME_AW(DialogBoxIndirect)
    3504 INT       WINAPI DialogBoxIndirectParamA(HINSTANCE,LPCDLGTEMPLATEA,HWND,DLGPROC,LPARAM);
    3505 INT       WINAPI DialogBoxIndirectParamW(HINSTANCE,LPCDLGTEMPLATEW,HWND,DLGPROC,LPARAM);
     3504INT       WINAPI DialogBoxIndirectParamA(HINSTANCE,LPCVOID,HWND,DLGPROC,LPARAM);
     3505INT       WINAPI DialogBoxIndirectParamW(HINSTANCE,LPCVOID,HWND,DLGPROC,LPARAM);
    35063506#define     DialogBoxIndirectParam WINELIB_NAME_AW(DialogBoxIndirectParam)
    35073507INT       WINAPI DialogBoxParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);
    … …  
    36083608HWND      WINAPI GetDlgItem(HWND,INT);
    36093609UINT      WINAPI GetDlgItemInt(HWND,INT,BOOL*,BOOL);
    3610 UINT      WINAPI GetDlgItemTextA(HWND,INT,LPSTR,UINT);
    3611 UINT      WINAPI GetDlgItemTextW(HWND,INT,LPWSTR,UINT);
     3610INT       WINAPI GetDlgItemTextA(HWND,INT,LPSTR,UINT);
     3611INT       WINAPI GetDlgItemTextW(HWND,INT,LPWSTR,UINT);
    36123612#define     GetDlgItemText WINELIB_NAME_AW(GetDlgItemText)
    36133613UINT      WINAPI GetDoubleClickTime(void);
    … …  
    37263726BOOL      WINAPI IsDialogMessageW(HWND,LPMSG);
    37273727#define     IsDialogMessage WINELIB_NAME_AW(IsDialogMessage)
    3728 BOOL      WINAPI IsDlgButtonChecked(HWND,UINT);
     3728UINT      WINAPI IsDlgButtonChecked(HWND,UINT);
    37293729BOOL      WINAPI IsIconic(HWND);
    37303730BOOL      WINAPI IsMenu(HMENU);
    … …  
    37573757HMENU     WINAPI LoadMenuW(HINSTANCE,LPCWSTR);
    37583758#define     LoadMenu WINELIB_NAME_AW(LoadMenu)
    3759 HMENU     WINAPI LoadMenuIndirectA(const MENUITEMTEMPLATEHEADER *);
    3760 HMENU     WINAPI LoadMenuIndirectW(const MENUITEMTEMPLATEHEADER *);
     3759HMENU     WINAPI LoadMenuIndirectA(LPCVOID);
     3760HMENU     WINAPI LoadMenuIndirectW(LPCVOID);
    37613761#define     LoadMenuIndirect WINELIB_NAME_AW(LoadMenuIndirect)
    37623762INT       WINAPI LoadStringA(HINSTANCE,UINT,LPSTR,INT);
Note: See TracChangeset for help on using the changeset viewer.