From 46258d6fb80517c94ea0fb73b601cbf3a9fc9edb Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Sun, 10 Aug 2003 00:40:01 +0000 Subject: [PATCH] 2003-08-10 Danny Smith * include/shlobj.h (SHELLSTATE): Add structure. (SHGetSetSettings): Add prototype. (SHGetSettings): Add prototype. * lib/user32.def (SHGetSetSettings): Add stub. 2003-08-10 Phil Krylov * include/commctrl.h (HDM_ORDERTOINDEX): Add define. (Header_OrderToIndex): Add macro. (Header_GetOrderArray): Add macro. * include/commdlg.h (FR_MATCHALEFHAMZA, FR_MATCHDIAC, FR_MATCHKASHIDA): Add defines. 2003-08-10 Martin Fuchs * include/commctrl.h (TVM_GETSCROLLTIME, TVM_SETSCROLLTIME): Add defines. --- winsup/w32api/ChangeLog | 21 +++++++++++++++++++ winsup/w32api/include/commctrl.h | 5 +++++ winsup/w32api/include/commdlg.h | 3 +++ winsup/w32api/include/shlobj.h | 36 ++++++++++++++++++++++++++++++++ winsup/w32api/lib/shell32.def | 1 + 5 files changed, 66 insertions(+) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index c507fa392..644bd62c9 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,24 @@ +2003-08-10 Danny Smith + + * include/shlobj.h (SHELLSTATE): Add structure. + (SHGetSetSettings): Add prototype. + (SHGetSettings): Add prototype. + * lib/user32.def (SHGetSetSettings): Add stub. + +2003-08-10 Phil Krylov + + * include/commctrl.h (HDM_ORDERTOINDEX): Add define. + (Header_OrderToIndex): Add macro. + (Header_GetOrderArray): Add macro. + + * include/commdlg.h (FR_MATCHALEFHAMZA, + FR_MATCHDIAC, FR_MATCHKASHIDA): Add defines. + +2003-08-10 Martin Fuchs + + * include/commctrl.h (TVM_GETSCROLLTIME, + TVM_SETSCROLLTIME): Add defines. + 2003-08-01 Danny Smith * include/shlobj.h (SHELLFLAGSTATE): Add structure. diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h index 1967570a3..90f2e8c5e 100644 --- a/winsup/w32api/include/commctrl.h +++ b/winsup/w32api/include/commctrl.h @@ -309,6 +309,7 @@ extern "C" { #define HDM_LAYOUT (HDM_FIRST+5) #if (_WIN32_IE >= 0x0300) #define HDM_GETITEMRECT (HDM_FIRST+7) +#define HDM_ORDERTOINDEX (HDM_FIRST+15) #define HDM_GETORDERARRAY (HDM_FIRST+17) #define HDM_SETORDERARRAY (HDM_FIRST+18) #endif @@ -1021,11 +1022,13 @@ extern "C" { #define TVM_GETBKCOLOR (TV_FIRST+31) #define TVM_GETINSERTMARKCOLOR (TV_FIRST+38) #define TVM_GETITEMHEIGHT (TV_FIRST+28) +#define TVM_GETSCROLLTIME (TV_FIRST+34) #define TVM_GETTEXTCOLOR (TV_FIRST+32) #define TVM_SETBKCOLOR (TV_FIRST+29) #define TVM_SETINSERTMARK (TV_FIRST+26) #define TVM_SETINSERTMARKCOLOR (TV_FIRST+37) #define TVM_SETITEMHEIGHT (TV_FIRST+27) +#define TVM_SETSCROLLTIME (TV_FIRST+33) #define TVM_SETTEXTCOLOR (TV_FIRST+30) #endif #define TVE_COLLAPSE 1 @@ -2340,7 +2343,9 @@ void WINAPI GetEffectiveClientRect(HWND,LPRECT,LPINT); #define Header_SetItem(w,i,phdi) (BOOL)SNDMSG((w),HDM_SETITEM,(WPARAM)(int)(i),(LPARAM)(const HD_ITEM*)(phdi)) #define Header_Layout(w,l) (BOOL)SNDMSG((w),HDM_LAYOUT,0,(LPARAM)(HD_LAYOUT*)(l)) #if (_WIN32_IE >= 0x0300) +#define Header_OrderToIndex(w,o) (int)SNDMSG((w),HDM_ORDERTOINDEX,(WPARAM)(o),0) #define Header_GetItemRect(w,i,r) (BOOL)SNDMSG((w),HDM_GETITEMRECT,(WPARAM)(i),(LPARAM)(r)) +#define Header_GetOrderArray(w,l,a) (BOOL)SNDMSG((w),HDM_GETORDERARRAY,(WPARAM)(l),(LPARAM)(a)) #define Header_SetOrderArray(w,l,a) (BOOL)SNDMSG((w),HDM_SETORDERARRAY,(WPARAM)(l),(LPARAM)(a)) #endif int WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP); diff --git a/winsup/w32api/include/commdlg.h b/winsup/w32api/include/commdlg.h index 465a18001..afe2a0cb7 100644 --- a/winsup/w32api/include/commdlg.h +++ b/winsup/w32api/include/commdlg.h @@ -125,7 +125,10 @@ extern "C" { #define FR_HIDEUPDOWN 0x4000 #define FR_HIDEMATCHCASE 0x8000 #define FR_HIDEWHOLEWORD 0x10000 +#define FR_MATCHALEFHAMZA 0x80000000 #define FR_MATCHCASE 4 +#define FR_MATCHDIAC 0x20000000 +#define FR_MATCHKASHIDA 0x40000000 #define FR_NOMATCHCASE 0x800 #define FR_NOUPDOWN 0x400 #define FR_NOWHOLEWORD 4096 diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h index 0c09fe7a4..1a0afaed5 100644 --- a/winsup/w32api/include/shlobj.h +++ b/winsup/w32api/include/shlobj.h @@ -776,6 +776,38 @@ typedef struct { UINT fRestFlags : 3; } SHELLFLAGSTATE, * LPSHELLFLAGSTATE; +#if (_WIN32_WINNT >= 0x0500) /* W2K */ +typedef struct { + BOOL fShowAllObjects : 1; + BOOL fShowExtensions : 1; + BOOL fNoConfirmRecycle : 1; + BOOL fShowSysFiles : 1; + BOOL fShowCompColor : 1; + BOOL fDoubleClickInWebView : 1; + BOOL fDesktopHTML : 1; + BOOL fWin95Classic : 1; + BOOL fDontPrettyPath : 1; + BOOL fShowAttribCol : 1; + BOOL fMapNetDrvBtn : 1; + BOOL fShowInfoTip : 1; + BOOL fHideIcons : 1; + BOOL fWebView : 1; + BOOL fFilter : 1; + BOOL fShowSuperHidden : 1; + BOOL fNoNetCrawling : 1; + DWORD dwWin95Unused; + UINT uWin95Unused; + LONG lParamSort; + int iSortDirection; + UINT version; + UINT uNotUsed; + BOOL fSepProcess : 1; + BOOL fStartPanelOn : 1; + BOOL fShowStartPage : 1; + UINT fSpareFlags : 13; +} SHELLSTATE, *LPSHELLSTATE; +#endif + void WINAPI SHAddToRecentDocs(UINT,PCVOID); LPITEMIDLIST WINAPI SHBrowseForFolderA(PBROWSEINFOA); LPITEMIDLIST WINAPI SHBrowseForFolderW(PBROWSEINFOW); @@ -803,6 +835,10 @@ HRESULT WINAPI SHGetFolderLocation(HWND,int,HANDLE,DWORD,LPITEMIDLIST*); HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR); HRESULT WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR); #endif +void WINAPI SHGetSettings(LPSHELLFLAGSTATE,DWORD); +#if (_WIN32_WINNT >= 0x0500) /* W2K */ +void WINAPI SHGetSetSettings(LPSHELLSTATE,DWORD,BOOL); +#endif #ifdef UNICODE typedef IShellExecuteHookW IShellExecuteHook; diff --git a/winsup/w32api/lib/shell32.def b/winsup/w32api/lib/shell32.def index a5cee20fd..fa8b8b8d9 100644 --- a/winsup/w32api/lib/shell32.def +++ b/winsup/w32api/lib/shell32.def @@ -48,6 +48,7 @@ SHGetUnreadMailCountW@24 SHGetSpecialFolderPathW@16 SHGetSpecialFolderPathA@16 SHGetSpecialFolderLocation@12 +SHGetSetSettings@12 SHGetSettings@8 SHGetPathFromIDListW@8 SHGetPathFromIDListA@8