Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 68781: [NTOSKRNL] Define UNC tag in tag header
by pschweitzer＠svn.reactos.org 21 Aug '15

21 Aug '15

Author: pschweitzer Date: Fri Aug 21 08:17:48 2015 New Revision: 68781 URL: http://svn.reactos.org/svn/reactos?rev=68781&view=rev Log: [NTOSKRNL] Define UNC tag in tag header Modified: trunk/reactos/ntoskrnl/fsrtl/unc.c trunk/reactos/ntoskrnl/include/internal/tag.h Modified: trunk/reactos/ntoskrnl/fsrtl/unc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/unc.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/unc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/unc.c [iso-8859-1] Fri Aug 21 08:17:48 2015 @@ -11,8 +11,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> - -#define TAG_UNC 'nuSF' KSEMAPHORE FsRtlpUncSemaphore; Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] Fri Aug 21 08:17:48 2015 @@ -28,6 +28,9 @@ /* formerly located in fs/notify.c */ #define FSRTL_NOTIFY_TAG 'ITON' + +/* formerly located in fsrtl/unc.c */ +#define TAG_UNC 'nuSF' /* formerly located in io/device.c */ #define TAG_DEVICE_EXTENSION 'TXED'

1 0

[pschweitzer] 68780: [ROSVBOXMGMT] Add missing L for help
by pschweitzer＠svn.reactos.org 21 Aug '15

21 Aug '15

Author: pschweitzer Date: Fri Aug 21 08:10:53 2015 New Revision: 68780 URL: http://svn.reactos.org/svn/reactos?rev=68780&view=rev Log: [ROSVBOXMGMT] Add missing L for help Modified: trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c Modified: trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/rosv… ============================================================================== --- trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] Fri Aug 21 08:10:53 2015 @@ -138,11 +138,11 @@ void printUsage(void) { - wprintf("ReactOS VBox Shared Folders Management\n"); - wprintf("\tstart: start the VBox Shared folders (mandatory prior any operation!)\n"); - wprintf("\taddconn <letter> <share name>: add a connection\n"); - wprintf("\tgetlist: list connections\n"); - wprintf("\tgetgloballist: list available shares\n"); + wprintf(L"ReactOS VBox Shared Folders Management\n"); + wprintf(L"\tstart: start the VBox Shared folders (mandatory prior any operation!)\n"); + wprintf(L"\taddconn <letter> <share name>: add a connection\n"); + wprintf(L"\tgetlist: list connections\n"); + wprintf(L"\tgetgloballist: list available shares\n"); } int wmain(int argc, wchar_t *argv[])

1 0

[pschweitzer] 68779: Erm. Addendum to r68778: don't reveal my secret plans to world (yet!)
by pschweitzer＠svn.reactos.org 21 Aug '15

21 Aug '15

Author: pschweitzer Date: Fri Aug 21 08:08:10 2015 New Revision: 68779 URL: http://svn.reactos.org/svn/reactos?rev=68779&view=rev Log: Erm. Addendum to r68778: don't reveal my secret plans to world (yet!) Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/CMak… ============================================================================== --- trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] Fri Aug 21 08:08:10 2015 @@ -1,6 +1,5 @@ add_subdirectory(appwiz) add_subdirectory(cat) -add_subdirectory(nfi) add_subdirectory(ntfsinfo) add_subdirectory(rosvboxmgmt) add_subdirectory(tee)

1 0

[pschweitzer] 68777: [NTOSKRNL] Implement the TokenImpersonationLevel case of SeQueryInformationToken(). This fixes VBoxSF driver not being able to expose shared folders in ReactOS
by pschweitzer＠svn.reactos.org 21 Aug '15

21 Aug '15

Author: pschweitzer Date: Fri Aug 21 08:03:11 2015 New Revision: 68777 URL: http://svn.reactos.org/svn/reactos?rev=68777&view=rev Log: [NTOSKRNL] Implement the TokenImpersonationLevel case of SeQueryInformationToken(). This fixes VBoxSF driver not being able to expose shared folders in ReactOS Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=68… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Fri Aug 21 08:03:11 2015 @@ -1076,8 +1076,40 @@ IN TOKEN_INFORMATION_CLASS TokenInformationClass, OUT PVOID *TokenInformation) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PSECURITY_IMPERSONATION_LEVEL SeImpersonationLvl; + PAGED_CODE(); + + switch (TokenInformationClass) + { + case TokenImpersonationLevel: + /* It is mandatory to have an impersonation token */ + if (((PTOKEN)Token)->TokenType != TokenImpersonation) + { + Status = STATUS_INVALID_INFO_CLASS; + break; + } + + /* Allocate the output buffer */ + SeImpersonationLvl = ExAllocatePoolWithTag(PagedPool, sizeof(SECURITY_IMPERSONATION_LEVEL), TAG_SE); + if (SeImpersonationLvl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + /* Set impersonation level and return the structure */ + *SeImpersonationLvl = ((PTOKEN)Token)->ImpersonationLevel; + *TokenInformation = SeImpersonationLvl; + Status = STATUS_SUCCESS; + break; + + default: + UNIMPLEMENTED; + break; + } + + return Status; } /*

1 0

[pschweitzer] 68778: [ROSVBOXMGMT] Add the "rosvboxmgmt" tool. It's purpose is to allow to interact with the VBoxSF driver as we don't have working MPR yet. In order to have UNC path available, all...
by pschweitzer＠svn.reactos.org 21 Aug '15

21 Aug '15

Author: pschweitzer Date: Fri Aug 21 08:03:13 2015 New Revision: 68778 URL: http://svn.reactos.org/svn/reactos?rev=68778&view=rev Log: [ROSVBOXMGMT] Add the "rosvboxmgmt" tool. It's purpose is to allow to interact with the VBoxSF driver as we don't have working MPR yet. In order to have UNC path available, all you need to do so far is rosvboxmgmt start. All the rest isn't mandatory. Added: trunk/rosapps/applications/cmdutils/rosvboxmgmt/ trunk/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c (with props) trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.rc (with props) Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/CMak… ============================================================================== --- trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] Fri Aug 21 08:03:13 2015 @@ -1,6 +1,8 @@ add_subdirectory(appwiz) add_subdirectory(cat) +add_subdirectory(nfi) add_subdirectory(ntfsinfo) +add_subdirectory(rosvboxmgmt) add_subdirectory(tee) add_subdirectory(touch) add_subdirectory(uptime) Added: trunk/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/rosv… ============================================================================== --- trunk/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt [iso-8859-1] Fri Aug 21 08:03:13 2015 @@ -0,0 +1,4 @@ +add_executable(rosvboxmgmt rosvboxmgmt.c rosvboxmgmt.rc) +set_module_type(rosvboxmgmt win32cui UNICODE) +add_importlibs(rosvboxmgmt msvcrt kernel32) +add_cd_file(TARGET rosvboxmgmt DESTINATION reactos/bin FOR all) Propchange: trunk/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/rosv… ============================================================================== --- trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c (added) +++ trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] Fri Aug 21 08:03:13 2015 @@ -0,0 +1,187 @@ +#include <stdio.h> +#include <wchar.h> +#include <windows.h> + +/* DON'T CHANGE ORDER!!!! */ +PCWSTR devices[3] = { L"\\\\.\\VBoxMiniRdrDN", L"\\??\\VBoxMiniRdrDN", L"\\Device\\VBoxMiniRdr" }; + +/* Taken from VBox header */ +#define _MRX_MAX_DRIVE_LETTERS 26 +#define IOCTL_MRX_VBOX_BASE FILE_DEVICE_NETWORK_FILE_SYSTEM +#define _MRX_VBOX_CONTROL_CODE(request, method, access) \ + CTL_CODE(IOCTL_MRX_VBOX_BASE, request, method, access) +#define IOCTL_MRX_VBOX_ADDCONN _MRX_VBOX_CONTROL_CODE(100, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MRX_VBOX_GETLIST _MRX_VBOX_CONTROL_CODE(103, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MRX_VBOX_GETGLOBALLIST _MRX_VBOX_CONTROL_CODE(104, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MRX_VBOX_START _MRX_VBOX_CONTROL_CODE(106, METHOD_BUFFERED, FILE_ANY_ACCESS) + +BOOL performDevIoCtl(DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize) +{ + short i; + BOOL ret; + DWORD lpBytesReturned; + HANDLE dev = INVALID_HANDLE_VALUE; + + wprintf(L"Trying to open a VBoxSRV device\n"); + for (i = 0; i < 3; ++i) + { + dev = CreateFile(devices[i], + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + if (dev != INVALID_HANDLE_VALUE) + { + break; + } + } + + if (dev == INVALID_HANDLE_VALUE) + { + return FALSE; + } + + wprintf(L"%s opened.\n", devices[i]); + + ret = DeviceIoControl(dev, dwIoControlCode, lpInBuffer, nInBufferSize, lpOutBuffer, nOutBufferSize, &lpBytesReturned, NULL); + wprintf(L"Done: it %s with error: %lx\n", (ret != 0 ? L"succeed" : L"failed"), (ret != 0 ? ERROR_SUCCESS : GetLastError())); + + CloseHandle(dev); + + return ret; +} + +int startVBoxSrv(void) +{ + return (performDevIoCtl(IOCTL_MRX_VBOX_START, NULL, 0, NULL, 0) == FALSE); +} + +int addConn(PCWSTR letter, PCWSTR path) +{ + BOOL ret; + PWSTR inputBuffer; + DWORD inputBufferSize; + + if (iswalpha(letter[0]) == 0) + { + wprintf(L"Invalid letter provided\n"); + return 1; + } + + if (wcschr(path, L'\\') != NULL) + { + wprintf(L"Only give the name of a share\n"); + return 1; + } + + inputBufferSize = (wcslen(path) + wcslen(devices[2]) + wcslen(L"\\;Z:\\vboxsvr\\")) * sizeof(WCHAR) + sizeof(UNICODE_NULL); + inputBuffer = malloc(inputBufferSize); + if (inputBuffer == NULL) + { + wprintf(L"Memory failure\n"); + return 1; + } + + swprintf(inputBuffer, L"%s\\;%c:\\vboxsvr\\%s", devices[2], towupper(letter[0]), path); + wprintf(L"Will create the following connection: %s\n", inputBuffer); + ret = performDevIoCtl(IOCTL_MRX_VBOX_ADDCONN, inputBuffer, inputBufferSize, NULL, 0); + free(inputBuffer); + + return (ret == FALSE); +} + +int getList(void) +{ + short i; + BOOL ret; + DWORD outputBufferSize; + char outputBuffer[_MRX_MAX_DRIVE_LETTERS]; + + outputBufferSize = sizeof(outputBuffer); + ret = performDevIoCtl(IOCTL_MRX_VBOX_GETLIST, NULL, 0, &outputBuffer, outputBufferSize); + if (ret == FALSE) + { + return 1; + } + + for (i = 0; i < _MRX_MAX_DRIVE_LETTERS; i += 2) + { + wprintf(L"%c: %s\t%c: %s\n", 'A' + i, (outputBuffer[i] == 0 ? L"FALSE" : L"TRUE"), + 'A' + (i + 1), (outputBuffer[i + 1] == 0 ? L"FALSE" : L"TRUE")); + } + + return 0; +} + +int getGlobalList(void) +{ + short i; + BOOL ret; + DWORD outputBufferSize; + char outputBuffer[_MRX_MAX_DRIVE_LETTERS]; + + outputBufferSize = sizeof(outputBuffer); + memset(outputBuffer, 0, outputBufferSize); + ret = performDevIoCtl(IOCTL_MRX_VBOX_GETGLOBALLIST, NULL, 0, &outputBuffer, outputBufferSize); + if (ret == FALSE) + { + return 1; + } + + for (i = 0; i < _MRX_MAX_DRIVE_LETTERS; i += 2) + { + wprintf(L"%c: %s\t%c: %s\n", 'A' + i, (outputBuffer[i] & 0x80 ? L"Active" : L"Inactive"), + 'A' + (i + 1), (outputBuffer[i + 1] & 0x80 ? L"Active" : L"Inactive")); + } + + return 0; +} + +void printUsage(void) +{ + wprintf("ReactOS VBox Shared Folders Management\n"); + wprintf("\tstart: start the VBox Shared folders (mandatory prior any operation!)\n"); + wprintf("\taddconn <letter> <share name>: add a connection\n"); + wprintf("\tgetlist: list connections\n"); + wprintf("\tgetgloballist: list available shares\n"); +} + +int wmain(int argc, wchar_t *argv[]) +{ + PCWSTR cmd; + + if (argc == 1) + { + printUsage(); + return 0; + } + + cmd = argv[1]; + + if (_wcsicmp(cmd, L"start") == 0) + { + return startVBoxSrv(); + } + else if (_wcsicmp(cmd, L"addconn") == 0) + { + if (argc < 4) + { + printUsage(); + return 0; + } + + return addConn(argv[2], argv[3]); + } + else if (_wcsicmp(cmd, L"getlist") == 0) + { + return getList(); + } + else if (_wcsicmp(cmd, L"getgloballist") == 0) + { + return getGlobalList(); + } + else + { + printUsage(); + return 0; + } +} Propchange: trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/rosv… ============================================================================== --- trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.rc (added) +++ trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.rc [iso-8859-1] Fri Aug 21 08:03:13 2015 @@ -0,0 +1,5 @@ + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS VBoxSRV management tool\0" +#define REACTOS_STR_INTERNAL_NAME "rosvboxmgmt\0" +#define REACTOS_STR_ORIGINAL_FILENAME "rosvboxmgmt.exe\0" +#include <reactos/version.rc> Propchange: trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 68776: [SDK:SCRNSAVE] - Add support for specifying a parent window handle for the screensaver configuration dialog, adapted from patch by Timo Kreuzer, see CORE-5718. - Fix failure retur...
by hbelusca＠svn.reactos.org 20 Aug '15

20 Aug '15

Author: hbelusca Date: Thu Aug 20 19:44:13 2015 New Revision: 68776 URL: http://svn.reactos.org/svn/reactos?rev=68776&view=rev Log: [SDK:SCRNSAVE] - Add support for specifying a parent window handle for the screensaver configuration dialog, adapted from patch by Timo Kreuzer, see CORE-5718. - Fix failure return values from the helper functions. - Add TranslateMessage call in the message pump. - Get the correct left/top coordinates for the screensaver, being multi-screen aware. - Use Win-compatible window names & styles for the screensaver preview dialog & screensaver window, compatible MS' scrnsave.lib. Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/scrnsave/scrnsave.… ============================================================================== --- trunk/reactos/lib/sdk/scrnsave/scrnsave.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/scrnsave/scrnsave.c [iso-8859-1] Thu Aug 20 19:44:13 2015 @@ -2,7 +2,8 @@ * PROJECT: ReactOS Screen Saver Library * LICENSE: GPL v2 or any later version * FILE: lib/sdk/scrnsave/scrnsave.c - * PURPOSE: Library for writing screen savers, compatible with MS' scrnsave.lib + * PURPOSE: Library for writing screen savers, compatible with + * MS' scrnsave.lib without Win9x support. * PROGRAMMERS: Anders Norlander <anorland(a)hem2.passagen.se> * Colin Finck <mail(a)colinfinck.de> */ @@ -38,7 +39,7 @@ return (c == ' ' || c == '\t'); } -#define ISNUM(c) ((c) >= '0' && c <= '9') +#define ISNUM(c) ((c) >= '0' && (c) <= '9') static ULONG_PTR _toulptr(const TCHAR *s) { @@ -78,9 +79,11 @@ { switch (wParam) { - case SC_CLOSE: - case SC_SCREENSAVE: - return FALSE; + case SC_CLOSE: // - Closing the screen saver, or... + case SC_NEXTWINDOW: // - Switching to + case SC_PREVWINDOW: // different windows, or... + case SC_SCREENSAVE: // - Starting another screen saver: + return FALSE; // Fail it! } } break; @@ -102,7 +105,7 @@ case WM_ACTIVATEAPP: if (!wParam) { - // wParam is FALSE, so the screensaver is losing the focus. + // wParam is FALSE, so the screen saver is losing the focus. PostMessage(hWnd, WM_CLOSE, 0, 0); } break; @@ -111,6 +114,8 @@ { POINT pt; GetCursorPos(&pt); + // TODO: Implement mouse move threshold. See: + // http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… if (pt.x == pt_orig.x && pt.y == pt_orig.y) break; @@ -118,11 +123,14 @@ } case WM_LBUTTONDOWN: + case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: - case WM_MBUTTONDOWN: + case WM_XBUTTONDOWN: case WM_KEYDOWN: case WM_KEYUP: - // Send a WM_CLOSE to close the screen saver (allows the screensaver author to do clean-up tasks) + case WM_SYSKEYDOWN: + // Send a WM_CLOSE to close the screen saver (allows + // the screen saver to perform clean-up tasks) PostMessage(hWnd, WM_CLOSE, 0, 0); break; @@ -137,60 +145,81 @@ // Registers the screen saver window class static BOOL RegisterScreenSaverClass(void) { - WNDCLASS cls = {0,}; - - cls.hIcon = LoadIcon(hMainInstance, MAKEINTATOM(ID_APP)); + WNDCLASS cls; + + cls.hCursor = NULL; + cls.hIcon = LoadIcon(hMainInstance, MAKEINTATOM(ID_APP)); + cls.lpszMenuName = NULL; cls.lpszClassName = CLASS_SCRNSAVE; cls.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); - cls.hInstance = hMainInstance; - cls.style = CS_VREDRAW | CS_HREDRAW | CS_SAVEBITS | CS_PARENTDC; - cls.lpfnWndProc = SysScreenSaverProc; - - return RegisterClass(&cls) != 0; -} - -static void LaunchConfig(void) + cls.hInstance = hMainInstance; + cls.style = CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS | CS_SAVEBITS | CS_PARENTDC; + cls.lpfnWndProc = SysScreenSaverProc; + cls.cbWndExtra = 0; + cls.cbClsExtra = 0; + + return (RegisterClass(&cls) != 0); +} + +static int LaunchConfig(HWND hParent) { // Only show the dialog if the RegisterDialogClasses function succeeded. // This is the same behaviour as MS' scrnsave.lib. - if( RegisterDialogClasses(hMainInstance) ) - DialogBox(hMainInstance, MAKEINTRESOURCE(DLG_SCRNSAVECONFIGURE), GetForegroundWindow(), (DLGPROC) ScreenSaverConfigureDialog); + if (!RegisterDialogClasses(hMainInstance)) + return -1; + + return DialogBox(hMainInstance, MAKEINTRESOURCE(DLG_SCRNSAVECONFIGURE), + hParent, (DLGPROC)ScreenSaverConfigureDialog); } static int LaunchScreenSaver(HWND hParent) { - UINT style; + LPCTSTR lpWindowName; + UINT style, exstyle; RECT rc; MSG msg; if (!RegisterScreenSaverClass()) { MessageBox(NULL, TEXT("RegisterClass() failed"), NULL, MB_ICONHAND); - return 1; + return -1; } // A slightly different approach needs to be used when displaying in a preview window if (hParent) { - style = WS_CHILD; + fChildPreview = TRUE; + lpWindowName = TEXT("Preview"); + + style = WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN; + exstyle = 0; + GetClientRect(hParent, &rc); + rc.left = 0; + rc.top = 0; } else { - style = WS_POPUP; - rc.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); + fChildPreview = FALSE; + lpWindowName = TEXT("Screen Saver"); + + style = WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; + exstyle = WS_EX_TOOLWINDOW | WS_EX_TOPMOST; + + // Get the left & top side coordinates of the virtual screen + rc.left = GetSystemMetrics(SM_XVIRTUALSCREEN); + rc.top = GetSystemMetrics(SM_YVIRTUALSCREEN); + // Get the width and height of the virtual screen + rc.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); rc.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); - style |= WS_VISIBLE; } // Create the main screen saver window - hMainWindow = CreateWindowEx(hParent ? 0 : WS_EX_TOPMOST, CLASS_SCRNSAVE, - TEXT("SCREENSAVER"), style, - 0, 0, rc.right, rc.bottom, hParent, NULL, - hMainInstance, NULL); - - if(!hMainWindow) - return 1; + hMainWindow = CreateWindowEx(exstyle, CLASS_SCRNSAVE, lpWindowName, style, + rc.left, rc.top, rc.right, rc.bottom, + hParent, NULL, hMainInstance, NULL); + if (!hMainWindow) + return -1; // Display window and start pumping messages ShowWindow(hMainWindow, SW_SHOW); @@ -198,7 +227,10 @@ SetCursor(NULL); while (GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); DispatchMessage(&msg); + } return msg.wParam; } @@ -208,12 +240,16 @@ { LPTSTR p; - UNREFERENCED_PARAMETER(nCmdShow); - UNREFERENCED_PARAMETER(hPrevInst); + UNREFERENCED_PARAMETER(nCmdShow); + UNREFERENCED_PARAMETER(hPrevInst); hMainInstance = hInst; - // Parse the arguments + // Parse the arguments: + // -a <hwnd> (Change the password; only for Win9x, unused on WinNT) + // -s (Run the screensaver) + // -p <hwnd> (Preview) + // -c <hwnd> (Configure) for (p = CmdLine; *p; p++) { switch (*p) @@ -226,23 +262,34 @@ case 'P': case 'p': { + HWND hParent; + + while (ISSPACE(*++p)); + hParent = (HWND)_toulptr(p); + // Start the screen saver in preview mode - HWND hParent; - fChildPreview = TRUE; - - while (ISSPACE(*++p)); - hParent = (HWND) _toulptr(p); - if (hParent && IsWindow(hParent)) return LaunchScreenSaver(hParent); + else + return -1; } - return 0; case 'C': case 'c': + { + HWND hParent; + + if (p[1] == ':') + hParent = (HWND)_toulptr(p + 2); + else + hParent = GetForegroundWindow(); + // Display the configuration dialog - LaunchConfig(); - return 0; + if (hParent && IsWindow(hParent)) + return LaunchConfig(hParent); + else + return -1; + } case '-': case '/': @@ -252,7 +299,5 @@ } } - LaunchConfig(); - - return 0; -} + return LaunchConfig(NULL); +}

1 0

[gadamopoulos] 68775: [SHELL32] - Move the properties dialog for the recycle bin in its own file. The implementation of the recycle bin is overly complicated and keeping with it a dialog for editin...
by gadamopoulos＠svn.reactos.org 19 Aug '15

19 Aug '15

Author: gadamopoulos Date: Wed Aug 19 18:10:30 2015 New Revision: 68775 URL: http://svn.reactos.org/svn/reactos?rev=68775&view=rev Log: [SHELL32] - Move the properties dialog for the recycle bin in its own file. The implementation of the recycle bin is overly complicated and keeping with it a dialog for editing some registry entries makes it worse. Added: trunk/reactos/dll/win32/shell32/dialogs/recycler_prop.cpp - copied, changed from r68772, trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Wed Aug 19 18:10:30 2015 @@ -28,6 +28,7 @@ dialogs/folder_options.cpp dialogs/filedefext.cpp dialogs/fprop.cpp + dialogs/recycler_prop.cpp CDropTargetHelper.cpp CEnumIDListBase.cpp CExtractIcon.cpp Copied: trunk/reactos/dll/win32/shell32/dialogs/recycler_prop.cpp (from r68772, trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/recycler_prop.cpp [iso-8859-1] Wed Aug 19 18:10:30 2015 @@ -21,95 +21,7 @@ #include <precomp.h> -#include <mmsystem.h> -#include <ntquery.h> - -#define MAX_PROPERTY_SHEET_PAGE 32 - WINE_DEFAULT_DEBUG_CHANNEL(CRecycleBin); - -typedef struct -{ - int column_name_id; - const GUID *fmtId; - DWORD pid; - int pcsFlags; - int fmt; - int cxChars; -} columninfo; - -static const columninfo RecycleBinColumns[] = -{ - {IDS_SHV_COLUMN1, &FMTID_Storage, PID_STG_NAME, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 30}, - {IDS_SHV_COLUMN_DELFROM, &FMTID_Displaced, PID_DISPLACED_FROM, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 30}, - {IDS_SHV_COLUMN_DELDATE, &FMTID_Displaced, PID_DISPLACED_DATE, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20}, - {IDS_SHV_COLUMN2, &FMTID_Storage, PID_STG_SIZE, SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 20}, - {IDS_SHV_COLUMN3, &FMTID_Storage, PID_STG_STORAGETYPE, SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20}, - {IDS_SHV_COLUMN4, &FMTID_Storage, PID_STG_WRITETIME, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20}, - /* {"creation time", &FMTID_Storage, PID_STG_CREATETIME, SHCOLSTATE_TYPE_DATE, LVCFMT_LEFT, 20}, */ - /* {"attribs", &FMTID_Storage, PID_STG_ATTRIBUTES, SHCOLSTATE_TYPE_STR, LVCFMT_LEFT, 20}, */ -}; - -#define COLUMN_NAME 0 -#define COLUMN_DELFROM 1 -#define COLUMN_DATEDEL 2 -#define COLUMN_SIZE 3 -#define COLUMN_TYPE 4 -#define COLUMN_MTIME 5 - -#define COLUMNS_COUNT 6 - -/* - * Recycle Bin folder - */ - -class CRecycleBinEnum : - public CEnumIDListBase -{ - private: - public: - CRecycleBinEnum(); - ~CRecycleBinEnum(); - HRESULT WINAPI Initialize(DWORD dwFlags); - static BOOL WINAPI CBEnumRecycleBin(IN PVOID Context, IN HANDLE hDeletedFile); - BOOL WINAPI CBEnumRecycleBin(IN HANDLE hDeletedFile); - - BEGIN_COM_MAP(CRecycleBinEnum) - COM_INTERFACE_ENTRY_IID(IID_IEnumIDList, IEnumIDList) - END_COM_MAP() -}; - -class CRecycleBinItemContextMenu : - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IContextMenu2 -{ - private: - LPITEMIDLIST apidl; - public: - CRecycleBinItemContextMenu(); - ~CRecycleBinItemContextMenu(); - HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); - - // IContextMenu - virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); - virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); - virtual HRESULT WINAPI GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen); - - // IContextMenu2 - virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); - - BEGIN_COM_MAP(CRecycleBinItemContextMenu) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) - END_COM_MAP() -}; - -typedef struct -{ - PIDLRecycleStruct *pFileDetails; - HANDLE hDeletedFile; - BOOL bFound; -} SEARCH_CONTEXT, *PSEARCH_CONTEXT; typedef struct { @@ -118,758 +30,7 @@ DWORD dwMaxCapacity; } DRIVE_ITEM_CONTEXT, *PDRIVE_ITEM_CONTEXT; -BOOL WINAPI CBSearchRecycleBin(IN PVOID Context, IN HANDLE hDeletedFile) -{ - PSEARCH_CONTEXT pContext = (PSEARCH_CONTEXT)Context; - - PDELETED_FILE_DETAILS_W pFileDetails; - DWORD dwSize; - BOOL ret; - - if (!GetDeletedFileDetailsW(hDeletedFile, - 0, - NULL, - &dwSize) && - GetLastError() != ERROR_INSUFFICIENT_BUFFER) - { - ERR("GetDeletedFileDetailsW failed\n"); - return FALSE; - } - - pFileDetails = (DELETED_FILE_DETAILS_W *)SHAlloc(dwSize); - if (!pFileDetails) - { - ERR("No memory\n"); - return FALSE; - } - - if (!GetDeletedFileDetailsW(hDeletedFile, - dwSize, - pFileDetails, - NULL)) - { - ERR("GetDeletedFileDetailsW failed\n"); - SHFree(pFileDetails); - return FALSE; - } - - ret = memcmp(pFileDetails, pContext->pFileDetails, dwSize); - if (!ret) - { - pContext->hDeletedFile = hDeletedFile; - pContext->bFound = TRUE; - } - else - CloseRecycleBinHandle(hDeletedFile); - - SHFree(pFileDetails); - return ret; -} - -static PIDLRecycleStruct * _ILGetRecycleStruct(LPCITEMIDLIST pidl) -{ - LPPIDLDATA pdata = _ILGetDataPointer(pidl); - - if (pdata && pdata->type == 0x00) - return (PIDLRecycleStruct*) & (pdata->u.crecycle); - - return NULL; -} - -CRecycleBinEnum::CRecycleBinEnum() -{ -} - -CRecycleBinEnum::~CRecycleBinEnum() -{ -} - -HRESULT WINAPI CRecycleBinEnum::Initialize(DWORD dwFlags) -{ - static LPCWSTR szDrive = L"C:\\"; - - if (dwFlags & SHCONTF_NONFOLDERS) - { - TRACE("Starting Enumeration\n"); - - if (!EnumerateRecycleBinW(szDrive /* FIXME */ , CBEnumRecycleBin, (PVOID)this)) - { - WARN("Error: EnumerateCRecycleBinW failed\n"); - return E_FAIL; - } - } - else - { - // do nothing - } - return S_OK; -} - -static LPITEMIDLIST _ILCreateRecycleItem(PDELETED_FILE_DETAILS_W pFileDetails) -{ - PIDLDATA tmp; - LPITEMIDLIST pidl; - PIDLRecycleStruct * p; - int size0 = (char*)&tmp.u.crecycle.szName - (char*)&tmp.u.crecycle; - int size = size0; - - tmp.type = 0x00; - size += (wcslen(pFileDetails->FileName) + 1) * sizeof(WCHAR); - - pidl = (LPITEMIDLIST)SHAlloc(size + 4); - if (!pidl) - return pidl; - - pidl->mkid.cb = size + 2; - memcpy(pidl->mkid.abID, &tmp, 2 + size0); - - p = &((PIDLDATA*)pidl->mkid.abID)->u.crecycle; - RtlCopyMemory(p, pFileDetails, sizeof(DELETED_FILE_DETAILS_W)); - wcscpy(p->szName, pFileDetails->FileName); - *(WORD*)((char*)pidl + (size + 2)) = 0; - return pidl; -} - -BOOL WINAPI CRecycleBinEnum::CBEnumRecycleBin(IN PVOID Context, IN HANDLE hDeletedFile) -{ - return static_cast<CRecycleBinEnum *>(Context)->CBEnumRecycleBin(hDeletedFile); -} - -BOOL WINAPI CRecycleBinEnum::CBEnumRecycleBin(IN HANDLE hDeletedFile) -{ - PDELETED_FILE_DETAILS_W pFileDetails; - DWORD dwSize; - LPITEMIDLIST pidl = NULL; - BOOL ret; - - if (!GetDeletedFileDetailsW(hDeletedFile, - 0, - NULL, - &dwSize) && - GetLastError() != ERROR_INSUFFICIENT_BUFFER) - { - ERR("GetDeletedFileDetailsW failed\n"); - return FALSE; - } - - pFileDetails = (DELETED_FILE_DETAILS_W *)SHAlloc(dwSize); - if (!pFileDetails) - { - ERR("No memory\n"); - return FALSE; - } - - if (!GetDeletedFileDetailsW(hDeletedFile, - dwSize, - pFileDetails, - NULL)) - { - ERR("GetDeletedFileDetailsW failed\n"); - SHFree(pFileDetails); - return FALSE; - } - - pidl = _ILCreateRecycleItem(pFileDetails); - if (!pidl) - { - SHFree(pFileDetails); - return FALSE; - } - - ret = AddToEnumList(pidl); - - if (!ret) - SHFree(pidl); - SHFree(pFileDetails); - TRACE("Returning %d\n", ret); - CloseRecycleBinHandle(hDeletedFile); - return ret; -} - -/************************************************************************** -* IContextMenu2 Bitbucket Item Implementation -*/ - -CRecycleBinItemContextMenu::CRecycleBinItemContextMenu() -{ - apidl = NULL; -} - -CRecycleBinItemContextMenu::~CRecycleBinItemContextMenu() -{ - ILFree(apidl); -} - -HRESULT WINAPI CRecycleBinItemContextMenu::Initialize(LPCITEMIDLIST pidl) -{ - apidl = ILClone(pidl); - if (apidl == NULL) - return E_OUTOFMEMORY; - return S_OK; -} - -HRESULT WINAPI CRecycleBinItemContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) -{ - WCHAR szBuffer[30] = {0}; - ULONG Count = 1; - - TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n", this, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); - - if (LoadStringW(shell32_hInstance, IDS_RESTORE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) - { - szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_ENABLED); - Count++; - } - - if (LoadStringW(shell32_hInstance, IDS_CUT, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) - { - _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_SEPARATOR, NULL, MFS_ENABLED); - szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_STRING, szBuffer, MFS_ENABLED); - } - - if (LoadStringW(shell32_hInstance, IDS_DELETE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) - { - szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_SEPARATOR, NULL, MFS_ENABLED); - _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_STRING, szBuffer, MFS_ENABLED); - } - - if (LoadStringW(shell32_hInstance, IDS_PROPERTIES, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) - { - szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_SEPARATOR, NULL, MFS_ENABLED); - _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_DEFAULT); - } - - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); -} - -HRESULT WINAPI CRecycleBinItemContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) -{ - SEARCH_CONTEXT Context; - static LPCWSTR szDrive = L"C:\\"; - - TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n", this, lpcmi, lpcmi->lpVerb, lpcmi->hwnd); - - if (lpcmi->lpVerb == MAKEINTRESOURCEA(1) || lpcmi->lpVerb == MAKEINTRESOURCEA(5)) - { - Context.pFileDetails = _ILGetRecycleStruct(apidl); - Context.bFound = FALSE; - - EnumerateRecycleBinW(szDrive, CBSearchRecycleBin, (PVOID)&Context); - if (!Context.bFound) - return E_FAIL; - - if (lpcmi->lpVerb == MAKEINTRESOURCEA(1)) - { - /* restore file */ - if (RestoreFile(Context.hDeletedFile)) - return S_OK; - else - return E_FAIL; - } - else - { - DeleteFileHandleToRecycleBin(Context.hDeletedFile); - return E_NOTIMPL; - } - } - else if (lpcmi->lpVerb == MAKEINTRESOURCEA(3)) - { - FIXME("implement cut\n"); - return E_NOTIMPL; - } - else if (lpcmi->lpVerb == MAKEINTRESOURCEA(7)) - { - FIXME("implement properties\n"); - return E_NOTIMPL; - } - - return S_OK; -} - -HRESULT WINAPI CRecycleBinItemContextMenu::GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen) -{ - TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n", this, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); - - return E_FAIL; -} - -HRESULT WINAPI CRecycleBinItemContextMenu::HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - TRACE("CRecycleBin_IContextMenu2Item_HandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n", this, uMsg, wParam, lParam); - - return E_NOTIMPL; -} - -/************************************************************************** -* registers clipboardformat once -*/ -void CRecycleBin::SF_RegisterClipFmt() -{ - TRACE ("(%p)\n", this); - - if (!cfShellIDList) - cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); -} - -CRecycleBin::CRecycleBin() -{ - pidl = NULL; - iIdEmpty = 0; - cfShellIDList = 0; - SF_RegisterClipFmt(); - fAcceptFmt = FALSE; -} - -CRecycleBin::~CRecycleBin() -{ - /* InterlockedDecrement(&objCount);*/ - SHFree(pidl); -} - -/************************************************************************* - * RecycleBin IPersistFolder2 interface - */ - -HRESULT WINAPI CRecycleBin::GetClassID(CLSID *pClassID) -{ - TRACE("(%p, %p)\n", this, pClassID); - if (pClassID == NULL) - return E_INVALIDARG; - memcpy(pClassID, &CLSID_RecycleBin, sizeof(CLSID)); - return S_OK; -} - -HRESULT WINAPI CRecycleBin::Initialize(LPCITEMIDLIST pidl) -{ - TRACE("(%p, %p)\n", this, pidl); - - SHFree((LPVOID)this->pidl); - this->pidl = ILClone(pidl); - if (this->pidl == NULL) - return E_OUTOFMEMORY; - return S_OK; -} - -HRESULT WINAPI CRecycleBin::GetCurFolder(LPITEMIDLIST *ppidl) -{ - TRACE("\n"); - *ppidl = ILClone(pidl); - return S_OK; -} - -/************************************************************************* - * RecycleBin IShellFolder2 interface - */ - -HRESULT WINAPI CRecycleBin::ParseDisplayName(HWND hwnd, LPBC pbc, - LPOLESTR pszDisplayName, ULONG *pchEaten, PIDLIST_RELATIVE *ppidl, - ULONG *pdwAttributes) -{ - FIXME("stub\n"); - return E_NOTIMPL; -} - - -PDELETED_FILE_DETAILS_W -UnpackDetailsFromPidl(LPCITEMIDLIST pidl) -{ - return (PDELETED_FILE_DETAILS_W)&pidl->mkid.abID; -} - -HRESULT WINAPI CRecycleBin::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) -{ - return ShellObjectCreatorInit<CRecycleBinEnum>(dwFlags, IID_IEnumIDList, ppEnumIDList); -} - -HRESULT WINAPI CRecycleBin::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbc, REFIID riid, void **ppv) -{ - FIXME("(%p, %p, %p, %s, %p) - stub\n", this, pidl, pbc, debugstr_guid(&riid), ppv); - return E_NOTIMPL; -} - -HRESULT WINAPI CRecycleBin::BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbc, REFIID riid, void **ppv) -{ - FIXME("(%p, %p, %p, %s, %p) - stub\n", this, pidl, pbc, debugstr_guid(&riid), ppv); - return E_NOTIMPL; -} - -HRESULT WINAPI CRecycleBin::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) -{ - /* TODO */ - TRACE("(%p, %p, %p, %p)\n", this, (void *)lParam, pidl1, pidl2); - if (pidl1->mkid.cb != pidl2->mkid.cb) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, pidl1->mkid.cb - pidl2->mkid.cb); - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (unsigned short)memcmp(pidl1->mkid.abID, pidl2->mkid.abID, pidl1->mkid.cb)); -} - -HRESULT WINAPI CRecycleBin::CreateViewObject(HWND hwndOwner, REFIID riid, void **ppv) -{ - CComPtr<IShellView> pShellView; - HRESULT hr = E_NOINTERFACE; - - TRACE("(%p, %p, %s, %p)\n", this, hwndOwner, debugstr_guid(&riid), ppv); - - if (!ppv) - return hr; - - *ppv = NULL; - - if (IsEqualIID (riid, IID_IDropTarget)) - { - hr = this->QueryInterface (IID_IDropTarget, ppv); - } - else if (IsEqualIID (riid, IID_IContextMenu) || IsEqualIID (riid, IID_IContextMenu2)) - { - hr = this->QueryInterface(riid, ppv); - } - else if (IsEqualIID (riid, IID_IShellView)) - { - hr = CDefView_Constructor(this, riid, ppv); - } - else - return hr; - TRACE ("-- (%p)->(interface=%p)\n", this, ppv); - return hr; - -} - -HRESULT WINAPI CRecycleBin::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, - SFGAOF *rgfInOut) -{ - TRACE("(%p, %d, {%p, ...}, {%x})\n", this, cidl, apidl ? apidl[0] : NULL, (unsigned int)*rgfInOut); - *rgfInOut &= SFGAO_FOLDER|SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANLINK; - return S_OK; -} - -HRESULT WINAPI CRecycleBin::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, - REFIID riid, UINT *prgfInOut, void **ppv) -{ - IUnknown *pObj = NULL; - HRESULT hr = E_INVALIDARG; - - TRACE ("(%p)->(%p,%u,apidl=%p, %p %p)\n", this, - hwndOwner, cidl, apidl, prgfInOut, ppv); - - if (!ppv) - return hr; - - *ppv = NULL; - - if ((IsEqualIID (riid, IID_IContextMenu) || IsEqualIID(riid, IID_IContextMenu2)) && (cidl >= 1)) - { - hr = ShellObjectCreatorInit<CRecycleBinItemContextMenu>(apidl[0], riid, &pObj); - } - else if (IsEqualIID (riid, IID_IDropTarget) && (cidl == 1)) - { - IDropTarget * pDt = NULL; - hr = QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); - pObj = pDt; - } - else if(IsEqualIID(riid, IID_IExtractIconA) && (cidl == 1)) - { - // FIXME: This is not correct, it does not show the right icons - LPITEMIDLIST pidlItem = ILCombine(pidl, apidl[0]); - pObj = IExtractIconA_Constructor(pidlItem); - SHFree(pidlItem); - hr = S_OK; - } - else if (IsEqualIID(riid, IID_IExtractIconW) && (cidl == 1)) - { - // FIXME: This is not correct, it does not show the right icons - LPITEMIDLIST pidlItem = ILCombine(pidl, apidl[0]); - pObj = IExtractIconW_Constructor(pidlItem); - SHFree(pidlItem); - hr = S_OK; - } - else - hr = E_NOINTERFACE; - - if (SUCCEEDED(hr) && !pObj) - hr = E_OUTOFMEMORY; - - *ppv = pObj; - TRACE ("(%p)->hr=0x%08x\n", this, hr); - return hr; -} - -HRESULT WINAPI CRecycleBin::GetDisplayNameOf(PCUITEMID_CHILD pidl, SHGDNF uFlags, STRRET *pName) -{ - PIDLRecycleStruct *pFileDetails; - LPWSTR pFileName; - - TRACE("(%p, %p, %x, %p)\n", this, pidl, (unsigned int)uFlags, pName); - - - if (_ILIsBitBucket (pidl)) - { - WCHAR pszPath[100]; - - if (HCR_GetClassNameW(CLSID_RecycleBin, pszPath, MAX_PATH)) - { - pName->uType = STRRET_WSTR; - pName->pOleStr = StrDupW(pszPath); - return S_OK; - } - } - - pFileDetails = _ILGetRecycleStruct(pidl); - if (!pFileDetails) - { - pName->cStr[0] = 0; - pName->uType = STRRET_CSTR; - return E_INVALIDARG; - } - - pFileName = wcsrchr(pFileDetails->szName, L'\\'); - if (!pFileName) - { - pName->cStr[0] = 0; - pName->uType = STRRET_CSTR; - return E_UNEXPECTED; - } - - pName->pOleStr = StrDupW(pFileName + 1); - if (pName->pOleStr == NULL) - return E_OUTOFMEMORY; - - pName->uType = STRRET_WSTR; - return S_OK; -} - -HRESULT WINAPI CRecycleBin::SetNameOf(HWND hwnd, PCUITEMID_CHILD pidl, LPCOLESTR pszName, - SHGDNF uFlags, PITEMID_CHILD *ppidlOut) -{ - TRACE("\n"); - return E_FAIL; /* not supported */ -} - -HRESULT WINAPI CRecycleBin::GetDefaultSearchGUID(GUID *pguid) -{ - FIXME("stub\n"); - return E_NOTIMPL; -} - -HRESULT WINAPI CRecycleBin::EnumSearches(IEnumExtraSearch **ppEnum) -{ - FIXME("stub\n"); - *ppEnum = NULL; - return E_NOTIMPL; -} - -HRESULT WINAPI CRecycleBin::GetDefaultColumn(DWORD dwReserved, ULONG *pSort, ULONG *pDisplay) -{ - TRACE("(%p, %x, %p, %p)\n", this, (unsigned int)dwReserved, pSort, pDisplay); - *pSort = 0; - *pDisplay = 0; - return S_OK; -} - -HRESULT WINAPI CRecycleBin::GetDefaultColumnState(UINT iColumn, SHCOLSTATEF *pcsFlags) -{ - TRACE("(%p, %d, %p)\n", this, iColumn, pcsFlags); - if (iColumn >= COLUMNS_COUNT) - return E_INVALIDARG; - *pcsFlags = RecycleBinColumns[iColumn].pcsFlags; - return S_OK; -} - -HRESULT WINAPI CRecycleBin::GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv) -{ - FIXME("stub\n"); - return E_NOTIMPL; -} - -static HRESULT FormatDateTime(LPWSTR buffer, int size, FILETIME * ft) -{ - FILETIME lft; - SYSTEMTIME time; - int ret; - - FileTimeToLocalFileTime(ft, &lft); - FileTimeToSystemTime(&lft, &time); - - ret = GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, buffer, size); - if (ret > 0 && ret < size) - { - /* Append space + time without seconds */ - buffer[ret-1] = ' '; - GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &time, NULL, &buffer[ret], size - ret); - } - - return (ret != 0 ? E_FAIL : S_OK); -} - -HRESULT WINAPI CRecycleBin::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, LPSHELLDETAILS pDetails) -{ - PIDLRecycleStruct * pFileDetails; - WCHAR buffer[MAX_PATH]; - WCHAR szTypeName[100]; - LPWSTR pszBackslash; - UINT Length; - - TRACE("(%p, %p, %d, %p)\n", this, pidl, iColumn, pDetails); - if (iColumn >= COLUMNS_COUNT) - return E_FAIL; - pDetails->fmt = RecycleBinColumns[iColumn].fmt; - pDetails->cxChar = RecycleBinColumns[iColumn].cxChars; - if (pidl == NULL) - { - pDetails->str.uType = STRRET_WSTR; - LoadStringW(shell32_hInstance, RecycleBinColumns[iColumn].column_name_id, buffer, MAX_PATH); - return SHStrDupW(buffer, &pDetails->str.pOleStr); - } - - if (iColumn == COLUMN_NAME) - return GetDisplayNameOf(pidl, SHGDN_NORMAL, &pDetails->str); - - pFileDetails = _ILGetRecycleStruct(pidl); - switch (iColumn) - { - case COLUMN_DATEDEL: - FormatDateTime(buffer, MAX_PATH, &pFileDetails->DeletionTime); - break; - case COLUMN_DELFROM: - pszBackslash = wcsrchr(pFileDetails->szName, L'\\'); - Length = (pszBackslash - pFileDetails->szName); - memcpy((LPVOID)buffer, pFileDetails->szName, Length * sizeof(WCHAR)); - buffer[Length] = L'\0'; - break; - case COLUMN_SIZE: - StrFormatKBSizeW(pFileDetails->FileSize.QuadPart, buffer, MAX_PATH); - break; - case COLUMN_MTIME: - FormatDateTime(buffer, MAX_PATH, &pFileDetails->LastModification); - break; - case COLUMN_TYPE: - szTypeName[0] = L'\0'; - wcscpy(buffer, PathFindExtensionW(pFileDetails->szName)); - if (!( HCR_MapTypeToValueW(buffer, buffer, sizeof(buffer) / sizeof(WCHAR), TRUE) && - HCR_MapTypeToValueW(buffer, szTypeName, sizeof(szTypeName) / sizeof(WCHAR), FALSE ))) - { - wcscpy (szTypeName, PathFindExtensionW(pFileDetails->szName)); - wcscat(szTypeName, L"-"); - Length = wcslen(szTypeName); - if (LoadStringW(shell32_hInstance, IDS_SHV_COLUMN1, &szTypeName[Length], (sizeof(szTypeName) / sizeof(WCHAR)) - Length)) - szTypeName[(sizeof(szTypeName)/sizeof(WCHAR))-1] = L'\0'; - } - pDetails->str.uType = STRRET_WSTR; - return SHStrDupW(szTypeName, &pDetails->str.pOleStr); - break; - default: - return E_FAIL; - } - - pDetails->str.uType = STRRET_WSTR; - return SHStrDupW(buffer, &pDetails->str.pOleStr); -} - -HRESULT WINAPI CRecycleBin::MapColumnToSCID(UINT iColumn, SHCOLUMNID *pscid) -{ - TRACE("(%p, %d, %p)\n", this, iColumn, pscid); - if (iColumn >= COLUMNS_COUNT) - return E_INVALIDARG; - pscid->fmtid = *RecycleBinColumns[iColumn].fmtId; - pscid->pid = RecycleBinColumns[iColumn].pid; - return S_OK; -} - -/************************************************************************* - * RecycleBin IContextMenu interface - */ - -HRESULT WINAPI CRecycleBin::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) -{ - WCHAR szBuffer[100]; - MENUITEMINFOW mii; - int id = 1; - - TRACE("QueryContextMenu %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.fState = MFS_ENABLED; - szBuffer[0] = L'\0'; - LoadStringW(shell32_hInstance, IDS_EMPTY_BITBUCKET, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); - mii.dwTypeData = szBuffer; - mii.cch = wcslen(mii.dwTypeData); - mii.wID = idCmdFirst + id++; - mii.fType = MFT_STRING; - iIdEmpty = 1; - - if (!InsertMenuItemW(hMenu, indexMenu, TRUE, &mii)) - return E_FAIL; - - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, id); -} - -HRESULT WINAPI CRecycleBin::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) -{ - HRESULT hr; - LPSHELLBROWSER lpSB; - IShellView * lpSV = NULL; - - TRACE("%p %p verb %p\n", this, lpcmi, lpcmi->lpVerb); - - if (LOWORD(lpcmi->lpVerb) == iIdEmpty) - { - // FIXME - // path & flags - hr = SHEmptyRecycleBinW(lpcmi->hwnd, L"C:\\", 0); - TRACE("result %x\n", hr); - if (hr != S_OK) - return hr; - - lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); - if (lpSB && SUCCEEDED(lpSB->QueryActiveShellView(&lpSV))) - lpSV->Refresh(); - } - return S_OK; -} - -HRESULT WINAPI CRecycleBin::GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen) -{ - FIXME("%p %lu %u %p %p %u\n", this, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); - - return E_NOTIMPL; -} - -/************************************************************************* - * RecycleBin IShellPropSheetExt interface - */ - -HRESULT WINAPI CRecycleBin::AddPages(LPFNSVADDPROPSHEETPAGE pfnAddPage, LPARAM lParam) -{ - FIXME("%p %p %lu\n", this, pfnAddPage, lParam); - - return E_NOTIMPL; -} - -HRESULT WINAPI CRecycleBin::ReplacePage(EXPPS uPageID, LPFNSVADDPROPSHEETPAGE pfnReplaceWith, LPARAM lParam) -{ - FIXME("%p %lu %p %lu\n", this, uPageID, pfnReplaceWith, lParam); - - return E_NOTIMPL; -} - -/************************************************************************* - * RecycleBin IShellExtInit interface - */ - -HRESULT WINAPI CRecycleBin::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID) -{ - TRACE("%p %p %p %p\n", this, pidlFolder, pdtobj, hkeyProgID ); - return S_OK; -} - -void toggleNukeOnDeleteOption(HWND hwndDlg, BOOL bEnable) +static void toggleNukeOnDeleteOption(HWND hwndDlg, BOOL bEnable) { if (bEnable) { @@ -1250,509 +411,3 @@ else return TRUE; } - -BOOL -TRASH_CanTrashFile(LPCWSTR wszPath) -{ - LONG ret; - DWORD dwNukeOnDelete, dwType, VolSerialNumber, MaxComponentLength; - DWORD FileSystemFlags, dwSize, dwDisposition; - HKEY hKey; - WCHAR szBuffer[10]; - WCHAR szKey[150] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Bitbucket\\Volume\\"; - - if (wszPath[1] != L':') - { - /* path is UNC */ - return FALSE; - } - - if (GetDriveTypeW(wszPath) != DRIVE_FIXED) - { - /* no bitbucket on removable media */ - return FALSE; - } - - if (!GetVolumeInformationW(wszPath, NULL, 0, &VolSerialNumber, &MaxComponentLength, &FileSystemFlags, NULL, 0)) - { - ERR("GetVolumeInformationW failed with %u\n", GetLastError()); - return FALSE; - } - - swprintf(szBuffer, L"%04X-%04X", LOWORD(VolSerialNumber), HIWORD(VolSerialNumber)); - wcscat(szKey, szBuffer); - - if (RegCreateKeyExW(HKEY_CURRENT_USER, szKey, 0, NULL, 0, KEY_WRITE, NULL, &hKey, &dwDisposition) != ERROR_SUCCESS) - { - ERR("RegCreateKeyExW failed\n"); - return FALSE; - } - - if (dwDisposition & REG_CREATED_NEW_KEY) - { - /* per default move to bitbucket */ - dwNukeOnDelete = 0; - RegSetValueExW(hKey, L"NukeOnDelete", 0, REG_DWORD, (LPBYTE)&dwNukeOnDelete, sizeof(DWORD)); - /* per default unlimited size */ - dwSize = -1; - RegSetValueExW(hKey, L"MaxCapacity", 0, REG_DWORD, (LPBYTE)&dwSize, sizeof(DWORD)); - RegCloseKey(hKey); - return TRUE; - } - else - { - dwSize = sizeof(dwNukeOnDelete); - ret = RegQueryValueExW(hKey, L"NukeOnDelete", NULL, &dwType, (LPBYTE)&dwNukeOnDelete, &dwSize); - if (ret != ERROR_SUCCESS) - { - if (ret == ERROR_FILE_NOT_FOUND) - { - /* restore key and enable bitbucket */ - dwNukeOnDelete = 0; - RegSetValueExW(hKey, L"NukeOnDelete", 0, REG_DWORD, (LPBYTE)&dwNukeOnDelete, sizeof(DWORD)); - } - RegCloseKey(hKey); - return TRUE; - } - else if (dwNukeOnDelete) - { - /* do not delete to bitbucket */ - RegCloseKey(hKey); - return FALSE; - } - /* FIXME - * check if bitbucket is full - */ - RegCloseKey(hKey); - return TRUE; - } -} - -BOOL -TRASH_TrashFile(LPCWSTR wszPath) -{ - TRACE("(%s)\n", debugstr_w(wszPath)); - return DeleteFileToRecycleBin(wszPath); -} - -/************************************************************************* - * SHUpdateCRecycleBinIcon [SHELL32.@] - * - * Undocumented - */ -EXTERN_C HRESULT WINAPI SHUpdateRecycleBinIcon(void) -{ - FIXME("stub\n"); - - - - return S_OK; -} - -/**************************************************************************** - * IDropTarget implementation - */ -BOOL CRecycleBin::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) -{ - /* TODO on shift we should delete, we should update the cursor manager to show this. */ - - DWORD dwEffect = DROPEFFECT_COPY; - - *pdwEffect = DROPEFFECT_NONE; - - if (fAcceptFmt) { /* Does our interpretation of the keystate ... */ - *pdwEffect = KeyStateToDropEffect (dwKeyState); - - if (*pdwEffect == DROPEFFECT_NONE) - *pdwEffect = dwEffect; - - /* ... matches the desired effect ? */ - if (dwEffect & *pdwEffect) { - return TRUE; - } - } - return FALSE; -} - -HRESULT WINAPI CRecycleBin::DragEnter(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) -{ - TRACE("Recycle bin drag over (%p)\n", this); - /* The recycle bin accepts pretty much everything, and sets a CSIDL flag. */ - fAcceptFmt = TRUE; - - QueryDrop(dwKeyState, pdwEffect); - return S_OK; -} - -HRESULT WINAPI CRecycleBin::DragOver(DWORD dwKeyState, POINTL pt, - DWORD *pdwEffect) -{ - TRACE("(%p)\n", this); - - if (!pdwEffect) - return E_INVALIDARG; - - QueryDrop(dwKeyState, pdwEffect); - - return S_OK; -} - -HRESULT WINAPI CRecycleBin::DragLeave() -{ - TRACE("(%p)\n", this); - - fAcceptFmt = FALSE; - - return S_OK; -} - -HRESULT WINAPI CRecycleBin::Drop(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) -{ - TRACE("(%p) object dropped on recycle bin, effect %u\n", this, *pdwEffect); - - /* TODO: pdwEffect should be read and make the drop object be permanently deleted in the move case (shift held) */ - - FORMATETC fmt; - TRACE("(%p)->(DataObject=%p)\n", this, pDataObject); - InitFormatEtc (fmt, cfShellIDList, TYMED_HGLOBAL); - - /* Handle cfShellIDList Drop objects here, otherwise send the approriate message to other software */ - if (SUCCEEDED(pDataObject->QueryGetData(&fmt))) { - IStream *s; - CoMarshalInterThreadInterfaceInStream(IID_IDataObject, pDataObject, &s); - SHCreateThread(DoDeleteThreadProc, s, NULL, NULL); - } - else - { - /* - * TODO call SetData on the data object with format CFSTR_TARGETCLSID - * set to the Recycle Bin's class identifier CLSID_RecycleBin. - */ - } - return S_OK; -} - -DWORD WINAPI DoDeleteThreadProc(LPVOID lpParameter) -{ - CoInitialize(NULL); - CComPtr<IDataObject> pDataObject; - HRESULT hr = CoGetInterfaceAndReleaseStream (static_cast<IStream*>(lpParameter), IID_PPV_ARG(IDataObject, &pDataObject)); - if (SUCCEEDED(hr)) - { - DoDeleteDataObject(pDataObject); - } - CoUninitialize(); - return 0; -} - -HRESULT WINAPI DoDeleteDataObject(IDataObject *pda) -{ - TRACE("performing delete"); - HRESULT hr; - - STGMEDIUM medium; - FORMATETC formatetc; - InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); - hr = pda->GetData(&formatetc, &medium); - if (FAILED(hr)) - return hr; - - /* lock the handle */ - LPIDA lpcida = (LPIDA)GlobalLock(medium.hGlobal); - if (!lpcida) - { - ReleaseStgMedium(&medium); - return E_FAIL; - } - - /* convert the data into pidl */ - LPITEMIDLIST pidl; - LPITEMIDLIST *apidl = _ILCopyCidaToaPidl(&pidl, lpcida); - if (!apidl) - { - ReleaseStgMedium(&medium); - return E_FAIL; - } - - CComPtr<IShellFolder> psfDesktop; - CComPtr<IShellFolder> psfFrom = NULL; - - /* Grab the desktop shell folder */ - hr = SHGetDesktopFolder(&psfDesktop); - if (FAILED(hr)) - { - ERR("SHGetDesktopFolder failed\n"); - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - return E_FAIL; - } - - /* Find source folder, this is where the clipboard data was copied from */ - if (_ILIsDesktop(pidl)) - { - psfFrom = psfDesktop; - } - else - { - hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfFrom)); - if (FAILED(hr)) - { - ERR("no IShellFolder\n"); - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - return E_FAIL; - } - } - - STRRET strTemp; - hr = psfFrom->GetDisplayNameOf(apidl[0], SHGDN_FORPARSING, &strTemp); - if (FAILED(hr)) - { - ERR("IShellFolder_GetDisplayNameOf failed with %x\n", hr); - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - return hr; - } - - WCHAR wszPath[MAX_PATH]; - hr = StrRetToBufW(&strTemp, apidl[0], wszPath, _countof(wszPath)); - if (FAILED(hr)) - { - ERR("StrRetToBufW failed with %x\n", hr); - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - return hr; - } - - /* Only keep the base path */ - LPWSTR pwszFilename = PathFindFileNameW(wszPath); - *pwszFilename = L'\0'; - - /* Build paths list */ - LPWSTR pwszPaths = BuildPathsList(wszPath, lpcida->cidl, (LPCITEMIDLIST*) apidl); - if (!pwszPaths) - { - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - return E_FAIL; - } - - /* Delete them */ - SHFILEOPSTRUCTW FileOp; - ZeroMemory(&FileOp, sizeof(FileOp)); - FileOp.wFunc = FO_DELETE; - FileOp.pFrom = pwszPaths; - FileOp.fFlags = FOF_ALLOWUNDO; - - if (SHFileOperationW(&FileOp) != 0) - { - ERR("SHFileOperation failed with 0x%x for %s\n", GetLastError(), debugstr_w(pwszPaths)); - hr = E_FAIL; - } - - HeapFree(GetProcessHeap(), 0, pwszPaths); - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - - return hr; -} - -/************************************************************************* - * SHEmptyRecycleBinA (SHELL32.@) - */ -HRESULT WINAPI SHEmptyRecycleBinA(HWND hwnd, LPCSTR pszRootPath, DWORD dwFlags) -{ - LPWSTR szRootPathW = NULL; - int len; - HRESULT hr; - - TRACE("%p, %s, 0x%08x\n", hwnd, debugstr_a(pszRootPath), dwFlags); - - if (pszRootPath) - { - len = MultiByteToWideChar(CP_ACP, 0, pszRootPath, -1, NULL, 0); - if (len == 0) - return HRESULT_FROM_WIN32(GetLastError()); - szRootPathW = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!szRootPathW) - return E_OUTOFMEMORY; - if (MultiByteToWideChar(CP_ACP, 0, pszRootPath, -1, szRootPathW, len) == 0) - { - HeapFree(GetProcessHeap(), 0, szRootPathW); - return HRESULT_FROM_WIN32(GetLastError()); - } - } - - hr = SHEmptyRecycleBinW(hwnd, szRootPathW, dwFlags); - HeapFree(GetProcessHeap(), 0, szRootPathW); - - return hr; -} - -HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags) -{ - WCHAR szPath[MAX_PATH] = {0}, szBuffer[MAX_PATH]; - DWORD dwSize, dwType, count; - LONG ret; - IShellFolder *pDesktop, *pRecycleBin; - PIDLIST_ABSOLUTE pidlRecycleBin; - PITEMID_CHILD pidl; - HRESULT hr = S_OK; - LPENUMIDLIST penumFiles; - STRRET StrRet; - - TRACE("%p, %s, 0x%08x\n", hwnd, debugstr_w(pszRootPath), dwFlags); - - if (!(dwFlags & SHERB_NOCONFIRMATION)) - { - hr = SHGetDesktopFolder(&pDesktop); - if (FAILED(hr)) - return hr; - hr = SHGetFolderLocation(NULL, CSIDL_BITBUCKET, NULL, 0, &pidlRecycleBin); - if (FAILED(hr)) - { - pDesktop->Release(); - return hr; - } - hr = pDesktop->BindToObject(pidlRecycleBin, NULL, IID_PPV_ARG(IShellFolder, &pRecycleBin)); - CoTaskMemFree(pidlRecycleBin); - pDesktop->Release(); - if (FAILED(hr)) - return hr; - hr = pRecycleBin->EnumObjects(hwnd, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN, &penumFiles); - if (FAILED(hr)) - { - pRecycleBin->Release(); - return hr; - } - - count = 0; - if (hr != S_FALSE) - { - while (penumFiles->Next(1, &pidl, NULL) == S_OK) - { - count++; - pRecycleBin->GetDisplayNameOf(pidl, SHGDN_NORMAL, &StrRet); - StrRetToBuf(&StrRet, pidl, szBuffer, _countof(szBuffer)); - CoTaskMemFree(pidl); - } - penumFiles->Release(); - } - pRecycleBin->Release(); - - switch (count) - { - case 0: - /* no files, don't need confirmation */ - break; - - case 1: - /* we have only one item inside the bin, so show a message box with its name */ - if (ShellMessageBoxW(shell32_hInstance, hwnd, MAKEINTRESOURCEW(IDS_DELETEITEM_TEXT), MAKEINTRESOURCEW(IDS_EMPTY_BITBUCKET), - MB_ICONEXCLAMATION | MB_YESNO | MB_DEFBUTTON2, szBuffer) == IDNO) - { - return S_OK; - } - break; - - default: - /* we have more than one item, so show a message box with the count of the items */ - StringCbPrintfW(szBuffer, sizeof(szBuffer), L"%u", count); - if (ShellMessageBoxW(shell32_hInstance, hwnd, MAKEINTRESOURCEW(IDS_DELETEMULTIPLE_TEXT), MAKEINTRESOURCEW(IDS_EMPTY_BITBUCKET), - MB_ICONEXCLAMATION | MB_YESNO | MB_DEFBUTTON2, szBuffer) == IDNO) - { - return S_OK; - } - break; - } - } - - if (dwFlags & SHERB_NOPROGRESSUI) - { - ret = EmptyRecycleBinW(pszRootPath); - } - else - { - /* FIXME - * show a progress dialog - */ - ret = EmptyRecycleBinW(pszRootPath); - } - - if (!ret) - return HRESULT_FROM_WIN32(GetLastError()); - - if (!(dwFlags & SHERB_NOSOUND)) - { - dwSize = sizeof(szPath); - ret = RegGetValueW(HKEY_CURRENT_USER, - L"AppEvents\\Schemes\\Apps\\Explorer\\EmptyRecycleBin\\.Current", - NULL, - RRF_RT_REG_SZ, - &dwType, - (PVOID)szPath, - &dwSize); - if (ret != ERROR_SUCCESS) - return S_OK; - - if (dwType != REG_EXPAND_SZ) /* type dismatch */ - return S_OK; - - szPath[(sizeof(szPath)/sizeof(WCHAR))-1] = L'\0'; - PlaySoundW(szPath, NULL, SND_FILENAME); - } - return S_OK; -} - -HRESULT WINAPI SHQueryRecycleBinA(LPCSTR pszRootPath, LPSHQUERYRBINFO pSHQueryRBInfo) -{ - LPWSTR szRootPathW = NULL; - int len; - HRESULT hr; - - TRACE("%s, %p\n", debugstr_a(pszRootPath), pSHQueryRBInfo); - - if (pszRootPath) - { - len = MultiByteToWideChar(CP_ACP, 0, pszRootPath, -1, NULL, 0); - if (len == 0) - return HRESULT_FROM_WIN32(GetLastError()); - szRootPathW = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!szRootPathW) - return E_OUTOFMEMORY; - if (MultiByteToWideChar(CP_ACP, 0, pszRootPath, -1, szRootPathW, len) == 0) - { - HeapFree(GetProcessHeap(), 0, szRootPathW); - return HRESULT_FROM_WIN32(GetLastError()); - } - } - - hr = SHQueryRecycleBinW(szRootPathW, pSHQueryRBInfo); - HeapFree(GetProcessHeap(), 0, szRootPathW); - - return hr; -} - -HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR pszRootPath, LPSHQUERYRBINFO pSHQueryRBInfo) -{ - FIXME("%s, %p - stub\n", debugstr_w(pszRootPath), pSHQueryRBInfo); - - if (!(pszRootPath) || (pszRootPath[0] == 0) || - !(pSHQueryRBInfo) || (pSHQueryRBInfo->cbSize < sizeof(SHQUERYRBINFO))) - { - return E_INVALIDARG; - } - - pSHQueryRBInfo->i64Size = 0; - pSHQueryRBInfo->i64NumItems = 0; - - return S_OK; -} Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Wed Aug 19 18:10:30 2015 @@ -110,13 +110,6 @@ HANDLE hDeletedFile; BOOL bFound; } SEARCH_CONTEXT, *PSEARCH_CONTEXT; - -typedef struct -{ - DWORD dwNukeOnDelete; - DWORD dwSerial; - DWORD dwMaxCapacity; -} DRIVE_ITEM_CONTEXT, *PDRIVE_ITEM_CONTEXT; BOOL WINAPI CBSearchRecycleBin(IN PVOID Context, IN HANDLE hDeletedFile) { @@ -869,388 +862,6 @@ return S_OK; } -void toggleNukeOnDeleteOption(HWND hwndDlg, BOOL bEnable) -{ - if (bEnable) - { - SendDlgItemMessage(hwndDlg, 14001, BM_SETCHECK, BST_UNCHECKED, 0); - EnableWindow(GetDlgItem(hwndDlg, 14002), FALSE); - SendDlgItemMessage(hwndDlg, 14003, BM_SETCHECK, BST_CHECKED, 0); - } - else - { - SendDlgItemMessage(hwndDlg, 14001, BM_SETCHECK, BST_CHECKED, 0); - EnableWindow(GetDlgItem(hwndDlg, 14002), TRUE); - SendDlgItemMessage(hwndDlg, 14003, BM_SETCHECK, BST_UNCHECKED, 0); - } -} - - -static VOID -InitializeRecycleBinDlg(HWND hwndDlg, WCHAR DefaultDrive) -{ - WCHAR CurDrive = L'A'; - WCHAR szDrive[] = L"A:\\"; - DWORD dwDrives; - WCHAR szName[100]; - WCHAR szVolume[100]; - DWORD MaxComponent, Flags; - DWORD dwSerial; - LVCOLUMNW lc; - HWND hDlgCtrl; - LVITEMW li; - INT itemCount; - ULARGE_INTEGER TotalNumberOfFreeBytes, TotalNumberOfBytes, FreeBytesAvailable; - RECT rect; - int columnSize; - int defIndex = 0; - DWORD dwSize; - PDRIVE_ITEM_CONTEXT pItem = NULL, pDefault = NULL, pFirst = NULL; - - hDlgCtrl = GetDlgItem(hwndDlg, 14000); - - if (!LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_LOCATION, szVolume, sizeof(szVolume) / sizeof(WCHAR))) - szVolume[0] = 0; - - GetClientRect(hDlgCtrl, &rect); - - memset(&lc, 0, sizeof(LV_COLUMN) ); - lc.mask = LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM | LVCF_FMT; - - columnSize = 140; //FIXME - lc.iSubItem = 0; - lc.fmt = LVCFMT_FIXED_WIDTH; - lc.cx = columnSize; - lc.cchTextMax = wcslen(szVolume); - lc.pszText = szVolume; - (void)SendMessageW(hDlgCtrl, LVM_INSERTCOLUMNW, 0, (LPARAM)&lc); - - if (!LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_DISKSPACE, szVolume, sizeof(szVolume) / sizeof(WCHAR))) - szVolume[0] = 0; - - lc.iSubItem = 1; - lc.cx = rect.right - rect.left - columnSize; - lc.cchTextMax = wcslen(szVolume); - lc.pszText = szVolume; - (void)SendMessageW(hDlgCtrl, LVM_INSERTCOLUMNW, 1, (LPARAM)&lc); - - dwDrives = GetLogicalDrives(); - itemCount = 0; - do - { - if ((dwDrives & 0x1)) - { - UINT Type = GetDriveTypeW(szDrive); - if (Type == DRIVE_FIXED) //FIXME - { - if (!GetVolumeInformationW(szDrive, szName, sizeof(szName) / sizeof(WCHAR), &dwSerial, &MaxComponent, &Flags, NULL, 0)) - { - szName[0] = 0; - dwSerial = -1; - } - - swprintf(szVolume, L"%s (%c:)", szName, szDrive[0]); - memset(&li, 0x0, sizeof(LVITEMW)); - li.mask = LVIF_TEXT | LVIF_PARAM; - li.iSubItem = 0; - li.pszText = szVolume; - li.iItem = itemCount; - SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&li); - if (GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable , &TotalNumberOfBytes, &TotalNumberOfFreeBytes)) - { - if (StrFormatByteSizeW(TotalNumberOfFreeBytes.QuadPart, szVolume, sizeof(szVolume) / sizeof(WCHAR))) - { - - pItem = (DRIVE_ITEM_CONTEXT *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DRIVE_ITEM_CONTEXT)); - if (pItem) - { - swprintf(szName, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Bitbucket\\Volume\\%04X-%04X", LOWORD(dwSerial), HIWORD(dwSerial)); - dwSize = sizeof(DWORD); - RegGetValueW(HKEY_CURRENT_USER, szName, L"MaxCapacity", RRF_RT_DWORD, NULL, &pItem->dwMaxCapacity, &dwSize); - dwSize = sizeof(DWORD); - RegGetValueW(HKEY_CURRENT_USER, szName, L"NukeOnDelete", RRF_RT_DWORD, NULL, &pItem->dwNukeOnDelete, &dwSize); - pItem->dwSerial = dwSerial; - li.mask = LVIF_PARAM; - li.lParam = (LPARAM)pItem; - (void)SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); - if (CurDrive == DefaultDrive) - { - defIndex = itemCount; - pDefault = pItem; - } - } - if (!pFirst) - pFirst = pItem; - - li.mask = LVIF_TEXT; - li.iSubItem = 1; - li.pszText = szVolume; - li.iItem = itemCount; - (void)SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); - } - } - itemCount++; - } - } - CurDrive++; - szDrive[0] = CurDrive; - dwDrives = (dwDrives >> 1); - } while(dwDrives); - - if (!pDefault) - pDefault = pFirst; - if (pDefault) - { - toggleNukeOnDeleteOption(hwndDlg, pDefault->dwNukeOnDelete); - SetDlgItemInt(hwndDlg, 14002, pDefault->dwMaxCapacity, FALSE); - } - ZeroMemory(&li, sizeof(li)); - li.mask = LVIF_STATE; - li.stateMask = (UINT) - 1; - li.state = LVIS_FOCUSED | LVIS_SELECTED; - li.iItem = defIndex; - (void)SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); - -} - -static BOOL StoreDriveSettings(HWND hwndDlg) -{ - int iCount, iIndex; - HWND hDlgCtrl = GetDlgItem(hwndDlg, 14000); - LVITEMW li; - PDRIVE_ITEM_CONTEXT pItem; - HKEY hKey, hSubKey; - WCHAR szSerial[20]; - DWORD dwSize; - - - if (RegCreateKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Bitbucket\\Volume", 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) - return FALSE; - - iCount = ListView_GetItemCount(hDlgCtrl); - - ZeroMemory(&li, sizeof(li)); - li.mask = LVIF_PARAM; - - for(iIndex = 0; iIndex < iCount; iIndex++) - { - li.iItem = iIndex; - if (SendMessageW(hDlgCtrl, LVM_GETITEMW, 0, (LPARAM)&li)) - { - pItem = (PDRIVE_ITEM_CONTEXT)li.lParam; - swprintf(szSerial, L"%04X-%04X", LOWORD(pItem->dwSerial), HIWORD(pItem->dwSerial)); - if (RegCreateKeyExW(hKey, szSerial, 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) - { - dwSize = sizeof(DWORD); - RegSetValueExW(hSubKey, L"NukeOnDelete", 0, REG_DWORD, (LPBYTE)&pItem->dwNukeOnDelete, dwSize); - dwSize = sizeof(DWORD); - RegSetValueExW(hSubKey, L"MaxCapacity", 0, REG_DWORD, (LPBYTE)&pItem->dwMaxCapacity, dwSize); - RegCloseKey(hSubKey); - } - } - } - RegCloseKey(hKey); - return TRUE; - -} - -static VOID FreeDriveItemContext(HWND hwndDlg) -{ - int iCount, iIndex; - HWND hDlgCtrl = GetDlgItem(hwndDlg, 14000); - LVITEMW li; - - iCount = ListView_GetItemCount(hDlgCtrl); - - ZeroMemory(&li, sizeof(li)); - li.mask = LVIF_PARAM; - - for(iIndex = 0; iIndex < iCount; iIndex++) - { - li.iItem = iIndex; - if (SendMessageW(hDlgCtrl, LVM_GETITEMW, 0, (LPARAM)&li)) - { - HeapFree(GetProcessHeap(), 0, (LPVOID)li.lParam); - } - } -} - -static INT -GetDefaultItem(HWND hwndDlg, LVITEMW * li) -{ - HWND hDlgCtrl; - UINT iItemCount, iIndex; - - hDlgCtrl = GetDlgItem(hwndDlg, 14000); - if (!hDlgCtrl) - return -1; - - iItemCount = ListView_GetItemCount(hDlgCtrl); - if (!iItemCount) - return -1; - - ZeroMemory(li, sizeof(LVITEMW)); - li->mask = LVIF_PARAM | LVIF_STATE; - li->stateMask = (UINT) - 1; - for (iIndex = 0; iIndex < iItemCount; iIndex++) - { - li->iItem = iIndex; - if (SendMessageW(hDlgCtrl, LVM_GETITEMW, 0, (LPARAM)li)) - { - if (li->state & LVIS_SELECTED) - return iIndex; - } - } - return -1; - -} - -static INT_PTR CALLBACK -RecycleBinDlg( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - LPPSHNOTIFY lppsn; - LPNMLISTVIEW lppl; - LVITEMW li; - PDRIVE_ITEM_CONTEXT pItem; - BOOL bSuccess; - UINT uResult; - PROPSHEETPAGE * page; - DWORD dwStyle; - - switch(uMsg) - { - case WM_INITDIALOG: - page = (PROPSHEETPAGE*)lParam; - InitializeRecycleBinDlg(hwndDlg, (WCHAR)page->lParam); - dwStyle = (DWORD) SendDlgItemMessage(hwndDlg, 14000, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); - dwStyle = dwStyle | LVS_EX_FULLROWSELECT; - SendDlgItemMessage(hwndDlg, 14000, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); - if (GetDlgCtrlID((HWND)wParam) != 14000) - { - SetFocus(GetDlgItem(hwndDlg, 14000)); - return FALSE; - } - return TRUE; - case WM_COMMAND: - switch(LOWORD(wParam)) - { - case 14001: - toggleNukeOnDeleteOption(hwndDlg, FALSE); - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - case 14003: - toggleNukeOnDeleteOption(hwndDlg, TRUE); - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - case 14004: - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - } - break; - case WM_NOTIFY: - lppsn = (LPPSHNOTIFY) lParam; - lppl = (LPNMLISTVIEW) lParam; - if (lppsn->hdr.code == PSN_APPLY) - { - if (GetDefaultItem(hwndDlg, &li) > -1) - { - pItem = (PDRIVE_ITEM_CONTEXT)li.lParam; - if (pItem) - { - uResult = GetDlgItemInt(hwndDlg, 14002, &bSuccess, FALSE); - if (bSuccess) - pItem->dwMaxCapacity = uResult; - if (SendDlgItemMessageW(hwndDlg, 14003, BM_GETCHECK, 0, 0) == BST_CHECKED) - pItem->dwNukeOnDelete = TRUE; - else - pItem->dwNukeOnDelete = FALSE; - } - } - if (StoreDriveSettings(hwndDlg)) - { - SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR ); - return TRUE; - } - } - else if (lppl->hdr.code == LVN_ITEMCHANGING) - { - ZeroMemory(&li, sizeof(li)); - li.mask = LVIF_PARAM; - li.iItem = lppl->iItem; - if (!SendMessageW(lppl->hdr.hwndFrom, LVM_GETITEMW, 0, (LPARAM)&li)) - return TRUE; - - pItem = (PDRIVE_ITEM_CONTEXT)li.lParam; - if (!pItem) - return TRUE; - - if (!(lppl->uOldState & LVIS_FOCUSED) && (lppl->uNewState & LVIS_FOCUSED)) - { - /* new focused item */ - toggleNukeOnDeleteOption(lppl->hdr.hwndFrom, pItem->dwNukeOnDelete); - SetDlgItemInt(hwndDlg, 14002, pItem->dwMaxCapacity, FALSE); - } - else if ((lppl->uOldState & LVIS_FOCUSED) && !(lppl->uNewState & LVIS_FOCUSED)) - { - /* kill focus */ - uResult = GetDlgItemInt(hwndDlg, 14002, &bSuccess, FALSE); - if (bSuccess) - pItem->dwMaxCapacity = uResult; - if (SendDlgItemMessageW(hwndDlg, 14003, BM_GETCHECK, 0, 0) == BST_CHECKED) - pItem->dwNukeOnDelete = TRUE; - else - pItem->dwNukeOnDelete = FALSE; - } - return TRUE; - - } - break; - case WM_DESTROY: - FreeDriveItemContext(hwndDlg); - break; - } - 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.dwFlags = PSP_DEFAULT | PSH_PROPTITLE; - psh.pszCaption = MAKEINTRESOURCEW(IDS_RECYCLEBIN_FOLDER_NAME); - psh.hwndParent = NULL; - psh.phpage = hpsp; - psh.hInstance = shell32_hInstance; - - hprop = SH_CreatePropertySheetPage(IDD_RECYCLE_BIN_PROPERTIES, RecycleBinDlg, (LPARAM)sDrive, NULL); - if (!hprop) - { - ERR("Failed to create property sheet\n"); - return FALSE; - } - hpsp[psh.nPages] = hprop; - psh.nPages++; - - - ret = PropertySheetW(&psh); - if (ret < 0) - return FALSE; - else - return TRUE; -} - BOOL TRASH_CanTrashFile(LPCWSTR wszPath) {

1 0

[ekohl] 68774: [ADVAPI32] Add some well-known SDDL SID strings. This patch has aleady been sent upstream.
by ekohl＠svn.reactos.org 19 Aug '15

19 Aug '15

Author: ekohl Date: Wed Aug 19 18:04:40 2015 New Revision: 68774 URL: http://svn.reactos.org/svn/reactos?rev=68774&view=rev Log: [ADVAPI32] Add some well-known SDDL SID strings. This patch has aleady been sent upstream. Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Wed Aug 19 18:04:40 2015 @@ -108,16 +108,16 @@ { {'L','A'}, WinAccountAdministratorSid, DOMAIN_USER_RID_ADMIN }, { {'L','G'}, WinAccountGuestSid, DOMAIN_USER_RID_GUEST }, { {0,0}, WinAccountKrbtgtSid, DOMAIN_USER_RID_KRBTGT }, - { {0,0}, WinAccountDomainAdminsSid, DOMAIN_GROUP_RID_ADMINS }, - { {0,0}, WinAccountDomainUsersSid, DOMAIN_GROUP_RID_USERS }, - { {0,0}, WinAccountDomainGuestsSid, DOMAIN_GROUP_RID_GUESTS }, - { {0,0}, WinAccountComputersSid, DOMAIN_GROUP_RID_COMPUTERS }, - { {0,0}, WinAccountControllersSid, DOMAIN_GROUP_RID_CONTROLLERS }, - { {0,0}, WinAccountCertAdminsSid, DOMAIN_GROUP_RID_CERT_ADMINS }, - { {0,0}, WinAccountSchemaAdminsSid, DOMAIN_GROUP_RID_SCHEMA_ADMINS }, - { {0,0}, WinAccountEnterpriseAdminsSid, DOMAIN_GROUP_RID_ENTERPRISE_ADMINS }, - { {0,0}, WinAccountPolicyAdminsSid, DOMAIN_GROUP_RID_POLICY_ADMINS }, - { {0,0}, WinAccountRasAndIasServersSid, DOMAIN_ALIAS_RID_RAS_SERVERS }, + { {'D','A'}, WinAccountDomainAdminsSid, DOMAIN_GROUP_RID_ADMINS }, + { {'D','U'}, WinAccountDomainUsersSid, DOMAIN_GROUP_RID_USERS }, + { {'D','G'}, WinAccountDomainGuestsSid, DOMAIN_GROUP_RID_GUESTS }, + { {'D','C'}, WinAccountComputersSid, DOMAIN_GROUP_RID_COMPUTERS }, + { {'D','D'}, WinAccountControllersSid, DOMAIN_GROUP_RID_CONTROLLERS }, + { {'C','A'}, WinAccountCertAdminsSid, DOMAIN_GROUP_RID_CERT_ADMINS }, + { {'S','A'}, WinAccountSchemaAdminsSid, DOMAIN_GROUP_RID_SCHEMA_ADMINS }, + { {'E','A'}, WinAccountEnterpriseAdminsSid, DOMAIN_GROUP_RID_ENTERPRISE_ADMINS }, + { {'P','A'}, WinAccountPolicyAdminsSid, DOMAIN_GROUP_RID_POLICY_ADMINS }, + { {'R','S'}, WinAccountRasAndIasServersSid, DOMAIN_ALIAS_RID_RAS_SERVERS }, }; static const SID sidWorld = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } };

1 0

[gadamopoulos] 68773: [SHELL32] - Move a couple of headers in the dialogs directory.
by gadamopoulos＠svn.reactos.org 19 Aug '15

19 Aug '15

Author: gadamopoulos Date: Wed Aug 19 16:26:16 2015 New Revision: 68773 URL: http://svn.reactos.org/svn/reactos?rev=68773&view=rev Log: [SHELL32] - Move a couple of headers in the dialogs directory. Added: trunk/reactos/dll/win32/shell32/dialogs/drvdefext.h - copied unchanged from r68772, trunk/reactos/dll/win32/shell32/drvdefext.h trunk/reactos/dll/win32/shell32/dialogs/filedefext.h - copied unchanged from r68772, trunk/reactos/dll/win32/shell32/filedefext.h Removed: trunk/reactos/dll/win32/shell32/drvdefext.h trunk/reactos/dll/win32/shell32/filedefext.h Modified: trunk/reactos/dll/win32/shell32/precomp.h Removed: trunk/reactos/dll/win32/shell32/drvdefext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drvdefex… ============================================================================== --- trunk/reactos/dll/win32/shell32/drvdefext.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drvdefext.h (removed) @@ -1,75 +0,0 @@ -/* - * Provides default drive shell extension - * - * Copyright 2012 Rafal Harabien - * - * 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 - */ - -#ifndef _DRV_DEF_EXT_H_ -#define _DRV_DEF_EXT_H_ - -class CDrvDefExt : - public CComCoClass<CDrvDefExt, &CLSID_ShellDrvDefExt>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IShellExtInit, - public IContextMenu, - public IShellPropSheetExt, - public IObjectWithSite -{ -private: - VOID PaintStaticControls(HWND hwndDlg, LPDRAWITEMSTRUCT pDrawItem); - VOID InitGeneralPage(HWND hwndDlg); - static INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - static INT_PTR CALLBACK ExtraPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - static INT_PTR CALLBACK HardwarePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - - WCHAR m_wszDrive[MAX_PATH]; - UINT m_FreeSpacePerc; - -public: - CDrvDefExt(); - ~CDrvDefExt(); - - // IShellExtInit - virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pDataObj, HKEY hkeyProgID); - - // IContextMenu - virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); - virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici); - virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax); - - // IShellPropSheetExt - virtual HRESULT WINAPI AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam); - virtual HRESULT WINAPI ReplacePage(UINT uPageID, LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam); - - // IObjectWithSite - virtual HRESULT WINAPI SetSite(IUnknown *punk); - virtual HRESULT WINAPI GetSite(REFIID iid, void **ppvSite); - -DECLARE_REGISTRY_RESOURCEID(IDR_DRVDEFEXT) -DECLARE_NOT_AGGREGATABLE(CDrvDefExt) - -DECLARE_PROTECT_FINAL_CONSTRUCT() - -BEGIN_COM_MAP(CDrvDefExt) - COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) - COM_INTERFACE_ENTRY_IID(IID_IShellPropSheetExt, IShellPropSheetExt) - COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) -END_COM_MAP() -}; - -#endif /* _DRV_DEF_EXT_H_ */ Removed: trunk/reactos/dll/win32/shell32/filedefext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/filedefe… ============================================================================== --- trunk/reactos/dll/win32/shell32/filedefext.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/filedefext.h (removed) @@ -1,128 +0,0 @@ -/* - * Provides default file shell extension - * - * Copyright 2012 Rafal Harabien - * - * 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 - */ - -#ifndef _FILE_DEF_EXT_H_ -#define _FILE_DEF_EXT_H_ - -class CFileVersionInfo -{ - private: - PVOID m_pInfo; - WORD m_wLang, m_wCode; - WCHAR m_wszLang[64]; - - typedef struct _LANGANDCODEPAGE_ - { - WORD wLang; - WORD wCode; - } LANGANDCODEPAGE, *LPLANGANDCODEPAGE; - - public: - inline CFileVersionInfo(): - m_pInfo(NULL), m_wLang(0), m_wCode(0) - { - m_wszLang[0] = L'\0'; - } - - inline ~CFileVersionInfo() - { - if (m_pInfo) - HeapFree(GetProcessHeap(), 0, m_pInfo); - } - - BOOL Load(LPCWSTR pwszPath); - LPCWSTR GetString(LPCWSTR pwszName); - VS_FIXEDFILEINFO *GetFixedInfo(); - LPCWSTR GetLangName(); -}; - -class CFileDefExt : - public CComCoClass<CFileDefExt, &CLSID_ShellFileDefExt>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IShellExtInit, - public IContextMenu, - public IShellPropSheetExt, - public IObjectWithSite -{ -private: - VOID InitOpensWithField(HWND hwndDlg); - BOOL InitFileType(HWND hwndDlg); - BOOL InitFilePath(HWND hwndDlg); - static BOOL GetFileTimeString(LPFILETIME lpFileTime, LPWSTR pwszResult, UINT cchResult); - BOOL InitFileAttr(HWND hwndDlg); - BOOL InitGeneralPage(HWND hwndDlg); - BOOL SetVersionLabel(HWND hwndDlg, DWORD idCtrl, LPCWSTR pwszName); - BOOL AddVersionString(HWND hwndDlg, LPCWSTR pwszName); - BOOL InitVersionPage(HWND hwndDlg); - static INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - static INT_PTR CALLBACK VersionPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - BOOL CountFolderAndFiles(HWND hwndDlg, LPWSTR pwszBuf, UINT cchBufMax, LPDWORD ticks); - - WCHAR m_wszPath[MAX_PATH]; - CFileVersionInfo m_VerInfo; - BOOL m_bDir; - - DWORD m_cFiles; - DWORD m_cFolders; - ULARGE_INTEGER m_DirSize; - - static DWORD WINAPI _CountFolderAndFilesThreadProc(LPVOID lpParameter); - -public: - CFileDefExt(); - ~CFileDefExt(); - - // IShellExtInit - virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); - - // IContextMenu - virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); - virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici); - virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax); - - // IShellPropSheetExt - virtual HRESULT WINAPI AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam); - virtual HRESULT WINAPI ReplacePage(UINT uPageID, LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam); - - // IObjectWithSite - virtual HRESULT WINAPI SetSite(IUnknown *punk); - virtual HRESULT WINAPI GetSite(REFIID iid, void **ppvSite); - -DECLARE_REGISTRY_RESOURCEID(IDR_FILEDEFEXT) -DECLARE_NOT_AGGREGATABLE(CFileDefExt) - -DECLARE_PROTECT_FINAL_CONSTRUCT() - -BEGIN_COM_MAP(CFileDefExt) - COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) - COM_INTERFACE_ENTRY_IID(IID_IShellPropSheetExt, IShellPropSheetExt) - COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) -END_COM_MAP() -}; - -struct _CountFolderAndFilesData { - CFileDefExt *This; - HWND hwndDlg; - LPWSTR pwszBuf; - UINT cchBufMax; -}; - -#endif /* _FILE_DEF_EXT_H_ */ Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Wed Aug 19 16:26:16 2015 @@ -62,8 +62,8 @@ #include "droptargets/CexeDropHandler.h" #include "COpenWithMenu.h" #include "CNewMenu.h" -#include "filedefext.h" -#include "drvdefext.h" +#include "dialogs/filedefext.h" +#include "dialogs/drvdefext.h" #include "CQueryAssociations.h" #include "shellmenu/CBandSite.h" #include "shellmenu/CMenuBand.h"

1 0

[tfaber] 68772: [SHELL32][RSHELL] - Fix some extern "C"
by tfaber＠svn.reactos.org 19 Aug '15

19 Aug '15

Author: tfaber Date: Wed Aug 19 15:43:13 2015 New Revision: 68772 URL: http://svn.reactos.org/svn/reactos?rev=68772&view=rev Log: [SHELL32][RSHELL] - Fix some extern "C" Modified: trunk/reactos/base/shell/rshell/misc.cpp trunk/reactos/dll/win32/shell32/shelldesktop/shelldesktop.h trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h Modified: trunk/reactos/base/shell/rshell/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/misc.cpp… ============================================================================== --- trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] Wed Aug 19 15:43:13 2015 @@ -20,7 +20,6 @@ #include "shellmenu.h" -extern "C" HINSTANCE shell32_hInstance = NULL; DWORD WINAPI WinList_Init(void) Modified: trunk/reactos/dll/win32/shell32/shelldesktop/shelldesktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/shelldesktop.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/shelldesktop.h [iso-8859-1] Wed Aug 19 15:43:13 2015 @@ -33,4 +33,7 @@ #include <wine/debug.h> -extern "C" HINSTANCE shell32_hInstance; +extern "C" +{ +extern HINSTANCE shell32_hInstance; +} Modified: trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h [iso-8859-1] Wed Aug 19 15:43:13 2015 @@ -69,9 +69,15 @@ #pragma warning(pop) #endif -extern "C" HRESULT WINAPI CStartMenu_Constructor(REFIID riid, void **ppv); -extern "C" HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv); -extern "C" HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv); -extern "C" HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv); -extern "C" HRESULT WINAPI CBandSite_Constructor(REFIID riid, LPVOID *ppv); -extern "C" HRESULT WINAPI CMergedFolder_Constructor(REFIID riid, LPVOID *ppv); +extern "C" +{ +extern HINSTANCE shell32_hInstance; + +HRESULT WINAPI CStartMenu_Constructor(REFIID riid, void **ppv); +HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv); +HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv); +HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv); +HRESULT WINAPI CBandSite_Constructor(REFIID riid, LPVOID *ppv); +HRESULT WINAPI CMergedFolder_Constructor(REFIID riid, LPVOID *ppv); + +}

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