Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[janderwald] 29539: - add PickIconDlg declaration
by janderwald＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: janderwald Date: Fri Oct 12 19:17:51 2007 New Revision: 29539 URL: http://svn.reactos.org/svn/reactos?rev=29539&view=rev Log: - add PickIconDlg declaration Modified: trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h (original) +++ trunk/reactos/include/psdk/shlobj.h Fri Oct 12 19:17:51 2007 @@ -65,6 +65,7 @@ HRESULT WINAPI SHStartNetConnectionDialog(HWND,LPCSTR,DWORD); VOID WINAPI SHUpdateImageA(LPCSTR,INT,UINT,INT); VOID WINAPI SHUpdateImageW(LPCWSTR,INT,UINT,INT); +INT WINAPI PickIconDlg(HWND,LPWSTR,UINT,int *); #define SHUpdateImage WINELIB_NAME_AW(SHUpdateImage) int WINAPI RestartDialog(HWND,LPCWSTR,DWORD); int WINAPI RestartDialogEx(HWND,LPCWSTR,DWORD,DWORD);

1 0

[janderwald] 29538: - fix build - set control ids
by janderwald＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: janderwald Date: Fri Oct 12 18:49:21 2007 New Revision: 29538 URL: http://svn.reactos.org/svn/reactos?rev=29538&view=rev Log: - fix build - set control ids Modified: trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/shell32_De.rc trunk/reactos/dll/win32/shell32/shell32_En.rc trunk/reactos/dll/win32/shell32/shelllink.c Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c (original) +++ trunk/reactos/dll/win32/shell32/drive.c Fri Oct 12 18:49:21 2007 @@ -420,7 +420,7 @@ for (i = 0; i < DRIVE_PROPERTY_PAGES; i++) { - HPROPSHEETPAGE hprop = SH_CreatePropertySheetPage(PropPages[i].resname, PropPages[i].dlgproc, (LPARAM)drive); + HPROPSHEETPAGE hprop = SH_CreatePropertySheetPage(PropPages[i].resname, PropPages[i].dlgproc, (LPARAM)drive, NULL); if (hprop) { hpsp[psh.nPages] = hprop; Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_De.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_De.rc Fri Oct 12 18:49:21 2007 @@ -332,13 +332,13 @@ CAPTION "Recycle Bin Properties" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { - CONTROL "", -1, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 GROUPBOX "Settings for selected location", -1, 10, 80, 220, 70 - RADIOBUTTON "&Custom size:", -1, 20, 90, 80, 10 - EDITTEXT -1, 90, 90, 50, 10, WS_TABSTOP + RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10 + EDITTEXT 14002, 90, 90, 50, 10, WS_TABSTOP LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10 - RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", -1, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON"&Display delete confirmation dialog", -1, 20, 155, 140, 10, WS_TABSTOP + RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP + RADIOBUTTON"&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/shell32/shell32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_En.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_En.rc Fri Oct 12 18:49:21 2007 @@ -332,13 +332,13 @@ CAPTION "Recycle Bin Properties" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { - CONTROL "", -1, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 GROUPBOX "Settings for selected location", -1, 10, 80, 220, 70 - RADIOBUTTON "&Custom size:", -1, 20, 90, 80, 10 - EDITTEXT -1, 90, 90, 50, 10, WS_TABSTOP + RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10 + EDITTEXT 14002, 90, 90, 50, 10, WS_TABSTOP LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10 - RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", -1, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON"&Display delete confirmation dialog", -1, 20, 155, 140, 10, WS_TABSTOP + RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP + RADIOBUTTON"&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.c (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c Fri Oct 12 18:49:21 2007 @@ -2716,13 +2716,13 @@ memset(hppages, 0x0, sizeof(HPROPSHEETPAGE) * MAX_PROPERTY_SHEET_PAGE); - hpage = SH_CreatePropertySheetPage("SHELL_FILE_GENERAL_DLG", SH_FileGeneralDlgProc, (LPARAM)This->sLinkPath); + hpage = SH_CreatePropertySheetPage("SHELL_FILE_GENERAL_DLG", SH_FileGeneralDlgProc, (LPARAM)This->sLinkPath, NULL); if ( hpage == NULL ) return E_FAIL; else hppages[numpages++] = hpage; - hpage = SH_CreatePropertySheetPage("SHELL_GENERAL_SHORTCUT_DLG", SH_ShellLinkDlgProc, (LPARAM)This); + hpage = SH_CreatePropertySheetPage("SHELL_GENERAL_SHORTCUT_DLG", SH_ShellLinkDlgProc, (LPARAM)This, NULL); if ( hpage == NULL ) { ERR("SH_CreatePropertySheetPage failed\n");

1 0

[janderwald] 29537: - explictely use PROPSHEETHEADERW - implement _ILIsBitBucket function - implement a IContextMenu for recycle bin interface but is currently unused see notes shv_item_cmenu.c - implement recycle property dialog resources in vista style
by janderwald＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: janderwald Date: Fri Oct 12 18:25:58 2007 New Revision: 29537 URL: http://svn.reactos.org/svn/reactos?rev=29537&view=rev Log: - explictely use PROPSHEETHEADERW - implement _ILIsBitBucket function - implement a IContextMenu for recycle bin interface but is currently unused see notes shv_item_cmenu.c - implement recycle property dialog resources in vista style Modified: trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/fprop.c trunk/reactos/dll/win32/shell32/pidl.c trunk/reactos/dll/win32/shell32/pidl.h trunk/reactos/dll/win32/shell32/recyclebin.c trunk/reactos/dll/win32/shell32/shell32_De.rc trunk/reactos/dll/win32/shell32/shell32_En.rc trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shres.rc trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c (original) +++ trunk/reactos/dll/win32/shell32/drive.c Fri Oct 12 18:25:58 2007 @@ -411,8 +411,8 @@ BOOL ret; UINT i; - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwSize = sizeof(PROPSHEETHEADER); + ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); + psh.dwSize = sizeof(PROPSHEETHEADERW); //psh.dwFlags = PSH_USECALLBACK | PSH_PROPTITLE; psh.hwndParent = NULL; psh.nStartPage = 0; Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c (original) +++ trunk/reactos/dll/win32/shell32/fprop.c Fri Oct 12 18:25:58 2007 @@ -62,7 +62,7 @@ * */ HPROPSHEETPAGE -SH_CreatePropertySheetPage(LPSTR resname, DLGPROC dlgproc, LPARAM lParam) +SH_CreatePropertySheetPage(LPSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle) { HRSRC hRes; LPVOID lpsztemplate; @@ -88,6 +88,11 @@ ppage.u.pResource = lpsztemplate; ppage.pfnDlgProc = dlgproc; ppage.lParam = lParam; + ppage.pszTitle = szTitle; + if (szTitle) + { + ppage.dwFlags |= PSP_USETITLE; + } return CreatePropertySheetPageW(&ppage); } @@ -645,7 +650,7 @@ FIXME("directory / drive resources are missing\n"); return FALSE; } - hpage = SH_CreatePropertySheetPage("SHELL_FILE_GENERAL_DLG", SH_FileGeneralDlgProc, (LPARAM)wFileName); + hpage = SH_CreatePropertySheetPage("SHELL_FILE_GENERAL_DLG", SH_FileGeneralDlgProc, (LPARAM)wFileName, NULL); if (hpage == NULL) return FALSE; @@ -654,7 +659,7 @@ num_pages++; if ( GetFileVersionInfoSizeW(lpf, &dwHandle) ) { - if ( (hpage = SH_CreatePropertySheetPage("SHELL_FILE_VERSION_DLG",SH_FileVersionDlgProc, (LPARAM)lpf))!= NULL) + if ( (hpage = SH_CreatePropertySheetPage("SHELL_FILE_VERSION_DLG",SH_FileVersionDlgProc, (LPARAM)lpf, NULL))!= NULL) { hppages[num_pages] = hpage; num_pages++; Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.c (original) +++ trunk/reactos/dll/win32/shell32/pidl.c Fri Oct 12 18:25:58 2007 @@ -1633,6 +1633,16 @@ return IsEqualIID(iid, &CLSID_MyComputer); return FALSE; } +BOOL _ILIsBitBucket(LPCITEMIDLIST pidl) +{ + REFIID iid = _ILGetGUIDPointer(pidl); + + TRACE("(%p)\n",pidl); + + if (iid) + return IsEqualIID(iid, &CLSID_RecycleBin); + return FALSE; +} BOOL _ILIsSpecialFolder (LPCITEMIDLIST pidl) { Modified: trunk/reactos/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.h (original) +++ trunk/reactos/dll/win32/shell32/pidl.h Fri Oct 12 18:25:58 2007 @@ -204,6 +204,7 @@ BOOL _ILIsUnicode (LPCITEMIDLIST pidl); BOOL _ILIsDesktop (LPCITEMIDLIST pidl); BOOL _ILIsMyComputer (LPCITEMIDLIST pidl); +BOOL _ILIsBitBucket (LPCITEMIDLIST pidl); BOOL _ILIsDrive (LPCITEMIDLIST pidl); BOOL _ILIsFolder (LPCITEMIDLIST pidl); BOOL _ILIsValue (LPCITEMIDLIST pidl); Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c Fri Oct 12 18:25:58 2007 @@ -22,6 +22,8 @@ #define YDEBUG #define COBJMACROS #define NONAMELESSUNION +#define NONAMELESSSTRUCT +#define MAX_PROPERTY_SHEET_PAGE 32 #include <stdarg.h> @@ -40,6 +42,7 @@ #include "enumidlist.h" #include "xdg.h" #include "recyclebin.h" +#include <prsht.h> WINE_DEFAULT_DEBUG_CHANNEL(recyclebin); @@ -102,13 +105,24 @@ { const IShellFolder2Vtbl *lpVtbl; const IPersistFolder2Vtbl *lpPersistFolderVtbl; + const IContextMenuVtbl *lpCmt; LONG refCount; + + INT iIdOpen; + INT iIdEmpty; + INT iIdProperties; LPITEMIDLIST pidl; } RecycleBin; +static const IContextMenuVtbl recycleBincmVtbl; static const IShellFolder2Vtbl recycleBinVtbl; static const IPersistFolder2Vtbl recycleBinPersistVtbl; + +static RecycleBin *impl_from_IContextMenu(IContextMenu *iface) +{ + return (RecycleBin *)((char *)iface - FIELD_OFFSET(RecycleBin, lpCmt)); +} static RecycleBin *impl_from_IPersistFolder(IPersistFolder2 *iface) { @@ -130,6 +144,7 @@ ZeroMemory(obj, sizeof(RecycleBin)); obj->lpVtbl = &recycleBinVtbl; obj->lpPersistFolderVtbl = &recycleBinPersistVtbl; + obj->lpCmt = &recycleBincmVtbl; if (FAILED(ret = IUnknown_QueryInterface((IUnknown *)obj, riid, ppOutput))) { RecycleBin_Destructor(obj); @@ -159,6 +174,9 @@ if (IsEqualGUID(riid, &IID_IPersist) || IsEqualGUID(riid, &IID_IPersistFolder) || IsEqualGUID(riid, &IID_IPersistFolder2)) *ppvObject = &This->lpPersistFolderVtbl; + + if (IsEqualGUID(riid, &IID_IContextMenu)) + *ppvObject = &This->lpCmt; if (*ppvObject != NULL) { @@ -246,7 +264,7 @@ } PDELETED_FILE_DETAILS_W -UnpackDetailsFromPidl(LPITEMIDLIST pidl) +UnpackDetailsFromPidl(LPCITEMIDLIST pidl) { return (PDELETED_FILE_DETAILS_W)&pidl->mkid.abID[1]; } @@ -568,3 +586,201 @@ FIXME("stub\n"); return S_OK; } +static HRESULT WINAPI +RecycleBin_IContextMenu_QueryInterface( IContextMenu* iface, REFIID riid, void** ppvObject ) +{ + return RecycleBin_QueryInterface((IShellFolder2 *)impl_from_IContextMenu(iface), riid, ppvObject); +} + +static ULONG WINAPI +RecycleBin_IContextMenu_AddRef( IContextMenu* iface ) +{ + return RecycleBin_AddRef((IShellFolder2 *)impl_from_IContextMenu(iface)); +} + +static ULONG WINAPI +RecycleBin_IContextMenu_Release( IContextMenu* iface ) +{ + return RecycleBin_Release((IShellFolder2 *)impl_from_IContextMenu(iface)); +} + +static HRESULT WINAPI +RecycleBin_IContextMenu_QueryContextMenu( IContextMenu* iface, HMENU hmenu, UINT indexMenu, + UINT idCmdFirst, UINT idCmdLast, UINT uFlags ) +{ + RecycleBin * This = impl_from_IContextMenu(iface); + static WCHAR szOpen[] = { 'O','p','e','n',0 }; + static WCHAR szEmpty[] = { 'E','m','p','t','y',' ','R','e','c','y','c','l','e',' ','B','i','n',0 }; + static WCHAR szProperties[] = { 'P','r','o','p','e','r','t','i','e','s',0 }; + MENUITEMINFOW mii; + int id = 1; + + TRACE("%p %p %u %u %u %u\n", This, + hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags ); + + if ( !hmenu ) + return E_INVALIDARG; + + memset( &mii, 0, sizeof(mii) ); + mii.cbSize = sizeof (mii); + mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE; + mii.dwTypeData = (LPWSTR)szOpen; + mii.cch = strlenW( mii.dwTypeData ); + mii.wID = idCmdFirst + id++; + mii.fState = MFS_ENABLED; + mii.fType = MFT_STRING; + if (!InsertMenuItemW( hmenu, indexMenu, TRUE, &mii )) + return E_FAIL; + This->iIdOpen = 0; + + mii.fState = MFS_ENABLED; + mii.dwTypeData = (LPWSTR)szEmpty; + mii.cch = strlenW( mii.dwTypeData ); + mii.wID = idCmdFirst + id++; + if (!InsertMenuItemW( hmenu, idCmdLast, TRUE, &mii )) + { + TRACE("RecycleBin_IContextMenu_QueryContextMenu failed to insert item properties"); + return E_FAIL; + } + This->iIdEmpty = 1; + id++; + + mii.fState = MFS_ENABLED; + mii.dwTypeData = (LPWSTR)szProperties; + mii.cch = strlenW( mii.dwTypeData ); + mii.wID = idCmdFirst + id++; + if (!InsertMenuItemW( hmenu, idCmdLast, TRUE, &mii )) + { + TRACE("RecycleBin_IContextMenu_QueryContextMenu failed to insert item properties"); + return E_FAIL; + } + This->iIdProperties = 2; + id++; + + return MAKE_HRESULT( SEVERITY_SUCCESS, 0, id ); +} + +static HRESULT WINAPI +RecycleBin_IContextMenu_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici ) +{ + RecycleBin * This = impl_from_IContextMenu(iface); + + TRACE("%p %p\n", This, lpici ); + + return E_FAIL; +} + +static HRESULT WINAPI +RecycleBin_IContextMenu_GetCommandString( IContextMenu* iface, UINT_PTR idCmd, UINT uType, + UINT* pwReserved, LPSTR pszName, UINT cchMax ) +{ + RecycleBin * This = impl_from_IContextMenu(iface); + + FIXME("%p %lu %u %p %p %u\n", This, + idCmd, uType, pwReserved, pszName, cchMax ); + + return E_NOTIMPL; +} + +static const IContextMenuVtbl recycleBincmVtbl = +{ + RecycleBin_IContextMenu_QueryInterface, + RecycleBin_IContextMenu_AddRef, + RecycleBin_IContextMenu_Release, + RecycleBin_IContextMenu_QueryContextMenu, + RecycleBin_IContextMenu_InvokeCommand, + RecycleBin_IContextMenu_GetCommandString +}; + +INT_PTR +CALLBACK +RecycleBinGeneralDlg( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + + + return FALSE; +} + +void +InitializeBitBucketDlg(HWND hwndDlg) +{ + WCHAR CurDrive = L'A'; + WCHAR szDrive[] = L"A:\\"; + DWORD dwDrives; + WCHAR szName[MAX_PATH+1]; + DWORD MaxComponent, Flags; + + dwDrives = GetLogicalDrives(); + do + { + if ((dwDrives & 0x1)) + { + UINT Type = GetDriveTypeW(szDrive); + if (Type == DRIVE_FIXED) //FIXME + { + if (!GetVolumeInformationW(szDrive, szName, MAX_PATH+1, NULL, &MaxComponent, &Flags, NULL, 0)) + { + wcscpy(szName, szDrive); + } + } + } + CurDrive++; + szDrive[0] = CurDrive; + dwDrives = (dwDrives >> 1); + }while(dwDrives); + + +} + + + +INT_PTR +CALLBACK +BitBucketDlg( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + + + return FALSE; +} + +BOOL SH_ShowRecycleBinProperties(WCHAR sDrive) +{ + HPROPSHEETPAGE hpsp[1]; + PROPSHEETHEADERW psh; + HPROPSHEETPAGE hprop; + + BOOL ret; + + + ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); + psh.dwSize = sizeof(PROPSHEETHEADERW); + psh.hwndParent = NULL; + psh.u3.phpage = hpsp; + + hprop = SH_CreatePropertySheetPage("BITBUCKET_PROPERTIES_DLG", BitBucketDlg, (LPARAM)0, NULL); + if (!hprop) + { + ERR("Failed to create property sheet"); + return FALSE; + } + hpsp[psh.nPages] = hprop; + psh.nPages++; + + + ret = PropertySheetW(&psh); + if (ret < 0) + return FALSE; + else + return TRUE; +} + Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_De.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_De.rc Fri Oct 12 18:25:58 2007 @@ -327,6 +327,19 @@ PUSHBUTTON "Abbrechen", 14008, 140, 170, 60, 15, WS_TABSTOP } +BITBUCKET_PROPERTIES_DLG DIALOGEX 0, 0, 240, 190 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Recycle Bin Properties" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + CONTROL "", -1, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 + GROUPBOX "Settings for selected location", -1, 10, 80, 220, 70 + RADIOBUTTON "&Custom size:", -1, 20, 90, 80, 10 + EDITTEXT -1, 90, 90, 50, 10, WS_TABSTOP + LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10 + RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", -1, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP + RADIOBUTTON"&Display delete confirmation dialog", -1, 20, 155, 140, 10, WS_TABSTOP +} STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/shell32/shell32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_En.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_En.rc Fri Oct 12 18:25:58 2007 @@ -327,6 +327,19 @@ PUSHBUTTON "Cancel", 14008, 140, 170, 60, 15, WS_TABSTOP } +BITBUCKET_PROPERTIES_DLG DIALOGEX 0, 0, 240, 190 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Recycle Bin Properties" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + CONTROL "", -1, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 + GROUPBOX "Settings for selected location", -1, 10, 80, 220, 70 + RADIOBUTTON "&Custom size:", -1, 20, 90, 80, 10 + EDITTEXT -1, 90, 90, 50, 10, WS_TABSTOP + LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10 + RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", -1, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP + RADIOBUTTON"&Display delete confirmation dialog", -1, 20, 155, 140, 10, WS_TABSTOP +} STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h Fri Oct 12 18:25:58 2007 @@ -241,6 +241,7 @@ INT_PTR CALLBACK SH_FileGeneralDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK SH_FileVersionDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -HPROPSHEETPAGE SH_CreatePropertySheetPage(LPSTR resname, DLGPROC dlgproc, LPARAM lParam); +HPROPSHEETPAGE SH_CreatePropertySheetPage(LPSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle); BOOL SH_ShowDriveProperties(WCHAR * drive); +BOOL SH_ShowRecycleBinProperties(WCHAR sDrive); #endif Modified: trunk/reactos/dll/win32/shell32/shres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shres.rc… ============================================================================== --- trunk/reactos/dll/win32/shell32/shres.rc (original) +++ trunk/reactos/dll/win32/shell32/shres.rc Fri Oct 12 18:25:58 2007 @@ -34,7 +34,6 @@ BEGIN VK_F5, FCIDM_SHVIEW_REFRESH, VIRTKEY END - /* Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Fri Oct 12 18:25:58 2007 @@ -396,6 +396,13 @@ LPITEMIDLIST pidlFQ = NULL; SHELLEXECUTEINFOA sei; + /* + * FIXXME + * + * The IShellFolder interface GetUIObject should create the specific item and then query if it has an IContextMenu interface + * If yes return interface to it. + */ + if (_ILIsMyComputer(This->apidl[0])) { ShellExecuteA(hwnd, "open", "rundll32.exe shell32.dll,Control_RunDLL sysdm.cpl", NULL, NULL, SW_SHOWNORMAL); @@ -412,6 +419,12 @@ ILGetDisplayName(This->apidl[0], buffer); SH_ShowDriveProperties(buffer); return; + } + else if (_ILIsBitBucket(This->apidl[0])) + { + ///FIXME + WCHAR szDrive = 'C'; + SH_ShowRecycleBinProperties(szDrive); } else {

1 0

[peterw] 29536: - Fix build.
by peterw＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: peterw Date: Fri Oct 12 16:19:37 2007 New Revision: 29536 URL: http://svn.reactos.org/svn/reactos?rev=29536&view=rev Log: - Fix build. Modified: trunk/reactos/base/system/winlogon/sas.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Fri Oct 12 16:19:37 2007 @@ -324,7 +324,7 @@ #else /* The following code is no only incomplete, it's a mess and uncompilable */ /* Still, it gives some ideas about data types and functions involved and */ - /* required to set up a SECURITY_DESCRIPTOR for a SECURITY_ATTRIBUTES + /* required to set up a SECURITY_DESCRIPTOR for a SECURITY_ATTRIBUTES */ /* instance for a thread, to allow that thread to ImpersonateLoggedOnUser(). */ /* Specifically THREAD_SET_THREAD_TOKEN is required. */ PSECURITY_DESCRIPTOR psd = 0;

1 0

[janderwald] 29535: - fix warning
by janderwald＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: janderwald Date: Fri Oct 12 16:11:00 2007 New Revision: 29535 URL: http://svn.reactos.org/svn/reactos?rev=29535&view=rev Log: - fix warning Modified: trunk/reactos/include/psdk/ntquery.h Modified: trunk/reactos/include/psdk/ntquery.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntquery.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ntquery.h (original) +++ trunk/reactos/include/psdk/ntquery.h Fri Oct 12 16:11:00 2007 @@ -79,4 +79,4 @@ } #endif -#endif +#endif

1 0

[peterw] 29534: Patch by Marc Piulachs (Issue 2737) - Imported write.exe plus small fix to compile it as unicode. (Added to rosapps instead of base/applications though)
by peterw＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: peterw Date: Fri Oct 12 16:06:05 2007 New Revision: 29534 URL: http://svn.reactos.org/svn/reactos?rev=29534&view=rev Log: Patch by Marc Piulachs (Issue 2737) - Imported write.exe plus small fix to compile it as unicode. (Added to rosapps instead of base/applications though) Added: trunk/rosapps/write/ trunk/rosapps/write/En.rc (with props) trunk/rosapps/write/Ko.rc (with props) trunk/rosapps/write/resources.h (with props) trunk/rosapps/write/rsrc.rc (with props) trunk/rosapps/write/write.c (with props) trunk/rosapps/write/write.rbuild (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/rosapps/directory.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Oct 12 16:06:05 2007 @@ -509,6 +509,7 @@ modules\rosapps\templates\mdi.exe 1 optional modules\rosapps\winefile\winefile.exe 1 optional modules\rosapps\winver\winver.exe 1 optional +modules\rosapps\write\write.exe 1 optional modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional modules\rostests\winetests\cabinet\cabinet_winetest.exe 7 optional modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=29534… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Fri Oct 12 16:06:05 2007 @@ -112,4 +112,8 @@ <directory name="winver"> <xi:include href="winver/winver.rbuild" /> </directory> + + <directory name="write"> + <xi:include href="write/write.rbuild" /> + </directory> </group> Added: trunk/rosapps/write/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/En.rc?rev=29534&view… ============================================================================== --- trunk/rosapps/write/En.rc (added) +++ trunk/rosapps/write/En.rc Fri Oct 12 16:06:05 2007 @@ -1,0 +1,26 @@ +/* + * English language support + * + * Copyright (C) 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_FAILED, "Starting Wordpad failed" +} Propchange: trunk/rosapps/write/En.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/write/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/Ko.rc?rev=29534&view… ============================================================================== --- trunk/rosapps/write/Ko.rc (added) +++ trunk/rosapps/write/Ko.rc Fri Oct 12 16:06:05 2007 @@ -1,0 +1,27 @@ +/* + * Korean language support + * + * Copyright (C) 2007 Mikolaj Zalewski + * Copyright (C) 2008 YunSong Hwang(È²À±¼º)(hys545(a)dreamwiz.com) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_FAILED, "¿öµåÆÐµå ½ÃÀÛ ½ÇÆÐÇÔ" +} Propchange: trunk/rosapps/write/Ko.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/write/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/resources.h?rev=2953… ============================================================================== --- trunk/rosapps/write/resources.h (added) +++ trunk/rosapps/write/resources.h Fri Oct 12 16:06:05 2007 @@ -1,0 +1,19 @@ +/* + * Copyright 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define IDS_FAILED 101 Propchange: trunk/rosapps/write/resources.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/rsrc.rc?rev=29534&vi… ============================================================================== --- trunk/rosapps/write/rsrc.rc (added) +++ trunk/rosapps/write/rsrc.rc Fri Oct 12 16:06:05 2007 @@ -1,0 +1,27 @@ +/* + * Copyright 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> +#include <winuser.h> + +#include "resources.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "En.rc" +#include "Ko.rc" Propchange: trunk/rosapps/write/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/write/write.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/write.c?rev=29534&vi… ============================================================================== --- trunk/rosapps/write/write.c (added) +++ trunk/rosapps/write/write.c Fri Oct 12 16:06:05 2007 @@ -1,0 +1,54 @@ +/* + * Write.exe - this program only calls wordpad.exe + * + * Copyright 2007 by Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN + +#include <stdarg.h> + +#include <windows.h> +#include "resources.h" + +static const WCHAR SZ_BACKSLASH[] = {'\\',0}; +static const WCHAR SZ_WORDPAD[] = {'w','o','r','d','p','a','d','.','e','x','e',0}; + +int CALLBACK wWinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPWSTR szCmdParagraph, int res) +{ + WCHAR path[MAX_PATH]; + STARTUPINFOW stinf; + PROCESS_INFORMATION info; + + if (!GetSystemDirectoryW(path, MAX_PATH - 1 - lstrlenW(SZ_WORDPAD))) + goto failed; + if (path[lstrlenW(path) - 1] != '\\') + lstrcatW(path, SZ_BACKSLASH); + lstrcatW(path, SZ_WORDPAD); + + stinf.cb = sizeof(STARTUPINFO); + GetStartupInfoW(&stinf); + + if (!CreateProcessW(path, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &stinf, &info)) + goto failed; + return 0; + +failed: + LoadStringW(GetModuleHandle(NULL), IDS_FAILED, path, MAX_PATH); + MessageBoxW(NULL, path, NULL, MB_OK|MB_ICONERROR); + return 1; +} Propchange: trunk/rosapps/write/write.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/write/write.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/write.rbuild?rev=295… ============================================================================== --- trunk/rosapps/write/write.rbuild (added) +++ trunk/rosapps/write/write.rbuild Fri Oct 12 16:06:05 2007 @@ -1,0 +1,14 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="write" type="win32gui" installbase="system32" installname="write.exe" unicode="yes"> + <include base="write">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0600</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>shell32</library> + <file>write.c</file> + <file>rsrc.rc</file> +</module> Propchange: trunk/rosapps/write/write.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mnordell] 29533: Beginnings of enabling THREAD_SET_THREAD_TOKEN, to allow ROS to actually be shut down. Mostly skeleton and junk, but the basic infrastructure is at least in place.
by mnordell＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: mnordell Date: Fri Oct 12 16:04:50 2007 New Revision: 29533 URL: http://svn.reactos.org/svn/reactos?rev=29533&view=rev Log: Beginnings of enabling THREAD_SET_THREAD_TOKEN, to allow ROS to actually be shut down. Mostly skeleton and junk, but the basic infrastructure is at least in place. Modified: trunk/reactos/base/system/winlogon/sas.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Fri Oct 12 16:04:50 2007 @@ -312,14 +312,94 @@ return 1; } + +static NTSTATUS +CreateLogoffSecurityAttributes( + OUT PSECURITY_ATTRIBUTES* ppsa) +{ +#if 1 + DPRINT1("CreateSecurityAttributes needs implementation!\n"); + *ppsa = 0; + return STATUS_UNSUCCESSFUL; +#else + /* The following code is no only incomplete, it's a mess and uncompilable */ + /* Still, it gives some ideas about data types and functions involved and */ + /* required to set up a SECURITY_DESCRIPTOR for a SECURITY_ATTRIBUTES + /* instance for a thread, to allow that thread to ImpersonateLoggedOnUser(). */ + /* Specifically THREAD_SET_THREAD_TOKEN is required. */ + PSECURITY_DESCRIPTOR psd = 0; + PSECURITY_ATTRIBUTES psa = 0; + ACL rgAcls[2]; + EXPLICIT_ACCESS ea[2]; + + /* set up the required security attributes to be able to shut down */ + psd = HeapAlloc(GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH); + psa = HeapAlloc(GetProcessHeap(), 0, sizeof(SECURITY_ATTRIBUTES)); + if (!psd || !psa) + { + DPRINT("Failed to allocate memory for a security descriptor!\n"); + return STATUS_NO_MEMORY; + } + + if (!InitializeSecurityDescriptor(psd, SECURITY_DESCRIPTOR_REVISION)) + { + HeapFree(GetProcessHeap(), 0, psd); + DPRINT("Failed to initialize security descriptor for logoff thread!\n"); + return STATUS_UNSUCCESSFUL; + } + + // Initialize an EXPLICIT_ACCESS structure for an ACE. + // The ACE will allow this thread to log off (and shut down the system, currently). + ZeroMemory(ea, sizeof(ea)); + ea[0].grfAccessPermissions = KEY_READ; + ea[0].grfAccessMode = SET_ACCESS; + ea[0].grfInheritance= NO_INHERITANCE; + ea[0].Trustee.TrusteeForm = TRUSTEE_IS_SID; + ea[0].Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; + ea[0].Trustee.ptstrName = (LPTSTR) pEveryoneSID; + + if (!SetSecurityDescriptorDacl(pSD, + TRUE, // bDaclPresent flag + pACL, + FALSE)) // not a default DACL + { + DPRINT("SetSecurityDescriptorDacl Error %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, psd); + return STATUS_UNSUCCESSFUL; + } + + psa->nLength = sizeof(sa); + psa->lpSecurityDescriptor = psd; + psa->bInheritHandle = FALSE; + + *ppsa = psa; + + return STATUS_SUCCESS; +#endif +} + +static void +DestroyLogoffSecurityAttributes( + IN PSECURITY_ATTRIBUTES psa) +{ + if (psa) + { + HeapFree(GetProcessHeap(), 0, psa->lpSecurityDescriptor); + HeapFree(GetProcessHeap(), 0, psa); + } +} + + static NTSTATUS HandleLogoff( IN OUT PWLSESSION Session, IN UINT Flags) { PLOGOFF_SHUTDOWN_DATA LSData; + PSECURITY_ATTRIBUTES psa; HANDLE hThread; DWORD exitCode; + NTSTATUS Status; DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_SAVEYOURSETTINGS); @@ -333,8 +413,26 @@ LSData->Flags = Flags; LSData->Session = Session; + Status = CreateLogoffSecurityAttributes(&psa); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed to create a required security descriptor. Error 0x%08x\n", Status); +#if 1 + DPRINT("Attempting to continue without it.\n"); +#else + DPRINT("Aborting logoff\n"); + HeapFree(GetProcessHeap(), 0, LSData); + return Status; +#endif + } + /* Run logoff thread */ - hThread = CreateThread(NULL, 0, LogoffShutdownThread, (LPVOID)LSData, 0, NULL); + hThread = CreateThread(psa, 0, LogoffShutdownThread, (LPVOID)LSData, 0, NULL); + + /* we're done with the SECURITY_DESCRIPTOR */ + DestroyLogoffSecurityAttributes(psa); + psa = NULL; + if (!hThread) { ERR("Unable to create logoff thread, error %lu\n", GetLastError());

1 0

[fireball] 29532: Dmitry Chapyshev <lentind@yandex.ru> - Make the "Information" tab work. - Improve overall applet's behavior (more correct and more "smart"). - Fixed a bug when switching between tabs. - Small improvements in the UI, other small fixes. - If no apps or no updates are installed, then the controls in the respective tabs will be grayed out, and a respective information message will be shown instead of the empty list.
by fireball＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: fireball Date: Fri Oct 12 14:12:52 2007 New Revision: 29532 URL: http://svn.reactos.org/svn/reactos?rev=29532&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Make the "Information" tab work. - Improve overall applet's behavior (more correct and more "smart"). - Fixed a bug when switching between tabs. - Small improvements in the UI, other small fixes. - If no apps or no updates are installed, then the controls in the respective tabs will be grayed out, and a respective information message will be shown instead of the empty list. Modified: trunk/reactos/dll/cpl/appwiz/appwiz.h trunk/reactos/dll/cpl/appwiz/lang/en-US.rc trunk/reactos/dll/cpl/appwiz/remove.c trunk/reactos/dll/cpl/appwiz/resource.h trunk/reactos/dll/cpl/appwiz/updates.c Modified: trunk/reactos/dll/cpl/appwiz/appwiz.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.h?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.h (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.h Fri Oct 12 14:12:52 2007 @@ -44,32 +44,35 @@ INT_PTR CALLBACK RemovePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK -InfoPropDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); - VOID AddListColumn(HWND hList, LPTSTR Caption); VOID -FillSoftwareList(HWND hwndDlg, BOOL bShowUpdates); +FillSoftwareList(HWND hwndDlg, BOOL bShowUpdates, UINT Control); VOID -AddItemsToViewControl(HWND hwndDlg); +AddItemsToViewControl(HWND hwndDlg, UINT Control); VOID -FindItems(HWND hwndDlg); +FindItems(HWND hwndDlg, UINT ListControl, UINT EditControl, UINT RemBtn, UINT InfoBtn); VOID -CallUninstall(HWND hwndDlg, UINT Control, BOOL isUpdate); +CallUninstall(HWND hwndDlg, UINT Control, UINT RemBtn, UINT InfoBtn, BOOL isUpdate); VOID -GetCurrentView(HWND hwndDlg); +GetCurrentView(HWND hwndDlg, UINT ViewControl, UINT ListControl); VOID -CallInformation(HWND hwndDlg); +CallInformation(HWND hwndDlg, HWND infDlg, UINT Control); VOID -ShowPopupMenu(HWND hwndDlg, UINT ResMenu, INT xPos, INT yPos); +ShowPopupMenu(HWND hwndDlg, UINT ResMenu, INT xPos, INT yPos, UINT Control); + +BOOL +IsItemSelected(HWND hwndDlg, UINT Control); + +VOID +ButtonStatus(HWND hwndDlg, BOOL Status, UINT RemBtn, UINT InfoBtn); /* add.c */ INT_PTR CALLBACK Modified: trunk/reactos/dll/cpl/appwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/en-US.rc Fri Oct 12 14:12:52 2007 @@ -24,10 +24,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,6,16,16 - LTEXT "The following Software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Modify/Remove.",-1,36,7,PROPSHEETWIDTH-48,32 - LTEXT "Find:",-1,PROPSHEETPADDING,33,50,14 + LTEXT "The following Software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Modify/Remove.",-1,36,7,PROPSHEETWIDTH-48,22 + LTEXT "Find:",-1,PROPSHEETPADDING,33,30,8 EDITTEXT IDC_FIND_EDIT, PROPSHEETPADDING+30, 30, 180, 14, WS_VISIBLE | WS_TABSTOP - LTEXT "View:",-1,250,33,40,8 + LTEXT "View:",-1,250,33,30,8 COMBOBOX IDC_VIEW_COMBO, 280, 30, 94, 80, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL CONTROL "", IDC_SOFTWARELIST, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL, PROPSHEETPADDING, 50, PROPSHEETWIDTH-12, 155, WS_EX_CLIENTEDGE PUSHBUTTON "Modify/&Remove", IDC_ADDREMOVE, PROPSHEETPADDING, 210, 80, 14, WS_DISABLED @@ -40,14 +40,14 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_UPDATES,-1,PROPSHEETPADDING,6,16,16 - LTEXT "The following Updates can be automatically removed. To remove a update, select it from the list and click Remove.",-1,36,7,PROPSHEETWIDTH-48,32 - LTEXT "Find:",-1,PROPSHEETPADDING,33,50,14 - EDITTEXT IDC_FIND_EDIT, PROPSHEETPADDING+30, 30, 180, 14, WS_VISIBLE | WS_TABSTOP - LTEXT "View:",-1,250,33,40,8 - COMBOBOX IDC_VIEW_COMBO, 280, 30, 94, 80, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - CONTROL "", IDC_SOFTWARELIST, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL, PROPSHEETPADDING, 50, PROPSHEETWIDTH-12, 155, WS_EX_CLIENTEDGE - PUSHBUTTON "&Remove", IDC_ADDREMOVE, PROPSHEETPADDING, 210, 80, 14, WS_DISABLED - PUSHBUTTON "&Information", IDC_INFO_BUTTON, PROPSHEETPADDING+85, 210, 80, 14, WS_DISABLED + LTEXT "The following Updates can be automatically removed. To remove a update, select it from the list and click Remove.",-1,36,7,PROPSHEETWIDTH-48,22 + LTEXT "Find:",-1,PROPSHEETPADDING,33,30,8 + EDITTEXT IDC_UPD_FIND_EDIT, PROPSHEETPADDING+30, 30, 180, 14, WS_VISIBLE | WS_TABSTOP + LTEXT "View:",-1,250,33,30,8 + COMBOBOX IDC_UPD_VIEW_COMBO, 280, 30, 94, 80, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + CONTROL "", IDC_UPDATESLIST, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL, PROPSHEETPADDING, 50, PROPSHEETWIDTH-12, 155, WS_EX_CLIENTEDGE + PUSHBUTTON "&Remove", IDC_UPD_REMOVE, PROPSHEETPADDING, 210, 80, 14, WS_DISABLED + PUSHBUTTON "&Information", IDC_UPD_INFO_BUTTON, PROPSHEETPADDING+85, 210, 80, 14, WS_DISABLED END IDD_PROPPAGEADD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -75,7 +75,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_REACTOS,-1,PROPSHEETPADDING,6,16,16 - LTEXT "",-1,36,7,PROPSHEETWIDTH-48,32 + LTEXT "",-1,36,7,PROPSHEETWIDTH-48,22 END IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -119,40 +119,39 @@ LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 END -IDD_INFORMATION DIALOG 5, 100, 269, 200 +IDD_INFORMATION DIALOG 5, 100, 269, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Information" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "DisplayName", IDS_INFO_DISPNAME, PROPSHEETPADDING, 8, 160, 24 - LTEXT "Registered Owner:", -1, PROPSHEETPADDING, 25, 160, 17 - LTEXT "", IDS_INFO_REGOWNER, PROPSHEETPADDING+75, 25, 160, 17 - LTEXT "Product ID:", -1, PROPSHEETPADDING, 40, 160, 17 - LTEXT "", IDS_INFO_PRODUCTID, PROPSHEETPADDING+75, 40, 160, 17 - LTEXT "Publisher:", -1, PROPSHEETPADDING, 55, 160, 17 - LTEXT "", IDS_INFO_PUBLISHER, PROPSHEETPADDING+75, 55, 160, 17 - LTEXT "Version:", -1, PROPSHEETPADDING, 70, 160, 17 - LTEXT "", IDS_INFO_VERSION, PROPSHEETPADDING+75, 70, 160, 17 - LTEXT "Contact:", -1, PROPSHEETPADDING, 85, 160, 17 - LTEXT "", IDS_INFO_CONTACT, PROPSHEETPADDING+75, 85, 160, 17 - LTEXT "Support Information:", -1, PROPSHEETPADDING, 100, 160, 17 - LTEXT "", IDS_INFO_SUPPORTINFO, PROPSHEETPADDING+75, 100, 160, 17 - LTEXT "Support Telephone:", -1, PROPSHEETPADDING, 115, 160, 17 - LTEXT "", IDS_INFO_SUPPORTPHONE, PROPSHEETPADDING+75, 115, 160, 17 - LTEXT "Product Updates:", -1, PROPSHEETPADDING, 130, 160, 17 - LTEXT "", IDS_INFO_PRODUCT_UPDATES, PROPSHEETPADDING+75, 130, 160, 17 - LTEXT "Readme:", -1, PROPSHEETPADDING, 145, 160, 17 - LTEXT "", IDS_INFO_README, PROPSHEETPADDING+75, 145, 160, 17 - LTEXT "Comments:", -1, PROPSHEETPADDING, 160, 160, 17 - LTEXT "", IDS_INFO_COMMENTS, PROPSHEETPADDING+75, 160, 160, 17 - PUSHBUTTON "&Close", IDCANCEL, 212, 180, 50, 14 + EDITTEXT IDS_INFO_DISPNAME, PROPSHEETPADDING, 6, 258, 15, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Registered Owner:", -1, PROPSHEETPADDING, 27, 97, 8 + EDITTEXT IDS_INFO_REGOWNER, PROPSHEETPADDING+97, 25, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Product ID:", -1, PROPSHEETPADDING, 44, 97, 8 + EDITTEXT IDS_INFO_PRODUCTID, PROPSHEETPADDING+97, 42, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Publisher:", -1, PROPSHEETPADDING, 61, 97, 8 + EDITTEXT IDS_INFO_PUBLISHER, PROPSHEETPADDING+97, 59, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Version:", -1, PROPSHEETPADDING, 78, 97, 8 + EDITTEXT IDS_INFO_VERSION, PROPSHEETPADDING+97, 76, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Contact:", -1, PROPSHEETPADDING, 95, 97, 8 + EDITTEXT IDS_INFO_CONTACT, PROPSHEETPADDING+97, 93, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Support Information:", -1, PROPSHEETPADDING, 112, 97, 8 + EDITTEXT IDS_INFO_SUPPORTINFO, PROPSHEETPADDING+97, 110, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Support Telephone:", -1, PROPSHEETPADDING, 129, 97, 8 + EDITTEXT IDS_INFO_SUPPORTPHONE, PROPSHEETPADDING+97, 127, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Product Updates:", -1, PROPSHEETPADDING, 146, 97, 8 + EDITTEXT IDS_INFO_PRODUCT_UPDATES, PROPSHEETPADDING+97, 144, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Readme:", -1, PROPSHEETPADDING, 163, 97, 8 + EDITTEXT IDS_INFO_README, PROPSHEETPADDING+97, 161, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Comments:", -1, PROPSHEETPADDING, 180, 97, 8 + EDITTEXT IDS_INFO_COMMENTS, PROPSHEETPADDING+97, 178, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&Close", IDCANCEL, 212, 198, 50, 14 END STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Add/Remove Programs" IDS_CPLSYSTEMDESCRIPTION "Sets up programs and creates shortcuts." - IDS_NOITEM_SELECTED "No item selected!" IDS_ERROR "Error" IDS_UNABLEREAD_UNINSTSTR "Unable to read UninstallString. This entry is invalid or has been created by an MSI installer." IDS_UNABLEOPEN_UNINSTKEY "Unable to open Uninstall Key" @@ -163,4 +162,8 @@ IDS_DETAILS "Details" IDS_CREATE_SHORTCUT "Create Shortcut" IDS_ERROR_NOT_FOUND "The file %s was not found." + IDS_UNABLEREAD_INFORMATION "Unable to open Information Keys" + IDS_NO_INFORMATION "No information" + IDS_NONE_APP "There are no installed applications." + IDS_NONE_UPD "There are no installed updates." END Modified: trunk/reactos/dll/cpl/appwiz/remove.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/remove.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/remove.c (original) +++ trunk/reactos/dll/cpl/appwiz/remove.c Fri Oct 12 14:12:52 2007 @@ -30,14 +30,77 @@ #include "appwiz.h" -VOID -CallInformation(HWND hwndDlg) -{ - -} - -VOID -CallUninstall(HWND hwndDlg, UINT Control, BOOL isUpdate) +HWND InfoDialog; + +BOOL +GetInfoItem(HWND hwndDlg, HKEY hKey, LPCTSTR RegName, UINT Control) +{ + DWORD dwSize = 1024; + TCHAR pszInfoString[1024]; + + if (RegQueryValueEx(hKey, + RegName, + NULL, + NULL, + (LPBYTE)pszInfoString, + &dwSize) == ERROR_SUCCESS) + { + SendMessage(GetDlgItem(hwndDlg, Control), WM_SETTEXT, -1, (LPARAM)pszInfoString); + return TRUE; + } + else + { + dwSize = 1024; + LoadString(hApplet, IDS_NO_INFORMATION, pszInfoString, sizeof(pszInfoString) / sizeof(TCHAR)); + SendMessage(GetDlgItem(hwndDlg, Control), WM_SETTEXT, -1, (LPARAM)pszInfoString); + return FALSE; + } +} + +VOID +CallInformation(HWND hwndDlg, HWND infDlg, UINT Control) +{ + INT nIndex; + HKEY hKey; + TCHAR Buf[256],Title[256]; + + nIndex = (INT)SendMessage(GetDlgItem(infDlg, Control),LVM_GETNEXTITEM,-1,LVNI_FOCUSED); + if (nIndex != -1) + { + LVITEM item; + + ZeroMemory(&item, sizeof(LVITEM)); + item.mask = LVIF_PARAM; + item.iItem = nIndex; + (void)ListView_GetItem(GetDlgItem(infDlg,Control),&item); + hKey = (HKEY)item.lParam; + + if (!GetInfoItem(hwndDlg, hKey, L"DisplayName", IDS_INFO_DISPNAME)) + { + LoadString(hApplet, IDS_UNABLEREAD_INFORMATION, Buf, sizeof(Buf) / sizeof(TCHAR)); + LoadString(hApplet, IDS_ERROR, Title, sizeof(Title) / sizeof(TCHAR)); + MessageBox(hwndDlg, + Buf, + Title, + MB_ICONSTOP); + return; + } + + (void)GetInfoItem(hwndDlg, hKey, L"RegOwner", IDS_INFO_REGOWNER); + (void)GetInfoItem(hwndDlg, hKey, L"ProductID", IDS_INFO_PRODUCTID); + (void)GetInfoItem(hwndDlg, hKey, L"Publisher", IDS_INFO_PUBLISHER); + (void)GetInfoItem(hwndDlg, hKey, L"DisplayVersion", IDS_INFO_VERSION); + (void)GetInfoItem(hwndDlg, hKey, L"Contact", IDS_INFO_CONTACT); + (void)GetInfoItem(hwndDlg, hKey, L"HelpLink", IDS_INFO_SUPPORTINFO); + (void)GetInfoItem(hwndDlg, hKey, L"HelpTelephone", IDS_INFO_SUPPORTPHONE); + (void)GetInfoItem(hwndDlg, hKey, L"URLUpdateInfo", IDS_INFO_PRODUCT_UPDATES); + (void)GetInfoItem(hwndDlg, hKey, L"Readme", IDS_INFO_README); + (void)GetInfoItem(hwndDlg, hKey, L"Comments", IDS_INFO_COMMENTS); + } +} + +VOID +CallUninstall(HWND hwndDlg, UINT Control, UINT RemBtn, UINT InfoBtn, BOOL isUpdate) { STARTUPINFO si; PROCESS_INFORMATION pi; @@ -49,23 +112,14 @@ TCHAR Buf[256],Title[256]; nIndex = (INT)SendMessage(GetDlgItem(hwndDlg, Control),LVM_GETNEXTITEM,-1,LVNI_FOCUSED); - if (nIndex == -1) - { - LoadString(hApplet, IDS_NOITEM_SELECTED, Buf, sizeof(Buf) / sizeof(TCHAR)); - LoadString(hApplet, IDS_CPLSYSTEMNAME, Title, sizeof(Title) / sizeof(TCHAR)); - MessageBox(hwndDlg, - Buf, - Title, - MB_ICONINFORMATION); - } - else + if (nIndex != -1) { LVITEM item; ZeroMemory(&item, sizeof(LVITEM)); item.mask = LVIF_PARAM; item.iItem = nIndex; - (void)ListView_GetItem(GetDlgItem(hwndDlg,IDC_SOFTWARELIST),&item); + (void)ListView_GetItem(GetDlgItem(hwndDlg,Control),&item); hKey = (HKEY)item.lParam; dwType = REG_SZ; @@ -82,12 +136,13 @@ si.wShowWindow = SW_SHOW; if (CreateProcess(NULL,pszUninstallString,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi)) { + ButtonStatus(hwndDlg, FALSE, RemBtn, InfoBtn); WaitForSingleObject(pi.hProcess, INFINITE); CloseHandle(pi.hProcess); CloseHandle(pi.hThread); // Update software list - (void)ListView_DeleteAllItems(GetDlgItem(hwndDlg, IDC_SOFTWARELIST)); - FillSoftwareList(hwndDlg, isUpdate); + (void)ListView_DeleteAllItems(GetDlgItem(hwndDlg, Control)); + FillSoftwareList(hwndDlg, isUpdate, Control); } } else @@ -118,7 +173,7 @@ } static VOID -AddItemToList(HWND hwndDlg, LPARAM hSubKey, LPTSTR pszDisplayName, INT ItemIndex) +AddItemToList(HWND hwndDlg, LPARAM hSubKey, LPTSTR pszDisplayName, INT ItemIndex, UINT Control) { int index; HIMAGELIST hImgListSmall; @@ -153,7 +208,7 @@ ImageList_AddIcon(hImgListLarge,hIcon); DestroyIcon(hIcon); - hList = GetDlgItem(hwndDlg, IDC_SOFTWARELIST); + hList = GetDlgItem(hwndDlg, Control); ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; @@ -163,12 +218,35 @@ listItem.iImage = index; (void)ListView_InsertItem(hList, &listItem); - (void)ListView_SetImageList(GetDlgItem(hwndDlg, IDC_SOFTWARELIST),hImgListSmall,LVSIL_SMALL); - (void)ListView_SetImageList(GetDlgItem(hwndDlg, IDC_SOFTWARELIST),hImgListLarge,LVSIL_NORMAL); -} - -VOID -FillSoftwareList(HWND hwndDlg, BOOL bShowUpdates) + (void)ListView_SetImageList(hList,hImgListSmall,LVSIL_SMALL); + (void)ListView_SetImageList(hList,hImgListLarge,LVSIL_NORMAL); +} + +VOID +SetNoneAppMsg(HWND hwndDlg, BOOL IsUpdates) +{ + TCHAR Buf[256]; + + if (IsUpdates) + { + LoadString(hApplet, IDS_NONE_UPD, Buf, sizeof(Buf) / sizeof(TCHAR)); + AddItemToList(hwndDlg, -1, (LPTSTR)Buf, 0, IDC_UPDATESLIST); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPD_FIND_EDIT),FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPD_VIEW_COMBO),FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDATESLIST),FALSE); + } + else + { + LoadString(hApplet, IDS_NONE_APP, Buf, sizeof(Buf) / sizeof(TCHAR)); + AddItemToList(hwndDlg, -1, (LPTSTR)Buf, 0, IDC_SOFTWARELIST); + EnableWindow(GetDlgItem(hwndDlg, IDC_FIND_EDIT),FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_VIEW_COMBO),FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SOFTWARELIST),FALSE); + } +} + +VOID +FillSoftwareList(HWND hwndDlg, BOOL bShowUpdates, UINT Control) { TCHAR pszName[MAX_PATH]; TCHAR pszDisplayName[MAX_PATH]; @@ -183,6 +261,7 @@ BOOL bIsSystemComponent = FALSE; INT ItemIndex = 0; TCHAR Buf[256],Title[256]; + BOOL IsAdd = FALSE; if (RegOpenKey(HKEY_LOCAL_MACHINE, TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"), @@ -237,11 +316,13 @@ { if ((!bIsUpdate) && (!bIsSystemComponent) && (!bShowUpdates)) { - AddItemToList(hwndDlg, (LPARAM)hSubKey, (LPTSTR)pszDisplayName, ItemIndex); + AddItemToList(hwndDlg, (LPARAM)hSubKey, (LPTSTR)pszDisplayName, ItemIndex, Control); + IsAdd = TRUE; } else if (bIsUpdate && bShowUpdates) { - AddItemToList(hwndDlg, (LPARAM)hSubKey, (LPTSTR)pszDisplayName, ItemIndex); + AddItemToList(hwndDlg, (LPARAM)hSubKey, (LPTSTR)pszDisplayName, ItemIndex, Control); + IsAdd = TRUE; } } } @@ -251,16 +332,19 @@ } RegCloseKey(hKey); -} - -VOID -AddItemsToViewControl(HWND hwndDlg) + + if (!IsAdd) SetNoneAppMsg(hwndDlg, bShowUpdates); + +} + +VOID +AddItemsToViewControl(HWND hwndDlg, UINT Control) { TCHAR Buf[256]; int Index; HWND hList; - hList = GetDlgItem(hwndDlg, IDC_VIEW_COMBO); + hList = GetDlgItem(hwndDlg, Control); // Large Icons LoadString(hApplet, IDS_LARGEICONS, Buf, sizeof(Buf) / sizeof(TCHAR)); Index = (int)SendMessage(hList, @@ -300,7 +384,7 @@ } VOID -FindItems(HWND hwndDlg) +FindItems(HWND hwndDlg, UINT ListControl, UINT EditControl, UINT RemBtn, UINT InfoBtn) { HWND hList; HWND hEdit; @@ -310,8 +394,8 @@ LV_ITEM listItem; BOOL comp = TRUE; - hList = GetDlgItem(hwndDlg, IDC_SOFTWARELIST); - hEdit = GetDlgItem(hwndDlg, IDC_FIND_EDIT); + hList = GetDlgItem(hwndDlg, ListControl); + hEdit = GetDlgItem(hwndDlg, EditControl); SendMessage(hEdit, WM_GETTEXT, 128, (LPARAM)szText); @@ -330,45 +414,41 @@ } ListView_SetItemState(hList, Index, LVIS_SELECTED | LVIS_FOCUSED, -1); if (comp) - { - EnableWindow(GetDlgItem(hwndDlg, IDC_ADDREMOVE),TRUE); - } + ButtonStatus(hwndDlg, TRUE, RemBtn, InfoBtn); else - { - EnableWindow(GetDlgItem(hwndDlg, IDC_ADDREMOVE),FALSE); - } -} - -VOID -GetCurrentView(HWND hwndDlg) + ButtonStatus(hwndDlg, FALSE, RemBtn, InfoBtn); +} + +VOID +GetCurrentView(HWND hwndDlg, UINT ViewControl, UINT ListControl) { int nCurrSel; - nCurrSel = (int)SendMessage(GetDlgItem(hwndDlg, IDC_VIEW_COMBO), + nCurrSel = (int)SendMessage(GetDlgItem(hwndDlg, ViewControl), CB_GETCURSEL, (WPARAM)0, (LPARAM)0); switch (nCurrSel) { case 0: - SetWindowLong(GetDlgItem(hwndDlg, IDC_SOFTWARELIST), + SetWindowLong(GetDlgItem(hwndDlg, ListControl), GWL_STYLE, LVS_ICON | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP); break; case 1: - SetWindowLong(GetDlgItem(hwndDlg, IDC_SOFTWARELIST), + SetWindowLong(GetDlgItem(hwndDlg, ListControl), GWL_STYLE,LVS_LIST | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP); break; case 2: - SetWindowLong(GetDlgItem(hwndDlg, IDC_SOFTWARELIST), + SetWindowLong(GetDlgItem(hwndDlg, ListControl), GWL_STYLE,LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP); break; } } VOID -ShowPopupMenu(HWND hwndDlg, UINT ResMenu, INT xPos, INT yPos) +ShowPopupMenu(HWND hwndDlg, UINT ResMenu, INT xPos, INT yPos, UINT Control) { INT nIndex; - nIndex = (INT)SendMessage(GetDlgItem(hwndDlg, IDC_SOFTWARELIST),LVM_GETNEXTITEM,-1,LVNI_FOCUSED); + nIndex = (INT)SendMessage(GetDlgItem(hwndDlg, Control),LVM_GETNEXTITEM,-1,LVNI_FOCUSED); if ( nIndex != -1) { POINT pt; @@ -377,7 +457,7 @@ GetCursorPos(&pt); - GetWindowRect(GetDlgItem(hwndDlg, IDC_SOFTWARELIST), &lvRect); + GetWindowRect(GetDlgItem(hwndDlg, Control), &lvRect); if (PtInRect(&lvRect, pt)) { hMenu = GetSubMenu(LoadMenu(hApplet, MAKEINTRESOURCE(ResMenu)),0); @@ -392,6 +472,7 @@ } } +static INT_PTR CALLBACK InfoPropDlgProc(HWND hDlg, UINT message, @@ -404,15 +485,12 @@ { case WM_INITDIALOG: { - + CallInformation(hDlg, InfoDialog, IDC_SOFTWARELIST); } case WM_COMMAND: { switch (LOWORD(wParam)) { - case IDOK: - - break; case IDCANCEL: EndDialog(hDlg,LOWORD(wParam)); break; @@ -424,6 +502,22 @@ return FALSE; } +BOOL +IsItemSelected(HWND hwndDlg, UINT Control) +{ + INT nIndex; + nIndex = (INT)SendMessage(GetDlgItem(hwndDlg, Control),LVM_GETNEXTITEM,-1,LVNI_FOCUSED); + if (nIndex != -1) return TRUE; + return FALSE; +} + +VOID +ButtonStatus(HWND hwndDlg, BOOL Status, UINT RemBtn, UINT InfoBtn) +{ + EnableWindow(GetDlgItem(hwndDlg, RemBtn),Status); + EnableWindow(GetDlgItem(hwndDlg, InfoBtn),Status); +} + /* Property page dialog callback */ INT_PTR CALLBACK RemovePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -434,10 +528,11 @@ switch (uMsg) { case WM_INITDIALOG: - AddItemsToViewControl(hwndDlg); + AddItemsToViewControl(hwndDlg, IDC_VIEW_COMBO); LoadString(hApplet, IDS_APPLIST, Buf, sizeof(Buf) / sizeof(TCHAR)); AddListColumn(GetDlgItem(hwndDlg, IDC_SOFTWARELIST),Buf); - FillSoftwareList(hwndDlg, FALSE); + FillSoftwareList(hwndDlg, FALSE, IDC_SOFTWARELIST); + InfoDialog = hwndDlg; break; case WM_COMMAND: @@ -446,25 +541,26 @@ case IDC_FIND_EDIT: if (HIWORD(wParam) == EN_CHANGE) { - FindItems(hwndDlg); + FindItems(hwndDlg,IDC_SOFTWARELIST,IDC_FIND_EDIT,IDC_ADDREMOVE,IDC_INFO_BUTTON); } break; case ID_APP_MODIFYREMOVE: case IDC_ADDREMOVE: - CallUninstall(hwndDlg, IDC_SOFTWARELIST, FALSE); + CallUninstall(hwndDlg, IDC_SOFTWARELIST, IDC_ADDREMOVE, IDC_INFO_BUTTON, FALSE); break; case ID_APP_INFORMATION: case IDC_INFO_BUTTON: + { + if (IsItemSelected(hwndDlg, IDC_SOFTWARELIST)) DialogBox(hApplet, MAKEINTRESOURCE(IDD_INFORMATION), hwndDlg, InfoPropDlgProc); + } break; case IDC_VIEW_COMBO: if (HIWORD(wParam) == CBN_SELCHANGE) - { - GetCurrentView(hwndDlg); - } + GetCurrentView(hwndDlg, IDC_VIEW_COMBO, IDC_SOFTWARELIST); break; } break; @@ -476,33 +572,18 @@ switch (((LPNMHDR)lParam)->code) { case NM_DBLCLK: - CallUninstall(hwndDlg, IDC_SOFTWARELIST, FALSE); + CallUninstall(hwndDlg, IDC_SOFTWARELIST, IDC_ADDREMOVE, IDC_INFO_BUTTON, FALSE); break; case NM_CLICK: { - INT nIndex; - nIndex = (INT)SendMessage(GetDlgItem(hwndDlg, IDC_SOFTWARELIST),LVM_GETNEXTITEM,-1,LVNI_FOCUSED); - if (nIndex == -1) - { - EnableWindow(GetDlgItem(hwndDlg, IDC_ADDREMOVE),FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_INFO_BUTTON),FALSE); - } + if (!IsItemSelected(hwndDlg, IDC_SOFTWARELIST)) + ButtonStatus(hwndDlg, FALSE, IDC_ADDREMOVE, IDC_INFO_BUTTON); else - { - EnableWindow(GetDlgItem(hwndDlg, IDC_ADDREMOVE),TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_INFO_BUTTON),TRUE); - } + ButtonStatus(hwndDlg, TRUE, IDC_ADDREMOVE, IDC_INFO_BUTTON); } break; } break; - } - } - break; - case WM_MENUSELECT: - { - switch((UINT)LOWORD(wParam)) - { } } break; @@ -511,7 +592,8 @@ ShowPopupMenu(hwndDlg, IDR_POPUP_APP, GET_X_LPARAM(lParam), - GET_Y_LPARAM(lParam)); + GET_Y_LPARAM(lParam), + IDC_SOFTWARELIST); } break; } Modified: trunk/reactos/dll/cpl/appwiz/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/resource.h (original) +++ trunk/reactos/dll/cpl/appwiz/resource.h Fri Oct 12 14:12:52 2007 @@ -45,28 +45,31 @@ /* strings */ #define IDS_CPLSYSTEMNAME 1001 #define IDS_CPLSYSTEMDESCRIPTION 2001 -#define IDS_NOITEM_SELECTED 2002 -#define IDS_ERROR 2003 -#define IDS_UNABLEREAD_UNINSTSTR 2004 -#define IDS_UNABLEOPEN_UNINSTKEY 2005 -#define IDS_APPLIST 2006 -#define IDS_LARGEICONS 2007 -#define IDS_LIST 2008 -#define IDS_DETAILS 2009 -#define IDS_UPDATESLIST 2010 -#define IDS_INFO_DISPNAME 2011 -#define IDS_INFO_PUBLISHER 2012 -#define IDS_INFO_VERSION 2013 -#define IDS_INFO_CONTACT 2014 -#define IDS_INFO_SUPPORTINFO 2015 -#define IDS_INFO_SUPPORTPHONE 2016 -#define IDS_INFO_PRODUCT_UPDATES 2017 -#define IDS_INFO_COMMENTS 2018 -#define IDS_INFO_REGOWNER 2019 -#define IDS_INFO_PRODUCTID 2020 -#define IDS_INFO_README 2021 -#define IDS_CREATE_SHORTCUT 2022 -#define IDS_ERROR_NOT_FOUND 2023 +#define IDS_ERROR 2002 +#define IDS_UNABLEREAD_UNINSTSTR 2003 +#define IDS_UNABLEOPEN_UNINSTKEY 2004 +#define IDS_APPLIST 2005 +#define IDS_LARGEICONS 2006 +#define IDS_LIST 2007 +#define IDS_DETAILS 2008 +#define IDS_UPDATESLIST 2009 +#define IDS_INFO_DISPNAME 2010 +#define IDS_INFO_PUBLISHER 2011 +#define IDS_INFO_VERSION 2012 +#define IDS_INFO_CONTACT 2013 +#define IDS_INFO_SUPPORTINFO 2014 +#define IDS_INFO_SUPPORTPHONE 2015 +#define IDS_INFO_PRODUCT_UPDATES 2016 +#define IDS_INFO_COMMENTS 2017 +#define IDS_INFO_REGOWNER 2018 +#define IDS_INFO_PRODUCTID 2019 +#define IDS_INFO_README 2020 +#define IDS_CREATE_SHORTCUT 2021 +#define IDS_ERROR_NOT_FOUND 2022 +#define IDS_UNABLEREAD_INFORMATION 2023 +#define IDS_NO_INFORMATION 2024 +#define IDS_NONE_APP 2025 +#define IDS_NONE_UPD 2026 /* controls */ #define IDC_INSTALL 101 @@ -81,6 +84,11 @@ #define IDC_ADD_DOWNLOAD_BUTTON 110 #define IDC_ADD_FIND_BUTTON 111 #define IDC_ADD_PROP_BUTTON 112 +#define IDC_UPD_VIEW_COMBO 113 +#define IDC_UPDATESLIST 114 +#define IDC_UPD_FIND_EDIT 115 +#define IDC_UPD_REMOVE 116 +#define IDC_UPD_INFO_BUTTON 117 #endif /* __CPL_RESOURCE_H */ Modified: trunk/reactos/dll/cpl/appwiz/updates.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/updates.c?r… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/updates.c (original) +++ trunk/reactos/dll/cpl/appwiz/updates.c Fri Oct 12 14:12:52 2007 @@ -30,6 +30,38 @@ #include "appwiz.h" +HWND UpdInfoDialog; + +static +INT_PTR CALLBACK +InfoPropDlgProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (message) + { + case WM_INITDIALOG: + { + CallInformation(hDlg, UpdInfoDialog, IDC_UPDATESLIST); + } + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDCANCEL: + EndDialog(hDlg,LOWORD(wParam)); + break; + } + } + break; + } + + return FALSE; +} + /* Property page dialog callback */ INT_PTR CALLBACK UpdatesPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -42,62 +74,56 @@ switch (uMsg) { case WM_INITDIALOG: - AddItemsToViewControl(hwndDlg); + AddItemsToViewControl(hwndDlg, IDC_UPD_VIEW_COMBO); LoadString(hApplet, IDS_UPDATESLIST, Buf, sizeof(Buf) / sizeof(TCHAR)); - AddListColumn(GetDlgItem(hwndDlg, IDC_SOFTWARELIST),Buf); - FillSoftwareList(hwndDlg, TRUE); + AddListColumn(GetDlgItem(hwndDlg, IDC_UPDATESLIST),Buf); + FillSoftwareList(hwndDlg, TRUE, IDC_UPDATESLIST); + UpdInfoDialog = hwndDlg; break; case WM_COMMAND: switch (LOWORD(wParam)) { - case IDC_FIND_EDIT: + case IDC_UPD_FIND_EDIT: if (HIWORD(wParam) == EN_CHANGE) { - FindItems(hwndDlg); + FindItems(hwndDlg,IDC_UPDATESLIST,IDC_UPD_FIND_EDIT,IDC_UPD_REMOVE,IDC_UPD_INFO_BUTTON); } break; case ID_UPD_INFORMATION: - case IDC_INFO_BUTTON: + case IDC_UPD_INFO_BUTTON: + { + if (IsItemSelected(hwndDlg, IDC_SOFTWARELIST)) DialogBox(hApplet, MAKEINTRESOURCE(IDD_INFORMATION), hwndDlg, InfoPropDlgProc); + } break; case ID_UPD_REMOVE: - case IDC_ADDREMOVE: - CallUninstall(hwndDlg, IDC_SOFTWARELIST, TRUE); + case IDC_UPD_REMOVE: + CallUninstall(hwndDlg, IDC_UPDATESLIST, IDC_UPD_REMOVE, IDC_UPD_INFO_BUTTON, TRUE); break; - case IDC_VIEW_COMBO: + case IDC_UPD_VIEW_COMBO: if (HIWORD(wParam) == CBN_SELCHANGE) - { - GetCurrentView(hwndDlg); - } + GetCurrentView(hwndDlg, IDC_UPD_VIEW_COMBO, IDC_UPDATESLIST); break; } break; case WM_NOTIFY: switch (LOWORD(wParam)) { - case IDC_SOFTWARELIST: + case IDC_UPDATESLIST: switch (((LPNMHDR)lParam)->code) { case NM_DBLCLK: - CallUninstall(hwndDlg, IDC_SOFTWARELIST, TRUE); + CallUninstall(hwndDlg, IDC_UPDATESLIST, IDC_UPD_REMOVE, IDC_UPD_INFO_BUTTON, TRUE); break; case NM_CLICK: { - INT nIndex; - nIndex = (INT)SendMessage(GetDlgItem(hwndDlg, IDC_SOFTWARELIST),LVM_GETNEXTITEM,-1,LVNI_FOCUSED); - if (nIndex == -1) - { - EnableWindow(GetDlgItem(hwndDlg, IDC_ADDREMOVE),FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_INFO_BUTTON),FALSE); - } + if (!IsItemSelected(hwndDlg, IDC_UPDATESLIST)) + ButtonStatus(hwndDlg, FALSE, IDC_UPD_REMOVE, IDC_UPD_INFO_BUTTON); else - { - EnableWindow(GetDlgItem(hwndDlg, IDC_ADDREMOVE),TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_INFO_BUTTON),TRUE); - } + ButtonStatus(hwndDlg, TRUE, IDC_UPD_REMOVE, IDC_UPD_INFO_BUTTON); } break; } @@ -109,7 +135,8 @@ ShowPopupMenu(hwndDlg, IDR_POPUP_UPD, GET_X_LPARAM(lParam), - GET_Y_LPARAM(lParam)); + GET_Y_LPARAM(lParam), + IDC_UPDATESLIST); } break; }

1 0

[fireball] 29531: Johannes Anderwald - Fix the msvcrt exception (because vlc first calls _getmainargs. This function sets the __argc to 1. Afterwards vlc calls again __wgetmainargs where __argc is now one. When entering the function _wadd, it doesnot allocate the __wargv because __argc is 1. Therefore it crashes). See issue #821 for more details.
by fireball＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: fireball Date: Fri Oct 12 13:58:00 2007 New Revision: 29531 URL: http://svn.reactos.org/svn/reactos?rev=29531&view=rev Log: Johannes Anderwald - Fix the msvcrt exception (because vlc first calls _getmainargs. This function sets the __argc to 1. Afterwards vlc calls again __wgetmainargs where __argc is now one. When entering the function _wadd, it doesnot allocate the __wargv because __argc is 1. Therefore it crashes). See issue #821 for more details. Modified: trunk/reactos/lib/sdk/crt/misc/crtmain.c (props changed) trunk/reactos/lib/sdk/crt/misc/getargs.c (contents, props changed) Propchange: trunk/reactos/lib/sdk/crt/misc/crtmain.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/lib/sdk/crt/misc/getargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/getargs.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/getargs.c (original) +++ trunk/reactos/lib/sdk/crt/misc/getargs.c Fri Oct 12 13:58:00 2007 @@ -192,7 +192,18 @@ ignorespace = 0; doexpand = expand_wildcards; + if (__argv && _environ) + { + *argv = __argv; + *env = _environ; + *argc = __argc; + return; + } + + __argc = 0; + len = strlen(_acmdln); + while (_acmdln[i]) { @@ -262,6 +273,16 @@ ignorespace = 0; doexpand = expand_wildcards; + if (__wargv && __winitenv) + { + *wargv = __wargv; + *wenv = __winitenv; + *argc = __argc; + return; + } + + __argc = 0; + len = wcslen(_wcmdln); while (_wcmdln[i]) Propchange: trunk/reactos/lib/sdk/crt/misc/getargs.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[mnordell] 29530: Added some descriptive comments for otherwise hard-to-understand bitwise operations
by mnordell＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: mnordell Date: Fri Oct 12 13:52:23 2007 New Revision: 29530 URL: http://svn.reactos.org/svn/reactos?rev=29530&view=rev Log: Added some descriptive comments for otherwise hard-to-understand bitwise operations Modified: trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Fri Oct 12 13:52:23 2007 @@ -494,6 +494,9 @@ GrantedAccess = CurrentProcess->GrantedAccess; /* Validate access */ + /* ~GrantedAccess = RefusedAccess.*/ + /* ~GrantedAccess & DesiredAccess = list of refused bits. */ + /* !(~GrantedAccess & DesiredAccess) == TRUE means ALL requested rights are granted */ if ((AccessMode == KernelMode) || !(~GrantedAccess & DesiredAccess)) { @@ -539,6 +542,9 @@ GrantedAccess = CurrentThread->GrantedAccess; /* Validate access */ + /* ~GrantedAccess = RefusedAccess.*/ + /* ~GrantedAccess & DesiredAccess = list of refused bits. */ + /* !(~GrantedAccess & DesiredAccess) == TRUE means ALL requested rights are granted */ if ((AccessMode == KernelMode) || !(~GrantedAccess & DesiredAccess)) { @@ -608,6 +614,9 @@ GrantedAccess = HandleEntry->GrantedAccess; /* Validate access */ + /* ~GrantedAccess = RefusedAccess.*/ + /* ~GrantedAccess & DesiredAccess = list of refused bits. */ + /* !(~GrantedAccess & DesiredAccess) == TRUE means ALL requested rights are granted */ if ((AccessMode == KernelMode) || !(~GrantedAccess & DesiredAccess)) {

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
71
Older →

Jump to page: