Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 16746: Implement ValidateRect.
by navaraf＠svn.reactos.com 26 Jul '05

26 Jul '05

Implement ValidateRect. Modified: trunk/reactos/lib/user32/windows/paint.c _____ Modified: trunk/reactos/lib/user32/windows/paint.c --- trunk/reactos/lib/user32/windows/paint.c 2005-07-26 15:15:18 UTC (rev 16745) +++ trunk/reactos/lib/user32/windows/paint.c 2005-07-26 15:21:41 UTC (rev 16746) @@ -227,7 +227,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -235,8 +235,7 @@ HWND hWnd, CONST RECT *lpRect) { - UNIMPLEMENTED; - return FALSE; + return RedrawWindow(hWnd, lpRect, 0, RDW_VALIDATE); }

1 0

[ion] 16745: - Allow file debug prints to happen at IRQL > DISPATCH_LEVEL, but don't queue a work item until we are at <= DISPATCH. Fixes /DEBUGPORT=FILE freeze/crash/bug.
by ion＠svn.reactos.com 26 Jul '05

26 Jul '05

- Allow file debug prints to happen at IRQL > DISPATCH_LEVEL, but don't queue a work item until we are at <= DISPATCH. Fixes /DEBUGPORT=FILE freeze/crash/bug. Modified: trunk/reactos/ntoskrnl/kd/kdio.c _____ Modified: trunk/reactos/ntoskrnl/kd/kdio.c --- trunk/reactos/ntoskrnl/kd/kdio.c 2005-07-26 14:00:45 UTC (rev 16744) +++ trunk/reactos/ntoskrnl/kd/kdio.c 2005-07-26 15:15:18 UTC (rev 16745) @@ -71,9 +71,17 @@ /* Make sure we are initialized and can queue */ if (!KdpLogInitialized || (ItemQueued)) return; - /* Queue the work item */ - ExQueueWorkItem(&KdpDebugLogQueue, HyperCriticalWorkQueue); - ItemQueued = TRUE; + /* + * Queue the work item + * Note that we don't want to queue if we are > DISPATCH_LEVEL... + * The message is in the buffer and will simply be taken care of at + * the next time we are at <= DISPATCH, so it won't be lost. + */ + if (KeGetCurrentIrql() <= DISPATCH_LEVEL) + { + ExQueueWorkItem(&KdpDebugLogQueue, HyperCriticalWorkQueue); + ItemQueued = TRUE; + } } VOID

1 0

[ion] 16744: - Various Microsoft DDK/PSDK compatibility fixes and some MSVC stuff too.
by ion＠svn.reactos.com 26 Jul '05

26 Jul '05

- Various Microsoft DDK/PSDK compatibility fixes and some MSVC stuff too. - Fix PSECURITY_DESCRIPTOR_RELATIVE names.c - Don't use rtltypes.h as a replacement for normal stdlib headers. - Fix a HAL header fixme. Modified: trunk/reactos/drivers/video/videoprt/videoprt.h Modified: trunk/reactos/hal/halx86/include/hal.h Modified: trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/ntndk.h Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/include/ndk/zwtypes.h Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/reactos/helper.h Modified: trunk/reactos/include/subsys/csrss/csrss.h Modified: trunk/reactos/include/wine/debug.h Modified: trunk/reactos/include/wine/unicode.h Modified: trunk/reactos/lib/advapi32/advapi32.h Modified: trunk/reactos/lib/advapi32/sec/sec.c Modified: trunk/reactos/lib/dnsapi/dnsapi/names.c Modified: trunk/reactos/lib/kernel32/debug/break.c Modified: trunk/reactos/lib/kernel32/file/cnotify.c Modified: trunk/reactos/lib/kernel32/file/curdir.c Modified: trunk/reactos/lib/kernel32/file/iocompl.c Modified: trunk/reactos/lib/kernel32/include/debug.h Modified: trunk/reactos/lib/kernel32/k32.h Modified: trunk/reactos/lib/kernel32/kernel32.rc Modified: trunk/reactos/lib/kernel32/misc/comm.c Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/lib/kernel32/misc/errormsg.c Modified: trunk/reactos/lib/kernel32/misc/lang.c Modified: trunk/reactos/lib/kernel32/misc/muldiv.c Modified: trunk/reactos/lib/kernel32/misc/nls.c Modified: trunk/reactos/lib/kernel32/misc/profile.c Modified: trunk/reactos/lib/kernel32/misc/utils.c Modified: trunk/reactos/lib/kernel32/misc/version.c Modified: trunk/reactos/lib/kernel32/tests/setup.c Modified: trunk/reactos/lib/kernel32/tests/tests/CreateFile.c Modified: trunk/reactos/lib/ntdll/inc/ntdll.h Modified: trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/lib/userenv/precomp.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/services/rpcss/rpcss.c Modified: trunk/reactos/subsys/csrss/csrss.h Modified: trunk/reactos/subsys/smss/smss.h Modified: trunk/reactos/subsys/system/autochk/autochk.c Modified: trunk/reactos/subsys/system/services/services.h Modified: trunk/reactos/w32api/include/ddk/ntifs.h Modified: trunk/reactos/w32api/include/ddk/winddk.h Modified: trunk/reactos/w32api/include/ntdef.h Modified: trunk/reactos/w32api/include/winbase.h Modified: trunk/reactos/w32api/include/windows.h Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/drivers/video/videoprt/videoprt.h --- trunk/reactos/drivers/video/videoprt/videoprt.h 2005-07-26 13:50:18 UTC (rev 16743) +++ trunk/reactos/drivers/video/videoprt/videoprt.h 2005-07-26 14:00:45 UTC (rev 16744) @@ -24,6 +24,7 @@ #ifndef VIDEOPRT_H #define VIDEOPRT_H +#include <stdio.h> #include <ddk/ntddk.h> #include <ddk/miniport.h> #include <ddk/video.h> _____ Modified: trunk/reactos/hal/halx86/include/hal.h --- trunk/reactos/hal/halx86/include/hal.h 2005-07-26 13:50:18 UTC (rev 16743) +++ trunk/reactos/hal/halx86/include/hal.h 2005-07-26 14:00:45 UTC (rev 16744) @@ -8,25 +8,20 @@ /* INCLUDES ******************************************************************/ +/* C Headers */ +#include <stdio.h> + /* IFS/DDK/NDK Headers */ #include <ddk/ntddk.h> #include <ddk/ntifs.h> #include <ndk/ntndk.h> /* Internal Kernel Headers */ -//#include <internal/mm.h> +#include <internal/mm.h> #include <internal/ke.h> #define KPCR_BASE 0xFF000000 // HACK! -//Temporary hack below until ntoskrnl is on NDK -PVOID STDCALL -MmAllocateContiguousAlignedMemory(IN ULONG NumberOfBytes, - IN PHYSICAL_ADDRESS LowestAcceptableAddress, - IN PHYSICAL_ADDRESS HighestAcceptableAddress, - IN PHYSICAL_ADDRESS BoundaryAddressMultiple OPTIONAL, - IN MEMORY_CACHING_TYPE CacheType OPTIONAL, - IN ULONG Alignment); /* Internal HAL Headers */ #include "apic.h" #include "bus.h" _____ Modified: trunk/reactos/include/ndk/mmtypes.h --- trunk/reactos/include/ndk/mmtypes.h 2005-07-26 13:50:18 UTC (rev 16743) +++ trunk/reactos/include/ndk/mmtypes.h 2005-07-26 14:00:45 UTC (rev 16744) @@ -33,17 +33,15 @@ /* TYPES *********************************************************************/ /* FIXME: Forced to do this for now, because of EPROCESS, will go away before 0.3.0 */ -#ifndef __NTOSKRNL__ typedef struct _MADDRESS_SPACE { - PVOID MemoryAreaRoot; + struct _MEMORY_AREA *MemoryAreaRoot; FAST_MUTEX Lock; PVOID LowestAddress; struct _EPROCESS* Process; PUSHORT PageTableRefCountTable; ULONG PageTableRefCountTableSize; } MADDRESS_SPACE, *PMADDRESS_SPACE; -#endif typedef struct _PP_LOOKASIDE_LIST { _____ Modified: trunk/reactos/include/ndk/ntndk.h --- trunk/reactos/include/ndk/ntndk.h 2005-07-26 13:50:18 UTC (rev 16743) +++ trunk/reactos/include/ndk/ntndk.h 2005-07-26 14:00:45 UTC (rev 16744) @@ -9,8 +9,12 @@ #ifndef _NTNDK_ #define _NTNDK_ +/* C Standard Headers */ +#include <stdarg.h> +#include <excpt.h> + +/* Kernel-Mode NDK */ #ifndef NTOS_MODE_USER - /* Kernel-Mode NDK */ #include "kdtypes.h" /* Kernel Debugger Types */ #include "kdfuncs.h" /* Kernel Debugger Functions */ #include "cctypes.h" /* Cache Manager Types */ _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-07-26 13:50:18 UTC (rev 16743) +++ trunk/reactos/include/ndk/pstypes.h 2005-07-26 14:00:45 UTC (rev 16744) @@ -22,13 +22,13 @@ /* CONSTANTS *****************************************************************/ /* These are not exposed to drivers normally */ -#ifndef _NTOS_MODE_USER - #define JOB_OBJECT_ASSIGN_PROCESS (1) - #define JOB_OBJECT_SET_ATTRIBUTES (2) - #define JOB_OBJECT_QUERY (4) - #define JOB_OBJECT_TERMINATE (8) - #define JOB_OBJECT_SET_SECURITY_ATTRIBUTES (16) - #define JOB_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|31) +#ifndef NTOS_MODE_USER + #define JOB_OBJECT_ASSIGN_PROCESS 1 + #define JOB_OBJECT_SET_ATTRIBUTES 2 + #define JOB_OBJECT_QUERY 4 + #define JOB_OBJECT_TERMINATE 8 + #define JOB_OBJECT_SET_SECURITY_ATTRIBUTES 16 + #define JOB_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|31) #endif #define THREAD_ALERT 0x4 @@ -36,12 +36,12 @@ #define USER_SHARED_DATA (0x7FFE0000) /* Process priority classes */ -#define PROCESS_PRIORITY_CLASS_HIGH (4) /* FIXME */ -#define PROCESS_PRIORITY_CLASS_IDLE (0) /* FIXME */ -#define PROCESS_PRIORITY_CLASS_NORMAL (2) /* FIXME */ -#define PROCESS_PRIORITY_CLASS_REALTIME (5) /* FIXME */ -#define PROCESS_PRIORITY_CLASS_BELOW_NORMAL (1) /* FIXME */ -#define PROCESS_PRIORITY_CLASS_ABOVE_NORMAL (3) /* FIXME */ +#define PROCESS_PRIORITY_CLASS_IDLE 0 +#define PROCESS_PRIORITY_CLASS_BELOW_NORMAL 1 +#define PROCESS_PRIORITY_CLASS_NORMAL 2 +#define PROCESS_PRIORITY_CLASS_ABOVE_NORMAL 3 +#define PROCESS_PRIORITY_CLASS_HIGH 4 +#define PROCESS_PRIORITY_CLASS_REALTIME 5 /* Global Flags */ #define FLG_STOP_ON_EXCEPTION 0x00000001 @@ -75,16 +75,16 @@ /* ENUMERATIONS **************************************************************/ /* FUNCTION TYPES ************************************************************/ -typedef VOID (STDCALL *PPEBLOCKROUTINE)(PVOID); +typedef VOID (NTAPI *PPEBLOCKROUTINE)(PVOID); typedef NTSTATUS -(STDCALL *PW32_PROCESS_CALLBACK)( +(NTAPI *PW32_PROCESS_CALLBACK)( struct _EPROCESS *Process, BOOLEAN Create ); typedef NTSTATUS -(STDCALL *PW32_THREAD_CALLBACK)( +(NTAPI *PW32_THREAD_CALLBACK)( struct _ETHREAD *Thread, BOOLEAN Create ); _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-07-26 13:50:18 UTC (rev 16743) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-07-26 14:00:45 UTC (rev 16744) @@ -12,7 +12,7 @@ /* DEPENDENCIES **************************************************************/ #include "rtltypes.h" #include "pstypes.h" -#include <ddk/ntnls.h> +#include <ntnls.h> /* PROTOTYPES ****************************************************************/ @@ -156,7 +156,7 @@ STDCALL RtlAbsoluteToSelfRelativeSD( IN PSECURITY_DESCRIPTOR AbsoluteSecurityDescriptor, - IN OUT PSECURITY_DESCRIPTOR_RELATIVE SelfRelativeSecurityDescriptor, + IN OUT PISECURITY_DESCRIPTOR_RELATIVE SelfRelativeSecurityDescriptor, IN PULONG BufferLength ); @@ -322,7 +322,7 @@ NTSTATUS STDCALL RtlCreateSecurityDescriptorRelative( - PSECURITY_DESCRIPTOR_RELATIVE SecurityDescriptor, + PISECURITY_DESCRIPTOR_RELATIVE SecurityDescriptor, ULONG Revision ); @@ -460,7 +460,7 @@ NTSTATUS STDCALL RtlSelfRelativeToAbsoluteSD( - IN PSECURITY_DESCRIPTOR_RELATIVE SelfRelativeSD, + IN PISECURITY_DESCRIPTOR_RELATIVE SelfRelativeSD, OUT PSECURITY_DESCRIPTOR AbsoluteSD, IN PULONG AbsoluteSDSize, IN PACL Dacl, @@ -547,7 +547,7 @@ BOOLEAN STDCALL RtlValidRelativeSecurityDescriptor( - IN PSECURITY_DESCRIPTOR_RELATIVE SecurityDescriptorInput, + IN PISECURITY_DESCRIPTOR_RELATIVE SecurityDescriptorInput, IN ULONG SecurityDescriptorLength, IN SECURITY_INFORMATION RequiredInformation ); @@ -1016,14 +1016,6 @@ /* * Memory Functions */ -SIZE_T -STDCALL -RtlCompareMemory( - IN const VOID *Source1, - IN const VOID *Source2, - IN SIZE_T Length -); - VOID STDCALL RtlFillMemoryUlong( @@ -1727,75 +1719,4 @@ STDCALL RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation); -/* - * C Runtime Library Functions - */ -char *_itoa (int value, char *string, int radix); -wchar_t *_itow (int value, wchar_t *string, int radix); -int _snprintf(char * buf, size_t cnt, const char *fmt, ...); -int _snwprintf(wchar_t *buf, size_t cnt, const wchar_t *fmt, ...); -int _stricmp(const char *s1, const char *s2); -char * _strlwr(char *x); -int _strnicmp(const char *s1, const char *s2, size_t n); -char * _strnset(char* szToFill, int szFill, size_t sizeMaxFill); -char * _strrev(char *s); -char * _strset(char* szToFill, int szFill); -char * _strupr(char *x); -int _vsnprintf(char *buf, size_t cnt, const char *fmt, va_list args); -int _wcsicmp (const wchar_t* cs, const wchar_t* ct); -wchar_t * _wcslwr (wchar_t *x); -int _wcsnicmp (const wchar_t * cs,const wchar_t * ct,size_t count); -wchar_t* _wcsnset (wchar_t* wsToFill, wchar_t wcFill, size_t sizeMaxFill); -wchar_t * _wcsrev(wchar_t *s); -wchar_t *_wcsupr(wchar_t *x); -int atoi(const char *str); -long atol(const char *str); -int isdigit(int c); -int isalpha(int c); -int islower(int c); -int isprint(int c); -int isspace(int c); -int isupper(int c); -int isxdigit(int c); -size_t mbstowcs (wchar_t *wcstr, const char *mbstr, size_t count); -int mbtowc (wchar_t *wchar, const char *mbchar, size_t count); -void * memchr(const void *s, int c, size_t n); -void * memcpy(void *to, const void *from, size_t count); -void * memmove(void *dest,const void *src, size_t count); -void * memset(void *src, int val, size_t count); -int rand(void); -int sprintf(char * buf, const char *fmt, ...); -void srand(unsigned seed); -char * strcat(char *s, const char *append); -char * strchr(const char *s, int c); -int strcmp(const char *s1, const char *s2); -char * strcpy(char *to, const char *from); -size_t strlen(const char *str); -char * strncat(char *dst, const char *src, size_t n); -int strncmp(const char *s1, const char *s2, size_t n); -char *strncpy(char *dst, const char *src, size_t n); -char *strrchr(const char *s, int c); -size_t strspn(const char *s1, const char *s2); -char *strstr(const char *s, const char *find); -int swprintf(wchar_t *buf, const wchar_t *fmt, ...); -int tolower(int c); -int toupper(int c); -wchar_t towlower(wchar_t c); -wchar_t towupper(wchar_t c); -int vsprintf(char *buf, const char *fmt, va_list args); -wchar_t * wcscat(wchar_t *dest, const wchar_t *src); -wchar_t * wcschr(const wchar_t *str, wchar_t ch); -int wcscmp(const wchar_t *cs, const wchar_t *ct); -wchar_t* wcscpy(wchar_t* str1, const wchar_t* str2); -size_t wcscspn(const wchar_t *str,const wchar_t *reject); -size_t wcslen(const wchar_t *s); -wchar_t * wcsncat(wchar_t *dest, const wchar_t *src, size_t count); -int wcsncmp(const wchar_t *cs, const wchar_t *ct, size_t count); -wchar_t * wcsncpy(wchar_t *dest, const wchar_t *src, size_t count); -wchar_t * wcsrchr(const wchar_t *str, wchar_t ch); -size_t wcsspn(const wchar_t *str,const wchar_t *accept); -wchar_t *wcsstr(const wchar_t *s,const wchar_t *b); -size_t wcstombs (char *mbstr, const wchar_t *wcstr, size_t count); -int wctomb (char *mbchar, wchar_t wchar); - #endif _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-07-26 13:50:18 UTC (rev 16743) +++ trunk/reactos/include/ndk/rtltypes.h 2005-07-26 14:00:45 UTC (rev 16744) @@ -11,6 +11,7 @@ /* DEPENDENCIES **************************************************************/ #include "zwtypes.h" +#include "excpt.h" /* EXPORTED DATA *************************************************************/ @@ -69,14 +70,6 @@ typedef enum { - ExceptionContinueExecution, - ExceptionContinueSearch, - ExceptionNestedException, - ExceptionCollidedUnwind -} EXCEPTION_DISPOSITION; - -typedef enum -{ INVALID_PATH = 0, UNC_PATH, /* "//foo" */ ABSOLUTE_DRIVE_PATH, /* "c:/foo" */ @@ -102,16 +95,16 @@ PVOID ); -typedef LONG (STDCALL *PVECTORED_EXCEPTION_HANDLER)( +typedef LONG (NTAPI *PVECTORED_EXCEPTION_HANDLER)( PEXCEPTION_POINTERS ExceptionPointers ); -typedef DWORD (STDCALL *PTHREAD_START_ROUTINE)( +typedef DWORD (NTAPI *PTHREAD_START_ROUTINE)( LPVOID Parameter ); typedef VOID -(STDCALL *PRTL_BASE_PROCESS_START_ROUTINE)( +(NTAPI *PRTL_BASE_PROCESS_START_ROUTINE)( PTHREAD_START_ROUTINE StartAddress, PVOID Parameter ); @@ -234,11 +227,13 @@ } RTL_HEAP_DEFINITION, *PRTL_HEAP_DEFINITION; /* END REVIEW AREA */ +#ifdef _INC_EXCPT typedef struct _EXCEPTION_REGISTRATION { struct _EXCEPTION_REGISTRATION* prev; PEXCEPTION_HANDLER handler; } EXCEPTION_REGISTRATION, *PEXCEPTION_REGISTRATION; +#endif typedef EXCEPTION_REGISTRATION EXCEPTION_REGISTRATION_RECORD; typedef PEXCEPTION_REGISTRATION PEXCEPTION_REGISTRATION_RECORD; @@ -276,7 +271,7 @@ } RTL_RANGE, *PRTL_RANGE; typedef BOOLEAN -(STDCALL *PRTL_CONFLICT_RANGE_CALLBACK) ( +(NTAPI *PRTL_CONFLICT_RANGE_CALLBACK) ( PVOID Context, PRTL_RANGE Range ); @@ -357,7 +352,7 @@ ULONG CountY; ULONG CountCharsX; ULONG CountCharsY; - ULONG FillAttribute;; + ULONG FillAttribute; ULONG WindowFlags; ULONG ShowWindowFlags; UNICODE_STRING WindowTitle; @@ -405,7 +400,7 @@ } RTL_ATOM_TABLE, *PRTL_ATOM_TABLE; /* Let Kernel Drivers use this */ -#ifndef _WINBASE_H +#ifndef _WINBASE_ typedef struct _SYSTEMTIME { WORD wYear; _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-07-26 13:50:18 UTC (rev 16743) +++ trunk/reactos/include/ndk/umtypes.h 2005-07-26 14:00:45 UTC (rev 16744) @@ -1,1394 +1,1427 @@ -/* - * PROJECT: ReactOS Native Headers - * FILE: include/ndk/umtypes.h - * PURPOSE: Definitions needed for Native Headers if target is not Kernel-Mode. - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - * UPDATE HISTORY: - * Created 06/10/04 - */ - -#ifndef _UMTYPES_H -#define _UMTYPES_H - -/* DEPENDENCIES **************************************************************/ -#include <winioctl.h> -#include <ntstatus.h> -#include <ddk/ntnls.h> -#define STATIC static - -/* EXPORTED DATA *************************************************************/ - -/* CONSTANTS *****************************************************************/ - -/* NTAPI/NTOSAPI Define */ -#define NTAPI __stdcall -#define NTOSAPI - -/* Definitions for Object Creation -- winternl.h */ -#define OBJ_INHERIT 2L -#define OBJ_PERMANENT 16L -#define OBJ_EXCLUSIVE 32L -#define OBJ_CASE_INSENSITIVE 64L -#define OBJ_OPENIF 128L -#define OBJ_OPENLINK 256L -#define OBJ_VALID_ATTRIBUTES 498L -#define InitializeObjectAttributes(p,n,a,r,s) { \ - (p)->Length = sizeof(OBJECT_ATTRIBUTES); \ - (p)->RootDirectory = (r); \ - (p)->Attributes = (a); \ - (p)->ObjectName = (n); \ - (p)->SecurityDescriptor = (s); \ - (p)->SecurityQualityOfService = NULL; \ -} - -/* Native API Return Value Macros */ -#define NT_SUCCESS(x) ((x)>=0) -#define NT_WARNING(x) ((ULONG)(x)>>30==2) -#define NT_ERROR(x) ((ULONG)(x)>>30==3) - -/* Object Access Rights FIXME: Some are in w32api's psdk..,is that normal ?*/ -#define DIRECTORY_QUERY (0x0001) -#define DIRECTORY_TRAVERSE (0x0002) -#define DIRECTORY_CREATE_OBJECT (0x0004) -#define DIRECTORY_CREATE_SUBDIRECTORY (0x0008) -#define DIRECTORY_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0xF) -#define EVENT_QUERY_STATE (0x0001) -#define SEMAPHORE_QUERY_STATE (0x0001) -#define SYMBOLIC_LINK_QUERY 0x0001 -#define SYMBOLIC_LINK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x1) - -/* I/O Control Codes for communicating with Mailslots */ -#define FSCTL_MAILSLOT_PEEK \ - CTL_CODE(FILE_DEVICE_MAILSLOT, 0, METHOD_NEITHER, FILE_READ_DATA) - -/* I/O Control Codes for communicating with Pipes */ -#define FSCTL_PIPE_ASSIGN_EVENT \ - CTL_CODE(FILE_DEVICE_NAMED_PIPE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define FSCTL_PIPE_DISCONNECT \ - CTL_CODE(FILE_DEVICE_NAMED_PIPE, 1, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define FSCTL_PIPE_LISTEN \ - CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define FSCTL_PIPE_PEEK \ - CTL_CODE(FILE_DEVICE_NAMED_PIPE, 3, METHOD_BUFFERED, FILE_READ_DATA) - -#define FSCTL_PIPE_QUERY_EVENT \ - CTL_CODE(FILE_DEVICE_NAMED_PIPE, 4, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define FSCTL_PIPE_TRANSCEIVE \ - CTL_CODE(FILE_DEVICE_NAMED_PIPE, 5, METHOD_NEITHER, FILE_READ_DATA | FILE_WRITE_DATA) - -#define FSCTL_PIPE_WAIT \ - CTL_CODE(FILE_DEVICE_NAMED_PIPE, 6, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define FSCTL_PIPE_IMPERSONATE \ - CTL_CODE(FILE_DEVICE_NAMED_PIPE, 7, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define FSCTL_PIPE_SET_CLIENT_PROCESS \ - CTL_CODE(FILE_DEVICE_NAMED_PIPE, 8, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define FSCTL_PIPE_QUERY_CLIENT_PROCESS \ - CTL_CODE(FILE_DEVICE_NAMED_PIPE, 9, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define FSCTL_PIPE_INTERNAL_READ \ - CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2045, METHOD_BUFFERED, FILE_READ_DATA) - -#define FSCTL_PIPE_INTERNAL_WRITE \ - CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2046, METHOD_BUFFERED, FILE_WRITE_DATA) - -#define FSCTL_PIPE_INTERNAL_TRANSCEIVE \ - CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2047, METHOD_NEITHER, FILE_READ_DATA | FILE_WRITE_DATA) - -#define FSCTL_PIPE_INTERNAL_READ_OVFLOW \ - CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2048, METHOD_BUFFERED, FILE_READ_DATA) - -/* Macros for current Process/Thread built-in 'special' ID */ -#define NtCurrentProcess() ( (HANDLE)(LONG_PTR) -1 ) -#define ZwCurrentProcess() NtCurrentProcess() -#define NtCurrentThread() ( (HANDLE)(LONG_PTR) -2 ) -#define ZwCurrentThread() NtCurrentThread() - -/* Kernel Shared Data Constants */ -#define PROCESSOR_FEATURE_MAX 64 -#define SharedUserData ((KUSER_SHARED_DATA * CONST) USER_SHARED_DATA) - -/* Paging Values on x86 */ -#define PAGE_SIZE 0x1000 -#define PAGE_SHIFT 12L - -/* Run-Time Library (RTL) Registry Constants */ -#define RTL_REGISTRY_ABSOLUTE 0 -#define RTL_REGISTRY_SERVICES 1 -#define RTL_REGISTRY_CONTROL 2 -#define RTL_REGISTRY_WINDOWS_NT 3 -#define RTL_REGISTRY_DEVICEMAP 4 -#define RTL_REGISTRY_USER 5 -#define RTL_REGISTRY_MAXIMUM 6 -#define RTL_REGISTRY_HANDLE 0x40000000 -#define RTL_REGISTRY_OPTIONAL 0x80000000 -#define RTL_QUERY_REGISTRY_SUBKEY 0x00000001 -#define RTL_QUERY_REGISTRY_TOPKEY 0x00000002 -#define RTL_QUERY_REGISTRY_REQUIRED 0x00000004 -#define RTL_QUERY_REGISTRY_NOVALUE 0x00000008 -#define RTL_QUERY_REGISTRY_NOEXPAND 0x00000010 -#define RTL_QUERY_REGISTRY_DIRECT 0x00000020 -#define RTL_QUERY_REGISTRY_DELETE 0x00000040 - -/* File Result Flags */ -#define FILE_SUPERSEDED 0x00000000 -#define FILE_OPENED 0x00000001 -#define FILE_CREATED 0x00000002 -#define FILE_OVERWRITTEN 0x00000003 -#define FILE_EXISTS 0x00000004 -#define FILE_DOES_NOT_EXIST 0x00000005 - -/* Pipe Flags */ -#define FILE_PIPE_BYTE_STREAM_MODE 0x00000000 -#define FILE_PIPE_MESSAGE_MODE 0x00000001 -#define FILE_PIPE_QUEUE_OPERATION 0x00000000 -#define FILE_PIPE_COMPLETE_OPERATION 0x00000001 -#define FILE_PIPE_INBOUND 0x00000000 -#define FILE_PIPE_OUTBOUND 0x00000001 -#define FILE_PIPE_FULL_DUPLEX 0x00000002 -#define FILE_PIPE_CLIENT_END 0x00000000 -#define FILE_PIPE_SERVER_END 0x00000001 - -/* Device Charactertics */ -#define FILE_REMOVABLE_MEDIA 0x00000001 -#define FILE_REMOTE_DEVICE 0x00000010 - -/* SID Constants */ -#define SID_MAX_SUB_AUTHORITIES 15 - -/* Version Constants */ -#define VER_MINORVERSION 0x0000001 -#define VER_MAJORVERSION 0x0000002 -#define VER_BUILDNUMBER 0x0000004 -#define VER_PLATFORMID 0x0000008 -#define VER_SERVICEPACKMINOR 0x0000010 -#define VER_SERVICEPACKMAJOR 0x0000020 -#define VER_SUITENAME 0x0000040 -#define VER_PRODUCT_TYPE 0x0000080 -#define VER_PLATFORM_WIN32s 0 -#define VER_PLATFORM_WIN32_WINDOWS 1 -#define VER_PLATFORM_WIN32_NT 2 -#define VER_EQUAL 1 -#define VER_GREATER 2 -#define VER_GREATER_EQUAL 3 -#define VER_LESS 4 -#define VER_LESS_EQUAL 5 -#define VER_AND 6 -#define VER_OR 7 -#define VER_CONDITION_MASK 7 -#define VER_NUM_BITS_PER_CONDITION_MASK 3 - -/* RTL String Hash Algorithms */ -#define HASH_STRING_ALGORITHM_DEFAULT 0 -#define HASH_STRING_ALGORITHM_X65599 1 -#define HASH_STRING_ALGORITHM_INVALID 0xffffffff - -/* List Macros */ -static __inline -VOID -InitializeListHead( - IN PLIST_ENTRY ListHead) -{ - ListHead->Flink = ListHead->Blink = ListHead; -} - -static __inline -VOID -InsertHeadList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY Entry) -{ - PLIST_ENTRY OldFlink; - OldFlink = ListHead->Flink; - Entry->Flink = OldFlink; - Entry->Blink = ListHead; - OldFlink->Blink = Entry; - ListHead->Flink = Entry; -} - -static __inline -VOID -InsertTailList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY Entry) -{ - PLIST_ENTRY OldBlink; - OldBlink = ListHead->Blink; - Entry->Flink = ListHead; - Entry->Blink = OldBlink; - OldBlink->Flink = Entry; - ListHead->Blink = Entry; -} - -#define IsListEmpty(ListHead) \ - ((ListHead)->Flink == (ListHead)) - -#define PopEntryList(ListHead) \ - (ListHead)->Next; \ - { \ - PSINGLE_LIST_ENTRY _FirstEntry; \ - _FirstEntry = (ListHead)->Next; \ - if (_FirstEntry != NULL) \ - (ListHead)->Next = _FirstEntry->Next; \ - } - -#define PushEntryList(_ListHead, _Entry) \ - (_Entry)->Next = (_ListHead)->Next; \ - (_ListHead)->Next = (_Entry); \ - -static __inline -BOOLEAN -RemoveEntryList( - IN PLIST_ENTRY Entry) -{ - PLIST_ENTRY OldFlink; - PLIST_ENTRY OldBlink; - - OldFlink = Entry->Flink; - OldBlink = Entry->Blink; - OldFlink->Blink = OldBlink; - OldBlink->Flink = OldFlink; - return (OldFlink == OldBlink); -} - -static __inline -PLIST_ENTRY -RemoveHeadList( - IN PLIST_ENTRY ListHead) -{ - PLIST_ENTRY Flink; - PLIST_ENTRY Entry; - - Entry = ListHead->Flink; - Flink = Entry->Flink; - ListHead->Flink = Flink; - Flink->Blink = ListHead; - return Entry; -} - -static __inline -PLIST_ENTRY -RemoveTailList( - IN PLIST_ENTRY ListHead) -{ - PLIST_ENTRY Blink; - PLIST_ENTRY Entry; - - Entry = ListHead->Blink; - Blink = Entry->Blink; - ListHead->Blink = Blink; - Blink->Flink = ListHead; - return Entry; -} - -#define IsFirstEntry(ListHead, Entry) \ - ((ListHead)->Flink == Entry) - -#define IsLastEntry(ListHead, Entry) \ - ((ListHead)->Blink == Entry) - -/* - * Constant String Macro - */ -#define RTL_CONSTANT_STRING(__SOURCE_STRING__) \ -{ \ - sizeof(__SOURCE_STRING__) - sizeof((__SOURCE_STRING__)[0]), \ - sizeof(__SOURCE_STRING__), \ - (__SOURCE_STRING__) \ -} - -/* ENUMERATIONS **************************************************************/ - -/* Kernel Shared Data Values */ -typedef enum _NT_PRODUCT_TYPE -{ - NtProductWinNt = 1, - NtProductLanManNt, - NtProductServer -} NT_PRODUCT_TYPE, *PNT_PRODUCT_TYPE; - -typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE -{ - StandardDesign, - NEC98x86, - EndAlternatives -} ALTERNATIVE_ARCHITECTURE_TYPE; - -/* Run-Time Library (RTL) Enumerations */ -typedef enum _TABLE_SEARCH_RESULT -{ - TableEmptyTree, - TableFoundNode, - TableInsertAsLeft, - TableInsertAsRight -} TABLE_SEARCH_RESULT; - -typedef enum _RTL_GENERIC_COMPARE_RESULTS -{ - GenericLessThan, - GenericGreaterThan, - GenericEqual -} RTL_GENERIC_COMPARE_RESULTS; - -/* Kernel or Native Enumerations used by Native API */ -typedef enum _SECTION_INHERIT -{ - ViewShare = 1, - ViewUnmap = 2 -} SECTION_INHERIT; - -typedef enum _POOL_TYPE -{ - NonPagedPool, - PagedPool, - NonPagedPoolMustSucceed, - DontUseThisType, - NonPagedPoolCacheAligned, - PagedPoolCacheAligned, - NonPagedPoolCacheAlignedMustS, - MaxPoolType, - NonPagedPoolSession = 32, - PagedPoolSession, - NonPagedPoolMustSucceedSession, - DontUseThisTypeSession, - NonPagedPoolCacheAlignedSession, - PagedPoolCacheAlignedSession, - NonPagedPoolCacheAlignedMustSSession -} POOL_TYPE; - -typedef enum _EVENT_TYPE -{ - NotificationEvent, - SynchronizationEvent -} EVENT_TYPE; - -typedef enum _TIMER_TYPE -{ - NotificationTimer, - SynchronizationTimer -} TIMER_TYPE; - -typedef enum _WAIT_TYPE -{ - WaitAll, - WaitAny -} WAIT_TYPE; - -typedef enum _INTERFACE_TYPE -{ - InterfaceTypeUndefined = -1, - Internal, - Isa, - Eisa, - MicroChannel, - TurboChannel, - PCIBus, - VMEBus, - NuBus, - PCMCIABus, - CBus, - MPIBus, - MPSABus, - ProcessorInternal, - InternalPowerBus, - PNPISABus, - PNPBus, - MaximumInterfaceType -}INTERFACE_TYPE, *PINTERFACE_TYPE; - -typedef enum _MODE -{ - KernelMode, - UserMode, - MaximumMode -} MODE; - -typedef enum _KWAIT_REASON -{ - Executive, - FreePage, - PageIn, - PoolAllocation, - DelayExecution, - Suspended, - UserRequest, - WrExecutive, - WrFreePage, - WrPageIn, - WrPoolAllocation, - WrDelayExecution, - WrSuspended, - WrUserRequest, - WrEventPair, - WrQueue, - WrLpcReceive, - WrLpcReply, - WrVirtualMemory, - WrPageOut, - WrRendezvous, - Spare2, - WrGuardedMutex, - Spare4, - Spare5, - Spare6, - WrKernel, - WrResource, - WrPushLock, - WrMutex, - WrQuantumEnd, - WrDispatchInt, - WrPreempted, - WrYieldExecution, - MaximumWaitReason -} KWAIT_REASON; - -typedef enum _KPROFILE_SOURCE -{ - ProfileTime, - ProfileAlignmentFixup, - ProfileTotalIssues, - ProfilePipelineDry, - ProfileLoadInstructions, - ProfilePipelineFrozen, - ProfileBranchInstructions, - ProfileTotalNonissues, - ProfileDcacheMisses, - ProfileIcacheMisses, - ProfileCacheMisses, - ProfileBranchMispredictions, - ProfileStoreInstructions, - ProfileFpInstructions, - ProfileIntegerInstructions, - Profile2Issue, - Profile3Issue, - Profile4Issue, - ProfileSpecialInstructions, - ProfileTotalCycles, - ProfileIcacheIssues, - ProfileDcacheAccesses, - ProfileMemoryBarrierCycles, - ProfileLoadLinkedIssues, - ProfileMaximum -} KPROFILE_SOURCE; - -/**** Information Classes ****/ - -/* - * File - */ -typedef enum _FILE_INFORMATION_CLASS -{ - FileDirectoryInformation = 1, - FileFullDirectoryInformation, - FileBothDirectoryInformation, - FileBasicInformation, - FileStandardInformation, - FileInternalInformation, - FileEaInformation, - FileAccessInformation, - FileNameInformation, - FileRenameInformation, - FileLinkInformation, - FileNamesInformation, - FileDispositionInformation, - FilePositionInformation, - FileFullEaInformation, - FileModeInformation, - FileAlignmentInformation, - FileAllInformation, - FileAllocationInformation, - FileEndOfFileInformation, - FileAlternateNameInformation, - FileStreamInformation, - FilePipeInformation, - FilePipeLocalInformation, - FilePipeRemoteInformation, - FileMailslotQueryInformation, - FileMailslotSetInformation, - FileCompressionInformation, - FileObjectIdInformation, - FileCompletionInformation, - FileMoveClusterInformation, - FileQuotaInformation, - FileReparsePointInformation, - FileNetworkOpenInformation, - FileAttributeTagInformation, - FileTrackingInformation, - FileIdBothDirectoryInformation, - FileIdFullDirectoryInformation, - FileValidDataLengthInformation, - FileShortNameInformation, - FileMaximumInformation -} FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS; - -/* - * File System - */ -typedef enum _FSINFOCLASS -{ - FileFsVolumeInformation = 1, - FileFsLabelInformation, - FileFsSizeInformation, - FileFsDeviceInformation, - FileFsAttributeInformation, - FileFsControlInformation, - FileFsFullSizeInformation, - FileFsObjectIdInformation, - FileFsDriverPathInformation, - FileFsMaximumInformation -} FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS; - -/* - * Registry Key - */ -typedef enum _KEY_INFORMATION_CLASS -{ - KeyBasicInformation, - KeyNodeInformation, - KeyFullInformation, - KeyNameInformation, - KeyCachedInformation, - KeyFlagsInformation -} KEY_INFORMATION_CLASS; - -/* - * Registry Key Value - */ -typedef enum _KEY_VALUE_INFORMATION_CLASS -{ - KeyValueBasicInformation, - KeyValueFullInformation, - KeyValuePartialInformation, - KeyValueFullInformationAlign64, - KeyValuePartialInformationAlign64 -} KEY_VALUE_INFORMATION_CLASS; - -/* - * Registry Key Set - */ -typedef enum _KEY_SET_INFORMATION_CLASS -{ - KeyWriteTimeInformation, - KeyUserFlagsInformation, - MaxKeySetInfoClass -} KEY_SET_INFORMATION_CLASS; - -/* - * Process - */ -typedef enum _PROCESSINFOCLASS -{ - ProcessBasicInformation, - ProcessQuotaLimits, - ProcessIoCounters, - ProcessVmCounters, - ProcessTimes, - ProcessBasePriority, - ProcessRaisePriority, - ProcessDebugPort, - ProcessExceptionPort, - ProcessAccessToken, - ProcessLdtInformation, - ProcessLdtSize, - ProcessDefaultHardErrorMode, - ProcessIoPortHandlers, - ProcessPooledUsageAndLimits, - ProcessWorkingSetWatch, - ProcessUserModeIOPL, - ProcessEnableAlignmentFaultFixup, - ProcessPriorityClass, - ProcessWx86Information, - ProcessHandleCount, - ProcessAffinityMask, - ProcessPriorityBoost, - ProcessDeviceMap, - ProcessSessionInformation, - ProcessForegroundInformation, - ProcessWow64Information, - ProcessImageFileName, - ProcessLUIDDeviceMapsEnabled, - ProcessBreakOnTermination, [truncated at 1000 lines; 3138 more skipped]

1 0

[weiden] 16743: add uxtheme.dll and objsel.dll to the bootcd
by weiden＠svn.reactos.com 26 Jul '05

26 Jul '05

add uxtheme.dll and objsel.dll to the bootcd Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-07-26 13:42:15 UTC (rev 16742) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-07-26 13:50:18 UTC (rev 16743) @@ -114,6 +114,7 @@ lib\mswsock\mswsock.dll 1 lib\netapi32\netapi32.dll 1 lib\ntdll\ntdll.dll 1 +lib\objsel\objsel.dll 1 lib\ole32\ole32.dll 1 lib\oleaut32\oleaut32.dll 1 lib\olepro32\olepro32.dll 1 @@ -135,6 +136,7 @@ lib\urlmon\urlmon.dll 1 lib\user32\user32.dll 1 lib\userenv\userenv.dll 1 +lib\uxtheme\uxtheme.dll 1 lib\version\version.dll 1 lib\winspool\winspool.drv 1 lib\wininet\wininet.dll 1

1 0

[weiden] 16742: show the object picker dialog when clicking the Add button
by weiden＠svn.reactos.com 26 Jul '05

26 Jul '05

show the object picker dialog when clicking the Add button Modified: trunk/reactos/lib/aclui/aclui.c Modified: trunk/reactos/lib/aclui/aclui.xml Modified: trunk/reactos/lib/aclui/acluilib.h _____ Modified: trunk/reactos/lib/aclui/aclui.c --- trunk/reactos/lib/aclui/aclui.c 2005-07-26 13:40:31 UTC (rev 16741) +++ trunk/reactos/lib/aclui/aclui.c 2005-07-26 13:42:15 UTC (rev 16742) @@ -41,6 +41,8 @@ HeapFree(GetProcessHeap(), 0, sp); + + CoUninitialize(); } static VOID @@ -456,7 +458,7 @@ { PSECURITY_PAGE sp = (PSECURITY_PAGE)ppsp->lParam; - switch(uMsg) + switch (uMsg) { case PSPCB_CREATE: { @@ -568,6 +570,82 @@ } } +static HRESULT +InitializeObjectPicker(IN PSECURITY_PAGE sp, + OUT IDsObjectPicker **pDsObjectPicker) +{ + HRESULT hRet; + + *pDsObjectPicker = NULL; + + hRet = CoCreateInstance(&CLSID_DsObjectPicker, + NULL, + CLSCTX_INPROC_SERVER, + &IID_IDsObjectPicker, + (LPVOID*)pDsObjectPicker); + if (SUCCEEDED(hRet)) + { + DSOP_INIT_INFO InitInfo; + UINT i; + PCWSTR Attributes[] = + { + L"ObjectSid", + }; + DSOP_SCOPE_INIT_INFO Scopes[] = + { + { + sizeof(DSOP_SCOPE_INIT_INFO), + DSOP_SCOPE_TYPE_TARGET_COMPUTER, + DSOP_SCOPE_FLAG_DEFAULT_FILTER_USERS | DSOP_SCOPE_FLAG_DEFAULT_FILTER_GROUPS | + DSOP_SCOPE_FLAG_STARTING_SCOPE, + { + { + 0, + 0, + 0 + }, + DSOP_DOWNLEVEL_FILTER_USERS | DSOP_DOWNLEVEL_FILTER_LOCAL_GROUPS | + DSOP_DOWNLEVEL_FILTER_GLOBAL_GROUPS | DSOP_DOWNLEVEL_FILTER_ALL_WELLKNOWN_SIDS + }, + NULL, + NULL, + S_OK + }, + }; + + InitInfo.cbSize = sizeof(InitInfo); + InitInfo.pwzTargetComputer = (PCWSTR)sp->ServerName; + InitInfo.cDsScopeInfos = sizeof(Scopes) / sizeof(Scopes[0]); + InitInfo.aDsScopeInfos = Scopes; + InitInfo.flOptions = DSOP_FLAG_MULTISELECT | DSOP_SCOPE_TYPE_TARGET_COMPUTER; + InitInfo.cAttributesToFetch = sizeof(Attributes) / sizeof(Attributes[0]); + InitInfo.apwzAttributeNames = Attributes; + + for (i = 0; i < InitInfo.cDsScopeInfos; i++) + { + if ((sp->ObjectInfo.dwFlags & SI_SERVER_IS_DC) && + (InitInfo.aDsScopeInfos[i].flType & DSOP_SCOPE_TYPE_UPLEVEL_JOINED_DOMAIN)) + { + /* only set the domain controller string if we know the target + computer is a domain controller and the scope type is an + up-level domain to which the target computer is joined */ + InitInfo.aDsScopeInfos[i].pwzDcName = InitInfo.pwzTargetComputer; + } + } + + hRet = (*pDsObjectPicker)->lpVtbl->Initialize(*pDsObjectPicker, + &InitInfo); + + if (FAILED(hRet)) + { + /* delete the object picker in case initialization failed! */ + (*pDsObjectPicker)->lpVtbl->Release(*pDsObjectPicker); + } + } + + return hRet; +} + static INT_PTR CALLBACK SecurityPageProc(IN HWND hwndDlg, IN UINT uMsg, @@ -576,7 +654,7 @@ { PSECURITY_PAGE sp; - switch(uMsg) + switch (uMsg) { case WM_NOTIFY: { @@ -587,7 +665,7 @@ { if (pnmh->hwndFrom == sp->hWndAceList) { - switch(pnmh->code) + switch (pnmh->code) { case LVN_ITEMCHANGED: { @@ -605,7 +683,7 @@ } else if (pnmh->hwndFrom == sp->hAceCheckList) { - switch(pnmh->code) + switch (pnmh->code) { case CLN_CHANGINGITEMCHECKBOX: { @@ -625,6 +703,40 @@ break; } + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_ACELIST_ADD: + { + HRESULT hRet; + IDsObjectPicker *pDsObjectPicker = NULL; + IDataObject *Selections = NULL; + + sp = (PSECURITY_PAGE)GetWindowLongPtr(hwndDlg, + DWL_USER); + + hRet = InitializeObjectPicker(sp, + &pDsObjectPicker); + if (SUCCEEDED(hRet)) + { + hRet = pDsObjectPicker->lpVtbl->InvokeDialog(pDsObjectPicker, + hwndDlg, + &Selections); + if (FAILED(hRet)) + { + MessageBox(hwndDlg, L"InvokeDialog failed!\n", NULL, 0); + } + + /* delete the instance */ + pDsObjectPicker->lpVtbl->Release(pDsObjectPicker); + } + break; + } + } + break; + } + case WM_INITDIALOG: { sp = (PSECURITY_PAGE)((LPPROPSHEETPAGE)lParam)->lParam; @@ -751,7 +863,7 @@ SI_OBJECT_INFO ObjectInfo; HRESULT hRet; - if(psi == NULL) + if (psi == NULL) { SetLastError(ERROR_INVALID_PARAMETER); @@ -765,7 +877,7 @@ ZeroMemory(&ObjectInfo, sizeof(ObjectInfo)); hRet = psi->lpVtbl->GetObjectInformation(psi, &ObjectInfo); - if(FAILED(hRet)) + if (FAILED(hRet)) { SetLastError(hRet); @@ -773,6 +885,13 @@ return NULL; } + hRet = CoInitialize(NULL); + if (FAILED(hRet)) + { + DPRINT("CoInitialize failed!\n"); + return NULL; + } + if (!RegisterCheckListControl(hDllInstance)) { DPRINT("Registering the CHECKLIST_ACLUI class failed!\n"); @@ -802,7 +921,7 @@ psp.lParam = (LPARAM)sPage; psp.pfnCallback = SecurityPageCallback; - if(ObjectInfo.dwFlags & SI_PAGE_TITLE) + if (ObjectInfo.dwFlags & SI_PAGE_TITLE) { psp.pszTitle = ObjectInfo.pszPageTitle; @@ -840,7 +959,7 @@ LPWSTR lpCaption; BOOL Ret; - if(psi == NULL) + if (psi == NULL) { SetLastError(ERROR_INVALID_PARAMETER); @@ -854,7 +973,7 @@ ZeroMemory(&ObjectInfo, sizeof(ObjectInfo)); hRet = psi->lpVtbl->GetObjectInformation(psi, &ObjectInfo); - if(FAILED(hRet)) + if (FAILED(hRet)) { SetLastError(hRet); @@ -864,7 +983,7 @@ /* create the page */ hPages[0] = CreateSecurityPage(psi); - if(hPages[0] == NULL) + if (hPages[0] == NULL) { DPRINT("CreateSecurityPage(), couldn't create property sheet!\n"); return FALSE; @@ -890,7 +1009,7 @@ Ret = (PropertySheet(&psh) != -1); - if(lpCaption != NULL) + if (lpCaption != NULL) { LocalFree((HLOCAL)lpCaption); } _____ Modified: trunk/reactos/lib/aclui/aclui.xml --- trunk/reactos/lib/aclui/aclui.xml 2005-07-26 13:40:31 UTC (rev 16741) +++ trunk/reactos/lib/aclui/aclui.xml 2005-07-26 13:42:15 UTC (rev 16742) @@ -12,6 +12,7 @@ <library>user32</library> <library>gdi32</library> <library>comctl32</library> + <library>ole32</library> <library>uxtheme</library> <file>aclui.c</file> <file>checklist.c</file> _____ Modified: trunk/reactos/lib/aclui/acluilib.h --- trunk/reactos/lib/aclui/acluilib.h 2005-07-26 13:40:31 UTC (rev 16741) +++ trunk/reactos/lib/aclui/acluilib.h 2005-07-26 13:42:15 UTC (rev 16742) @@ -1,5 +1,6 @@ #include <windows.h> #include <commctrl.h> +#include <objsel.h> #include <prsht.h> #include <aclui.h> #include <sddl.h>

1 0

[weiden] 16741: import objsel.dll from wine-20050726
by weiden＠svn.reactos.com 26 Jul '05

26 Jul '05

import objsel.dll from wine-20050726 Modified: trunk/reactos/baseaddress.xml Modified: trunk/reactos/doc/README.WINE Modified: trunk/reactos/include/wine/ole2.h Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/objsel/ Added: trunk/reactos/lib/objsel/Makefile.in Added: trunk/reactos/lib/objsel/factory.c Added: trunk/reactos/lib/objsel/objsel.c Added: trunk/reactos/lib/objsel/objsel.rc Added: trunk/reactos/lib/objsel/objsel.spec Added: trunk/reactos/lib/objsel/objsel.xml Added: trunk/reactos/lib/objsel/objsel_private.h Added: trunk/reactos/lib/objsel/regsvr.c Modified: trunk/reactos/lib/uuid/uuid.c Added: trunk/reactos/w32api/include/objsel.h _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-07-26 13:24:44 UTC (rev 16740) +++ trunk/reactos/baseaddress.xml 2005-07-26 13:40:31 UTC (rev 16741) @@ -2,6 +2,7 @@ <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> <property name="BASEADDRESS_UXTHEME" value="0x5AD70000" /> +<property name="BASEADDRESS_OBJSEL" value="0x5B400000" /> <property name="BASEADDRESS_DINPUT" value="0x5F580000" /> <property name="BASEADDRESS_TIMEDATE" value="0x64DA0000" /> <property name="BASEADDRESS_SYSDM" value="0x64DD0000" /> _____ Modified: trunk/reactos/doc/README.WINE --- trunk/reactos/doc/README.WINE 2005-07-26 13:24:44 UTC (rev 16740) +++ trunk/reactos/doc/README.WINE 2005-07-26 13:40:31 UTC (rev 16741) @@ -51,6 +51,7 @@ reactos/lib/msi # Synced to Wine-20050419 reactos/lib/msvideo # Out of sync reactos/lib/netapi32 # Out of sync +reactos/lib/objsel # Synced to Wine-20050726 reactos/lib/odbc32 # In sync. Depends on port of Linux ODBC. reactos/lib/ole32 # Synced to Wine-20050419 reactos/lib/oleaut32 # Synced to Wine-20050419 _____ Modified: trunk/reactos/include/wine/ole2.h --- trunk/reactos/include/wine/ole2.h 2005-07-26 13:24:44 UTC (rev 16740) +++ trunk/reactos/include/wine/ole2.h 2005-07-26 13:40:31 UTC (rev 16741) @@ -19,6 +19,7 @@ */ #include_next <ole2.h> +#include <unknwn.h> /* for LPUNKNOWN */ #ifndef __WINE_OLE2_H #define __WINE_OLE2_H _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-07-26 13:24:44 UTC (rev 16740) +++ trunk/reactos/lib/directory.xml 2005-07-26 13:40:31 UTC (rev 16741) @@ -190,6 +190,9 @@ <directory name="ntdll"> <xi:include href="ntdll/ntdll.xml" /> </directory> +<directory name="objsel"> + <xi:include href="objsel/objsel.xml" /> +</directory> <directory name="ole32"> <xi:include href="ole32/ole32.xml" /> </directory> Property changes on: trunk/reactos/lib/objsel ___________________________________________________________________ Name: svn:ignore + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp *.cur *.bmp *.ico Makefile.ros *.spec.def *.stubs.c makefile _____ Added: trunk/reactos/lib/objsel/Makefile.in --- trunk/reactos/lib/objsel/Makefile.in 2005-07-26 13:24:44 UTC (rev 16740) +++ trunk/reactos/lib/objsel/Makefile.in 2005-07-26 13:40:31 UTC (rev 16741) @@ -0,0 +1,18 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = objsel.dll +IMPORTS = ole32 oleaut32 user32 advapi32 kernel32 +EXTRALIBS = -lstrmiids -luuid $(LIBUNICODE) + +C_SRCS = \ + factory.c \ + objsel.c \ + regsvr.c + +RC_SRCS = objsel.rc + +@MAKE_DLL_RULES@ + +### Dependencies: Property changes on: trunk/reactos/lib/objsel/Makefile.in ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/objsel/factory.c --- trunk/reactos/lib/objsel/factory.c 2005-07-26 13:24:44 UTC (rev 16740) +++ trunk/reactos/lib/objsel/factory.c 2005-07-26 13:40:31 UTC (rev 16741) @@ -0,0 +1,163 @@ +/* + * ClassFactory implementation for OBJSEL.dll + * + * Copyright (C) 2002 John K. Hohm + * Copyright (C) 2002 Robert Shearman + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "objsel_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(objsel); + + +/********************************************************************** + * OBJSEL_IClassFactory_QueryInterface (also IUnknown) + */ +static HRESULT WINAPI OBJSEL_IClassFactory_QueryInterface( + LPCLASSFACTORY iface, + REFIID riid, + LPVOID *ppvObj) +{ + TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + + if (ppvObj == NULL) return E_POINTER; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + *ppvObj = (LPVOID)iface; + IClassFactory_AddRef(iface); + return S_OK; + } + else if (IsEqualGUID(riid, &IID_IDsObjectPicker)) + { + return IClassFactory_CreateInstance(iface, NULL, riid, ppvObj); + } + + FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + + +/********************************************************************** + * OBJSEL_IClassFactory_AddRef (also IUnknown) + */ +static ULONG WINAPI OBJSEL_IClassFactory_AddRef(LPCLASSFACTORY iface) +{ + ClassFactoryImpl *This = (ClassFactoryImpl *)iface; + ULONG ref; + + TRACE("\n"); + + if (This == NULL) return E_POINTER; + + ref = InterlockedIncrement(&This->ref); + + if (ref == 1) + { + InterlockedIncrement(&dll_refs); + } + + return ref; +} + + +/********************************************************************** + * OBJSEL_IClassFactory_Release (also IUnknown) + */ +static ULONG WINAPI OBJSEL_IClassFactory_Release(LPCLASSFACTORY iface) +{ + ClassFactoryImpl *This = (ClassFactoryImpl *)iface; + ULONG ref; + + TRACE("\n"); + + if (This == NULL) return E_POINTER; + + ref = InterlockedDecrement(&This->ref); + + if (ref == 0) + { + InterlockedDecrement(&dll_refs); + } + + return ref; +} + + +/********************************************************************** + * OBJSEL_IClassFactory_CreateInstance + */ +static HRESULT WINAPI OBJSEL_IClassFactory_CreateInstance( + LPCLASSFACTORY iface, + LPUNKNOWN pUnkOuter, + REFIID riid, + LPVOID *ppvObj) +{ + TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + + if (ppvObj == NULL) return E_POINTER; + + /* Don't support aggregation (Windows doesn't) */ + if (pUnkOuter != NULL) return CLASS_E_NOAGGREGATION; + + if (IsEqualGUID(&IID_IDsObjectPicker, riid)) + { + return OBJSEL_IDsObjectPicker_Create(ppvObj); + } + + return CLASS_E_CLASSNOTAVAILABLE; +} + + +/********************************************************************** + * OBJSEL_IClassFactory_LockServer + */ +static HRESULT WINAPI OBJSEL_IClassFactory_LockServer( + LPCLASSFACTORY iface, + BOOL fLock) +{ + TRACE("\n"); + + if (fLock) + IClassFactory_AddRef(iface); + else + IClassFactory_Release(iface); + return S_OK; +} + + +/********************************************************************** + * IClassFactory_Vtbl + */ +static IClassFactoryVtbl IClassFactory_Vtbl = +{ + OBJSEL_IClassFactory_QueryInterface, + OBJSEL_IClassFactory_AddRef, + OBJSEL_IClassFactory_Release, + OBJSEL_IClassFactory_CreateInstance, + OBJSEL_IClassFactory_LockServer +}; + + +/********************************************************************** + * static ClassFactory instance + */ + +ClassFactoryImpl OBJSEL_ClassFactory = { &IClassFactory_Vtbl, 0 }; Property changes on: trunk/reactos/lib/objsel/factory.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/objsel/objsel.c --- trunk/reactos/lib/objsel/objsel.c 2005-07-26 13:24:44 UTC (rev 16740) +++ trunk/reactos/lib/objsel/objsel.c 2005-07-26 13:40:31 UTC (rev 16741) @@ -0,0 +1,211 @@ +/* + * Object Picker Dialog + * + * Copyright 2005 Thomas Weidenmueller <w3seek(a)reactos.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "objsel_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(objsel); + +LONG dll_refs = 0; +HINSTANCE hInstance; + +/********************************************************************** * + * DllEntryPoint + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) +{ + switch(fdwReason) + { + case DLL_PROCESS_ATTACH: + hInstance = hinstDLL; + DisableThreadLibraryCalls(hInstance); + break; + } + return TRUE; +} + + +/********************************************************************** * + * DllGetClassObject (OBJSEL.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +{ + TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + + *ppv = NULL; + + if (IsEqualGUID(rclsid, &CLSID_DsObjectPicker)) + return IClassFactory_QueryInterface((IClassFactory*)&OBJSEL_ClassFactory, iid, ppv); + + FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_gui d(iid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + + +/********************************************************************** * + * DllCanUnloadNow (OBJSEL.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return dll_refs != 0 ? S_FALSE : S_OK; +} + + +/********************************************************************** + * OBJSEL_IDsObjectPicker_Destroy (also IUnknown) + */ +static VOID WINAPI OBJSEL_IDsObjectPicker_Destroy(IDsObjectPickerImpl *This) +{ + HeapFree(GetProcessHeap(), + 0, + This); +} + + +/********************************************************************** + * OBJSEL_IDsObjectPicker_AddRef (also IUnknown) + */ +static ULONG WINAPI OBJSEL_IDsObjectPicker_AddRef(IDsObjectPicker * iface) +{ + IDsObjectPickerImpl *This = (IDsObjectPickerImpl *)iface; + ULONG ref; + + TRACE("\n"); + + if (This == NULL) return E_POINTER; + + ref = InterlockedIncrement(&This->ref); + + if (ref == 1) + { + InterlockedIncrement(&dll_refs); + } + + return ref; +} + + +/********************************************************************** + * OBJSEL_IDsObjectPicker_Release (also IUnknown) + */ +static ULONG WINAPI OBJSEL_IDsObjectPicker_Release(IDsObjectPicker * iface) +{ + IDsObjectPickerImpl *This = (IDsObjectPickerImpl *)iface; + ULONG ref; + + TRACE("\n"); + + if (This == NULL) return E_POINTER; + + ref = InterlockedDecrement(&This->ref); + + if (ref == 0) + { + InterlockedDecrement(&dll_refs); + OBJSEL_IDsObjectPicker_Destroy(This); + } + + return ref; +} + + +/********************************************************************** + * OBJSEL_IDsObjectPicker_QueryInterface (also IUnknown) + */ +static HRESULT WINAPI OBJSEL_IDsObjectPicker_QueryInterface( + IDsObjectPicker * iface, + REFIID riid, + LPVOID *ppvObj) +{ + TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + + if (ppvObj == NULL) return E_POINTER; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDsObjectPicker)) + { + *ppvObj = (LPVOID)iface; + OBJSEL_IDsObjectPicker_AddRef(iface); + return S_OK; + } + + FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + + +/********************************************************************** + * OBJSEL_IDsObjectPicker_Initialize + */ +static HRESULT WINAPI OBJSEL_IDsObjectPicker_Initialize( + IDsObjectPicker * iface, + PDSOP_INIT_INFO pInitInfo) +{ + FIXME("stub!\n"); + return S_OK; +} + + +/********************************************************************** + * OBJSEL_IDsObjectPicker_InvokeDialog + */ +static HRESULT WINAPI OBJSEL_IDsObjectPicker_InvokeDialog( + IDsObjectPicker * iface, + HWND hwndParent, + IDataObject** ppdoSelections) +{ + FIXME("stub!\n"); + return S_FALSE; +} + + +/********************************************************************** + * IDsObjectPicker_Vtbl + */ +static IDsObjectPickerVtbl IDsObjectPicker_Vtbl = +{ + OBJSEL_IDsObjectPicker_QueryInterface, + OBJSEL_IDsObjectPicker_AddRef, + OBJSEL_IDsObjectPicker_Release, + OBJSEL_IDsObjectPicker_Initialize, + OBJSEL_IDsObjectPicker_InvokeDialog +}; + + +/********************************************************************** + * OBJSEL_IDsObjectPicker_Create + */ +HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj) +{ + IDsObjectPickerImpl *Instance = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(IDsObjectPickerImpl)); + if (Instance != NULL) + { + Instance->lpVtbl = &IDsObjectPicker_Vtbl; + OBJSEL_IDsObjectPicker_AddRef((IDsObjectPicker *)Instance); + + *ppvObj = Instance; + return S_OK; + } + else + return E_OUTOFMEMORY; +} Property changes on: trunk/reactos/lib/objsel/objsel.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/objsel/objsel.rc --- trunk/reactos/lib/objsel/objsel.rc 2005-07-26 13:24:44 UTC (rev 16740) +++ trunk/reactos/lib/objsel/objsel.rc 2005-07-26 13:40:31 UTC (rev 16741) @@ -0,0 +1,28 @@ +/* + * Object Picker Dialog + * + * Copyright 2005 Thomas Weidenmueller <w3seek(a)reactos.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windef.h" +#include "winbase.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define WINE_FILENAME_STR "objsel.dll" + +#include "wine/wine_common_ver.rc" Property changes on: trunk/reactos/lib/objsel/objsel.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/objsel/objsel.spec --- trunk/reactos/lib/objsel/objsel.spec 2005-07-26 13:24:44 UTC (rev 16740) +++ trunk/reactos/lib/objsel/objsel.spec 2005-07-26 13:40:31 UTC (rev 16741) @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Property changes on: trunk/reactos/lib/objsel/objsel.spec ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/objsel/objsel.xml --- trunk/reactos/lib/objsel/objsel.xml 2005-07-26 13:24:44 UTC (rev 16740) +++ trunk/reactos/lib/objsel/objsel.xml 2005-07-26 13:40:31 UTC (rev 16741) @@ -0,0 +1,22 @@ +<module name="objsel" type="win32dll" baseaddress="${BASEADDRESS_OBJSEL}" installbase="system32" installname="objsel.dll"> + <importlibrary definition="objsel.spec.def" /> + <include base="objsel">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <library>ole32</library> + <library>ntdll</library> + <file>factory.c</file> + <file>objsel.c</file> + <file>regsvr.c</file> + <file>objsel.rc</file> + <file>objsel.spec</file> +</module> Property changes on: trunk/reactos/lib/objsel/objsel.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/objsel/objsel_private.h --- trunk/reactos/lib/objsel/objsel_private.h 2005-07-26 13:24:44 UTC (rev 16740) +++ trunk/reactos/lib/objsel/objsel_private.h 2005-07-26 13:40:31 UTC (rev 16741) @@ -0,0 +1,65 @@ +/* + * Object Picker Dialog Includes + * + * Copyright 2005 Thomas Weidenmueller <w3seek(a)reactos.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <string.h> +#include <stdarg.h> +#include <stdio.h> +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "wingdi.h" +#include "winuser.h" + +#define COBJMACROS +#define COM_NO_WINDOWS_H + +#include "ole2.h" +#include "strmif.h" +#include "olectl.h" +#include "unknwn.h" +#include "objsel.h" +#include "wine/unicode.h" +#include "uuids.h" + +/********************************************************************** + * Dll lifetime tracking declaration for objsel.dll + */ + +extern LONG dll_refs; + +/********************************************************************** + * ClassFactory declaration for objsel.dll + */ +typedef struct +{ + IClassFactoryVtbl *lpVtbl; + LONG ref; +} ClassFactoryImpl; + +typedef struct +{ + IDsObjectPickerVtbl *lpVtbl; + LONG ref; +} IDsObjectPickerImpl; + +HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj); + +extern ClassFactoryImpl OBJSEL_ClassFactory; Property changes on: trunk/reactos/lib/objsel/objsel_private.h ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/objsel/regsvr.c --- trunk/reactos/lib/objsel/regsvr.c 2005-07-26 13:24:44 UTC (rev 16740) +++ trunk/reactos/lib/objsel/regsvr.c 2005-07-26 13:40:31 UTC (rev 16741) @@ -0,0 +1,567 @@ +/* + * self-registerable dll functions for objsel.dll + * + * Copyright (C) 2004 Raphael Junqueira + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" + +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "winerror.h" + +#include "objbase.h" +#include "unknwn.h" +#include "objsel.h" + +#include "wine/debug.h" + +#include "initguid.h" + +WINE_DEFAULT_DEBUG_CHANNEL(objsel); + +/* + * Near the bottom of this file are the exported DllRegisterServer and + * DllUnregisterServer, which make all this worthwhile. + */ + +/********************************************************************** * + * interface for self-registering + */ +struct regsvr_interface { + IID const *iid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + IID const *base_iid; /* can be NULL to omit */ + int num_methods; /* can be <0 to omit */ + CLSID const *ps_clsid; /* can be NULL to omit */ + CLSID const *ps_clsid32; /* can be NULL to omit */ +}; + +static HRESULT register_interfaces(struct regsvr_interface const *list); +static HRESULT unregister_interfaces(struct regsvr_interface const *list); + +/** + * @todo: maybe adding typelibs support here + * [Software\\Classes\\CLSID\\{000C1090-0000-0000-C000-000000000046}\\TypeL ib] 1080380217 + * @="{000C1092-0000-0000-C000-000000000046}" + */ +struct regsvr_coclass { + CLSID const *clsid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + LPCSTR iph32; /* can be NULL to omit */ + LPCSTR ips; /* can be NULL to omit */ + LPCSTR ips32; /* can be NULL to omit */ + LPCSTR ips32_tmodel; /* can be NULL to omit, if apartment, iph32 must be set */ + LPCSTR progid; /* can be NULL to omit */ + LPCSTR viprogid; /* can be NULL to omit */ + LPCSTR progid_extra; /* can be NULL to omit */ +}; + +static HRESULT register_coclasses(struct regsvr_coclass const *list); +static HRESULT unregister_coclasses(struct regsvr_coclass const *list); + +/********************************************************************** * + * static string constants + */ +static WCHAR const interface_keyname[10] = { + 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; +static WCHAR const base_ifa_keyname[14] = { + 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', + 'e', 0 }; +static WCHAR const num_methods_keyname[11] = { + 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; +static WCHAR const ps_clsid_keyname[15] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', 0 }; +static WCHAR const ps_clsid32_keyname[17] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', '3', '2', 0 }; +static WCHAR const clsid_keyname[6] = { + 'C', 'L', 'S', 'I', 'D', 0 }; +static WCHAR const curver_keyname[7] = { + 'C', 'u', 'r', 'V', 'e', 'r', 0 }; +static WCHAR const iph32_keyname[] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'H', 'a', 'n', 'd', 'l', 'e', 'r', + '3', '2', 0 }; +static WCHAR const ips_keyname[13] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + 0 }; +static WCHAR const ips32_keyname[15] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + '3', '2', 0 }; +static WCHAR const progid_keyname[7] = { + 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static WCHAR const viprogid_keyname[25] = { + 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', + 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', + 0 }; +static char const tmodel_valuename[] = "ThreadingModel"; + +/********************************************************************** * + * static helper functions + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid); +static LONG register_key_defvalueW(HKEY base, WCHAR const *name, + WCHAR const *value); +static LONG register_key_defvalueA(HKEY base, WCHAR const *name, + char const *value); +static LONG register_progid(WCHAR const *clsid, + char const *progid, char const *curver_progid, + char const *name, char const *extra); +static LONG recursive_delete_key(HKEY key); +static LONG recursive_delete_keyA(HKEY base, char const *name); +static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); + +/********************************************************************** * + * register_interfaces + */ +static HRESULT register_interfaces(struct regsvr_interface const *list) { + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &interface_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + HKEY iid_key; + + StringFromGUID2(list->iid, buf, 39); + res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &iid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_interface_key; + + if (list->name) { + res = RegSetValueExA(iid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->base_iid) { + register_key_guid(iid_key, base_ifa_keyname, list->base_iid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (0 <= list->num_methods) { + static WCHAR const fmt[3] = { '%', 'd', 0 }; + HKEY key; + + res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + + wsprintfW(buf, fmt, list->num_methods); + res = RegSetValueExW(key, NULL, 0, REG_SZ, + (CONST BYTE*)buf, + (lstrlenW(buf) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid) { + register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid32) { + register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + error_close_iid_key: + RegCloseKey(iid_key); + } + +error_close_interface_key: + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/********************************************************************** * + * unregister_interfaces + */ +static HRESULT unregister_interfaces(struct regsvr_interface const *list) { + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, + KEY_READ | KEY_WRITE, &interface_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->iid, buf, 39); + res = recursive_delete_keyW(interface_key, buf); + } + + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/********************************************************************** * + * register_coclasses + */ +static HRESULT register_coclasses(struct regsvr_coclass const *list) { + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + HKEY clsid_key; + + StringFromGUID2(list->clsid, buf, 39); + res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->name) { + res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->iph32) { + HKEY iph32_key; + + res = RegCreateKeyExW(clsid_key, iph32_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &iph32_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegSetValueExA(iph32_key, NULL, 0, REG_SZ, + (CONST BYTE*)list->iph32, + lstrlenA(list->iph32) + 1); + RegCloseKey(iph32_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips) { + res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips32) { + HKEY ips32_key; + + res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &ips32_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, + (CONST BYTE*)list->ips32, + lstrlenA(list->ips32) + 1); + if (res == ERROR_SUCCESS && list->ips32_tmodel) + res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, + (CONST BYTE*)list->ips32_tmodel, + strlen(list->ips32_tmodel) + 1); + RegCloseKey(ips32_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->progid) { + res = register_key_defvalueA(clsid_key, progid_keyname, + list->progid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_progid(buf, list->progid, NULL, + list->name, list->progid_extra); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->viprogid) { + res = register_key_defvalueA(clsid_key, viprogid_keyname, + list->viprogid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_progid(buf, list->viprogid, list->progid, + list->name, list->progid_extra); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + error_close_clsid_key: + RegCloseKey(clsid_key); + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/********************************************************************** * + * unregister_coclasses + */ +static HRESULT unregister_coclasses(struct regsvr_coclass const *list) { + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, + KEY_READ | KEY_WRITE, &coclass_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->clsid, buf, 39); + res = recursive_delete_keyW(coclass_key, buf); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->progid) { + res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + + if (list->viprogid) { + res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + } [truncated at 1000 lines; 412 more skipped]

1 0

[greatlrd] 16740: update the En.rc for del by Brandon Turner and me
by greatlrd＠svn.reactos.com 26 Jul '05

26 Jul '05

update the En.rc for del by Brandon Turner and me Modified: trunk/reactos/subsys/system/cmd/En.rc _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-07-26 13:15:50 UTC (rev 16739) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-07-26 13:24:44 UTC (rev 16740) @@ -138,9 +138,9 @@ a prompt for a new one. Press ENTER to keep the same date.\n" STRING_DEL_HELP1, "Deletes one or more files.\n\n\ -DEL [/N /P /T /Q /W /Y /Z /A[[:]attributes]] file ...\n\ -DELETE [/N /P /T /Q /W /Y /Z /A[[:]attributes]] file ...\n\ -ERASE [/N /P /T /Q /W /Y /Z /A[[:]attributes]] file ...\n\n\ +DEL [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\ +DELETE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\ +ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\n\ file Specifies the file(s) to delete.\n\n\ /N Nothing.\n\ /P Prompt. Ask before deleting each file.\n\ @@ -148,7 +148,8 @@ /Q Quiet.\n\ /W Wipe. Overwrite the file with random numbers before deleting it.\n\ /Y Yes. Kill even *.* without asking.\n\ - /Z Zap. Delete hidden, read-only and system files.\n\ + /F Force Delete hidden, read-only and system files.\n\ + /S Delete file from all sub directory\n\ /A Select files to be deleted based on attributes.\n\ attributes\n\ R Read Only files\n\

1 0

[greatlrd] 16739: Implement /S /F and code clean up by Brandon Turner
by greatlrd＠svn.reactos.com 26 Jul '05

26 Jul '05

Implement /S /F and code clean up by Brandon Turner Modified: trunk/reactos/subsys/system/cmd/del.c _____ Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2005-07-26 12:22:55 UTC (rev 16738) +++ trunk/reactos/subsys/system/cmd/del.c 2005-07-26 13:15:50 UTC (rev 16739) @@ -1,44 +1,44 @@ /* - * DEL.C - del internal command. - * - * - * History: - * - * 06/29/98 (Rob Lake rlake(a)cs.mun.ca) - * rewrote del to support wildcards - * added my name to the contributors - * - * 07/13/98 (Rob Lake) - * fixed bug that caused del not to delete file with out - * attribute. moved set, del, ren, and ver to there own files - * - * 27-Jul-1998 (John P Price <linux-guru(a)gcfl.net>) - * added config.h include - * - * 09-Dec-1998 (Eric Kohl <ekohl(a)abo.rhein-zeiung.de>) - * Fixed command line parsing bugs. - * - * 21-Jan-1999 (Eric Kohl <ekohl(a)abo.rhein-zeiung.de>) - * Started major rewrite using a new structure. - * - * 03-Feb-1999 (Eric Kohl <ekohl(a)abo.rhein-zeiung.de>) - * First working version. - * - * 30-Mar-1999 (Eric Kohl <ekohl(a)abo.rhein-zeiung.de>) - * Added quiet ("/Q"), wipe ("/W") and zap ("/Z") option. - * - * 06-Nov-1999 (Eric Kohl <ekohl(a)abo.rhein-zeiung.de>) - * Little fix to keep DEL quiet inside batch files. - * - * 28-Jan-2004 (Michael Fritscher <michael(a)fritscher.net>) - * Added prompt ("/P"), yes ("/Y") and wipe("/W") option. - * - * 22-Jun-2005 (Brandon Turner <turnerb7(a)msu.edu>) - * Added exclusive deletion "del * -abc.txt -text*.txt" - * - * 22-Jun-2005 (Brandon Turner <turnerb7(a)msu.edu>) - * Implemented /A example "del /A:H /A:-R *.exe -ping.exe" - */ +* DEL.C - del internal command. +* +* +* History: +* +* 06/29/98 (Rob Lake rlake(a)cs.mun.ca) +* rewrote del to support wildcards +* added my name to the contributors +* +* 07/13/98 (Rob Lake) +* fixed bug that caused del not to delete file with out +* attribute. moved set, del, ren, and ver to there own files +* +* 27-Jul-1998 (John P Price <linux-guru(a)gcfl.net>) +* added config.h include +* +* 09-Dec-1998 (Eric Kohl <ekohl(a)abo.rhein-zeiung.de>) +* Fixed command line parsing bugs. +* +* 21-Jan-1999 (Eric Kohl <ekohl(a)abo.rhein-zeiung.de>) +* Started major rewrite using a new structure. +* +* 03-Feb-1999 (Eric Kohl <ekohl(a)abo.rhein-zeiung.de>) +* First working version. +* +* 30-Mar-1999 (Eric Kohl <ekohl(a)abo.rhein-zeiung.de>) +* Added quiet ("/Q"), wipe ("/W") and zap ("/Z") option. +* +* 06-Nov-1999 (Eric Kohl <ekohl(a)abo.rhein-zeiung.de>) +* Little fix to keep DEL quiet inside batch files. +* +* 28-Jan-2004 (Michael Fritscher <michael(a)fritscher.net>) +* Added prompt ("/P"), yes ("/Y") and wipe("/W") option. +* +* 22-Jun-2005 (Brandon Turner <turnerb7(a)msu.edu>) +* Added exclusive deletion "del * -abc.txt -text*.txt" +* +* 22-Jun-2005 (Brandon Turner <turnerb7(a)msu.edu>) +* Implemented /A example "del /A:H /A:-R *.exe -ping.exe" +*/ #include <precomp.h> #include "resource.h" @@ -49,16 +49,15 @@ enum { DEL_ATTRIBUTES = 0x001, /* /A */ - DEL_ERROR = 0x002, /* /E : not implemented */ DEL_NOTHING = 0x004, /* /N */ DEL_PROMPT = 0x008, /* /P */ DEL_QUIET = 0x010, /* /Q */ - DEL_SUBDIR = 0x020, /* /S : not implemented */ + DEL_SUBDIR = 0x020, /* /S */ DEL_TOTAL = 0x040, /* /T */ DEL_WIPE = 0x080, /* /W */ DEL_EMPTYDIR = 0x100, /* /X : not implemented */ DEL_YES = 0x200, /* /Y */ - DEL_ZAP = 0x400 /* /Z */ + DEL_FORCE = 0x800 /* /F */ }; enum @@ -79,8 +78,8 @@ RemoveFile (LPTSTR lpFileName, DWORD dwFlags) { /*This function is called by CommandDelete and - does the actual process of deleting the single - file*/ + does the actual process of deleting the single + file*/ if (dwFlags & DEL_WIPE) { @@ -115,10 +114,10 @@ CloseHandle (file); } /*check to see if it is read only and if this is done based on /A - if it is done by file name, access is denied. However, if it is done - using the /A switch you must un-read only the file and allow it to be - deleted*/ - if((dwFlags & DEL_ATTRIBUTES)) + if it is done by file name, access is denied. However, if it is done + using the /A switch you must un-read only the file and allow it to be + deleted*/ + if((dwFlags & DEL_ATTRIBUTES) || (dwFlags & DEL_FORCE)) { HANDLE hFile; WIN32_FIND_DATA f2; @@ -126,9 +125,9 @@ if(f2.dwFileAttributes & FILE_ATTRIBUTE_READONLY) { /*setting file to normal, not saving old attrs first - because the file is going to be deleted anyways - so the only thing that matters is that it isnt - read only.*/ + because the file is going to be deleted anyways + so the only thing that matters is that it isnt + read only.*/ SetFileAttributes(lpFileName,FILE_ATTRIBUTE_NORMAL); } @@ -136,11 +135,93 @@ return DeleteFile (lpFileName); } +BOOL _SearchPathex(TCHAR *lpPath,TCHAR *lpFileName,TCHAR *lpBuffer, DWORD dwFlags) +{ + TCHAR szFullPath[MAX_PATH]; + WIN32_FIND_DATA f; + HANDLE hFile; + TCHAR CMDPath[MAX_PATH]; + + /* Make the Full Path Name */ + _tcscpy(szFullPath,lpPath); + _tcscat(szFullPath,lpFileName); + + /* Open up the handle to the file(s) */ + hFile = FindFirstFile(szFullPath, &f); + do + { + /* Build the full name again, this time using the handle + as it might have had a * in the name before */ + _tcscpy(szFullPath,lpPath); + _tcscat(szFullPath,f.cFileName); + + /* We cant delete . or .. */ + if (!_tcscmp (f.cFileName, _T(".")) || + !_tcscmp (f.cFileName, _T(".."))) + continue; + + /* We cant delete ourselves */ + GetModuleFileName(NULL, CMDPath, MAX_PATH); + if(!_tcscmp (CMDPath,szFullPath)) + continue; + + /* If there is a read only / system file and they are forcing, then we can delete it + But we must first set it to normal. Otherwise we cant delete it */ + if(((dwFlags & DEL_FORCE) || (dwFlags & DEL_ATTRIBUTES)) && ((f.dwFileAttributes & FILE_ATTRIBUTE_READONLY) || (f.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM))) + { + + SetFileAttributes(szFullPath,FILE_ATTRIBUTE_NORMAL); + + } + else if(!((dwFlags & DEL_FORCE) || (dwFlags & DEL_ATTRIBUTES)) && ((f.dwFileAttributes & FILE_ATTRIBUTE_READONLY) || (f.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM))) + continue; + + /* If we find a file, we can return and continue to delete it */ + if(IsExistingFile(szFullPath)) + { + _tcscpy(lpBuffer,szFullPath); + CloseHandle(hFile); + return TRUE; + } + }while(FindNextFile (hFile, &f)); + + CloseHandle(hFile); + + /* None in this folder, so lets drop down to another folder */ + _tcscat(lpPath,_T("*")); + hFile = FindFirstFile(lpPath, &f); + lpPath[_tcslen(lpPath) - 1] = _T('\0'); + + do + { + /* dont count this folder or the folder above */ + if (!_tcscmp (f.cFileName, _T(".")) || + !_tcscmp (f.cFileName, _T(".."))) + continue; + + /* Assemble full path to file */ + _tcscpy(szFullPath,lpPath); + _tcscat(szFullPath,f.cFileName); + if(IsExistingDirectory(szFullPath)) + { + _tcscat(szFullPath,_T("\\")); + /* If it is a directory, move into(Recurvsily) */ + if(_SearchPathex(szFullPath,lpFileName,lpBuffer,dwFlags)) + { + return TRUE; + } + + } + }while(FindNextFile (hFile, &f)); + return FALSE; +} + + INT CommandDelete (LPTSTR cmd, LPTSTR param) { /*cmd is the command that was given, in this case it will always be "del" or "delete" - param is whatever is given after the command*/ + param is whatever is given after the command*/ TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szFullPath[MAX_PATH]; @@ -161,11 +242,14 @@ WIN32_FIND_DATA f; WIN32_FIND_DATA f2; LONG ch; + BOOL bSubFileFound = FALSE; BOOL bExclusion; - + TCHAR szOrginalArg[MAX_PATH]; + TCHAR AltArg[MAX_PATH]; + /*checks the first two chars of param to see if it is /? - this however allows the following command to not show help - "del frog.txt /?" */ + this however allows the following command to not show help + "del frog.txt /?" */ if (!_tcsncmp (param, _T("/?"), 2)) { @@ -175,396 +259,375 @@ arg = split (param, &args, FALSE); - if (args > 0) + if (args == 0) { - /* check for options anywhere in command line */ - for (i = 0; i < args; i++) + /* only command given */ + error_req_param_missing (); + freep (arg); + return 1; + } + /* check for options anywhere in command line */ + for (i = 0; i < args; i++) + { + if (*arg[i] == _T('/')) { - if (*arg[i] == _T('/')) + /*found a command, but check to make sure it has something after it*/ + if (_tcslen (arg[i]) >= 2) { - /*found a command, but check to make sure it has something after it*/ - if (_tcslen (arg[i]) >= 2) + ch = _totupper (arg[i][1]); + if (ch == _T('N')) { - ch = _totupper (arg[i][1]); - if (ch == _T('N')) + dwFlags |= DEL_NOTHING; + } + else if (ch == _T('P')) + { + dwFlags |= DEL_PROMPT; + } + else if (ch == _T('Q')) + { + dwFlags |= DEL_QUIET; + } + else if (ch == _T('F')) + { + dwFlags |= DEL_FORCE; + } + else if (ch == _T('S')) + { + dwFlags |= DEL_SUBDIR; + } + else if (ch == _T('T')) + { + dwFlags |= DEL_TOTAL; + } + else if (ch == _T('W')) + { + dwFlags |= DEL_WIPE; + } + else if (ch == _T('Y')) + { + dwFlags |= DEL_YES; + } + else if (ch == _T('A')) + { + + dwFlags |= DEL_ATTRIBUTES; + /*the proper syntax for /A has a min of 4 chars + i.e. /A:R or /A:-H */ + if (_tcslen (arg[i]) < 4) { - dwFlags |= DEL_NOTHING; + error_invalid_parameter_format(arg[i]); + return 0; } - else if (ch == _T('P')) - { - dwFlags |= DEL_PROMPT; + ch = _totupper (arg[i][3]); + if (_tcslen (arg[i]) == 4) + { + if(ch == _T('A')) + { + dwAttrFlags |= ATTR_ARCHIVE; + } + if(ch == _T('H')) + { + dwAttrFlags |= ATTR_HIDDEN; + } + if(ch == _T('S')) + { + dwAttrFlags |= ATTR_SYSTEM; + } + if(ch == _T('R')) + { + dwAttrFlags |= ATTR_READ_ONLY; + } } - else if (ch == _T('Q')) + if (_tcslen (arg[i]) == 5) { - dwFlags |= DEL_QUIET; - } - else if (ch == _T('S')) - { - dwFlags |= DEL_SUBDIR; - } - else if (ch == _T('T')) - { - dwFlags |= DEL_TOTAL; - } - else if (ch == _T('W')) - { - dwFlags |= DEL_WIPE; - } - else if (ch == _T('Y')) - { - dwFlags |= DEL_YES; - } - else if (ch == _T('Z')) - { - dwFlags |= DEL_ZAP; - } - else if (ch == _T('A')) - { - - dwFlags |= DEL_ATTRIBUTES; - /*the proper syntax for /A has a min of 4 chars - i.e. /A:R or /A:-H */ - if (_tcslen (arg[i]) < 4) + if(ch == _T('-')) { - error_invalid_parameter_format(arg[i]); - return 0; - } - ch = _totupper (arg[i][3]); - if (_tcslen (arg[i]) == 4) - { + ch = _totupper (arg[i][4]); if(ch == _T('A')) { - dwAttrFlags |= ATTR_ARCHIVE; + dwAttrFlags |= ATTR_N_ARCHIVE; } if(ch == _T('H')) { - dwAttrFlags |= ATTR_HIDDEN; + dwAttrFlags |= ATTR_N_HIDDEN; } if(ch == _T('S')) { - dwAttrFlags |= ATTR_SYSTEM; + dwAttrFlags |= ATTR_N_SYSTEM; } if(ch == _T('R')) { - dwAttrFlags |= ATTR_READ_ONLY; + dwAttrFlags |= ATTR_N_READ_ONLY; } } - if (_tcslen (arg[i]) == 5) - { - if(ch == _T('-')) - { - ch = _totupper (arg[i][4]); - if(ch == _T('A')) - { - dwAttrFlags |= ATTR_N_ARCHIVE; - } - if(ch == _T('H')) - { - dwAttrFlags |= ATTR_N_HIDDEN; - } - if(ch == _T('S')) - { - dwAttrFlags |= ATTR_N_SYSTEM; - } - if(ch == _T('R')) - { - dwAttrFlags |= ATTR_N_READ_ONLY; - } - } - } } } + } - nEvalArgs++; - } + nEvalArgs++; } - - /* there are only options on the command line --> error!!! - there is the same number of args as there is flags, so none of the args were filenames*/ - if (args == nEvalArgs) + } + + /* there are only options on the command line --> error!!! + there is the same number of args as there is flags, so none of the args were filenames*/ + if (args == nEvalArgs) + { + error_req_param_missing (); + freep (arg); + return 1; + } + + /* keep quiet within batch files */ + if (bc != NULL) + dwFlags |= DEL_QUIET; + + /* check for filenames anywhere in command line */ + for (i = 0; i < args; i++) + { + + /*this checks to see if it isnt a flag, if it isnt, we assume it is a file name*/ + if((*arg[i] == _T('/')) || (*arg[i] == _T('-'))) + continue; + bSubFileFound = FALSE; + + /* We want to make 2 copies of the argument, + 1. copy will stay the same as the argument + 2. will be edited and striped down to the bad folder */ + if(_tcslen(arg[i]) == 2 && arg[i][1] == _T(':')) { - error_req_param_missing (); - freep (arg); - return 1; + /* Check for C: D: ... */ + GetRootPath(arg[i],szOrginalArg,MAX_PATH); + GetRootPath(arg[i],AltArg,MAX_PATH); } + else + { + _tcscpy(szOrginalArg,arg[i]); + _tcscpy(AltArg,arg[i]); + } - /* keep quiet within batch files */ - if (bc != NULL) - dwFlags |= DEL_QUIET; + do + { + - /* check for filenames anywhere in command line */ - for (i = 0; i < args; i++) - { - if (!_tcscmp (arg[i], _T("*")) || - !_tcscmp (arg[i], _T("*.*"))) + if(dwFlags & DEL_SUBDIR) { - /*well, the user wants to delete everything but if they didnt yes DEL_YES, DEL_QUIET, or DEL_PROMPT - then we are going to want to make sure that in fact they want to do that. */ + + TCHAR FoundPath[MAX_PATH]; + TCHAR * PathFileName; + TCHAR PathBaseFolder[MAX_PATH]; - if (!((dwFlags & DEL_YES) || (dwFlags & DEL_QUIET) || (dwFlags & DEL_PROMPT))) + /* Get just the file name */ + PathFileName = _tcsrchr(szOrginalArg,_T('\\')); + if(PathFileName != NULL) + PathFileName++; + else + PathFileName = szOrginalArg; + + /* Get the full path to the file */ + GetFullPathName (szOrginalArg,MAX_PATH,PathBaseFolder,NULL); + + /* strip the filename off of it */ + for(ii = (_tcslen(PathBaseFolder) - 1); ii > -1; ii--) { - LoadString( CMD_ModuleHandle, STRING_DEL_HELP2, szMsg, RC_STRING_MAX_SIZE); - - res = FilePromptYN (szMsg); - if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) + if(PathBaseFolder[ii] != _T('\\')) + PathBaseFolder[ii] = _T('\0'); + else + { break; + } + } + + /* Start looking for it, once it cant find anymore files on that name + it returns false and that is how we know we have found all files in sub directories. */ + if(_SearchPathex(PathBaseFolder,PathFileName,FoundPath,dwFlags)) + { + bSubFileFound = TRUE; + _tcscpy(AltArg,FoundPath); + } + else + { + bSubFileFound = FALSE; + continue; + } + } - - /*this checks to see if it isnt a flag, if it isnt, we assume it is a file name*/ - if ((*arg[i] != _T('/')) && (*arg[i] != _T('-'))) + + + if(_tcschr (AltArg, _T('*')) == NULL && + IsExistingDirectory (AltArg)) + { + /* If it doesnt have a \ at the end already then on needs to be added */ + if(AltArg[_tcslen(AltArg) - 1] != _T('\\')) + _tcscat (AltArg, _T("\\")); + /* Add a wildcard after the \ */ + _tcscat (AltArg, _T("*")); + } + + if(!_tcscmp (AltArg, _T("*")) || + !_tcscmp (AltArg, _T("*.*"))|| + (AltArg[_tcslen(AltArg) - 2] == _T('\\') && AltArg[_tcslen(AltArg) - 1] == _T('*'))) + { + /*well, the user wants to delete everything but if they didnt yes DEL_YES, DEL_QUIET, or DEL_PROMPT + then we are going to want to make sure that in fact they want to do that. */ + + if (!((dwFlags & DEL_YES) || (dwFlags & DEL_QUIET) || (dwFlags & DEL_PROMPT))) { + LoadString( CMD_ModuleHandle, STRING_DEL_HELP2, szMsg, RC_STRING_MAX_SIZE); + + res = FilePromptYNA (szMsg); + if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) + break; + if(res == PROMPT_ALL) + dwFlags |= DEL_YES; + } + } + + + #ifdef _DEBUG - ConErrPrintf (_T("File: %s\n"), arg[i]); + ConErrPrintf (_T("File: %s\n"), arg[i]); #endif - if (_tcschr (arg[i], _T('*')) || _tcschr (arg[i], _T('?'))) - { - /* wildcards in filespec */ #ifdef _DEBUG - ConErrPrintf(_T("Wildcards!\n\n")); + ConErrPrintf(_T("Wildcards!\n\n")); #endif - - GetFullPathName (arg[i], - MAX_PATH, - szFullPath, - &pFilePart); + + GetFullPathName (AltArg, + MAX_PATH, + szFullPath, + &pFilePart); #ifdef _DEBUG - ConErrPrintf(_T("Full path: %s\n"), szFullPath); - ConErrPrintf(_T("File part: %s\n"), pFilePart); + ConErrPrintf(_T("Full path: %s\n"), szFullPath); + ConErrPrintf(_T("File part: %s\n"), pFilePart); #endif - hFile = FindFirstFile (szFullPath, &f); + hFile = FindFirstFile (szFullPath, &f); + + do + { + + if (hFile == INVALID_HANDLE_VALUE) + { + error_file_not_found (); + freep (arg); + return 0; + } + + /*bExclusion is the check varible to see if it has a match + and it needs to be set to false before each loop, as it hasnt been matched yet*/ + bExclusion = 0; + + /*loop through each of the arguments*/ + for (ii = 0; ii < args; ii++) + { + /*check to see if it is a exclusion tag but not a ':' (used in ATTR)*/ + if(_tcschr (arg[ii], _T('-')) && _tcschr (arg[ii], _T(':')) == NULL) + { + /*remove the - from the front to get the real name*/ + _tcscpy (exfileName , arg[ii]); + szFileName = strtok (exfileName,"-"); + GetFullPathName (szFileName, + MAX_PATH, + szFullPath, + &pFilePart); + hFileExcl = FindFirstFile (szFullPath, &f2); do { + /*check to see if the filenames match*/ + if(!_tcscmp (f.cFileName, f2.cFileName)) + bExclusion = 1; + } + while (FindNextFile (hFileExcl, &f2)); + } + } + + /*if it is going to be excluded by - no need to check attrs*/ + if(dwFlags & DEL_ATTRIBUTES && bExclusion == 0) + { + /*save if file attr check if user doesnt care about that attr anyways*/ + if(dwAttrFlags & ATTR_ARCHIVE && !(f.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)) + bExclusion = 1; + if(dwAttrFlags & ATTR_HIDDEN && !(f.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) + bExclusion = 1; + if(dwAttrFlags & ATTR_SYSTEM && !(f.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)) + bExclusion = 1; + if(dwAttrFlags & ATTR_READ_ONLY && !(f.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) + bExclusion = 1; + if(dwAttrFlags & ATTR_N_ARCHIVE && (f.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)) + bExclusion = 1; + if(dwAttrFlags & ATTR_N_HIDDEN && (f.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) + bExclusion = 1; + if(dwAttrFlags & ATTR_N_SYSTEM && (f.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)) + bExclusion = 1; + if(dwAttrFlags & ATTR_N_READ_ONLY && (f.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) + bExclusion = 1; + } - if (hFile == INVALID_HANDLE_VALUE) - { - error_file_not_found (); - freep (arg); - return 0; - } + if(bExclusion) + continue; - /*bExclusion is the check varible to see if it has a match - and it needs to be set to false before each loop, as it hasnt been matched yet*/ - bExclusion = 0; + /* ignore ".", ".." and directories */ + if (!_tcscmp (f.cFileName, _T(".")) || + !_tcscmp (f.cFileName, _T("..")) || + f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + continue; - /*loop through each of the arguments*/ - for (ii = 0; ii < args; ii++) - { - /*check to see if it is a exclusion tag but not a ':' (used in ATTR)*/ - if(_tcschr (arg[ii], _T('-')) && _tcschr (arg[ii], _T(':')) == NULL) - { - /*remove the - from the front to get the real name*/ - _tcscpy (exfileName , arg[ii]); - szFileName = strtok (exfileName,"-"); - GetFullPathName (szFileName, - MAX_PATH, - szFullPath, - &pFilePart); - hFileExcl = FindFirstFile (szFullPath, &f2); - do - { - /*check to see if the filenames match*/ - if(!_tcscmp (f.cFileName, f2.cFileName)) - bExclusion = 1; - } - while (FindNextFile (hFileExcl, &f2)); - } - } + _tcscpy (pFilePart, f.cFileName); - /*if it is going to be excluded by - no need to check attrs*/ - if(dwFlags & DEL_ATTRIBUTES && bExclusion == 0) - { - - /*save if file attr check if user doesnt care about that attr anyways*/ - if(dwAttrFlags & ATTR_ARCHIVE) - {if(!(f.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)) - bExclusion = 1;} - if(dwAttrFlags & ATTR_HIDDEN) - {if(!(f.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) - bExclusion = 1;} - if(dwAttrFlags & ATTR_SYSTEM) - {if(!(f.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)) - bExclusion = 1;} - if(dwAttrFlags & ATTR_READ_ONLY) - {if(!(f.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) - bExclusion = 1;} - if(dwAttrFlags & ATTR_N_ARCHIVE) - {if(f.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE) - bExclusion = 1;} - if(dwAttrFlags & ATTR_N_HIDDEN) - {if(f.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) - bExclusion = 1;} - if(dwAttrFlags & ATTR_N_SYSTEM) - {if(f.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) - bExclusion = 1;} - if(dwAttrFlags & ATTR_N_READ_ONLY) - {if(f.dwFileAttributes & FILE_ATTRIBUTE_READONLY) - bExclusion = 1;} - } - - if(!bExclusion) - { - /* ignore ".", ".." and directories */ - if (!_tcscmp (f.cFileName, _T(".")) || - !_tcscmp (f.cFileName, _T("..")) || - f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - continue; - - _tcscpy (pFilePart, f.cFileName); - #ifdef _DEBUG - ConErrPrintf(_T("Full filename: %s\n"), szFullPath); + ConErrPrintf(_T("Full filename: %s\n"), szFullPath); #endif - /* ask for deleting */ - if (dwFlags & DEL_PROMPT) - { - LoadString(CMD_ModuleHandle, STRING_DEL_ERROR5, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, szFullPath); + /* ask for deleting */ + if (dwFlags & DEL_PROMPT) + { + LoadString(CMD_ModuleHandle, STRING_DEL_ERROR5, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg, szFullPath); - LoadString(CMD_ModuleHandle, STRING_DEL_ERROR6, szMsg, RC_STRING_MAX_SIZE); - res = FilePromptYN (szMsg); + LoadString(CMD_ModuleHandle, STRING_DEL_ERROR6, szMsg, RC_STRING_MAX_SIZE); + res = FilePromptYN (szMsg); - if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) - { - continue; //FIXME: Errorcode? - } - } - - /*user cant ask it to be quiet and tell you what it did*/ - if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) - { - LoadString(CMD_ModuleHandle, STRING_DEL_ERROR7, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, szFullPath); - } - - /* delete the file */ - if (!(dwFlags & DEL_NOTHING)) - { - if (RemoveFile (szFullPath, dwFlags)) - { - dwFiles++; - } - else - { - if (dwFlags & DEL_ZAP) - { - if (SetFileAttributes (szFullPath, 0)) - { - if (RemoveFile (szFullPath, dwFlags)) - { - dwFiles++; - } - else - { - ErrorMessage (GetLastError(), _T("")); - } - } - else - { - ErrorMessage (GetLastError(), _T("")); - } - } - else - { - ErrorMessage (GetLastError(), _T("")); - } - } - } - } - } - while (FindNextFile (hFile, &f)); - FindClose (hFile); + if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) + { + continue; //FIXME: Errorcode? } - else - { - - /* no wildcards in filespec */ -#ifdef _DEBUG - ConErrPrintf(_T("No Wildcards!\n")); -#endif - GetFullPathName (arg[i], - MAX_PATH, - szFullPath, - &pFilePart); + } - /* ask for deleting */ - // Don't ask if the file doesn't exist, the following code will make the error-msg - if((dwFlags & DEL_PROMPT) && (FindFirstFile(szFullPath, &f) != INVALID_HANDLE_VALUE)) - { - LoadString(CMD_ModuleHandle, STRING_DEL_ERROR5, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, szFullPath); + /*user cant ask it to be quiet and tell you what it did*/ + if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) + { + LoadString(CMD_ModuleHandle, STRING_DEL_ERROR7, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg, szFullPath); + } - LoadString(CMD_ModuleHandle, STRING_DEL_ERROR6, szMsg, RC_STRING_MAX_SIZE); - res = FilePromptYN (szMsg); + /* delete the file */ + if(dwFlags & DEL_NOTHING) + continue; - if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) - { - break; //FIXME: Errorcode? - } - } -#ifdef _DEBUG - ConErrPrintf(_T("Full path: %s\n"), szFullPath); -#endif - if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) - { - LoadString(CMD_ModuleHandle, STRING_DEL_ERROR7, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, szFullPath); - } - - if (!(dwFlags & DEL_NOTHING)) - { - if (RemoveFile (szFullPath, dwFlags)) - { - dwFiles++; - } - else - { - if (dwFlags & DEL_ZAP) - { - if (SetFileAttributes (szFullPath, 0)) - { - if (RemoveFile (szFullPath, dwFlags)) - { - dwFiles++; - } - else - { - ErrorMessage (GetLastError(), _T("")); - } - } - else - { - ErrorMessage (GetLastError(), _T("")); - } - } - else - { - ErrorMessage (GetLastError(), _T("")); - } - } - } - } + if(RemoveFile (szFullPath, dwFlags)) + dwFiles++; + else + { + bSubFileFound = FALSE; + ErrorMessage (GetLastError(), _T("")); + break; } } + while (FindNextFile (hFile, &f)); + } + while(bSubFileFound); } - else - { - /* only command given */ - error_req_param_missing (); - freep (arg); - return 1; - } - + FindClose (hFile); + freep (arg); - if (!(dwFlags & DEL_QUIET)) + /*Based on MS cmd, we only tell what files are being deleted when /S is used */ + if (dwFlags & DEL_TOTAL) { if (dwFiles < 2) { @@ -577,7 +640,9 @@ ConOutPrintf(szMsg, dwFiles); } + return 0; } + #endif

1 0

[weiden] 16738: removed some MmCopyTo/FromCaller calls from win32k's GDI
by weiden＠svn.reactos.com 26 Jul '05

26 Jul '05

removed some MmCopyTo/FromCaller calls from win32k's GDI Modified: trunk/reactos/subsys/win32k/objects/brush.c Modified: trunk/reactos/subsys/win32k/objects/cliprgn.c Modified: trunk/reactos/subsys/win32k/objects/coord.c Modified: trunk/reactos/subsys/win32k/objects/dc.c Modified: trunk/reactos/subsys/win32k/objects/fillshap.c Modified: trunk/reactos/subsys/win32k/objects/line.c Modified: trunk/reactos/subsys/win32k/objects/pen.c Modified: trunk/reactos/subsys/win32k/objects/print.c Modified: trunk/reactos/subsys/win32k/objects/rect.c Modified: trunk/reactos/subsys/win32k/objects/region.c _____ Modified: trunk/reactos/subsys/win32k/objects/brush.c --- trunk/reactos/subsys/win32k/objects/brush.c 2005-07-26 11:22:48 UTC (rev 16737) +++ trunk/reactos/subsys/win32k/objects/brush.c 2005-07-26 12:22:55 UTC (rev 16738) @@ -563,7 +563,7 @@ CONST VOID *PackedDIB) { BITMAPINFO *SafeBitmapInfoAndData; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; HBRUSH hBrush; SafeBitmapInfoAndData = EngAllocMem(0, BitmapInfoSize, 0); @@ -573,10 +573,24 @@ return NULL; } - Status = MmCopyFromCaller(SafeBitmapInfoAndData, BitmapInfoAndData, - BitmapInfoSize); + _SEH_TRY + { + ProbeForRead(BitmapInfoAndData, + BitmapInfoSize, + 1); + RtlCopyMemory(SafeBitmapInfoAndData, + BitmapInfoAndData, + BitmapInfoSize); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) { + EngFreeMem(SafeBitmapInfoAndData); SetLastNtError(Status); return 0; } @@ -632,11 +646,23 @@ if (Point != NULL) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; POINT SafePoint; SafePoint.x = dc->w.brushOrgX; SafePoint.y = dc->w.brushOrgY; - Status = MmCopyToCaller(Point, &SafePoint, sizeof(POINT)); + _SEH_TRY + { + ProbeForWrite(Point, + sizeof(POINT), + 1); + *Point = SafePoint; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); @@ -661,7 +687,7 @@ ULONG Reserved) { PPATRECT rb = NULL; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; BOOL Ret; if (cRects > 0) @@ -672,7 +698,21 @@ SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - Status = MmCopyFromCaller(rb, pRects, sizeof(PATRECT) * cRects); + _SEH_TRY + { + ProbeForRead(pRects, + cRects * sizeof(PATRECT), + 1); + RtlCopyMemory(rb, + pRects, + cRects * sizeof(PATRECT)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) { ExFreePool(rb); _____ Modified: trunk/reactos/subsys/win32k/objects/cliprgn.c --- trunk/reactos/subsys/win32k/objects/cliprgn.c 2005-07-26 11:22:48 UTC (rev 16737) +++ trunk/reactos/subsys/win32k/objects/cliprgn.c 2005-07-26 12:22:55 UTC (rev 16738) @@ -192,7 +192,19 @@ Ret = IntGdiGetClipBox(hDC, &Saferect); - Status = MmCopyToCaller(rc, &Saferect, sizeof(RECT)); + _SEH_TRY + { + ProbeForWrite(rc, + sizeof(RECT), + 1); + *rc = Saferect; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { @@ -341,7 +353,7 @@ BOOL STDCALL NtGdiRectVisible(HDC hDC, CONST PRECT UnsafeRect) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PROSRGNDATA Rgn; PDC dc = DC_LockDc(hDC); BOOL Result = FALSE; @@ -353,10 +365,23 @@ return FALSE; } - Status = MmCopyFromCaller(&Rect, UnsafeRect, sizeof(RECT)); + _SEH_TRY + { + ProbeForRead(UnsafeRect, + sizeof(RECT), + 1); + Rect = *UnsafeRect; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); + SetLastNtError(Status); return FALSE; } _____ Modified: trunk/reactos/subsys/win32k/objects/coord.c --- trunk/reactos/subsys/win32k/objects/coord.c 2005-07-26 11:22:48 UTC (rev 16737) +++ trunk/reactos/subsys/win32k/objects/coord.c 2005-07-26 12:22:55 UTC (rev 16738) @@ -63,17 +63,29 @@ { XFORM xformTemp; XFORM xform1, xform2; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; BOOL Ret; - - Status = MmCopyFromCaller( &xform1, Unsafexform1, sizeof(XFORM) ); - if(!NT_SUCCESS(Status)) + _SEH_TRY { - SetLastNtError(Status); - return FALSE; + ProbeForWrite(UnsafeXFormResult, + sizeof(XFORM), + 1); + ProbeForRead(Unsafexform1, + sizeof(XFORM), + 1); + ProbeForRead(Unsafexform2, + sizeof(XFORM), + 1); + xform1 = *Unsafexform1; + xform2 = *Unsafexform2; } - Status = MmCopyFromCaller( &xform2, Unsafexform2, sizeof(XFORM) ); + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -83,7 +95,17 @@ Ret = IntGdiCombineTransform(&xformTemp, &xform1, &xform2); /* Copy the result to xformResult */ - Status = MmCopyToCaller( UnsafeXFormResult, &xformTemp, sizeof(XFORM) ); + _SEH_TRY + { + /* pointer was already probed! */ + *UnsafeXFormResult = xformTemp; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -131,7 +153,7 @@ int Count) { PDC dc; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; LPPOINT Points; ULONG Size; @@ -159,7 +181,21 @@ return FALSE; } - Status = MmCopyFromCaller(Points, UnsafePoints, Size); + _SEH_TRY + { + ProbeForWrite(UnsafePoints, + Size, + 1); + RtlCopyMemory(Points, + UnsafePoints, + Size); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); @@ -170,7 +206,19 @@ IntDPtoLP(dc, Points, Count); - Status = MmCopyToCaller(UnsafePoints, Points, Size); + _SEH_TRY + { + /* pointer was already probed! */ + RtlCopyMemory(UnsafePoints, + Points, + Size); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); @@ -218,7 +266,7 @@ LPXFORM XForm) { PDC dc; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; dc = DC_LockDc ( hDC ); if (!dc) @@ -233,7 +281,18 @@ return FALSE; } - Status = MmCopyToCaller(XForm, &dc->w.xformWorld2Wnd, sizeof(XFORM)); + _SEH_TRY + { + ProbeForWrite(XForm, + sizeof(XFORM), + 1); + *XForm = dc->w.xformWorld2Wnd; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; DC_UnlockDc(dc); return NT_SUCCESS(Status); @@ -280,7 +339,7 @@ NtGdiLPtoDP ( HDC hDC, LPPOINT UnsafePoints, INT Count ) { PDC dc; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; LPPOINT Points; ULONG Size; @@ -308,7 +367,21 @@ return FALSE; } - Status = MmCopyFromCaller(Points, UnsafePoints, Size); + _SEH_TRY + { + ProbeForWrite(UnsafePoints, + Size, + 1); + RtlCopyMemory(Points, + UnsafePoints, + Size); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); @@ -319,7 +392,19 @@ IntLPtoDP(dc, Points, Count); - Status = MmCopyToCaller(UnsafePoints, Points, Size); + _SEH_TRY + { + /* pointer was already probed! */ + RtlCopyMemory(UnsafePoints, + Points, + Size); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); @@ -341,7 +426,7 @@ { PDC dc; XFORM SafeXForm; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; dc = DC_LockDc(hDC); if (!dc) @@ -357,7 +442,19 @@ return FALSE; } - Status = MmCopyFromCaller(&SafeXForm, UnsafeXForm, sizeof(XFORM)); + _SEH_TRY + { + ProbeForRead(UnsafeXForm, + sizeof(XFORM), + 1); + SafeXForm = *UnsafeXForm; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); @@ -403,8 +500,7 @@ LPPOINT UnsafePoint) { PDC dc; - POINT Point; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; dc = DC_LockDc ( hDC ); if(!dc) @@ -415,9 +511,20 @@ if (UnsafePoint) { - Point.x = dc->vportOrgX; - Point.y = dc->vportOrgY; - Status = MmCopyToCaller(UnsafePoint, &Point, sizeof(POINT)); + _SEH_TRY + { + ProbeForWrite(UnsafePoint, + sizeof(POINT), + 1); + UnsafePoint->x = dc->vportOrgX; + UnsafePoint->y = dc->vportOrgY; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if ( !NT_SUCCESS(Status) ) { SetLastNtError(Status); @@ -452,13 +559,22 @@ if (Point) { - POINT SafePoint; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; + + _SEH_TRY + { + ProbeForWrite(Point, + sizeof(POINT), + 1); + Point->x = dc->wndOrgX; + Point->y = dc->wndOrgY; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - SafePoint.x = dc->wndOrgX; - SafePoint.y = dc->wndOrgY; - - Status = MmCopyToCaller(Point, &SafePoint, sizeof(POINT)); if(!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -594,13 +710,22 @@ if (Size) { - SIZE SafeSize; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; - SafeSize.cx = dc->vportExtX; - SafeSize.cy = dc->vportExtY; + _SEH_TRY + { + ProbeForWrite(Size, + sizeof(SIZE), + 1); + Size->cx = dc->vportExtX; + Size->cy = dc->vportExtY; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - Status = MmCopyToCaller(Size, &SafeSize, sizeof(SIZE)); if(!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -636,13 +761,22 @@ if (Point) { - POINT SafePoint; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; + + _SEH_TRY + { + ProbeForWrite(Point, + sizeof(POINT), + 1); + Point->x = dc->vportOrgX; + Point->y = dc->vportOrgY; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - SafePoint.x = dc->vportOrgX; - SafePoint.y = dc->vportOrgY; - - Status = MmCopyToCaller(Point, &SafePoint, sizeof(POINT)); if(!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -690,13 +824,22 @@ if (Size) { - SIZE SafeSize; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; + + _SEH_TRY + { + ProbeForWrite(Size, + sizeof(SIZE), + 1); + Size->cx = dc->wndExtX; + Size->cy = dc->wndExtY; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - SafeSize.cx = dc->wndExtX; - SafeSize.cy = dc->wndExtY; - - Status = MmCopyToCaller(Size, &SafeSize, sizeof(SIZE)); if(!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -732,13 +875,22 @@ if (Point) { - POINT SafePoint; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; + + _SEH_TRY + { + ProbeForWrite(Point, + sizeof(POINT), + 1); + Point->x = dc->wndOrgX; + Point->y = dc->wndOrgY; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - SafePoint.x = dc->wndOrgX; - SafePoint.y = dc->wndOrgY; - - Status = MmCopyToCaller(Point, &SafePoint, sizeof(POINT)); if(!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -762,7 +914,7 @@ CONST LPXFORM XForm) { PDC dc; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; dc = DC_LockDc (hDC); if ( !dc ) @@ -785,7 +937,19 @@ return FALSE; } - Status = MmCopyFromCaller(&dc->w.xformWorld2Wnd, XForm, sizeof(XFORM)); + _SEH_TRY + { + ProbeForRead(XForm, + sizeof(XFORM), + 1); + dc->w.xformWorld2Wnd = *XForm; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2005-07-26 11:22:48 UTC (rev 16737) +++ trunk/reactos/subsys/win32k/objects/dc.c 2005-07-26 12:22:55 UTC (rev 16738) @@ -69,7 +69,7 @@ } \ BOOL STDCALL NtGdi##FuncName ( HDC hdc, LP##type pt ) \ { \ - NTSTATUS Status; \ + NTSTATUS Status = STATUS_SUCCESS; \ type Safept; \ PDC dc; \ if(!pt) \ @@ -84,7 +84,18 @@ } \ Int##FuncName( dc, &Safept); \ DC_UnlockDc(dc); \ - Status = MmCopyToCaller(pt, &Safept, sizeof( type )); \ + _SEH_TRY \ + { \ + ProbeForWrite(pt, \ + sizeof( type ), \ + 1); \ + *pt = Safept; \ + } \ + _SEH_HANDLE \ + { \ + Status = _SEH_GetExceptionCode(); \ + } \ + _SEH_END; \ if(!NT_SUCCESS(Status)) \ { \ SetLastNtError(Status); \ @@ -830,11 +841,25 @@ UNICODE_STRING SafeDriver, SafeDevice; DEVMODEW SafeInitData; HDC Ret; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; if(InitData) { - Status = MmCopyFromCaller(&SafeInitData, InitData, sizeof(DEVMODEW)); + _SEH_TRY + { + ProbeForRead(InitData, + sizeof(DEVMODEW), + 1); + RtlCopyMemory(&SafeInitData, + InitData, + sizeof(DEVMODEW)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -878,11 +903,24 @@ UNICODE_STRING SafeDriver, SafeDevice; DEVMODEW SafeInitData; HDC Ret; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; if(InitData) { - Status = MmCopyFromCaller(&SafeInitData, InitData, sizeof(DEVMODEW)); + _SEH_TRY + { + ProbeForRead(InitData, + sizeof(DEVMODEW), + 1); + RtlCopyMemory(&SafeInitData, + InitData, + sizeof(DEVMODEW)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; if(!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -1076,7 +1114,7 @@ BOOL Ret; DC *dc; POINT SafePoint; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; if(!Point) { @@ -1093,7 +1131,19 @@ Ret = IntGdiGetDCOrgEx(dc, &SafePoint); - Status = MmCopyToCaller(Point, &SafePoint, sizeof(POINT)); + _SEH_TRY + { + ProbeForWrite(Point, + sizeof(POINT), + 1); + *Point = SafePoint; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -1621,12 +1671,30 @@ { INT Ret; LPVOID SafeBuf; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; if (count <= 0) { return 0; } + + _SEH_TRY + { + ProbeForWrite(buffer, + count, + 1); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return 0; + } SafeBuf = ExAllocatePoolWithTag(PagedPool, count, TAG_GDIOBJ); if(!SafeBuf) @@ -1637,7 +1705,19 @@ Ret = IntGdiGetObject(handle, count, SafeBuf); - Status = MmCopyToCaller(buffer, SafeBuf, count); + _SEH_TRY + { + /* pointer already probed! */ + RtlCopyMemory(buffer, + SafeBuf, + count); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + ExFreePool(SafeBuf); if(!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/subsys/win32k/objects/fillshap.c --- trunk/reactos/subsys/win32k/objects/fillshap.c 2005-07-26 11:22:48 UTC (rev 16737) +++ trunk/reactos/subsys/win32k/objects/fillshap.c 2005-07-26 12:22:55 UTC (rev 16738) @@ -845,7 +845,7 @@ { DC *dc; LPPOINT Safept; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; BOOL Ret = FALSE; if ( Count < 2 ) @@ -853,6 +853,24 @@ SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; } + + _SEH_TRY + { + ProbeForRead(UnsafePoints, + Count * sizeof(POINT), + 1); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } dc = DC_LockDc(hDC); if(!dc) @@ -870,7 +888,19 @@ SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); else { - Status = MmCopyFromCaller(Safept, UnsafePoints, sizeof(POINT) * Count); + _SEH_TRY + { + /* pointer was already probed! */ + RtlCopyMemory(Safept, + UnsafePoints, + Count * sizeof(POINT)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) SetLastNtError(Status); else @@ -913,6 +943,28 @@ if(Count > 0) { + _SEH_TRY + { + ProbeForRead(Points, + Count * sizeof(POINT), + 1); + ProbeForRead(PolyCounts, + Count * sizeof(INT), + 1); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + DC_UnlockDc(dc); + SetLastNtError(Status); + return FALSE; + } + Safept = ExAllocatePoolWithTag(PagedPool, (sizeof(POINT) + sizeof(INT)) * Count, TAG_SHAPE); if(!Safept) { @@ -922,16 +974,23 @@ } SafePolyPoints = (LPINT)&Safept[Count]; - - Status = MmCopyFromCaller(Safept, Points, sizeof(POINT) * Count); - if(!NT_SUCCESS(Status)) + + _SEH_TRY { - DC_UnlockDc(dc); - ExFreePool(Safept); - SetLastNtError(Status); - return FALSE; + /* pointers already probed! */ + RtlCopyMemory(Safept, + Points, + Count * sizeof(POINT)); + RtlCopyMemory(SafePolyPoints, + PolyCounts, + Count * sizeof(INT)); } - Status = MmCopyFromCaller(SafePolyPoints, PolyCounts, sizeof(INT) * Count); + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); @@ -1520,7 +1579,7 @@ PTRIVERTEX SafeVertex; PVOID SafeMesh; ULONG SizeMesh; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; dc = DC_LockDc(hdc); if(!dc) @@ -1555,6 +1614,28 @@ SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; } + + _SEH_TRY + { + ProbeForRead(pVertex, + uVertex * sizeof(TRIVERTEX), + 1); + ProbeForRead(pMesh, + SizeMesh, + 1); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + DC_UnlockDc(dc); + SetLastWin32Error(Status); + return FALSE; + } if(!(SafeVertex = ExAllocatePoolWithTag(PagedPool, (uVertex * sizeof(TRIVERTEX)) + SizeMesh, TAG_SHAPE))) { @@ -1562,16 +1643,25 @@ SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - Status = MmCopyFromCaller(SafeVertex, pVertex, uVertex * sizeof(TRIVERTEX)); - if(!NT_SUCCESS(Status)) + + SafeMesh = (PTRIVERTEX)(SafeVertex + uVertex); + + _SEH_TRY { - DC_UnlockDc(dc); - ExFreePool(SafeVertex); - SetLastNtError(Status); - return FALSE; + /* pointers were already probed! */ + RtlCopyMemory(SafeVertex, + pVertex, + uVertex * sizeof(TRIVERTEX)); + RtlCopyMemory(SafeMesh, + pMesh, + SizeMesh); } - SafeMesh = (PTRIVERTEX)(SafeVertex + uVertex); - Status = MmCopyFromCaller(SafeMesh, pMesh, SizeMesh); + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); _____ Modified: trunk/reactos/subsys/win32k/objects/line.c --- trunk/reactos/subsys/win32k/objects/line.c 2005-07-26 11:22:48 UTC (rev 16737) +++ trunk/reactos/subsys/win32k/objects/line.c 2005-07-26 12:22:55 UTC (rev 16738) @@ -503,7 +503,7 @@ { DC *dc; POINT SafePoint; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; BOOL Ret; dc = DC_LockDc(hDC); @@ -521,7 +521,19 @@ if(Point) { - Status = MmCopyFromCaller(&SafePoint, Point, sizeof(POINT)); + _SEH_TRY + { + ProbeForRead(Point, + sizeof(POINT), + 1); + SafePoint = *Point; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); @@ -544,7 +556,7 @@ { DC *dc; LPPOINT Safept; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; BOOL Ret; dc = DC_LockDc(hDC); @@ -562,6 +574,25 @@ if(Count > 0) { [truncated at 1000 lines; 1059 more skipped]

1 0

[navaraf] 16737: Fix some bugs in DIB mapping code to prevent instant system crashes.
by navaraf＠svn.reactos.com 26 Jul '05

26 Jul '05

Fix some bugs in DIB mapping code to prevent instant system crashes. Modified: trunk/reactos/subsys/win32k/objects/dib.c _____ Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2005-07-26 11:00:15 UTC (rev 16736) +++ trunk/reactos/subsys/win32k/objects/dib.c 2005-07-26 11:22:48 UTC (rev 16737) @@ -175,7 +175,7 @@ RECTL DestRect; XLATEOBJ *XlateObj; PPALGDI hDCPalette; - //RGBQUAD *lpRGB; + //RGBQUAD *lpRGB; HPALETTE DDB_Palette, DIB_Palette; ULONG DDB_Palette_Type, DIB_Palette_Type; INT DIBWidth; @@ -190,7 +190,7 @@ //if (ColorUse == DIB_PAL_COLORS) // lpRGB = DIB_MapPaletteColors(hDC, bmi); //else - // lpRGB = &bmi->bmiColors[0]; + // lpRGB = &bmi->bmiColors; DestSurf = &bitmap->SurfObj; @@ -810,6 +810,7 @@ UINT Entries = 0; BITMAP bm; SIZEL Size; + RGBQUAD *lpRGB; DPRINT("format (%ld,%ld), planes %d, bpp %d, size %ld, colors %ld (%s)\n", bi->biWidth, bi->biHeight, bi->biPlanes, bi->biBitCount, @@ -846,7 +847,9 @@ } if(usage == DIB_PAL_COLORS) - memcpy(bmi->bmiColors, (UINT *)DIB_MapPaletteColors(dc, bmi), sizeof(UINT *)); + lpRGB = DIB_MapPaletteColors(dc, bmi); + else + lpRGB = bmi->bmiColors; // Allocate Memory for DIB and fill structure if (bm.bmBits) @@ -869,9 +872,9 @@ else switch(bi->biBitCount) { case 16: - dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)bmi->bmiColors : 0x7c00; - dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)bmi->bmiColors + 1) : 0x03e0; - dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)bmi->bmiColors + 2) : 0x001f; break; + dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0x7c00; + dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x03e0; + dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x001f; break; case 24: dib->dsBitfields[0] = 0xff0000; @@ -880,9 +883,9 @@ break; case 32: - dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)bmi->bmiColors : 0xff0000; - dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)bmi->bmiColors + 1) : 0x00ff00; - dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)bmi->bmiColors + 2) : 0x0000ff; + dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0xff0000; + dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x00ff00; + dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x0000ff; break; } dib->dshSection = section; @@ -901,12 +904,20 @@ bm.bmBits); if (! res) { + if (lpRGB != bmi->bmiColors) + { + ExFreePool(lpRGB); + } SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); return NULL; } bmp = BITMAPOBJ_LockBitmap(res); if (NULL == bmp) { + if (lpRGB != bmi->bmiColors) + { + ExFreePool(lpRGB); + } SetLastWin32Error(ERROR_INVALID_HANDLE); NtGdiDeleteObject(bmp); return NULL; @@ -921,7 +932,7 @@ if(bi->biBitCount == 8) { Entries = 256; } if (Entries) - bmp->hDIBPalette = PALETTE_AllocPaletteIndexedRGB(Entries, bmi->bmiColors); + bmp->hDIBPalette = PALETTE_AllocPaletteIndexedRGB(Entries, lpRGB); else bmp->hDIBPalette = PALETTE_AllocPalette(PAL_BITFIELDS, 0, NULL, dib->dsBitfields[0], @@ -946,6 +957,11 @@ if (res) { BITMAPOBJ_FreeBitmap(res); res = 0; } } + if (lpRGB != bmi->bmiColors) + { + ExFreePool(lpRGB); + } + if (bmp) { BITMAPOBJ_UnlockBitmap(bmp); @@ -1097,6 +1113,12 @@ return NULL; } + if (palGDI->Mode != PAL_INDEXED) + { + PALETTE_UnlockPalette(palGDI); + return NULL; + } + nNumColors = 1 << lpbmi->bmiHeader.biBitCount; if (lpbmi->bmiHeader.biClrUsed) {

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