Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mnordell] 29545: Just some more notes about what (likely) is required to make it possible for users to cleanly shut down ROS.
by mnordell＠svn.reactos.org 13 Oct '07

13 Oct '07

Author: mnordell Date: Sat Oct 13 07:34:56 2007 New Revision: 29545 URL: http://svn.reactos.org/svn/reactos?rev=29545&view=rev Log: Just some more notes about what (likely) is required to make it possible for users to cleanly shut down ROS. 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 Sat Oct 13 07:34:56 2007 @@ -318,7 +318,7 @@ OUT PSECURITY_ATTRIBUTES* ppsa) { #if 1 - DPRINT1("CreateSecurityAttributes needs implementation!\n"); + DPRINT1("CreateLogoffSecurityAttributes needs implementation!\n"); *ppsa = 0; return STATUS_UNSUCCESSFUL; #else @@ -329,21 +329,55 @@ /* Specifically THREAD_SET_THREAD_TOKEN is required. */ PSECURITY_DESCRIPTOR psd = 0; PSECURITY_ATTRIBUTES psa = 0; - ACL rgAcls[2]; + BYTE* pMem; + PACL pACL; EXPLICIT_ACCESS ea[2]; + *ppsa = NULL; + + // Let's first try to enumerate what kind of data we need for this to ever work: + // 1. The Winlogon SID, to be able to give it THREAD_SET_THREAD_TOKEN. + // 2. The users SID (the user trying to logoff, or rather shut down the system). + // 3. At least two EXPLICIT_ACCESS instances: + // 3.1 One for Winlogon itself, giving it the rights + // required to THREAD_SET_THREAD_TOKEN (as it's needed to successfully call + // ImpersonateLoggedOnUser). + // 3.2 One for the user, to allow *that* thread to perform its work. + // 4. An ACL to hold the these EXPLICIT_ACCESS ACE's. + // 5. A SECURITY_DESCRIPTOR to hold the ACL, and finally. + // 6. A SECURITY_ATTRIBUTES instance to pull all of this required stuff + // together, to hand it to CreateThread. + // + // However, it seems struct LOGOFF_SHUTDOWN_DATA doesn't contain + // these required SID's, why they'd have to be added. + // The Winlogon's own SID should probably only be created once, + // while the user's SID obviously must be created for each new user. + // Might as well store it when the user logs on? + /* 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"); + /* To save space and time, allocate a single block of memory holding */ + /* both SECURITY_ATTRIBUTES and SECURITY_DESCRIPTOR */ + pMem = HeapAlloc(GetProcessHeap(), + 0, + sizeof(SECURITY_ATTRIBUTES) + + SECURITY_DESCRIPTOR_MIN_LENGTH + + sizeof(ACL)); + if (!pMem) + { + DPRINT("Failed to allocate memory for logoff security descriptor!\n"); return STATUS_NO_MEMORY; } + /* Note that the security descriptor needs to be in _absolute_ format, */ + /* meaning its members must be pointers to other structures, rather */ + /* than the relative format using offsets */ + psa = (PSECURITY_ATTRIBUTES)pMem; + psd = (PSECURITY_DESCRIPTOR)(pMem + sizeof(SECURITY_ATTRIBUTES)); + pACL = (PACL)(((PBYTE)psd) + SECURITY_DESCRIPTOR_MIN_LENGTH); + if (!InitializeSecurityDescriptor(psd, SECURITY_DESCRIPTOR_REVISION)) { - HeapFree(GetProcessHeap(), 0, psd); + HeapFree(GetProcessHeap(), 0, pMem); DPRINT("Failed to initialize security descriptor for logoff thread!\n"); return STATUS_UNSUCCESSFUL; } @@ -351,11 +385,11 @@ // 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].grfAccessPermissions = THREAD_SET_THREAD_TOKEN; + ea[0].grfAccessMode = SET_ACCESS; // GRANT_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.TrusteeType = TRUSTEE_IS_USER; ea[0].Trustee.ptstrName = (LPTSTR) pEveryoneSID; if (!SetSecurityDescriptorDacl(pSD, @@ -364,7 +398,7 @@ FALSE)) // not a default DACL { DPRINT("SetSecurityDescriptorDacl Error %u\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, psd); + HeapFree(GetProcessHeap(), 0, pMem); return STATUS_UNSUCCESSFUL; } @@ -378,13 +412,12 @@ #endif } -static void +static VOID DestroyLogoffSecurityAttributes( IN PSECURITY_ATTRIBUTES psa) { if (psa) { - HeapFree(GetProcessHeap(), 0, psa->lpSecurityDescriptor); HeapFree(GetProcessHeap(), 0, psa); } }

1 0

[dreimer] 29544: Add German Translation and Fix English SUBLANG to our Defaults.
by dreimer＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: dreimer Date: Fri Oct 12 21:49:52 2007 New Revision: 29544 URL: http://svn.reactos.org/svn/reactos?rev=29544&view=rev Log: Add German Translation and Fix English SUBLANG to our Defaults. Added: trunk/rosapps/write/De.rc (with props) Modified: trunk/rosapps/write/En.rc trunk/rosapps/write/rsrc.rc Added: trunk/rosapps/write/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/De.rc?rev=29544&view… ============================================================================== --- trunk/rosapps/write/De.rc (added) +++ trunk/rosapps/write/De.rc Fri Oct 12 21:49:52 2007 @@ -1,0 +1,27 @@ +/* + * German language support + * + * Copyright (C) 2007 Mikolaj Zalewski + * Copyright (C) 2007 Daniel Reimer + * + * 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_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_FAILED, "Wordpad konnte nicht gestartet werden" +} Propchange: trunk/rosapps/write/De.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/write/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/En.rc?rev=29544&r1=2… ============================================================================== --- trunk/rosapps/write/En.rc (original) +++ trunk/rosapps/write/En.rc Fri Oct 12 21:49:52 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE { Modified: trunk/rosapps/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/rsrc.rc?rev=29544&r1… ============================================================================== --- trunk/rosapps/write/rsrc.rc (original) +++ trunk/rosapps/write/rsrc.rc Fri Oct 12 21:49:52 2007 @@ -23,5 +23,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#include "De.rc" #include "En.rc" #include "Ko.rc"

1 0

[cwittich] 29543: LdrpLoadModule called with LOAD_LIBRARY_AS_DATAFILE returns SUCCESS and a valid BaseAddress but no Module
by cwittich＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: cwittich Date: Fri Oct 12 21:15:23 2007 New Revision: 29543 URL: http://svn.reactos.org/svn/reactos?rev=29543&view=rev Log: LdrpLoadModule called with LOAD_LIBRARY_AS_DATAFILE returns SUCCESS and a valid BaseAddress but no Module Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c Fri Oct 12 21:15:23 2007 @@ -752,6 +752,9 @@ Status = LdrpAttachProcess(); RtlLeaveCriticalSection(Peb->LoaderLock); } + + if ((!Module) && (NT_SUCCESS(Status))) + return Status; *BaseAddress = NT_SUCCESS(Status) ? Module->DllBase : NULL;

1 0

[janderwald] 29542: - dont allow creating a link to a shortcut See issue #2735 for more details.
by janderwald＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: janderwald Date: Fri Oct 12 20:07:41 2007 New Revision: 29542 URL: http://svn.reactos.org/svn/reactos?rev=29542&view=rev Log: - dont allow creating a link to a shortcut See issue #2735 for more details. Modified: 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/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 20:07:41 2007 @@ -175,15 +175,15 @@ LTEXT "Zielpfad:", 14006, 10, 40, 70, 10 LTEXT "", 14007, 70, 40, 150, 10 LTEXT "Ziel:", 14008, 10, 55, 45, 10 - EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT + EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT | ES_AUTOHSCROLL LTEXT "&Starten in:",14010, 10, 65, 57, 10 - EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT + EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT | ES_AUTOHSCROLL LTEXT "&Kurztasten:", 14014, 10, 80, 57, 10 EDITTEXT 14015, 70, 80, 150, 10, ES_LEFT LTEXT "Ausführen:", 14016, 10, 90, 57, 10 - EDITTEXT 14017, 70, 90, 150, 10 + EDITTEXT 14017, 70, 90, 150, 10, ES_AUTOHSCROLL LTEXT "K&ommentar:", 14018, 10, 100, 57, 10 - EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT + EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "&Ziel finden...", 14020, 10, 115, 63, 14, ES_LEFT PUSHBUTTON "I&con wechseln...", 14021, 83, 115, 63, 14, ES_LEFT PUSHBUTTON "Er&weitert...", 14022, 156, 115, 63, 14, ES_LEFT @@ -335,7 +335,7 @@ 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:", 14001, 20, 90, 80, 10 - EDITTEXT 14002, 90, 90, 50, 10, WS_TABSTOP + EDITTEXT 14002, 90, 90, 50, 10, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10 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 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 20:07:41 2007 @@ -173,15 +173,15 @@ LTEXT "Target location:", 14006, 10, 40, 70, 10 LTEXT "", 14007, 70, 40, 150, 10 LTEXT "Target:", 14008, 10, 55, 45, 10 - EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT + EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT | ES_AUTOHSCROLL LTEXT "&Start in:",14010, 10, 65, 57, 10 - EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT + EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT | ES_AUTOHSCROLL LTEXT "Shortcut &key:", 14014, 10, 80, 57, 10 EDITTEXT 14015, 70, 80, 150, 10, ES_LEFT LTEXT "Run:", 14016, 10, 90, 57, 10 - EDITTEXT 14017, 70, 90, 150, 10 + EDITTEXT 14017, 70, 90, 150, 10, ES_AUTOHSCROLL LTEXT "C&omment:", 14018, 10, 100, 57, 10 - EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT + EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "&Find Target...", 14020, 10, 115, 63, 14, ES_LEFT PUSHBUTTON "&Change Icon...", 14021, 83, 115, 63, 14, ES_LEFT PUSHBUTTON "A&dvanced...", 14022, 156, 115, 63, 14, ES_LEFT @@ -335,7 +335,7 @@ 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:", 14001, 20, 90, 80, 10 - EDITTEXT 14002, 90, 90, 50, 10, WS_TABSTOP + EDITTEXT 14002, 90, 90, 50, 10, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10 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 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 20:07:41 2007 @@ -2595,6 +2595,7 @@ IShellLinkImpl *This; HWND hDlgCtrl; WCHAR szBuffer[MAX_PATH]; + WCHAR * ptr; int IconIndex; INT_PTR result; @@ -2643,10 +2644,20 @@ SendMessageW( hDlgCtrl, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)szBuffer); if ( !SHELL_ExistsFileW(szBuffer) ) { + //FIXME load localized error msg MessageBoxW( hwndDlg, L"file not existing", szBuffer, MB_OK ); SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE ); return TRUE; } + ptr = wcsrchr(szBuffer, L'.'); + if (ptr && !wcsnicmp(ptr, L".lnk", 4)) + { + // FIXME load localized error msg + MessageBoxW( hwndDlg, L"You cannot create a link to a shortcut", L"Error", MB_ICONERROR ); + SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE ); + return TRUE; + } + IShellLinkW_fnSetPath((IShellLinkW*)&This->lpvtblw, szBuffer); TRACE("This %p sLinkPath %S\n", This, This->sLinkPath);

1 0

[fireball] 29541: - Don't free a NULL pointer.
by fireball＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: fireball Date: Fri Oct 12 19:42:08 2007 New Revision: 29541 URL: http://svn.reactos.org/svn/reactos?rev=29541&view=rev Log: - Don't free a NULL pointer. Modified: trunk/reactos/ntoskrnl/cm/regfile.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Fri Oct 12 19:42:08 2007 @@ -27,7 +27,7 @@ IN PUNICODE_STRING FileName, IN ULONG Flags) { - PEREGISTRY_HIVE Hive; + PEREGISTRY_HIVE Hive = NULL; NTSTATUS Status; BOOLEAN Allocate = TRUE; @@ -43,7 +43,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("CmpInitHiveFromFile() failed (Status %lx)\n", Status); - ExFreePool(Hive); + if (Hive) ExFreePool(Hive); return Status; }

1 0

[janderwald] 29540: - fix PickIconDlg prototype
by janderwald＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: janderwald Date: Fri Oct 12 19:17:55 2007 New Revision: 29540 URL: http://svn.reactos.org/svn/reactos?rev=29540&view=rev Log: - fix PickIconDlg prototype Modified: trunk/reactos/dll/win32/shell32/dialogs.c trunk/reactos/dll/win32/shell32/undocshell.h Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.c (original) +++ trunk/reactos/dll/win32/shell32/dialogs.c Fri Oct 12 19:17:55 2007 @@ -62,9 +62,9 @@ */ BOOL WINAPI PickIconDlg( HWND hwndOwner, - LPSTR lpstrFile, - DWORD nMaxFile, - LPDWORD lpdwIconIndex) + LPWSTR lpstrFile, + UINT nMaxFile, + INT* lpdwIconIndex) { FIXME("(%p,%s,%08x,%p):stub.\n", hwndOwner, lpstrFile, nMaxFile,lpdwIconIndex); Modified: trunk/reactos/dll/win32/shell32/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/undocshe… ============================================================================== --- trunk/reactos/dll/win32/shell32/undocshell.h (original) +++ trunk/reactos/dll/win32/shell32/undocshell.h Fri Oct 12 19:17:55 2007 @@ -84,12 +84,6 @@ * Shell Common Dialogs */ -BOOL WINAPI PickIconDlg( - HWND hwndOwner, - LPSTR lpstrFile, - DWORD nMaxFile, - LPDWORD lpdwIconIndex); - /* RunFileDlg flags */ #define RFF_NOBROWSE 0x01 #define RFF_NODEFAULT 0x02

1 0

[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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs