Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[janderwald] 22322: add freeldr_fdebug rbuild
by janderwald＠svn.reactos.org 12 Jun '06

12 Jun '06

Author: janderwald Date: Mon Jun 12 21:30:21 2006 New Revision: 22322 URL: http://svn.reactos.ru/svn/reactos?rev=22322&view=rev Log: add freeldr_fdebug rbuild Modified: trunk/reactos/boot/freeldr/freeldr.rbuild Modified: trunk/reactos/boot/freeldr/freeldr.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/freeldr.rbuild… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr.rbuild Mon Jun 12 21:30:21 2006 @@ -11,6 +11,9 @@ <xi:include href="freeldr/freeldr.rbuild" /> <xi:include href="freeldr/setupldr.rbuild" /> </directory> +<directory name="fdebug"> + <xi:include href="fdebug/fdebug.rbuild" /> +</directory> <directory name="install"> <xi:include href="install/installfreeldr.rbuild" /> </directory>

1 0

[janderwald] 22321: add norwegian translation patch by LMH1 (bug 1575)
by janderwald＠svn.reactos.org 12 Jun '06

12 Jun '06

Author: janderwald Date: Mon Jun 12 21:28:08 2006 New Revision: 22321 URL: http://svn.reactos.ru/svn/reactos?rev=22321&view=rev Log: add norwegian translation patch by LMH1 (bug 1575) Added: trunk/reactos/boot/freeldr/fdebug/No.rc Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc Added: trunk/reactos/boot/freeldr/fdebug/No.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/No.rc?r… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/No.rc (added) +++ trunk/reactos/boot/freeldr/fdebug/No.rc Mon Jun 12 21:28:08 2006 @@ -1,0 +1,198 @@ +///////////////////////////////////////////////////////////////////////////// +// Norwegian (N.O.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_FDEBUG ICON DISCARDABLE "fdebug.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDC_FDEBUG MENU DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "Koble &til", ID_FILE_CONNECT + MENUITEM "Koble &fra", ID_FILE_DISCONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Start Opptak", ID_FILE_STARTCAPTURE + MENUITEM "S&topp Opptak", ID_FILE_STOPCAPTURE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Lokalt Ekko", ID_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "&Avslutt", IDM_EXIT + END + POPUP "&Hjelp" + BEGIN + MENUITEM "&Om ...", IDM_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDC_FDEBUG ACCELERATORS MOVEABLE PURE +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 252 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_CONNECTION, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 189 + TOPMARGIN, 7 + BOTTOMMARGIN, 93 + END + + IDD_CAPTURE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 244 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Om FreeLoader feilsøker" +FONT 8, "Tahoma" +BEGIN + CONTROL "FreeLoader feilsøker v1.0\nopphavsrett (C) 2003\nlaget av Brian Palmer (brianp(a)reactos.org)", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, + 122,26 + DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP + ICON IDI_FDEBUG,IDC_STATIC,19,30,20,20 + EDITTEXT IDC_LICENSE_EDIT,53,63,174,107,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +IDD_CONNECTION DIALOG DISCARDABLE 0, 0, 196, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Connection Options" +FONT 8, "Tahoma" +BEGIN + LTEXT "Enter the COM port (e.g. COM1):",IDC_STATIC,7,7,108,8 + EDITTEXT IDC_COMPORT,7,17,182,14,ES_AUTOHSCROLL + LTEXT "Enter the baud rate (e.g. 115200):",IDC_STATIC,7,38,114, + 8 + EDITTEXT IDC_BAUTRATE,7,48,182,14,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,45,79,50,14 + PUSHBUTTON "Cancel",IDCANCEL,100,79,50,14 +END + +IDD_CAPTURE DIALOG DISCARDABLE 0, 0, 251, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Capture File" +FONT 8, "Tahoma" +BEGIN + LTEXT "Opptak fil Navn:",IDC_STATIC,7,17,62,8 + EDITTEXT IDC_CAPTUREFILENAME,7,26,181,14,ES_AUTOHSCROLL + PUSHBUTTON "&Bla gjennom",IDC_BROWSE,194,26,50,14 + DEFPUSHBUTTON "OK",IDOK,139,74,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,194,74,50,14 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "fdebug" + IDS_HELLO "Hei verden!" + IDC_FDEBUG "FDEBUG" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "Dette programmet er fri programvare; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." +END + +#endif // Norwegian (N.O.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug.… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.rc (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.rc Mon Jun 12 21:28:08 2006 @@ -21,3 +21,4 @@ #include "Ja.rc" #include "Pl.rc" #include "Tr.rc" +#include "No.rc"

1 0

[janderwald] 22320: add rbuild file
by janderwald＠svn.reactos.org 12 Jun '06

12 Jun '06

Author: janderwald Date: Mon Jun 12 21:26:41 2006 New Revision: 22320 URL: http://svn.reactos.ru/svn/reactos?rev=22320&view=rev Log: add rbuild file Added: trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild Added: trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug.… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild (added) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild Mon Jun 12 21:26:41 2006 @@ -1,0 +1,18 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<module name="freeldr_fdebug" type="win32gui" installbase="system32" installname="fdebug.exe" allowwarnings="true"> + <include base="ReactOS">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>comdlg32</library> + <library>gdi32</library> + <file>fdebug.c</file> + <file>rs232.c</file> + <file>fdebug.rc</file> +</module>

1 0

[ion] 22319: - Pretty much the last Ob implementation/optimization patch (Except for a minor fix by Thomas to fix handle sweeping), re-implemented the ObFindObject routine by using some code that I had written almost 2 years ago with help from Thomas and Filip, plus some fixes discovered today while testing. - Fixed symbolic link and desktop/winsta parse procedures to become NT-compatible now that ObFindObject is as well. Also fixed file/device parse routine for these changes. - ObFindObject now
by ion＠svn.reactos.org 12 Jun '06

12 Jun '06

Author: ion Date: Mon Jun 12 09:58:08 2006 New Revision: 22319 URL: http://svn.reactos.ru/svn/reactos?rev=22319&view=rev Log: - Pretty much the last Ob implementation/optimization patch (Except for a minor fix by Thomas to fix handle sweeping), re-implemented the ObFindObject routine by using some code that I had written almost 2 years ago with help from Thomas and Filip, plus some fixes discovered today while testing. - Fixed symbolic link and desktop/winsta parse procedures to become NT-compatible now that ObFindObject is as well. Also fixed file/device parse routine for these changes. - ObFindObject now supports STATUS_REPARSE_OBJECT, and has an optimized path for parsing when a root directory is given, as well as is entirely unicode_string-based. - Cleaned up ob.h and added ob_x.h for the inlined functions. - Implemented new Ob tracing system. Added: trunk/reactos/ntoskrnl/include/internal/ob_x.h Modified: trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/io/file.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/symlink.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/o… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Mon Jun 12 09:58:08 2006 @@ -1,53 +1,89 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: include/internal/objmgr.h - * PURPOSE: Object manager definitions - * PROGRAMMER: David Welch (welch(a)mcmail.com) - */ - -#ifndef __INCLUDE_INTERNAL_OBJMGR_H -#define __INCLUDE_INTERNAL_OBJMGR_H - +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/include/ob.h +* PURPOSE: Internal header for the Object Manager +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +*/ +#include "ob_x.h" + +// +// Define this if you want debugging support +// +#define _OB_DEBUG_ 0x00 + +// +// These define the Debug Masks Supported +// +#define OB_HANDLE_DEBUG 0x01 +#define OB_NAMESPACE_DEBUG 0x02 +#define OB_SECURITY_DEBUG 0x04 +#define OB_REFERENCE_DEBUG 0x08 +#define OB_CALLBACK_DEBUG 0x10 + +// +// Debug/Tracing support +// +#if _OB_DEBUG_ +#ifdef NEW_DEBUG_SYSTEM_IMPLEMENTED // enable when Debug Filters are implemented +#define OBTRACE DbgPrintEx +#else +#define OBTRACE(x, ...) \ + if (x & ObpTraceLevel) DbgPrint(__VA_ARGS__) +#endif +#else +#define OBTRACE(x, ...) DPRINT(__VA_ARGS__) +#endif + +// +// Mask to detect GENERIC_XXX access masks being used +// +#define GENERIC_ACCESS \ + (GENERIC_READ | \ + GENERIC_WRITE | \ + GENERIC_EXECUTE | \ + GENERIC_ALL) + +// +// Identifies a Kernel Handle +// +#define KERNEL_HANDLE_FLAG \ + (1 << ((sizeof(HANDLE) * 8) - 1)) +#define ObIsKernelHandle(Handle, ProcessorMode) \ + (((ULONG_PTR)(Handle) & KERNEL_HANDLE_FLAG) && \ + ((ProcessorMode) == KernelMode)) + +// +// Converts to and from a Kernel Handle to a normal handle +// +#define ObKernelHandleToHandle(Handle) \ + (HANDLE)((ULONG_PTR)(Handle) & ~KERNEL_HANDLE_FLAG) +#define ObMarkHandleAsKernelHandle(Handle) \ + (HANDLE)((ULONG_PTR)(Handle) | KERNEL_HANDLE_FLAG) + +// +// Returns the number of handles in a handle table +// +#define ObpGetHandleCountByHandleTable(HandleTable) \ + ((PHANDLE_TABLE)HandleTable)->HandleCount + +// +// Context Structures for Ex*Handle Callbacks +// typedef struct _OBP_SET_HANDLE_ATTRIBUTES_CONTEXT { KPROCESSOR_MODE PreviousMode; OBJECT_HANDLE_ATTRIBUTE_INFORMATION Information; } OBP_SET_HANDLE_ATTRIBUTES_CONTEXT, *POBP_SET_HANDLE_ATTRIBUTES_CONTEXT; - typedef struct _OBP_CLOSE_HANDLE_CONTEXT { PHANDLE_TABLE HandleTable; KPROCESSOR_MODE AccessMode; } OBP_CLOSE_HANDLE_CONTEXT, *POBP_CLOSE_HANDLE_CONTEXT; -#define GENERIC_ACCESS (GENERIC_READ | \ - GENERIC_WRITE | \ - GENERIC_EXECUTE | \ - GENERIC_ALL) - -#define KERNEL_HANDLE_FLAG (1 << ((sizeof(HANDLE) * 8) - 1)) -#define ObIsKernelHandle(Handle, ProcessorMode) \ - (((ULONG_PTR)(Handle) & KERNEL_HANDLE_FLAG) && \ - ((ProcessorMode) == KernelMode)) -#define ObKernelHandleToHandle(Handle) \ - (HANDLE)((ULONG_PTR)(Handle) & ~KERNEL_HANDLE_FLAG) -#define ObMarkHandleAsKernelHandle(Handle) \ - (HANDLE)((ULONG_PTR)(Handle) | KERNEL_HANDLE_FLAG) -#define ObpGetHandleCountByHandleTable(HandleTable) \ - ((PHANDLE_TABLE)HandleTable)->HandleCount - -extern KEVENT ObpDefaultObject; -extern POBJECT_TYPE ObpTypeObjectType; -extern POBJECT_TYPE ObSymbolicLinkType; -extern POBJECT_TYPE ObTypeObjectType; -extern POBJECT_DIRECTORY NameSpaceRoot; -extern POBJECT_DIRECTORY ObpTypeDirectoryObject; -extern PHANDLE_TABLE ObpKernelHandleTable; -extern WORK_QUEUE_ITEM ObpReaperWorkItem; -extern volatile PVOID ObpReaperList; -extern NPAGED_LOOKASIDE_LIST ObpNmLookasideList, ObpCiLookasideList; - +// +// Directory Namespace Functions +// BOOLEAN NTAPI ObpDeleteEntryDirectory( @@ -72,12 +108,33 @@ IN POBP_LOOKUP_CONTEXT Context ); +// +// Symbolic Link Functions +// VOID NTAPI ObInitSymbolicLinkImplementation( VOID ); +NTSTATUS +NTAPI +ObpParseSymbolicLink( + IN PVOID ParsedObject, + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING FullPath, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *NextObject +); + +// +// Process/Handle Table Init/Rundown +// NTSTATUS NTAPI ObpCreateHandleTable( @@ -91,6 +148,9 @@ IN PEPROCESS Process ); +// +// Object Lookup Functions +// NTSTATUS NTAPI ObFindObject( @@ -107,6 +167,9 @@ IN PVOID Insert ); +// +// Object Attribute Functions +// BOOLEAN NTAPI ObpSetHandleAttributes( @@ -117,17 +180,26 @@ VOID NTAPI -ObpDeleteNameCheck( - IN PVOID Object -); - -VOID -NTAPI ObQueryDeviceMapInformation( IN PEPROCESS Process, OUT PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo ); +// +// Object Lifetime Functions +// +VOID +FASTCALL +ObpDeleteObject( + IN PVOID Object +); + +VOID +NTAPI +ObpReapObject( + IN PVOID Unused +); + VOID FASTCALL ObpSetPermanentObject( @@ -136,22 +208,19 @@ ); VOID -FASTCALL -ObpDeleteObject( - IN PVOID Object -); - -VOID -NTAPI -ObpReapObject( - IN PVOID Unused -); - -/* Security descriptor cache functions */ - -NTSTATUS -NTAPI -ObpInitSdCache(VOID); +NTAPI +ObpDeleteNameCheck( + IN PVOID Object +); + +// +// Security descriptor cache functions +// +NTSTATUS +NTAPI +ObpInitSdCache( + VOID +); NTSTATUS NTAPI @@ -162,7 +231,9 @@ NTSTATUS NTAPI -ObpRemoveSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor); +ObpRemoveSecurityDescriptor( + IN PSECURITY_DESCRIPTOR SecurityDescriptor +); PSECURITY_DESCRIPTOR NTAPI @@ -172,37 +243,45 @@ VOID NTAPI -ObpDereferenceCachedSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor); - +ObpDereferenceCachedSecurityDescriptor( + IN PSECURITY_DESCRIPTOR SecurityDescriptor +); + +// +// Executive Fast Referencing Functions +// VOID FASTCALL ObInitializeFastReference( IN PEX_FAST_REF FastRef, - PVOID Object + IN PVOID Object ); PVOID FASTCALL ObFastReplaceObject( IN PEX_FAST_REF FastRef, - PVOID Object + IN PVOID Object ); PVOID FASTCALL -ObFastReferenceObject(IN PEX_FAST_REF FastRef); +ObFastReferenceObject( + IN PEX_FAST_REF FastRef +); VOID FASTCALL ObFastDereferenceObject( IN PEX_FAST_REF FastRef, - PVOID Object -); - -/* Object Create and Object Name Capture Functions */ - -NTSTATUS -STDCALL + IN PVOID Object +); + +// +// Object Create and Object Name Capture Functions +// +NTSTATUS +NTAPI ObpCaptureObjectName( IN PUNICODE_STRING CapturedName, IN PUNICODE_STRING ObjectName, @@ -211,7 +290,7 @@ ); NTSTATUS -STDCALL +NTAPI ObpCaptureObjectAttributes( IN POBJECT_ATTRIBUTES ObjectAttributes, IN KPROCESSOR_MODE AccessMode, @@ -220,119 +299,17 @@ OUT PUNICODE_STRING ObjectName ); -VOID -static __inline -ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) -{ - /* Check if we have a security descriptor */ - if (ObjectCreateInfo->SecurityDescriptor) - { - /* Release it */ - SeReleaseSecurityDescriptor(ObjectCreateInfo->SecurityDescriptor, - ObjectCreateInfo->ProbeMode, - TRUE); - ObjectCreateInfo->SecurityDescriptor = NULL; - } -} - -PVOID -static __inline -ObpAllocateCapturedAttributes(IN PP_NPAGED_LOOKASIDE_NUMBER Type) -{ - PKPRCB Prcb = KeGetCurrentPrcb(); - PVOID Buffer; - PNPAGED_LOOKASIDE_LIST List; - - /* Get the P list first */ - List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[Type].P; - - /* Attempt allocation */ - List->L.TotalAllocates++; - Buffer = (PVOID)InterlockedPopEntrySList(&List->L.ListHead); - if (!Buffer) - { - /* Let the balancer know that the P list failed */ - List->L.AllocateMisses++; - - /* Try the L List */ - List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[Type].L; - List->L.TotalAllocates++; - Buffer = (PVOID)InterlockedPopEntrySList(&List->L.ListHead); - if (!Buffer) - { - /* Let the balancer know the L list failed too */ - List->L.AllocateMisses++; - - /* Allocate it */ - Buffer = List->L.Allocate(List->L.Type, List->L.Size, List->L.Tag); - } - } - - /* Return buffer */ - return Buffer; -} - -VOID -static __inline -ObpFreeCapturedAttributes(IN PVOID Buffer, - IN PP_NPAGED_LOOKASIDE_NUMBER Type) -{ - PKPRCB Prcb = KeGetCurrentPrcb(); - PNPAGED_LOOKASIDE_LIST List; - - /* Use the P List */ - List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[Type].P; - List->L.TotalFrees++; - - /* Check if the Free was within the Depth or not */ - if (ExQueryDepthSList(&List->L.ListHead) >= List->L.Depth) - { - /* Let the balancer know */ - List->L.FreeMisses++; - - /* Use the L List */ - List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[Type].L; - List->L.TotalFrees++; - - /* Check if the Free was within the Depth or not */ - if (ExQueryDepthSList(&List->L.ListHead) >= List->L.Depth) - { - /* All lists failed, use the pool */ - List->L.FreeMisses++; - List->L.Free(Buffer); - } - } - else - { - /* The free was within the Depth */ - InterlockedPushEntrySList(&List->L.ListHead, - (PSINGLE_LIST_ENTRY)Buffer); - } -} - -VOID -static __inline -ObpReleaseCapturedName(IN PUNICODE_STRING Name) -{ - /* We know this is a pool-allocation if the size doesn't match */ - if (Name->MaximumLength != 248) - { - ExFreePool(Name->Buffer); - } - else - { - /* Otherwise, free from the lookaside */ - ObpFreeCapturedAttributes(Name, LookasideNameBufferList); - } -} - -VOID -static __inline -ObpFreeAndReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) -{ - /* First release the attributes, then free them from the lookaside list */ - ObpReleaseCapturedAttributes(ObjectCreateInfo); - ObpFreeCapturedAttributes(ObjectCreateInfo, LookasideCreateInfoList); -} - -#endif /* __INCLUDE_INTERNAL_OBJMGR_H */ +// +// Global data inside the Object Manager +// +extern ULONG ObpTraceLevel; +extern KEVENT ObpDefaultObject; +extern POBJECT_TYPE ObpTypeObjectType; +extern POBJECT_TYPE ObSymbolicLinkType; +extern POBJECT_TYPE ObTypeObjectType; +extern POBJECT_DIRECTORY NameSpaceRoot; +extern POBJECT_DIRECTORY ObpTypeDirectoryObject; +extern PHANDLE_TABLE ObpKernelHandleTable; +extern WORK_QUEUE_ITEM ObpReaperWorkItem; +extern volatile PVOID ObpReaperList; +extern NPAGED_LOOKASIDE_LIST ObpNmLookasideList, ObpCiLookasideList; Added: trunk/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/o… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob_x.h (added) +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h Mon Jun 12 09:58:08 2006 @@ -1,0 +1,123 @@ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/include/ob_x.h +* PURPOSE: Intenral Inlined Functions for the Object Manager +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +*/ + +VOID +static __inline +ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) +{ + /* Check if we have a security descriptor */ + if (ObjectCreateInfo->SecurityDescriptor) + { + /* Release it */ + SeReleaseSecurityDescriptor(ObjectCreateInfo->SecurityDescriptor, + ObjectCreateInfo->ProbeMode, + TRUE); + ObjectCreateInfo->SecurityDescriptor = NULL; + } +} + +PVOID +static __inline +ObpAllocateCapturedAttributes(IN PP_NPAGED_LOOKASIDE_NUMBER Type) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + PVOID Buffer; + PNPAGED_LOOKASIDE_LIST List; + + /* Get the P list first */ + List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[Type].P; + + /* Attempt allocation */ + List->L.TotalAllocates++; + Buffer = (PVOID)InterlockedPopEntrySList(&List->L.ListHead); + if (!Buffer) + { + /* Let the balancer know that the P list failed */ + List->L.AllocateMisses++; + + /* Try the L List */ + List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[Type].L; + List->L.TotalAllocates++; + Buffer = (PVOID)InterlockedPopEntrySList(&List->L.ListHead); + if (!Buffer) + { + /* Let the balancer know the L list failed too */ + List->L.AllocateMisses++; + + /* Allocate it */ + Buffer = List->L.Allocate(List->L.Type, List->L.Size, List->L.Tag); + } + } + + /* Return buffer */ + return Buffer; +} + +VOID +static __inline +ObpFreeCapturedAttributes(IN PVOID Buffer, + IN PP_NPAGED_LOOKASIDE_NUMBER Type) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + PNPAGED_LOOKASIDE_LIST List; + + /* Use the P List */ + List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[Type].P; + List->L.TotalFrees++; + + /* Check if the Free was within the Depth or not */ + if (ExQueryDepthSList(&List->L.ListHead) >= List->L.Depth) + { + /* Let the balancer know */ + List->L.FreeMisses++; + + /* Use the L List */ + List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[Type].L; + List->L.TotalFrees++; + + /* Check if the Free was within the Depth or not */ + if (ExQueryDepthSList(&List->L.ListHead) >= List->L.Depth) + { + /* All lists failed, use the pool */ + List->L.FreeMisses++; + List->L.Free(Buffer); + } + } + else + { + /* The free was within the Depth */ + InterlockedPushEntrySList(&List->L.ListHead, + (PSINGLE_LIST_ENTRY)Buffer); + } +} + +VOID +static __inline +ObpReleaseCapturedName(IN PUNICODE_STRING Name) +{ + /* We know this is a pool-allocation if the size doesn't match */ + if (Name->MaximumLength != 248) + { + ExFreePool(Name->Buffer); + } + else + { + /* Otherwise, free from the lookaside */ + ObpFreeCapturedAttributes(Name, LookasideNameBufferList); + } +} + +VOID +static __inline +ObpFreeAndReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) +{ + /* First release the attributes, then free them from the lookaside list */ + ObpReleaseCapturedAttributes(ObjectCreateInfo); + ObpFreeCapturedAttributes(ObjectCreateInfo, LookasideCreateInfoList); +} + Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=2231… ============================================================================== --- trunk/reactos/ntoskrnl/io/file.c (original) +++ trunk/reactos/ntoskrnl/io/file.c Mon Jun 12 09:58:08 2006 @@ -44,19 +44,15 @@ NTSTATUS Status; PFILE_OBJECT FileObject; DPRINT("IopParseDevice:\n" - "DeviceObject : %p, Type : %p, TypeName : %wZ\n" - "FileObject : %p, Type : %p, TypeName : %wZ\n" - "CompleteName : %wZ, RemainingName : %wZ\n", - ParseObject, - ObjectType, - &ObjectType->Name, - Context, - Context ? OBJECT_TO_OBJECT_HEADER(Context)->Type : NULL, - Context ? &OBJECT_TO_OBJECT_HEADER(Context)->Type->Name: NULL, - CompleteName, - RemainingName); - - if (!RemainingName || !RemainingName->Buffer) + "DeviceObject : %p\n" + "RelatedFileObject : %p\n" + "CompleteName : %wZ, RemainingName : %wZ\n", + ParseObject, + Context, + CompleteName, + RemainingName); + + if (!*RemainingName->Buffer) { DeviceObject = ParseObject; @@ -71,6 +67,7 @@ (PVOID*)&FileObject); /* Set File Object Data */ FileObject->DeviceObject = IoGetAttachedDevice(DeviceObject); + DPRINT("DO. DRV Name: %p %wZ\n", DeviceObject, &DeviceObject->DriverObject->DriverName); /* HACK */ FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; @@ -88,7 +85,7 @@ 0, (PVOID*)&FileObject); - if (ObjectType == IoDeviceObjectType) + if (!Context) { /* Parent is a device object */ DeviceObject = IoGetAttachedDevice((PDEVICE_OBJECT)ParseObject); @@ -110,7 +107,6 @@ RtlCreateUnicodeString(&FileObject->FileName, RemainingName->Buffer); FileObject->DeviceObject = DeviceObject; *Object = FileObject; - RemainingName->Buffer = NULL; // ros hack return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Mon Jun 12 09:58:08 2006 @@ -19,12 +19,6 @@ PHANDLE_TABLE ObpKernelHandleTable = NULL; -#ifdef _OBDEBUG_ -#define OBTRACE DPRINT1 -#else -#define OBTRACE DPRINT -#endif - /* PRIVATE FUNCTIONS *********************************************************/ NTSTATUS @@ -103,7 +97,8 @@ /* Get the object type and header */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); ObjectType = ObjectHeader->Type; - OBTRACE("OBTRACE - %s - Decrementing count for: %p. HC LC %lx %lx\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - Decrementing count for: %p. HC LC %lx %lx\n", __FUNCTION__, ObjectBody, ObjectHeader->HandleCount, @@ -132,7 +127,8 @@ /* Decrease the total number of handles for this type */ ObjectType->TotalNumberOfHandles--; - OBTRACE("OBTRACE - %s - Decremented count for: %p. HC LC %lx %lx\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - Decremented count for: %p. HC LC %lx %lx\n", __FUNCTION__, ObjectBody, ObjectHeader->HandleCount, @@ -183,7 +179,8 @@ ObjectType = ObjectHeader->Type; Body = &ObjectHeader->Body; GrantedAccess = HandleEntry->GrantedAccess; - OBTRACE("OBTRACE - %s - Closing handle: %lx for %p. HC LC %lx %lx\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - Closing handle: %lx for %p. HC LC %lx %lx\n", __FUNCTION__, Handle, Body, @@ -243,7 +240,8 @@ //ObDereferenceObject(Body); // FIXME: Needs sync changes in other code /* Return to caller */ - OBTRACE("OBTRACE - %s - Closed handle: %lx for %p. HC LC %lx %lx\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - Closed handle: %lx for %p. HC LC %lx %lx\n", __FUNCTION__, Handle, Body, @@ -297,7 +295,8 @@ /* Get the object header and type */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); ObjectType = ObjectHeader->Type; - OBTRACE("OBTRACE - %s - Incrementing count for: %p. Reason: %lx. HC LC %lx %lx\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - Incrementing count for: %p. Reason: %lx. HC LC %lx %lx\n", __FUNCTION__, Object, OpenReason, @@ -376,7 +375,8 @@ /* Increase total number of handles */ ObjectType->TotalNumberOfHandles++; - OBTRACE("OBTRACE - %s - Incremented count for: %p. Reason: %lx HC LC %lx %lx\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - Incremented count for: %p. Reason: %lx HC LC %lx %lx\n", __FUNCTION__, Object, OpenReason, @@ -429,7 +429,8 @@ /* Get the object header and type */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); ObjectType = ObjectHeader->Type; - OBTRACE("OBTRACE - %s - Incrementing count for: %p. UNNAMED. HC LC %lx %lx\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - Incrementing count for: %p. UNNAMED. HC LC %lx %lx\n", __FUNCTION__, Object, ObjectHeader->HandleCount, @@ -486,7 +487,8 @@ /* Increase total number of handles */ ObjectType->TotalNumberOfHandles++; - OBTRACE("OBTRACE - %s - Incremented count for: %p. UNNAMED HC LC %lx %lx\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - Incremented count for: %p. UNNAMED HC LC %lx %lx\n", __FUNCTION__, Object, ObjectHeader->HandleCount, @@ -546,7 +548,8 @@ /* Get the object header and type */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); - OBTRACE("OBTRACE - %s - Creating handle for: %p. UNNAMED. HC LC %lx %lx\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - Creating handle for: %p. UNNAMED. HC LC %lx %lx\n", __FUNCTION__, Object, ObjectHeader->HandleCount, @@ -606,7 +609,8 @@ * ObpIncrementHandleCount to make sure that Object Security is valid * (specified in Gl00my documentation on Ob) */ - OBTRACE("OBTRACE - %s - Handle Properties: [%p-%lx-%lx]\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - Handle Properties: [%p-%lx-%lx]\n", __FUNCTION__, NewEntry.Object, NewEntry.ObAttributes & 3, NewEntry.GrantedAccess); Handle = ExCreateHandle(HandleTable, &NewEntry); @@ -634,7 +638,8 @@ /* Return handle and object */ *ReturnedHandle = Handle; if (ReturnedObject) *ReturnedObject = Object; - OBTRACE("OBTRACE - %s - Returning Handle: %lx HC LC %lx %lx\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s %s - Returning Handle: %lx HC LC %lx %lx\n", __FUNCTION__, Handle, ObjectHeader->HandleCount, @@ -716,7 +721,8 @@ /* Get the object header and type */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); ObjectType = ObjectHeader->Type; - OBTRACE("OBTRACE - %s - Creating handle for: %p. Reason: %lx. HC LC %lx %lx\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - Creating handle for: %p. Reason: %lx. HC LC %lx %lx\n", __FUNCTION__, Object, OpenReason, @@ -787,7 +793,8 @@ * ObpIncrementHandleCount to make sure that Object Security is valid * (specified in Gl00my documentation on Ob) */ - OBTRACE("OBTRACE - %s - Handle Properties: [%p-%lx-%lx]\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - Handle Properties: [%p-%lx-%lx]\n", __FUNCTION__, NewEntry.Object, NewEntry.ObAttributes & 3, NewEntry.GrantedAccess); Handle = ExCreateHandle(HandleTable, &NewEntry); @@ -815,7 +822,8 @@ /* Return handle and object */ *ReturnedHandle = Handle; if (ReturnedObject) *ReturnedObject = Object; - OBTRACE("OBTRACE - %s - Returning Handle: %lx HC LC %lx %lx\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - Returning Handle: %lx HC LC %lx %lx\n", __FUNCTION__, Handle, ObjectHeader->HandleCount, @@ -857,7 +865,8 @@ PHANDLE_TABLE_ENTRY HandleTableEntry; NTSTATUS Status; PAGED_CODE(); - OBTRACE("OBTRACE - %s - Closing handle: %lx\n", __FUNCTION__, Handle); + OBTRACE(OB_HANDLE_DEBUG, + "%s - Closing handle: %lx\n", __FUNCTION__, Handle); /* Check if we're dealing with a kernel handle */ if (ObIsKernelHandle(Handle, AccessMode)) @@ -924,7 +933,8 @@ } /* Return status */ - OBTRACE("OBTRACE - %s - Closed handle: %lx S: %lx\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - Closed handle: %lx S: %lx\n", __FUNCTION__, Handle, Status); return Status; } @@ -1213,7 +1223,8 @@ PHANDLE_TABLE HandleTable = NULL; OBJECT_HANDLE_INFORMATION HandleInformation; PAGED_CODE(); - OBTRACE("OBTRACE - %s - Duplicating handle: %lx for %p into %p\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - Duplicating handle: %lx for %p into %p\n", __FUNCTION__, SourceHandle, SourceProcess, @@ -1376,7 +1387,8 @@ if (TargetHandle) *TargetHandle = NewHandle; /* Return status */ - OBTRACE("OBTRACE - %s - Duplicated handle: %lx for %p into %p. Source: %p HC PC %lx %lx\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - Duplicated handle: %lx for %p into %p. Source: %p HC PC %lx %lx\n", __FUNCTION__, NewHandle, SourceProcess, @@ -1534,7 +1546,8 @@ Quickie: ObpReleaseCapturedAttributes(&ObjectCreateInfo); if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); - OBTRACE("OBTRACE: %s returning Object with PC S: %lx %lx\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s returning Object with PC S: %lx %lx\n", __FUNCTION__, OBJECT_TO_OBJECT_HEADER(Object)->PointerCount, Status); @@ -1633,7 +1646,8 @@ ObDereferenceObject(Object); /* Return */ - OBTRACE("OBTRACE: %s returning Object with PC S: %lx %lx\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - returning Object with PC S: %lx %lx\n", __FUNCTION__, OBJECT_TO_OBJECT_HEADER(Object)->PointerCount, Status); @@ -1993,11 +2007,12 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - OBTRACE("OBTRACE - %s - Duplicating handle: %lx for %lx into %lx.\n", - __FUNCTION__, - SourceHandle, - SourceProcessHandle, - TargetProcessHandle); + OBTRACE(OB_HANDLE_DEBUG, + "%s - Duplicating handle: %lx for %lx into %lx.\n", + __FUNCTION__, + SourceHandle, + SourceProcessHandle, + TargetProcessHandle); if((TargetHandle) && (PreviousMode != KernelMode)) { @@ -2083,7 +2098,8 @@ } /* Dereference the processes */ - OBTRACE("OBTRACE - %s - Duplicated handle: %lx into %lx S %lx\n", + OBTRACE(OB_HANDLE_DEBUG, + "%s - Duplicated handle: %lx into %lx S %lx\n", __FUNCTION__, hTarget, TargetProcessHandle, Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Mon Jun 12 09:58:08 2006 @@ -38,6 +38,7 @@ }; PDEVICE_MAP ObSystemDeviceMap = NULL; +ULONG ObpTraceLevel = OB_NAMESPACE_DEBUG; /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Mon Jun 12 09:58:08 2006 @@ -106,280 +106,433 @@ ObFindObject(IN HANDLE RootHandle, IN PUNICODE_STRING ObjectName, IN ULONG Attributes, - IN KPROCESSOR_MODE PreviousMode, + IN KPROCESSOR_MODE AccessMode, IN PVOID *ReturnedObject, IN POBJECT_TYPE ObjectType, IN POBP_LOOKUP_CONTEXT Context, IN PACCESS_STATE AccessState, IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, IN PVOID ParseContext, - IN PVOID Insert) + OUT PVOID ExpectedObject) { - PVOID NextObject; - PVOID CurrentObject; - PVOID RootObject; + PVOID RootDirectory; + PVOID CurrentDirectory = NULL; + PVOID CurrentObject = NULL; POBJECT_HEADER CurrentHeader; NTSTATUS Status = STATUS_SUCCESS; - PWSTR current; - UNICODE_STRING PathString; - UNICODE_STRING CurrentUs; - UNICODE_STRING Path; - PUNICODE_STRING RemainingPath = &Path; - + PVOID NewName; + POBJECT_HEADER_NAME_INFO ObjectNameInfo; + UNICODE_STRING RemainingPath, PartName; + BOOLEAN InsideRoot = FALSE; + OB_PARSE_METHOD ParseRoutine; PAGED_CODE(); - DPRINT("ObFindObject(ObjectCreateInfo %x, ReturnedObject %x, " - "RemainingPath %x)\n",ObjectCreateInfo,ReturnedObject,RemainingPath); - - RtlInitUnicodeString (RemainingPath, NULL); - - if (RootHandle == NULL) - { - ObReferenceObjectByPointer(NameSpaceRoot, - DIRECTORY_TRAVERSE, - NULL, - PreviousMode); - CurrentObject = NameSpaceRoot; + /* Assume failure */ + OBTRACE(OB_NAMESPACE_DEBUG, + "%s - Finding Object: %wZ. Expecting: %p\n", + __FUNCTION__, + ObjectName, + ExpectedObject); + *ReturnedObject = NULL; + + /* Check if we got a Root Directory */ + if (RootHandle) + { + /* We did. Reference it */ + Status = ObReferenceObjectByHandle(RootHandle, + 0, + NULL, + AccessMode, + &RootDirectory, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Get the header */ + CurrentHeader = OBJECT_TO_OBJECT_HEADER(RootDirectory); + + /* The name cannot start with a separator, unless this is a file */ + if ((ObjectName->Buffer) && + (ObjectName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR) && + (CurrentHeader->Type != IoFileObjectType)) + { + /* The syntax is bad, so fail this request */ + ObDereferenceObject(RootDirectory); + return STATUS_OBJECT_PATH_SYNTAX_BAD; + } + + /* Don't parse a Directory */ + if (CurrentHeader->Type != ObDirectoryType) + { + /* Make sure the Object Type has a parse routine */ + ParseRoutine = CurrentHeader->Type->TypeInfo.ParseProcedure; + if (!ParseRoutine) + { + /* We can't parse a name if we don't have a parse routine */ + ObDereferenceObject(RootDirectory); + return STATUS_INVALID_HANDLE; + } + + /* Now parse */ + while (TRUE) + { + /* Start with the full name */ + RemainingPath = *ObjectName; + + /* Call the Parse Procedure */ + Status = ParseRoutine(RootDirectory, + ObjectType, + AccessState, + AccessMode, + Attributes, + ObjectName, + &RemainingPath, + ParseContext, + SecurityQos, + &CurrentObject); + + /* Check for success or failure, so not reparse */ + if ((Status != STATUS_REPARSE) && + (Status != STATUS_REPARSE_OBJECT)) + { + /* Check for failure */ + if (!NT_SUCCESS(Status)) + { + /* Parse routine might not have cleared this, do it */ + CurrentObject = NULL; + } + else if (!CurrentObject) + { + /* Modify status to reflect failure inside Ob */ + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + + /* We're done, return the status and object */ + *ReturnedObject = CurrentObject; + ObDereferenceObject(RootDirectory); + return Status; + } + else if ((!ObjectName->Length) || + (!ObjectName->Buffer) || + (ObjectName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR)) + { + /* Reparsed to the root directory, so start over */ + ObDereferenceObject(RootDirectory); + RootDirectory = NameSpaceRoot; + + /* Don't use this anymore, since we're starting at root */ + RootHandle = NULL; + break; + } + } + } + else if (!(ObjectName->Length) || !(ObjectName->Buffer)) + { + /* Just return the Root Directory if we didn't get a name*/ + Status = ObReferenceObjectByPointer(RootDirectory, + 0, + ObjectType, + AccessMode); + if (NT_SUCCESS(Status)) *ReturnedObject = RootDirectory; + ObDereferenceObject(RootDirectory); + return Status; + } } else { - Status = ObReferenceObjectByHandle(RootHandle, - 0, - NULL, - PreviousMode, - &CurrentObject, - NULL); - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - - if (ObjectName->Length == 0 || - ObjectName->Buffer[0] == UNICODE_NULL) - { - *ReturnedObject = CurrentObject; - return STATUS_SUCCESS; - } - - if (RootHandle == NULL && - ObjectName->Buffer[0] != L'\\') - { - ObDereferenceObject (CurrentObject); - DPRINT1("failed\n"); - return STATUS_UNSUCCESSFUL; - } - - /* Create a zero-terminated copy of the object name */ - PathString.Length = ObjectName->Length; - PathString.MaximumLength = ObjectName->Length + sizeof(WCHAR); - PathString.Buffer = ExAllocatePool (NonPagedPool, - PathString.MaximumLength); - if (PathString.Buffer == NULL) - { - ObDereferenceObject (CurrentObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlCopyMemory (PathString.Buffer, - ObjectName->Buffer, - ObjectName->Length); - PathString.Buffer[PathString.Length / sizeof(WCHAR)] = UNICODE_NULL; - - current = PathString.Buffer; - - RootObject = CurrentObject; - if (ObjectType == ObSymbolicLinkType) - Attributes |= OBJ_OPENLINK; - + /* We did not get a Root Directory, so use the root */ + RootDirectory = NameSpaceRoot; + + /* It must start with a path separator */ + if (!(ObjectName->Length) || + !(ObjectName->Buffer) || + (ObjectName->Buffer[0] != OBJ_NAME_PATH_SEPARATOR)) + { + /* This name is invalid, so fail */ + return STATUS_OBJECT_PATH_SYNTAX_BAD; + } + + /* Check if the name is only the path separator */ + if (ObjectName->Length == sizeof(OBJ_NAME_PATH_SEPARATOR)) + { + /* So the caller only wants the root directory; do we have one? */ + if (!RootDirectory) + { + /* This must be the first time we're creating it... right? */ + if (ExpectedObject) + { + /* Yes, so return it to ObInsert so that it can create it */ + Status = ObReferenceObjectByPointer(ExpectedObject, + 0, + ObjectType, + AccessMode); + if (NT_SUCCESS(Status)) *ReturnedObject = ExpectedObject; + return Status; + } + else + { + /* This should never really happen */ + ASSERT(FALSE); + return STATUS_INVALID_PARAMETER; + } + } + else + { + /* We do have the root directory, so just return it */ + Status = ObReferenceObjectByPointer(RootDirectory, + 0, + ObjectType, + AccessMode); + if (NT_SUCCESS(Status)) *ReturnedObject = RootDirectory; + return Status; + } + } + } + + /* Save the name */ +ReparseNewDir: + RemainingPath = *ObjectName; + + /* Reparse */ while (TRUE) { + /* Check if we should use the Root Directory */ + if (!InsideRoot) + { + /* Yes, use the root directory and remember that */ + CurrentDirectory = RootDirectory; + InsideRoot = TRUE; + } + + /* Check if the name starts with a path separator */ + if ((RemainingPath.Length) && + (RemainingPath.Buffer[0] == OBJ_NAME_PATH_SEPARATOR)) + { + /* Skip the path separator */ + RemainingPath.Buffer++; + RemainingPath.Length -= sizeof(OBJ_NAME_PATH_SEPARATOR); + } + + /* Find the next Part Name */ + PartName = RemainingPath; + while (RemainingPath.Length) + { + /* Break if we found the \ ending */ + if (RemainingPath.Buffer[0] == OBJ_NAME_PATH_SEPARATOR) break; + + /* Move on */ + RemainingPath.Buffer++; + RemainingPath.Length -= sizeof(OBJ_NAME_PATH_SEPARATOR); + } + + /* Get its size and make sure it's valid */ + if (!(PartName.Length -= RemainingPath.Length)) + { + Status = STATUS_OBJECT_NAME_INVALID; + break; + } + + /* Do the look up */ + Context->DirectoryLocked = TRUE; + Context->Directory = CurrentDirectory; + CurrentObject = ObpLookupEntryDirectory(CurrentDirectory, + &PartName, + Attributes, + FALSE, + Context); + if (!CurrentObject) + { + /* We didn't find it... do we still have a path? */ + if (RemainingPath.Length) + { + /* Then tell the caller the path wasn't found */ + Status = STATUS_OBJECT_PATH_NOT_FOUND; + break; + } + else if (!ExpectedObject) + { + /* Otherwise, we have a path, but the name isn't valid */ + Status = STATUS_OBJECT_NAME_NOT_FOUND; + break; + } + + /* Reference newly to be inserted object */ + ObReferenceObject(ExpectedObject); + CurrentHeader = OBJECT_TO_OBJECT_HEADER(ExpectedObject); + + /* Create Object Name */ + NewName = ExAllocatePoolWithTag(NonPagedPool, + PartName.MaximumLength, + OB_NAME_TAG); + ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(CurrentHeader); + + /* Copy the Name */ + RtlMoveMemory(NewName, PartName.Buffer, PartName.MaximumLength); + + /* Free old name */ + if (ObjectNameInfo->Name.Buffer) ExFreePool(ObjectNameInfo->Name.Buffer); + + /* Write new one */ + ObjectNameInfo->Name.Buffer = NewName; + ObjectNameInfo->Name.Length = PartName.Length; + ObjectNameInfo->Name.MaximumLength = PartName.MaximumLength; + + /* Rereference the Directory and insert */ + ObReferenceObject(CurrentDirectory); + ObpInsertEntryDirectory(CurrentDirectory, Context, CurrentHeader); + + /* Return Status and the Expected Object */ + Status = STATUS_SUCCESS; + CurrentObject = ExpectedObject; + + /* Get out of here */ + break; + } + +Reparse: + /* We found it, so now get its header */ CurrentHeader = OBJECT_TO_OBJECT_HEADER(CurrentObject); - /* Loop as long as we're dealing with a directory */ - while (CurrentHeader->Type == ObDirectoryType) - { - PWSTR Start, End; - PVOID FoundObject; - UNICODE_STRING StartUs; - NextObject = NULL; - - if (!current) goto Next; - - Start = current; - if (*Start == L'\\') Start++; - - End = wcschr(Start, L'\\'); - if (End != NULL) *End = 0; - - RtlInitUnicodeString(&StartUs, Start); - Context->DirectoryLocked = TRUE; - Context->Directory = CurrentObject; - FoundObject = ObpLookupEntryDirectory(CurrentObject, &StartUs, Attributes, FALSE, Context); - if (FoundObject == NULL) - { - if (End != NULL) - { - *End = L'\\'; - } - goto Next; - } - - ObReferenceObjectByPointer(FoundObject, - STANDARD_RIGHTS_REQUIRED, - NULL, - UserMode); - if (End != NULL) - { - *End = L'\\'; - current = End; + /* + * Check for a parse Procedure, but don't bother to parse for an insert + * unless it's a Symbolic Link, in which case we MUST parse + */ + ParseRoutine = CurrentHeader->Type->TypeInfo.ParseProcedure; + if (ParseRoutine && + (!ExpectedObject || ParseRoutine == ObpParseSymbolicLink)) + { + /* Use the Root Directory next time */ + InsideRoot = FALSE; + + /* Call the Parse Procedure */ + Status = ParseRoutine(CurrentObject, + ObjectType, + AccessState, + AccessMode, + Attributes, + ObjectName, + &RemainingPath, + ParseContext, + SecurityQos, + &CurrentObject); + + /* Check if we have to reparse */ + if ((Status == STATUS_REPARSE) || + (Status == STATUS_REPARSE_OBJECT)) + { + /* Start over from root if we got sent back there */ + if ((Status == STATUS_REPARSE_OBJECT) || + (ObjectName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR)) + { + /* Check if we got a root directory */ + if (RootHandle) + { + /* Stop using it, because we have a new directory now */ + ObDereferenceObject(RootDirectory); + RootHandle = NULL; + } + + /* Start at Root */ + RootDirectory = NameSpaceRoot; + + /* Check for reparse status */ + if (Status == STATUS_REPARSE_OBJECT) + { + /* Did we actually get an object to which to reparse? */ + if (!CurrentObject) + { + /* We didn't, so set a failure status */ + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + else + { + /* We did, so we're free to parse the new object */ + InsideRoot = TRUE; + goto Reparse; + } + } + + /* Restart the search */ + goto ReparseNewDir; + } + else if (RootDirectory == NameSpaceRoot) + { + /* We got STATUS_REPARSE but are at the Root Directory */ + CurrentObject = NULL; + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + } + else if (!NT_SUCCESS(Status)) + { + /* Total failure */ + CurrentObject = NULL; + } + else if (!CurrentObject) + { + /* We didn't reparse but we didn't find the Object Either */ + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + + /* Break out of the loop */ + break; + } + else + { + /* No parse routine...do we still have a remaining name? */ + if (!RemainingPath.Length) + { + /* Are we creating an object? */ + if (!ExpectedObject) + { + /* We don't... reference the Object */ + Status = ObReferenceObjectByPointer(CurrentObject, + 0, + ObjectType, + AccessMode); + if (!NT_SUCCESS(Status)) CurrentObject = NULL; + } + + /* And get out of the reparse loop */ + break; } else { - current = NULL; - } - - NextObject = FoundObject; - -Next: - if (NextObject == NULL) - { - break; - } - ObDereferenceObject(CurrentObject); - CurrentObject = NextObject; - CurrentHeader = OBJECT_TO_OBJECT_HEADER(CurrentObject); - } - - if (CurrentHeader->Type->TypeInfo.ParseProcedure == NULL) - { - DPRINT("Current object can't parse\n"); - break; - } - - RtlInitUnicodeString(&CurrentUs, current); - Status = CurrentHeader->Type->TypeInfo.ParseProcedure(CurrentObject, - CurrentHeader->Type, - AccessState, - PreviousMode, - Attributes, - &PathString, - &CurrentUs, - ParseContext, - SecurityQos, - &NextObject); - current = CurrentUs.Buffer; - if (Status == STATUS_REPARSE) - { - /* reparse the object path */ - NextObject = NameSpaceRoot; - current = PathString.Buffer; - - ObReferenceObjectByPointer(NextObject, - DIRECTORY_TRAVERSE, - NULL, - PreviousMode); - } - - - if (NextObject == NULL) - { - break; - } - ObDereferenceObject(CurrentObject); - CurrentObject = NextObject; - if (!current) break; - } - - if (current) - { - RtlpCreateUnicodeString (RemainingPath, current, NonPagedPool); - } - - RtlFreeUnicodeString (&PathString); - *ReturnedObject = CurrentObject; - - /* - * Icky hack: put the code that was in ObInsertObject here so that - * we can get rid of the "RemainingPath" stuff, which shouldn't - * be exposed outside of here. - * Also makes the interface closer to NT parsing, and will make the - * eventual changes easier to deal with - */ - if (Insert) - { - PVOID FoundObject = NULL; - POBJECT_HEADER Header = OBJECT_TO_OBJECT_HEADER(Insert); - POBJECT_HEADER FoundHeader = NULL; - FoundObject = *ReturnedObject; - if (FoundObject) - { - FoundHeader = OBJECT_TO_OBJECT_HEADER(FoundObject); - } - - if (FoundHeader && RemainingPath->Buffer == NULL) - { - DPRINT("Object exists\n"); - ObDereferenceObject(FoundObject); - return STATUS_OBJECT_NAME_COLLISION; - } - - /* - * MiniHack - * If we still have a remaining path on a directory object, but we are - * a file object, then fail, because this means the file doesn't exist - */ - if ((RemainingPath->Buffer) && - (FoundHeader && FoundHeader->Type == ObDirectoryType) && - (Header->Type == IoFileObjectType)) - { - /* Hack */ - RtlFreeUnicodeString(RemainingPath); - *ReturnedObject = NULL; - return STATUS_OBJECT_PATH_NOT_FOUND; - } - - if (FoundHeader && FoundHeader->Type == ObDirectoryType && - RemainingPath->Buffer) - { - /* The name was changed so let's update it */ - PVOID NewName; - PWSTR BufferPos = RemainingPath->Buffer; - ULONG Delta = 0; - POBJECT_HEADER_NAME_INFO ObjectNameInfo; - - ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(Header); - - if (BufferPos[0] == L'\\') - { - BufferPos++; - Delta = sizeof(WCHAR); - } - NewName = ExAllocatePool(NonPagedPool, RemainingPath->MaximumLength - Delta); - RtlMoveMemory(NewName, BufferPos, RemainingPath->MaximumLength - Delta); - if (ObjectNameInfo->Name.Buffer) ExFreePool(ObjectNameInfo->Name.Buffer); - ObjectNameInfo->Name.Buffer = NewName; - ObjectNameInfo->Name.Length = RemainingPath->Length - Delta; - ObjectNameInfo->Name.MaximumLength = RemainingPath->MaximumLength - Delta; - ObpInsertEntryDirectory(FoundObject, Context, Header); - } - - RtlFreeUnicodeString(RemainingPath); - *ReturnedObject = Insert; - } - else - { - /* ROS Hack */ - DPRINT("REmaining path: %wZ\n", RemainingPath); - if (RemainingPath->Buffer != NULL) - { - if (wcschr(RemainingPath->Buffer + 1, L'\\') == NULL) - Status = STATUS_OBJECT_NAME_NOT_FOUND; - else - Status =STATUS_OBJECT_PATH_NOT_FOUND; - } - } - + /* We still have a name; check if this is a directory object */ + if (CurrentHeader->Type == ObDirectoryType) + { + /* Restart from this directory */ + CurrentDirectory = CurrentObject; + } + else + { + /* We still have a name, but no parse routine for it */ + Status = STATUS_OBJECT_TYPE_MISMATCH; + CurrentObject = NULL; + break; + } + } + } + } + + /* Write what we found, and if it's null, check if we got success */ + if (!(*ReturnedObject = CurrentObject) && (NT_SUCCESS(Status))) + { + /* Nothing found... but we have success. Correct the status code */ + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + + /* Check if we had a root directory */ + if (RootHandle) + { + /* Dereference it */ + ObDereferenceObject(RootDirectory); + } + + /* Return status to caller */ + OBTRACE(OB_NAMESPACE_DEBUG, + "%s - Found Object: %p. Expected: %p\n", + __FUNCTION__, + *ReturnedObject, + ExpectedObject); return Status; } Modified: trunk/reactos/ntoskrnl/ob/symlink.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/symlink.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/symlink.c (original) +++ trunk/reactos/ntoskrnl/ob/symlink.c Mon Jun 12 09:58:08 2006 @@ -100,24 +100,45 @@ POBJECT_SYMBOLIC_LINK SymlinkObject = (POBJECT_SYMBOLIC_LINK)ParsedObject; PUNICODE_STRING TargetPath; PWSTR NewTargetPath; - ULONG LengthUsed, MaximumLength, RemainLength; - PWSTR *RemainingPath = &RemainingName->Buffer; - - /* - * Stop parsing if the entire path has been parsed and - * the desired object is a symbolic link object. - */ - if (((*RemainingPath == NULL) || (**RemainingPath == 0)) && - (Attributes & OBJ_OPENLINK)) - { - *NextObject = NULL; - return(STATUS_SUCCESS); + ULONG LengthUsed, MaximumLength; + NTSTATUS Status; + + /* Assume failure */ + *NextObject = NULL; + + /* Check if we're out of name to parse */ + if (!RemainingName->Length) + { + /* Check if we got an object type */ + if (ObjectType) + { + /* Reference the object only */ + Status = ObReferenceObjectByPointer(ParsedObject, + 0, + ObjectType, + AccessMode); + if (NT_SUCCESS(Status)) + { + /* Return it */ + *NextObject = ParsedObject; + } + + if ((NT_SUCCESS(Status)) || (Status != STATUS_OBJECT_TYPE_MISMATCH)) + { + /* Fail */ + return Status; + } + } + } + else if (RemainingName->Buffer[0] != OBJ_NAME_PATH_SEPARATOR) + { + /* Symbolic links must start with a backslash */ + return STATUS_OBJECT_TYPE_MISMATCH; } /* Set the target path and length */ TargetPath = &SymlinkObject->LinkTarget; - RemainLength = *RemainingPath ? wcslen(*RemainingPath) * sizeof(WCHAR) : 0; - LengthUsed = TargetPath->Length + RemainLength; + LengthUsed = TargetPath->Length + RemainingName->Length; /* Optimization: check if the new name is shorter */ if (FullPath->MaximumLength <= LengthUsed) @@ -136,12 +157,12 @@ } /* Make sure we have a length */ - if (RemainLength) + if (RemainingName->Length) { /* Copy the new path */ RtlMoveMemory((PVOID)((ULONG_PTR)NewTargetPath + TargetPath->Length), - *RemainingPath, - RemainLength); + RemainingName->Buffer, + RemainingName->Length); } /* Copy the target path and null-terminate it */ @@ -156,10 +177,7 @@ FullPath->MaximumLength = MaximumLength; FullPath->Buffer = NewTargetPath; - /* Reinitialize RemainingPath for reparsing */ - *RemainingPath = FullPath->Buffer; - - *NextObject = NULL; + /* Tell the parse routine to start reparsing */ return STATUS_REPARSE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Mon Jun 12 09:58:08 2006 @@ -133,7 +133,6 @@ /* Reference the desktop and return it */ ObReferenceObject(Desktop); *Object = Desktop; - RemainingName->Buffer = NULL; // => ROS Parse routines need to do this return Status; } } @@ -168,7 +167,6 @@ /* Set the desktop object and return success */ *Object = Desktop; - RemainingName->Buffer = NULL; // => ROS Parse routines need to do this return STATUS_SUCCESS; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Mon Jun 12 09:58:08 2006 @@ -126,8 +126,8 @@ } /* Reference the window station and return */ - //ObReferenceObject(Object); - //*NextObject = Object; => ROS Parse routines don't need to do this + ObReferenceObject(Parameters->ParseObject); + *Parameters->Object = Parameters->ParseObject; return STATUS_SUCCESS; } @@ -149,10 +149,8 @@ /* * Check if we are parsing a desktop. - * FIXME: ROS Sends the wrong Object Type. The parsed object's type - * should be sent, not the parsed parent's. */ - if (Parameters->ObjectType == ExWindowStationObjectType) + if (Parameters->ObjectType == ExDesktopObjectType) { /* Then call the desktop parse routine */ return IntDesktopObjectParse(Parameters->ParseObject,

1 0

[ion] 22318: - Fix a typo that had broken the build -- sorry.
by ion＠svn.reactos.org 11 Jun '06

11 Jun '06

Author: ion Date: Mon Jun 12 02:32:12 2006 New Revision: 22318 URL: http://svn.reactos.ru/svn/reactos?rev=22318&view=rev Log: - Fix a typo that had broken the build -- sorry. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/i… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Mon Jun 12 02:32:12 2006 @@ -489,7 +489,7 @@ NTAPI IopParseDevice( IN PVOID ParseObject, - IN POBJECT_TYPE ObjectType, + IN PVOID ObjectType, IN OUT PACCESS_STATE AccessState, IN KPROCESSOR_MODE AccessMode, IN ULONG Attributes, @@ -504,7 +504,7 @@ NTAPI IopParseFile( IN PVOID ParseObject, - IN POBJECT_TYPE ObjectType, + IN PVOID ObjectType, IN OUT PACCESS_STATE AccessState, IN KPROCESSOR_MODE AccessMode, IN ULONG Attributes, Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=2231… ============================================================================== --- trunk/reactos/ntoskrnl/io/file.c (original) +++ trunk/reactos/ntoskrnl/io/file.c Mon Jun 12 02:32:12 2006 @@ -29,7 +29,7 @@ NTSTATUS NTAPI IopParseDevice(IN PVOID ParseObject, - IN POBJECT_TYPE ObjectType, + IN PVOID ObjectType, IN OUT PACCESS_STATE AccessState, IN KPROCESSOR_MODE AccessMode, IN ULONG Attributes, @@ -117,7 +117,7 @@ NTSTATUS NTAPI IopParseFile(IN PVOID ParseObject, - IN POBJECT_TYPE ObjectType, + IN PVOID ObjectType, IN OUT PACCESS_STATE AccessState, IN KPROCESSOR_MODE AccessMode, IN ULONG Attributes,

1 0

[ion] 22317: - Bring out the champagne... one of my first-ever and most ancient ReactOS TODOs: the IopCreateFile hack has been totally removed and we now have a file/device parse routine. It's still nothing like NT's but it's not a hack anymore, and actually works like it should.
by ion＠svn.reactos.org 11 Jun '06

11 Jun '06

Author: ion Date: Mon Jun 12 02:26:54 2006 New Revision: 22317 URL: http://svn.reactos.ru/svn/reactos?rev=22317&view=rev Log: - Bring out the champagne... one of my first-ever and most ancient ReactOS TODOs: the IopCreateFile hack has been totally removed and we now have a file/device parse routine. It's still nothing like NT's but it's not a hack anymore, and actually works like it should. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/file.c trunk/reactos/ntoskrnl/io/iomgr.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/i… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Mon Jun 12 02:26:54 2006 @@ -486,12 +486,33 @@ /* file.c */ NTSTATUS -STDCALL -IopCreateFile( - PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - POBJECT_CREATE_INFORMATION ObjectAttributes +NTAPI +IopParseDevice( + IN PVOID ParseObject, + IN POBJECT_TYPE ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING CompleteName, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *Object +); + +NTSTATUS +NTAPI +IopParseFile( + IN PVOID ParseObject, + IN POBJECT_TYPE ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING CompleteName, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *Object ); VOID Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=2231… ============================================================================== --- trunk/reactos/ntoskrnl/io/file.c (original) +++ trunk/reactos/ntoskrnl/io/file.c Mon Jun 12 02:26:54 2006 @@ -39,6 +39,10 @@ IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, OUT PVOID *Object) { + POPEN_PACKET OpenPacket = (POPEN_PACKET)Context; + PDEVICE_OBJECT DeviceObject; + NTSTATUS Status; + PFILE_OBJECT FileObject; DPRINT("IopParseDevice:\n" "DeviceObject : %p, Type : %p, TypeName : %wZ\n" "FileObject : %p, Type : %p, TypeName : %wZ\n" @@ -52,11 +56,61 @@ CompleteName, RemainingName); - /* - * Just clear the object and return success, and ObFindObject will behave - * just as if we had no parse procedure, so we can debug in peace. - */ - *Object = NULL; + if (!RemainingName || !RemainingName->Buffer) + { + DeviceObject = ParseObject; + + Status = ObCreateObject(AccessMode, + IoFileObjectType, + NULL, + AccessMode, + NULL, + sizeof(FILE_OBJECT), + 0, + 0, + (PVOID*)&FileObject); + /* Set File Object Data */ + FileObject->DeviceObject = IoGetAttachedDevice(DeviceObject); + + /* HACK */ + FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; + *Object = FileObject; + return STATUS_SUCCESS; + } + + Status = ObCreateObject(AccessMode, + IoFileObjectType, + NULL, + AccessMode, + NULL, + sizeof(FILE_OBJECT), + 0, + 0, + (PVOID*)&FileObject); + + if (ObjectType == IoDeviceObjectType) + { + /* Parent is a device object */ + DeviceObject = IoGetAttachedDevice((PDEVICE_OBJECT)ParseObject); + if (DeviceObject->Vpb) + { + if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) + { + Status = IoMountVolume(DeviceObject, FALSE); + } + DeviceObject = DeviceObject->Vpb->DeviceObject; + } + } + else + { + FileObject->RelatedFileObject = OpenPacket->RelatedFileObject; + DeviceObject = OpenPacket->RelatedFileObject->DeviceObject; + } + + RtlCreateUnicodeString(&FileObject->FileName, RemainingName->Buffer); + FileObject->DeviceObject = DeviceObject; + *Object = FileObject; + RemainingName->Buffer = NULL; // ros hack return STATUS_SUCCESS; } @@ -74,23 +128,11 @@ OUT PVOID *Object) { PVOID DeviceObject; + OPEN_PACKET OpenPacket; /* Get the device object */ DeviceObject = IoGetRelatedDeviceObject(ParseObject); - Context = ParseObject; - - DPRINT("IopParseFile:\n" - "DeviceObject : %p, Type : %p, TypeName : %wZ\n" - "FileObject : %p, Type : %p, TypeName : %wZ\n" - "CompleteName : %wZ, RemainingName : %wZ\n", - DeviceObject, - OBJECT_TO_OBJECT_HEADER(DeviceObject)->Type, - &OBJECT_TO_OBJECT_HEADER(DeviceObject)->Type->Name, - ParseObject, - ObjectType, - &ObjectType->Name, - CompleteName, - RemainingName); + OpenPacket.RelatedFileObject = ParseObject; /* Call the main routine */ return IopParseDevice(DeviceObject, @@ -100,76 +142,9 @@ Attributes, CompleteName, RemainingName, - Context, + &OpenPacket, SecurityQos, Object); - -} - -/* - * NAME INTERNAL - * IopCreateFile - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - */ -NTSTATUS -STDCALL -IopCreateFile(PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - POBJECT_CREATE_INFORMATION ObjectCreateInfo) -{ - PDEVICE_OBJECT DeviceObject; - PFILE_OBJECT FileObject = (PFILE_OBJECT) ObjectBody; - POBJECT_TYPE ParentObjectType; - NTSTATUS Status; - - ParentObjectType = OBJECT_TO_OBJECT_HEADER(Parent)->Type; - if (ParentObjectType == IoDeviceObjectType) - { - /* Parent is a device object */ - DeviceObject = IoGetAttachedDevice((PDEVICE_OBJECT)Parent); - if (DeviceObject->Vpb) - { - if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) - { - DPRINT("Mount the logical volume\n"); - Status = IoMountVolume(DeviceObject, FALSE); - DPRINT("Status %x\n", Status); - } - DeviceObject = DeviceObject->Vpb->DeviceObject; - } - } - else - { - DeviceObject = ((PFILE_OBJECT)Parent)->DeviceObject; - FileObject->RelatedFileObject = (PFILE_OBJECT)Parent; - } - -#if 0 - DbgPrint("--------------------- Creating File ---------------------\n"); - DbgPrint("Parent ObjectType: %wZ\n" - "Device Object: %p\n" - "File Object: %p\n" - "Device Name: %wZ\n" - "Remaining Path: %S\n", - &ParentObjectType->Name, - DeviceObject, - FileObject, - &DeviceObject->DriverObject->DriverName, - RemainingPath); - DbgPrint("--------------------- Created File ----------------------\n"); -#endif - - RtlCreateUnicodeString(&FileObject->FileName, RemainingPath); - FileObject->DeviceObject = DeviceObject; - return STATUS_SUCCESS; } VOID @@ -847,7 +822,7 @@ IN ULONG Options) { PFILE_OBJECT FileObject = NULL; - PDEVICE_OBJECT DeviceObject; + //PDEVICE_OBJECT DeviceObject; PIRP Irp; PEXTENDED_IO_STACK_LOCATION StackLoc; IO_SECURITY_CONTEXT SecurityContext; @@ -940,6 +915,8 @@ DPRINT1("FIXME: IO_CHECK_CREATE_PARAMETERS not yet supported!\n"); } + RtlMapGenericMask(&DesiredAccess, &IoFileObjectType->TypeInfo.GenericMapping); + /* First try to open an existing named object */ Status = ObOpenObjectByName(ObjectAttributes, NULL, @@ -949,69 +926,14 @@ NULL, &LocalHandle); - // - // start stuff that should be in IopParseDevice - // - if (NT_SUCCESS(Status)) - { - Status = ObReferenceObjectByHandle(LocalHandle, - DesiredAccess, - NULL, - KernelMode, - (PVOID*)&DeviceObject, - NULL); - DPRINT("FileExisted: %wZ %lx %p\n", ObjectAttributes->ObjectName, LocalHandle, DeviceObject); - ZwClose(LocalHandle); - - /* FIXME: wt... */ - Status = ObCreateObject(KernelMode, - IoFileObjectType, - NULL, - KernelMode, - NULL, - sizeof(FILE_OBJECT), - 0, - 0, - (PVOID*)&FileObject); - - /* Set File Object Data */ - FileObject->DeviceObject = IoGetAttachedDevice(DeviceObject); - - /* HACK */ - FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; - DPRINT("%p\n", FileObject->DeviceObject); - ObDereferenceObject (DeviceObject); - } - - if (FileObject == NULL) - { - Status = ObCreateObject(AccessMode, - IoFileObjectType, - ObjectAttributes, - AccessMode, - NULL, - sizeof(FILE_OBJECT), - 0, - 0, - (PVOID*)&FileObject); - } - - RtlMapGenericMask(&DesiredAccess, - &OBJECT_TO_OBJECT_HEADER(FileObject)->Type->TypeInfo.GenericMapping); - - Status = ObInsertObject ((PVOID)FileObject, - NULL, - DesiredAccess, - 0, - NULL, - &LocalHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObInsertObject() failed! (Status %lx)\n", Status); - ObMakeTemporaryObject(FileObject); - ObDereferenceObject (FileObject); - return Status; - } + ObReferenceObjectByHandle(LocalHandle, + DesiredAccess, + NULL, + KernelMode, + (PVOID*)&FileObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; + // // stop stuff that should be in IopParseDevice // Modified: trunk/reactos/ntoskrnl/io/iomgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr.c?rev=223… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr.c Mon Jun 12 02:26:54 2006 @@ -51,31 +51,6 @@ #pragma alloc_text(INIT, IoInit3) #endif -NTSTATUS -NTAPI -IopParseFile(IN PVOID ParseObject, - IN PVOID ObjectType, - IN OUT PACCESS_STATE AccessState, - IN KPROCESSOR_MODE AccessMode, - IN ULONG Attributes, - IN OUT PUNICODE_STRING CompleteName, - IN OUT PUNICODE_STRING RemainingName, - IN OUT PVOID Context OPTIONAL, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, - OUT PVOID *Object); - -NTSTATUS -NTAPI -IopParseDevice(IN PVOID ParseObject, - IN PVOID ObjectType, - IN OUT PACCESS_STATE AccessState, - IN KPROCESSOR_MODE AccessMode, - IN ULONG Attributes, - IN OUT PUNICODE_STRING CompleteName, - IN OUT PUNICODE_STRING RemainingName, - IN OUT PVOID Context OPTIONAL, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, - OUT PVOID *Object); /* INIT FUNCTIONS ************************************************************/ VOID Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Mon Jun 12 02:26:54 2006 @@ -338,14 +338,6 @@ *ReturnedObject = NULL; return STATUS_OBJECT_PATH_NOT_FOUND; } - else if (Header->Type == IoFileObjectType) - { - /* Otherwise, call the hacked parse routine which will go away soon */ - Status = IopCreateFile(&Header->Body, - FoundObject, - RemainingPath->Buffer, - NULL); - } if (FoundHeader && FoundHeader->Type == ObDirectoryType && RemainingPath->Buffer)

1 0

[ekohl] 22316: Implement CM_Delete_DevNode_Key and add CM_Delete_DevNode_Key_Ex stub.
by ekohl＠svn.reactos.org 11 Jun '06

11 Jun '06

Author: ekohl Date: Mon Jun 12 01:56:08 2006 New Revision: 22316 URL: http://svn.reactos.ru/svn/reactos?rev=22316&view=rev Log: Implement CM_Delete_DevNode_Key and add CM_Delete_DevNode_Key_Ex stub. Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/include/ddk/cfgmgr32.h trunk/reactos/include/reactos/wine/cfgmgr32.h Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr32… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Mon Jun 12 01:56:08 2006 @@ -43,8 +43,8 @@ ;CM_Create_Range_List CM_Delete_Class_Key(a)8=SETUPAPI.CM_Delete_Class_Key CM_Delete_Class_Key_Ex(a)12=SETUPAPI.CM_Delete_Class_Key_Ex -;CM_Delete_DevNode_Key -;CM_Delete_DevNode_Key_Ex +CM_Delete_DevNode_Key(a)12=SETUPAPI.CM_Delete_DevNode_Key +CM_Delete_DevNode_Key_Ex(a)16=SETUPAPI.CM_Delete_DevNode_Key_Ex ;CM_Delete_Range ;CM_Detect_Resource_Conflict ;CM_Detect_Resource_Conflict_Ex Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Mon Jun 12 01:56:08 2006 @@ -444,6 +444,30 @@ return PNP_DeleteClassKey(BindingHandle, szGuidString, ulFlags); +} + +/*********************************************************************** + * CM_Delete_DevNode_Key [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Delete_DevNode_Key( + DEVNODE dnDevNode, ULONG ulHardwareProfile, ULONG ulFlags) +{ + TRACE("%p %lu %lx\n", dnDevNode, ulHardwareProfile, ulFlags); + return CM_Delete_DevNode_Key_Ex(dnDevNode, ulHardwareProfile, ulFlags, + NULL); +} + +/*********************************************************************** + * CM_Delete_DevNode_Key_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Delete_DevNode_Key_Ex( + DEVNODE dnDevNode, ULONG ulHardwareProfile, ULONG ulFlags, + HANDLE hMachine) +{ + FIXME("%p %lu %lx %p\n", + dnDevNode, ulHardwareProfile, ulFlags, hMachine); + + return CR_CALL_NOT_IMPLEMENTED; } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/setupapi… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Mon Jun 12 01:56:08 2006 @@ -27,8 +27,8 @@ @ stub CM_Create_Range_List @ stdcall CM_Delete_Class_Key(ptr long) @ stdcall CM_Delete_Class_Key_Ex(ptr long long) -@ stub CM_Delete_DevNode_Key -@ stub CM_Delete_DevNode_Key_Ex +@ stdcall CM_Delete_DevNode_Key(long long long) +@ stdcall CM_Delete_DevNode_Key_Ex(long long long ptr) @ stub CM_Delete_Range @ stub CM_Detect_Resource_Conflict @ stub CM_Detect_Resource_Conflict_Ex Modified: trunk/reactos/include/ddk/cfgmgr32.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ddk/cfgmgr32.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/cfgmgr32.h (original) +++ trunk/reactos/include/ddk/cfgmgr32.h Mon Jun 12 01:56:08 2006 @@ -827,8 +827,26 @@ IN ULONG ulFlags, IN HANDLE hMachine); -/* FIXME: Obsolete CM_Delete_DevNode_Key */ -/* FIXME: Obsolete CM_Delete_DevNode_Key_Ex */ +CMAPI +CONFIGRET +WINAPI +CM_Delete_DevNode_Key( + IN DEVNODE dnDevNode, + IN ULONG ulHardwareProfile, + IN ULONG ulFlags); + +CMAPI +CONFIGRET +WINAPI +CM_Delete_DevNode_Key_Ex( + IN DEVNODE dnDevNode, + IN ULONG ulHardwareProfile, + IN ULONG ulFlags, + IN HANDLE hMachine); + +#define CM_Delete_DevInst_Key CM_Delete_DevNode_Key +#define CM_Delete_DevInst_Key_Ex CM_Delete_DevNode_Key_Ex + /* FIXME: Obsolete CM_Delete_Range */ /* FIXME: Obsolete CM_Detected_Resource_Conflict */ /* FIXME: Obsolete CM_Detected_Resource_Conflict_Ex */ Modified: trunk/reactos/include/reactos/wine/cfgmgr32.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/reactos/wine/cfgmgr… ============================================================================== --- trunk/reactos/include/reactos/wine/cfgmgr32.h (original) +++ trunk/reactos/include/reactos/wine/cfgmgr32.h Mon Jun 12 01:56:08 2006 @@ -31,6 +31,8 @@ typedef HMACHINE *PHMACHINE; typedef DWORD DEVINST; typedef DEVINST *PDEVINST; +typedef DWORD DEVNODE; +typedef DEVNODE *PDEVNODE; typedef ULONG REGDISPOSITION; typedef CHAR *DEVINSTID_A; @@ -207,6 +209,8 @@ #define CM_Create_DevNode_Ex WINELIB_NAME_AW(CM_Create_DevNode_Ex) CONFIGRET WINAPI CM_Delete_Class_Key( LPGUID, ULONG ); CONFIGRET WINAPI CM_Delete_Class_Key_Ex( LPGUID, ULONG, HANDLE ); +CONFIGRET WINAPI CM_Delete_DevNode_Key( DEVNODE, ULONG, ULONG ); +CONFIGRET WINAPI CM_Delete_DevNode_Key_Ex( DEVNODE, ULONG, ULONG, HANDLE ); CONFIGRET WINAPI CM_Disable_DevNode( DEVINST, ULONG ); CONFIGRET WINAPI CM_Disable_DevNode_Ex( DEVINST, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Disconnect_Machine( HMACHINE );

1 0

[fireball] 22315: Slightly update the doc to make it correspond to nowadays reality
by fireball＠svn.reactos.org 11 Jun '06

11 Jun '06

Author: fireball Date: Mon Jun 12 01:05:25 2006 New Revision: 22315 URL: http://svn.reactos.ru/svn/reactos?rev=22315&view=rev Log: Slightly update the doc to make it correspond to nowadays reality Modified: trunk/reactos/media/doc/HACKING Modified: trunk/reactos/media/doc/HACKING URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/HACKING?rev=22315… ============================================================================== --- trunk/reactos/media/doc/HACKING (original) +++ trunk/reactos/media/doc/HACKING Mon Jun 12 01:05:25 2006 @@ -26,19 +26,14 @@ * Style -There is no coding style used for ReactOS, however the following guidelines -make things easier +There is a coding style used for ReactOS, it's described in a ReactOS's Wiki +page called Coding Style: http://www.reactos.org/wiki/index.php/Coding_Style - Include information at the top of a module about its purpose, contact - information for its programmer and any useful notes. - - Include a comment by each non-trival function describing its arguments, - purpose and any other notes. - - Update the documentation in this directory - -These guidelines are an ideal, no one manages to implement them all the -time, straightforward working code is probably just as good. +However, not all codebase complies with the rules outlined in that page, so +if you need to hack some code which has not been yet formatted, it's wise +to keep the kind of formatting it already has, to make it looking good until +it receives a formatting patch. + * Debugging @@ -105,11 +100,11 @@ There is a mailing list for kernel development, - ros-kernel(a)reactos.com + ros-dev(a)reactos.org - The main developers use a cvs account to coordinate changes, ask - rex (rex(a)lvcablemodem.com) for an account if you are going to be adding - a lot of code. Smaller patches can go to the mailing list or to the + The main developers use a svn account to coordinate changes, ask + Aleksey (aleksey(a)reactos.org) for an account if you are going to be + adding a lot of code. Smaller patches can go to the mailing list or to the relevant developer (usually the comment at the top of a module will have an email address). Regular snapshots are made available for download, see the mailing list for announcements.

1 0

[gedmurphy] 22314: update the comctl32 wine tests
by gedmurphy＠svn.reactos.org 11 Jun '06

11 Jun '06

Author: gedmurphy Date: Sun Jun 11 19:51:13 2006 New Revision: 22314 URL: http://svn.reactos.ru/svn/reactos?rev=22314&view=rev Log: update the comctl32 wine tests Added: trunk/reactos/regtests/winetests/comctl32/comboex.c trunk/reactos/regtests/winetests/comctl32/header.c trunk/reactos/regtests/winetests/comctl32/monthcal.c trunk/reactos/regtests/winetests/comctl32/progress.c trunk/reactos/regtests/winetests/comctl32/propsheet.c trunk/reactos/regtests/winetests/comctl32/propsheet.rc trunk/reactos/regtests/winetests/comctl32/toolbar.c trunk/reactos/regtests/winetests/comctl32/tooltips.c trunk/reactos/regtests/winetests/comctl32/treeview.c trunk/reactos/regtests/winetests/comctl32/updown.c Modified: trunk/reactos/regtests/winetests/comctl32/comctl32.rbuild trunk/reactos/regtests/winetests/comctl32/dpa.c trunk/reactos/regtests/winetests/comctl32/imagelist.c trunk/reactos/regtests/winetests/comctl32/mru.c trunk/reactos/regtests/winetests/comctl32/subclass.c trunk/reactos/regtests/winetests/comctl32/tab.c Added: trunk/reactos/regtests/winetests/comctl32/comboex.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/comboex.c (added) +++ trunk/reactos/regtests/winetests/comctl32/comboex.c Sun Jun 11 19:51:13 2006 @@ -1,0 +1,236 @@ +/* Unit test suite for comboex control. + * + * Copyright 2005 Jason Edmeades + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <windows.h> +#include <commctrl.h> + +#include "wine/test.h" + +static HWND hComboExParentWnd; +static HINSTANCE hMainHinst; +static const char ComboExTestClass[] = "ComboExTestClass"; + +#define MAX_CHARS 100 +static char *textBuffer = NULL; + +static HWND createComboEx(DWORD style) { + return CreateWindowExA(0, WC_COMBOBOXEXA, NULL, style, 0, 0, 300, 300, + hComboExParentWnd, NULL, hMainHinst, NULL); +} + +static LONG addItem(HWND cbex, int idx, LPTSTR text) { + COMBOBOXEXITEM cbexItem; + memset(&cbexItem, 0x00, sizeof(cbexItem)); + cbexItem.mask = CBEIF_TEXT; + cbexItem.iItem = idx; + cbexItem.pszText = text; + cbexItem.cchTextMax = 0; + return (LONG)SendMessage(cbex, CBEM_INSERTITEM, 0,(LPARAM)&cbexItem); +} + +static LONG setItem(HWND cbex, int idx, LPTSTR text) { + COMBOBOXEXITEM cbexItem; + memset(&cbexItem, 0x00, sizeof(cbexItem)); + cbexItem.mask = CBEIF_TEXT; + cbexItem.iItem = idx; + cbexItem.pszText = text; + cbexItem.cchTextMax = 0; + return (LONG)SendMessage(cbex, CBEM_SETITEM, 0,(LPARAM)&cbexItem); +} + +static LONG delItem(HWND cbex, int idx) { + return (LONG)SendMessage(cbex, CBEM_DELETEITEM, (LPARAM)idx, 0); +} + +static LONG getItem(HWND cbex, int idx, COMBOBOXEXITEM *cbItem) { + memset(cbItem, 0x00, sizeof(COMBOBOXEXITEM)); + cbItem->mask = CBEIF_TEXT; + cbItem->pszText = textBuffer; + cbItem->iItem = idx; + cbItem->cchTextMax = 100; + return (LONG)SendMessage(cbex, CBEM_GETITEM, 0, (LPARAM)cbItem); +} + +static void test_comboboxex(void) { + HWND myHwnd = 0; + LONG res = -1; + COMBOBOXEXITEM cbexItem; + +#define FIRST_ITEM "First Item" +#define SECOND_ITEM "Second Item" +#define THIRD_ITEM "Third Item" +#define MIDDLE_ITEM "Between First and Second Items" +#define REPLACEMENT_ITEM "Between First and Second Items" + + /* Allocate space for result */ + textBuffer = malloc(MAX_CHARS); + + /* Basic comboboxex test */ + myHwnd = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); + + /* Add items onto the end of the combobox */ + res = addItem(myHwnd, -1, FIRST_ITEM); + ok(res == 0, "Adding simple item failed (%ld)\n", res); + res = addItem(myHwnd, -1, SECOND_ITEM); + ok(res == 1, "Adding simple item failed (%ld)\n", res); + res = addItem(myHwnd, 2, THIRD_ITEM); + ok(res == 2, "Adding simple item failed (%ld)\n", res); + res = addItem(myHwnd, 1, MIDDLE_ITEM); + ok(res == 1, "Inserting simple item failed (%ld)\n", res); + + /* Add an item completely out of range */ + res = addItem(myHwnd, 99, "Out Of Range Item"); + ok(res == -1, "Adding using out of range index worked unexpectedly (%ld)\n", res); + res = addItem(myHwnd, 5, "Out Of Range Item"); + ok(res == -1, "Adding using out of range index worked unexpectedly (%ld)\n", res); + /* Removed: Causes traps on Windows XP + res = addItem(myHwnd, -2, "Out Of Range Item"); + ok(res == -1, "Adding out of range worked unexpectedly (%ld)\n", res); + */ + + /* Get an item completely out of range */ + res = getItem(myHwnd, 99, &cbexItem); + ok(res == 0, "Getting item using out of range index worked unexpectedly (%ld, %s)\n", res, cbexItem.pszText); + res = getItem(myHwnd, 4, &cbexItem); + ok(res == 0, "Getting item using out of range index worked unexpectedly (%ld, %s)\n", res, cbexItem.pszText); + res = getItem(myHwnd, -2, &cbexItem); + ok(res == 0, "Getting item using out of range index worked unexpectedly (%ld, %s)\n", res, cbexItem.pszText); + + /* Get an item in range */ + res = getItem(myHwnd, 0, &cbexItem); + ok(res != 0, "Getting item using valid index failed unexpectedly (%ld)\n", res); + ok(strcmp(FIRST_ITEM, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); + + res = getItem(myHwnd, 1, &cbexItem); + ok(res != 0, "Getting item using valid index failed unexpectedly (%ld)\n", res); + ok(strcmp(MIDDLE_ITEM, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); + + res = getItem(myHwnd, 2, &cbexItem); + ok(res != 0, "Getting item using valid index failed unexpectedly (%ld)\n", res); + ok(strcmp(SECOND_ITEM, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); + + res = getItem(myHwnd, 3, &cbexItem); + ok(res != 0, "Getting item using valid index failed unexpectedly (%ld)\n", res); + ok(strcmp(THIRD_ITEM, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); + + /* Set an item completely out of range */ + res = setItem(myHwnd, 99, REPLACEMENT_ITEM); + ok(res == 0, "Setting item using out of range index worked unexpectedly (%ld)\n", res); + res = setItem(myHwnd, 4, REPLACEMENT_ITEM); + ok(res == 0, "Setting item using out of range index worked unexpectedly (%ld)\n", res); + res = setItem(myHwnd, -2, REPLACEMENT_ITEM); + ok(res == 0, "Setting item using out of range index worked unexpectedly (%ld)\n", res); + + /* Set an item in range */ + res = setItem(myHwnd, 0, REPLACEMENT_ITEM); + ok(res != 0, "Setting first item failed (%ld)\n", res); + res = setItem(myHwnd, 3, REPLACEMENT_ITEM); + ok(res != 0, "Setting last item failed (%ld)\n", res); + + /* Remove items completely out of range (4 items in control at this point) */ + res = delItem(myHwnd, -1); + ok(res == CB_ERR, "Deleting using out of range index worked unexpectedly (%ld)\n", res); + res = delItem(myHwnd, 4); + ok(res == CB_ERR, "Deleting using out of range index worked unexpectedly (%ld)\n", res); + + /* Remove items in range (4 items in control at this point) */ + res = delItem(myHwnd, 3); + ok(res == 3, "Deleting using out of range index failed (%ld)\n", res); + res = delItem(myHwnd, 0); + ok(res == 2, "Deleting using out of range index failed (%ld)\n", res); + res = delItem(myHwnd, 0); + ok(res == 1, "Deleting using out of range index failed (%ld)\n", res); + res = delItem(myHwnd, 0); + ok(res == 0, "Deleting using out of range index failed (%ld)\n", res); + + /* Remove from an empty box */ + res = delItem(myHwnd, 0); + ok(res == CB_ERR, "Deleting using out of range index worked unexpectedly (%ld)\n", res); + + + /* Cleanup */ + free(textBuffer); + +} + +LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProcA(hWnd, msg, wParam, lParam); + } + + return 0L; +} + +static void init(void) { + WNDCLASSA wc; + INITCOMMONCONTROLSEX icex; + + icex.dwSize = sizeof(INITCOMMONCONTROLSEX); + icex.dwICC = ICC_USEREX_CLASSES; + InitCommonControlsEx(&icex); + + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, MAKEINTRESOURCEA(IDC_ARROW)); + wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.lpszMenuName = NULL; + wc.lpszClassName = ComboExTestClass; + wc.lpfnWndProc = ComboExTestWndProc; + RegisterClassA(&wc); + + hComboExParentWnd = CreateWindowExA(0, ComboExTestClass, "ComboEx test", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 680, 260, NULL, NULL, GetModuleHandleA(NULL), 0); + assert(hComboExParentWnd != NULL); + + hMainHinst = GetModuleHandleA(NULL); + +} + +static void cleanup(void) +{ + MSG msg; + + PostMessageA(hComboExParentWnd, WM_CLOSE, 0, 0); + while (GetMessageA(&msg,0,0,0)) { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + UnregisterClassA(ComboExTestClass, GetModuleHandleA(NULL)); +} + +START_TEST(comboex) +{ + init(); + + test_comboboxex(); + + cleanup(); +} Modified: trunk/reactos/regtests/winetests/comctl32/comctl32.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/comctl32.rbuild (original) +++ trunk/reactos/regtests/winetests/comctl32/comctl32.rbuild Sun Jun 11 19:51:13 2006 @@ -5,9 +5,21 @@ <library>ole32</library> <library>comctl32</library> <library>ntdll</library> + <library>gdi32</library> + <file>comboex.c</file> <file>dpa.c</file> + <file>header.c</file> + <file>imagelist.c</file> + <file>monthcal.c</file> <file>mru.c</file> + <file>progress.c</file> + <file>propsheet.c</file> <file>subclass.c</file> <file>tab.c</file> <file>testlist.c</file> + <file>toolbar.c</file> + <file>tooltips.c</file> + <file>treeview.c</file> + <file>updown.c</file> + <file>propsheet.rc</file> </module> Modified: trunk/reactos/regtests/winetests/comctl32/dpa.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/dpa.c (original) +++ trunk/reactos/regtests/winetests/comctl32/dpa.c Sun Jun 11 19:51:13 2006 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define COBJMACROS Added: trunk/reactos/regtests/winetests/comctl32/header.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/header.c (added) +++ trunk/reactos/regtests/winetests/comctl32/header.c Sun Jun 11 19:51:13 2006 @@ -1,0 +1,550 @@ +/* Unit test suite for header control. + * + * Copyright 2005 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <windows.h> +#include <commctrl.h> +#include <assert.h> + +#include "wine/test.h" + +typedef struct tagEXPECTEDNOTIFY +{ + INT iCode; + BOOL fUnicode; + HDITEMA hdItem; +} EXPECTEDNOTIFY; + +EXPECTEDNOTIFY expectedNotify[10]; +INT nExpectedNotify = 0; +INT nReceivedNotify = 0; +INT unexpectedNotify[10]; +INT nUnexpectedNotify = 0; + +static HWND hHeaderParentWnd; +static HWND hWndHeader; +#define MAX_CHARS 100 + +static void expect_notify(INT iCode, BOOL fUnicode, HDITEMA *lpItem) +{ + assert(nExpectedNotify < 10); + expectedNotify[nExpectedNotify].iCode = iCode; + expectedNotify[nExpectedNotify].fUnicode = fUnicode; + expectedNotify[nExpectedNotify].hdItem = *lpItem; + nExpectedNotify++; +} + +static void dont_expect_notify(INT iCode) +{ + assert(nUnexpectedNotify < 10); + unexpectedNotify[nUnexpectedNotify++] = iCode; +} + +static BOOL notifies_received() +{ + BOOL fRet = (nExpectedNotify == nReceivedNotify); + nExpectedNotify = nReceivedNotify = 0; + nUnexpectedNotify = 0; + return fRet; +} + +static LONG addItem(HWND hdex, int idx, LPCSTR text) +{ + HDITEMA hdItem; + hdItem.mask = HDI_TEXT | HDI_WIDTH; + hdItem.cxy = 100; + hdItem.pszText = (LPSTR)text; + hdItem.cchTextMax = 0; + return (LONG)SendMessage(hdex, HDM_INSERTITEMA, (WPARAM)idx, (LPARAM)&hdItem); +} + +static LONG setItem(HWND hdex, int idx, LPCSTR text, BOOL fCheckNotifies) +{ + LONG ret; + HDITEMA hdexItem; + hdexItem.mask = HDI_TEXT; + hdexItem.pszText = (LPSTR)text; + hdexItem.cchTextMax = 0; + if (fCheckNotifies) + { + expect_notify(HDN_ITEMCHANGINGA, FALSE, &hdexItem); + expect_notify(HDN_ITEMCHANGEDA, FALSE, &hdexItem); + } + ret = (LONG)SendMessage(hdex, HDM_SETITEMA, (WPARAM)idx, (LPARAM)&hdexItem); + if (fCheckNotifies) + ok(notifies_received(), "setItem(): not all expected notifies were received\n"); + return ret; +} + +static LONG setItemUnicodeNotify(HWND hdex, int idx, LPCSTR text, LPCWSTR wText) +{ + LONG ret; + HDITEMA hdexItem; + HDITEMW hdexNotify; + hdexItem.mask = HDI_TEXT; + hdexItem.pszText = (LPSTR)text; + hdexItem.cchTextMax = 0; + + hdexNotify.mask = HDI_TEXT; + hdexNotify.pszText = (LPWSTR)wText; + + expect_notify(HDN_ITEMCHANGINGW, TRUE, (HDITEMA*)&hdexNotify); + expect_notify(HDN_ITEMCHANGEDW, TRUE, (HDITEMA*)&hdexNotify); + ret = (LONG)SendMessage(hdex, HDM_SETITEMA, (WPARAM)idx, (LPARAM)&hdexItem); + ok(notifies_received(), "setItemUnicodeNotify(): not all expected notifies were received\n"); + return ret; +} + +static LONG delItem(HWND hdex, int idx) +{ + return (LONG)SendMessage(hdex, HDM_DELETEITEM, (WPARAM)idx, 0); +} + +static LONG getItemCount(HWND hdex) +{ + return (LONG)SendMessage(hdex, HDM_GETITEMCOUNT, 0, 0); +} + +static LONG getItem(HWND hdex, int idx, LPSTR textBuffer) +{ + HDITEMA hdItem; + hdItem.mask = HDI_TEXT; + hdItem.pszText = textBuffer; + hdItem.cchTextMax = MAX_CHARS; + return (LONG)SendMessage(hdex, HDM_GETITEMA, (WPARAM)idx, (LPARAM)&hdItem); +} + +static void addReadDelItem(HWND hdex, HDITEMA *phdiCreate, int maskRead, HDITEMA *phdiRead) +{ + ok(SendMessage(hdex, HDM_INSERTITEMA, (WPARAM)0, (LPARAM)phdiCreate)!=-1, "Adding item failed\n"); + ZeroMemory(phdiRead, sizeof(HDITEMA)); + phdiRead->mask = maskRead; + ok(SendMessage(hdex, HDM_GETITEMA, (WPARAM)0, (LPARAM)phdiRead)!=0, "Getting item data failed\n"); + ok(SendMessage(hdex, HDM_DELETEITEM, (WPARAM)0, (LPARAM)0)!=0, "Deleteing item failed\n"); +} + +static HWND create_header_control (void) +{ + HWND handle; + HDLAYOUT hlayout; + RECT rectwin; + WINDOWPOS winpos; + + handle = CreateWindowEx(0, WC_HEADER, NULL, + WS_CHILD|WS_BORDER|WS_VISIBLE|HDS_BUTTONS|HDS_HORZ, + 0, 0, 0, 0, + hHeaderParentWnd, NULL, NULL, NULL); + assert(handle); + + if (winetest_interactive) + ShowWindow (hHeaderParentWnd, SW_SHOW); + + GetClientRect(hHeaderParentWnd,&rectwin); + hlayout.prc = &rectwin; + hlayout.pwpos = &winpos; + SendMessageA(handle,HDM_LAYOUT,0,(LPARAM) &hlayout); + SetWindowPos(handle, winpos.hwndInsertAfter, winpos.x, winpos.y, + winpos.cx, winpos.cy, 0); + + return handle; +} + +static void compare_items(INT iCode, HDITEMA *hdi1, HDITEMA *hdi2, BOOL fUnicode) +{ + ok(hdi1->mask == hdi2->mask, "Notify %d mask mismatch (%08x != %08x)\n", iCode, hdi1->mask, hdi2->mask); + if (hdi1->mask & HDI_WIDTH) + { + ok(hdi1->cxy == hdi2->cxy, "Notify %d cxy mismatch (%08x != %08x)\n", iCode, hdi1->cxy, hdi2->cxy); + } + if (hdi1->mask & HDI_TEXT) + { + if (hdi1->pszText == LPSTR_TEXTCALLBACKA) + { + ok(hdi1->pszText == LPSTR_TEXTCALLBACKA, "Notify %d - only one item is LPSTR_TEXTCALLBACK\n", iCode); + } + else + if (fUnicode) + { + char buf1[260]; + char buf2[260]; + WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)hdi1->pszText, -1, buf1, 260, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)hdi2->pszText, -1, buf2, 260, NULL, NULL); + ok(lstrcmpW((LPWSTR)hdi1->pszText, (LPWSTR)hdi2->pszText)==0, + "Notify %d text mismatch (L\"%s\" vs L\"%s\")\n", + iCode, buf1, buf2); + } + else + { + ok(strcmp(hdi1->pszText, hdi2->pszText)==0, + "Notify %d text mismatch (\"%s\" vs \"%s\")\n", + iCode, hdi1->pszText, hdi2->pszText); + } + } +} + +static const char *str_items[] = + {"First Item", "Second Item", "Third Item", "Fourth Item", "Replace Item", "Out Of Range Item"}; + +static const char pszUniTestA[] = "TST"; +static const WCHAR pszUniTestW[] = {'T','S','T',0}; + + +#define TEST_GET_ITEM(i,c)\ +{ res = getItem(hWndHeader, i, buffer);\ + ok(res != 0, "Getting item[%d] using valid index failed unexpectedly (%ld)\n", i, res);\ + ok(strcmp(str_items[c], buffer) == 0, "Getting item[%d] returned \"%s\" expecting \"%s\"\n", i, buffer, str_items[c]);\ +} + +#define TEST_GET_ITEMCOUNT(i)\ +{ res = getItemCount(hWndHeader);\ + ok(res == i, "Got Item Count as %ld\n", res);\ +} + +static void check_auto_format(void) +{ + HDITEMA hdiCreate; + HDITEMA hdiRead; + static CHAR text[] = "Test"; + ZeroMemory(&hdiCreate, sizeof(HDITEMA)); + + /* Windows implicitly sets some format bits in INSERTITEM */ + + /* HDF_STRING is automaticaly set and cleared for no text */ + hdiCreate.mask = HDI_TEXT|HDI_WIDTH|HDI_FORMAT; + hdiCreate.pszText = text; + hdiCreate.cxy = 100; + hdiCreate.fmt=HDF_CENTER; + addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); + ok(hdiRead.fmt == (HDF_STRING|HDF_CENTER), "HDF_STRING not set automatically (fmt=%x)\n", hdiRead.fmt); + + hdiCreate.mask = HDI_WIDTH|HDI_FORMAT; + hdiCreate.pszText = text; + hdiCreate.fmt = HDF_CENTER|HDF_STRING; + addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); + ok(hdiRead.fmt == (HDF_CENTER), "HDF_STRING should be automatically cleared (fmt=%x)\n", hdiRead.fmt); + + /* HDF_BITMAP is automatically set and cleared for a NULL bitmap or no bitmap */ + hdiCreate.mask = HDI_BITMAP|HDI_WIDTH|HDI_FORMAT; + hdiCreate.hbm = CreateBitmap(16, 16, 1, 8, NULL); + hdiCreate.fmt = HDF_CENTER; + addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); + ok(hdiRead.fmt == (HDF_BITMAP|HDF_CENTER), "HDF_BITMAP not set automatically (fmt=%x)\n", hdiRead.fmt); + DeleteObject(hdiCreate.hbm); + + hdiCreate.hbm = NULL; + hdiCreate.fmt = HDF_CENTER|HDF_BITMAP; + addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); + ok(hdiRead.fmt == HDF_CENTER, "HDF_BITMAP not cleared automatically for NULL bitmap (fmt=%x)\n", hdiRead.fmt); + + hdiCreate.mask = HDI_WIDTH|HDI_FORMAT; + hdiCreate.fmt = HDF_CENTER|HDF_BITMAP; + addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); + ok(hdiRead.fmt == HDF_CENTER, "HDF_BITMAP not cleared automatically for no bitmap (fmt=%x)\n", hdiRead.fmt); + + /* HDF_IMAGE is automatically set but not cleared */ + hdiCreate.mask = HDI_IMAGE|HDI_WIDTH|HDI_FORMAT; + hdiCreate.iImage = 17; + addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); + ok(hdiRead.fmt == (HDF_IMAGE|HDF_CENTER), "HDF_IMAGE not set automatically (fmt=%x)\n", hdiRead.fmt); + + hdiCreate.mask = HDI_WIDTH|HDI_FORMAT; + hdiCreate.fmt = HDF_CENTER|HDF_IMAGE; + hdiCreate.iImage = 0; + addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); + ok(hdiRead.fmt == (HDF_CENTER|HDF_IMAGE), "HDF_IMAGE shouldn't be cleared automatically (fmt=%x)\n", hdiRead.fmt); +} + +static void check_auto_fields(void) +{ + HDITEMA hdiCreate; + HDITEMA hdiRead; + static CHAR text[] = "Test"; + LRESULT res; + + /* Windows stores the format, width, lparam even if they are not in the item's mask */ + ZeroMemory(&hdiCreate, sizeof(HDITEMA)); + hdiCreate.mask = HDI_TEXT; + hdiCreate.cxy = 100; + hdiCreate.pszText = text; + addReadDelItem(hWndHeader, &hdiCreate, HDI_WIDTH, &hdiRead); + TEST_GET_ITEMCOUNT(6); + ok(hdiRead.cxy == hdiCreate.cxy, "cxy should be automatically set\n"); + + ZeroMemory(&hdiCreate, sizeof(HDITEMA)); + hdiCreate.mask = HDI_TEXT; + hdiCreate.pszText = text; + hdiCreate.lParam = 0x12345678; + addReadDelItem(hWndHeader, &hdiCreate, HDI_LPARAM, &hdiRead); + TEST_GET_ITEMCOUNT(6); + ok(hdiRead.lParam == hdiCreate.lParam, "lParam should be automatically set\n"); + + ZeroMemory(&hdiCreate, sizeof(HDITEMA)); + hdiCreate.mask = HDI_TEXT; + hdiCreate.pszText = text; + hdiCreate.fmt = HDF_STRING|HDF_CENTER; + addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); + TEST_GET_ITEMCOUNT(6); + ok(hdiRead.fmt == hdiCreate.fmt, "fmt should be automatically set\n"); + + /* others fields are not set */ + ZeroMemory(&hdiCreate, sizeof(HDITEMA)); + hdiCreate.mask = HDI_TEXT; + hdiCreate.pszText = text; + hdiCreate.hbm = CreateBitmap(16, 16, 1, 8, NULL); + addReadDelItem(hWndHeader, &hdiCreate, HDI_BITMAP, &hdiRead); + TEST_GET_ITEMCOUNT(6); + ok(hdiRead.hbm == NULL, "hbm should not be automatically set\n"); + DeleteObject(hdiCreate.hbm); + + ZeroMemory(&hdiCreate, sizeof(HDITEMA)); + hdiCreate.mask = HDI_IMAGE; + hdiCreate.iImage = 17; + hdiCreate.pszText = text; + addReadDelItem(hWndHeader, &hdiCreate, HDI_TEXT, &hdiRead); + TEST_GET_ITEMCOUNT(6); + ok(hdiRead.pszText==NULL, "pszText shouldn't be automatically set\n"); + + /* field from comctl >4.0 not tested as the system probably won't touch them */ +} + +static void check_mask() +{ + HDITEMA hdi; + static CHAR text[] = "ABC"; + LRESULT ret; + + /* don't create items if the mask is zero */ + ZeroMemory(&hdi, sizeof(hdi)); + hdi.mask = 0; + hdi.cxy = 200; + hdi.pszText = text; + hdi.fmt = 0; + hdi.iOrder = 0; + hdi.lParam = 17; + hdi.cchTextMax = 260; + ret = SendMessage(hWndHeader, HDM_INSERTITEM, (WPARAM)0, (LPARAM)&hdi); + ok(ret == -1, "Creating an item with a zero mask should have failed\n"); + if (ret != -1) SendMessage(hWndHeader, HDM_DELETEITEM, (WPARAM)0, (LPARAM)0); + + /* with a non-zero mask creation will succeed */ + ZeroMemory(&hdi, sizeof(hdi)); + hdi.mask = HDI_LPARAM; + ret = SendMessage(hWndHeader, HDM_INSERTITEM, (WPARAM)0, (LPARAM)&hdi); + ok(ret != -1, "Adding item with non-zero mask failed\n"); + if (ret != -1) + SendMessage(hWndHeader, HDM_DELETEITEM, (WPARAM)0, (LPARAM)0); + + /* in SETITEM if the mask contains a unknown bit, it is ignored */ + ZeroMemory(&hdi, sizeof(hdi)); + hdi.mask = 0x08000000 | HDI_LPARAM | HDI_IMAGE; + hdi.lParam = 133; + hdi.iImage = 17; + ret = SendMessage(hWndHeader, HDM_INSERTITEM, (WPARAM)0, (LPARAM)&hdi); + ok(ret != -1, "Adding item failed\n"); + + if (ret != -1) + { + /* check result */ + ZeroMemory(&hdi, sizeof(hdi)); + hdi.mask = HDI_LPARAM | HDI_IMAGE; + SendMessage(hWndHeader, HDM_GETITEM, (WPARAM)0, (LPARAM)&hdi); + ok(hdi.lParam == 133, "comctl32 4.0 field not set\n"); + ok(hdi.iImage == 17, "comctl32 >4.0 field not set\n"); + + /* but in GETITEM if an unknown bit is set, comctl32 uses only version 4.0 fields */ + ZeroMemory(&hdi, sizeof(hdi)); + hdi.mask = 0x08000000 | HDI_LPARAM | HDI_IMAGE; + SendMessage(hWndHeader, HDM_GETITEM, (WPARAM)0, (LPARAM)&hdi); + ok(hdi.lParam == 133, "comctl32 4.0 field not read\n"); + ok(hdi.iImage == 0, "comctl32 >4.0 field shouldn't be read\n"); + + SendMessage(hWndHeader, HDM_DELETEITEM, (WPARAM)0, (LPARAM)0); + } +} + +static void test_header_control (void) +{ + LONG res; + static char buffer[MAX_CHARS]; + int i; + + hWndHeader = create_header_control (); + + for (i = 3; i >= 0; i--) + { + TEST_GET_ITEMCOUNT(3-i); + res = addItem(hWndHeader, 0, str_items[i]); + ok(res == 0, "Adding simple item failed (%ld)\n", res); + } + + TEST_GET_ITEMCOUNT(4); + res = addItem(hWndHeader, 99, str_items[i+1]); + ok(res != -1, "Adding Out of Range item should fail with -1 got (%ld)\n", res); + TEST_GET_ITEMCOUNT(5); + res = addItem(hWndHeader, 5, str_items[i+1]); + ok(res != -1, "Adding Out of Range item should fail with -1 got (%ld)\n", res); + TEST_GET_ITEMCOUNT(6); + + for (i = 0; i < 4; i++) { TEST_GET_ITEM(i,i); TEST_GET_ITEMCOUNT(6); } + + res=getItem(hWndHeader, 99, buffer); + ok(res == 0, "Getting Out of Range item should fail with 0 (%ld), got %s\n", res,buffer); + res=getItem(hWndHeader, 5, buffer); + ok(res == 1, "Getting Out of Range item should fail with 1 (%ld), got %s\n", res,buffer); + res=getItem(hWndHeader, -2, buffer); + ok(res == 0, "Getting Out of Range item should fail with 0 (%ld), got %s\n", res,buffer); + + if (winetest_interactive) + { + UpdateWindow(hHeaderParentWnd); + UpdateWindow(hWndHeader); + } + + TEST_GET_ITEMCOUNT(6); + res=setItem(hWndHeader, 99, str_items[5], FALSE); + ok(res == 0, "Setting Out of Range item should fail with 0 (%ld)\n", res); + res=setItem(hWndHeader, 5, str_items[5], TRUE); + ok(res == 1, "Setting Out of Range item should fail with 1 (%ld)\n", res); + res=setItem(hWndHeader, -2, str_items[5], FALSE); + ok(res == 0, "Setting Out of Range item should fail with 0 (%ld)\n", res); + TEST_GET_ITEMCOUNT(6); + + for (i = 0; i < 4; i++) + { + res = setItem(hWndHeader, i, str_items[4], TRUE); + ok(res != 0, "Setting %d item failed (%ld)\n", i+1, res); + TEST_GET_ITEM(i, 4); + TEST_GET_ITEMCOUNT(6); + } + + SendMessageA(hWndHeader, HDM_SETUNICODEFORMAT, (WPARAM)TRUE, 0); + setItemUnicodeNotify(hWndHeader, 3, pszUniTestA, pszUniTestW); + SendMessageA(hWndHeader, WM_NOTIFYFORMAT, (WPARAM)hHeaderParentWnd, (LPARAM)NF_REQUERY); + setItem(hWndHeader, 3, str_items[4], TRUE); + + dont_expect_notify(HDN_GETDISPINFOA); + dont_expect_notify(HDN_GETDISPINFOW); + addItem(hWndHeader, 0, LPSTR_TEXTCALLBACKA); + setItem(hWndHeader, 0, str_items[4], TRUE); + /* unexpected notifies cleared by notifies_received in setItem */ + dont_expect_notify(HDN_GETDISPINFOA); + dont_expect_notify(HDN_GETDISPINFOW); + setItem(hWndHeader, 0, LPSTR_TEXTCALLBACKA, TRUE); + /* unexpected notifies cleared by notifies_received in setItem */ + delItem(hWndHeader, 0); + + check_auto_format(); + TEST_GET_ITEMCOUNT(6); + check_auto_fields(); + TEST_GET_ITEMCOUNT(6); + check_mask(); + TEST_GET_ITEMCOUNT(6); + + res = delItem(hWndHeader, 5); + ok(res == 1, "Deleting Out of Range item should fail with 1 (%ld)\n", res); + res = delItem(hWndHeader, -2); + ok(res == 0, "Deleting Out of Range item should fail with 0 (%ld)\n", res); + TEST_GET_ITEMCOUNT(5); + + res = delItem(hWndHeader, 3); + ok(res != 0, "Deleting using out of range index failed (%ld)\n", res); + TEST_GET_ITEMCOUNT(4); + res = delItem(hWndHeader, 0); + ok(res != 0, "Deleting using out of range index failed (%ld)\n", res); + TEST_GET_ITEMCOUNT(3); + res = delItem(hWndHeader, 0); + ok(res != 0, "Deleting using out of range index failed (%ld)\n", res); + TEST_GET_ITEMCOUNT(2); + res = delItem(hWndHeader, 0); + ok(res != 0, "Deleting using out of range index failed (%ld)\n", res); + TEST_GET_ITEMCOUNT(1); + + DestroyWindow(hWndHeader); +} + + +LRESULT CALLBACK HeaderTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + + case WM_NOTIFY: + { + NMHEADERA *hdr = (NMHEADER *)lParam; + EXPECTEDNOTIFY *expected; + int i; + + for (i=0; i<nUnexpectedNotify; i++) + ok(hdr->hdr.code != unexpectedNotify[i], "Received invalid notify %d\n", hdr->hdr.code); + + if (nReceivedNotify >= nExpectedNotify || hdr->hdr.hwndFrom != hWndHeader ) + break; + + expected = &expectedNotify[nReceivedNotify]; + if (hdr->hdr.code != expected->iCode) + break; + + nReceivedNotify++; + compare_items(hdr->hdr.code, &expected->hdItem, hdr->pitem, expected->fUnicode); + break; + } + + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProcA(hWnd, msg, wParam, lParam); + } + + return 0L; +} + +static void init(void) { + WNDCLASSA wc; + INITCOMMONCONTROLSEX icex; + + icex.dwSize = sizeof(INITCOMMONCONTROLSEX); + icex.dwICC = ICC_USEREX_CLASSES; + InitCommonControlsEx(&icex); + + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, MAKEINTRESOURCEA(IDC_ARROW)); + wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.lpszMenuName = NULL; + wc.lpszClassName = "HeaderTestClass"; + wc.lpfnWndProc = HeaderTestWndProc; + RegisterClassA(&wc); + + hHeaderParentWnd = CreateWindowExA(0, "HeaderTestClass", "Header test", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 680, 260, NULL, NULL, GetModuleHandleA(NULL), 0); + assert(hHeaderParentWnd != NULL); +} + +START_TEST(header) +{ + init(); + + test_header_control(); + + DestroyWindow(hHeaderParentWnd); +} Modified: trunk/reactos/regtests/winetests/comctl32/imagelist.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/imagelist.c (original) +++ trunk/reactos/regtests/winetests/comctl32/imagelist.c Sun Jun 11 19:51:13 2006 @@ -15,12 +15,12 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <assert.h> #include <windows.h> -#include <wine/commctrl.h> +#include <commctrl.h> #include <stdio.h> #include "wine/test.h" Added: trunk/reactos/regtests/winetests/comctl32/monthcal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/monthcal.c (added) +++ trunk/reactos/regtests/winetests/comctl32/monthcal.c Sun Jun 11 19:51:13 2006 @@ -1,0 +1,96 @@ +/* + * comctl32 month calendar unit tests + * + * Copyright (C) 2006 Vitaliy Margolen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windows.h" + +#include "commctrl.h" + +#include "wine/test.h" + +void test_monthcal(void) +{ + HWND hwnd; + SYSTEMTIME st[2], st1[2]; + INITCOMMONCONTROLSEX ic = {sizeof(INITCOMMONCONTROLSEX), ICC_DATE_CLASSES}; + int res, month_range; + + InitCommonControlsEx(&ic); + hwnd = CreateWindowA(MONTHCAL_CLASSA, "MonthCal", WS_POPUP | WS_VISIBLE, CW_USEDEFAULT, + 0, 300, 300, 0, 0, NULL, NULL); + ok(hwnd != NULL, "Failed to create MonthCal\n"); + GetSystemTime(&st[0]); + st[1] = st[0]; + + /* Invalid date/time */ + st[0].wYear = 2000; + /* Time should not matter */ + st[1].wHour = st[1].wMinute = st[1].wSecond = 70; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set MAX limit\n"); + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "No limits should be set\n"); + ok(st1[0].wYear != 2000, "Lover limit changed\n"); + + st[1].wMonth = 0; + ok(!SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Should have failed to set limits\n"); + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "No limits should be set\n"); + ok(st1[0].wYear != 2000, "Lover limit changed\n"); + ok(!SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Should have failed to set MAX limit\n"); + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "No limits should be set\n"); + ok(st1[0].wYear != 2000, "Lover limit changed\n"); + + GetSystemTime(&st[0]); + st[0].wDay = 20; + st[0].wMonth = 5; + st[1] = st[0]; + + month_range = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st1); + st[1].wMonth--; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Failed to set both min and max limits\n"); + res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st1); + ok(res == month_range, "Invalid month range (%d)\n", res); + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == (GDTR_MIN|GDTR_MAX), "Limits should be set\n"); + + st[1].wMonth += 2; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Failed to set both min and max limits\n"); + res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st1); + ok(res == month_range, "Invalid month range (%d)\n", res); + + st[1].wYear --; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Failed to set both min and max limits\n"); + st[1].wYear += 1; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Failed to set both min and max limits\n"); + + st[1].wMonth -= 3; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set max limit\n"); + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "Only MAX limit should be set\n"); + st[1].wMonth += 4; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set max limit\n"); + st[1].wYear -= 3; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set max limit\n"); + st[1].wYear += 4; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set max limit\n"); + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "Only MAX limit should be set\n"); +} + +START_TEST(monthcal) +{ + test_monthcal(); +} Modified: trunk/reactos/regtests/winetests/comctl32/mru.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/mru.c (original) +++ trunk/reactos/regtests/winetests/comctl32/mru.c Sun Jun 11 19:51:13 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> Added: trunk/reactos/regtests/winetests/comctl32/progress.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/progress.c (added) +++ trunk/reactos/regtests/winetests/comctl32/progress.c Sun Jun 11 19:51:13 2006 @@ -1,0 +1,205 @@ +/* Unit tests for the progress bar control. + * + * Copyright 2005 Michael Kaufmann + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "commctrl.h" + +#include "wine/test.h" + + +HWND hProgressParentWnd, hProgressWnd; +static const char progressTestClass[] = "ProgressBarTestClass"; + + +LRESULT CALLBACK ProgressTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProcA(hWnd, msg, wParam, lParam); + } + + return 0L; +} + +static WNDPROC progress_wndproc; +static BOOL erased; +static RECT last_paint_rect; + +LRESULT CALLBACK ProgressSubclassProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == WM_PAINT) + { + GetUpdateRect(hWnd, &last_paint_rect, FALSE); + } + else if (msg == WM_ERASEBKGND) + { + erased = TRUE; + } + return CallWindowProc(progress_wndproc, hWnd, msg, wParam, lParam); +} + + +static void update_window(HWND hWnd) +{ + UpdateWindow(hWnd); + ok(!GetUpdateRect(hWnd, NULL, FALSE), "GetUpdateRect must return zero after UpdateWindow\n"); +} + + +static void init(void) +{ + WNDCLASSA wc; + INITCOMMONCONTROLSEX icex; + RECT rect; + + icex.dwSize = sizeof(INITCOMMONCONTROLSEX); + icex.dwICC = ICC_PROGRESS_CLASS; + InitCommonControlsEx(&icex); + + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, MAKEINTRESOURCEA(IDC_ARROW)); + wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.lpszMenuName = NULL; + wc.lpszClassName = progressTestClass; + wc.lpfnWndProc = ProgressTestWndProc; + RegisterClassA(&wc); + + rect.left = 0; + rect.top = 0; + rect.right = 400; + rect.bottom = 20; + assert(AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE)); + + hProgressParentWnd = CreateWindowExA(0, progressTestClass, "Progress Bar Test", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, GetModuleHandleA(NULL), 0); + assert(hProgressParentWnd != NULL); + + GetClientRect(hProgressParentWnd, &rect); + hProgressWnd = CreateWindowEx(0, PROGRESS_CLASS, "", WS_CHILD | WS_VISIBLE, + 0, 0, rect.right, rect.bottom, hProgressParentWnd, NULL, GetModuleHandleA(NULL), 0); + assert(hProgressWnd != NULL); + progress_wndproc = (WNDPROC)SetWindowLongPtr(hProgressWnd, GWLP_WNDPROC, (LPARAM)ProgressSubclassProc); + + ShowWindow(hProgressParentWnd, SW_SHOWNORMAL); + ok(GetUpdateRect(hProgressParentWnd, NULL, FALSE), "GetUpdateRect: There should be a region that needs to be updated\n"); + update_window(hProgressParentWnd); +} + + +static void cleanup(void) +{ + MSG msg; + + PostMessageA(hProgressParentWnd, WM_CLOSE, 0, 0); + while (GetMessageA(&msg,0,0,0)) { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + UnregisterClassA(progressTestClass, GetModuleHandleA(NULL)); +} + + +/* + * Tests if a progress bar repaints itself immediately when it receives + * some specific messages. + */ +static void test_redraw(void) +{ + RECT client_rect; + + SendMessageA(hProgressWnd, PBM_SETRANGE, 0, MAKELPARAM(0, 100)); + SendMessageA(hProgressWnd, PBM_SETPOS, 10, 0); + SendMessageA(hProgressWnd, PBM_SETSTEP, 20, 0); + update_window(hProgressWnd); + + /* PBM_SETPOS */ + ok(SendMessageA(hProgressWnd, PBM_SETPOS, 50, 0) == 10, "PBM_SETPOS must return the previous position\n"); + ok(!GetUpdateRect(hProgressWnd, NULL, FALSE), "PBM_SETPOS: The progress bar should be redrawn immediately\n"); + + /* PBM_DELTAPOS */ + ok(SendMessageA(hProgressWnd, PBM_DELTAPOS, 15, 0) == 50, "PBM_DELTAPOS must return the previous position\n"); + ok(!GetUpdateRect(hProgressWnd, NULL, FALSE), "PBM_DELTAPOS: The progress bar should be redrawn immediately\n"); + + /* PBM_SETPOS */ + ok(SendMessageA(hProgressWnd, PBM_SETPOS, 80, 0) == 65, "PBM_SETPOS must return the previous position\n"); + ok(!GetUpdateRect(hProgressWnd, NULL, FALSE), "PBM_SETPOS: The progress bar should be redrawn immediately\n"); + + /* PBM_STEPIT */ + ok(SendMessageA(hProgressWnd, PBM_STEPIT, 0, 0) == 80, "PBM_STEPIT must return the previous position\n"); + ok(!GetUpdateRect(hProgressWnd, NULL, FALSE), "PBM_STEPIT: The progress bar should be redrawn immediately\n"); + ok((UINT)SendMessageA(hProgressWnd, PBM_GETPOS, 0, 0) == 100, "PBM_GETPOS returned a wrong position\n"); + + /* PBM_SETRANGE and PBM_SETRANGE32: + Usually the progress bar doesn't repaint itself immediately. If the + position is not in the new range, it does. + Don't test this, it may change in future Windows versions. */ + + SendMessage(hProgressWnd, PBM_SETPOS, 0, 0); + update_window(hProgressWnd); + + /* increase to 10 - no background erase required */ + erased = FALSE; + SetRectEmpty(&last_paint_rect); + SendMessage(hProgressWnd, PBM_SETPOS, 10, 0); + GetClientRect(hProgressWnd, &client_rect); + ok(EqualRect(&last_paint_rect, &client_rect), + "last_paint_rect was { %ld, %ld, %ld, %ld } instead of { %ld, %ld, %ld, %ld }\n", + last_paint_rect.left, last_paint_rect.top, last_paint_rect.right, last_paint_rect.bottom, + client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); + update_window(hProgressWnd); + ok(!erased, "Progress bar shouldn't have erased the background\n"); + + /* decrease to 0 - background erase will be required */ + erased = FALSE; + SetRectEmpty(&last_paint_rect); + SendMessage(hProgressWnd, PBM_SETPOS, 0, 0); + GetClientRect(hProgressWnd, &client_rect); + ok(EqualRect(&last_paint_rect, &client_rect), + "last_paint_rect was { %ld, %ld, %ld, %ld } instead of { %ld, %ld, %ld, %ld }\n", + last_paint_rect.left, last_paint_rect.top, last_paint_rect.right, last_paint_rect.bottom, + client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); + update_window(hProgressWnd); + ok(erased, "Progress bar should have erased the background\n"); +} + + +START_TEST(progress) +{ + init(); + + test_redraw(); + + cleanup(); +} Added: trunk/reactos/regtests/winetests/comctl32/propsheet.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/propsheet.c (added) +++ trunk/reactos/regtests/winetests/comctl32/propsheet.c Sun Jun 11 19:51:13 2006 @@ -1,0 +1,107 @@ +/* Unit test suite for property sheet control. + * + * Copyright 2006 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windows.h> +#include <commctrl.h> + +#include "wine/test.h" + +static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) +{ + switch(msg) + { + case PSCB_INITIALIZED: + { + char caption[256]; + GetWindowTextA(hwnd, caption, sizeof(caption)); + ok(!strcmp(caption,"test caption"), "caption: %s\n", caption); + return 0; + } + } + return 0; +} + +static INT_PTR CALLBACK page_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, + LPARAM lparam) +{ + switch(msg) + { + case WM_INITDIALOG: + { + HWND sheet = GetParent(hwnd); + char caption[256]; + GetWindowTextA(sheet, caption, sizeof(caption)); + ok(!strcmp(caption,"test caption"), "caption: %s\n", caption); + return TRUE; + } + + case WM_NOTIFY: + { + NMHDR *nmhdr = (NMHDR *)lparam; + switch(nmhdr->code) + { + case PSN_APPLY: + return TRUE; + default: + return FALSE; + } + } + default: + return FALSE; + } +} + +static void test_title(void) +{ + HPROPSHEETPAGE hpsp[1]; + PROPSHEETPAGEA psp; + PROPSHEETHEADERA psh; + HWND hdlg; + + memset(&psp, 0, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.dwFlags = 0; + psp.hInstance = GetModuleHandleW(NULL); + psp.u.pszTemplate = "prop_page1"; + psp.u2.pszIcon = NULL; + psp.pfnDlgProc = page_dlg_proc; + psp.lParam = 0; + + hpsp[0] = CreatePropertySheetPageA(&psp); + + memset(&psh, 0, sizeof(psh)); + psh.dwSize = sizeof(psh); + psh.dwFlags = PSH_MODELESS | PSH_USECALLBACK; + psh.pszCaption = "test caption"; + psh.nPages = 1; + psh.hwndParent = GetDesktopWindow(); + psh.u3.phpage = hpsp; + psh.pfnCallback = sheet_callback; + + hdlg = (HWND)PropertySheetA(&psh); + DestroyWindow(hdlg); +} + +START_TEST(propsheet) +{ + test_title(); +} Added: trunk/reactos/regtests/winetests/comctl32/propsheet.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/propsheet.rc (added) +++ trunk/reactos/regtests/winetests/comctl32/propsheet.rc Sun Jun 11 19:51:13 2006 @@ -1,0 +1,29 @@ +/* Resources for the unit test suite for property sheet control. + * + * Copyright 2006 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "winuser.h" + +PROP_PAGE1 DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +CAPTION "Page1" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Test", -1, 10, 6, 100, 8 +} Modified: trunk/reactos/regtests/winetests/comctl32/subclass.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/subclass.c (original) +++ trunk/reactos/regtests/winetests/comctl32/subclass.c Sun Jun 11 19:51:13 2006 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <assert.h> @@ -234,7 +234,7 @@ ok_sequence(Sub_AfterDeletedTest, "After Deleted"); pSetWindowSubclass(hwnd, WndProcSub, 2, 0); - origProc3 = (WNDPROC)SetWindowLong(hwnd, GWL_WNDPROC, (LONG)WndProc3); + origProc3 = (WNDPROC)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG)WndProc3); SendMessage(hwnd, WM_USER, 1, 0); SendMessage(hwnd, WM_USER, 2, 0); ok_sequence(Sub_OldAfterNewTest, "Old after New"); Modified: trunk/reactos/regtests/winetests/comctl32/tab.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/tab.c (original) +++ trunk/reactos/regtests/winetests/comctl32/tab.c Sun Jun 11 19:51:13 2006 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <assert.h> @@ -23,29 +23,43 @@ #include "wine/test.h" -#undef VISIBLE - +#define DEFAULT_MIN_TAB_WIDTH 54 #define TAB_DEFAULT_WIDTH 96 -#define TAB_PADDING_X 2 -#define TAB_PADDING_Y 2 - -#define TCS_BOTTOM 0x0002 - -#ifdef VISIBLE -#define WAIT Sleep (1000) -#define REDRAW(hwnd) RedrawWindow (hwnd, NULL, 0, RDW_UPDATENOW) -#define trace_tab(str) trace(str) -#else -#define WAIT -#define REDRAW(hwnd) -#define trace_tab(str) -#endif +#define TAB_PADDING_X 6 +#define EXTRA_ICON_PADDING 3 + +#define TabWidthPadded(padd_x, num) (DEFAULT_MIN_TAB_WIDTH - (TAB_PADDING_X - (padd_x)) * num) + +#define TabCheckSetSize(hwnd, SetWidth, SetHeight, ExpWidth, ExpHeight, Msg)\ + SendMessage (hwnd, TCM_SETITEMSIZE, 0,\ + (LPARAM) MAKELPARAM((SetWidth >= 0) ? SetWidth:0, (SetHeight >= 0) ? SetHeight:0));\ + if (winetest_interactive) RedrawWindow (hwnd, NULL, 0, RDW_UPDATENOW);\ + CheckSize(hwnd, ExpWidth, ExpHeight, Msg); + +#define CheckSize(hwnd,width,height,msg)\ + SendMessage (hwnd, TCM_GETITEMRECT, 0, (LPARAM) &rTab);\ + if ((width >= 0) && (height < 0))\ + ok (width == rTab.right - rTab.left, "%s: Expected width [%d] got [%ld]\n",\ + msg, (int)width, rTab.right - rTab.left);\ + else if ((height >= 0) && (width < 0))\ + ok (height == rTab.bottom - rTab.top, "%s: Expected height [%d] got [%ld]\n",\ + msg, (int)height, rTab.bottom - rTab.top);\ + else\ + ok ((width == rTab.right - rTab.left) &&\ + (height == rTab.bottom - rTab.top ),\ + "%s: Expected [%d,%d] got [%ld,%ld]\n", msg, (int)width, (int)height,\ + rTab.right - rTab.left, rTab.bottom - rTab.top); + +static HFONT hFont = 0; static HWND -create_tabcontrol (DWORD style) +create_tabcontrol (DWORD style, DWORD mask) { HWND handle; TCITEM tcNewTab; + static char text1[] = "Tab 1", + text2[] = "Wide Tab 2", + text3[] = "T 3"; handle = CreateWindow ( WC_TABCONTROLA, @@ -55,145 +69,181 @@ NULL, NULL, NULL, 0); assert (handle); - + SetWindowLong(handle, GWL_STYLE, WS_CLIPSIBLINGS | WS_CLIPCHILDREN | TCS_FOCUSNEVER | style); - - tcNewTab.mask = TCIF_TEXT | TCIF_IMAGE; - tcNewTab.pszText = "Tab 1"; + SendMessage (handle, WM_SETFONT, 0, (LPARAM) hFont); + + tcNewTab.mask = mask; + tcNewTab.pszText = text1; tcNewTab.iImage = 0; SendMessage (handle, TCM_INSERTITEM, 0, (LPARAM) &tcNewTab); - tcNewTab.pszText = "Wide Tab 2"; + tcNewTab.pszText = text2; tcNewTab.iImage = 1; SendMessage (handle, TCM_INSERTITEM, 1, (LPARAM) &tcNewTab); - tcNewTab.pszText = "T 3"; + tcNewTab.pszText = text3; tcNewTab.iImage = 2; SendMessage (handle, TCM_INSERTITEM, 2, (LPARAM) &tcNewTab); -#ifdef VISIBLE - ShowWindow (handle, SW_SHOW); -#endif - REDRAW(handle); - WAIT; + if (winetest_interactive) + { + ShowWindow (handle, SW_SHOW); + RedrawWindow (handle, NULL, 0, RDW_UPDATENOW); + Sleep (1000); + } return handle; } -static void CheckSize(HWND hwnd, INT width, INT height) +static void test_tab(INT nMinTabWidth) { - RECT rTab, r1; - - r1.left=r1.top=r1.right=r1.bottom=0; - SendMessage (hwnd, TCM_GETITEMRECT, 0, (LPARAM) &rTab); - SendMessage (hwnd, TCM_ADJUSTRECT, FALSE, (LPARAM) &r1); - /* trace ("Got (%ld,%ld)-(%ld,%ld)\n", rTab.left, rTab.top, rTab.right, rTab.bottom); */ - trace (" (%ld,%ld)-(%ld,%ld)\n", r1.left, r1.top, r1.right, r1.bottom); - if ((width >= 0) && (height < 0)) - ok (width == rTab.right - rTab.left, "Expected [%d] got [%ld]\n", width, rTab.right - rTab.left); - else if ((height >= 0) && (width < 0)) - ok (height == rTab.bottom - rTab.top, "Expected [%d] got [%ld]\n", height, rTab.bottom - rTab.top); - else - ok ((width == rTab.right - rTab.left) && - (height == rTab.bottom - rTab.top ), - "Expected [%d,%d] got [%ld,%ld]\n", width, height, rTab.right - rTab.left, rTab.bottom - rTab.top); -} - -static void TabCheckSetSize(HWND hwnd, INT SetWidth, INT SetHeight, INT ExpWidth, INT ExpHeight) -{ - SendMessage (hwnd, TCM_SETITEMSIZE, 0, - (LPARAM) MAKELPARAM((SetWidth >= 0) ? SetWidth:0, (SetHeight >= 0) ? SetHeight:0)); - REDRAW(hwnd); - CheckSize(hwnd, ExpWidth, ExpHeight); - WAIT; + HWND hwTab; + RECT rTab; + HIMAGELIST himl = ImageList_Create(21, 21, ILC_COLOR, 3, 4); + SIZE size; + HDC hdc; + HFONT hOldFont; + INT i; + + hwTab = create_tabcontrol(TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE); + SendMessage(hwTab, TCM_SETMINTABWIDTH, 0, nMinTabWidth); + + hdc = GetDC(hwTab); + hOldFont = SelectObject(hdc, (HFONT)SendMessage(hwTab, WM_GETFONT, 0, 0)); + GetTextExtentPoint32A(hdc, "Tab 1", strlen("Tab 1"), &size); + trace("Tab1 text size: size.cx=%ld size.cy=%ld\n", size.cx, size.cy); + SelectObject(hdc, hOldFont); + ReleaseDC(hwTab, hdc); + + trace (" TCS_FIXEDWIDTH tabs no icon...\n"); + CheckSize(hwTab, TAB_DEFAULT_WIDTH, -1, "default width"); + TabCheckSetSize(hwTab, 50, 20, 50, 20, "set size"); + TabCheckSetSize(hwTab, 0, 1, 0, 1, "min size"); + + SendMessage(hwTab, TCM_SETIMAGELIST, 0, (LPARAM)himl); + + trace (" TCS_FIXEDWIDTH tabs with icon...\n"); + TabCheckSetSize(hwTab, 50, 30, 50, 30, "set size > icon"); + TabCheckSetSize(hwTab, 20, 20, 25, 20, "set size < icon"); + TabCheckSetSize(hwTab, 0, 1, 25, 1, "min size"); + + DestroyWindow (hwTab); + + hwTab = create_tabcontrol(TCS_FIXEDWIDTH | TCS_BUTTONS, TCIF_TEXT|TCIF_IMAGE); + SendMessage(hwTab, TCM_SETMINTABWIDTH, 0, nMinTabWidth); + + trace (" TCS_FIXEDWIDTH buttons no icon...\n"); + CheckSize(hwTab, TAB_DEFAULT_WIDTH, -1, "default width"); + TabCheckSetSize(hwTab, 20, 20, 20, 20, "set size 1"); + TabCheckSetSize(hwTab, 10, 50, 10, 50, "set size 2"); + TabCheckSetSize(hwTab, 0, 1, 0, 1, "min size"); + + SendMessage(hwTab, TCM_SETIMAGELIST, 0, (LPARAM)himl); + + trace (" TCS_FIXEDWIDTH buttons with icon...\n"); + TabCheckSetSize(hwTab, 50, 30, 50, 30, "set size > icon"); + TabCheckSetSize(hwTab, 20, 20, 25, 20, "set size < icon"); + TabCheckSetSize(hwTab, 0, 1, 25, 1, "min size"); + SendMessage(hwTab, TCM_SETPADDING, 0, MAKELPARAM(4,4)); + TabCheckSetSize(hwTab, 0, 1, 25, 1, "set padding, min size"); + + DestroyWindow (hwTab); + + hwTab = create_tabcontrol(TCS_FIXEDWIDTH | TCS_BOTTOM, TCIF_TEXT|TCIF_IMAGE); + SendMessage(hwTab, TCM_SETMINTABWIDTH, 0, nMinTabWidth); + + trace (" TCS_FIXEDWIDTH | TCS_BOTTOM tabs...\n"); + CheckSize(hwTab, TAB_DEFAULT_WIDTH, -1, "no icon, default width"); + + TabCheckSetSize(hwTab, 20, 20, 20, 20, "no icon, set size 1"); + TabCheckSetSize(hwTab, 10, 50, 10, 50, "no icon, set size 2"); + TabCheckSetSize(hwTab, 0, 1, 0, 1, "no icon, min size"); + + SendMessage(hwTab, TCM_SETIMAGELIST, 0, (LPARAM)himl); + + TabCheckSetSize(hwTab, 50, 30, 50, 30, "with icon, set size > icon"); + TabCheckSetSize(hwTab, 20, 20, 25, 20, "with icon, set size < icon"); + TabCheckSetSize(hwTab, 0, 1, 25, 1, "with icon, min size"); + SendMessage(hwTab, TCM_SETPADDING, 0, MAKELPARAM(4,4)); + TabCheckSetSize(hwTab, 0, 1, 25, 1, "set padding, min size"); + + DestroyWindow (hwTab); + + hwTab = create_tabcontrol(0, TCIF_TEXT|TCIF_IMAGE); + SendMessage(hwTab, TCM_SETMINTABWIDTH, 0, nMinTabWidth); + + trace (" non fixed width, with text...\n"); + CheckSize(hwTab, max(size.cx +TAB_PADDING_X*2, (nMinTabWidth < 0) ? DEFAULT_MIN_TAB_WIDTH : nMinTabWidth), -1, + "no icon, default width"); + for (i=0; i<8; i++) + { + INT nTabWidth = (nMinTabWidth < 0) ? TabWidthPadded(i, 2) : nMinTabWidth; + + SendMessage(hwTab, TCM_SETIMAGELIST, 0, 0); + SendMessage(hwTab, TCM_SETPADDING, 0, MAKELPARAM(i,i)); + + TabCheckSetSize(hwTab, 50, 20, max(size.cx + i*2, nTabWidth), 20, "no icon, set size"); + TabCheckSetSize(hwTab, 0, 1, max(size.cx + i*2, nTabWidth), 1, "no icon, min size"); + + SendMessage(hwTab, TCM_SETIMAGELIST, 0, (LPARAM)himl); + nTabWidth = (nMinTabWidth < 0) ? TabWidthPadded(i, 3) : nMinTabWidth; + + TabCheckSetSize(hwTab, 50, 30, max(size.cx + 21 + i*3, nTabWidth), 30, "with icon, set size > icon"); + TabCheckSetSize(hwTab, 20, 20, max(size.cx + 21 + i*3, nTabWidth), 20, "with icon, set size < icon"); + TabCheckSetSize(hwTab, 0, 1, max(size.cx + 21 + i*3, nTabWidth), 1, "with icon, min size"); + } + DestroyWindow (hwTab); + + hwTab = create_tabcontrol(0, TCIF_IMAGE); + SendMessage(hwTab, TCM_SETMINTABWIDTH, 0, nMinTabWidth); + + trace (" non fixed width, no text...\n"); + CheckSize(hwTab, (nMinTabWidth < 0) ? DEFAULT_MIN_TAB_WIDTH : nMinTabWidth, -1, "no icon, default width"); + for (i=0; i<8; i++) + { + INT nTabWidth = (nMinTabWidth < 0) ? TabWidthPadded(i, 2) : nMinTabWidth; + + SendMessage(hwTab, TCM_SETIMAGELIST, 0, 0); + SendMessage(hwTab, TCM_SETPADDING, 0, MAKELPARAM(i,i)); + + TabCheckSetSize(hwTab, 50, 20, nTabWidth, 20, "no icon, set size"); + TabCheckSetSize(hwTab, 0, 1, nTabWidth, 1, "no icon, min size"); + + SendMessage(hwTab, TCM_SETIMAGELIST, 0, (LPARAM)himl); + if (i > 1 && nMinTabWidth > 0 && nMinTabWidth < DEFAULT_MIN_TAB_WIDTH) + nTabWidth += EXTRA_ICON_PADDING *(i-1); + + TabCheckSetSize(hwTab, 50, 30, nTabWidth, 30, "with icon, set size > icon"); + TabCheckSetSize(hwTab, 20, 20, nTabWidth, 20, "with icon, set size < icon"); + TabCheckSetSize(hwTab, 0, 1, nTabWidth, 1, "with icon, min size"); + } + + DestroyWindow (hwTab); + + ImageList_Destroy(himl); + DeleteObject(hFont); } START_TEST(tab) { - HWND hwTab; - HIMAGELIST himl = ImageList_Create(21, 21, ILC_COLOR, 3, 4); + LOGFONTA logfont; + + lstrcpyA(logfont.lfFaceName, "Arial"); + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = -12; + logfont.lfWeight = FW_NORMAL; + logfont.lfCharSet = ANSI_CHARSET; + hFont = CreateFontIndirectA(&logfont); InitCommonControls(); - - hwTab = create_tabcontrol(TCS_FIXEDWIDTH); - - trace_tab ("Testing TCS_FIXEDWIDTH tabs no icon...\n"); - trace_tab (" default width...\n"); - CheckSize(hwTab, TAB_DEFAULT_WIDTH, -1); - trace_tab (" set size...\n"); - TabCheckSetSize(hwTab, 50, 20, 50, 20); - WAIT; - trace_tab (" min size...\n"); - TabCheckSetSize(hwTab, 0, 1, 0, 1); - WAIT; - - SendMessage(hwTab, TCM_SETIMAGELIST, 0, (LPARAM)himl); - - trace_tab ("Testing TCS_FIXEDWIDTH tabs with icon...\n"); - trace_tab (" set size > icon...\n"); - TabCheckSetSize(hwTab, 50, 30, 50, 30); - trace_tab (" set size < icon...\n"); - TabCheckSetSize(hwTab, 20, 20, 25, 20); - trace_tab (" min size...\n"); - TabCheckSetSize(hwTab, 0, 1, 25, 1); - - DestroyWindow (hwTab); - - trace_tab ("Testing TCS_FIXEDWIDTH buttons no icon...\n"); - hwTab = create_tabcontrol(TCS_FIXEDWIDTH | TCS_BUTTONS); - - trace_tab (" default width...\n"); - CheckSize(hwTab, TAB_DEFAULT_WIDTH, -1); - trace_tab (" set size 1...\n"); - TabCheckSetSize(hwTab, 20, 20, 20, 20); - trace_tab (" set size 2...\n"); - TabCheckSetSize(hwTab, 10, 50, 10, 50); - trace_tab (" min size...\n"); - TabCheckSetSize(hwTab, 0, 1, 0, 1); - - SendMessage(hwTab, TCM_SETIMAGELIST, 0, (LPARAM)himl); - - trace_tab ("Testing TCS_FIXEDWIDTH buttons with icon...\n"); - trace_tab (" set size > icon...\n"); - TabCheckSetSize(hwTab, 50, 30, 50, 30); - trace_tab (" set size < icon...\n"); - TabCheckSetSize(hwTab, 20, 20, 25, 20); - trace_tab (" min size...\n"); - TabCheckSetSize(hwTab, 0, 1, 25, 1); - trace_tab (" Add padding...\n"); - SendMessage(hwTab, TCM_SETPADDING, 0, MAKELPARAM(4,4)); - trace_tab (" min size...\n"); - TabCheckSetSize(hwTab, 0, 1, 25, 1); - - DestroyWindow (hwTab); - - hwTab = create_tabcontrol(TCS_FIXEDWIDTH | TCS_BOTTOM); - trace_tab ("Testing TCS_FIXEDWIDTH | TCS_BOTTOM tabs no icon...\n"); - - trace_tab (" default width...\n"); - CheckSize(hwTab, TAB_DEFAULT_WIDTH, -1); - trace_tab (" set size 1...\n"); - TabCheckSetSize(hwTab, 20, 20, 20, 20); - trace_tab (" set size 2...\n"); - TabCheckSetSize(hwTab, 10, 50, 10, 50); - trace_tab (" min size...\n"); - TabCheckSetSize(hwTab, 0, 1, 0, 1); - - SendMessage(hwTab, TCM_SETIMAGELIST, 0, (LPARAM)himl); - - trace_tab ("Testing TCS_FIXEDWIDTH | TCS_BOTTOM tabs with icon...\n"); - trace_tab (" set size > icon...\n"); - TabCheckSetSize(hwTab, 50, 30, 50, 30); - trace_tab (" set size < icon...\n"); - TabCheckSetSize(hwTab, 20, 20, 25, 20); - trace_tab (" min size...\n"); - TabCheckSetSize(hwTab, 0, 1, 25, 1); - trace_tab (" Add padding...\n"); - SendMessage(hwTab, TCM_SETPADDING, 0, MAKELPARAM(4,4)); - trace_tab (" min size...\n"); - TabCheckSetSize(hwTab, 0, 1, 25, 1); - - DestroyWindow (hwTab); - - - ImageList_Destroy(himl); + trace ("Testing with default MinWidth\n"); + test_tab(-1); + trace ("Testing with MinWidth set to -3\n"); + test_tab(-3); + trace ("Testing with MinWidth set to 24\n"); + test_tab(24); + trace ("Testing with MinWidth set to 54\n"); + test_tab(54); + trace ("Testing with MinWidth set to 94\n"); + test_tab(94); } Added: trunk/reactos/regtests/winetests/comctl32/toolbar.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/toolbar.c (added) +++ trunk/reactos/regtests/winetests/comctl32/toolbar.c Sun Jun 11 19:51:13 2006 @@ -1,0 +1,137 @@ +/* Unit tests for treeview. + * + * Copyright 2005 Krzysztof Foltman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winnls.h" +#include "winreg.h" +#include "commctrl.h" + +#include "wine/test.h" + +static void MakeButton(TBBUTTON *p, int idCommand, int fsStyle, int nString) { + p->iBitmap = -2; + p->idCommand = idCommand; + p->fsState = TBSTATE_ENABLED; + p->fsStyle = fsStyle; + p->iString = nString; +} + +static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + + case WM_CREATE: + { + TBBUTTON buttons[9]; + int i; + HWND hToolbar; + for (i=0; i<9; i++) + MakeButton(buttons+i, 1000+i, TBSTYLE_CHECKGROUP, 0); + MakeButton(buttons+3, 1003, TBSTYLE_SEP|TBSTYLE_GROUP, 0); + MakeButton(buttons+6, 1006, TBSTYLE_SEP, 0); + + hToolbar = CreateToolbarEx(hWnd, + WS_VISIBLE | WS_CLIPCHILDREN | CCS_TOP | + WS_CHILD | TBSTYLE_LIST, + 100, + 0, NULL, (UINT)0, + buttons, sizeof(buttons)/sizeof(buttons[0]), + 0, 0, 20, 16, sizeof(TBBUTTON)); + ok(hToolbar != NULL, "Toolbar creation\n"); + + SendMessage(hToolbar, TB_ADDSTRINGA, 0, (LPARAM)"test\000"); + + /* test for exclusion working inside a separator-separated :-) group */ + SendMessage(hToolbar, TB_CHECKBUTTON, 1000, 1); /* press A1 */ + ok(SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1000, 0), "A1 pressed\n"); + ok(!SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1001, 0), "A2 not pressed\n"); + + SendMessage(hToolbar, TB_CHECKBUTTON, 1004, 1); /* press A5, release A1 */ + ok(SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1004, 0), "A5 pressed\n"); + ok(!SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1000, 0), "A1 not pressed anymore\n"); + + SendMessage(hToolbar, TB_CHECKBUTTON, 1005, 1); /* press A6, release A5 */ + ok(SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1005, 0), "A6 pressed\n"); + ok(!SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1004, 0), "A5 not pressed anymore\n"); + + /* test for inter-group crosstalk, ie. two radio groups interfering with each other */ + SendMessage(hToolbar, TB_CHECKBUTTON, 1007, 1); /* press B2 */ + ok(SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1005, 0), "A6 still pressed, no inter-group crosstalk\n"); + ok(!SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1000, 0), "A1 still not pressed\n"); + ok(SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1007, 0), "B2 pressed\n"); + + SendMessage(hToolbar, TB_CHECKBUTTON, 1000, 1); /* press A1 and ensure B group didn't suffer */ + ok(!SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1005, 0), "A6 not pressed anymore\n"); + ok(SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1000, 0), "A1 pressed\n"); + ok(SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1007, 0), "B2 still pressed\n"); + + SendMessage(hToolbar, TB_CHECKBUTTON, 1008, 1); /* press B3, and ensure A group didn't suffer */ + ok(!SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1005, 0), "A6 pressed\n"); + ok(SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1000, 0), "A1 pressed\n"); + ok(!SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1007, 0), "B2 not pressed\n"); + ok(SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1008, 0), "B3 pressed\n"); + PostMessage(hWnd, WM_CLOSE, 0, 0); + return 0; + } + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProcA(hWnd, msg, wParam, lParam); + } + return 0L; +} + +START_TEST(toolbar) +{ + WNDCLASSA wc; + MSG msg; + RECT rc; + HWND hMainWnd; + + InitCommonControls(); + + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, MAKEINTRESOURCEA(IDC_IBEAM)); + wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.lpszMenuName = NULL; + wc.lpszClassName = "MyTestWnd"; + wc.lpfnWndProc = MyWndProc; + RegisterClassA(&wc); + + hMainWnd = CreateWindowExA(0, "MyTestWnd", "Blah", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 680, 260, NULL, NULL, GetModuleHandleA(NULL), 0); + GetClientRect(hMainWnd, &rc); + + while(GetMessageA(&msg,0,0,0)) { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } +} Added: trunk/reactos/regtests/winetests/comctl32/tooltips.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/tooltips.c (added) +++ trunk/reactos/regtests/winetests/comctl32/tooltips.c Sun Jun 11 19:51:13 2006 @@ -1,0 +1,68 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <windows.h> +#include <commctrl.h> + +#include "wine/test.h" + +static void test_create_tooltip(void) +{ + HWND parent, hwnd; + DWORD style, exp_style; + + parent = CreateWindowEx(0, "static", NULL, WS_POPUP, + 0, 0, 0, 0, + NULL, NULL, NULL, 0); + assert(parent); + + hwnd = CreateWindowEx(0, TOOLTIPS_CLASS, NULL, 0x7fffffff | WS_POPUP, + 10, 10, 300, 100, + parent, NULL, NULL, 0); + assert(hwnd); + + style = GetWindowLong(hwnd, GWL_STYLE); + trace("style = %08lx\n", style); + exp_style = 0x7fffffff | WS_POPUP; + exp_style &= ~(WS_CHILD | WS_MAXIMIZE | WS_BORDER | WS_DLGFRAME); + ok(style == exp_style,"wrong style %08lx/%08lx\n", style, exp_style); + + DestroyWindow(hwnd); + + hwnd = CreateWindowEx(0, TOOLTIPS_CLASS, NULL, 0, + 10, 10, 300, 100, + parent, NULL, NULL, 0); + assert(hwnd); + + style = GetWindowLong(hwnd, GWL_STYLE); + trace("style = %08lx\n", style); + ok(style == (WS_POPUP | WS_CLIPSIBLINGS | WS_BORDER), + "wrong style %08lx\n", style); + + DestroyWindow(hwnd); + + DestroyWindow(parent); +} + +START_TEST(tooltips) +{ + InitCommonControls(); + + test_create_tooltip(); +} Added: trunk/reactos/regtests/winetests/comctl32/treeview.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/treeview.c (added) +++ trunk/reactos/regtests/winetests/comctl32/treeview.c Sun Jun 11 19:51:13 2006 @@ -1,0 +1,221 @@ +/* Unit tests for treeview. + * + * Copyright 2005 Krzysztof Foltman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winnls.h" +#include "winreg.h" +#include "commctrl.h" + +#include "wine/test.h" + +static HWND hMainWnd; + +static HWND hTree; +static HTREEITEM hRoot, hChild; + +static int pos = 0; +static char sequence[256]; + +static void Clear(void) +{ + pos = 0; + sequence[0] = '\0'; +} + +static void AddItem(char ch) +{ + sequence[pos++] = ch; + sequence[pos] = '\0'; +} + +static void IdentifyItem(HTREEITEM hItem) +{ + if (hItem == hRoot) { + AddItem('R'); + return; + } + if (hItem == hChild) { + AddItem('C'); + return; + } + if (hItem == NULL) { + AddItem('n'); + return; + } + AddItem('?'); +} + +static void FillRoot(void) +{ + TVINSERTSTRUCTA ins; + static CHAR root[] = "Root", + child[] = "Child"; + + Clear(); + AddItem('A'); + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = root; + hRoot = TreeView_InsertItem(hTree, &ins); + assert(hRoot); + + AddItem('B'); + ins.hParent = hRoot; + ins.hInsertAfter = TVI_FIRST; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = child; + hChild = TreeView_InsertItem(hTree, &ins); + assert(hChild); + AddItem('.'); + + ok(!strcmp(sequence, "AB."), "Item creation\n"); +} + +static void DoTest1(void) +{ + BOOL r; + r = TreeView_SelectItem(hTree, NULL); + Clear(); + AddItem('1'); + r = TreeView_SelectItem(hTree, hRoot); + AddItem('2'); + r = TreeView_SelectItem(hTree, hRoot); + AddItem('3'); + r = TreeView_SelectItem(hTree, NULL); + AddItem('4'); + r = TreeView_SelectItem(hTree, NULL); + AddItem('5'); + r = TreeView_SelectItem(hTree, hRoot); + AddItem('.'); + ok(!strcmp(sequence, "1(nR)nR23(Rn)Rn45(nR)nR."), "root-none select test\n"); +} + +static void DoTest2(void) +{ + BOOL r; + r = TreeView_SelectItem(hTree, NULL); + Clear(); + AddItem('1'); + r = TreeView_SelectItem(hTree, hRoot); + AddItem('2'); + r = TreeView_SelectItem(hTree, hRoot); + AddItem('3'); + r = TreeView_SelectItem(hTree, hChild); + AddItem('4'); + r = TreeView_SelectItem(hTree, hChild); + AddItem('5'); + r = TreeView_SelectItem(hTree, hRoot); + AddItem('.'); + ok(!strcmp(sequence, "1(nR)nR23(RC)RC45(CR)CR."), "root-child select test\n"); +} + +LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + + case WM_CREATE: + { + hTree = CreateWindowExA(WS_EX_CLIENTEDGE, WC_TREEVIEWA, NULL, WS_CHILD|WS_VISIBLE| + TVS_LINESATROOT|TVS_HASLINES|TVS_HASBUTTONS, + 0, 0, 300, 50, hWnd, (HMENU)100, GetModuleHandleA(0), 0); + + SetFocus(hTree); + return 0; + } + case WM_NOTIFY: + { + NMHDR *pHdr = (NMHDR *)lParam; + + if (pHdr->idFrom == 100) { + NMTREEVIEWA *pTreeView = (LPNMTREEVIEWA) lParam; + switch(pHdr->code) { + case TVN_SELCHANGINGA: + AddItem('('); + IdentifyItem(pTreeView->itemOld.hItem); + IdentifyItem(pTreeView->itemNew.hItem); + return 0; + case TVN_SELCHANGEDA: + AddItem(')'); + IdentifyItem(pTreeView->itemOld.hItem); + IdentifyItem(pTreeView->itemNew.hItem); + return 0; + } + } + return 0; + } + + case WM_SIZE: + MoveWindow(hTree, 0, 0, LOWORD(lParam), HIWORD(lParam), TRUE); + break; + + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProcA(hWnd, msg, wParam, lParam); + } + return 0L; +} + +START_TEST(treeview) +{ + WNDCLASSA wc; + MSG msg; + INITCOMMONCONTROLSEX icex; + RECT rc; + + icex.dwSize = sizeof(INITCOMMONCONTROLSEX); + icex.dwICC = ICC_TREEVIEW_CLASSES; + InitCommonControlsEx(&icex); + + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, MAKEINTRESOURCEA(IDC_IBEAM)); + wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.lpszMenuName = NULL; + wc.lpszClassName = "MyTestWnd"; + wc.lpfnWndProc = MyWndProc; + RegisterClassA(&wc); + + + hMainWnd = CreateWindowExA(0, "MyTestWnd", "Blah", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 680, 260, NULL, NULL, GetModuleHandleA(NULL), 0); + GetClientRect(hMainWnd, &rc); + + FillRoot(); + DoTest1(); + DoTest2(); + + PostMessageA(hMainWnd, WM_CLOSE, 0, 0); + while(GetMessageA(&msg,0,0,0)) { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } +} Added: trunk/reactos/regtests/winetests/comctl32/updown.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/updown.c (added) +++ trunk/reactos/regtests/winetests/comctl32/updown.c Sun Jun 11 19:51:13 2006 @@ -1,0 +1,98 @@ +/* Unit test suite for updown control. + * + * Copyright 2005 C. Scott Ananian + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <windows.h> +#include <commctrl.h> +#include <stdio.h> + +#include "wine/test.h" + +static HDC desktopDC; +static HINSTANCE hinst; + +static HWND create_edit_control (DWORD style, DWORD exstyle) +{ + HWND handle; + + handle = CreateWindowEx(exstyle, + "EDIT", + NULL, + ES_AUTOHSCROLL | ES_AUTOVSCROLL | style, + 10, 10, 300, 300, + NULL, NULL, hinst, NULL); + assert (handle); + if (winetest_interactive) + ShowWindow (handle, SW_SHOW); + return handle; +} + +static HWND create_updown_control (HWND hWndEdit) +{ + HWND hWndUpDown; + + /* make the control */ + hWndUpDown = CreateWindowEx + (0L, UPDOWN_CLASS, NULL, + /* window styles */ + UDS_SETBUDDYINT | UDS_ALIGNRIGHT | + UDS_ARROWKEYS | UDS_NOTHOUSANDS, + /* placement */ + 0, 0, 8, 8, + /* parent, etc */ + NULL, NULL, hinst, NULL); + assert (hWndUpDown); + /* set the buddy. */ + SendMessage (hWndUpDown, UDM_SETBUDDY, (WPARAM)hWndEdit, 0L ); + /* set the range. */ + SendMessage (hWndUpDown, UDM_SETRANGE, 0L, (LPARAM) MAKELONG(32000, 0)); + /* maybe show it. */ + if (winetest_interactive) + ShowWindow (hWndUpDown, SW_SHOW); + return hWndUpDown; +} + +static void test_updown_control (void) +{ + HWND hWndUpDown, hWndEdit; + int num; + + hWndEdit = create_edit_control (ES_AUTOHSCROLL | ES_NUMBER, 0); + hWndUpDown = create_updown_control (hWndEdit); + /* before we set a value, it should be '0' */ + num = SendMessage(hWndUpDown, UDM_GETPOS, 0, 0L); + ok(num == 0, "Expected 0 got %d\n", num); + /* set a value, check it. */ + SendMessage(hWndUpDown, UDM_SETPOS, 0L, MAKELONG( 1, 0)); + num = SendMessage(hWndUpDown, UDM_GETPOS, 0, 0L); + ok(num == 1, "Expected 1 got %d\n", num); + /* okay, done (short set of tests!) */ + DestroyWindow(hWndUpDown); + DestroyWindow(hWndEdit); +} + +START_TEST(updown) +{ + desktopDC=GetDC(NULL); + hinst = GetModuleHandleA(NULL); + + InitCommonControls(); + + test_updown_control(); +}

1 0

[mbosma] 22313: Fix size of the startmenu (e.g. Start->Programs) when there are very much entries. Tested under Windows. Fix by slawek from the German forum.
by mbosma＠svn.reactos.org 11 Jun '06

11 Jun '06

Author: mbosma Date: Sun Jun 11 19:16:48 2006 New Revision: 22313 URL: http://svn.reactos.ru/svn/reactos?rev=22313&view=rev Log: Fix size of the startmenu (e.g. Start->Programs) when there are very much entries. Tested under Windows. Fix by slawek from the German forum. Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/explorer/taskbar… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp Sun Jun 11 19:16:48 2006 @@ -1482,7 +1482,7 @@ if (rect.bottom > cyscreen) { _arrow_btns = true; - _invisible_lines = (rect.bottom-cyscreen+(STARTMENU_LINE_HEIGHT(icon_size)-1))/STARTMENU_SEP_HEIGHT(icon_size) + 1; + _invisible_lines = (rect.bottom-cyscreen+(STARTMENU_LINE_HEIGHT(icon_size)+1))/STARTMENU_LINE_HEIGHT(icon_size)+1; rect.bottom -= _invisible_lines * STARTMENU_LINE_HEIGHT(icon_size); bottom_max = rect.bottom;

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2006