system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 11:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed prototypes of CreateStatusWindowA/W, ImageList_Copy,

Browse source 
ImageList_EndDrag, ImageList_SetImageCount.
This commit is contained in:
Filip Navara 2003-08-22 23:51:15 +00:00 committed by Alexandre Julliard
parent 112ded1a75
commit 1ccaaa1a82
4 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/comctl32/comctl32undoc.c
View file

@ -106,8 +106,7 @@ DPA_LoadStream (HDPA *phDpa, DPALOADPROC loadProc, IStream *pStream, LPARAM lPar
*phDpa = (HDPA)NULL;
position.s.LowPart = 0;
position.s.HighPart = 0;
position.QuadPart = 0;
/*
* Zero out our streamData

10
dlls/comctl32/commctrl.c
View file

@ -531,7 +531,7 @@ void WINAPI DrawStatusTextA (HDC hdc, LPRECT lprc, LPCSTR text, UINT style)
*/
HWND WINAPI
CreateStatusWindowA (INT style, LPCSTR text, HWND parent, UINT wid)
CreateStatusWindowA (LONG style, LPCSTR text, HWND parent, UINT wid)
{
return CreateWindowA(STATUSCLASSNAMEA, text, style,
CW_USEDEFAULT, CW_USEDEFAULT,
@ -555,7 +555,7 @@ CreateStatusWindowA (INT style, LPCSTR text, HWND parent, UINT wid)
*/
HWND WINAPI
CreateStatusWindowW (INT style, LPCWSTR text, HWND parent, UINT wid)
CreateStatusWindowW (LONG style, LPCWSTR text, HWND parent, UINT wid)
{
return CreateWindowW(STATUSCLASSNAMEW, text, style,
CW_USEDEFAULT, CW_USEDEFAULT,
@ -928,11 +928,11 @@ CreateMappedBitmap (HINSTANCE hInstance, INT idBitmap, UINT wFlags,
HWND WINAPI
CreateToolbar (HWND hwnd, DWORD style, UINT wID, INT nBitmaps,
HINSTANCE hBMInst, UINT wBMID,
LPCOLDTBBUTTON lpButtons,INT iNumButtons)
LPCTBBUTTON lpButtons,INT iNumButtons)
{
return CreateToolbarEx (hwnd, style | CCS_NODIVIDER, wID, nBitmaps,
hBMInst, wBMID, (LPCTBBUTTON)lpButtons,
iNumButtons, 0, 0, 0, 0, sizeof (OLDTBBUTTON));
hBMInst, wBMID, lpButtons,
iNumButtons, 0, 0, 0, 0, CCSIZEOF_STRUCT(TBBUTTON, dwData));
}

8
dlls/comctl32/imagelist.c
View file

@ -440,7 +440,7 @@ ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack,
BOOL WINAPI
ImageList_Copy (HIMAGELIST himlDst, INT iDst, HIMAGELIST himlSrc,
INT iSrc, INT uFlags)
INT iSrc, UINT uFlags)
{
TRACE("iDst=%d iSrc=%d\n", iDst, iSrc);
@ -1244,7 +1244,7 @@ ImageList_Duplicate (HIMAGELIST himlSrc)
* Failure: FALSE
*/
BOOL WINAPI
VOID WINAPI
ImageList_EndDrag (void)
{
/* cleanup the InternalDrag struct */
@ -1259,8 +1259,6 @@ ImageList_EndDrag (void)
DeleteObject(InternalDrag.hbmBg);
InternalDrag.hbmBg = 0;
InternalDrag.bHSPending = FALSE;
return TRUE;
}
@ -2511,7 +2509,7 @@ ImageList_SetIconSize (HIMAGELIST himl, INT cx, INT cy)
*/
BOOL WINAPI
ImageList_SetImageCount (HIMAGELIST himl, INT iImageCount)
ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount)
{
HDC hdcBitmap;
HBITMAP hbmNewBitmap;

12
include/commctrl.h
View file

@ -324,8 +324,8 @@ static const WCHAR STATUSCLASSNAMEW[] = { 'm','s','c','t','l','s','_',
#define SBN_LAST (0U-899U)
#define SBN_SIMPLEMODECHANGE (SBN_FIRST-0)
HWND WINAPI CreateStatusWindowA (INT, LPCSTR, HWND, UINT);
HWND WINAPI CreateStatusWindowW (INT, LPCWSTR, HWND, UINT);
HWND WINAPI CreateStatusWindowA (LONG, LPCSTR, HWND, UINT);
HWND WINAPI CreateStatusWindowW (LONG, LPCWSTR, HWND, UINT);
#define CreateStatusWindow WINELIB_NAME_AW(CreateStatusWindow)
VOID WINAPI DrawStatusTextA (HDC, LPRECT, LPCSTR, UINT);
VOID WINAPI DrawStatusTextW (HDC, LPRECT, LPCWSTR, UINT);
@ -556,7 +556,7 @@ typedef struct _IMAGELISTDRAWPARAMS
INT WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP);
INT WINAPI ImageList_AddMasked(HIMAGELIST,HBITMAP,COLORREF);
BOOL WINAPI ImageList_BeginDrag(HIMAGELIST,INT,INT,INT);
BOOL WINAPI ImageList_Copy(HIMAGELIST,INT,HIMAGELIST,INT,INT);
BOOL WINAPI ImageList_Copy(HIMAGELIST,INT,HIMAGELIST,INT,UINT);
HIMAGELIST WINAPI ImageList_Create(INT,INT,UINT,INT,INT);
BOOL WINAPI ImageList_Destroy(HIMAGELIST);
BOOL WINAPI ImageList_DragEnter(HWND,INT,INT);
@ -568,7 +568,7 @@ BOOL WINAPI ImageList_DrawEx(HIMAGELIST,INT,HDC,INT,INT,INT,
INT,COLORREF,COLORREF,UINT);
BOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*);
HIMAGELIST WINAPI ImageList_Duplicate(HIMAGELIST);
BOOL WINAPI ImageList_EndDrag(VOID);
VOID WINAPI ImageList_EndDrag(VOID);
COLORREF WINAPI ImageList_GetBkColor(HIMAGELIST);
HIMAGELIST WINAPI ImageList_GetDragImage(POINT*,POINT*);
HICON WINAPI ImageList_GetIcon(HIMAGELIST,INT,UINT);
@ -592,7 +592,7 @@ COLORREF WINAPI ImageList_SetBkColor(HIMAGELIST,COLORREF);
BOOL WINAPI ImageList_SetDragCursorImage(HIMAGELIST,INT,INT,INT);
BOOL WINAPI ImageList_SetIconSize(HIMAGELIST,INT,INT);
BOOL WINAPI ImageList_SetImageCount(HIMAGELIST,INT);
BOOL WINAPI ImageList_SetImageCount(HIMAGELIST,UINT);
BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT);
#ifdef IStream_METHODS
BOOL WINAPI ImageList_Write(HIMAGELIST, LPSTREAM);
@ -1426,7 +1426,7 @@ typedef struct
HWND WINAPI
CreateToolbar(HWND, DWORD, UINT, INT, HINSTANCE,
UINT, LPCOLDTBBUTTON, INT);
UINT, LPCTBBUTTON, INT);
HWND WINAPI
CreateToolbarEx(HWND, DWORD, UINT, INT,