Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 54852: [USB-BRINGUP] - Implement IOCTL_KEYBOARD_QUERY_ATTRIBUTES, IOCTL_INTERNAL_KEYBOARD_CONNECT, IOCTL_INTERNAL_KEYBOARD_DISCONNECT, IOCTL_INTERNAL_KEYBOARD_ENABLE, IOCTL_INTERNAL_KE...
by janderwald＠svn.reactos.org 06 Jan '12

06 Jan '12

Author: janderwald Date: Fri Jan 6 18:32:35 2012 New Revision: 54852 URL: http://svn.reactos.org/svn/reactos?rev=54852&view=rev Log: [USB-BRINGUP] - Implement IOCTL_KEYBOARD_QUERY_ATTRIBUTES, IOCTL_INTERNAL_KEYBOARD_CONNECT, IOCTL_INTERNAL_KEYBOARD_DISCONNECT, IOCTL_INTERNAL_KEYBOARD_ENABLE, IOCTL_INTERNAL_KEYBOARD_DISABLE Modified: branches/usb-bringup/drivers/hid/kbdhid/kbdhid.c branches/usb-bringup/drivers/hid/kbdhid/kbdhid.h Modified: branches/usb-bringup/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/kbdhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Fri Jan 6 18:32:35 2012 @@ -249,6 +249,8 @@ { PIO_STACK_LOCATION IoStack; PKBDHID_DEVICE_EXTENSION DeviceExtension; + PCONNECT_DATA Data; + PKEYBOARD_ATTRIBUTES Attributes; /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -258,9 +260,131 @@ /* get device extension */ DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_QUERY_ATTRIBUTES) + { + /* verify output buffer length */ + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(MOUSE_ATTRIBUTES)) + { + /* invalid request */ + DPRINT1("[MOUHID] IOCTL_MOUSE_QUERY_ATTRIBUTES Buffer too small\n"); + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_BUFFER_TOO_SMALL; + } + + /* get output buffer */ + Attributes = (PKEYBOARD_ATTRIBUTES)Irp->AssociatedIrp.SystemBuffer; + + /* copy attributes */ + RtlCopyMemory(Attributes, &DeviceExtension->Attributes, sizeof(KEYBOARD_ATTRIBUTES)); + + /* complete request */ + Irp->IoStatus.Information = sizeof(MOUSE_ATTRIBUTES); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_KEYBOARD_CONNECT) + { + /* verify input buffer length */ + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) + { + /* invalid request */ + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_PARAMETER; + } + + /* is it already connected */ + if (DeviceExtension->ClassService) + { + /* already connected */ + Irp->IoStatus.Status = STATUS_SHARING_VIOLATION; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SHARING_VIOLATION; + } + + /* get connect data */ + Data = (PCONNECT_DATA)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + /* store connect details */ + DeviceExtension->ClassDeviceObject = Data->ClassDeviceObject; + DeviceExtension->ClassService = Data->ClassService; + + /* completed successfully */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_KEYBOARD_DISCONNECT) + { + /* not implemented */ + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_KEYBOARD_ENABLE) + { + /* not supported */ + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_KEYBOARD_DISABLE) + { + /* not supported */ + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_QUERY_INDICATORS) + { + /* not implemented */ + DPRINT1("IOCTL_KEYBOARD_QUERY_INDICATORS not implemented\n"); + ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_QUERY_TYPEMATIC) + { + /* not implemented */ + DPRINT1("IOCTL_KEYBOARD_QUERY_TYPEMATIC not implemented\n"); + ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_SET_INDICATORS) + { + /* not implemented */ + DPRINT1("IOCTL_KEYBOARD_SET_INDICATORS not implemented\n"); + ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_SET_TYPEMATIC) + { + /* not implemented */ + DPRINT1("IOCTL_KEYBOARD_SET_TYPEMATIC not implemented\n"); + ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION) + { + /* not implemented */ + DPRINT1("IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION not implemented\n"); + ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } + + /* unknown control code */ DPRINT1("[KBDHID] Unknown DeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); - - ASSERT(FALSE); /* unknown request not supported */ Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -624,6 +748,20 @@ /* init device extension */ DeviceExtension->NextDeviceObject = NextDeviceObject; KeInitializeEvent(&DeviceExtension->ReadCompletionEvent, NotificationEvent, FALSE); + + /* init keyboard attributes */ + DeviceExtension->Attributes.KeyboardIdentifier.Type = KEYBOARD_TYPE_UNKNOWN; + DeviceExtension->Attributes.KeyboardIdentifier.Subtype = MICROSOFT_KBD_101_TYPE; + DeviceExtension->Attributes.NumberOfFunctionKeys = MICROSOFT_KBD_FUNC; + DeviceExtension->Attributes.NumberOfIndicators = 3; // caps, num lock, scroll lock + DeviceExtension->Attributes.NumberOfKeysTotal = 101; + DeviceExtension->Attributes.InputDataQueueLength = 1; + DeviceExtension->Attributes.KeyRepeatMinimum.Rate = KEYBOARD_TYPEMATIC_RATE_MINIMUM; + DeviceExtension->Attributes.KeyRepeatMinimum.Delay = KEYBOARD_TYPEMATIC_DELAY_MINIMUM; + DeviceExtension->Attributes.KeyRepeatMaximum.Rate = KEYBOARD_TYPEMATIC_RATE_DEFAULT; + DeviceExtension->Attributes.KeyRepeatMaximum.Delay = KEYBOARD_TYPEMATIC_DELAY_MAXIMUM; + + /* allocate irp */ DeviceExtension->Irp = IoAllocateIrp(NextDeviceObject->StackSize, FALSE); /* FIXME handle allocation error */ Modified: branches/usb-bringup/drivers/hid/kbdhid/kbdhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/kbdhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] Fri Jan 6 18:32:35 2012 @@ -6,8 +6,9 @@ #include <hidpddi.h> #include <hidpi.h> #include <debug.h> -#include <ntddmou.h> #include <kbdmou.h> +//#include <kbd.h> +#include <ntddkbd.h> #include <debug.h> @@ -98,9 +99,30 @@ // UCHAR StopReadReport; + // + // keyboard attributes + // + KEYBOARD_ATTRIBUTES Attributes; + }KBDHID_DEVICE_EXTENSION, *PKBDHID_DEVICE_EXTENSION; + +/* defaults from kbfiltr.h */ +#define KEYBOARD_TYPEMATIC_RATE_MINIMUM 2 +#define KEYBOARD_TYPEMATIC_RATE_MAXIMUM 30 +#define KEYBOARD_TYPEMATIC_RATE_DEFAULT 30 +#define KEYBOARD_TYPEMATIC_DELAY_MINIMUM 250 +#define KEYBOARD_TYPEMATIC_DELAY_MAXIMUM 1000 +#define KEYBOARD_TYPEMATIC_DELAY_DEFAULT 250 + +/* FIXME: write kbd.h */ +#define MICROSOFT_KBD_FUNC 12 +#define KEYBOARD_TYPE_UNKNOWN (0x51) +#define MICROSOFT_KBD_101_TYPE 0 + + NTSTATUS KbdHid_InitiateRead( IN PKBDHID_DEVICE_EXTENSION DeviceExtension); +

1 0

[tkreuzer] 54851: [SAL.h] Add definitions for declspec based sal
by tkreuzer＠svn.reactos.org 06 Jan '12

06 Jan '12

Author: tkreuzer Date: Fri Jan 6 17:02:57 2012 New Revision: 54851 URL: http://svn.reactos.org/svn/reactos?rev=54851&view=rev Log: [SAL.h] Add definitions for declspec based sal Modified: trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=548… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Fri Jan 6 17:02:57 2012 @@ -31,7 +31,7 @@ #ifdef _PREFAST_ #ifndef _USE_DECLSPECS_FOR_SAL -#define _USE_DECLSPECS_FOR_SAL 0 +#define _USE_DECLSPECS_FOR_SAL 1 #endif #if !defined(_USE_ATTRIBUTES_FOR_SAL) || _USE_DECLSPECS_FOR_SAL @@ -192,6 +192,8 @@ #define __count_c_impl(size) ValidElementsConst=size #define __count_impl(size) ValidElements=NL_(size) #define __count_x_impl(size) ValidElements="\n@"#size +#define __inner_exceptthat [SAL_except] +#define __inner_typefix(ctype) [SAL_typefix(p1=_SA_SPECSTRIZE(ctype))] #define __maybenull_impl Null=SA_Maybe #define __maybenull_impl_notref Null=SA_Maybe,Notref=1 #define __maybevalid_impl Valid=SA_Maybe @@ -210,9 +212,6 @@ #define __writeaccess_impl Access=SA_Write #define __writeaccess_impl_notref Access=SA_Write,Notref=1 #define __zterm_impl NullTerminated=SA_Yes - -#define __inner_exceptthat [SAL_except] -#define __inner_typefix(ctype) [SAL_typefix(p1=_SA_SPECSTRIZE(ctype))] #define _Check_return_impl_ [returnvalue:SA_Post(MustCheck=SA_Yes)] #define _Deref_in_bound_impl_ [SA_PreBound(Deref=1)] #define _Deref_in_range_impl_(min,max) [SA_PreRange(Deref=1,MinVal=#min,MaxVal=#max)] @@ -234,6 +233,7 @@ #define _Deref2_ret1_impl_(p1) [returnvalue:SA_Post(Deref=2,Notref=1,p1)] #define _In_bound_impl_ [SA_PreBound(Deref=0)] #define _In_range_impl_(min,max) [SA_PreRange(MinVal=#min,MaxVal=#max)] +#define _Notref_impl_ _SA_annotes0(SAL_notref) #define _Out_bound_impl_ [SA_PostBound(Deref=0)] #define _Out_range_impl_(min,max) [SA_PostRange(MinVal=#min,MaxVal=#max)] #define _Post1_impl_(p1) [SA_Post(p1)] @@ -258,9 +258,93 @@ #else /* #if _USE_DECLSPECS_FOR_SAL */ -#error unimplemented - +#define __bytecap_c_impl(size) _SA_annotes1(SAL_writableTo,byteCount(size)) +#define __bytecap_impl(size) _SA_annotes1(SAL_writableTo,byteCount(size)) +#define __bytecap_x_impl(size) _SA_annotes1(SAL_writableTo,inexpressibleCount(#size)) +#define __bytecount_c_impl(size) _SA_annotes1(SAL_readableTo,byteCount(size)) +#define __bytecount_impl(size) _SA_annotes1(SAL_readableTo,byteCount(size)) +#define __bytecount_x_impl(size) _SA_annotes1(SAL_readableTo,inexpressibleCount(#size)) +#define __cap_c_impl(size) _SA_annotes1(SAL_writableTo,elementCount(size)) +#define __cap_c_one_notref_impl _Notref_ _SA_annotes1(SAL_writableTo,elementCount(1)) +#define __cap_for_impl(param) _SA_annotes1(SAL_writableTo,inexpressibleCount(sizeof(param))) +#define __cap_impl(size) _SA_annotes1(SAL_writableTo,elementCount(size)) +#define __cap_x_impl(size) _SA_annotes1(SAL_writableTo,inexpressibleCount(#size)) +#define __count_c_impl(size) _SA_annotes1(SAL_readableTo,elementCount(size)) +#define __count_impl(size) _SA_annotes1(SAL_readableTo,elementCount(size)) +#define __count_x_impl(size) _SA_annotes1(SAL_readableTo,inexpressibleCount(#size)) +#define __inner_exceptthat _SA_annotes0(SAL_except) +#define __inner_typefix(ctype) _SA_annotes1(SAL_typefix, ctype) +#define __maybenull_impl _SA_annotes0(SAL_maybenull) +#define __maybenull_impl_notref _Notref_ _Maybenull_impl_ +#define __maybevalid_impl _SA_annotes0(SAL_maybevalid) // _SA_annotes1(SAL_valid, __maybe) +#define __maybezterm_impl _SA_annotes1(SAL_nullTerminated, __maybe) +#define __maybzterm_impl _SA_annotes1(SAL_nullTerminated, __maybe) +#define __mult_impl(mult,size) _SA_annotes1(SAL_writableTo,(mult)*(size)) +#define __notnull_impl _SA_annotes0(SAL_notnull) // _SA_annotes1(SAL_null, __no) +#define __notnull_impl_notref _Notref_ _Notnull_impl_ +#define __notvalid_impl _SA_annotes0(SAL_notvalid) // _SA_annotes1(SAL_valid, __no) +#define __null_impl _SA_annotes0(SAL_null) // _SA_annotes1(SAL_null, __yes) +#define __null_impl_notref _Notref_ _Null_impl_ +#define __notzterm_impl _SA_annotes1(SAL_nullTerminated, __no) +#define __readaccess_impl _SA_annotes0(SAL_readonly) //_SA_annotes1(SAL_access, 0x1) +#define __readaccess_impl_notref _Notref_ _SA_annotes0(SAL_readonly) //_SA_annotes1(SAL_access, 0x1) +#define __valid_impl _SA_annotes0(SAL_valid) // _SA_annotes1(SAL_valid, __yes) +#define __writeaccess_impl _SA_annotes0(SAL_notreadonly) // _SA_annotes1(SAL_access, 0x2) +#define __writeaccess_impl_notref _Notref_ _SA_annotes0(SAL_notreadonly) // _SA_annotes1(SAL_access, 0x2) +#define __zterm_impl _SA_annotes1(SAL_nullTerminated, __yes) +#define _Check_return_impl_ __post _SA_annotes0(SAL_checkReturn) +#define _Deref_in_bound_impl_ _Deref_pre_impl_ _Bound_impl_ +#define _Deref_in_range_impl_(min,max) _Deref_pre_impl_ _Range_impl_(min,max) +#define _Deref_out_bound_impl_ _Deref_post_impl_ _Bound_impl_ +#define _Deref_out_range_impl_(min,max) _Deref_post_impl_ _Range_impl_(min,max) +#define _Deref_post_impl_ _Post_impl_ _Notref_impl_ _Deref_impl_ +#define _Deref_post1_impl_(p1) _Deref_post_impl_ p1 +#define _Deref_post2_impl_(p1,p2) _Deref_post_impl_ p1 _Deref_post_impl_ p2 +#define _Deref_post3_impl_(p1,p2,p3) _Deref_post_impl_ p1 _Deref_post_impl_ p2 _Deref_post_impl_ p3 +#define _Deref_pre_impl_ _Pre_impl_ _Notref_impl_ _Deref_impl_ +#define _Deref_pre1_impl_(p1) _Deref_pre_impl_ p1 +#define _Deref_pre2_impl_(p1,p2) _Deref_pre_impl_ p1 _Deref_pre_impl_ p2 +#define _Deref_pre3_impl_(p1,p2,p3) _Deref_pre_impl_ p1 _Deref_pre_impl_ p2 _Deref_pre_impl_ p3 +#define _Deref_ret_bound_impl_ _Deref_post_impl_ _Bound_impl_ +#define _Deref_ret_range_impl_(min,max) _Deref_post_impl_ _Range_impl_(min,max) +#define _Deref_ret1_impl_(p1) _Deref_post_impl_ p1 +#define _Deref_ret2_impl_(p1,p2) _Deref_post_impl_ p1 _Deref_post_impl_ p2 +#define _Deref_ret3_impl_(p1,p2,p3) _Deref_post_impl_ p1 _Deref_post_impl_ p2 _Deref_post_impl_ p3 +#define _Deref2_post1_impl_(p1) _Deref_post_impl_ _Notref_impl_ _Deref_impl_ p1 +#define _Deref2_pre1_impl_(p1) _Deref_pre_impl_ _Notref_impl_ _Deref_impl_ p1 +#define _Deref2_ret1_impl_(p1) _Deref_post_impl_ _Notref_impl_ _Deref_impl_ p1 +#define _In_bound_impl_ _Pre_impl_ _Bound_impl_ +#define _In_range_impl_(min,max) _Pre_impl_ _Range_impl_(min,max) +#if (_MSC_VER > 1600) // CHECKME: doesn't work with WDK 7600 +#define _Notref_impl_ _SA_annotes0(SAL_notref) +#else +#define _Notref_impl_ #endif +#define _Out_bound_impl_ _Post_impl_ _Bound_impl_ +#define _Out_range_impl_(min,max) _Post_impl_ _Range_impl_(min,max) +#define _Post1_impl_(p1) _Post_impl_ p1 +#define _Post2_impl_(p1,p2) _Post_impl_ p1 _Post_impl_ p2 +#define _Post3_impl_(p1,p2,p3) _Post_impl_ p1 _Post_impl_ p2 _Post_impl_ p3 +#define _Pre1_impl_(p1) _Pre_impl_ p1 +#define _Pre2_impl_(p1,p2) _Pre_impl_ p1 _Pre_impl_ p2 +#define _Pre3_impl_(p1,p2,p3) _Pre_impl_ p1 _Pre_impl_ p2 _Pre_impl_ p3 +#define _Printf_format_string_impl_ _SA_annotes1(SAL_IsFormatString, "printf") +#define _Ret_bound_impl_ _Post_impl_ _Bound_impl_ +#define _Ret_range_impl_(min,max) _Post_impl_ _Range_impl_(min,max) +#define _Ret1_impl_(p1) _Post_impl_ p1 +#define _Ret2_impl_(p1,p2) _Post_impl_ p1 _Post_impl_ p2 +#define _Ret3_impl_(p1,p2,p3) _Post_impl_ p1 _Post_impl_ p2 _Post_impl_ p3 +#define _SA_annotes0(n) __declspec(#n) +#define _SA_annotes1(n,pp1) __declspec(#n "(" _SA_SPECSTRIZE(pp1) ")" ) +#define _SA_annotes2(n,pp1,pp2) __declspec(#n "(" _SA_SPECSTRIZE(pp1) "," _SA_SPECSTRIZE(pp2) ")") +#define _SA_annotes3(n,pp1,pp2,pp3) __declspec(#n "(" _SA_SPECSTRIZE(pp1) "," _SA_SPECSTRIZE(pp2) "," _SA_SPECSTRIZE(pp3) ")") +#define _Scanf_format_string_impl_ _SA_annotes1(SAL_IsFormatString, "scanf") +#define _Scanf_s_format_string_impl_ _SA_annotes1(SAL_IsFormatString, "scanf_s") +#define _Use_decl_anno_impl_ __declspec("SAL_useHeader()") // this is a special case! + +#endif + +#define _SA_SPECSTRIZE(x) #x /* Common definitions */ #define _At_(target, annos) _At_impl_(target, annos _SAL_nop_impl_) @@ -279,7 +363,6 @@ #define _Must_inspect_impl_ _Post_impl_ _SA_annotes0(SAL_mustInspect) #define _Notliteral_impl_ _SA_annotes1(SAL_constant, __no) #define _Notnull_impl_ _SA_annotes1(SAL_null, __no) -#define _Notref_impl_ _SA_annotes0(SAL_notref) #define _Notvalid_impl_ _SA_annotes1(SAL_valid, __no) #define _Null_impl_ _SA_annotes1(SAL_null, __yes) #define _Null_terminated_impl_ _SA_annotes1(SAL_nullTerminated, __yes) @@ -1560,5 +1643,5 @@ #define _Writable_bytes_(size) #define _Writable_elements_(size) -#endif /* _USE_ATTRIBUTES_FOR_SAL || _USE_ATTRIBUTES_FOR_SAL */ - +#endif /* _USE_ATTRIBUTES_FOR_SAL || _USE_DECLSPECS_FOR_SAL */ +

1 0

[janderwald] 54850: [USB-BRINGUP] - Add keyboard hid driver template ripped off from mouhid driver - Implement keyboard driver initialization
by janderwald＠svn.reactos.org 06 Jan '12

06 Jan '12

Author: janderwald Date: Fri Jan 6 16:35:55 2012 New Revision: 54850 URL: http://svn.reactos.org/svn/reactos?rev=54850&view=rev Log: [USB-BRINGUP] - Add keyboard hid driver template ripped off from mouhid driver - Implement keyboard driver initialization Added: branches/usb-bringup/drivers/hid/kbdhid/ (with props) branches/usb-bringup/drivers/hid/kbdhid/CMakeLists.txt (with props) branches/usb-bringup/drivers/hid/kbdhid/kbdhid.c (with props) branches/usb-bringup/drivers/hid/kbdhid/kbdhid.h (with props) branches/usb-bringup/drivers/hid/kbdhid/kbdhid.rc (with props) Modified: branches/usb-bringup/drivers/hid/CMakeLists.txt branches/usb-bringup/drivers/hid/mouhid/mouhid.rc Modified: branches/usb-bringup/drivers/hid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/CMakeLi… ============================================================================== --- branches/usb-bringup/drivers/hid/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/CMakeLists.txt [iso-8859-1] Fri Jan 6 16:35:55 2012 @@ -1,4 +1,5 @@ add_subdirectory(hidclass) add_subdirectory(hidparse) add_subdirectory(hidusb) +add_subdirectory(kbdhid) add_subdirectory(mouhid) Propchange: branches/usb-bringup/drivers/hid/kbdhid/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Jan 6 16:35:55 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup/drivers/hid/kbdhid/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup/drivers/hid/kbdhid/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup/drivers/hid/kbdhid/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/usb-bringup/drivers/hid/kbdhid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/kbdhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/kbdhid/CMakeLists.txt (added) +++ branches/usb-bringup/drivers/hid/kbdhid/CMakeLists.txt [iso-8859-1] Fri Jan 6 16:35:55 2012 @@ -1,0 +1,13 @@ + +add_definitions(-DDEBUG_MODE) + +include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) + +add_library(kbdhid SHARED kbdhid.c kbdhid.rc) + +set_module_type(kbdhid kernelmodedriver) +add_importlibs(kbdhid ntoskrnl hal hidparse) +add_cab_target(kbdhid 2) + +add_cab_target(kbdhid 2) + Propchange: branches/usb-bringup/drivers/hid/kbdhid/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/kbdhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/kbdhid/kbdhid.c (added) +++ branches/usb-bringup/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Fri Jan 6 16:35:55 2012 @@ -1,0 +1,674 @@ +/* + * PROJECT: ReactOS HID Stack + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/hid/kbdhid/kbdhid.c + * PURPOSE: Keyboard HID Driver + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "kbdhid.h" + +VOID +KbdHid_DispatchInputData( + IN PKBDHID_DEVICE_EXTENSION DeviceExtension, + IN PKEYBOARD_INPUT_DATA InputData, + IN ULONG InputDataLength) +{ + KIRQL OldIrql; + ULONG InputDataConsumed; + + if (!DeviceExtension->ClassService) + return; + + /* sanity check */ + ASSERT(DeviceExtension->ClassService); + ASSERT(DeviceExtension->ClassDeviceObject); + + /* raise irql */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + /* dispatch input data */ + (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassService)(DeviceExtension->ClassDeviceObject, InputData, InputData + InputDataLength + 1, &InputDataConsumed); + + /* lower irql to previous level */ + KeLowerIrql(OldIrql); +} + +NTSTATUS +NTAPI +KbdHid_ReadCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PKBDHID_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = (PKBDHID_DEVICE_EXTENSION)Context; + + if (Irp->IoStatus.Status == STATUS_PRIVILEGE_NOT_HELD || + Irp->IoStatus.Status == STATUS_DEVICE_NOT_CONNECTED || + Irp->IoStatus.Status == STATUS_CANCELLED || + DeviceExtension->StopReadReport) + { + /* failed to read or should be stopped*/ + DPRINT1("[KBDHID] ReadCompletion terminating read Status %x\n", Irp->IoStatus.Status); + + /* report no longer active */ + DeviceExtension->ReadReportActive = FALSE; + + /* request stopping of the report cycle */ + DeviceExtension->StopReadReport = FALSE; + + /* signal completion event */ + KeSetEvent(&DeviceExtension->ReadCompletionEvent, 0, 0); + return STATUS_MORE_PROCESSING_REQUIRED; + } + + UNIMPLEMENTED + ASSERT(FALSE); + + /* dispatch mouse action */ + //KbdHid_DispatchInputData(DeviceExtension, &InputData); + + /* re-init read */ + KbdHid_InitiateRead(DeviceExtension); + + /* stop completion */ + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +KbdHid_InitiateRead( + IN PKBDHID_DEVICE_EXTENSION DeviceExtension) +{ + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + + /* re-use irp */ + IoReuseIrp(DeviceExtension->Irp, STATUS_SUCCESS); + + /* init irp */ + DeviceExtension->Irp->MdlAddress = DeviceExtension->ReportMDL; + + /* get next stack location */ + IoStack = IoGetNextIrpStackLocation(DeviceExtension->Irp); + + /* init stack location */ + IoStack->Parameters.Read.Length = DeviceExtension->ReportLength; + IoStack->Parameters.Read.Key = 0; + IoStack->Parameters.Read.ByteOffset.QuadPart = 0LL; + IoStack->MajorFunction = IRP_MJ_READ; + IoStack->FileObject = DeviceExtension->FileObject; + + /* set completion routine */ + IoSetCompletionRoutine(DeviceExtension->Irp, KbdHid_ReadCompletion, DeviceExtension, TRUE, TRUE, TRUE); + + /* read is active */ + DeviceExtension->ReadReportActive = TRUE; + + /* start the read */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, DeviceExtension->Irp); + + /* done */ + return Status; +} + +NTSTATUS +NTAPI +KbdHid_CreateCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + KeSetEvent((PKEVENT)Context, 0, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; +} + + +NTSTATUS +NTAPI +KbdHid_Create( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + KEVENT Event; + PKBDHID_DEVICE_EXTENSION DeviceExtension; + + DPRINT1("[KBDHID]: IRP_MJ_CREATE\n"); + + /* get device extension */ + DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* get stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* copy stack location to next */ + IoCopyCurrentIrpStackLocationToNext(Irp); + + /* init event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* prepare irp */ + IoSetCompletionRoutine(Irp, KbdHid_CreateCompletion, &Event, TRUE, TRUE, TRUE); + + /* call lower driver */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* request pending */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* failed */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + /* is the driver already in use */ + if (DeviceExtension->FileObject == NULL) + { + /* did the caller specify correct attributes */ + ASSERT(IoStack->Parameters.Create.SecurityContext); + if (IoStack->Parameters.Create.SecurityContext->DesiredAccess) + { + /* store file object */ + DeviceExtension->FileObject = IoStack->FileObject; + + /* reset event */ + KeResetEvent(&DeviceExtension->ReadCompletionEvent); + + /* initiating read */ + Status = KbdHid_InitiateRead(DeviceExtension); + DPRINT1("[KBDHID] KbdHid_InitiateRead: status %x\n", Status); + if (Status == STATUS_PENDING) + { + /* report irp is pending */ + Status = STATUS_SUCCESS; + } + } + } + + /* complete request */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + + +NTSTATUS +NTAPI +KbdHid_Close( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PKBDHID_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + DPRINT("[KBDHID] IRP_MJ_CLOSE ReadReportActive %x\n", DeviceExtension->ReadReportActive); + + if (DeviceExtension->ReadReportActive) + { + /* request stopping of the report cycle */ + DeviceExtension->StopReadReport = TRUE; + + /* wait until the reports have been read */ + KeWaitForSingleObject(&DeviceExtension->ReadCompletionEvent, Executive, KernelMode, FALSE, NULL); + + /* cancel irp */ + IoCancelIrp(DeviceExtension->Irp); + } + + DPRINT("[KBDHID] IRP_MJ_CLOSE ReadReportActive %x\n", DeviceExtension->ReadReportActive); + + /* remove file object */ + DeviceExtension->FileObject = NULL; + + /* skip location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* pass irp to down the stack */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); +} + +NTSTATUS +NTAPI +KbdHid_InternalDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PKBDHID_DEVICE_EXTENSION DeviceExtension; + + /* get current stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + DPRINT1("[KBDHID] InternalDeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); + + /* get device extension */ + DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + DPRINT1("[KBDHID] Unknown DeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); + + ASSERT(FALSE); + /* unknown request not supported */ + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +KbdHid_DeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PKBDHID_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* skip stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* pass and forget */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); +} + +NTSTATUS +NTAPI +KbdHid_Power( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +KbdHid_SubmitRequest( + PDEVICE_OBJECT DeviceObject, + ULONG IoControlCode, + ULONG InputBufferSize, + PVOID InputBuffer, + ULONG OutputBufferSize, + PVOID OutputBuffer) +{ + KEVENT Event; + PKBDHID_DEVICE_EXTENSION DeviceExtension; + PIRP Irp; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatus; + + /* get device extension */ + DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* init event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* build request */ + Irp = IoBuildDeviceIoControlRequest(IoControlCode, DeviceExtension->NextDeviceObject, InputBuffer, InputBufferSize, OutputBuffer, OutputBufferSize, FALSE, &Event, &IoStatus); + if (!Irp) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* send request */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* wait for request to complete */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + /* done */ + return Status; +} + +NTSTATUS +NTAPI +KbdHid_StartDevice( + IN PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + ULONG Buttons; + HID_COLLECTION_INFORMATION Information; + PHIDP_PREPARSED_DATA PreparsedData; + HIDP_CAPS Capabilities; + PKBDHID_DEVICE_EXTENSION DeviceExtension; + PUSAGE_AND_PAGE Buffer; + + /* get device extension */ + DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* query collection information */ + Status = KbdHid_SubmitRequest(DeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, 0, NULL, sizeof(HID_COLLECTION_INFORMATION), &Information); + if (!NT_SUCCESS(Status)) + { + /* failed to query collection information */ + DPRINT1("[KBDHID] failed to obtain collection information with %x\n", Status); + return Status; + } + + /* lets allocate space for preparsed data */ + PreparsedData = (PHIDP_PREPARSED_DATA)ExAllocatePool(NonPagedPool, Information.DescriptorSize); + if (!PreparsedData) + { + /* no memory */ + DPRINT1("[KBDHID] no memory size %u\n", Information.DescriptorSize); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* now obtain the preparsed data */ + Status = KbdHid_SubmitRequest(DeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, 0, NULL, Information.DescriptorSize, PreparsedData); + if (!NT_SUCCESS(Status)) + { + /* failed to get preparsed data */ + DPRINT1("[KBDHID] failed to obtain collection information with %x\n", Status); + ExFreePool(PreparsedData); + return Status; + } + + /* lets get the caps */ + Status = HidP_GetCaps(PreparsedData, &Capabilities); + if (Status != HIDP_STATUS_SUCCESS) + { + /* failed to get capabilities */ + DPRINT1("[KBDHID] failed to obtain caps with %x\n", Status); + ExFreePool(PreparsedData); + return Status; + } + + DPRINT1("[KBDHID] Usage %x UsagePage %x InputReportLength %lu\n", Capabilities.Usage, Capabilities.UsagePage, Capabilities.InputReportByteLength); + + /* init input report*/ + DeviceExtension->ReportLength = Capabilities.InputReportByteLength; + ASSERT(DeviceExtension->ReportLength); + DeviceExtension->Report = (PUCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength); + ASSERT(DeviceExtension->Report); + RtlZeroMemory(DeviceExtension->Report, DeviceExtension->ReportLength); + + /* build mdl */ + DeviceExtension->ReportMDL = IoAllocateMdl(DeviceExtension->Report, DeviceExtension->ReportLength, FALSE, FALSE, NULL); + ASSERT(DeviceExtension->ReportMDL); + + /* init mdl */ + MmBuildMdlForNonPagedPool(DeviceExtension->ReportMDL); + + /* get max number of buttons */ + Buttons = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON, PreparsedData); + DPRINT1("[KBDHID] Buttons %lu\n", Buttons); + ASSERT(Buttons > 0); + + /* now allocate an array for those buttons */ + Buffer = (PUSAGE_AND_PAGE)ExAllocatePool(NonPagedPool, sizeof(USAGE_AND_PAGE) * 4 * Buttons); + if (!Buffer) + { + /* no memory */ + ExFreePool(PreparsedData); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* init usage lists */ + RtlZeroMemory(Buffer, sizeof(USAGE_AND_PAGE) * 4 * Buttons); + DeviceExtension->CurrentUsageList = Buffer; + Buffer += Buttons; + DeviceExtension->PreviousUsageList = Buffer; + Buffer += Buttons; + DeviceExtension->MakeUsageList = Buffer; + Buffer += Buttons; + DeviceExtension->BreakUsageList = Buffer; + + // + // FIMXE: implement device hacks + // + // UsageMappings + // KeyboardTypeOverride + // KeyboardSubTypeOverride + // KeyboardNumberTotalKeysOverride + // KeyboardNumberFunctionKeysOverride + // KeyboardNumberIndicatorsOverride + + /* store number of buttons */ + DeviceExtension->UsageListLength = (USHORT)Buttons; + + /* store preparsed data */ + DeviceExtension->PreparsedData = PreparsedData; + + /* completed successfully */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KbdHid_StartDeviceCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + KeSetEvent((PKEVENT)Context, 0, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +NTAPI +KbdHid_Flush( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PKBDHID_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* skip current stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* get next stack location */ + IoStack = IoGetNextIrpStackLocation(Irp); + + /* change request to hid flush queue request */ + IoStack->MajorFunction = IRP_MJ_DEVICE_CONTROL; + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_HID_FLUSH_QUEUE; + + /* call device */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); +} + +NTSTATUS +NTAPI +KbdHid_Pnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + KEVENT Event; + NTSTATUS Status; + PKBDHID_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + DPRINT1("[KBDHID] IRP_MJ_PNP Request: %x\n", IoStack->MinorFunction); + + if (IoStack->MinorFunction == IRP_MN_STOP_DEVICE || IoStack->MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE || IoStack->MinorFunction == IRP_MN_QUERY_STOP_DEVICE || IoStack->MinorFunction == IRP_MN_CANCEL_STOP_DEVICE) + { + /* indicate success */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + } + else if (IoStack->MinorFunction == IRP_MN_REMOVE_DEVICE) + { + /* FIXME synchronization */ + + /* cancel irp */ + IoCancelIrp(DeviceExtension->Irp); + + /* indicate success */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + + IoFreeIrp(DeviceExtension->Irp); + IoDetachDevice(DeviceExtension->NextDeviceObject); + IoDeleteDevice(DeviceObject); + return Status; + } + else if (IoStack->MinorFunction == IRP_MN_START_DEVICE) + { + /* init event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* copy stack location */ + IoCopyCurrentIrpStackLocationToNext (Irp); + + /* set completion routine */ + IoSetCompletionRoutine(Irp, KbdHid_StartDeviceCompletion, &Event, TRUE, TRUE, TRUE); + Irp->IoStatus.Status = 0; + + /* pass request */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Irp->IoStatus.Status; + } + + if (!NT_SUCCESS(Status)) + { + /* failed */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + /* lets start the device */ + Status = KbdHid_StartDevice(DeviceObject); + DPRINT1("KbdHid_StartDevice %x\n", Status); + + /* complete request */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* done */ + return Status; + } + else + { + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + } +} + +NTSTATUS +NTAPI +KbdHid_AddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + NTSTATUS Status; + PDEVICE_OBJECT DeviceObject, NextDeviceObject; + PKBDHID_DEVICE_EXTENSION DeviceExtension; + POWER_STATE State; + + /* create device object */ + Status = IoCreateDevice(DriverObject, sizeof(KBDHID_DEVICE_EXTENSION), NULL, FILE_DEVICE_KEYBOARD, 0, FALSE, &DeviceObject); + if (!NT_SUCCESS(Status)) + { + /* failed to create device object */ + return Status; + } + + /* now attach it */ + NextDeviceObject = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); + if (!NextDeviceObject) + { + /* failed to attach */ + IoDeleteDevice(DeviceObject); + return STATUS_DEVICE_NOT_CONNECTED; + } + + /* get device extension */ + DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* zero extension */ + RtlZeroMemory(DeviceExtension, sizeof(KBDHID_DEVICE_EXTENSION)); + + /* init device extension */ + DeviceExtension->NextDeviceObject = NextDeviceObject; + KeInitializeEvent(&DeviceExtension->ReadCompletionEvent, NotificationEvent, FALSE); + DeviceExtension->Irp = IoAllocateIrp(NextDeviceObject->StackSize, FALSE); + + /* FIXME handle allocation error */ + ASSERT(DeviceExtension->Irp); + + /* set power state to D0 */ + State.DeviceState = PowerDeviceD0; + PoSetPowerState(DeviceObject, DevicePowerState, State); + + /* init device object */ + DeviceObject->Flags |= DO_BUFFERED_IO | DO_POWER_PAGABLE; + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + /* completed successfully */ + return STATUS_SUCCESS; +} + +VOID +NTAPI +KbdHid_Unload( + IN PDRIVER_OBJECT DriverObject) +{ + UNIMPLEMENTED +} + + +NTSTATUS +NTAPI +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegPath) +{ + /* initialize driver object */ + DriverObject->DriverUnload = KbdHid_Unload; + DriverObject->DriverExtension->AddDevice = KbdHid_AddDevice; + DriverObject->MajorFunction[IRP_MJ_CREATE] = KbdHid_Create; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = KbdHid_Close; + DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = KbdHid_Flush; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = KbdHid_DeviceControl; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = KbdHid_InternalDeviceControl; + DriverObject->MajorFunction[IRP_MJ_POWER] = KbdHid_Power; + DriverObject->MajorFunction[IRP_MJ_PNP] = KbdHid_Pnp; + DriverObject->DriverUnload = KbdHid_Unload; + DriverObject->DriverExtension->AddDevice = KbdHid_AddDevice; + + /* done */ + return STATUS_SUCCESS; +} Propchange: branches/usb-bringup/drivers/hid/kbdhid/kbdhid.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/hid/kbdhid/kbdhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/kbdhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/kbdhid/kbdhid.h (added) +++ branches/usb-bringup/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] Fri Jan 6 16:35:55 2012 @@ -1,0 +1,106 @@ +#pragma once + +#define _HIDPI_NO_FUNCTION_MACROS_ +#include <ntddk.h> +#include <hidclass.h> +#include <hidpddi.h> +#include <hidpi.h> +#include <debug.h> +#include <ntddmou.h> +#include <kbdmou.h> +#include <debug.h> + + +typedef struct +{ + // + // lower device object + // + PDEVICE_OBJECT NextDeviceObject; + + // + // irp which is used for reading input reports + // + PIRP Irp; + + // + // event + // + KEVENT ReadCompletionEvent; + + // + // device object for class callback + // + PDEVICE_OBJECT ClassDeviceObject; + + // + // class callback + // + PVOID ClassService; + + // + // usage list length + // + USHORT UsageListLength; + + // + // current usage list length + // + PUSAGE_AND_PAGE CurrentUsageList; + + // + // previous usage list + // + PUSAGE_AND_PAGE PreviousUsageList; + + // + // removed usage item list + // + PUSAGE_AND_PAGE BreakUsageList; + + // + // new item usage list + // + PUSAGE_AND_PAGE MakeUsageList; + + // + // preparsed data + // + PVOID PreparsedData; + + // + // mdl for reading input report + // + PMDL ReportMDL; + + // + // input report buffer + // + PUCHAR Report; + + // + // input report length + // + ULONG ReportLength; + + // + // file object the device is reading reports from + // + PFILE_OBJECT FileObject; + + // + // report read is active + // + UCHAR ReadReportActive; + + // + // stop reading flag + // + UCHAR StopReadReport; + +}KBDHID_DEVICE_EXTENSION, *PKBDHID_DEVICE_EXTENSION; + + +NTSTATUS +KbdHid_InitiateRead( + IN PKBDHID_DEVICE_EXTENSION DeviceExtension); Propchange: branches/usb-bringup/drivers/hid/kbdhid/kbdhid.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/hid/kbdhid/kbdhid.rc URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/kbdhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/kbdhid/kbdhid.rc (added) +++ branches/usb-bringup/drivers/hid/kbdhid/kbdhid.rc [iso-8859-1] Fri Jan 6 16:35:55 2012 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Keyboard HID Class Driver\0" +#define REACTOS_STR_INTERNAL_NAME "kbdhid\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdhid.sys\0" +#include <reactos/version.rc> Propchange: branches/usb-bringup/drivers/hid/kbdhid/kbdhid.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.rc URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.rc [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.rc [iso-8859-1] Fri Jan 6 16:35:55 2012 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "USB HID Parser\0" -#define REACTOS_STR_INTERNAL_NAME "hidparse\0" -#define REACTOS_STR_ORIGINAL_FILENAME "hidparse.sys\0" +#define REACTOS_STR_FILE_DESCRIPTION "Mouse HID Class Driver\0" +#define REACTOS_STR_INTERNAL_NAME "mouhid\0" +#define REACTOS_STR_ORIGINAL_FILENAME "mouhid.sys\0" #include <reactos/version.rc>

1 0

[cgutman] 54849: [NDISUIO] - Build fixes
by cgutman＠svn.reactos.org 06 Jan '12

06 Jan '12

Author: cgutman Date: Fri Jan 6 05:59:56 2012 New Revision: 54849 URL: http://svn.reactos.org/svn/reactos?rev=54849&view=rev Log: [NDISUIO] - Build fixes Added: branches/wlan-bringup/include/reactos/drivers/ndisuio/ branches/wlan-bringup/include/reactos/drivers/ndisuio/nuiouser.h (with props) Modified: branches/wlan-bringup/drivers/network/CMakeLists.txt branches/wlan-bringup/drivers/network/directory.rbuild branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt branches/wlan-bringup/drivers/network/ndisuio/createclose.c branches/wlan-bringup/drivers/network/ndisuio/ioctl.c branches/wlan-bringup/drivers/network/ndisuio/main.c branches/wlan-bringup/drivers/network/ndisuio/misc.c branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h branches/wlan-bringup/drivers/network/ndisuio/protocol.c branches/wlan-bringup/drivers/network/ndisuio/readwrite.c Modified: branches/wlan-bringup/drivers/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/CM… ============================================================================== --- branches/wlan-bringup/drivers/network/CMakeLists.txt [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/CMakeLists.txt [iso-8859-1] Fri Jan 6 05:59:56 2012 @@ -2,5 +2,6 @@ add_subdirectory(afd) add_subdirectory(dd) add_subdirectory(ndis) +add_subdirectory(ndisuio) add_subdirectory(tcpip) add_subdirectory(tdi) Modified: branches/wlan-bringup/drivers/network/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/di… ============================================================================== --- branches/wlan-bringup/drivers/network/directory.rbuild [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/directory.rbuild [iso-8859-1] Fri Jan 6 05:59:56 2012 @@ -10,6 +10,9 @@ <directory name="ndis"> <xi:include href="ndis/ndis.rbuild" /> </directory> +<directory name="ndisuio"> + <xi:include href="ndisuio/ndisuio.rbuild" /> +</directory> <directory name="tcpip"> <xi:include href="tcpip/tcpip.rbuild" /> </directory> Modified: branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt [iso-8859-1] Fri Jan 6 05:59:56 2012 @@ -1,6 +1,10 @@ add_definitions( -DNDIS50 -D_NTDRIVER_) + +include_directories( + BEFORE include + ${REACTOS_SOURCE_DIR}/include/reactos/drivers/ndisuio) list(APPEND SOURCE createclose.c Modified: branches/wlan-bringup/drivers/network/ndisuio/createclose.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/createclose.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/createclose.c [iso-8859-1] Fri Jan 6 05:59:56 2012 @@ -41,7 +41,6 @@ PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; PNDISUIO_OPEN_ENTRY OpenEntry = IrpSp->FileObject->FsContext2; - KIRQL OldIrql; ASSERT(DeviceObject == GlobalDeviceObject); Modified: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] Fri Jan 6 05:59:56 2012 @@ -11,7 +11,7 @@ #define NDEBUG #include <debug.h> - +static NTSTATUS WaitForBind(PIRP Irp, PIO_STACK_LOCATION IrpSp) { @@ -28,6 +28,7 @@ return STATUS_SUCCESS; } +static NTSTATUS QueryBinding(PIRP Irp, PIO_STACK_LOCATION IrpSp) { @@ -96,6 +97,8 @@ return Status; } +#if 0 +static NTSTATUS CancelPacketRead(PIRP Irp, PIO_STACK_LOCATION IrpSp) { @@ -129,13 +132,15 @@ return Status; } - +#endif + +static NTSTATUS SetAdapterOid(PIRP Irp, PIO_STACK_LOCATION IrpSp) { PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; PNDISUIO_SET_OID SetOidRequest; - NDIS_REQUEST NdisRequest; + NDIS_REQUEST Request; ULONG RequestLength; NDIS_STATUS Status; @@ -143,18 +148,18 @@ SetOidRequest = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; RequestLength = IrpSp->Parameters.DeviceIoControl.InputBufferLength; - if (QueryOidRequest && RequestLength >= sizeof(NDIS_OID)) + if (SetOidRequest && RequestLength >= sizeof(NDIS_OID)) { /* Setup the NDIS request */ - NdisRequest.RequestType = NdisRequestSetInformation; - NdisRequest.Oid = SetOidRequest->Oid; - NdisRequest.InformationBuffer = SetOidRequest->Data; - NdisRequest.InformationBufferLength = RequestLength - sizeof(NDIS_OID); + Request.RequestType = NdisRequestSetInformation; + Request.DATA.SET_INFORMATION.Oid = SetOidRequest->Oid; + Request.DATA.SET_INFORMATION.InformationBuffer = SetOidRequest->Data; + Request.DATA.SET_INFORMATION.InformationBufferLength = RequestLength - sizeof(NDIS_OID); /* Dispatch the request */ NdisRequest(&Status, AdapterContext->BindingHandle, - &NdisRequest); + &Request); /* Wait for the request */ if (Status == NDIS_STATUS_PENDING) @@ -168,7 +173,7 @@ } /* Return the bytes read */ - if (NT_SUCCESS(Status)) Irp->IoStatus.Information = NdisRequest.BytesRead; + if (NT_SUCCESS(Status)) Irp->IoStatus.Information = Request.DATA.SET_INFORMATION.BytesRead; } else { @@ -183,12 +188,13 @@ return Status; } +static NTSTATUS QueryAdapterOid(PIRP Irp, PIO_STACK_LOCATION IrpSp) { PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; PNDISUIO_QUERY_OID QueryOidRequest; - NDIS_REQUEST NdisRequest; + NDIS_REQUEST Request; ULONG RequestLength; NDIS_STATUS Status; @@ -199,15 +205,15 @@ if (QueryOidRequest && RequestLength >= sizeof(NDIS_OID)) { /* Setup the NDIS request */ - NdisRequest.RequestType = NdisRequestQueryInformation; - NdisRequest.Oid = QueryOidRequest->Oid; - NdisRequest.InformationBuffer = QueryOidRequest->Data; - NdisRequest.InformationBufferLength = RequestLength - sizeof(NDIS_OID); + Request.RequestType = NdisRequestQueryInformation; + Request.DATA.QUERY_INFORMATION.Oid = QueryOidRequest->Oid; + Request.DATA.QUERY_INFORMATION.InformationBuffer = QueryOidRequest->Data; + Request.DATA.QUERY_INFORMATION.InformationBufferLength = RequestLength - sizeof(NDIS_OID); /* Dispatch the request */ NdisRequest(&Status, AdapterContext->BindingHandle, - &NdisRequest); + &Request); /* Wait for the request */ if (Status == NDIS_STATUS_PENDING) @@ -221,7 +227,7 @@ } /* Return the bytes written */ - if (NT_SUCCESS(Status)) Irp->IoStatus.Information = NdisRequest.BytesWritten; + if (NT_SUCCESS(Status)) Irp->IoStatus.Information = Request.DATA.QUERY_INFORMATION.BytesWritten; } else { @@ -236,6 +242,7 @@ return Status; } +static NTSTATUS OpenDeviceReadWrite(PIRP Irp, PIO_STACK_LOCATION IrpSp) { @@ -307,7 +314,7 @@ { /* Remove the reference we added */ KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); - DereferenceAdapterContext(AdapterContext, NULL); + DereferenceAdapterContextWithOpenEntry(AdapterContext, NULL); Status = STATUS_NO_MEMORY; } } @@ -326,6 +333,8 @@ return Status; } +#if 0 +static NTSTATUS OpenDeviceWrite(PIRP Irp, PIO_STACK_LOCATION IrpSp) { @@ -404,6 +413,7 @@ return Status; } +#endif NTSTATUS NTAPI @@ -420,10 +430,10 @@ { case IOCTL_NDISUIO_OPEN_DEVICE: return OpenDeviceReadWrite(Irp, IrpSp); - +#if 0 case IOCTL_NDISUIO_OPEN_WRITE_DEVICE: return OpenDeviceWrite(Irp, IrpSp); - +#endif case IOCTL_NDISUIO_BIND_WAIT: return WaitForBind(Irp, IrpSp); @@ -461,8 +471,10 @@ switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) { +#if 0 case IOCTL_CANCEL_READ: return CancelPacketRead(Irp, IrpSp); +#endif case IOCTL_NDISUIO_QUERY_OID_VALUE: return QueryAdapterOid(Irp, IrpSp); @@ -472,7 +484,7 @@ Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - break; + return STATUS_NOT_IMPLEMENTED; } } break; Modified: branches/wlan-bringup/drivers/network/ndisuio/main.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/main.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/main.c [iso-8859-1] Fri Jan 6 05:59:56 2012 @@ -13,12 +13,16 @@ PDEVICE_OBJECT GlobalDeviceObject; NDIS_HANDLE GlobalProtocolHandle; +KSPIN_LOCK GlobalAdapterListLock; +LIST_ENTRY GlobalAdapterList; +NDIS_HANDLE GlobalPacketPoolHandle; +NDIS_HANDLE GlobalBufferPoolHandle; + +NDIS_STRING ProtocolName = RTL_CONSTANT_STRING(L"NDISUIO"); VOID NTAPI NduUnload(PDRIVER_OBJECT DriverObject) -{ - IoDeleteDevice(GlobalDeviceObject); - - DPRINT("NDISUIO: Unloaded\n"); +{ + DPRINT1("NDISUIO: Unloaded\n"); } NTSTATUS @@ -26,8 +30,10 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) { - NTSTATUS Status; + NDIS_STATUS Status; NDIS_PROTOCOL_CHARACTERISTICS Chars; + UNICODE_STRING NtDeviceName = RTL_CONSTANT_STRING(NDISUIO_DEVICE_NAME_NT); + UNICODE_STRING DosDeviceName = RTL_CONSTANT_STRING(NDISUIO_DEVICE_NAME_DOS); /* Setup dispatch functions */ DriverObject->MajorFunction[IRP_MJ_CREATE] = NduDispatchCreate; @@ -36,13 +42,17 @@ DriverObject->MajorFunction[IRP_MJ_READ] = NduDispatchRead; DriverObject->MajorFunction[IRP_MJ_WRITE] = NduDispatchWrite; DriverObject->DriverUnload = NduUnload; + + /* Setup global state */ + InitializeListHead(&GlobalAdapterList); + KeInitializeSpinLock(&GlobalAdapterListLock); /* Create the NDISUIO device object */ Status = IoCreateDevice(DriverObject, 0, - NULL, // FIXME - NDISUIO_DEVICE_NAME, + &NtDeviceName, FILE_DEVICE_SECURE_OPEN, + 0, FALSE, &GlobalDeviceObject); if (!NT_SUCCESS(Status)) @@ -51,6 +61,41 @@ return Status; } + /* Create a symbolic link into the DOS devices namespace */ + Status = IoCreateSymbolicLink(&DosDeviceName, &NtDeviceName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create symbolic link with status 0x%x\n", Status); + IoDeleteDevice(GlobalDeviceObject); + return Status; + } + + /* Create the buffer pool */ + NdisAllocateBufferPool(&Status, + &GlobalBufferPoolHandle, + 100); + if (Status != NDIS_STATUS_SUCCESS) + { + DPRINT1("Failed to allocate buffer pool with status 0x%x\n", Status); + IoDeleteSymbolicLink(&DosDeviceName); + IoDeleteDevice(GlobalDeviceObject); + return Status; + } + + /* Create the packet pool */ + NdisAllocatePacketPool(&Status, + &GlobalPacketPoolHandle, + 50, + 0); + if (Status != NDIS_STATUS_SUCCESS) + { + DPRINT1("Failed to allocate packet pool with status 0x%x\n", Status); + NdisFreeBufferPool(GlobalBufferPoolHandle); + IoDeleteSymbolicLink(&DosDeviceName); + IoDeleteDevice(GlobalDeviceObject); + return Status; + } + /* Register the protocol with NDIS */ RtlZeroMemory(&Chars, sizeof(Chars)); Chars.MajorNdisVersion = NDIS_MAJOR_VERSION; @@ -62,14 +107,12 @@ Chars.ResetCompleteHandler = NduResetComplete; Chars.RequestCompleteHandler = NduRequestComplete; Chars.ReceiveHandler = NduReceive; - Chars.ReceiveComplete = NduReceiveComplete; + Chars.ReceiveCompleteHandler = NduReceiveComplete; Chars.StatusHandler = NduStatus; Chars.StatusCompleteHandler = NduStatusComplete; - Chars.Name = NULL; //FIXME - Chars.ReceivePacketHandler = NULL; //NduReceivePacket + Chars.Name = ProtocolName; Chars.BindAdapterHandler = NduBindAdapter; Chars.UnbindAdapterHandler = NduUnbindAdapter; - Chars.PnPEventHandler = NduPnPEvent; NdisRegisterProtocol(&Status, &GlobalProtocolHandle, @@ -78,11 +121,14 @@ if (Status != NDIS_STATUS_SUCCESS) { DPRINT1("Failed to register protocol with status 0x%x\n", Status); + NdisFreePacketPool(GlobalPacketPoolHandle); + NdisFreeBufferPool(GlobalBufferPoolHandle); + IoDeleteSymbolicLink(&DosDeviceName); IoDeleteDevice(GlobalDeviceObject); return Status; } - DPRINT("NDISUIO: Loaded\n"); + DPRINT1("NDISUIO: Loaded\n"); return STATUS_SUCCESS; } Modified: branches/wlan-bringup/drivers/network/ndisuio/misc.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/misc.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/misc.c [iso-8859-1] Fri Jan 6 05:59:56 2012 @@ -15,13 +15,14 @@ AllocateAndChainBuffer(PNDIS_PACKET Packet, PVOID Buffer, ULONG BufferSize, BOOLEAN Front) { NDIS_STATUS Status; + PNDIS_BUFFER NdisBuffer; /* Allocate the NDIS buffer mapping the pool */ NdisAllocateBuffer(&Status, - &Buffer, + &NdisBuffer, GlobalBufferPoolHandle, Buffer, - Length); + BufferSize); if (Status != NDIS_STATUS_SUCCESS) { DPRINT1("No free buffer descriptors\n"); @@ -31,12 +32,12 @@ if (Front) { /* Chain the buffer to front */ - NdisChainBufferAtFront(Packet, Buffer); + NdisChainBufferAtFront(Packet, NdisBuffer); } else { /* Chain the buffer to back */ - NdisChainBufferAtBack(Packet, Buffer); + NdisChainBufferAtBack(Packet, NdisBuffer); } /* Return success */ Modified: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h [iso-8859-1] Fri Jan 6 05:59:56 2012 @@ -9,11 +9,16 @@ #include <wdm.h> #include <ndis.h> -//#include <nuiouser.h> -#include <ndistapi.h> -#include <ndisguid.h> - -struct _NDISUIO_ADAPTER_CONTEXT +#include <nuiouser.h> + +extern PDEVICE_OBJECT GlobalDeviceObject; +extern NDIS_HANDLE GlobalProtocolHandle; +extern LIST_ENTRY GlobalAdapterList; +extern KSPIN_LOCK GlobalAdapterListLock; +extern NDIS_HANDLE GlobalPacketPoolHandle; +extern NDIS_HANDLE GlobalBufferPoolHandle; + +typedef struct _NDISUIO_ADAPTER_CONTEXT { /* Asynchronous completion */ NDIS_STATUS AsyncStatus; @@ -30,6 +35,9 @@ LIST_ENTRY PacketList; KEVENT PacketReadEvent; + /* Device name */ + UNICODE_STRING DeviceName; + /* Global list entry */ LIST_ENTRY ListEntry; @@ -37,7 +45,7 @@ KSPIN_LOCK Spinlock; } NDISUIO_ADAPTER_CONTEXT, *PNDISUIO_ADAPTER_CONTEXT; -struct _NDISUIO_OPEN_ENTRY +typedef struct _NDISUIO_OPEN_ENTRY { /* File object */ PFILE_OBJECT FileObject; @@ -49,7 +57,7 @@ LIST_ENTRY ListEntry; } NDISUIO_OPEN_ENTRY, *PNDISUIO_OPEN_ENTRY; -struct _NDISUIO_PACKET_ENTRY +typedef struct _NDISUIO_PACKET_ENTRY { /* Length of data at the end of the struct */ ULONG PacketLength; @@ -62,7 +70,134 @@ } NDISUIO_PACKET_ENTRY, *PNDISUIO_PACKET_ENTRY; /* NDIS version info */ -#define NDIS_MAJOR_VERISON 5 +#define NDIS_MAJOR_VERSION 5 #define NDIS_MINOR_VERSION 0 +/* createclose.c */ +NTSTATUS +NTAPI +NduDispatchCreate(PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +NTSTATUS +NTAPI +NduDispatchClose(PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +/* ioctl.c */ +NTSTATUS +NTAPI +NduDispatchDeviceControl(PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +/* misc.c */ +NDIS_STATUS +AllocateAndChainBuffer(PNDIS_PACKET Packet, + PVOID Buffer, + ULONG BufferSize, + BOOLEAN Front); + +PNDIS_PACKET +CreatePacketFromPoolBuffer(PVOID Buffer, + ULONG BufferSize); + +VOID +CleanupAndFreePacket(PNDIS_PACKET Packet, + BOOLEAN FreePool); + +PNDISUIO_ADAPTER_CONTEXT +FindAdapterContextByName(PNDIS_STRING DeviceName); + +VOID +ReferenceAdapterContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext); + +VOID +DereferenceAdapterContextWithOpenEntry(PNDISUIO_ADAPTER_CONTEXT AdapterContext, + PNDISUIO_OPEN_ENTRY OpenEntry); + +/* protocol.c */ +VOID +NTAPI +NduOpenAdapterComplete(NDIS_HANDLE ProtocolBindingContext, + NDIS_STATUS Status, + NDIS_STATUS OpenStatus); + +VOID +NTAPI +NduCloseAdapterComplete(NDIS_HANDLE ProtocolBindingContext, + NDIS_STATUS Status); + +VOID +NTAPI +NduSendComplete(NDIS_HANDLE ProtocolBindingContext, + PNDIS_PACKET Packet, + NDIS_STATUS Status); + +VOID +NTAPI +NduTransferDataComplete(NDIS_HANDLE ProtocolBindingContext, + PNDIS_PACKET Packet, + NDIS_STATUS Status, + UINT BytesTransferred); + +VOID +NTAPI +NduResetComplete(NDIS_HANDLE ProtocolBindingContext, + NDIS_STATUS Status); + +VOID +NTAPI +NduRequestComplete(NDIS_HANDLE ProtocolBindingContext, + PNDIS_REQUEST NdisRequest, + NDIS_STATUS Status); + +NDIS_STATUS +NTAPI +NduReceive(NDIS_HANDLE ProtocolBindingContext, + NDIS_HANDLE MacReceiveContext, + PVOID HeaderBuffer, + UINT HeaderBufferSize, + PVOID LookAheadBuffer, + UINT LookaheadBufferSize, + UINT PacketSize); + +VOID +NTAPI +NduReceiveComplete(NDIS_HANDLE ProtocolBindingContext); + +VOID +NTAPI +NduStatus(NDIS_HANDLE ProtocolBindingContext, + NDIS_STATUS GeneralStatus, + PVOID StatusBuffer, + UINT StatusBufferSize); + +VOID +NTAPI +NduStatusComplete(NDIS_HANDLE ProtocolBindingContext); + +VOID +NTAPI +NduBindAdapter(PNDIS_STATUS Status, + NDIS_HANDLE BindContext, + PNDIS_STRING DeviceName, + PVOID SystemSpecific1, + PVOID SystemSpecific2); + +VOID +NTAPI +NduUnbindAdapter(PNDIS_STATUS Status, + NDIS_HANDLE ProtocolBindingContext, + NDIS_HANDLE UnbindContext); + +/* readwrite.c */ +NTSTATUS +NTAPI +NduDispatchRead(PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +NTSTATUS +NTAPI +NduDispatchWrite(PDEVICE_OBJECT DeviceObject, + PIRP Irp); #endif /* __NDISUIO_H */ Modified: branches/wlan-bringup/drivers/network/ndisuio/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/protocol.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/protocol.c [iso-8859-1] Fri Jan 6 05:59:56 2012 @@ -113,10 +113,11 @@ UINT PacketSize) { PNDISUIO_ADAPTER_CONTEXT AdapterContext = ProtocolBindingContext; + PNDISUIO_PACKET_ENTRY PacketEntry; PVOID PacketBuffer; PNDIS_PACKET Packet; NDIS_STATUS Status; - ULONG BytesTransferred; + UINT BytesTransferred; /* Allocate a buffer to hold the packet data and header */ PacketBuffer = ExAllocatePool(NonPagedPool, PacketSize); @@ -138,6 +139,7 @@ MacReceiveContext, 0, PacketSize, + Packet, &BytesTransferred); if (Status == NDIS_STATUS_PENDING) { @@ -214,12 +216,14 @@ /* FIXME: Implement status tracking */ } +static NDIS_STATUS UnbindAdapterByContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext) { KIRQL OldIrql; PLIST_ENTRY CurrentOpenEntry; PNDISUIO_OPEN_ENTRY OpenEntry; + NDIS_STATUS Status; /* Remove the adapter context from the global list */ KeAcquireSpinLock(&GlobalAdapterListLock, &OldIrql); @@ -255,27 +259,29 @@ ASSERT(AdapterContext->OpenCount == 0); /* Send the close request */ - NdisCloseAdapter(Status, + NdisCloseAdapter(&Status, AdapterContext->BindingHandle); /* Wait for a pending close */ - if (*Status == NDIS_STATUS_PENDING) + if (Status == NDIS_STATUS_PENDING) { KeWaitForSingleObject(&AdapterContext->AsyncEvent, Executive, KernelMode, FALSE, NULL); - *Status = AdapterContext->AsyncStatus; + Status = AdapterContext->AsyncStatus; } /* Free the context */ ExFreePool(AdapterContext); -} - - + + return Status; +} + +static NDIS_STATUS -BindAdapterByName(PNDIS_STRING DeviceName, PNDISUIO_ADAPTER_CONTEXT *Context) +BindAdapterByName(PNDIS_STRING DeviceName) { NDIS_STATUS OpenErrorStatus; PNDISUIO_ADAPTER_CONTEXT AdapterContext; @@ -298,6 +304,17 @@ InitializeListHead(&AdapterContext->OpenEntryList); AdapterContext->OpenCount = 0; + AdapterContext->DeviceName.Length = + AdapterContext->DeviceName.MaximumLength = DeviceName->Length; + AdapterContext->DeviceName.Buffer = ExAllocatePool(NonPagedPool, DeviceName->Length); + if (!AdapterContext->DeviceName.Buffer) + { + ExFreePool(AdapterContext); + return NDIS_STATUS_RESOURCES; + } + + RtlCopyMemory(AdapterContext->DeviceName.Buffer, DeviceName->Buffer, DeviceName->Length); + /* Send the open request */ NdisOpenAdapter(&Status, &OpenErrorStatus, @@ -325,18 +342,16 @@ /* Check the final status */ if (Status != NDIS_STATUS_SUCCESS) { - DPRINT1("Failed to open adapter for bind with status 0x%x\n", *Status); + DPRINT1("Failed to open adapter for bind with status 0x%x\n", Status); ExFreePool(AdapterContext); - return; + return Status; } /* Add the adapter context to the global list */ ExInterlockedInsertTailList(&GlobalAdapterList, &AdapterContext->ListEntry, &GlobalAdapterListLock); - - /* Return the context */ - *Context = AdapterContext; + return STATUS_SUCCESS; } Modified: branches/wlan-bringup/drivers/network/ndisuio/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/readwrite.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/readwrite.c [iso-8859-1] Fri Jan 6 05:59:56 2012 @@ -11,10 +11,12 @@ #define NDEBUG #include <debug.h> +static VOID NTAPI ReadIrpCancel(PDEVICE_OBJECT DeviceObject, PIRP Irp) { + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; PNDISUIO_PACKET_ENTRY PacketEntry; @@ -22,7 +24,7 @@ IoReleaseCancelSpinLock(Irp->CancelIrql); /* Indicate a 0-byte packet on the queue to cancel the read */ - PacketEntry = ExAllocatePool(PagedPool, sizeof(NDISUIO_PACKET_ENTRY)); + PacketEntry = ExAllocatePool(NonPagedPool, sizeof(NDISUIO_PACKET_ENTRY)); if (PacketEntry) { PacketEntry->PacketLength = 0; @@ -131,7 +133,7 @@ /* Copy the packet */ RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, - &PacketEntry->PacketBuffer[0], + &PacketEntry->PacketData[0], BytesCopied); /* Free the packet entry */ @@ -189,7 +191,7 @@ if (Status == NDIS_STATUS_SUCCESS) BytesCopied = IrpSp->Parameters.Write.Length; - CleanupAndFreePacket(Packet); + CleanupAndFreePacket(Packet, TRUE); } else { Added: branches/wlan-bringup/include/reactos/drivers/ndisuio/nuiouser.h URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/include/reactos/dr… ============================================================================== --- branches/wlan-bringup/include/reactos/drivers/ndisuio/nuiouser.h (added) +++ branches/wlan-bringup/include/reactos/drivers/ndisuio/nuiouser.h [iso-8859-1] Fri Jan 6 05:59:56 2012 @@ -1,0 +1,59 @@ +#ifndef __NUIOUSER_H +#define __NUIOUSER_H + +/* Device names (NT and DOS style) */ +#define NDISUIO_DEVICE_NAME_NT L"\\Device\\Ndisuio" +#define NDISUIO_DEVICE_NAME_DOS L"\\DosDevices\\Ndisuio" + +/* Device name for user apps */ +#define NDISUIO_DEVICE_NAME L"\\\\.\\\\Ndisuio" + +/* Links a file handle with a bound NIC */ +#define IOCTL_NDISUIO_OPEN_DEVICE \ + CTL_CODE(FILE_DEVICE_NETWORK, 0x200, METHOD_BUFFERED, FILE_ANY_ACCESS) + +/* Queries an OID for the bound NIC */ +#define IOCTL_NDISUIO_QUERY_OID_VALUE \ + CTL_CODE(FILE_DEVICE_NETWORK, 0x201, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_NDISUIO_SET_ETHER_TYPE \ + CTL_CODE(FILE_DEVICE_NETWORK, 0x202, METHOD_BUFFERED, FILE_ANY_ACCESS) + +/* Queries binding information during enumeration */ +#define IOCTL_NDISUIO_QUERY_BINDING \ + CTL_CODE(FILE_DEVICE_NETWORK, 0x203, METHOD_BUFFERED, FILE_ANY_ACCESS) + +/* Waits for any pending bindings */ +#define IOCTL_NDISUIO_BIND_WAIT \ + CTL_CODE(FILE_DEVICE_NETWORK, 0x204, METHOD_BUFFERED, FILE_ANY_ACCESS) + +/* Sets an OID for a bound NIC */ +#define IOCTL_NDISUIO_SET_OID_VALUE \ + CTL_CODE(FILE_DEVICE_NETWORK, 0x205, METHOD_BUFFERED, FILE_ANY_ACCESS) + +/* Passed as a parameter to IOCTL_NDISUIO_QUERY_OID_VALUE */ +typedef struct _NDISUIO_QUERY_OID +{ + NDIS_OID Oid; + UCHAR Data[sizeof(ULONG)]; +} NDISUIO_QUERY_OID, *PNDISUIO_QUERY_OID; + +/* Passed as a parameter to IOCTL_NDISUIO_SET_OID_VALUE */ +typedef struct _NDISUIO_SET_OID +{ + NDIS_OID Oid; + UCHAR Data[sizeof(ULONG)]; +} NDISUIO_SET_OID, *PNDISUIO_SET_OID; + +/* Passed as a parameter to IOCTL_NDISUIO_QUERY_BINDING */ +typedef struct _NDISUIO_QUERY_BINDING +{ + ULONG BindingIndex; + ULONG DeviceNameOffset; + ULONG DeviceNameLength; + ULONG DeviceDescrOffset; + ULONG DeviceDescrLength; +} NDISUIO_QUERY_BINDING, *PNDISUIO_QUERY_BINDING; + +#endif + Propchange: branches/wlan-bringup/include/reactos/drivers/ndisuio/nuiouser.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/wlan-bringup/include/reactos/drivers/ndisuio/nuiouser.h ------------------------------------------------------------------------------ svn:executable = *

1 0

[rharabien] 54848: [SHELL32] - Fix few leaks and possible buffer overflows in New menu code - Add icons of folder and shortcut to New menu - Display message if file can't be created
by rharabien＠svn.reactos.org 05 Jan '12

05 Jan '12

Author: rharabien Date: Thu Jan 5 23:04:06 2012 New Revision: 54848 URL: http://svn.reactos.org/svn/reactos?rev=54848&view=rev Log: [SHELL32] - Fix few leaks and possible buffer overflows in New menu code - Add icons of folder and shortcut to New menu - Display message if file can't be created Modified: trunk/reactos/dll/win32/shell32/newmenu.cpp trunk/reactos/dll/win32/shell32/newmenu.h Modified: trunk/reactos/dll/win32/shell32/newmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/newmenu.… ============================================================================== --- trunk/reactos/dll/win32/shell32/newmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/newmenu.cpp [iso-8859-1] Thu Jan 5 23:04:06 2012 @@ -23,172 +23,194 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -static WCHAR szNew[MAX_PATH]; - CNewMenu::CNewMenu() { - szPath = NULL; - s_SnHead = NULL; - fSite = NULL; -} - + m_wszPath = NULL; + m_pShellItems = NULL; + m_pSite = NULL; +} CNewMenu::~CNewMenu() { UnloadShellItems(); -} - -void CNewMenu::UnloadItem(SHELLNEW_ITEM *item) + if (m_hSubMenu) + CleanupMenu(); +} + +void CNewMenu::CleanupMenu() +{ + INT Count, Index; + MENUITEMINFOW mii; + + /* get item count */ + Count = GetMenuItemCount(m_hSubMenu); + if (Count == -1) + return; + + /* setup menuitem info */ + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_DATA | MIIM_FTYPE | MIIM_CHECKMARKS; + + for(Index = 0; Index < Count; Index++) + { + if (GetMenuItemInfoW(m_hSubMenu, Index, TRUE, &mii)) + { + if (mii.hbmpChecked) + DeleteObject(mii.hbmpChecked); + } + } +} + +void CNewMenu::UnloadItem(SHELLNEW_ITEM *pItem) { // bail if the item is clearly invalid - if (NULL == item) + if (NULL == pItem) return; - if (NULL != item->szTarget) - free(item->szTarget); - - free(item->szDesc); - free(item->szIcon); - free(item->szExt); - - HeapFree(GetProcessHeap(), 0, item); + if (NULL != pItem->pwszTarget) + free(pItem->pwszTarget); + + free(pItem->pwszDesc); + free(pItem->pwszIcon); + free(pItem->pwszExt); + + HeapFree(GetProcessHeap(), 0, pItem); } void CNewMenu::UnloadShellItems() { SHELLNEW_ITEM *pCurItem; - while (s_SnHead) - { - pCurItem = s_SnHead; - s_SnHead = s_SnHead->Next; + while (m_pShellItems) + { + pCurItem = m_pShellItems; + m_pShellItems = m_pShellItems->pNext; UnloadItem(pCurItem); } - - s_SnHead = NULL; -} - -static -BOOL -GetKeyDescription(LPWSTR szKeyName, LPWSTR szResult) +} + +BOOL CNewMenu::GetKeyDescription(LPCWSTR pwszExt, LPWSTR pwszResult) { HKEY hKey; - DWORD dwDesc, dwError; - WCHAR szDesc[100]; - - TRACE("GetKeyDescription: keyname %s\n", debugstr_w(szKeyName)); - - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szKeyName, 0, KEY_READ | KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) + DWORD cbDesc; + WCHAR wszDesc[100]; + LONG Result; + + TRACE("GetKeyDescription: keyname %s\n", debugstr_w(pwszExt)); + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, pwszExt, 0, KEY_READ, &hKey) != ERROR_SUCCESS) return FALSE; - if (RegLoadMUIStringW(hKey, L"\\FriendlyTypeName", szResult, MAX_PATH, &dwDesc, 0, NULL) == ERROR_SUCCESS) - { - TRACE("result %s\n", debugstr_w(szResult)); + /* Get user friendly name */ + if (RegLoadMUIStringW(hKey, L"\\FriendlyTypeName", pwszResult, MAX_PATH, &cbDesc, 0, NULL) == ERROR_SUCCESS) + { + TRACE("result %s\n", debugstr_w(pwszResult)); RegCloseKey(hKey); return TRUE; } - /* fetch default value */ - dwDesc = sizeof(szDesc); - dwError = RegGetValueW(hKey, NULL, NULL, RRF_RT_REG_SZ, NULL, szDesc, &dwDesc); - if(dwError == ERROR_SUCCESS) - { - if (wcsncmp(szKeyName, szDesc, dwDesc / sizeof(WCHAR))) + + /* Fetch default value */ + cbDesc = sizeof(wszDesc); + Result = RegGetValueW(hKey, NULL, L"", RRF_RT_REG_SZ, NULL, wszDesc, &cbDesc); + if(Result == ERROR_SUCCESS) + { + if (wcscmp(pwszExt, wszDesc) != 0) { /* recurse for to a linked key */ - if (!GetKeyDescription(szDesc, szResult)) + if (!GetKeyDescription(wszDesc, pwszResult)) { /* use description */ - wcscpy(szResult, szDesc); + wcscpy(pwszResult, wszDesc); } } else { /* use default value as description */ - wcscpy(szResult, szDesc); + wcscpy(pwszResult, wszDesc); } } else { /* registry key w/o default key?? */ - TRACE("RegGetValue failed with %x\n", dwError); - wcscpy(szResult, szKeyName); + ERR("RegGetValue failed with %x\n", Result); + wcscpy(pwszResult, pwszExt); } RegCloseKey(hKey); return TRUE; } -CNewMenu::SHELLNEW_ITEM *CNewMenu::LoadItem(LPWSTR szKeyName) +CNewMenu::SHELLNEW_ITEM *CNewMenu::LoadItem(LPCWSTR pwszExt) { HKEY hKey; DWORD dwIndex = 0; - WCHAR szName[MAX_PATH]; - WCHAR szCommand[MAX_PATH]; - WCHAR szDesc[MAX_PATH] = L""; - WCHAR szIcon[MAX_PATH] = L""; - DWORD dwName, dwCommand; - LONG result; + WCHAR wszBuf[MAX_PATH]; + WCHAR wszCommand[MAX_PATH]; + WCHAR wszDesc[MAX_PATH] = L""; + WCHAR wszIcon[MAX_PATH] = L""; + DWORD cchName, cbCommand; SHELLNEW_ITEM *pNewItem = NULL; - wcscpy(szName, szKeyName); - GetKeyDescription(szKeyName, szDesc); - wcscat(szName, L"\\ShellNew"); - result = RegOpenKeyExW(HKEY_CLASSES_ROOT, szName, 0, KEY_READ, &hKey); - - TRACE("LoadItem dwName %d keyname %s szName %s szDesc %s szIcon %s\n", dwName, debugstr_w(szKeyName), debugstr_w(szName), debugstr_w(szDesc), debugstr_w(szIcon)); - - if (result != ERROR_SUCCESS) + StringCbPrintfW(wszBuf, sizeof(wszBuf), L"%s\\ShellNew", pwszExt); + + TRACE("LoadItem Keyname %s Name %s\n", debugstr_w(pwszExt), debugstr_w(wszBuf)); + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszBuf, 0, KEY_READ, &hKey) != ERROR_SUCCESS) { TRACE("Failed to open key\n"); return NULL; } - do - { - dwName = MAX_PATH; - dwCommand = MAX_PATH; - result = RegEnumValueW(hKey, dwIndex, szName, &dwName, NULL, NULL, (LPBYTE)szCommand, &dwCommand); - if (result == ERROR_SUCCESS) - { - SHELLNEW_TYPE type = SHELLNEW_TYPE_INVALID; - LPWSTR szTarget = szCommand; - - TRACE("szName %s szCommand %s\n", debugstr_w(szName), debugstr_w(szCommand)); - - if (!wcsicmp(szName, L"Command")) - type = SHELLNEW_TYPE_COMMAND; - else if (!wcsicmp(szName, L"Data")) - type = SHELLNEW_TYPE_DATA; - else if (!wcsicmp(szName, L"FileName")) - type = SHELLNEW_TYPE_FILENAME; - else if (!wcsicmp(szName, L"NullFile")) - { - type = SHELLNEW_TYPE_NULLFILE; - szTarget = NULL; - } - - if (type != SHELLNEW_TYPE_INVALID) - { - pNewItem = (SHELLNEW_ITEM *)HeapAlloc(GetProcessHeap(), 0, sizeof(SHELLNEW_ITEM)); - if (!pNewItem) - break; - - pNewItem->Type = type; - if (szTarget) - pNewItem->szTarget = _wcsdup(szTarget); - else - pNewItem->szTarget = NULL; - - pNewItem->szDesc = _wcsdup(szDesc); - pNewItem->szIcon = _wcsdup(szIcon); - pNewItem->szExt = _wcsdup(szKeyName); - pNewItem->Next = NULL; + /* Find first valid value */ + while (TRUE) + { + cchName = _countof(wszBuf); + cbCommand = sizeof(wszCommand); + if (RegEnumValueW(hKey, dwIndex++, wszBuf, &cchName, NULL, NULL, (LPBYTE)wszCommand, &cbCommand) != ERROR_SUCCESS) + break; + + SHELLNEW_TYPE Type = SHELLNEW_TYPE_INVALID; + LPWSTR pwszTarget = wszCommand; + + TRACE("wszBuf %s wszCommand %s\n", debugstr_w(wszBuf), debugstr_w(wszCommand)); + + /* Handle different types */ + if (!wcsicmp(wszBuf, L"Command")) + Type = SHELLNEW_TYPE_COMMAND; + else if (!wcsicmp(wszBuf, L"Data")) + Type = SHELLNEW_TYPE_DATA; + else if (!wcsicmp(wszBuf, L"FileName")) + Type = SHELLNEW_TYPE_FILENAME; + else if (!wcsicmp(wszBuf, L"NullFile")) + { + Type = SHELLNEW_TYPE_NULLFILE; + pwszTarget = NULL; + } + + /* Create new item */ + if (Type != SHELLNEW_TYPE_INVALID) + { + pNewItem = (SHELLNEW_ITEM *)HeapAlloc(GetProcessHeap(), 0, sizeof(SHELLNEW_ITEM)); + if (!pNewItem) break; - } - } - dwIndex++; - } while(result != ERROR_NO_MORE_ITEMS); + + pNewItem->Type = Type; + if (pwszTarget) + pNewItem->pwszTarget = _wcsdup(pwszTarget); + else + pNewItem->pwszTarget = NULL; + + GetKeyDescription(pwszExt, wszDesc); + pNewItem->pwszDesc = _wcsdup(wszDesc); + pNewItem->pwszIcon = _wcsdup(wszIcon); + pNewItem->pwszExt = _wcsdup(pwszExt); + pNewItem->pNext = NULL; + break; + } + } + RegCloseKey(hKey); return pNewItem; } @@ -196,71 +218,87 @@ BOOL CNewMenu::LoadShellNewItems() { - DWORD dwIndex; - WCHAR szName[MAX_PATH]; - LONG result; + DWORD dwIndex = 0; + WCHAR wszName[MAX_PATH]; SHELLNEW_ITEM *pNewItem; SHELLNEW_ITEM *pCurItem = NULL; - /* insert do new folder action */ - if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, szNew, sizeof(szNew) / sizeof(WCHAR))) - szNew[0] = 0; - + /* If there are any unload them */ UnloadShellItems(); - dwIndex = 0; - do - { - result = RegEnumKeyW(HKEY_CLASSES_ROOT, dwIndex, szName, MAX_PATH); - if (result == ERROR_SUCCESS) - { - pNewItem = LoadItem(szName); - if (pNewItem) - { - if (!wcsicmp(pNewItem->szExt, L".lnk")) + /* Enumerate all extesions */ + while (RegEnumKeyW(HKEY_CLASSES_ROOT, dwIndex++, wszName, _countof(wszName)) == ERROR_SUCCESS) + { + if (wszName[0] != '.' || wcsicmp(wszName, L".lnk") == 0) + continue; + + pNewItem = LoadItem(wszName); + if (pNewItem) + { + if (!wcsicmp(pNewItem->pwszExt, L".lnk")) + { + /* FIXME: Should we load them? + Add lnk handlers to begin of the list */ + if (m_pShellItems) { - if (s_SnHead) - { - pNewItem->Next = s_SnHead; - s_SnHead = pNewItem; - } - else - { - s_SnHead = pCurItem = pNewItem; - } + pNewItem->pNext = m_pShellItems; + m_pShellItems = pNewItem; } else + m_pShellItems = pCurItem = pNewItem; + } + else + { + /* Add at the end of list */ + if (pCurItem) { - if (pCurItem) - { - pCurItem->Next = pNewItem; - pCurItem = pNewItem; - } - else - { - pCurItem = s_SnHead = pNewItem; - } + pCurItem->pNext = pNewItem; + pCurItem = pNewItem; } - } - } - dwIndex++; - } while(result != ERROR_NO_MORE_ITEMS); - - if (s_SnHead == NULL) + else + pCurItem = m_pShellItems = pNewItem; + } + } + } + + if (m_pShellItems == NULL) return FALSE; else return TRUE; } +static HBITMAP IconToBitmap(HICON hIcon) +{ + HDC hdc, hdcScr; + HBITMAP hbm, hbmOld; + RECT rc; + + hdcScr = GetDC(NULL); + hdc = CreateCompatibleDC(hdcScr); + SetRect(&rc, 0, 0, GetSystemMetrics(SM_CXMENUCHECK), GetSystemMetrics(SM_CYMENUCHECK)); + hbm = CreateCompatibleBitmap(hdcScr, rc.right, rc.bottom); + ReleaseDC(NULL, hdcScr); + + hbmOld = (HBITMAP)SelectObject(hdc, hbm); + FillRect(hdc, &rc, (HBRUSH)(COLOR_MENU + 1)); + if (!DrawIconEx(hdc, 0, 0, hIcon, rc.right, rc.bottom, 0, NULL, DI_NORMAL)) + ERR("DrawIcon failed: %x\n", GetLastError()); + SelectObject(hdc, hbmOld); + + DeleteDC(hdc); + + return hbm; +} + UINT -CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idFirst, UINT idMenu) +CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) { MENUITEMINFOW mii; - SHELLNEW_ITEM *pCurItem; - UINT i; - WCHAR szBuffer[MAX_PATH]; - - if (s_SnHead == NULL) + WCHAR wszBuf[256]; + HICON hIcon; + UINT idCmd = idCmdFirst; + + if (m_pShellItems == NULL) { if (!LoadShellNewItems()) return 0; @@ -269,334 +307,279 @@ ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); - /* insert do new shortcut action */ - if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWFOLDER, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]))) - szBuffer[0] = 0; - szBuffer[MAX_PATH-1] = 0; + /* Insert new folder action */ + if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWFOLDER, wszBuf, _countof(wszBuf))) + wszBuf[0] = 0; mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; mii.fType = MFT_STRING; - mii.dwTypeData = szBuffer; + mii.dwTypeData = wszBuf; mii.cch = wcslen(mii.dwTypeData); - mii.wID = idFirst++; - InsertMenuItemW(hMenu, idMenu++, TRUE, &mii); - - /* insert do new shortcut action */ - if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWLINK, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]))) - szBuffer[0] = 0; - szBuffer[MAX_PATH-1] = 0; - mii.dwTypeData = szBuffer; + mii.wID = idCmd; + hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, 0, 0, 0); + if (hIcon) + { + mii.fMask |= MIIM_CHECKMARKS; + mii.hbmpChecked = mii.hbmpUnchecked = IconToBitmap(hIcon); + } + if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) + ++idCmd; + + /* Insert new shortcut action */ + if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWLINK, wszBuf, _countof(wszBuf))) + wszBuf[0] = 0; + mii.dwTypeData = wszBuf; mii.cch = wcslen(mii.dwTypeData); - mii.wID = idFirst++; - InsertMenuItemW(hMenu, idMenu++, TRUE, &mii); - - /* insert seperator for custom new action */ + mii.wID = idCmdFirst++; + hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_SHORTCUT), IMAGE_ICON, 0, 0, 0); + if (hIcon) + { + mii.fMask |= MIIM_CHECKMARKS; + mii.hbmpChecked = mii.hbmpUnchecked = IconToBitmap(hIcon); + } + if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) + ++idCmd; + + /* Insert seperator for custom new action */ mii.fMask = MIIM_TYPE | MIIM_ID; mii.fType = MFT_SEPARATOR; mii.wID = -1; - InsertMenuItemW(hMenu, idMenu++, TRUE, &mii); - + InsertMenuItemW(hMenu, Pos++, TRUE, &mii); + + /* Insert rest of items */ mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; /* - * FIXME + * FIXME: * implement loading of icons * and using MFT_OWNERDRAWN */ mii.fType = MFT_STRING; mii.fState = MFS_ENABLED; - pCurItem = s_SnHead; - i = 0; - - while(pCurItem) - { - if (i >= 1) - { - TRACE("szDesc %s\n", debugstr_w(pCurItem->szDesc)); - mii.dwTypeData = pCurItem->szDesc; - mii.cch = wcslen(mii.dwTypeData); - mii.wID = idFirst++; - InsertMenuItemW(hMenu, idMenu++, TRUE, &mii); - } - pCurItem = pCurItem->Next; - i++; - } - return (i + 2); + SHELLNEW_ITEM *pCurItem = m_pShellItems; + while (pCurItem) + { + TRACE("szDesc %s\n", debugstr_w(pCurItem->pwszDesc)); + mii.dwTypeData = pCurItem->pwszDesc; + mii.cch = wcslen(mii.dwTypeData); + mii.wID = idCmd; + if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) + ++idCmd; + pCurItem = pCurItem->pNext; + } + + return idCmd - idCmdFirst; } HRESULT CNewMenu::DoShellNewCmd(LPCMINVOKECOMMANDINFO lpcmi, IShellView *psv) { - SHELLNEW_ITEM *pCurItem = s_SnHead; - IPersistFolder3 * psf; + SHELLNEW_ITEM *pCurItem = m_pShellItems; LPITEMIDLIST pidl; STRRET strTemp; - WCHAR szTemp[MAX_PATH]; - WCHAR szBuffer[MAX_PATH]; - WCHAR szPath[MAX_PATH]; - STARTUPINFOW sInfo; - PROCESS_INFORMATION pi; - UINT i, target; - HANDLE hFile; - DWORD dwWritten, dwError; - CComPtr<IFolderView> folderView; - CComPtr<IShellFolder> parentFolder; - HRESULT hResult; - - i = 1; - target = LOWORD(lpcmi->lpVerb); - - while(pCurItem) - { - if (i == target) + WCHAR wszBuf[MAX_PATH]; + WCHAR wszPath[MAX_PATH]; + UINT i, idCmd = LOWORD(lpcmi->lpVerb); + CComPtr<IFolderView> pFolderView; + CComPtr<IShellFolder> pParentFolder; + CComPtr<IPersistFolder3> psf; + HRESULT hr; + + /* Find shell new item */ + for (i = 1; pCurItem; ++i) + { + if (i == idCmd) break; - pCurItem = pCurItem->Next; - i++; + pCurItem = pCurItem->pNext; } if (!pCurItem) return E_UNEXPECTED; - - //if (fSite == NULL) + //if (m_pSite == NULL) // return E_FAIL; - hResult = IUnknown_QueryService(psv, SID_IFolderView, IID_IFolderView, (void **)&folderView); - if (FAILED(hResult)) - return hResult; - hResult = folderView->GetFolder(IID_IShellFolder, (void **)&parentFolder); - if (FAILED(hResult)) - return hResult; - - if (parentFolder->QueryInterface(IID_IPersistFolder2, (LPVOID*)&psf) != S_OK) + + /* Get current folder */ + hr = IUnknown_QueryService(psv, SID_IFolderView, IID_IFolderView, (void **)&pFolderView); + if (FAILED(hr)) + return hr; + + hr = pFolderView->GetFolder(IID_IShellFolder, (void **)&pParentFolder); + if (FAILED(hr)) + return hr; + + if (pParentFolder->QueryInterface(IID_IPersistFolder2, (LPVOID*)&psf) != S_OK) { ERR("Failed to get interface IID_IPersistFolder2\n"); return E_FAIL; } + if (psf->GetCurFolder(&pidl) != S_OK) { ERR("IPersistFolder2_GetCurFolder failed\n"); return E_FAIL; } - if (parentFolder == NULL || parentFolder->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strTemp) != S_OK) + /* Get folder path */ + if (pParentFolder == NULL || pParentFolder->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strTemp) != S_OK) { ERR("IShellFolder_GetDisplayNameOf failed\n"); return E_FAIL; } - StrRetToBufW(&strTemp, pidl, szPath, MAX_PATH); - - switch(pCurItem->Type) + StrRetToBufW(&strTemp, pidl, wszPath, _countof(wszPath)); + + switch (pCurItem->Type) { case SHELLNEW_TYPE_COMMAND: { - LPWSTR ptr; - LPWSTR szCmd; - - if (!ExpandEnvironmentStringsW(pCurItem->szTarget, szBuffer, MAX_PATH)) + LPWSTR Ptr, pwszCmd; + WCHAR wszTemp[MAX_PATH]; + STARTUPINFOW si; + PROCESS_INFORMATION pi; + + if (!ExpandEnvironmentStringsW(pCurItem->pwszTarget, wszBuf, MAX_PATH)) { TRACE("ExpandEnvironmentStrings failed\n"); break; } - ptr = wcsstr(szBuffer, L"%1"); - if (ptr) - { - ptr[1] = 's'; - swprintf(szTemp, szBuffer, szPath); - ptr = szTemp; + /* Expand command parameter, FIXME: there can be more modifiers */ + Ptr = wcsstr(wszBuf, L"%1"); + if (Ptr) + { + Ptr[1] = 's'; + StringCbPrintfW(wszTemp, sizeof(wszTemp), wszBuf, wszPath); + pwszCmd = wszTemp; } else - { - ptr = szBuffer; - } - - ZeroMemory(&sInfo, sizeof(sInfo)); - sInfo.cb = sizeof(sInfo); - szCmd = _wcsdup(ptr); - if (!szCmd) - break; - if (CreateProcessW(NULL, szCmd, NULL, NULL, FALSE, 0, NULL, NULL, &sInfo, &pi)) - { - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - } - free(szCmd); + pwszCmd = wszBuf; + + /* Create process */ + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + if (CreateProcessW(NULL, pwszCmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } else + ERR("Failed to create process\n"); break; } case SHELLNEW_TYPE_DATA: case SHELLNEW_TYPE_FILENAME: case SHELLNEW_TYPE_NULLFILE: { - i = 2; - - PathAddBackslashW(szPath); - wcscat(szPath, szNew); - wcscat(szPath, L" "); - wcscat(szPath, pCurItem->szDesc); - wcscpy(szBuffer, szPath); - wcscat(szBuffer, pCurItem->szExt); - do - { - hFile = CreateFileW(szBuffer, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + BOOL bSuccess = TRUE; + LPWSTR pwszFilename = NULL; + size_t cchFilenameMax = 0; + + /* Build new file name */ + LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, wszBuf, _countof(wszBuf)); + StringCchCatExW(wszPath, _countof(wszPath), L"\\", &pwszFilename, &cchFilenameMax, 0); + StringCchPrintfW(pwszFilename, cchFilenameMax, L"%s %s%s", wszBuf, pCurItem->pwszDesc, pCurItem->pwszExt); + + /* Find unique name */ + for (i = 2; PathFileExistsW(wszPath); ++i) + { + StringCchPrintfW(pwszFilename, cchFilenameMax, L"%s %s (%u)%s", wszBuf, pCurItem->pwszDesc, i, pCurItem->pwszExt); + TRACE("New Filename %ls\n", pwszFilename); + } + + if (pCurItem->Type == SHELLNEW_TYPE_DATA || pCurItem->Type == SHELLNEW_TYPE_NULLFILE) + { + /* Create new file */ + HANDLE hFile = CreateFileW(wszPath, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile != INVALID_HANDLE_VALUE) - break; - dwError = GetLastError(); - - TRACE("FileName %s szBuffer %s i %u error %x\n", debugstr_w(szBuffer), debugstr_w(szPath), i, dwError); - swprintf(szBuffer, L"%s (%d)%s", szPath, i, pCurItem->szExt); - i++; - } while(hFile == INVALID_HANDLE_VALUE && dwError == ERROR_FILE_EXISTS); - - if (hFile == INVALID_HANDLE_VALUE) - return E_FAIL; - - if (pCurItem->Type == SHELLNEW_TYPE_DATA) - { - i = WideCharToMultiByte(CP_ACP, 0, pCurItem->szTarget, -1, (LPSTR)szTemp, MAX_PATH * 2, NULL, NULL); - if (i) { - WriteFile(hFile, (LPCVOID)szTemp, i, &dwWritten, NULL); + if (pCurItem->Type == SHELLNEW_TYPE_DATA) + { + /* Write a content */ + CHAR szTemp[256]; + DWORD cbWritten, cbTemp = WideCharToMultiByte(CP_ACP, 0, pCurItem->pwszTarget, -1, szTemp, _countof(szTemp), NULL, NULL); + if (cbTemp) + WriteFile(hFile, (LPCVOID)szTemp, cbTemp, &cbWritten, NULL); + else + ERR("WideCharToMultiByte failed\n"); + } + + /* Close file now */ + CloseHandle(hFile); } - } - CloseHandle(hFile); - if (pCurItem->Type == SHELLNEW_TYPE_FILENAME) - { - if (!CopyFileW(pCurItem->szTarget, szBuffer, FALSE)) - break; - } - TRACE("Notifying fs %s\n", debugstr_w(szBuffer)); - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, (LPCVOID)szBuffer, NULL); + else bSuccess = FALSE; + } + else if (pCurItem->Type == SHELLNEW_TYPE_FILENAME) + { + /* Copy file */ + bSuccess = CopyFileW(pCurItem->pwszTarget, wszPath, FALSE); + } + + /* Show message if we failed */ + if (bSuccess) + { + TRACE("Notifying fs %s\n", debugstr_w(wszPath)); + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, (LPCVOID)wszPath, NULL); + } + else + { + StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Cannot create file: %s", pwszFilename); + MessageBoxW(NULL, wszBuf, L"Cannot create file", MB_OK|MB_ICONERROR); // FIXME + } break; - case SHELLNEW_TYPE_INVALID: - break; - } + } + case SHELLNEW_TYPE_INVALID: + ERR("Invalid type\n"); + break; } return S_OK; } -/************************************************************************** -* DoMeasureItem -*/ -HRESULT -CNewMenu::DoMeasureItem(HWND hWnd, MEASUREITEMSTRUCT * lpmis) -{ - SHELLNEW_ITEM *pCurItem; - SHELLNEW_ITEM *pItem; - UINT i; - HDC hDC; - SIZE size; - - TRACE("DoMeasureItem entered with id %x\n", lpmis->itemID); - - pCurItem = s_SnHead; - - i = 1; - pItem = NULL; - while(pCurItem) - { - if (i == lpmis->itemID) - { - pItem = pCurItem; - break; - } - pCurItem = pCurItem->Next; - i++; - } - - if (!pItem) - { - TRACE("DoMeasureItem no item found\n"); - return E_FAIL; - } - hDC = GetDC(hWnd); - GetTextExtentPoint32W(hDC, pCurItem->szDesc, wcslen(pCurItem->szDesc), &size); - lpmis->itemWidth = size.cx + 32; - lpmis->itemHeight = max(size.cy, 20); - ReleaseDC (hWnd, hDC); - return S_OK; -} -/************************************************************************** -* DoDrawItem -*/ -HRESULT -CNewMenu::DoDrawItem(HWND hWnd, DRAWITEMSTRUCT * drawItem) -{ - SHELLNEW_ITEM *pCurItem; - SHELLNEW_ITEM *pItem; - UINT i; - pCurItem = s_SnHead; - - TRACE("DoDrawItem entered with id %x\n", drawItem->itemID); - - i = 1; - pItem = NULL; - while(pCurItem) - { - if (i == drawItem->itemID) - { - pItem = pCurItem; - break; - } - pCurItem = pCurItem->Next; - i++; - } - - if (!pItem) - return E_FAIL; - - drawItem->rcItem.left += 20; - - DrawTextW(drawItem->hDC, pCurItem->szDesc, wcslen(pCurItem->szDesc), &drawItem->rcItem, 0); - return S_OK; -} - -/************************************************************************** -* DoNewFolder -*/ -void CNewMenu::DoNewFolder( - IShellView *psv) -{ - ISFHelper *psfhlp; + +void CNewMenu::CreateNewFolder(IShellView *psv) +{ WCHAR wszName[MAX_PATH]; - CComPtr<IFolderView> folderView; - CComPtr<IShellFolder> parentFolder; - HRESULT hResult; - - //if (fSite == NULL) + CComPtr<ISFHelper> psfhlp; + CComPtr<IFolderView> pFolderView; + CComPtr<IShellFolder> pParentFolder; + HRESULT hr; + + //if (m_pSite == NULL) // return; - hResult = IUnknown_QueryService(psv, SID_IFolderView, IID_IFolderView, (void **)&folderView); - if (FAILED(hResult)) + + /* Get current folder */ + hr = IUnknown_QueryService(psv, SID_IFolderView, IID_IFolderView, (void **)&pFolderView); + if (FAILED(hr)) return; - hResult = folderView->GetFolder(IID_IShellFolder, (void **)&parentFolder); - if (FAILED(hResult)) + + hr = pFolderView->GetFolder(IID_IShellFolder, (void **)&pParentFolder); + if (FAILED(hr)) return; - parentFolder->QueryInterface(IID_ISFHelper, (LPVOID*)&psfhlp); - if (psfhlp) + hr = pParentFolder->QueryInterface(IID_ISFHelper, (LPVOID*)&psfhlp); + if (SUCCEEDED(hr)) { LPITEMIDLIST pidl; - if (psfhlp->GetUniqueName(wszName, MAX_PATH) != S_OK) + /* Get unique name and create a folder */ + if (psfhlp->GetUniqueName(wszName, _countof(wszName)) != S_OK) return; if (psfhlp->AddFolder(0, wszName, &pidl) != S_OK) + { + WCHAR wszBuf[256]; + StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Cannot create folder: %s", wszName); + MessageBoxW(NULL, wszBuf, L"Cannot create folder", MB_OK|MB_ICONERROR); return; - - if(psv) - { - psv->Refresh(); - /* if we are in a shellview do labeledit */ - psv->SelectItem( - pidl, (SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE - | SVSI_FOCUSED | SVSI_SELECT)); - psv->Refresh(); - } + } + + /* Do a labeledit */ + psv->Refresh(); + psv->SelectItem(pidl, SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | + SVSI_FOCUSED | SVSI_SELECT); + SHFree(pidl); - - psfhlp->Release(); } } HRESULT STDMETHODCALLTYPE CNewMenu::SetSite(IUnknown *pUnkSite) { - fSite = pUnkSite; + m_pSite = pUnkSite; return S_OK; } @@ -604,52 +587,51 @@ { if (ppvSite == NULL) return E_POINTER; - *ppvSite = fSite; - if (fSite != NULL) - fSite->AddRef(); + *ppvSite = m_pSite; + if (m_pSite != NULL) + m_pSite->AddRef(); return S_OK; } HRESULT WINAPI -CNewMenu::QueryContextMenu(HMENU hmenu, +CNewMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { - WCHAR szBuffer[200]; + WCHAR wszNew[200]; MENUITEMINFOW mii; - HMENU hSubMenu; - int id = 1; + UINT cItems = 0; TRACE("%p %p %u %u %u %u\n", this, - hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags ); - - if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, szBuffer, _countof(szBuffer))) - szBuffer[0] = 0; - - hSubMenu = CreateMenu(); - memset( &mii, 0, sizeof(mii) ); - mii.cbSize = sizeof (mii); + hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + + if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, wszNew, _countof(wszNew))) + return E_FAIL; + + m_hSubMenu = CreateMenu(); + memset(&mii, 0, sizeof(mii)); + mii.cbSize = sizeof(mii); mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE; mii.fType = MFT_STRING; - mii.wID = idCmdFirst + id++; - mii.dwTypeData = szBuffer; + mii.wID = -1; + mii.dwTypeData = wszNew; mii.cch = wcslen(mii.dwTypeData); mii.fState = MFS_ENABLED; - if (hSubMenu) - { - id += InsertShellNewItems(hSubMenu, idCmdFirst, 0); + if (m_hSubMenu) + { + cItems = InsertShellNewItems(m_hSubMenu, idCmdFirst, 0); mii.fMask |= MIIM_SUBMENU; - mii.hSubMenu = hSubMenu; - } - - if (!InsertMenuItemW(hmenu, indexMenu, TRUE, &mii)) + mii.hSubMenu = m_hSubMenu; + } + + if (!InsertMenuItemW(hMenu, indexMenu, TRUE, &mii)) return E_FAIL; - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, id); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, cItems); } HRESULT @@ -660,24 +642,21 @@ LPSHELLVIEW lpSV = NULL; HRESULT hr; - if((lpSB = (LPSHELLBROWSER)SendMessageA(lpici->hwnd, CWM_GETISHELLBROWSER, 0, 0))) - { + lpSB = (LPSHELLBROWSER)SendMessageA(lpici->hwnd, CWM_GETISHELLBROWSER, 0, 0); + if (lpSB) lpSB->QueryActiveShellView(&lpSV); - } if (LOWORD(lpici->lpVerb) == 0) { - DoNewFolder(lpSV); + CreateNewFolder(lpSV); return S_OK; } hr = DoShellNewCmd(lpici, lpSV); if (SUCCEEDED(hr) && lpSV) - { lpSV->Refresh(); - } - - TRACE("INewItem_IContextMenu_fnInvokeCommand %x\n", hr); + + TRACE("CNewMenu::InvokeCommand %x\n", hr); return hr; } @@ -685,7 +664,7 @@ WINAPI CNewMenu::GetCommandString(UINT_PTR idCmd, UINT uType, - UINT* pwReserved, + UINT *pwReserved, LPSTR pszName, UINT cchMax) { @@ -701,29 +680,13 @@ WPARAM wParam, LPARAM lParam) { - DRAWITEMSTRUCT *lpids = (DRAWITEMSTRUCT*) lParam; - MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*) lParam; - - TRACE("INewItem_IContextMenu_fnHandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n", this, uMsg, wParam, lParam); - - switch(uMsg) - { - case WM_MEASUREITEM: - return DoMeasureItem((HWND)wParam, lpmis); - break; - case WM_DRAWITEM: - return DoDrawItem((HWND)wParam, lpids); - break; - } + UNIMPLEMENTED; return S_OK; - - return E_UNEXPECTED; } HRESULT WINAPI CNewMenu::Initialize(LPCITEMIDLIST pidlFolder, - IDataObject *pdtobj, HKEY hkeyProgID ) -{ - + IDataObject *pdtobj, HKEY hkeyProgID) +{ return S_OK; } Modified: trunk/reactos/dll/win32/shell32/newmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/newmenu.… ============================================================================== --- trunk/reactos/dll/win32/shell32/newmenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/newmenu.h [iso-8859-1] Thu Jan 5 23:04:06 2012 @@ -41,29 +41,32 @@ struct SHELLNEW_ITEM { - SHELLNEW_TYPE Type; - LPWSTR szExt; - LPWSTR szTarget; - LPWSTR szDesc; - LPWSTR szIcon; - SHELLNEW_ITEM *Next; + SHELLNEW_TYPE Type; + LPWSTR pwszExt; + LPWSTR pwszTarget; + LPWSTR pwszDesc; + LPWSTR pwszIcon; + SHELLNEW_ITEM *pNext; }; - LPWSTR szPath; - SHELLNEW_ITEM *s_SnHead; - IUnknown* fSite; + LPWSTR m_wszPath; + SHELLNEW_ITEM *m_pShellItems; + IUnknown *m_pSite; + HMENU m_hSubMenu; + + void CleanupMenu(); + static BOOL GetKeyDescription(LPCWSTR pwszExt, LPWSTR pwszResult); + SHELLNEW_ITEM *LoadItem(LPCWSTR pwszExt); + void UnloadItem(SHELLNEW_ITEM *pItem); + void UnloadShellItems(); + BOOL LoadShellNewItems(); + UINT InsertShellNewItems(HMENU hMenu, UINT idFirst, UINT idMenu); + HRESULT DoShellNewCmd(LPCMINVOKECOMMANDINFO lpcmi, IShellView *psv); + void CreateNewFolder(IShellView *psv); + public: CNewMenu(); ~CNewMenu(); - SHELLNEW_ITEM *LoadItem(LPWSTR szKeyName); - void UnloadItem(SHELLNEW_ITEM *item); - void UnloadShellItems(); - BOOL LoadShellNewItems(); - UINT InsertShellNewItems(HMENU hMenu, UINT idFirst, UINT idMenu); - HRESULT DoShellNewCmd(LPCMINVOKECOMMANDINFO lpcmi, IShellView * psv); - HRESULT DoMeasureItem(HWND hWnd, MEASUREITEMSTRUCT *lpmis); - HRESULT DoDrawItem(HWND hWnd, DRAWITEMSTRUCT *drawItem); - void DoNewFolder(IShellView *psv); // IObjectWithSite virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); @@ -72,7 +75,7 @@ // IContextMenu virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); - virtual HRESULT WINAPI GetCommandString(UINT_PTR idCommand,UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen); + virtual HRESULT WINAPI GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen); // IContextMenu2 virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam);

1 0

[ekohl] 54847: [EVENTLOG] - Implement LogfBackupFile. - Fix a typo.
by ekohl＠svn.reactos.org 05 Jan '12

05 Jan '12

Author: ekohl Date: Thu Jan 5 23:03:40 2012 New Revision: 54847 URL: http://svn.reactos.org/svn/reactos?rev=54847&view=rev Log: [EVENTLOG] - Implement LogfBackupFile. - Fix a typo. Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] Thu Jan 5 23:03:40 2012 @@ -495,7 +495,7 @@ DPRINT("Flags: "); if (header->Flags & ELF_LOGFILE_HEADER_DIRTY) DPRINT("ELF_LOGFILE_HEADER_DIRTY"); if (header->Flags & ELF_LOGFILE_HEADER_WRAP) DPRINT("| ELF_LOGFILE_HEADER_WRAP "); - if (header->Flags & ELF_LOGGFILE_LOGFULL_WRITTEN) DPRINT("| ELF_LOGGFILE_LOGFULL_WRITTEN "); + if (header->Flags & ELF_LOGFILE_LOGFULL_WRITTEN) DPRINT("| ELF_LOGFILE_LOGFULL_WRITTEN "); if (header->Flags & ELF_LOGFILE_ARCHIVE_SET) DPRINT("| ELF_LOGFILE_ARCHIVE_SET "); DPRINT("\n"); } Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Thu Jan 5 23:03:40 2012 @@ -19,7 +19,7 @@ #include <lpcfuncs.h> #include <rtlfuncs.h> #include <obfuncs.h> -#include <iotypes.h> +#include <iofuncs.h> #include <debug.h> #include "eventlogrpc_s.h" @@ -42,7 +42,7 @@ */ #define ELF_LOGFILE_HEADER_DIRTY 1 #define ELF_LOGFILE_HEADER_WRAP 2 -#define ELF_LOGGFILE_LOGFULL_WRITTEN 4 +#define ELF_LOGFILE_LOGFULL_WRITTEN 4 #define ELF_LOGFILE_ARCHIVE_SET 8 /* FIXME: MSDN reads that the following two structs are in winnt.h. Are they? */ Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Thu Jan 5 23:03:40 2012 @@ -1077,13 +1077,200 @@ LogfBackupFile(PLOGFILE LogFile, PUNICODE_STRING BackupFileName) { -// RtlAcquireResourceShared(&LogFile->Lock, TRUE); - - /* FIXME: Write a backup file */ - -// RtlReleaseResource(&LogFile->Lock); - - return STATUS_NOT_IMPLEMENTED; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + EVENTLOGHEADER Header; + EVENTLOGEOF EofRec; + HANDLE FileHandle = NULL; + ULONG i; + LARGE_INTEGER FileOffset; + NTSTATUS Status; + PUCHAR Buffer = NULL; + + DWORD dwOffset, dwRead, dwRecSize; + + DPRINT("LogfBackupFile(%p, %wZ)\n", LogFile, BackupFileName); + + /* Lock the log file shared */ + RtlAcquireResourceShared(&LogFile->Lock, TRUE); + + InitializeObjectAttributes(&ObjectAttributes, + BackupFileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtCreateFile(&FileHandle, + GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ, + FILE_CREATE, + FILE_WRITE_THROUGH | FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + DPRINT("Can't create backup file %wZ (Status: 0x%08lx)\n", BackupFileName, Status); + goto Done; + } + + /* Initialize the (dirty) log file header */ + Header.HeaderSize = sizeof(EVENTLOGHEADER); + Header.Signature = LOGFILE_SIGNATURE; + Header.MajorVersion = MAJORVER; + Header.MinorVersion = MINORVER; + Header.StartOffset = sizeof(EVENTLOGHEADER); + Header.EndOffset = sizeof(EVENTLOGHEADER); + Header.CurrentRecordNumber = 1; + Header.OldestRecordNumber = 1; + Header.MaxSize = 0; + Header.Flags = ELF_LOGFILE_HEADER_DIRTY; + Header.Retention = LogFile->Header.Retention; + Header.EndHeaderSize = sizeof(EVENTLOGHEADER); + + /* Write the (dirty) log file header */ + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + &Header, + sizeof(EVENTLOGHEADER), + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to write the log file header (Status: 0x%08lx)\n", Status); + goto Done; + } + + for (i = LogFile->Header.OldestRecordNumber; i < LogFile->Header.CurrentRecordNumber; i++) + { + dwOffset = LogfOffsetByNumber(LogFile, i); + if (dwOffset == 0) + break; + + if (SetFilePointer(LogFile->hFile, dwOffset, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + { + DPRINT1("SetFilePointer() failed!\n"); + goto Done; + } + + if (!ReadFile(LogFile->hFile, &dwRecSize, sizeof(DWORD), &dwRead, NULL)) + { + DPRINT1("ReadFile() failed!\n"); + goto Done; + } + + if (SetFilePointer(LogFile->hFile, dwOffset, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + { + DPRINT1("SetFilePointer() failed!\n"); + goto Done; + } + + Buffer = HeapAlloc(MyHeap, 0, dwRecSize); + if (Buffer == NULL) + { + DPRINT1("HeapAlloc() failed!\n"); + goto Done; + } + + if (!ReadFile(LogFile->hFile, &Buffer, dwRecSize, &dwRead, NULL)) + { + DPRINT1("ReadFile() failed!\n"); + goto Done; + } + + /* Write the event record */ + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + Buffer, + dwRecSize, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtWriteFile() failed!\n"); + goto Done; + } + + /* Update the header information */ + Header.EndOffset += dwRecSize; + + /* Free the buffer */ + HeapFree(MyHeap, 0, Buffer); + Buffer = NULL; + } + + /* Initialize the EOF record */ + EofRec.RecordSizeBeginning = sizeof(EVENTLOGEOF); + EofRec.Ones = 0x11111111; + EofRec.Twos = 0x22222222; + EofRec.Threes = 0x33333333; + EofRec.Fours = 0x44444444; + EofRec.BeginRecord = sizeof(EVENTLOGHEADER); + EofRec.EndRecord = Header.EndOffset; + EofRec.CurrentRecordNumber = LogFile->Header.CurrentRecordNumber; + EofRec.OldestRecordNumber = LogFile->Header.OldestRecordNumber; + EofRec.RecordSizeEnd = sizeof(EVENTLOGEOF); + + /* Write the EOF record */ + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + &EofRec, + sizeof(EVENTLOGEOF), + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtWriteFile() failed!\n"); + goto Done; + } + + /* Update the header information */ + Header.CurrentRecordNumber = LogFile->Header.CurrentRecordNumber; + Header.OldestRecordNumber = LogFile->Header.OldestRecordNumber; + Header.MaxSize = Header.EndOffset + sizeof(EVENTLOGEOF); + Header.Flags = 0; + + /* Write the (clean) log file header */ + FileOffset.QuadPart = 0; + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + &Header, + sizeof(EVENTLOGHEADER), + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtWriteFile() failed!\n"); + } + +Done: + /* Free the buffer */ + if (Buffer != NULL) + HeapFree(MyHeap, 0, Buffer); + + /* Close the backup file */ + if (FileHandle != NULL) + NtClose(FileHandle); + + /* Unlock the log file */ + RtlReleaseResource(&LogFile->Lock); + + return Status; } Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Thu Jan 5 23:03:40 2012 @@ -472,6 +472,14 @@ case EVENTLOG_INFORMATION_TYPE: DPRINT("Info: %wZ\n", Strings[i]); + break; + + case EVENTLOG_AUDIT_SUCCESS: + DPRINT("Audit Success: %wZ\n", Strings[i]); + break; + + case EVENTLOG_AUDIT_FAILURE: + DPRINT("Audit Failure: %wZ\n", Strings[i]); break; default:

1 0

[ekohl] 54846: [ADVAPI32] Pass nt paths to ElfrBackupELFW and ElfrClearELFW.
by ekohl＠svn.reactos.org 05 Jan '12

05 Jan '12

Author: ekohl Date: Thu Jan 5 22:07:33 2012 New Revision: 54846 URL: http://svn.reactos.org/svn/reactos?rev=54846&view=rev Log: [ADVAPI32] Pass nt paths to ElfrBackupELFW and ElfrClearELFW. Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Thu Jan 5 22:07:33 2012 @@ -145,32 +145,38 @@ BackupEventLogA(IN HANDLE hEventLog, IN LPCSTR lpBackupFileName) { - ANSI_STRING BackupFileName; - NTSTATUS Status; + ANSI_STRING BackupFileNameA; + UNICODE_STRING BackupFileNameW; + NTSTATUS Status; + BOOL Result; TRACE("%p, %s\n", hEventLog, lpBackupFileName); - RtlInitAnsiString(&BackupFileName, lpBackupFileName); - - RpcTryExcept - { - Status = ElfrBackupELFA(hEventLog, - (PRPC_STRING)&BackupFileName); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} + if (lpBackupFileName == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + RtlInitAnsiString(&BackupFileNameA, lpBackupFileName); + + Status = RtlAnsiStringToUnicodeString(&BackupFileNameW, + &BackupFileNameA, + TRUE); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + Result = BackupEventLogW(hEventLog, + BackupFileNameW.Buffer); + + RtlFreeUnicodeString(&BackupFileNameW); + + return(Result); +} + /****************************************************************************** * BackupEventLogW [ADVAPI32.@] @@ -183,23 +189,36 @@ BackupEventLogW(IN HANDLE hEventLog, IN LPCWSTR lpBackupFileName) { - UNICODE_STRING BackupFileName; + UNICODE_STRING BackupFileNameW; NTSTATUS Status; TRACE("%p, %s\n", hEventLog, debugstr_w(lpBackupFileName)); - RtlInitUnicodeString(&BackupFileName, lpBackupFileName); + if (lpBackupFileName == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!RtlDosPathNameToNtPathName_U(lpBackupFileName, &BackupFileNameW, + NULL, NULL)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } RpcTryExcept { Status = ElfrBackupELFW(hEventLog, - (PRPC_UNICODE_STRING)&BackupFileName); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; + (PRPC_UNICODE_STRING)&BackupFileNameW); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + RtlFreeHeap(RtlGetProcessHeap(), 0, BackupFileNameW.Buffer); if (!NT_SUCCESS(Status)) { @@ -218,31 +237,37 @@ ClearEventLogA(IN HANDLE hEventLog, IN LPCSTR lpBackupFileName) { - ANSI_STRING BackupFileName; - NTSTATUS Status; + ANSI_STRING BackupFileNameA; + UNICODE_STRING BackupFileNameW; + NTSTATUS Status; + BOOL Result; TRACE("%p, %s\n", hEventLog, lpBackupFileName); - RtlInitAnsiString(&BackupFileName, lpBackupFileName); - - RpcTryExcept - { - Status = ElfrClearELFA(hEventLog, - (PRPC_STRING)&BackupFileName); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; + if (lpBackupFileName == NULL) + { + RtlInitUnicodeString(&BackupFileNameW, NULL); + } + else + { + RtlInitAnsiString(&BackupFileNameA, lpBackupFileName); + + Status = RtlAnsiStringToUnicodeString(&BackupFileNameW, + &BackupFileNameA, + TRUE); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + } + + Result = ClearEventLogW(hEventLog, + BackupFileNameW.Buffer); + + RtlFreeUnicodeString(&BackupFileNameW); + + return Result; } @@ -253,23 +278,38 @@ ClearEventLogW(IN HANDLE hEventLog, IN LPCWSTR lpBackupFileName) { - UNICODE_STRING BackupFileName; + UNICODE_STRING BackupFileNameW; NTSTATUS Status; TRACE("%p, %s\n", hEventLog, debugstr_w(lpBackupFileName)); - RtlInitUnicodeString(&BackupFileName,lpBackupFileName); + if (lpBackupFileName == NULL) + { + RtlInitUnicodeString(&BackupFileNameW, NULL); + } + else + { + if (!RtlDosPathNameToNtPathName_U(lpBackupFileName, &BackupFileNameW, + NULL, NULL)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + } RpcTryExcept { Status = ElfrClearELFW(hEventLog, - (PRPC_UNICODE_STRING)&BackupFileName); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; + (PRPC_UNICODE_STRING)&BackupFileNameW); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + if (lpBackupFileName != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, BackupFileNameW.Buffer); if (!NT_SUCCESS(Status)) {

1 0

[rharabien] 54845: [SHELL32] - Formatting. No code changes.
by rharabien＠svn.reactos.org 05 Jan '12

05 Jan '12

Author: rharabien Date: Thu Jan 5 18:34:35 2012 New Revision: 54845 URL: http://svn.reactos.org/svn/reactos?rev=54845&view=rev Log: [SHELL32] - Formatting. No code changes. Modified: trunk/reactos/dll/win32/shell32/control.cpp trunk/reactos/dll/win32/shell32/folders/cpanel.cpp trunk/reactos/dll/win32/shell32/newmenu.cpp trunk/reactos/dll/win32/shell32/shlexec.cpp Modified: trunk/reactos/dll/win32/shell32/control.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… ============================================================================== --- trunk/reactos/dll/win32/shell32/control.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/control.cpp [iso-8859-1] Thu Jan 5 18:34:35 2012 @@ -247,7 +247,7 @@ return 0; } -static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, +static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, WPARAM lParam1, LPARAM lParam2) { CPanel* panel = (CPanel*)GetWindowLongPtrW(hWnd, 0); @@ -259,16 +259,15 @@ case WM_CREATE: Control_WndProc_Create(hWnd, (CREATESTRUCTW*)lParam2); return 0; - case WM_DESTROY: { - CPlApplet* applet = panel->first; + CPlApplet *applet = panel->first; while (applet) applet = Control_UnloadApplet(applet); PostQuitMessage(0); - }; break; - + break; + } case WM_PAINT: return Control_WndProc_Paint(panel, lParam1); case WM_LBUTTONUP: @@ -324,27 +323,26 @@ } } -static void Control_DoWindow(CPanel* panel, HWND hWnd, HINSTANCE hInst) -{ - HANDLE h; - WIN32_FIND_DATAW fd; - WCHAR buffer[MAX_PATH]; - static const WCHAR wszAllCpl[] = {'*','.','c','p','l',0}; - WCHAR *p; - - GetSystemDirectoryW( buffer, MAX_PATH ); - p = buffer + wcslen(buffer); - *p++ = '\\'; - wcscpy(p, wszAllCpl); - - if ((h = FindFirstFileW(buffer, &fd)) != INVALID_HANDLE_VALUE) +static void Control_DoWindow(CPanel *panel, HWND hWnd, HINSTANCE hInst) +{ + HANDLE hFind; + WIN32_FIND_DATAW wfd; + WCHAR wszPath[MAX_PATH]; + WCHAR *Ptr = wszPath; + + Ptr += GetSystemDirectoryW(wszPath, MAX_PATH); + *Ptr++ = '\\'; + wcscpy(Ptr, L"*.cpl"); + + hFind = FindFirstFileW(wszPath, &wfd); + if (hFind != INVALID_HANDLE_VALUE) { do { - wcscpy(p, fd.cFileName); - Control_LoadApplet(hWnd, buffer, panel); - } while (FindNextFileW(h, &fd)); - FindClose(h); + wcscpy(Ptr, wfd.cFileName); + Control_LoadApplet(hWnd, wszPath, panel); + } while (FindNextFileW(hFind, &wfd)); + FindClose(hFind); } Control_DoInterface(panel, hWnd, hInst); Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] Thu Jan 5 18:34:35 2012 @@ -36,7 +36,6 @@ class CControlPanelEnum : public IEnumIDListImpl { - private: public: CControlPanelEnum(); ~CControlPanelEnum(); Modified: trunk/reactos/dll/win32/shell32/newmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/newmenu.… ============================================================================== --- trunk/reactos/dll/win32/shell32/newmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/newmenu.cpp [iso-8859-1] Thu Jan 5 18:34:35 2012 @@ -73,305 +73,289 @@ BOOL GetKeyDescription(LPWSTR szKeyName, LPWSTR szResult) { - HKEY hKey; - DWORD dwDesc, dwError; - WCHAR szDesc[100]; - - static const WCHAR szFriendlyTypeName[] = { '\\','F','r','i','e','n','d','l','y','T','y','p','e','N','a','m','e',0 }; - - TRACE("GetKeyDescription: keyname %s\n", debugstr_w(szKeyName)); - - if (RegOpenKeyExW(HKEY_CLASSES_ROOT,szKeyName,0, KEY_READ | KEY_QUERY_VALUE,&hKey) != ERROR_SUCCESS) - return FALSE; - - if (RegLoadMUIStringW(hKey,szFriendlyTypeName,szResult,MAX_PATH,&dwDesc,0,NULL) == ERROR_SUCCESS) - { - TRACE("result %s\n", debugstr_w(szResult)); - RegCloseKey(hKey); - return TRUE; - } - /* fetch default value */ - dwDesc = sizeof(szDesc); - dwError = RegGetValueW(hKey,NULL,NULL, RRF_RT_REG_SZ,NULL,szDesc,&dwDesc); - if(dwError == ERROR_SUCCESS) - { - if (wcsncmp(szKeyName, szDesc, dwDesc / sizeof(WCHAR))) - { - /* recurse for to a linked key */ - if (!GetKeyDescription(szDesc, szResult)) - { - /* use description */ - wcscpy(szResult, szDesc); - } - } - else - { - /* use default value as description */ - wcscpy(szResult, szDesc); - } - } - else - { - /* registry key w/o default key?? */ - TRACE("RegGetValue failed with %x\n", dwError); - wcscpy(szResult, szKeyName); - } - - RegCloseKey(hKey); - return TRUE; + HKEY hKey; + DWORD dwDesc, dwError; + WCHAR szDesc[100]; + + TRACE("GetKeyDescription: keyname %s\n", debugstr_w(szKeyName)); + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szKeyName, 0, KEY_READ | KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) + return FALSE; + + if (RegLoadMUIStringW(hKey, L"\\FriendlyTypeName", szResult, MAX_PATH, &dwDesc, 0, NULL) == ERROR_SUCCESS) + { + TRACE("result %s\n", debugstr_w(szResult)); + RegCloseKey(hKey); + return TRUE; + } + /* fetch default value */ + dwDesc = sizeof(szDesc); + dwError = RegGetValueW(hKey, NULL, NULL, RRF_RT_REG_SZ, NULL, szDesc, &dwDesc); + if(dwError == ERROR_SUCCESS) + { + if (wcsncmp(szKeyName, szDesc, dwDesc / sizeof(WCHAR))) + { + /* recurse for to a linked key */ + if (!GetKeyDescription(szDesc, szResult)) + { + /* use description */ + wcscpy(szResult, szDesc); + } + } + else + { + /* use default value as description */ + wcscpy(szResult, szDesc); + } + } + else + { + /* registry key w/o default key?? */ + TRACE("RegGetValue failed with %x\n", dwError); + wcscpy(szResult, szKeyName); + } + + RegCloseKey(hKey); + return TRUE; } CNewMenu::SHELLNEW_ITEM *CNewMenu::LoadItem(LPWSTR szKeyName) { - HKEY hKey; - DWORD dwIndex; - WCHAR szName[MAX_PATH]; - WCHAR szCommand[MAX_PATH]; - WCHAR szDesc[MAX_PATH] = {0}; - WCHAR szIcon[MAX_PATH] = {0}; - DWORD dwName, dwCommand; - LONG result; - SHELLNEW_ITEM *pNewItem; - - static const WCHAR szShellNew[] = { '\\','S','h','e','l','l','N','e','w',0 }; - static const WCHAR szCmd[] = { 'C','o','m','m','a','n','d',0 }; - static const WCHAR szData[] = { 'D','a','t','a',0 }; - static const WCHAR szFileName[] = { 'F','i','l','e','N','a','m','e', 0 }; - static const WCHAR szNullFile[] = { 'N','u','l','l','F','i','l','e', 0 }; - - - wcscpy(szName, szKeyName); - GetKeyDescription(szKeyName, szDesc); - wcscat(szName, szShellNew); - result = RegOpenKeyExW(HKEY_CLASSES_ROOT,szName,0,KEY_READ,&hKey); - - //TRACE("LoadItem dwName %d keyname %s szName %s szDesc %s szIcon %s\n", dwName, debugstr_w(szKeyName), debugstr_w(szName), debugstr_w(szDesc), debugstr_w(szIcon)); - - if (result != ERROR_SUCCESS) - { - return NULL; - } - - dwIndex = 0; - pNewItem = NULL; - - do - { - dwName = MAX_PATH; - dwCommand = MAX_PATH; - result = RegEnumValueW(hKey,dwIndex,szName,&dwName,NULL,NULL,(LPBYTE)szCommand, &dwCommand); - if (result == ERROR_SUCCESS) - { - SHELLNEW_TYPE type = SHELLNEW_TYPE_INVALID; - LPWSTR szTarget = szCommand; - //TRACE("szName %s szCommand %s\n", debugstr_w(szName), debugstr_w(szCommand)); - if (!wcsicmp(szName, szCmd)) - { - type = SHELLNEW_TYPE_COMMAND; - }else if (!wcsicmp(szName, szData)) - { - type = SHELLNEW_TYPE_DATA; - } - else if (!wcsicmp(szName, szFileName)) - { - type = SHELLNEW_TYPE_FILENAME; - } - else if (!wcsicmp(szName, szNullFile)) - { - type = SHELLNEW_TYPE_NULLFILE; - szTarget = NULL; - } - if (type != SHELLNEW_TYPE_INVALID) - { - pNewItem = (SHELLNEW_ITEM *)HeapAlloc(GetProcessHeap(), 0, sizeof(SHELLNEW_ITEM)); - pNewItem->Type = type; - if (szTarget) - pNewItem->szTarget = _wcsdup(szTarget); - else - pNewItem->szTarget = NULL; - - pNewItem->szDesc = _wcsdup(szDesc); - pNewItem->szIcon = _wcsdup(szIcon); - pNewItem->szExt = _wcsdup(szKeyName); - pNewItem->Next = NULL; - break; - } - } - dwIndex++; - }while(result != ERROR_NO_MORE_ITEMS); - RegCloseKey(hKey); - return pNewItem; -} - + HKEY hKey; + DWORD dwIndex = 0; + WCHAR szName[MAX_PATH]; + WCHAR szCommand[MAX_PATH]; + WCHAR szDesc[MAX_PATH] = L""; + WCHAR szIcon[MAX_PATH] = L""; + DWORD dwName, dwCommand; + LONG result; + SHELLNEW_ITEM *pNewItem = NULL; + + wcscpy(szName, szKeyName); + GetKeyDescription(szKeyName, szDesc); + wcscat(szName, L"\\ShellNew"); + result = RegOpenKeyExW(HKEY_CLASSES_ROOT, szName, 0, KEY_READ, &hKey); + + TRACE("LoadItem dwName %d keyname %s szName %s szDesc %s szIcon %s\n", dwName, debugstr_w(szKeyName), debugstr_w(szName), debugstr_w(szDesc), debugstr_w(szIcon)); + + if (result != ERROR_SUCCESS) + { + TRACE("Failed to open key\n"); + return NULL; + } + + do + { + dwName = MAX_PATH; + dwCommand = MAX_PATH; + result = RegEnumValueW(hKey, dwIndex, szName, &dwName, NULL, NULL, (LPBYTE)szCommand, &dwCommand); + if (result == ERROR_SUCCESS) + { + SHELLNEW_TYPE type = SHELLNEW_TYPE_INVALID; + LPWSTR szTarget = szCommand; + + TRACE("szName %s szCommand %s\n", debugstr_w(szName), debugstr_w(szCommand)); + + if (!wcsicmp(szName, L"Command")) + type = SHELLNEW_TYPE_COMMAND; + else if (!wcsicmp(szName, L"Data")) + type = SHELLNEW_TYPE_DATA; + else if (!wcsicmp(szName, L"FileName")) + type = SHELLNEW_TYPE_FILENAME; + else if (!wcsicmp(szName, L"NullFile")) + { + type = SHELLNEW_TYPE_NULLFILE; + szTarget = NULL; + } + + if (type != SHELLNEW_TYPE_INVALID) + { + pNewItem = (SHELLNEW_ITEM *)HeapAlloc(GetProcessHeap(), 0, sizeof(SHELLNEW_ITEM)); + if (!pNewItem) + break; + + pNewItem->Type = type; + if (szTarget) + pNewItem->szTarget = _wcsdup(szTarget); + else + pNewItem->szTarget = NULL; + + pNewItem->szDesc = _wcsdup(szDesc); + pNewItem->szIcon = _wcsdup(szIcon); + pNewItem->szExt = _wcsdup(szKeyName); + pNewItem->Next = NULL; + break; + } + } + dwIndex++; + } while(result != ERROR_NO_MORE_ITEMS); + RegCloseKey(hKey); + return pNewItem; +} BOOL CNewMenu::LoadShellNewItems() { - DWORD dwIndex; - WCHAR szName[MAX_PATH]; - LONG result; - SHELLNEW_ITEM *pNewItem; - SHELLNEW_ITEM *pCurItem = NULL; - static WCHAR szLnk[] = { '.','l','n','k',0 }; - - /* insert do new folder action */ - if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, szNew, sizeof(szNew) / sizeof(WCHAR))) - szNew[0] = 0; - szNew[MAX_PATH-1] = 0; - - UnloadShellItems(); - - dwIndex = 0; - do - { - result = RegEnumKeyW(HKEY_CLASSES_ROOT,dwIndex,szName,MAX_PATH); - if (result == ERROR_SUCCESS) - { - pNewItem = LoadItem(szName); - if (pNewItem) - { - if (!wcsicmp(pNewItem->szExt, szLnk)) - { - if (s_SnHead) + DWORD dwIndex; + WCHAR szName[MAX_PATH]; + LONG result; + SHELLNEW_ITEM *pNewItem; + SHELLNEW_ITEM *pCurItem = NULL; + + /* insert do new folder action */ + if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, szNew, sizeof(szNew) / sizeof(WCHAR))) + szNew[0] = 0; + + UnloadShellItems(); + + dwIndex = 0; + do + { + result = RegEnumKeyW(HKEY_CLASSES_ROOT, dwIndex, szName, MAX_PATH); + if (result == ERROR_SUCCESS) + { + pNewItem = LoadItem(szName); + if (pNewItem) + { + if (!wcsicmp(pNewItem->szExt, L".lnk")) { - pNewItem->Next = s_SnHead; - s_SnHead = pNewItem; + if (s_SnHead) + { + pNewItem->Next = s_SnHead; + s_SnHead = pNewItem; + } + else + { + s_SnHead = pCurItem = pNewItem; + } } else { - s_SnHead = pCurItem = pNewItem; + if (pCurItem) + { + pCurItem->Next = pNewItem; + pCurItem = pNewItem; + } + else + { + pCurItem = s_SnHead = pNewItem; + } } } - else - { - if (pCurItem) - { - pCurItem->Next = pNewItem; - pCurItem = pNewItem; - } - else - { - pCurItem = s_SnHead = pNewItem; - } - } - } - } - dwIndex++; - }while(result != ERROR_NO_MORE_ITEMS); - - if (s_SnHead == NULL) - return FALSE; - else - return TRUE; + } + dwIndex++; + } while(result != ERROR_NO_MORE_ITEMS); + + if (s_SnHead == NULL) + return FALSE; + else + return TRUE; } UINT CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idFirst, UINT idMenu) { - MENUITEMINFOW mii; - SHELLNEW_ITEM *pCurItem; - UINT i; - WCHAR szBuffer[MAX_PATH]; - - if (s_SnHead == NULL) - { - if (!LoadShellNewItems()) - return 0; - } - - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - - /* insert do new shortcut action */ - if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWFOLDER, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]))) - szBuffer[0] = 0; - szBuffer[MAX_PATH-1] = 0; - mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; - mii.fType = MFT_STRING; - mii.dwTypeData = szBuffer; - mii.cch = wcslen(mii.dwTypeData); - mii.wID = idFirst++; - InsertMenuItemW(hMenu, idMenu++, TRUE, &mii); - - /* insert do new shortcut action */ - if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWLINK, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]))) - szBuffer[0] = 0; - szBuffer[MAX_PATH-1] = 0; - mii.dwTypeData = szBuffer; - mii.cch = wcslen(mii.dwTypeData); - mii.wID = idFirst++; - InsertMenuItemW(hMenu, idMenu++, TRUE, &mii); - - /* insert seperator for custom new action */ - mii.fMask = MIIM_TYPE | MIIM_ID; - mii.fType = MFT_SEPARATOR; - mii.wID = -1; - InsertMenuItemW(hMenu, idMenu++, TRUE, &mii); - - mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; - /* - * FIXME - * implement loading of icons - * and using MFT_OWNERDRAWN - */ - mii.fType = MFT_STRING; - mii.fState = MFS_ENABLED; - - pCurItem = s_SnHead; - i = 0; - - while(pCurItem) - { - if (i >= 1) - { - TRACE("szDesc %s\n", debugstr_w(pCurItem->szDesc)); - mii.dwTypeData = pCurItem->szDesc; - mii.cch = wcslen(mii.dwTypeData); - mii.wID = idFirst++; - InsertMenuItemW(hMenu, idMenu++, TRUE, &mii); - } - pCurItem = pCurItem->Next; - i++; - } - return (i+2); + MENUITEMINFOW mii; + SHELLNEW_ITEM *pCurItem; + UINT i; + WCHAR szBuffer[MAX_PATH]; + + if (s_SnHead == NULL) + { + if (!LoadShellNewItems()) + return 0; + } + + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + + /* insert do new shortcut action */ + if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWFOLDER, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]))) + szBuffer[0] = 0; + szBuffer[MAX_PATH-1] = 0; + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; + mii.fType = MFT_STRING; + mii.dwTypeData = szBuffer; + mii.cch = wcslen(mii.dwTypeData); + mii.wID = idFirst++; + InsertMenuItemW(hMenu, idMenu++, TRUE, &mii); + + /* insert do new shortcut action */ + if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWLINK, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]))) + szBuffer[0] = 0; + szBuffer[MAX_PATH-1] = 0; + mii.dwTypeData = szBuffer; + mii.cch = wcslen(mii.dwTypeData); + mii.wID = idFirst++; + InsertMenuItemW(hMenu, idMenu++, TRUE, &mii); + + /* insert seperator for custom new action */ + mii.fMask = MIIM_TYPE | MIIM_ID; + mii.fType = MFT_SEPARATOR; + mii.wID = -1; + InsertMenuItemW(hMenu, idMenu++, TRUE, &mii); + + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; + /* + * FIXME + * implement loading of icons + * and using MFT_OWNERDRAWN + */ + mii.fType = MFT_STRING; + mii.fState = MFS_ENABLED; + + pCurItem = s_SnHead; + i = 0; + + while(pCurItem) + { + if (i >= 1) + { + TRACE("szDesc %s\n", debugstr_w(pCurItem->szDesc)); + mii.dwTypeData = pCurItem->szDesc; + mii.cch = wcslen(mii.dwTypeData); + mii.wID = idFirst++; + InsertMenuItemW(hMenu, idMenu++, TRUE, &mii); + } + pCurItem = pCurItem->Next; + i++; + } + return (i + 2); } HRESULT CNewMenu::DoShellNewCmd(LPCMINVOKECOMMANDINFO lpcmi, IShellView *psv) { - SHELLNEW_ITEM *pCurItem = s_SnHead; - IPersistFolder3 * psf; - LPITEMIDLIST pidl; - STRRET strTemp; - WCHAR szTemp[MAX_PATH]; - WCHAR szBuffer[MAX_PATH]; - WCHAR szPath[MAX_PATH]; - STARTUPINFOW sInfo; - PROCESS_INFORMATION pi; - UINT i, target; - HANDLE hFile; - DWORD dwWritten, dwError; - CComPtr<IFolderView> folderView; - CComPtr<IShellFolder> parentFolder; - HRESULT hResult; - - static const WCHAR szP1[] = { '%', '1', 0 }; - static const WCHAR szFormat[] = {'%','s',' ','(','%','d',')','%','s',0 }; - - i = 1; - target = LOWORD(lpcmi->lpVerb); - - while(pCurItem) - { - if (i == target) - break; - - pCurItem = pCurItem->Next; - i++; - } - - if (!pCurItem) - return E_UNEXPECTED; + SHELLNEW_ITEM *pCurItem = s_SnHead; + IPersistFolder3 * psf; + LPITEMIDLIST pidl; + STRRET strTemp; + WCHAR szTemp[MAX_PATH]; + WCHAR szBuffer[MAX_PATH]; + WCHAR szPath[MAX_PATH]; + STARTUPINFOW sInfo; + PROCESS_INFORMATION pi; + UINT i, target; + HANDLE hFile; + DWORD dwWritten, dwError; + CComPtr<IFolderView> folderView; + CComPtr<IShellFolder> parentFolder; + HRESULT hResult; + + i = 1; + target = LOWORD(lpcmi->lpVerb); + + while(pCurItem) + { + if (i == target) + break; + + pCurItem = pCurItem->Next; + i++; + } + + if (!pCurItem) + return E_UNEXPECTED; //if (fSite == NULL) // return E_FAIL; @@ -382,111 +366,111 @@ if (FAILED(hResult)) return hResult; - if (parentFolder->QueryInterface(IID_IPersistFolder2, (LPVOID*)&psf) != S_OK) - { - ERR("Failed to get interface IID_IPersistFolder2\n"); - return E_FAIL; - } - if (psf->GetCurFolder(&pidl) != S_OK) - { - ERR("IPersistFolder2_GetCurFolder failed\n"); - return E_FAIL; - } - - if (parentFolder == NULL || parentFolder->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strTemp) != S_OK) - { - ERR("IShellFolder_GetDisplayNameOf failed\n"); - return E_FAIL; - } - StrRetToBufW(&strTemp, pidl, szPath, MAX_PATH); - - switch(pCurItem->Type) - { - case SHELLNEW_TYPE_COMMAND: - { - LPWSTR ptr; - LPWSTR szCmd; - - if (!ExpandEnvironmentStringsW(pCurItem->szTarget, szBuffer, MAX_PATH)) - { - TRACE("ExpandEnvironmentStrings failed\n"); - break; - } - - ptr = wcsstr(szBuffer, szP1); - if (ptr) - { - ptr[1] = 's'; - swprintf(szTemp, szBuffer, szPath); - ptr = szTemp; - } - else - { - ptr = szBuffer; - } - - ZeroMemory(&sInfo, sizeof(sInfo)); - sInfo.cb = sizeof(sInfo); - szCmd = _wcsdup(ptr); - if (!szCmd) - break; - if (CreateProcessW(NULL, szCmd, NULL, NULL,FALSE,0,NULL,NULL,&sInfo, &pi)) - { - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - } - free(szCmd); - break; - } - case SHELLNEW_TYPE_DATA: - case SHELLNEW_TYPE_FILENAME: - case SHELLNEW_TYPE_NULLFILE: - { - i = 2; - - PathAddBackslashW(szPath); - wcscat(szPath, szNew); - wcscat(szPath, L" "); - wcscat(szPath, pCurItem->szDesc); - wcscpy(szBuffer, szPath); - wcscat(szBuffer, pCurItem->szExt); - do - { - hFile = CreateFileW(szBuffer, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile != INVALID_HANDLE_VALUE) + if (parentFolder->QueryInterface(IID_IPersistFolder2, (LPVOID*)&psf) != S_OK) + { + ERR("Failed to get interface IID_IPersistFolder2\n"); + return E_FAIL; + } + if (psf->GetCurFolder(&pidl) != S_OK) + { + ERR("IPersistFolder2_GetCurFolder failed\n"); + return E_FAIL; + } + + if (parentFolder == NULL || parentFolder->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strTemp) != S_OK) + { + ERR("IShellFolder_GetDisplayNameOf failed\n"); + return E_FAIL; + } + StrRetToBufW(&strTemp, pidl, szPath, MAX_PATH); + + switch(pCurItem->Type) + { + case SHELLNEW_TYPE_COMMAND: + { + LPWSTR ptr; + LPWSTR szCmd; + + if (!ExpandEnvironmentStringsW(pCurItem->szTarget, szBuffer, MAX_PATH)) + { + TRACE("ExpandEnvironmentStrings failed\n"); break; - dwError = GetLastError(); - - TRACE("FileName %s szBuffer %s i %u error %x\n", debugstr_w(szBuffer), debugstr_w(szPath), i, dwError); - swprintf(szBuffer, szFormat, szPath, i, pCurItem->szExt); - i++; - }while(hFile == INVALID_HANDLE_VALUE && dwError == ERROR_FILE_EXISTS); - - if (hFile == INVALID_HANDLE_VALUE) - return E_FAIL; - - if (pCurItem->Type == SHELLNEW_TYPE_DATA) - { - i = WideCharToMultiByte(CP_ACP, 0, pCurItem->szTarget, -1, (LPSTR)szTemp, MAX_PATH*2, NULL, NULL); - if (i) - { - WriteFile(hFile, (LPCVOID)szTemp, i, &dwWritten, NULL); - } - } - CloseHandle(hFile); - if (pCurItem->Type == SHELLNEW_TYPE_FILENAME) - { - if (!CopyFileW(pCurItem->szTarget, szBuffer, FALSE)) + } + + ptr = wcsstr(szBuffer, L"%1"); + if (ptr) + { + ptr[1] = 's'; + swprintf(szTemp, szBuffer, szPath); + ptr = szTemp; + } + else + { + ptr = szBuffer; + } + + ZeroMemory(&sInfo, sizeof(sInfo)); + sInfo.cb = sizeof(sInfo); + szCmd = _wcsdup(ptr); + if (!szCmd) break; - } - TRACE("Notifying fs %s\n", debugstr_w(szBuffer)); - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, (LPCVOID)szBuffer, NULL); - break; - case SHELLNEW_TYPE_INVALID: - break; - } - } - return S_OK; + if (CreateProcessW(NULL, szCmd, NULL, NULL, FALSE, 0, NULL, NULL, &sInfo, &pi)) + { + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } + free(szCmd); + break; + } + case SHELLNEW_TYPE_DATA: + case SHELLNEW_TYPE_FILENAME: + case SHELLNEW_TYPE_NULLFILE: + { + i = 2; + + PathAddBackslashW(szPath); + wcscat(szPath, szNew); + wcscat(szPath, L" "); + wcscat(szPath, pCurItem->szDesc); + wcscpy(szBuffer, szPath); + wcscat(szBuffer, pCurItem->szExt); + do + { + hFile = CreateFileW(szBuffer, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile != INVALID_HANDLE_VALUE) + break; + dwError = GetLastError(); + + TRACE("FileName %s szBuffer %s i %u error %x\n", debugstr_w(szBuffer), debugstr_w(szPath), i, dwError); + swprintf(szBuffer, L"%s (%d)%s", szPath, i, pCurItem->szExt); + i++; + } while(hFile == INVALID_HANDLE_VALUE && dwError == ERROR_FILE_EXISTS); + + if (hFile == INVALID_HANDLE_VALUE) + return E_FAIL; + + if (pCurItem->Type == SHELLNEW_TYPE_DATA) + { + i = WideCharToMultiByte(CP_ACP, 0, pCurItem->szTarget, -1, (LPSTR)szTemp, MAX_PATH * 2, NULL, NULL); + if (i) + { + WriteFile(hFile, (LPCVOID)szTemp, i, &dwWritten, NULL); + } + } + CloseHandle(hFile); + if (pCurItem->Type == SHELLNEW_TYPE_FILENAME) + { + if (!CopyFileW(pCurItem->szTarget, szBuffer, FALSE)) + break; + } + TRACE("Notifying fs %s\n", debugstr_w(szBuffer)); + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, (LPCVOID)szBuffer, NULL); + break; + case SHELLNEW_TYPE_INVALID: + break; + } + } + return S_OK; } /************************************************************************** * DoMeasureItem @@ -494,40 +478,40 @@ HRESULT CNewMenu::DoMeasureItem(HWND hWnd, MEASUREITEMSTRUCT * lpmis) { - SHELLNEW_ITEM *pCurItem; - SHELLNEW_ITEM *pItem; - UINT i; - HDC hDC; - SIZE size; - - TRACE("DoMeasureItem entered with id %x\n", lpmis->itemID); - - pCurItem = s_SnHead; - - i = 1; - pItem = NULL; - while(pCurItem) - { - if (i == lpmis->itemID) - { - pItem = pCurItem; - break; - } - pCurItem = pCurItem->Next; - i++; - } - - if (!pItem) - { - TRACE("DoMeasureItem no item found\n"); - return E_FAIL; - } - hDC = GetDC(hWnd); - GetTextExtentPoint32W(hDC, pCurItem->szDesc, wcslen(pCurItem->szDesc), &size); - lpmis->itemWidth = size.cx + 32; - lpmis->itemHeight = max(size.cy, 20); - ReleaseDC (hWnd, hDC); - return S_OK; + SHELLNEW_ITEM *pCurItem; + SHELLNEW_ITEM *pItem; + UINT i; + HDC hDC; + SIZE size; + + TRACE("DoMeasureItem entered with id %x\n", lpmis->itemID); + + pCurItem = s_SnHead; + + i = 1; + pItem = NULL; + while(pCurItem) + { + if (i == lpmis->itemID) + { + pItem = pCurItem; + break; + } + pCurItem = pCurItem->Next; + i++; + } + + if (!pItem) + { + TRACE("DoMeasureItem no item found\n"); + return E_FAIL; + } + hDC = GetDC(hWnd); + GetTextExtentPoint32W(hDC, pCurItem->szDesc, wcslen(pCurItem->szDesc), &size); + lpmis->itemWidth = size.cx + 32; + lpmis->itemHeight = max(size.cy, 20); + ReleaseDC (hWnd, hDC); + return S_OK; } /************************************************************************** * DoDrawItem @@ -535,33 +519,33 @@ HRESULT CNewMenu::DoDrawItem(HWND hWnd, DRAWITEMSTRUCT * drawItem) { - SHELLNEW_ITEM *pCurItem; - SHELLNEW_ITEM *pItem; - UINT i; - pCurItem = s_SnHead; - - TRACE("DoDrawItem entered with id %x\n", drawItem->itemID); - - i = 1; - pItem = NULL; - while(pCurItem) - { - if (i == drawItem->itemID) - { - pItem = pCurItem; - break; - } - pCurItem = pCurItem->Next; - i++; - } - - if (!pItem) - return E_FAIL; - - drawItem->rcItem.left += 20; - - DrawTextW(drawItem->hDC, pCurItem->szDesc, wcslen(pCurItem->szDesc), &drawItem->rcItem, 0); - return S_OK; + SHELLNEW_ITEM *pCurItem; + SHELLNEW_ITEM *pItem; + UINT i; + pCurItem = s_SnHead; + + TRACE("DoDrawItem entered with id %x\n", drawItem->itemID); + + i = 1; + pItem = NULL; + while(pCurItem) + { + if (i == drawItem->itemID) + { + pItem = pCurItem; + break; + } + pCurItem = pCurItem->Next; + i++; + } + + if (!pItem) + return E_FAIL; + + drawItem->rcItem.left += 20; + + DrawTextW(drawItem->hDC, pCurItem->szDesc, wcslen(pCurItem->szDesc), &drawItem->rcItem, 0); + return S_OK; } /************************************************************************** @@ -570,11 +554,11 @@ void CNewMenu::DoNewFolder( IShellView *psv) { - ISFHelper * psfhlp; + ISFHelper *psfhlp; WCHAR wszName[MAX_PATH]; - CComPtr<IFolderView> folderView; - CComPtr<IShellFolder> parentFolder; - HRESULT hResult; + CComPtr<IFolderView> folderView; + CComPtr<IShellFolder> parentFolder; + HRESULT hResult; //if (fSite == NULL) // return; @@ -588,25 +572,25 @@ parentFolder->QueryInterface(IID_ISFHelper, (LPVOID*)&psfhlp); if (psfhlp) { - LPITEMIDLIST pidl; - - if (psfhlp->GetUniqueName(wszName, MAX_PATH) != S_OK) - return; - if (psfhlp->AddFolder(0, wszName, &pidl) != S_OK) - return; - - if(psv) - { - psv->Refresh(); - /* if we are in a shellview do labeledit */ - psv->SelectItem( - pidl,(SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE - |SVSI_FOCUSED|SVSI_SELECT)); - psv->Refresh(); - } - SHFree(pidl); - - psfhlp->Release(); + LPITEMIDLIST pidl; + + if (psfhlp->GetUniqueName(wszName, MAX_PATH) != S_OK) + return; + if (psfhlp->AddFolder(0, wszName, &pidl) != S_OK) + return; + + if(psv) + { + psv->Refresh(); + /* if we are in a shellview do labeledit */ + psv->SelectItem( + pidl, (SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE + | SVSI_FOCUSED | SVSI_SELECT)); + psv->Refresh(); + } + SHFree(pidl); + + psfhlp->Release(); } } @@ -629,10 +613,10 @@ HRESULT WINAPI CNewMenu::QueryContextMenu(HMENU hmenu, - UINT indexMenu, - UINT idCmdFirst, - UINT idCmdLast, - UINT uFlags) + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags) { WCHAR szBuffer[200]; MENUITEMINFOW mii; @@ -642,11 +626,8 @@ TRACE("%p %p %u %u %u %u\n", this, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags ); - if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, szBuffer, 200)) - { + if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, szBuffer, _countof(szBuffer))) szBuffer[0] = 0; - } - szBuffer[199] = 0; hSubMenu = CreateMenu(); memset( &mii, 0, sizeof(mii) ); @@ -655,34 +636,33 @@ mii.fType = MFT_STRING; mii.wID = idCmdFirst + id++; mii.dwTypeData = szBuffer; - mii.cch = wcslen( mii.dwTypeData ); + mii.cch = wcslen(mii.dwTypeData); mii.fState = MFS_ENABLED; if (hSubMenu) { - id += InsertShellNewItems( hSubMenu, idCmdFirst, 0); + id += InsertShellNewItems(hSubMenu, idCmdFirst, 0); mii.fMask |= MIIM_SUBMENU; mii.hSubMenu = hSubMenu; } - - if (!InsertMenuItemW( hmenu, indexMenu, TRUE, &mii )) + if (!InsertMenuItemW(hmenu, indexMenu, TRUE, &mii)) return E_FAIL; - return MAKE_HRESULT( SEVERITY_SUCCESS, 0, id ); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, id); } HRESULT WINAPI CNewMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) { - LPSHELLBROWSER lpSB; + LPSHELLBROWSER lpSB; LPSHELLVIEW lpSV = NULL; HRESULT hr; - if((lpSB = (LPSHELLBROWSER)SendMessageA(lpici->hwnd, CWM_GETISHELLBROWSER,0,0))) - { - lpSB->QueryActiveShellView(&lpSV); + if((lpSB = (LPSHELLBROWSER)SendMessageA(lpici->hwnd, CWM_GETISHELLBROWSER, 0, 0))) + { + lpSB->QueryActiveShellView(&lpSV); } if (LOWORD(lpici->lpVerb) == 0) @@ -704,10 +684,10 @@ HRESULT WINAPI CNewMenu::GetCommandString(UINT_PTR idCmd, - UINT uType, - UINT* pwReserved, - LPSTR pszName, - UINT cchMax) + UINT uType, + UINT* pwReserved, + LPSTR pszName, + UINT cchMax) { FIXME("%p %lu %u %p %p %u\n", this, idCmd, uType, pwReserved, pszName, cchMax ); @@ -715,26 +695,25 @@ return E_NOTIMPL; } -HRESULT -WINAPI +HRESULT +WINAPI CNewMenu::HandleMenuMsg(UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - DRAWITEMSTRUCT * lpids = (DRAWITEMSTRUCT*) lParam; + WPARAM wParam, + LPARAM lParam) +{ + DRAWITEMSTRUCT *lpids = (DRAWITEMSTRUCT*) lParam; MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*) lParam; - TRACE("INewItem_IContextMenu_fnHandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n",this, uMsg, wParam, lParam); - + TRACE("INewItem_IContextMenu_fnHandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n", this, uMsg, wParam, lParam); switch(uMsg) { - case WM_MEASUREITEM: - return DoMeasureItem((HWND)wParam, lpmis); - break; - case WM_DRAWITEM: - return DoDrawItem((HWND)wParam, lpids); - break; + case WM_MEASUREITEM: + return DoMeasureItem((HWND)wParam, lpmis); + break; + case WM_DRAWITEM: + return DoDrawItem((HWND)wParam, lpids); + break; } return S_OK; @@ -743,7 +722,7 @@ HRESULT WINAPI CNewMenu::Initialize(LPCITEMIDLIST pidlFolder, - IDataObject *pdtobj, HKEY hkeyProgID ) + IDataObject *pdtobj, HKEY hkeyProgID ) { return S_OK; Modified: trunk/reactos/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlexec.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlexec.cpp [iso-8859-1] Thu Jan 5 18:34:35 2012 @@ -24,12 +24,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(exec); -static const WCHAR wszOpen[] = {'o','p','e','n',0}; -static const WCHAR wszExe[] = {'.','e','x','e',0}; -static const WCHAR wszILPtr[] = {':','%','p',0}; -static const WCHAR wszShell[] = {'\\','s','h','e','l','l','\\',0}; -static const WCHAR wszFolder[] = {'F','o','l','d','e','r',0}; -static const WCHAR wszEmpty[] = {0}; +static const WCHAR wszOpen[] = L"open"; +static const WCHAR wszExe[] = L".exe"; +static const WCHAR wszShell[] = L"\\shell\\"; +static const WCHAR wszFolder[] = L"Folder"; #define SEE_MASK_CLASSALL (SEE_MASK_CLASSNAME | SEE_MASK_CLASSKEY) @@ -39,7 +37,7 @@ bool quotes_opened = false; bool backslash_encountered = false; - for (int curArg=0; curArg<=argNum && *args; ++curArg) + for (int curArg = 0; curArg <= argNum && *args; ++curArg) { firstCharQuote = false; if (*args == '"') @@ -60,7 +58,7 @@ { if (quotes_opened) { - if (*(args+1) != '"') + if (*(args + 1) != '"') { quotes_opened = false; args++; @@ -68,7 +66,7 @@ } else { - args++; + args++; } } else @@ -105,7 +103,7 @@ bool quotes_opened = false; bool backslash_encountered = false; - for (int curArg=0; curArg<=argNum && *args; ++curArg) + for (int curArg = 0; curArg <= argNum && *args; ++curArg) { while(*args) { @@ -118,13 +116,13 @@ { if (quotes_opened) { - if (*(args+1) != '"') + if (*(args + 1) != '"') { quotes_opened = false; } else { - args++; + args++; } } else @@ -137,7 +135,7 @@ else { backslash_encountered = false; - if (*args == ' ' && !quotes_opened && curArg!=argNum) + if (*args == ' ' && !quotes_opened && curArg != argNum) break; } @@ -205,7 +203,8 @@ used++; if (used < len) *res++ = '%'; - }; break; + }; + break; case '*': { @@ -226,7 +225,8 @@ break; } } - }; break; + }; + break; case '~': @@ -238,7 +238,7 @@ case '7': case '8': case '9': - //case '0': + //case '0': { if (*fmt == '~') { @@ -258,13 +258,14 @@ ParseNoTildeEffect(res, args, len, used, *fmt - '2'); } } - }; break; + }; + break; case '1': if (!done || (*fmt == '1')) { /*FIXME Is the call to SearchPathW() really needed? We already have separated out the parameter string in args. */ - if (SearchPathW(NULL, lpFile, wszExe, sizeof(xlpFile)/sizeof(WCHAR), xlpFile, NULL)) + if (SearchPathW(NULL, lpFile, wszExe, sizeof(xlpFile) / sizeof(WCHAR), xlpFile, NULL)) cmd = xlpFile; else cmd = lpFile; @@ -279,11 +280,11 @@ found_p1 = TRUE; break; - /* - * IE uses this a lot for activating things such as windows media - * player. This is not verified to be fully correct but it appears - * to work just fine. - */ + /* + * IE uses this a lot for activating things such as windows media + * player. This is not verified to be fully correct but it appears + * to work just fine. + */ case 'l': case 'L': if (lpFile) @@ -309,16 +310,16 @@ LPVOID pv; HGLOBAL hmem = SHAllocShared(pidl, ILGetSize(pidl), 0); pv = SHLockShared(hmem, 0); - chars = swprintf(buf, wszILPtr, pv); - - if (chars >= sizeof(buf)/sizeof(WCHAR)) + chars = swprintf(buf, L":%p", pv); + + if (chars >= sizeof(buf) / sizeof(WCHAR)) ERR("pidl format buffer too small!\n"); used += chars; if (used < len) { - wcscpy(res,buf); + wcscpy(res, buf); res += chars; } SHUnlockShared(pv); @@ -385,7 +386,7 @@ } *res = '\0'; - TRACE("used %i of %i space\n",used,len); + TRACE("used %i of %i space\n", used, len); if (out_len) *out_len = used; @@ -398,7 +399,7 @@ static HRESULT SHELL_GetPathFromIDListForExecuteW(LPCITEMIDLIST pidl, LPWSTR pszPath, UINT uOutSize) { STRRET strret; - IShellFolder* desktop; + IShellFolder *desktop; HRESULT hr = SHGetDesktopFolder(&desktop); @@ -420,7 +421,7 @@ * */ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, - const SHELLEXECUTEINFOW *psei, LPSHELLEXECUTEINFOW psei_out) + const SHELLEXECUTEINFOW *psei, LPSHELLEXECUTEINFOW psei_out) { STARTUPINFOW startup; PROCESS_INFORMATION info; @@ -443,12 +444,12 @@ /* ShellExecute specifies the command from psei->lpDirectory * if present. Not from the current dir as CreateProcess does */ - if ( lpDirectory ) - if ( ( gcdret = GetCurrentDirectoryW( MAX_PATH, curdir))) - if ( !SetCurrentDirectoryW( lpDirectory)) + if (lpDirectory) + if ((gcdret = GetCurrentDirectoryW( MAX_PATH, curdir))) + if (!SetCurrentDirectoryW( lpDirectory)) ERR("cannot set directory %s\n", debugstr_w(lpDirectory)); - ZeroMemory(&startup,sizeof(STARTUPINFOW)); + ZeroMemory(&startup, sizeof(STARTUPINFOW)); startup.cb = sizeof(STARTUPINFOW); startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = psei->nShow; @@ -463,7 +464,7 @@ /* Give 30 seconds to the app to come up, if desired. Probably only needed when starting app immediately before making a DDE connection. */ if (shWait) - if (WaitForInputIdle( info.hProcess, 30000 ) == WAIT_FAILED) + if (WaitForInputIdle(info.hProcess, 30000) == WAIT_FAILED) WARN("WaitForInputIdle failed: Error %d\n", GetLastError() ); retval = 33; @@ -483,8 +484,8 @@ psei_out->hInstApp = (HINSTANCE)retval; - if( gcdret ) - if( !SetCurrentDirectoryW( curdir)) + if (gcdret) + if (!SetCurrentDirectoryW(curdir)) ERR("cannot return to directory %s\n", debugstr_w(curdir)); return retval; @@ -499,7 +500,7 @@ */ static LPWSTR SHELL_BuildEnvW( const WCHAR *path ) { - static const WCHAR wPath[] = {'P','A','T','H','=',0}; + static const WCHAR wPath[] = L"PATH="; WCHAR *strings, *new_env; WCHAR *p, *p2; int total = wcslen(path) + 1; @@ -517,9 +518,9 @@ if (!got_path) total += 5; /* we need to create PATH */ total++; /* terminating null */ - if (!(new_env = (LPWSTR)HeapAlloc( GetProcessHeap(), 0, total * sizeof(WCHAR) ))) - { - FreeEnvironmentStringsW( strings ); + if (!(new_env = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, total * sizeof(WCHAR)))) + { + FreeEnvironmentStringsW(strings); return NULL; } p = strings; @@ -527,7 +528,7 @@ while (*p) { int len = wcslen(p) + 1; - memcpy( p2, p, len * sizeof(WCHAR) ); + memcpy(p2, p, len * sizeof(WCHAR)); if (!_wcsnicmp( p, wPath, 5 )) { p2[len - 1] = ';'; @@ -539,12 +540,12 @@ } if (!got_path) { - wcscpy( p2, wPath ); - wcscat( p2, path ); + wcscpy(p2, wPath); + wcscat(p2, path); p2 += wcslen(p2) + 1; } *p2 = 0; - FreeEnvironmentStringsW( strings ); + FreeEnvironmentStringsW(strings); return new_env; } @@ -559,9 +560,6 @@ */ static BOOL SHELL_TryAppPathW( LPCWSTR szName, LPWSTR lpResult, WCHAR **env) { - static const WCHAR wszKeyAppPaths[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s', - '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','A','p','p',' ','P','a','t','h','s','\\',0}; - static const WCHAR wPath[] = {'P','a','t','h',0}; HKEY hkApp = 0; WCHAR buffer[1024]; LONG len; @@ -569,12 +567,12 @@ BOOL found = FALSE; if (env) *env = NULL; - wcscpy(buffer, wszKeyAppPaths); + wcscpy(buffer, L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\"); wcscat(buffer, szName); res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, buffer, 0, KEY_READ, &hkApp); if (res) goto end; - len = MAX_PATH*sizeof(WCHAR); + len = MAX_PATH * sizeof(WCHAR); res = RegQueryValueW(hkApp, NULL, lpResult, &len); if (res) goto end; found = TRUE; @@ -582,8 +580,8 @@ if (env) { DWORD count = sizeof(buffer); - if (!RegQueryValueExW(hkApp, wPath, NULL, NULL, (LPBYTE)buffer, &count) && buffer[0]) - *env = SHELL_BuildEnvW( buffer ); + if (!RegQueryValueExW(hkApp, L"Path", NULL, NULL, (LPBYTE)buffer, &count) && buffer[0]) + *env = SHELL_BuildEnvW(buffer); } end: @@ -593,13 +591,13 @@ static UINT SHELL_FindExecutableByOperation(LPCWSTR lpOperation, LPWSTR key, LPWSTR filetype, LPWSTR command, LONG commandlen) { - static const WCHAR wCommand[] = {'\\','c','o','m','m','a','n','d',0}; + static const WCHAR wCommand[] = L"\\command"; HKEY hkeyClass; WCHAR verb[MAX_PATH]; if (RegOpenKeyExW(HKEY_CLASSES_ROOT, filetype, 0, 0x02000000, &hkeyClass)) return SE_ERR_NOASSOC; - if (!HCR_GetDefaultVerbW(hkeyClass, lpOperation, verb, sizeof(verb)/sizeof(verb[0]))) + if (!HCR_GetDefaultVerbW(hkeyClass, lpOperation, verb, sizeof(verb) / sizeof(verb[0]))) return SE_ERR_NOASSOC; RegCloseKey(hkeyClass); @@ -617,7 +615,7 @@ LPWSTR tmp; WCHAR param[256]; LONG paramlen = sizeof(param); - static const WCHAR wSpace[] = {' ',0}; + static const WCHAR wSpace[] = {' ', 0}; /* FIXME: it seems all Windows version don't behave the same here. * the doc states that this ddeexec information can be found after @@ -662,11 +660,8 @@ * on the operation) */ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation, - LPWSTR lpResult, DWORD resultLen, LPWSTR key, WCHAR **env,LPITEMIDLIST pidl, LPCWSTR args) -{ - static const WCHAR wWindows[] = {'w','i','n','d','o','w','s',0}; - static const WCHAR wPrograms[] = {'p','r','o','g','r','a','m','s',0}; - static const WCHAR wExtensions[] = {'e','x','e',' ','p','i','f',' ','b','a','t',' ','c','m','d',' ','c','o','m',0}; + LPWSTR lpResult, DWORD resultLen, LPWSTR key, WCHAR **env, LPITEMIDLIST pidl, LPCWSTR args) +{ WCHAR *extension = NULL; /* pointer to file extension */ WCHAR filetype[256]; /* registry name for this filetype */ LONG filetypelen = sizeof(filetype); /* length of above */ @@ -700,7 +695,7 @@ return 33; } - if (SearchPathW(lpPath, lpFile, wszExe, sizeof(xlpFile)/sizeof(WCHAR), xlpFile, NULL)) + if (SearchPathW(lpPath, lpFile, wszExe, sizeof(xlpFile) / sizeof(WCHAR), xlpFile, NULL)) { TRACE("SearchPathW returned non-zero\n"); lpFile = xlpFile; @@ -708,15 +703,15 @@ } attribs = GetFileAttributesW(lpFile); - if (attribs!=INVALID_FILE_ATTRIBUTES && (attribs&FILE_ATTRIBUTE_DIRECTORY)) - { - wcscpy(filetype, wszFolder); - filetypelen = 6; /* strlen("Folder") */ + if (attribs != INVALID_FILE_ATTRIBUTES && (attribs & FILE_ATTRIBUTE_DIRECTORY)) + { + wcscpy(filetype, wszFolder); + filetypelen = 6; /* strlen("Folder") */ } else { /* Did we get something? Anything? */ - if (xlpFile[0]==0) + if (xlpFile[0] == 0) { TRACE("Returning SE_ERR_FNF\n"); return SE_ERR_FNF; @@ -727,7 +722,7 @@ /* .\FILE.EXE :( */ TRACE("xlpFile=%s,extension=%s\n", debugstr_w(xlpFile), debugstr_w(extension)); - if (extension == NULL || extension[1]==0) + if (extension == NULL || extension[1] == 0) { WARN("Returning SE_ERR_NOASSOC\n"); return SE_ERR_NOASSOC; @@ -744,7 +739,7 @@ /* See if it's a program - if GetProfileString fails, we skip this * section. Actually, if GetProfileString fails, we've probably * got a lot more to worry about than running a program... */ - if (GetProfileStringW(wWindows, wPrograms, wExtensions, wBuffer, sizeof(wBuffer)/sizeof(WCHAR)) > 0) + if (GetProfileStringW(L"windows", L"programs", L"exe pif bat cmd com", wBuffer, sizeof(wBuffer) / sizeof(WCHAR)) > 0) { CharLowerW(wBuffer); tok = wBuffer; @@ -776,7 +771,7 @@ &filetypelen) == ERROR_SUCCESS) { filetypelen /= sizeof(WCHAR); - if (filetypelen == sizeof(filetype)/sizeof(WCHAR)) + if (filetypelen == sizeof(filetype) / sizeof(WCHAR)) filetypelen--; filetype[filetypelen] = '\0'; @@ -818,17 +813,15 @@ WCHAR *p = lpResult; while (*p != ' ' && *p != '\0') p++; - *p='\0'; + *p = '\0'; } } } else /* Check win.ini */ { - static const WCHAR wExtensions[] = {'e','x','t','e','n','s','i','o','n','s',0}; - /* Toss the leading dot */ extension++; - if (GetProfileStringW(wExtensions, extension, wszEmpty, command, sizeof(command)/sizeof(WCHAR)) > 0) + if (GetProfileStringW(L"extesions", extension, L"", command, sizeof(command) / sizeof(WCHAR)) > 0) { if (wcslen(command) != 0) { @@ -839,7 +832,7 @@ tok[0] = '\0'; wcscat(lpResult, xlpFile); /* what if no dir in xlpFile? */ tok = wcschr(command, '^'); /* see above */ - if ((tok != NULL) && (wcslen(tok)>5)) + if ((tok != NULL) && (wcslen(tok) > 5)) { wcscat(lpResult, &tok[5]); } @@ -863,7 +856,7 @@ ULONG_PTR dwData1, ULONG_PTR dwData2) { TRACE("dde_cb: %04x, %04x, %p, %p, %p, %p, %08lx, %08lx\n", - uType, uFmt, hConv, hsz1, hsz2, hData, dwData1, dwData2); + uType, uFmt, hConv, hsz1, hsz2, hData, dwData1, dwData2); return NULL; } @@ -881,8 +874,6 @@ LPCWSTR szCommandline, LPITEMIDLIST pidl, SHELL_ExecuteW32 execfunc, const SHELLEXECUTEINFOW *psei, LPSHELLEXECUTEINFOW psei_out) { - static const WCHAR wApplication[] = {'\\','a','p','p','l','i','c','a','t','i','o','n',0}; - static const WCHAR wTopic[] = {'\\','t','o','p','i','c',0}; WCHAR regkey[256]; WCHAR * endkey = regkey + wcslen(key); WCHAR app[256], topic[256], ifexec[256], res[256]; @@ -898,37 +889,37 @@ BOOL unicode = !(GetVersion() & 0x80000000); wcscpy(regkey, key); - wcscpy(endkey, wApplication); + wcscpy(endkey, L"application"); applen = sizeof(app); if (RegQueryValueW(HKEY_CLASSES_ROOT, regkey, app, &applen) != ERROR_SUCCESS) { WCHAR command[1024], fullpath[MAX_PATH]; - static const WCHAR wSo[] = { '.','s','o',0 }; - DWORD sizeSo = sizeof(wSo)/sizeof(WCHAR); + static const WCHAR wSo[] = L".so"; + DWORD sizeSo = sizeof(wSo) / sizeof(WCHAR); LPWSTR ptr = NULL; DWORD ret = 0; /* Get application command from start string and find filename of application */ if (*start == '"') { - wcscpy(command, start+1); + wcscpy(command, start + 1); if ((ptr = wcschr(command, '"'))) - *ptr = 0; - ret = SearchPathW(NULL, command, wszExe, sizeof(fullpath)/sizeof(WCHAR), fullpath, &ptr); + * ptr = 0; + ret = SearchPathW(NULL, command, wszExe, sizeof(fullpath) / sizeof(WCHAR), fullpath, &ptr); } else { - LPWSTR p,space; - for (p=(LPWSTR)start; (space= const_cast<LPWSTR>(strchrW(p, ' '))); p=space+1) + LPWSTR p, space; + for (p = (LPWSTR)start; (space = const_cast<LPWSTR>(strchrW(p, ' '))); p = space + 1) { - int idx = space-start; - memcpy(command, start, idx*sizeof(WCHAR)); + int idx = space - start; + memcpy(command, start, idx * sizeof(WCHAR)); command[idx] = '\0'; - if ((ret = SearchPathW(NULL, command, wszExe, sizeof(fullpath)/sizeof(WCHAR), fullpath, &ptr))) + if ((ret = SearchPathW(NULL, command, wszExe, sizeof(fullpath) / sizeof(WCHAR), fullpath, &ptr))) break; } if (!ret) - ret = SearchPathW(NULL, start, wszExe, sizeof(fullpath)/sizeof(WCHAR), fullpath, &ptr); + ret = SearchPathW(NULL, start, wszExe, sizeof(fullpath) / sizeof(WCHAR), fullpath, &ptr); } if (!ret) @@ -939,9 +930,9 @@ wcscpy(app, ptr); /* Remove extensions (including .so) */ - ptr = app + wcslen(app) - (sizeSo-1); + ptr = app + wcslen(app) - (sizeSo - 1); if (wcslen(app) >= sizeSo && - !wcscmp(ptr, wSo)) + !wcscmp(ptr, wSo)) *ptr = 0; ptr = const_cast<LPWSTR>(strrchrW(app, '.')); @@ -949,12 +940,11 @@ *ptr = 0; } - wcscpy(endkey, wTopic); + wcscpy(endkey, L"\\topic"); topiclen = sizeof(topic); if (RegQueryValueW(HKEY_CLASSES_ROOT, regkey, topic, &topiclen) != ERROR_SUCCESS) { - static const WCHAR wSystem[] = {'S','y','s','t','e','m',0}; - wcscpy(topic, wSystem); + wcscpy(topic, L"System"); } if (unicode) @@ -975,7 +965,6 @@ exec = ddeexec; if (!hConv) { - static const WCHAR wIfexec[] = {'\\','i','f','e','x','e','c',0}; TRACE("Launching %s\n", debugstr_w(start)); ret = execfunc(start, env, TRUE, psei, psei_out); if (ret <= 32) @@ -991,7 +980,7 @@ SetLastError(ERROR_DDE_FAIL); return 30; /* whatever */ } - strcpyW(endkey, wIfexec); + strcpyW(endkey, L"\\ifexec"); ifexeclen = sizeof(ifexec); if (RegQueryValueW(HKEY_CLASSES_ROOT, regkey, ifexec, &ifexeclen) == ERROR_SUCCESS) { @@ -999,8 +988,8 @@ } } - SHELL_ArgifyW(res, sizeof(res)/sizeof(WCHAR), exec, lpFile, pidl, szCommandline, &resultLen); - if (resultLen > sizeof(res)/sizeof(WCHAR)) + SHELL_ArgifyW(res, sizeof(res) / sizeof(WCHAR), exec, lpFile, pidl, szCommandline, &resultLen); + if (resultLen > sizeof(res) / sizeof(WCHAR)) ERR("Argify buffer not large enough, truncated\n"); TRACE("%s %s => %s\n", debugstr_w(exec), debugstr_w(lpFile), debugstr_w(res)); @@ -1026,7 +1015,7 @@ DdeDisconnect(hConv); - error: +error: DdeUninitialize(ddeInst); return ret; @@ -1040,8 +1029,6 @@ SHELL_ExecuteW32 execfunc, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) { - static const WCHAR wCommand[] = {'c','o','m','m','a','n','d',0}; - static const WCHAR wDdeexec[] = {'d','d','e','e','x','e','c',0}; WCHAR cmd[256], param[1024], ddeexec[256]; DWORD cmdlen = sizeof(cmd), ddeexeclen = sizeof(ddeexec); UINT_PTR retval = SE_ERR_NOASSOC; @@ -1049,7 +1036,7 @@ LPWSTR tmp; TRACE("%s %s %s %s %s\n", debugstr_w(key), debugstr_w(lpFile), debugstr_w(env), - debugstr_w(szCommandline), debugstr_w(executable_name)); + debugstr_w(szCommandline), debugstr_w(executable_name)); cmd[0] = '\0'; param[0] = '\0'; @@ -1061,19 +1048,19 @@ /* Is there a replace() function anywhere? */ cmdlen /= sizeof(WCHAR); - if (cmdlen >= sizeof(cmd)/sizeof(WCHAR)) - cmdlen = sizeof(cmd)/sizeof(WCHAR)-1; + if (cmdlen >= sizeof(cmd) / sizeof(WCHAR)) + cmdlen = sizeof(cmd) / sizeof(WCHAR) - 1; cmd[cmdlen] = '\0'; - SHELL_ArgifyW(param, sizeof(param)/sizeof(WCHAR), cmd, lpFile, (LPITEMIDLIST)psei->lpIDList, szCommandline, &resultLen); - if (resultLen > sizeof(param)/sizeof(WCHAR)) + SHELL_ArgifyW(param, sizeof(param) / sizeof(WCHAR), cmd, lpFile, (LPITEMIDLIST)psei->lpIDList, szCommandline, &resultLen); + if (resultLen > sizeof(param) / sizeof(WCHAR)) ERR("Argify buffer not large enough, truncating\n"); } /* Get the parameters needed by the application from the associated ddeexec key */ - tmp = const_cast<LPWSTR>(strstrW(key, wCommand)); + tmp = const_cast<LPWSTR>(strstrW(key, L"command")); assert(tmp); - wcscpy(tmp, wDdeexec); + wcscpy(tmp, L"ddeexec"); if (RegQueryValueW(HKEY_CLASSES_ROOT, key, ddeexec, (LONG *)&ddeexeclen) == ERROR_SUCCESS) { @@ -1106,8 +1093,8 @@ retval = FindExecutableW(wFile, wDirectory, wResult); WideCharToMultiByte(CP_ACP, 0, wResult, -1, lpResult, MAX_PATH, NULL, NULL); - SHFree( wFile ); - SHFree( wDirectory ); + SHFree(wFile); + SHFree(wDirectory); TRACE("returning %s\n", lpResult); return retval; @@ -1151,7 +1138,7 @@ if (lpDirectory) { - GetCurrentDirectoryW(sizeof(old_dir)/sizeof(WCHAR), old_dir); + GetCurrentDirectoryW(sizeof(old_dir) / sizeof(WCHAR), old_dir); SetCurrentDirectoryW(lpDirectory); } @@ -1164,7 +1151,7 @@ } /* FIXME: is this already implemented somewhere else? */ -static HKEY ShellExecute_GetClassKey( const SHELLEXECUTEINFOW *sei ) +static HKEY ShellExecute_GetClassKey(const SHELLEXECUTEINFOW *sei) { LPCWSTR ext = NULL, lpClass = NULL; LPWSTR cls = NULL; @@ -1179,35 +1166,35 @@ lpClass = sei->lpClass; else { - ext = PathFindExtensionW( sei->lpFile ); - TRACE("ext = %s\n", debugstr_w( ext ) ); + ext = PathFindExtensionW(sei->lpFile); + TRACE("ext = %s\n", debugstr_w(ext)); if (!ext) return hkey; - r = RegOpenKeyW( HKEY_CLASSES_ROOT, ext, &hkey ); - if (r != ERROR_SUCCESS ) + r = RegOpenKeyW(HKEY_CLASSES_ROOT, ext, &hkey); + if (r != ERROR_SUCCESS) return hkey; - r = RegQueryValueExW( hkey, NULL, 0, &type, NULL, &sz ); - if ( r == ERROR_SUCCESS && type == REG_SZ ) + r = RegQueryValueExW(hkey, NULL, 0, &type, NULL, &sz); + if (r == ERROR_SUCCESS && type == REG_SZ) { sz += sizeof (WCHAR); - cls = (LPWSTR)HeapAlloc( GetProcessHeap(), 0, sz ); + cls = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, sz); cls[0] = 0; - RegQueryValueExW( hkey, NULL, 0, &type, (LPBYTE) cls, &sz ); + RegQueryValueExW(hkey, NULL, 0, &type, (LPBYTE) cls, &sz); } RegCloseKey( hkey ); lpClass = cls; } - TRACE("class = %s\n", debugstr_w(lpClass) ); + TRACE("class = %s\n", debugstr_w(lpClass)); hkey = 0; - if ( lpClass ) - RegOpenKeyW( HKEY_CLASSES_ROOT, lpClass, &hkey ); - - HeapFree( GetProcessHeap(), 0, cls ); + if (lpClass) + RegOpenKeyW( HKEY_CLASSES_ROOT, lpClass, &hkey); + + HeapFree(GetProcessHeap(), 0, cls); return hkey; } @@ -1228,30 +1215,30 @@ BOOL ret; fullpath[0] = 0; - ret = GetFullPathNameW( sei->lpFile, MAX_PATH, fullpath, NULL ); + ret = GetFullPathNameW(sei->lpFile, MAX_PATH, fullpath, NULL); if (!ret) goto end; - pidl = ILCreateFromPathW( fullpath ); - } - - r = SHBindToParent( pidl, IID_IShellFolder, (LPVOID*)&shf, &pidllast ); - if ( FAILED( r ) ) + pidl = ILCreateFromPathW(fullpath); + } + + r = SHBindToParent(pidl, IID_IShellFolder, (LPVOID*)&shf, &pidllast); + if (FAILED(r)) goto end; shf->GetUIObjectOf(NULL, 1, &pidllast, - IID_IDataObject, NULL, (LPVOID*) &dataobj ); + IID_IDataObject, NULL, (LPVOID*) &dataobj); end: - if ( pidl != sei->lpIDList ) - ILFree( pidl ); - if ( shf ) + if (pidl != sei->lpIDList) + ILFree(pidl); + if (shf) shf->Release(); return dataobj; } -static HRESULT shellex_run_context_menu_default( IShellExtInit *obj, - LPSHELLEXECUTEINFOW sei ) +static HRESULT shellex_run_context_menu_default(IShellExtInit *obj, + LPSHELLEXECUTEINFOW sei) { IContextMenu *cm = NULL; CMINVOKECOMMANDINFOEX ici; @@ -1261,36 +1248,36 @@ HMENU hmenu = 0; HRESULT r; - TRACE("%p %p\n", obj, sei ); - - r = obj->QueryInterface(IID_IContextMenu, (LPVOID*) &cm ); - if ( FAILED( r ) ) + TRACE("%p %p\n", obj, sei); + + r = obj->QueryInterface(IID_IContextMenu, (LPVOID*) &cm); + if (FAILED(r)) return r; hmenu = CreateMenu(); - if ( !hmenu ) + if (!hmenu) goto end; /* the number of the last menu added is returned in r */ - r = cm->QueryContextMenu(hmenu, 0, 0x20, 0x7fff, CMF_DEFAULTONLY ); - if ( FAILED( r ) ) + r = cm->QueryContextMenu(hmenu, 0, 0x20, 0x7fff, CMF_DEFAULTONLY); + if (FAILED(r)) goto end; - n = GetMenuItemCount( hmenu ); - for ( i = 0; i < n; i++ ) - { - memset( &info, 0, sizeof info ); + n = GetMenuItemCount(hmenu); + for (i = 0; i < n; i++) + { + memset(&info, 0, sizeof(info)); info.cbSize = sizeof info; info.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE | MIIM_DATA | MIIM_ID; info.dwTypeData = string; info.cch = sizeof string; string[0] = 0; - GetMenuItemInfoW( hmenu, i, TRUE, &info ); + GetMenuItemInfoW(hmenu, i, TRUE, &info); TRACE("menu %d %s %08x %08lx %08x %08x\n", i, debugstr_w(string), - info.fState, info.dwItemData, info.fType, info.wID ); - if ( ( !sei->lpVerb && (info.fState & MFS_DEFAULT) ) || - ( sei->lpVerb && !lstrcmpiW( sei->lpVerb, string ) ) ) + info.fState, info.dwItemData, info.fType, info.wID); + if ((!sei->lpVerb && (info.fState & MFS_DEFAULT)) || + (sei->lpVerb && !lstrcmpiW(sei->lpVerb, string))) { def = i; break; @@ -1298,75 +1285,75 @@ } r = E_FAIL; - if ( def == -1 ) + if (def == -1) goto end; - memset( &ici, 0, sizeof ici ); + memset(&ici, 0, sizeof ici); ici.cbSize = sizeof ici; - ici.fMask = CMIC_MASK_UNICODE | (sei->fMask & (SEE_MASK_NOASYNC|SEE_MASK_ASYNCOK|SEE_MASK_FLAG_NO_UI)); + ici.fMask = CMIC_MASK_UNICODE | (sei->fMask & (SEE_MASK_NOASYNC | SEE_MASK_ASYNCOK | SEE_MASK_FLAG_NO_UI)); ici.nShow = sei->nShow; - ici.lpVerb = MAKEINTRESOURCEA( def ); + ici.lpVerb = MAKEINTRESOURCEA(def); ici.hwnd = sei->hwnd; ici.lpParametersW = sei->lpParameters; - r = cm->InvokeCommand((LPCMINVOKECOMMANDINFO) &ici ); - - TRACE("invoke command returned %08x\n", r ); + r = cm->InvokeCommand((LPCMINVOKECOMMANDINFO)&ici); + + TRACE("invoke command returned %08x\n", r); end: - if ( hmenu ) + if (hmenu) DestroyMenu( hmenu ); - if ( cm ) + if (cm) cm->Release(); return r; } -static HRESULT shellex_load_object_and_run( HKEY hkey, LPCGUID guid, LPSHELLEXECUTEINFOW sei ) +static HRESULT shellex_load_object_and_run(HKEY hkey, LPCGUID guid, LPSHELLEXECUTEINFOW sei) { IDataObject *dataobj = NULL; IObjectWithSite *ows = NULL; IShellExtInit *obj = NULL; HRESULT r; - TRACE("%p %s %p\n", hkey, debugstr_guid( guid ), sei ); - - r = CoInitialize( NULL ); - if ( FAILED( r ) ) + TRACE("%p %s %p\n", hkey, debugstr_guid(guid), sei); + + r = CoInitialize(NULL); + if (FAILED(r)) goto end; r = CoCreateInstance(*guid, NULL, CLSCTX_INPROC_SERVER, - IID_IShellExtInit, (LPVOID*)&obj ); - if ( FAILED( r ) ) - { - ERR("failed %08x\n", r ); + IID_IShellExtInit, (LPVOID*)&obj); + if (FAILED(r)) + { + ERR("failed %08x\n", r); goto end; } - dataobj = shellex_get_dataobj( sei ); - if ( !dataobj ) + dataobj = shellex_get_dataobj(sei); + if (!dataobj) { ERR("failed to get data object\n"); goto end; } - r = obj->Initialize(NULL, dataobj, hkey ); - if ( FAILED( r ) ) + r = obj->Initialize(NULL, dataobj, hkey); + if (FAILED(r)) goto end; - r = obj->QueryInterface(IID_IObjectWithSite, (LPVOID*) &ows ); - if ( FAILED( r ) ) + r = obj->QueryInterface(IID_IObjectWithSite, (LPVOID*) &ows); + if (FAILED(r)) goto end; - ows->SetSite(NULL ); - - r = shellex_run_context_menu_default( obj, sei ); + ows->SetSite(NULL); + + r = shellex_run_context_menu_default(obj, sei); end: - if ( ows ) + if (ows) ows->Release(); - if ( dataobj ) + if (dataobj) dataobj->Release(); - if ( obj ) + if (obj) obj->Release(); CoUninitialize(); return r; @@ -1378,8 +1365,6 @@ */ static LONG ShellExecute_FromContextMenu( LPSHELLEXECUTEINFOW sei ) { - static const WCHAR szcm[] = { 's','h','e','l','l','e','x','\\', - 'C','o','n','t','e','x','t','M','e','n','u','H','a','n','d','l','e','r','s',0 }; HKEY hkey, hkeycm = 0; WCHAR szguid[39]; HRESULT hr; @@ -1387,52 +1372,51 @@ DWORD i; LONG r; - TRACE("%s\n", debugstr_w(sei->lpFile) ); - - hkey = ShellExecute_GetClassKey( sei ); - if ( !hkey ) + TRACE("%s\n", debugstr_w(sei->lpFile)); + + hkey = ShellExecute_GetClassKey(sei); + if (!hkey) return ERROR_FUNCTION_FAILED; - r = RegOpenKeyW( hkey, szcm, &hkeycm ); - if ( r == ERROR_SUCCESS ) + r = RegOpenKeyW(hkey, L"shellex\\ContextMenuHandlers", &hkeycm); + if (r == ERROR_SUCCESS) { i = 0; - while ( 1 ) - { - r = RegEnumKeyW( hkeycm, i++, szguid, sizeof(szguid)/sizeof(szguid[0]) ); - if ( r != ERROR_SUCCESS ) + while (1) + { + r = RegEnumKeyW(hkeycm, i++, szguid, sizeof(szguid) / sizeof(szguid[0])); + if (r != ERROR_SUCCESS) break; - hr = CLSIDFromString( szguid, &guid ); + hr = CLSIDFromString(szguid, &guid); if (SUCCEEDED(hr)) { /* stop at the first one that succeeds in running */ - hr = shellex_load_object_and_run( hkey, &guid, sei ); - if ( SUCCEEDED( hr ) ) + hr = shellex_load_object_and_run(hkey, &guid, sei); + if (SUCCEEDED(hr)) break; } } - RegCloseKey( hkeycm ); - } - - if ( hkey != sei->hkeyClass ) - RegCloseKey( hkey ); + RegCloseKey(hkeycm); + } + + if (hkey != sei->hkeyClass) + RegCloseKey(hkey); return r; } -static UINT_PTR SHELL_execute_class( LPCWSTR wszApplicationName, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc ) -{ - static const WCHAR wSpace[] = {' ',0}; +static UINT_PTR SHELL_execute_class(LPCWSTR wszApplicationName, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc) +{ WCHAR execCmd[1024], wcmd[1024]; /* launch a document by fileclass like 'WordPad.Document.1' */ /* the Commandline contains 'c:\Path\wordpad.exe "%1"' */ /* FIXME: wcmd should not be of a fixed size. Fixed to 1024, MAX_PATH is way too short! */ - ULONG cmask=(psei->fMask & SEE_MASK_CLASSALL); + ULONG cmask = (psei->fMask & SEE_MASK_CLASSALL); DWORD resultLen; BOOL done; HCR_GetExecuteCommandW((cmask == SEE_MASK_CLASSKEY) ? psei->hkeyClass : NULL, - (cmask == SEE_MASK_CLASSNAME) ? psei->lpClass: NULL, + (cmask == SEE_MASK_CLASSNAME) ? psei->lpClass : NULL, psei->lpVerb, execCmd, sizeof(execCmd)); @@ -1440,26 +1424,26 @@ TRACE("SEE_MASK_CLASSNAME->%s, doc->%s\n", debugstr_w(execCmd), debugstr_w(wszApplicationName)); wcmd[0] = '\0'; - done = SHELL_ArgifyW(wcmd, sizeof(wcmd)/sizeof(WCHAR), execCmd, wszApplicationName, (LPITEMIDLIST)psei->lpIDList, NULL, &resultLen); + done = SHELL_ArgifyW(wcmd, sizeof(wcmd) / sizeof(WCHAR), execCmd, wszApplicationName, (LPITEMIDLIST)psei->lpIDList, NULL, &resultLen); if (!done && wszApplicationName[0]) { - strcatW(wcmd, wSpace); + strcatW(wcmd, L" "); strcatW(wcmd, wszApplicationName); } - if (resultLen > sizeof(wcmd)/sizeof(WCHAR)) + if (resultLen > sizeof(wcmd) / sizeof(WCHAR)) ERR("Argify buffer not large enough... truncating\n"); return execfunc(wcmd, NULL, FALSE, psei, psei_out); } -static BOOL SHELL_translate_idlist( LPSHELLEXECUTEINFOW sei, LPWSTR wszParameters, DWORD parametersLen, LPWSTR wszApplicationName, DWORD dwApplicationNameLen ) -{ - static const WCHAR wExplorer[] = {'e','x','p','l','o','r','e','r','.','e','x','e',0}; +static BOOL SHELL_translate_idlist(LPSHELLEXECUTEINFOW sei, LPWSTR wszParameters, DWORD parametersLen, LPWSTR wszApplicationName, DWORD dwApplicationNameLen) +{ + static const WCHAR wExplorer[] = L"explorer.exe"; WCHAR buffer[MAX_PATH]; BOOL appKnownSingular = FALSE; /* last chance to translate IDList: now also allow CLSID paths */ if (SUCCEEDED(SHELL_GetPathFromIDListForExecuteW((LPCITEMIDLIST)sei->lpIDList, buffer, sizeof(buffer)))) { - if (buffer[0]==':' && buffer[1]==':') { + if (buffer[0] == ':' && buffer[1] == ':') { /* open shell folder for the specified class GUID */ if (strlenW(buffer) + 1 > parametersLen) ERR("parameters len exceeds buffer size (%i > %i), truncating\n", @@ -1481,10 +1465,10 @@ strcpyW(target, buffer); attribs = GetFileAttributesW(buffer); if (attribs != INVALID_FILE_ATTRIBUTES && - (attribs & FILE_ATTRIBUTE_DIRECTORY) && - HCR_GetExecuteCommandW(0, wszFolder, - sei->lpVerb, - buffer, sizeof(buffer))) { + (attribs & FILE_ATTRIBUTE_DIRECTORY) && + HCR_GetExecuteCommandW(0, wszFolder, + sei->lpVerb, + buffer, sizeof(buffer))) { SHELL_ArgifyW(wszApplicationName, dwApplicationNameLen, buffer, target, (LPITEMIDLIST)sei->lpIDList, NULL, &resultLen); if (resultLen > dwApplicationNameLen) @@ -1497,10 +1481,8 @@ return appKnownSingular; } -static UINT_PTR SHELL_quote_and_execute( LPCWSTR wcmd, LPCWSTR wszParameters, LPCWSTR lpstrProtocol, LPCWSTR wszApplicationName, LPWSTR env, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc ) -{ - static const WCHAR wQuote[] = {'"',0}; - static const WCHAR wSpace[] = {' ',0}; +static UINT_PTR SHELL_quote_and_execute(LPCWSTR wcmd, LPCWSTR wszParameters, LPCWSTR lpstrProtocol, LPCWSTR wszApplicationName, LPWSTR env, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc) +{ UINT_PTR retval; DWORD len; WCHAR *wszQuotedCmd; @@ -1516,12 +1498,12 @@ /* Must quote to handle case where cmd contains spaces, * else security hole if malicious user creates executable file "C:\\Program" */ - strcpyW(wszQuotedCmd, wQuote); + strcpyW(wszQuotedCmd, L"\""); strcatW(wszQuotedCmd, wcmd); - strcatW(wszQuotedCmd, wQuote); + strcatW(wszQuotedCmd, L"\""); if (wszParameters[0]) { - strcatW(wszQuotedCmd, wSpace); + strcatW(wszQuotedCmd, " "); strcatW(wszQuotedCmd, wszParameters); } @@ -1535,10 +1517,10 @@ return retval; } -static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc ) -{ - static const WCHAR wShell[] = {'\\','s','h','e','l','l','\\',0}; - static const WCHAR wCommand[] = {'\\','c','o','m','m','a','n','d',0}; +static UINT_PTR SHELL_execute_url(LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc) +{ + static const WCHAR wShell[] = L"\\shell\\"; + static const WCHAR wCommand[] = L"\\command"; UINT_PTR retval; WCHAR *lpstrProtocol; LPCWSTR lpstrRes; @@ -1559,10 +1541,10 @@ else len += lstrlenW(wszOpen); lpstrProtocol = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - memcpy(lpstrProtocol, lpFile, iSize*sizeof(WCHAR)); + memcpy(lpstrProtocol, lpFile, iSize * sizeof(WCHAR)); lpstrProtocol[iSize] = '\0'; strcatW(lpstrProtocol, wShell); - strcatW(lpstrProtocol, psei->lpVerb? psei->lpVerb: wszOpen); + strcatW(lpstrProtocol, psei->lpVerb ? psei->lpVerb : wszOpen); strcatW(lpstrProtocol, wCommand); /* Remove File Protocol from lpFile */ @@ -1578,7 +1560,7 @@ return retval; } -void do_error_dialog( UINT_PTR retval, HWND hwnd, WCHAR* filename) +void do_error_dialog(UINT_PTR retval, HWND hwnd, WCHAR* filename) { WCHAR msg[2048]; DWORD_PTR msgArguments[3] = { (DWORD_PTR)filename, 0, 0 }; @@ -1587,14 +1569,14 @@ error_code = GetLastError(); if (retval == SE_ERR_NOASSOC) - LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, sizeof(msg)/sizeof(WCHAR)); + LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, sizeof(msg) / sizeof(WCHAR)); else FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY, NULL, error_code, LANG_USER_DEFAULT, msg, - sizeof(msg)/sizeof(WCHAR), + sizeof(msg) / sizeof(WCHAR), (va_list*)msgArguments); MessageBoxW(hwnd, msg, NULL, MB_ICONERROR); @@ -1603,12 +1585,8 @@ /************************************************************************* * SHELL_execute [Internal] */ -BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) -{ - static const WCHAR wSpace[] = {' ',0}; - static const WCHAR wWww[] = {'w','w','w',0}; - static const WCHAR wFile[] = {'f','i','l','e',0}; - static const WCHAR wHttp[] = {'h','t','t','p',':','/','/',0}; +BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) +{ static const DWORD unsupportedFlags = SEE_MASK_INVOKEIDLIST | SEE_MASK_ICON | SEE_MASK_HOTKEY | SEE_MASK_CONNECTNETDRV | SEE_MASK_FLAG_DDEWAIT | @@ -1616,7 +1594,7 @@ WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024]; WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd; - DWORD dwApplicationNameLen = MAX_PATH+2; + DWORD dwApplicationNameLen = MAX_PATH + 2; DWORD parametersLen = sizeof(parametersBuffer) / sizeof(WCHAR); DWORD dirLen = sizeof(dirBuffer) / sizeof(WCHAR); DWORD wcmdLen = sizeof(wcmdBuffer) / sizeof(WCHAR); @@ -1633,41 +1611,41 @@ sei_tmp = *sei; TRACE("mask=0x%08x hwnd=%p verb=%s file=%s parm=%s dir=%s show=0x%08x class=%s\n", - sei_tmp.fMask, sei_tmp.hwnd, debugstr_w(sei_tmp.lpVerb), - debugstr_w(sei_tmp.lpFile), debugstr_w(sei_tmp.lpParameters), - debugstr_w(sei_tmp.lpDirectory), sei_tmp.nShow, - ((sei_tmp.fMask & SEE_MASK_CLASSALL) == SEE_MASK_CLASSNAME) ? - debugstr_w(sei_tmp.lpClass) : "not used"); + sei_tmp.fMask, sei_tmp.hwnd, debugstr_w(sei_tmp.lpVerb), + debugstr_w(sei_tmp.lpFile), debugstr_w(sei_tmp.lpParameters), + debugstr_w(sei_tmp.lpDirectory), sei_tmp.nShow, + ((sei_tmp.fMask & SEE_MASK_CLASSALL) == SEE_MASK_CLASSNAME) ? + debugstr_w(sei_tmp.lpClass) : "not used"); sei->hProcess = NULL; /* make copies of all path/command strings */ if (!sei_tmp.lpFile) { - wszApplicationName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, dwApplicationNameLen*sizeof(WCHAR)); + wszApplicationName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, dwApplicationNameLen * sizeof(WCHAR)); *wszApplicationName = '\0'; } else if (*sei_tmp.lpFile == '\"') { - DWORD l = strlenW(sei_tmp.lpFile+1); + DWORD l = strlenW(sei_tmp.lpFile + 1); if(l >= dwApplicationNameLen) - dwApplicationNameLen = l+1; - - wszApplicationName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, dwApplicationNameLen*sizeof(WCHAR)); - memcpy(wszApplicationName, sei_tmp.lpFile+1, (l+1)*sizeof(WCHAR)); - - if (wszApplicationName[l-1] == '\"') - wszApplicationName[l-1] = '\0'; + dwApplicationNameLen = l + 1; + + wszApplicationName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, dwApplicationNameLen * sizeof(WCHAR)); + memcpy(wszApplicationName, sei_tmp.lpFile + 1, (l + 1)*sizeof(WCHAR)); + + if (wszApplicationName[l-1] == L'\"') + wszApplicationName[l-1] = L'\0'; appKnownSingular = TRUE; - TRACE("wszApplicationName=%s\n",debugstr_w(wszApplicationName)); + TRACE("wszApplicationName=%s\n", debugstr_w(wszApplicationName)); } else { - DWORD l = strlenW(sei_tmp.lpFile)+1; - if(l > dwApplicationNameLen) dwApplicationNameLen = l+1; - wszApplicationName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, dwApplicationNameLen*sizeof(WCHAR)); - memcpy(wszApplicationName, sei_tmp.lpFile, l*sizeof(WCHAR)); + DWORD l = strlenW(sei_tmp.lpFile) + 1; + if(l > dwApplicationNameLen) dwApplicationNameLen = l + 1; + wszApplicationName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, dwApplicationNameLen * sizeof(WCHAR)); + memcpy(wszApplicationName, sei_tmp.lpFile, l * sizeof(WCHAR)); } wszParameters = parametersBuffer; @@ -1682,7 +1660,7 @@ strcpyW(wszParameters, sei_tmp.lpParameters); } else - *wszParameters = '\0'; + *wszParameters = L'\0'; wszDir = dirBuffer; if (sei_tmp.lpDirectory) @@ -1696,7 +1674,7 @@ strcpyW(wszDir, sei_tmp.lpDirectory); } else - *wszDir = '\0'; + *wszDir = L'\0'; /* adjust string pointers to point to the new buffers */ sei_tmp.lpFile = wszApplicationName; @@ -1737,7 +1715,7 @@ TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName)); } - if ( ERROR_SUCCESS == ShellExecute_FromContextMenu( &sei_tmp ) ) + if (ERROR_SUCCESS == ShellExecute_FromContextMenu(&sei_tmp)) { sei->hInstApp = (HINSTANCE) 33; HeapFree(GetProcessHeap(), 0, wszApplicationName); @@ -1750,8 +1728,7 @@ if (sei_tmp.fMask & SEE_MASK_CLASSALL) { - retval = SHELL_execute_class( wszApplicationName, &sei_tmp, sei, - execfunc ); + retval = SHELL_execute_class(wszApplicationName, &sei_tmp, sei, execfunc); if (retval <= 32 && !(sei_tmp.fMask & SEE_MASK_FLAG_NO_UI)) { OPENASINFO Info; @@ -1764,7 +1741,7 @@ Info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_EXEC; //if (SHOpenWithDialog(sei_tmp.hwnd, &Info) != S_OK) - do_error_dialog(retval, sei_tmp.hwnd, wszApplicationName); + do_error_dialog(retval, sei_tmp.hwnd, wszApplicationName); } HeapFree(GetProcessHeap(), 0, wszApplicationName); if (wszParameters != parametersBuffer) @@ -1778,21 +1755,21 @@ if (sei_tmp.fMask & SEE_MASK_IDLIST) { appKnownSingular = SHELL_translate_idlist( &sei_tmp, wszParameters, - parametersLen, - wszApplicationName, - dwApplicationNameLen ); + parametersLen, + wszApplicationName, + dwApplicationNameLen ); } /* expand environment strings */ len = ExpandEnvironmentStringsW(sei_tmp.lpFile, NULL, 0); - if (len>0) + if (len > 0) { LPWSTR buf; - buf = (LPWSTR)HeapAlloc(GetProcessHeap(),0,(len+1)*sizeof(WCHAR)); - - ExpandEnvironmentStringsW(sei_tmp.lpFile, buf, len+1); + buf = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + + ExpandEnvironmentStringsW(sei_tmp.lpFile, buf, len + 1); HeapFree(GetProcessHeap(), 0, wszApplicationName); - dwApplicationNameLen = len+1; + dwApplicationNameLen = len + 1; wszApplicationName = buf; /* appKnownSingular unmodified */ @@ -1806,7 +1783,7 @@ { LPWSTR buf; len++; - buf = (LPWSTR)HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); + buf = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); ExpandEnvironmentStringsW(sei_tmp.lpParameters, buf, len); if (wszParameters != parametersBuffer) HeapFree(GetProcessHeap(), 0, wszParameters); @@ -1823,7 +1800,7 @@ { LPWSTR buf; len++; - buf = (LPWSTR)HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); + buf = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); ExpandEnvironmentStringsW(sei_tmp.lpDirectory, buf, len); if (wszDir != dirBuffer) HeapFree(GetProcessHeap(), 0, wszDir); @@ -1833,25 +1810,25 @@ } /* Else, try to execute the filename */ - TRACE("execute:%s,%s,%s\n", debugstr_w(wszApplicationName), debugstr_w(wszParameters), debugstr_w(wszDir)); + TRACE("execute: %s,%s,%s\n", debugstr_w(wszApplicationName), debugstr_w(wszParameters), debugstr_w(wszDir)); /* separate out command line arguments from executable file name */ if (!*sei_tmp.lpParameters && !appKnownSingular) { /* If the executable path is quoted, handle the rest of the command line as parameters. */ - if (sei_tmp.lpFile[0] == '"') + if (sei_tmp.lpFile[0] == L'"') { LPWSTR src = wszApplicationName/*sei_tmp.lpFile*/ + 1; LPWSTR dst = wfileName; LPWSTR end; /* copy the unquoted executable path to 'wfileName' */ - while(*src && *src!='"') - *dst++ = *src++; - - *dst = '\0'; - - if (*src == '"') + while(*src && *src != L'"') + *dst++ = *src++; + + *dst = L'\0'; + + if (*src == L'"') { end = ++src; @@ -1865,7 +1842,7 @@ strcpyW(wszParameters, src); /* terminate previous command string after the quote character */ - *end = '\0'; + *end = L'\0'; } else { @@ -1875,14 +1852,14 @@ LPWSTR space, s; LPWSTR beg = wszApplicationName/*sei_tmp.lpFile*/; - for(s=beg; (space= const_cast<LPWSTR>(strchrW(s, ' '))); s=space+1) + for(s = beg; (space = const_cast<LPWSTR>(strchrW(s, L' '))); s = space + 1) { - int idx = space-sei_tmp.lpFile; + int idx = space - sei_tmp.lpFile; memcpy(buffer, sei_tmp.lpFile, idx * sizeof(WCHAR)); buffer[idx] = '\0'; /*FIXME This finds directory paths if the targeted file name contains spaces. */ - if (SearchPathW(*sei_tmp.lpDirectory? sei_tmp.lpDirectory: NULL, buffer, wszExe, sizeof(xlpFile)/sizeof(xlpFile[0]), xlpFile, NULL)) + if (SearchPathW(*sei_tmp.lpDirectory ? sei_tmp.lpDirectory : NULL, buffer, wszExe, sizeof(xlpFile) / sizeof(xlpFile[0]), xlpFile, NULL)) { /* separate out command from parameter string */ LPCWSTR p = space + 1; @@ -1891,17 +1868,17 @@ ++p; strcpyW(wszParameters, p); - *space = '\0'; + *space = L'\0'; break; } } - lstrcpynW(wfileName, sei_tmp.lpFile,sizeof(wfileName)/sizeof(WCHAR)); + lstrcpynW(wfileName, sei_tmp.lpFile, sizeof(wfileName) / sizeof(WCHAR)); } } else - lstrcpynW(wfileName, sei_tmp.lpFile,sizeof(wfileName)/sizeof(WCHAR)); + lstrcpynW(wfileName, sei_tmp.lpFile, sizeof(wfileName) / sizeof(WCHAR)); lpFile = wfileName; @@ -1917,7 +1894,7 @@ swprintf(wcmd, L"\"%s\"", wszApplicationName); if (sei_tmp.lpParameters[0]) { - strcatW(wcmd, wSpace); + strcatW(wcmd, L" "); strcatW(wcmd, wszParameters); } @@ -1935,53 +1912,49 @@ } /* Else, try to find the executable */ - wcmd[0] = '\0'; + wcmd[0] = L'\0'; retval = SHELL_FindExecutable(sei_tmp.lpDirectory, lpFile, sei_tmp.lpVerb, wcmd, wcmdLen, lpstrProtocol, &env, (LPITEMIDLIST)sei_tmp.lpIDList, sei_tmp.lpParameters); if (retval > 32) /* Found */ { - retval = SHELL_quote_and_execute( wcmd, wszParameters, lpstrProtocol, - wszApplicationName, env, &sei_tmp, - sei, execfunc ); - HeapFree( GetProcessHeap(), 0, env ); + retval = SHELL_quote_and_execute(wcmd, wszParameters, lpstrProtocol, + wszApplicationName, env, &sei_tmp, + sei, execfunc); + HeapFree(GetProcessHeap(), 0, env); } else if (PathIsDirectoryW(lpFile)) { - static const WCHAR wExplorer[] = {'e','x','p','l','o','r','e','r',0}; - static const WCHAR wQuote[] = {'"',0}; WCHAR wExec[MAX_PATH]; - WCHAR * lpQuotedFile = (LPWSTR)HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR) * (strlenW(lpFile) + 3) ); + WCHAR * lpQuotedFile = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * (strlenW(lpFile) + 3)); if (lpQuotedFile) { - retval = SHELL_FindExecutable( sei_tmp.lpDirectory, wExplorer, - wszOpen, wExec, MAX_PATH, - NULL, &env, NULL, NULL ); + retval = SHELL_FindExecutable(sei_tmp.lpDirectory, L"explorer", + wszOpen, wExec, MAX_PATH, + NULL, &env, NULL, NULL); if (retval > 32) { - strcpyW(lpQuotedFile, wQuote); - strcatW(lpQuotedFile, lpFile); - strcatW(lpQuotedFile, wQuote); - retval = SHELL_quote_and_execute( wExec, lpQuotedFile, - lpstrProtocol, - wszApplicationName, env, - &sei_tmp, sei, execfunc ); - HeapFree( GetProcessHeap(), 0, env ); + swprintf(lpQuotedFile, L"\"%s\"", lpFile); + retval = SHELL_quote_and_execute(wExec, lpQuotedFile, + lpstrProtocol, + wszApplicationName, env, + &sei_tmp, sei, execfunc); + HeapFree(GetProcessHeap(), 0, env); } - HeapFree( GetProcessHeap(), 0, lpQuotedFile ); + HeapFree(GetProcessHeap(), 0, lpQuotedFile); } else retval = 0; /* Out of memory */ } else if (PathIsURLW(lpFile)) /* File not found, check for URL */ { - retval = SHELL_execute_url( lpFile, wFile, wcmd, &sei_tmp, sei, execfunc ); + retval = SHELL_execute_url(lpFile, L"file", wcmd, &sei_tmp, sei, execfunc ); } /* Check if file specified is in the form www.??????.*** */ - else if (!strncmpiW(lpFile, wWww, 3)) + else if (!strncmpiW(lpFile, L"www", 3)) { /* if so, append lpFile http:// and call ShellExecute */ WCHAR lpstrTmpFile[256]; - strcpyW(lpstrTmpFile, wHttp); + strcpyW(lpstrTmpFile, L"http://"); strcatW(lpstrTmpFile, lpFile); retval = (UINT_PTR)ShellExecuteW(sei_tmp.hwnd, sei_tmp.lpVerb, lpstrTmpFile, NULL, NULL, 0); } @@ -2000,7 +1973,7 @@ Info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_EXEC; //if (SHOpenWithDialog(sei_tmp.hwnd, &Info) != S_OK) - do_error_dialog(retval, sei_tmp.hwnd, wszApplicationName); + do_error_dialog(retval, sei_tmp.hwnd, wszApplicationName); } HeapFree(GetProcessHeap(), 0, wszApplicationName); @@ -2019,8 +1992,8 @@ /************************************************************************* * ShellExecuteA [SHELL32.290] */ -HINSTANCE WINAPI ShellExecuteA(HWND hWnd, LPCSTR lpOperation,LPCSTR lpFile, - LPCSTR lpParameters,LPCSTR lpDirectory, INT iShowCmd) +HINSTANCE WINAPI ShellExecuteA(HWND hWnd, LPCSTR lpOperation, LPCSTR lpFile, + LPCSTR lpParameters, LPCSTR lpDirectory, INT iShowCmd) { SHELLEXECUTEINFOA sei; @@ -2042,7 +2015,7 @@ sei.dwHotKey = 0; sei.hProcess = 0; - ShellExecuteExA (&sei); + ShellExecuteExA(&sei); return sei.hInstApp; } @@ -2050,7 +2023,7 @@ * ShellExecuteExA [SHELL32.292] * */ -BOOL WINAPI ShellExecuteExA (LPSHELLEXECUTEINFOA sei) +BOOL WINAPI ShellExecuteExA(LPSHELLEXECUTEINFOA sei) { SHELLEXECUTEINFOW seiW; BOOL ret; @@ -2077,7 +2050,7 @@ else seiW.lpClass = NULL; - ret = SHELL_execute( &seiW, SHELL_ExecuteW ); + ret = SHELL_execute(&seiW, SHELL_ExecuteW); sei->hInstApp = seiW.hInstApp; @@ -2097,9 +2070,9 @@ * ShellExecuteExW [SHELL32.293] * */ -BOOL WINAPI ShellExecuteExW (LPSHELLEXECUTEINFOW sei) -{ - return SHELL_execute( sei, SHELL_ExecuteW ); +BOOL WINAPI ShellExecuteExW(LPSHELLEXECUTEINFOW sei) +{ + return SHELL_execute(sei, SHELL_ExecuteW); } /************************************************************************* @@ -2128,7 +2101,7 @@ sei.dwHotKey = 0; sei.hProcess = 0; - SHELL_execute( &sei, SHELL_ExecuteW ); + SHELL_execute(&sei, SHELL_ExecuteW); return sei.hInstApp; } @@ -2137,8 +2110,8 @@ * * FIXME: the callback function most likely doesn't work the same way on Windows. */ -EXTERN_C HINSTANCE WINAPI WOWShellExecute(HWND hWnd, LPCSTR lpOperation,LPCSTR lpFile, - LPCSTR lpParameters,LPCSTR lpDirectory, INT iShowCmd, void *callback) +EXTERN_C HINSTANCE WINAPI WOWShellExecute(HWND hWnd, LPCSTR lpOperation, LPCSTR lpFile, + LPCSTR lpParameters, LPCSTR lpDirectory, INT iShowCmd, void *callback) { SHELLEXECUTEINFOW seiW; WCHAR *wVerb = NULL, *wFile = NULL, *wParameters = NULL, *wDirectory = NULL; @@ -2159,7 +2132,7 @@ seiW.dwHotKey = 0; seiW.hProcess = hProcess; - SHELL_execute( &seiW, (SHELL_ExecuteW32)callback ); + SHELL_execute(&seiW, (SHELL_ExecuteW32)callback); SHFree(wVerb); SHFree(wFile);

1 0

[rharabien] 54844: [SHELL32] - Rewrite Open With menu and dialog - Load all applications - Use treeview with Recommended and Other programs - Don't allow duplicates - Load registry keys in proper way
by rharabien＠svn.reactos.org 05 Jan '12

05 Jan '12

Author: rharabien Date: Thu Jan 5 18:31:18 2012 New Revision: 54844 URL: http://svn.reactos.org/svn/reactos?rev=54844&view=rev Log: [SHELL32] - Rewrite Open With menu and dialog - Load all applications - Use treeview with Recommended and Other programs - Don't allow duplicates - Load registry keys in proper way Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/openwithmenu.cpp trunk/reactos/dll/win32/shell32/openwithmenu.h trunk/reactos/dll/win32/shell32/shresdef.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… Modified: trunk/reactos/dll/win32/shell32/openwithmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef…

1 0

[janderwald] 54843: [HID] - Implement quering compatible ids - Fix result status for quering instance id - Fix bug in msmouse.inf
by janderwald＠svn.reactos.org 05 Jan '12

05 Jan '12

Author: janderwald Date: Thu Jan 5 18:22:48 2012 New Revision: 54843 URL: http://svn.reactos.org/svn/reactos?rev=54843&view=rev Log: [HID] - Implement quering compatible ids - Fix result status for quering instance id - Fix bug in msmouse.inf Modified: branches/usb-bringup/drivers/hid/hidclass/pdo.c branches/usb-bringup/media/inf/input.inf branches/usb-bringup/media/inf/msmouse.inf Modified: branches/usb-bringup/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] Thu Jan 5 18:22:48 2012 @@ -131,6 +131,8 @@ // // store result // + DPRINT1("NewBuffer %S\n", NewBuffer); + ASSERT(FALSE); Irp->IoStatus.Information = (ULONG_PTR)NewBuffer; return STATUS_SUCCESS; } @@ -183,8 +185,8 @@ // // single tlc device // - Offset = swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x&Rev_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->Common.Attributes.VersionNumber) + 1; - Offset += swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID) + 1; + Offset = swprintf(&Buffer[Offset], L"HID\\Vix_%04x&Pid_%04x&Rev_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->Common.Attributes.VersionNumber) + 1; + Offset += swprintf(&Buffer[Offset], L"HID\\Vix_%04x&Pid_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID) + 1; } // @@ -270,6 +272,7 @@ // // store result // + ASSERT(FALSE); Irp->IoStatus.Information = (ULONG_PTR)Ptr; return STATUS_SUCCESS; } @@ -298,11 +301,7 @@ return Status; } DPRINT1("HidClassPDO_HandleQueryInstanceId Buffer %S\n", Irp->IoStatus.Information); - // - //TODO implement instance id - // example: - // HID\VID_045E&PID_0047\8&1A0700BC&0&0000 - return STATUS_NOT_IMPLEMENTED; + return Status; } NTSTATUS @@ -310,29 +309,28 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - NTSTATUS Status; - - // - // copy current stack location - // - IoCopyCurrentIrpStackLocationToNext(Irp); - - // - // call mini-driver - // - Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); - if (!NT_SUCCESS(Status)) - { - // - // failed - // - return Status; - } - - // - // FIXME: implement me - // - return STATUS_NOT_IMPLEMENTED; + LPWSTR Buffer; + + Buffer = (LPWSTR)ExAllocatePool(NonPagedPool, 2 * sizeof(WCHAR)); + if (!Buffer) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // zero buffer + // + Buffer[0] = 0; + Buffer[1] = 0; + + // + // store result + // + Irp->IoStatus.Information = (ULONG_PTR)Buffer; + return STATUS_SUCCESS; } Modified: branches/usb-bringup/media/inf/input.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/media/inf/input.inf… ============================================================================== --- branches/usb-bringup/media/inf/input.inf [iso-8859-1] (original) +++ branches/usb-bringup/media/inf/input.inf [iso-8859-1] Thu Jan 5 18:22:48 2012 @@ -59,7 +59,7 @@ StartType = 3 ErrorControl = 1 ServiceBinary = %12%\hidusb.sys -LoadOrderGroup = Pointer Port +LoadOrderGroup = extended base [strings] MSFT = "ReactOS" Modified: branches/usb-bringup/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/media/inf/msmouse.i… ============================================================================== Binary files - no diff available.

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