From 5ca7a646d5c4bf58816d6cbce806d150a11e346f Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Sun, 17 Aug 2003 08:47:37 +0000 Subject: 2003-08-17 Martin Fuchs * include/commctrl.h (TreeView_GetScrollTime, TreeView_SetScrollTime): Define macros. * include/winuser.h (GetShellWindow): Add prototype. * include/objidl.h (STGMEDIUM): Correct lpszFileName type. --- winsup/w32api/include/commctrl.h | 2 ++ winsup/w32api/include/objidl.h | 2 +- winsup/w32api/include/winuser.h | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h index 90f2e8c..d1a0c0a 100644 --- a/winsup/w32api/include/commctrl.h +++ b/winsup/w32api/include/commctrl.h @@ -2582,10 +2582,12 @@ WINBOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*); #define TreeView_GetBkColor(w) (COLORREF)SNDMSG((w),TVM_GETBKCOLOR,0,0) #define TreeView_GetInsertMarkColor(w) (COLORREF)SNDMSG((w),TVM_GETINSERTMARKCOLOR,0,0) #define TreeView_GetItemHeight(w) (int)SNDMSG((w),TVM_GETITEMHEIGHT,0,0) +#define TreeView_GetScrollTime(w) (UINT)SNDMSG((w),TVM_GETSCROLLTIME,0,0) #define TreeView_GetTextColor(w) (COLORREF)SNDMSG((w),TVM_GETTEXTCOLOR,0,0) #define TreeView_SetBkColor(w,c) (COLORREF)SNDMSG((w),TVM_SETBKCOLOR,0,(LPARAM)(c)) #define TreeView_SetInsertMarkColor(w,c) (COLORREF)SNDMSG((w),TVM_SETINSERTMARKCOLOR,0,(LPARAM)(c)) #define TreeView_SetItemHeight(w,h) (int)SNDMSG((w),TVM_SETITEMHEIGHT,(WPARAM)(h),0) +#define TreeView_SetScrollTime(w,t) (UINT)SNDMSG((w),TVM_SETSCROLLTIME,(WPARAM)(UINT)(t),0) #define TreeView_SetTextColor(w,c) (COLORREF)SNDMSG((w),TVM_SETTEXTCOLOR,0,(LPARAM)(c)) #endif diff --git a/winsup/w32api/include/objidl.h b/winsup/w32api/include/objidl.h index 6cbd038..326915c 100644 --- a/winsup/w32api/include/objidl.h +++ b/winsup/w32api/include/objidl.h @@ -159,7 +159,7 @@ typedef struct tagSTGMEDIUM { PVOID hMetaFilePict; HENHMETAFILE hEnhMetaFile; HGLOBAL hGlobal; - LPCSTR lpszFileName; + LPWSTR lpszFileName; LPSTREAM pstm; LPSTORAGE pstg; } DUMMYUNIONNAME; diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index b62b3cc..8879002 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -3060,6 +3060,9 @@ DWORD WINAPI GetQueueStatus(UINT); BOOL WINAPI GetScrollInfo(HWND,int,LPSCROLLINFO); int WINAPI GetScrollPos(HWND,int); BOOL WINAPI GetScrollRange(HWND,int,LPINT,LPINT); +#if (_WIN32_WINNT >= _NT5) +HWND WINAPI GetShellWindow(VOID); +#endif HMENU WINAPI GetSubMenu(HMENU,int); DWORD WINAPI GetSysColor(int); HBRUSH WINAPI GetSysColorBrush(int); -- cgit v1.1