Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 16638: make GetRootPath bit smarter
by greatlrd＠svn.reactos.com 19 Jul '05

19 Jul '05

make GetRootPath bit smarter Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-07-18 23:04:39 UTC (rev 16637) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-07-19 01:36:54 UTC (rev 16638) @@ -159,33 +159,44 @@ INT GetRootPath(TCHAR *InPath,TCHAR *OutPath,INT size) { INT retcode = 1; - INT t; + if (_tcslen(InPath)>1) { - if (InPath[1]==_T(':')) + if (InPath[1]==_T(':')) { - for (t=0;t<32;t++) - { - if (_tgetdcwd(t,OutPath,size) != NULL) - { - if (_tcsncicmp(InPath,OutPath,2)) - { - retcode = 0; - return retcode; - } - } - } - } - } + TCHAR num[2]; + INT t=0; + + num[1] = _T('\0'); + num[0] = InPath[0]; + _tcslwr(num); + + if ((InPath[0] >= _T('0')) && (InPath[0] <= _T('9'))) + { + t = (InPath[0] - _T('0')) +28; + } + + if ((InPath[0] >= _T('a')) && (InPath[0] <= _T('z'))) + { + t = (InPath[0] - _T('a')) +1; + } + + if (_tgetdcwd(t,OutPath,size) != NULL) + { + return 0; + } + } + } - /* fail to getting path devic did not exists */ + /* fail */ if (_tcslen(InPath)>1) { if (InPath[1]==_T(':')) return 1; } + /* Get current directory */ retcode = GetCurrentDirectory(size,OutPath); if (retcode==0) return 1; @@ -220,6 +231,7 @@ nErrorLevel = 0; + /* The whole param string is our parameter these days. The only thing we do is eliminating every quotation mark */ /* Is it safe to change the characters param is pointing to? I presume it is, as there doesn't seem to be any post-processing of it after the function call (what would that accomplish?) */

1 0

[greatlrd] 16637: make GetRootPath bit faster if it does not get a drive name with :
by greatlrd＠svn.reactos.com 18 Jul '05

18 Jul '05

make GetRootPath bit faster if it does not get a drive name with : Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-07-18 22:44:13 UTC (rev 16636) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-07-18 23:04:39 UTC (rev 16637) @@ -148,10 +148,10 @@ free (lpLastPath); } -/* help functions for getting current path from driver - without changing driver. Return code 0 = ok, 1 = fail. +/* help functions for getting current path from drive + without changing drive. Return code 0 = ok, 1 = fail. INT GetRootPath("C:",outbuffer,chater size of outbuffer); - the frist param can have any size, if the the two frist + the first param can have any size, if the the two frist letter are not a drive with : it will get Currentpath on current drive exacly as GetCurrentDirectory does. */ @@ -161,17 +161,23 @@ INT retcode = 1; INT t; - for (t=0;t<32;t++) - { - if (_tgetdcwd(t,OutPath,size) != NULL) - { - if (_tcsncicmp(InPath,OutPath,2)) - { - retcode = 0; - return retcode; - } - } - } + if (_tcslen(InPath)>1) + { + if (InPath[1]==_T(':')) + { + for (t=0;t<32;t++) + { + if (_tgetdcwd(t,OutPath,size) != NULL) + { + if (_tcsncicmp(InPath,OutPath,2)) + { + retcode = 0; + return retcode; + } + } + } + } + } /* fail to getting path devic did not exists */ if (_tcslen(InPath)>1)

1 0

[greatlrd] 16636: add a new interal function call GetRootPath(TCHAR *InPath, TCHAR *OutPath, INT size) it get the a driver current path without change the current driver directory, it is not in use yet, prep for copy, cd, rm, and all other commands.
by greatlrd＠svn.reactos.com 18 Jul '05

18 Jul '05

add a new interal function call GetRootPath(TCHAR *InPath,TCHAR *OutPath,INT size) it get the a driver current path without change the current driver directory, it is not in use yet, prep for copy, cd, rm, and all other commands. Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/internal.c Modified: trunk/reactos/subsys/system/cmd/precomp.h _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-07-18 19:50:23 UTC (rev 16635) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-07-18 22:44:13 UTC (rev 16636) @@ -291,6 +291,7 @@ /* Prototypes for MISC.C */ +INT GetRootPath(TCHAR *InPath,TCHAR *OutPath,INT size); TCHAR cgetchar (VOID); BOOL CheckCtrlBreak (INT); LPTSTR *split (LPTSTR, LPINT, BOOL); _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-07-18 19:50:23 UTC (rev 16635) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-07-18 22:44:13 UTC (rev 16636) @@ -148,6 +148,46 @@ free (lpLastPath); } +/* help functions for getting current path from driver + without changing driver. Return code 0 = ok, 1 = fail. + INT GetRootPath("C:",outbuffer,chater size of outbuffer); + the frist param can have any size, if the the two frist + letter are not a drive with : it will get Currentpath on + current drive exacly as GetCurrentDirectory does. + */ + +INT GetRootPath(TCHAR *InPath,TCHAR *OutPath,INT size) +{ + INT retcode = 1; + INT t; + + for (t=0;t<32;t++) + { + if (_tgetdcwd(t,OutPath,size) != NULL) + { + if (_tcsncicmp(InPath,OutPath,2)) + { + retcode = 0; + return retcode; + } + } + } + + /* fail to getting path devic did not exists */ + if (_tcslen(InPath)>1) + { + if (InPath[1]==_T(':')) + return 1; + } + + retcode = GetCurrentDirectory(size,OutPath); + if (retcode==0) + return 1; + + return 0; +} + + /* * CD / CHDIR * _____ Modified: trunk/reactos/subsys/system/cmd/precomp.h --- trunk/reactos/subsys/system/cmd/precomp.h 2005-07-18 19:50:23 UTC (rev 16635) +++ trunk/reactos/subsys/system/cmd/precomp.h 2005-07-18 22:44:13 UTC (rev 16636) @@ -4,6 +4,8 @@ #include <shellapi.h> #include <tchar.h> +#include <direct.h> + #include <ctype.h> #include <string.h> #include <stdio.h> @@ -15,3 +17,4 @@ #include "cmd.h" #include "config.h" #include "batch.h" +

1 0

[ion] 16635: - Fix nasty APC delivery bug (in case a Kernel-Mode Special APC still returned with a Normal Routine, the Normal Routine was called with incorrect values (Special Routines take PVOID* arguments, while Normal Routines do not!))
by ion＠svn.reactos.com 18 Jul '05

18 Jul '05

- Fix nasty APC delivery bug (in case a Kernel-Mode Special APC still returned with a Normal Routine, the Normal Routine was called with incorrect values (Special Routines take PVOID* arguments, while Normal Routines do not!)) - Remove APC from list before setting it to non-inserted. - Do proper thread termination piggybacking; terminate threads in user-mode as Hartmut correctly fixed. Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-07-18 15:05:58 UTC (rev 16634) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-07-18 19:50:23 UTC (rev 16635) @@ -567,9 +567,9 @@ Apc = CONTAINING_RECORD(ApcListEntry, KAPC, ApcListEntry); /* Save Parameters so that it's safe to free the Object in Kernel Routine*/ - NormalRoutine = Apc->NormalRoutine; - KernelRoutine = Apc->KernelRoutine; - NormalContext = Apc->NormalContext; + NormalRoutine = Apc->NormalRoutine; + KernelRoutine = Apc->KernelRoutine; + NormalContext = Apc->NormalContext; SystemArgument1 = Apc->SystemArgument1; SystemArgument2 = Apc->SystemArgument2; @@ -577,8 +577,8 @@ if (NormalRoutine == NULL) { /* Remove the APC from the list */ + RemoveEntryList(ApcListEntry); Apc->Inserted = FALSE; - RemoveEntryList(ApcListEntry); /* Go back to APC_LEVEL */ KeReleaseSpinLock(&Thread->ApcQueueLock, OldIrql); @@ -586,10 +586,10 @@ /* Call the Special APC */ DPRINT("Delivering a Special APC: %x\n", Apc); KernelRoutine(Apc, - &NormalRoutine, - &NormalContext, - &SystemArgument1, - &SystemArgument2); + &NormalRoutine, + &NormalContext, + &SystemArgument1, + &SystemArgument2); /* Raise IRQL and Lock again */ KeAcquireSpinLock(&Thread->ApcQueueLock, &OldIrql); @@ -612,8 +612,8 @@ } /* Dequeue the APC */ + Apc->Inserted = FALSE; RemoveEntryList(ApcListEntry); - Apc->Inserted = FALSE; /* Go back to APC_LEVEL */ KeReleaseSpinLock(&Thread->ApcQueueLock, OldIrql); @@ -621,10 +621,10 @@ /* Call the Kernel APC */ DPRINT("Delivering a Normal APC: %x\n", Apc); KernelRoutine(Apc, - &NormalRoutine, - &NormalContext, - &SystemArgument1, - &SystemArgument2); + &NormalRoutine, + &NormalContext, + &SystemArgument1, + &SystemArgument2); /* If There still is a Normal Routine, then we need to call this at PASSIVE_LEVEL */ if (NormalRoutine != NULL) { @@ -635,7 +635,7 @@ /* Call and Raise IRQ back to APC_LEVEL */ DPRINT("Calling the Normal Routine for a Normal APC: %x\n", Apc); - NormalRoutine(&NormalContext, &SystemArgument1, &SystemArgument2); + NormalRoutine(NormalContext, SystemArgument1, SystemArgument2); KeRaiseIrql(APC_LEVEL, &OldIrql); } @@ -657,23 +657,23 @@ Apc = CONTAINING_RECORD(ApcListEntry, KAPC, ApcListEntry); /* Save Parameters so that it's safe to free the Object in Kernel Routine*/ - NormalRoutine = Apc->NormalRoutine; - KernelRoutine = Apc->KernelRoutine; - NormalContext = Apc->NormalContext; + NormalRoutine = Apc->NormalRoutine; + KernelRoutine = Apc->KernelRoutine; + NormalContext = Apc->NormalContext; SystemArgument1 = Apc->SystemArgument1; SystemArgument2 = Apc->SystemArgument2; /* Remove the APC from Queue, restore IRQL and call the APC */ RemoveEntryList(ApcListEntry); Apc->Inserted = FALSE; + KeReleaseSpinLock(&Thread->ApcQueueLock, OldIrql); - KeReleaseSpinLock(&Thread->ApcQueueLock, OldIrql); DPRINT("Calling the Kernel Routine for for a User APC: %x\n", Apc); KernelRoutine(Apc, - &NormalRoutine, - &NormalContext, - &SystemArgument1, - &SystemArgument2); + &NormalRoutine, + &NormalContext, + &SystemArgument1, + &SystemArgument2); if (NormalRoutine == NULL) { @@ -685,11 +685,11 @@ /* Set up the Trap Frame and prepare for Execution in NTDLL.DLL */ DPRINT("Delivering a User APC: %x\n", Apc); KiInitializeUserApc(Reserved, - TrapFrame, - NormalRoutine, - NormalContext, - SystemArgument1, - SystemArgument2); + TrapFrame, + NormalRoutine, + NormalContext, + SystemArgument1, + SystemArgument2); } } else { _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-07-18 15:05:58 UTC (rev 16634) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-07-18 19:50:23 UTC (rev 16635) @@ -346,18 +346,23 @@ PVOID* SystemArgument1, PVOID* SystemArguemnt2) { - NTSTATUS ExitStatus = (NTSTATUS)Apc->NormalContext; + DPRINT1("PsExitSpecialApc called: 0x%x (proc: 0x%x)\n", + PsGetCurrentThread(), PsGetCurrentProcess()); - DPRINT("PsExitSpecialApc called: 0x%x (proc: 0x%x)\n", PsGetCurrentThread(), PsGetCurrentProcess()); + /* Don't do anything unless we are in User-Mode */ + if (Apc->SystemArgument2) + { + NTSTATUS ExitStatus = (NTSTATUS)Apc->NormalContext; - /* Free the APC */ - ExFreePool(Apc); + /* Free the APC */ + ExFreePool(Apc); - /* Terminate the Thread */ - PspExitThread(ExitStatus); + /* Terminate the Thread */ + PspExitThread(ExitStatus); - /* we should never reach this point! */ - KEBUGCHECK(0); + /* we should never reach this point! */ + KEBUGCHECK(0); + } } VOID @@ -366,14 +371,46 @@ PVOID SystemArgument1, PVOID SystemArgument2) { - /* Not fully supported yet... must work out some issues that - * I don't understand yet -- Alex - */ - DPRINT1("APC2\n"); - PspExitThread((NTSTATUS)NormalContext); + PKAPC Apc = (PKAPC)SystemArgument1; + PETHREAD Thread = PsGetCurrentThread(); + NTSTATUS ExitStatus; + + DPRINT1("PspExitNormalApc called: 0x%x (proc: 0x%x)\n", + PsGetCurrentThread(), PsGetCurrentProcess()); - /* we should never reach this point! */ - KEBUGCHECK(0); + /* This should never happen */ + ASSERT(!SystemArgument2); + + /* If this is a system thread, we can safely kill it from Kernel-Mode */ + if (PsIsSystemThread(Thread)) + { + /* Get the Exit Status */ + DPRINT1("Killing System Thread\n"); + ExitStatus = (NTSTATUS)Apc->NormalContext; + + /* Free the APC */ + ExFreePool(Apc); + + /* Exit the Thread */ + PspExitThread(ExitStatus); + } + + /* If we're here, this is not a System Thread, so kill it from User-Mode */ + DPRINT1("Initializing User-Mode APC\n"); + KeInitializeApc(Apc, + &Thread->Tcb, + OriginalApcEnvironment, + PsExitSpecialApc, + NULL, + PspExitNormalApc, + UserMode, + NormalContext); + + /* Now insert the APC with the User-Mode Flag */ + KeInsertQueueApc(Apc, Apc, (PVOID)UserMode, 2); + + /* Forcefully resume the thread */ + KeForceResumeThread(&Thread->Tcb); } /* @@ -402,14 +439,14 @@ /* Allocate the APC */ Apc = ExAllocatePoolWithTag(NonPagedPool, sizeof(KAPC), TAG_TERMINATE_APC); - /* Initialize a User Mode APC to Kill the Thread */ + /* Initialize a Kernel Mode APC to Kill the Thread */ KeInitializeApc(Apc, &Thread->Tcb, OriginalApcEnvironment, PsExitSpecialApc, NULL, PspExitNormalApc, - UserMode, + KernelMode, (PVOID)ExitStatus); /* Insert it into the APC Queue */

1 0

[hbirr] 16634: Removed the message also from the senders queue (in MsqCleanupMessageQueue).
by hbirr＠svn.reactos.com 18 Jul '05

18 Jul '05

Removed the message also from the senders queue (in MsqCleanupMessageQueue). Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c --- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-07-18 14:10:56 UTC (rev 16633) +++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-07-18 15:05:58 UTC (rev 16634) @@ -1423,6 +1423,13 @@ CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); + IntLockMessageQueue(CurrentSentMessage->SenderQueue); + /* remove the message from the dispatching list */ + if(CurrentSentMessage->DispatchingListEntry.Flink != NULL) + { + RemoveEntryList(&CurrentSentMessage->DispatchingListEntry); + } + DPRINT("Notify the sender, the thread has been terminated while dispatching a message!\n"); /* wake the sender's thread */ @@ -1430,7 +1437,8 @@ { KeSetEvent(CurrentSentMessage->CompletionEvent, IO_NO_INCREMENT, FALSE); } - + IntUnLockMessageQueue(CurrentSentMessage->SenderQueue); + /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue); IntDereferenceMessageQueue(CurrentSentMessage->SenderQueue);

1 0

[hpoussin] 16633: Forward more exports to setupapi.dll
by hpoussin＠svn.reactos.com 18 Jul '05

18 Jul '05

Forward more exports to setupapi.dll Modified: trunk/reactos/lib/cfgmgr32/cfgmgr32.def _____ Modified: trunk/reactos/lib/cfgmgr32/cfgmgr32.def --- trunk/reactos/lib/cfgmgr32/cfgmgr32.def 2005-07-18 11:57:16 UTC (rev 16632) +++ trunk/reactos/lib/cfgmgr32/cfgmgr32.def 2005-07-18 14:10:56 UTC (rev 16633) @@ -25,8 +25,8 @@ ;CMP_UnregisterNotification ;CMP_WaitNoPendingInstallEvents ;CMP_WaitServices -;CM_Add_Empty_Log_Conf -;CM_Add_Empty_Log_Conf_Ex +;CM_Add_Empty_Log_Conf(a)16=SETUPAPI.CM_Add_Empty_Log_Conf +;CM_Add_Empty_Log_Conf_Ex(a)20=SETUPAPI.CM_Add_Empty_Log_Conf_Ex ;CM_Add_IDA ;CM_Add_IDW ;CM_Add_ID_ExA @@ -54,8 +54,8 @@ ;CM_Dup_Range_List ;CM_Enable_DevNode ;CM_Enable_DevNode_Ex -;CM_Enumerate_Classes -;CM_Enumerate_Classes_Ex +CM_Enumerate_Classes(a)12=SETUPAPI.CM_Enumerate_Classes +CM_Enumerate_Classes_Ex(a)16=SETUPAPI.CM_Enumerate_Classes_Ex ;CM_Enumerate_EnumeratorsA ;CM_Enumerate_EnumeratorsW ;CM_Enumerate_Enumerators_ExA @@ -81,10 +81,10 @@ ;CM_Get_Class_Name_ExW ;CM_Get_Depth ;CM_Get_Depth_Ex -;CM_Get_DevNode_Registry_PropertyA -;CM_Get_DevNode_Registry_PropertyW -;CM_Get_DevNode_Registry_Property_ExA -;CM_Get_DevNode_Registry_Property_ExW +CM_Get_DevNode_Registry_PropertyA(a)24=SETUPAPI.CM_Get_DevNode_Registry_P ropertyA +CM_Get_DevNode_Registry_PropertyW(a)24=SETUPAPI.CM_Get_DevNode_Registry_P ropertyW +CM_Get_DevNode_Registry_Property_ExA(a)28=SETUPAPI.CM_Get_DevNode_Registr y_Property_ExA +CM_Get_DevNode_Registry_Property_ExW(a)28=SETUPAPI.CM_Get_DevNode_Registr y_Property_ExW ;CM_Get_DevNode_Status ;CM_Get_DevNode_Status_Ex ;CM_Get_Device_IDA

1 0

[hpoussin] 16632: Move serial ports and mice classes parameters to their own .inf files. They would be regenerated during 2nd stage setup
by hpoussin＠svn.reactos.com 18 Jul '05

18 Jul '05

Move serial ports and mice classes parameters to their own .inf files. They would be regenerated during 2nd stage setup Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/media/inf/inf.xml Added: trunk/reactos/media/inf/mouse.inf Added: trunk/reactos/media/inf/ports.inf Modified: trunk/reactos/media/inf/syssetup.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-07-18 07:17:53 UTC (rev 16631) +++ trunk/reactos/bootdata/hivesys.inf 2005-07-18 11:57:16 UTC (rev 16632) @@ -578,16 +578,14 @@ ;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","Type",0x00010001,0x000000 01 ; i8042 port driver -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","ErrorControl",0x0001 0001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Group",0x00000000,"K eyboard Port" -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","ImagePath",0x0002000 0,"system32\drivers\i8042prt.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Start",0x00010001,0x 00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Type",0x00010001,0x0 0000001 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x0001 0001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Start",0x00010001,0x 00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x0 0000001 +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","Service",0x0000 0000,"i8042prt" +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","ClassGUID",0x00 000000,"{4D36E96B-E325-11CE-BFC1-08002BE10318}" +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","Service",0x0000 0000,"i8042prt" +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","ClassGUID",0x00 000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","SampleRat e",0x00010001,0x0000003c -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","BreakOnSy sRq",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","MouseReso lution",0x00010001,0x00000003 - ; Keyboard class driver HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010 001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Group",0x00000000,"Ke yboard Class" @@ -596,19 +594,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Type",0x00010001,0x00 000001 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08 002BE10318}","UpperFilters",0x00010000,"kbdclass" -; Serial port enumerator -HKLM,"SYSTEM\CurrentControlSet\Services\serenum","ErrorControl",0x00010 001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Group",0x00000000,"PN P Filter" -HKLM,"SYSTEM\CurrentControlSet\Services\serenum","ImagePath",0x00020000 ,"system32\drivers\serenum.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Start",0x00010001,0x0 0000003 -HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Type",0x00010001,0x00 000001 -;hard coded values -HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","0",0x00000000,"A CPI\PNP0501" -HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","Count",0x0001000 1,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","NextInstance",0x 00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","UpperFilters",0x00 010000,"serenum" -HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","UpperFilters",0x00 010000,"serenum" - ; SB16 driver HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Group",0x00000000,"Bas e" HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ServiceType",0x0001000 1,0x00000001 @@ -825,19 +810,12 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Null","Type",0x00010001,0x000000 01 ; Serial device driver -HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ErrorControl",0x000100 01,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Group",0x00000000,"Ext ended Base" -HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ImagePath",0x00020000, "system32\drivers\serial.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Start",0x00010001,0x00 000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Type",0x00010001,0x000 00001 -;hard coded values -HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","0",0x00000000,"AC PI\PNP0501" -HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","Count",0x00010001 ,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","NextInstance",0x0 0010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","ClassGUID",0x000000 00,"{4D36E978-E325-11CE-BFC1-08002BE10318}" HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","Service",0x00000000 ,"serial" +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","UpperFilters",0x00 010000,"serenum" HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","ClassGUID",0x000000 00,"{4D36E978-E325-11CE-BFC1-08002BE10318}" HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","Service",0x00000000 ,"serial" +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","UpperFilters",0x00 010000,"serenum" ; Packet driver HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ErrorControl",0x0001000 1,0x00000001 _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-07-18 07:17:53 UTC (rev 16631) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-07-18 11:57:16 UTC (rev 16632) @@ -265,5 +265,7 @@ media\drivers\etc\services 5 media\inf\NET_NIC.inf 6 media\inf\layout.inf 6 +media\inf\mouse.inf 6 +media\inf\ports.inf 6 media\inf\scsi.inf 6 media\inf\syssetup.inf 6 _____ Modified: trunk/reactos/media/inf/inf.xml --- trunk/reactos/media/inf/inf.xml 2005-07-18 07:17:53 UTC (rev 16631) +++ trunk/reactos/media/inf/inf.xml 2005-07-18 11:57:16 UTC (rev 16632) @@ -1,4 +1,6 @@ <installfile base="inf">layout.inf</installfile> +<installfile base="inf">mouse.inf</installfile> <installfile base="inf">NET_NIC.inf</installfile> +<installfile base="inf">ports.inf</installfile> <installfile base="inf">scsi.inf</installfile> <installfile base="inf">syssetup.inf</installfile> _____ Added: trunk/reactos/media/inf/mouse.inf --- trunk/reactos/media/inf/mouse.inf 2005-07-18 07:17:53 UTC (rev 16631) +++ trunk/reactos/media/inf/mouse.inf 2005-07-18 11:57:16 UTC (rev 16632) @@ -0,0 +1,127 @@ +; MOUSE.INF + +; Installation file for mouse devices + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = Mouse +ClassGUID = {4D36E96F-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 10/19/1999,5.00.2157.1 + +[DestinationDirs] +DefaultDestDir = 12 + +[ClassInstall32.NT] +AddReg = MouseClass.NT.AddReg + +[MouseClass.NT.AddReg] +HKR, , , 0, %MouseClassName% +HKR, , Icon, 0, "-2" +HKR, , Installer32, 0, "syssetup.dll,MouseClassInstaller" +HKR, , NoInstallClass, 0, 1 + +[Manufacturer] +%StdMfg% = StdMfg +%LogMfg = LogMsf +%MSMfg% = MSMfg + +[StdMfg] +%SERIAL_MOUSE.DeviceDesc% = Serial_Inst,*PNP0F0C,SERENUM\PNP0F0C,*PNP0F17,SERENUM\PNP0F17,SERIAL_MOU SE +%PS2_MOUSE.DeviceDesc% = PS2_Inst,*PNP0F0E,*PNP0F19,PS2_MOUSE + +[LogMfg] +%*PNP0F08.DeviceDesc% = Serial_Inst,*PNP0F08,SERENUM\PNP0F08 +%*PNP0F12.DeviceDesc% = PS2_Inst,*PNP0F12 + +[MSMfg] +%*PNP0F01.DeviceDesc% = Serial_Inst,*PNP0F01,SERENUM\PNP0F01 +%*PNP0F03.DeviceDesc% = PS2_Inst,*PNP0F03 +%*PNP0F13.DeviceDesc" = PS2_Inst,*PNP0F13 + +;---------------------------- MOUCLASS DRIVER --------------------------- + +[Mouclass_CopyFiles.NT] +mouclass.sys + +[mouclass_Service_Inst] +ServiceType = 1 +StartType = 3 +ErrorControl = 1 +ServiceBinary = %12%\mouclass.sys +LoadOrderGroup = Pointer Class + +;----------------------------- SERIAL DRIVER ---------------------------- + +[Serial_Inst.NT] +CopyFiles = Serial_CopyFiles, Mouclass_CopyFiles + +[Serial_CopyFiles.NT] +sermouse.sys + +[Serial_Inst.NT.Services] +AddService = sermouse, 0x00000002, sermouse_Service_Inst +AddService = mouclass, , mouclass_Service_Inst + +[sermouse_Service_Inst] +ServiceType = 1 +StartType = 1 +ErrorControl = 1 +ServiceBinary = %12%\sermouse.sys +LoadOrderGroup = Pointer Port + +;------------------------------ PS/2 DRIVER ----------------------------- + +[PS2_Inst.NT] +CopyFiles = PS2_CopyFiles, Mouclass_CopyFiles +AddReg = PS2_AddReg + +[PS2_CopyFiles.NT] +i8042prt.sys + +[PS2_Inst.NT.Services] +AddService = i8042prt, 0x00000002, i8042prt_Service_Inst +AddService = mouclass, , mouclass_Service_Inst + +[i8042prt_Service_Inst] +ServiceType = 1 +StartType = 1 +ErrorControl = 1 +ServiceBinary = %12%\i8042prt.sys +LoadOrderGroup = Keyboard Port + +[PS2_AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","SampleRat e",0x00010001,0x0000003c +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSy sRq",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","MouseReso lution",0x00010001,0x00000003 + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" +MouseClassName = "Mice and other pointing devices" +StdMfg = "(Standard mice)" +LogMfg = "Logitech" +MSMfg = "Microsoft" + +*PNP0F01.DeviceDesc = "Microsoft Serial Mouse" +*PNP0F03.DeviceDesc = "Microsoft PS/2-style Mouse" +*PNP0F08.DeviceDesc = "Logitech Serial Mouse" +*PNP0F12.DeviceDesc = "Logitech PS/2-style Mouse" +*PNP0F13.DeviceDesc = "PS/2 port for PS/2-style mice" +SERIAL_MOUSE.DeviceDesc = "Standard Serial Mouse" +PS2_MOUSE.DeviceDesc = "Standard PS/2 Mouse" + +[String.040c] +MouseClassName = "Souris et autres dispositifs de pointage" +StdMfg = "(Souris standard)" + +*PNP0F01.DeviceDesc = "Souris Microsoft sur port sÚrie" +*PNP0F03.DeviceDesc = "Souris Microsoft sur port PS/2" +*PNP0F08.DeviceDesc = "Souris Logitech sur port sÚrie" +*PNP0F12.DeviceDesc = "Souris Logitech sur port PS/2" +*PNP0F13.DeviceDesc = "Souris compatible PS/2" +SERIAL_MOUSE.DeviceDesc = "Souris standard sur port sÚrie" +PS2_MOUSE.DeviceDesc = "Souris standard sur port PS/2" \ No newline at end of file _____ Added: trunk/reactos/media/inf/ports.inf --- trunk/reactos/media/inf/ports.inf 2005-07-18 07:17:53 UTC (rev 16631) +++ trunk/reactos/media/inf/ports.inf 2005-07-18 11:57:16 UTC (rev 16632) @@ -0,0 +1,74 @@ +; PORTS.INF + +; Installation file for communication ports + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = Ports +ClassGUID = {4D36E978-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 10/19/1999,5.00.2157.1 + +[DestinationDirs] +DefaultDestDir = 12 + +[ClassInstall32.NT] +AddReg = PortsClass.NT.AddReg + +[PortsClass.NT.AddReg] +HKR, , , 0, %PortsClassName% +HKR, , Icon, 0, "-23" +HKR, , Installer32, 0, "msports.dll,PortsClassInstaller" + +[Manufacturer] +%StdMfg% = StdMfg + +[StdMfg] +%*PNP0500.DeviceDesc% = ComPort_Inst,*PNP0500,*PNP0501 +%*PNP0501.DeviceDesc% = ComPort_Inst,*PNP0501 + +;---------------------------- COM PORT DRIVER --------------------------- + +[ComPort_Inst.NT] +CopyFiles = ComPort_CopyFiles.NT + +[ComPort_CopyFiles.NT] +serial.sys +serenum.sys + +[ComPort_Inst.NT.Services] +AddService = serial, 0x00000002, serial_Service_Inst +AddService = serenum, , serenum_Service_Inst + +[serial_Service_Inst] +ServiceType = 1 +StartType = 1 +ErrorControl = 0 +ServiceBinary = %12%\serial.sys +LoadOrderGroup = Extended base + +[serenum_Service_Inst] +ServiceType = 1 +StartType = 3 +ErrorControl = 1 +ServiceBinary = %12%\serenum.sys +LoadOrderGroup = PNP Filter + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" +PortsClassName = "Serial and parallel ports" +StdMfg = "(Standard ports)" + +*PNP0500.DeviceDesc = "Serial communication port" +*PNP0501.DeviceDesc = "Serial communication port" + +[String.040c] +PortsClassName = "Ports (SÚrie et parallÞle)" +StdMfg = "(Ports standard)" + +*PNP0500.DeviceDesc = "Port de communication sÚrie" +*PNP0501.DeviceDesc = "Port de communication sÚrie" \ No newline at end of file _____ Modified: trunk/reactos/media/inf/syssetup.inf --- trunk/reactos/media/inf/syssetup.inf 2005-07-18 07:17:53 UTC (rev 16631) +++ trunk/reactos/media/inf/syssetup.inf 2005-07-18 11:57:16 UTC (rev 16632) @@ -14,5 +14,7 @@ [DeviceInfsToInstall] ; MS uses netnovel.inf as class-installer INF for NICs ; we use a separate one to keep things clean +mouse.inf NET_NIC.inf +ports.inf scsi.inf

1 0

[hpoussin] 16631: Implement SetupDiGetDeviceRegistryPropertyA/W
by hpoussin＠svn.reactos.com 18 Jul '05

18 Jul '05

Implement SetupDiGetDeviceRegistryPropertyA/W Change the way devices are enumerated in SetupDiGetClassDevsExW. Now, it enumerates subkeys of HKLM\SYSTEM\CurrentControlSet\Enum instead of HLKM\SYSTEM\CurrentControlSet\Control\Class ones. Free the temp buffer in SetupDiGetDeviceRegistryPropertyA only when it is no more usefull Replace RegOpenKeyEx by RegOpenKeyExW Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-07-18 03:13:11 UTC (rev 16630) +++ trunk/reactos/lib/setupapi/devinst.c 2005-07-18 07:17:53 UTC (rev 16631) @@ -85,7 +85,7 @@ struct { GUID ClassGuid; - WCHAR RegistryKey[0]; /* "0000", "0001"... */ + WCHAR InstancePath[0]; /* "ACPI\PNP0501\4&2658d0a0&0" */ } Device; struct { @@ -723,7 +723,12 @@ &DevInfo->Device.ClassGuid, sizeof(GUID)); DeviceInfoData->DevInst = 0; /* FIXME */ - DeviceInfoData->Reserved = (ULONG_PTR)0; + /* Note: this appears to be dangerous, passing a private + * pointer a heap-allocated datum to the caller. However, the + * expected lifetime of the device data is the same as the + * HDEVINFO; once that is closed, the data are no longer valid. + */ + DeviceInfoData->Reserved = (ULONG_PTR)DevInfo; ret = TRUE; } else @@ -1082,62 +1087,219 @@ return ret; } -static LONG SETUP_CreateDevListFromClass( - DeviceInfoList *list, - PCWSTR MachineName, - LPGUID class, - PCWSTR Enumerator) +static LONG SETUP_CreateDevListFromEnumerator( + DeviceInfoList* list, + LPCGUID pClassGuid OPTIONAL, + LPCWSTR pClassGuidW OPTIONAL, /* pClassGuid in string form */ + LPCWSTR Enumerator, + HKEY hEnumeratorKey) /* handle to Enumerator registry key */ { - HKEY KeyClass; - LONG rc; - DWORD subKeys = 0, maxSubKey; + HKEY hDeviceIdKey, hInstanceIdKey; + WCHAR KeyBuffer[MAX_PATH]; + WCHAR InstancePath[MAX_PATH]; + LPWSTR pEndOfInstancePath; /* Pointer into InstancePath buffer */ DeviceInfo* deviceInfo; + DWORD i = 0, j; + DWORD dwLength, dwRegType; + DWORD rc; + + /* Enumerate device IDs (subkeys of hEnumeratorKey) */ + while (TRUE) + { + dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); + rc = RegEnumKeyExW(hEnumeratorKey, i, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); + if (rc == ERROR_NO_MORE_ITEMS) + break; + if (rc != ERROR_SUCCESS) + return rc; + i++; + + /* Open device id sub key */ + rc = RegOpenKeyExW(hEnumeratorKey, KeyBuffer, 0, KEY_ENUMERATE_SUB_KEYS, &hDeviceIdKey); + if (rc != ERROR_SUCCESS) + return rc; + wcscpy(InstancePath, Enumerator); + wcscat(InstancePath, L"\\"); + wcscat(InstancePath, KeyBuffer); + wcscat(InstancePath, L"\\"); + pEndOfInstancePath = &InstancePath[wcslen(InstancePath)]; + + /* Enumerate instance IDs (subkeys of hDeviceIdKey) */ + j = 0; + while (TRUE) + { + dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); + rc = RegEnumKeyExW(hDeviceIdKey, j, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); + if (rc == ERROR_NO_MORE_ITEMS) + break; + if (rc != ERROR_SUCCESS) + { + RegCloseKey(hDeviceIdKey); + return rc; + } + j++; + + /* Open instance id sub key */ + rc = RegOpenKeyExW(hDeviceIdKey, KeyBuffer, 0, KEY_QUERY_VALUE, &hInstanceIdKey); + if (rc != ERROR_SUCCESS) + { + RegCloseKey(hDeviceIdKey); + return rc; + } + *pEndOfInstancePath = UNICODE_NULL; + wcscat(InstancePath, KeyBuffer); + + /* Read ClassGUID value */ + dwLength = sizeof(KeyBuffer) - sizeof(UNICODE_NULL); + rc = RegQueryValueExW(hInstanceIdKey, ClassGUID, NULL, &dwRegType, (LPBYTE)KeyBuffer, &dwLength); + RegCloseKey(hInstanceIdKey); + if (rc == ERROR_FILE_NOT_FOUND) + { + if (pClassGuidW) + /* Skip this bad entry as we can't verify it */ + continue; + } + else if (rc != ERROR_SUCCESS) + { + RegCloseKey(hDeviceIdKey); + return rc; + } + else if (dwRegType != REG_SZ) + { + RegCloseKey(hDeviceIdKey); + return ERROR_GEN_FAILURE; + } + else if (pClassGuidW) + { + if (wcsicmp(KeyBuffer, pClassGuidW) != 0) + /* Skip this entry as it is not the right device class */ + continue; + } + + /* Add the entry to the list */ + deviceInfo = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DeviceInfo, Device.InstancePath) + wcslen(InstancePath) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!deviceInfo) + { + RegCloseKey(hDeviceIdKey); + return ERROR_NO_SYSTEM_RESOURCES; + } + deviceInfo->IsDevice = TRUE; + memcpy(&deviceInfo->Device.ClassGuid, pClassGuid, sizeof(GUID)); + wcscpy(deviceInfo->Device.InstancePath, InstancePath); + InsertTailList(&list->ListHead, &deviceInfo->ItemEntry); + list->numberOfEntries++; + } + RegCloseKey(hDeviceIdKey); + } + + return ERROR_SUCCESS; +} + +static LONG SETUP_CreateDevList( + DeviceInfoList* list, + PCWSTR MachineName OPTIONAL, + LPGUID class OPTIONAL, + PCWSTR Enumerator OPTIONAL) +{ + HKEY HKLM, hEnumKey, hEnumeratorKey; + WCHAR szGuidString[MAX_GUID_STRING_LEN + 3]; + WCHAR KeyBuffer[MAX_PATH]; DWORD i; + DWORD dwLength; + DWORD rc; - KeyClass = SetupDiOpenClassRegKeyExW(class, KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, DIOCR_INSTALLER, MachineName, NULL); - if (KeyClass == INVALID_HANDLE_VALUE) - return GetLastError(); + /* Create szGuidString */ + if (class && !IsEqualIID(&class, &GUID_NULL)) + { + LPWSTR lpGuidString; + if (UuidToStringW((UUID *)class, &lpGuidString) != RPC_S_OK) + return ERROR_GEN_FAILURE; + wcscpy(szGuidString, L"{"); + wcscat(szGuidString, lpGuidString); + wcscat(szGuidString, L"}"); + RpcStringFreeW(&lpGuidString); + } + else + { + class = NULL; + szGuidString[0] = UNICODE_NULL; + } - if (Enumerator) - FIXME("Enumerator parameter ignored\n"); + /* Open Enum key */ + if (MachineName != NULL) + { + rc = RegConnectRegistryW(MachineName, HKEY_LOCAL_MACHINE, &HKLM); + if (rc != ERROR_SUCCESS) + return rc; + } + else + HKLM = HKEY_LOCAL_MACHINE; - rc = RegQueryInfoKeyW( - KeyClass, - NULL, NULL, - NULL, - &subKeys, - &maxSubKey, - NULL, NULL, NULL, NULL, NULL, NULL); + rc = RegOpenKeyExW(HKLM, + EnumKeyName, + 0, + KEY_ENUMERATE_SUB_KEYS, + &hEnumKey); + if (MachineName != NULL) RegCloseKey(HKLM); if (rc != ERROR_SUCCESS) + return rc; + + /* If enumerator is provided, call directly SETUP_CreateDevListFromEnumerator. + * Else, enumerate all enumerators all call SETUP_CreateDevListFromEnumerator + * for each one. + */ + if (Enumerator) { - RegCloseKey(KeyClass); + rc = RegOpenKeyExW( + hEnumKey, + Enumerator, + 0, + KEY_ENUMERATE_SUB_KEYS, + &hEnumeratorKey); + RegCloseKey(hEnumKey); + if (rc != ERROR_SUCCESS) + return rc; + rc = SETUP_CreateDevListFromEnumerator(list, class, *szGuidString ? szGuidString : NULL, Enumerator, hEnumeratorKey); + RegCloseKey(hEnumeratorKey); return rc; } - - for (i = 0; i < subKeys; i++) + else { - deviceInfo = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DeviceInfo, Device.RegistryKey) + maxSubKey * sizeof(WCHAR)); - if (!deviceInfo) + /* Enumerate enumerators */ + i = 0; + while (TRUE) { - RegCloseKey(KeyClass); - return ERROR_NO_SYSTEM_RESOURCES; + dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); + rc = RegEnumKeyExW(hEnumKey, i, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); + if (rc == ERROR_NO_MORE_ITEMS) + break; + if (rc != ERROR_SUCCESS) + { + RegCloseKey(hEnumKey); + return rc; + } + i++; + + /* Open sub key */ + rc = RegOpenKeyExW(hEnumKey, KeyBuffer, 0, KEY_ENUMERATE_SUB_KEYS, &hEnumeratorKey); + if (rc != ERROR_SUCCESS) + { + RegCloseKey(hEnumKey); + return rc; + } + + /* Call SETUP_CreateDevListFromEnumerator */ + rc = SETUP_CreateDevListFromEnumerator(list, class, *szGuidString ? szGuidString : NULL, KeyBuffer, hEnumeratorKey); + RegCloseKey(hEnumeratorKey); + if (rc != ERROR_SUCCESS) + { + RegCloseKey(hEnumKey); + return rc; + } } - rc = RegEnumKeyW(KeyClass, i, &deviceInfo->Device.RegistryKey[0], maxSubKey); - if (rc == ERROR_NO_MORE_ITEMS) - break; - if (rc != ERROR_SUCCESS) - { - RegCloseKey(KeyClass); - return rc; - } - deviceInfo->IsDevice = TRUE; - memcpy(&deviceInfo->Device.ClassGuid, class, sizeof(GUID)); - InsertTailList(&list->ListHead, &deviceInfo->ItemEntry); - list->numberOfEntries++; + RegCloseKey(hEnumKey); + return ERROR_SUCCESS; } - - RegCloseKey(KeyClass); - return ERROR_SUCCESS; } #ifdef __WINE__ @@ -1255,7 +1417,7 @@ i++; /* Open sub key */ - rc = RegOpenKeyEx(hInterfaceKey, KeyBuffer, 0, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, &hDeviceInstanceKey); + rc = RegOpenKeyExW(hInterfaceKey, KeyBuffer, 0, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, &hDeviceInstanceKey); if (rc != ERROR_SUCCESS) { RegCloseKey(hInterfaceKey); @@ -1306,7 +1468,7 @@ } /* Find class GUID associated to the device instance */ - rc = RegOpenKeyEx( + rc = RegOpenKeyExW( HKEY_LOCAL_MACHINE, EnumKeyName, 0, /* Options */ @@ -1319,7 +1481,7 @@ RegCloseKey(hInterfaceKey); return rc; } - rc = RegOpenKeyEx( + rc = RegOpenKeyExW( hEnumKey, InstancePath, 0, /* Options */ @@ -1383,7 +1545,7 @@ continue; /* Open sub key */ - rc = RegOpenKeyEx(hDeviceInstanceKey, KeyBuffer, 0, KEY_QUERY_VALUE, &hReferenceKey); + rc = RegOpenKeyExW(hDeviceInstanceKey, KeyBuffer, 0, KEY_QUERY_VALUE, &hReferenceKey); if (rc != ERROR_SUCCESS) { RegCloseKey(hDeviceInstanceKey); @@ -1462,9 +1624,6 @@ HDEVINFO hDeviceInfo = INVALID_HANDLE_VALUE; DeviceInfoList *list; LPGUID pClassGuid; - LPGUID ClassGuidList; - DWORD RequiredSize; - LONG i; LONG rc; TRACE("%s %s %p 0x%08lx %p %s %p\n", debugstr_guid(class), debugstr_w(enumstr), @@ -1503,47 +1662,14 @@ if (flags & DIGCF_ALLCLASSES) { - /* Get list of device classes */ - SetupDiBuildClassInfoList(0, NULL, 0, &RequiredSize); - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + rc = SETUP_CreateDevList(list, machine, pClassGuid, enumstr); + if (rc != ERROR_SUCCESS) { + SetLastError(rc); if (!deviceset) SetupDiDestroyDeviceInfoList(hDeviceInfo); return INVALID_HANDLE_VALUE; } - ClassGuidList = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(GUID)); - if (!ClassGuidList) - { - if (!deviceset) - SetupDiDestroyDeviceInfoList(hDeviceInfo); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return INVALID_HANDLE_VALUE; - } - if (!SetupDiBuildClassInfoListExW(0, ClassGuidList, RequiredSize, &RequiredSize, machine, NULL)) - { - HeapFree(GetProcessHeap(), 0, ClassGuidList); - if (!deviceset) - SetupDiDestroyDeviceInfoList(hDeviceInfo); - return INVALID_HANDLE_VALUE; - } - - /* Enumerate devices in each device class */ - for (i = 0; i < RequiredSize; i++) - { - if (pClassGuid == NULL || IsEqualIID(pClassGuid, &ClassGuidList[i])) - { - rc = SETUP_CreateDevListFromClass(list, machine, &ClassGuidList[i], enumstr); - if (rc != ERROR_SUCCESS) - { - HeapFree(GetProcessHeap(), 0, ClassGuidList); - SetLastError(rc); - if (!deviceset) - SetupDiDestroyDeviceInfoList(hDeviceInfo); - return INVALID_HANDLE_VALUE; - } - } - } - HeapFree(GetProcessHeap(), 0, ClassGuidList); return hDeviceInfo; } else if (flags & DIGCF_DEVICEINTERFACE) @@ -1581,7 +1707,7 @@ } else { - rc = SETUP_CreateDevListFromClass(list, machine, (LPGUID)class, enumstr); + rc = SETUP_CreateDevList(list, machine, (LPGUID)class, enumstr); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -1630,7 +1756,11 @@ ItemList = ItemList->Flink; DevInfo = (DeviceInfo *)ItemList; - if (!DevInfo->IsDevice) + if (DevInfo->IsDevice) + SetLastError(ERROR_INVALID_PARAMETER); + else if (!IsEqualIID(&DevInfo->Interface.InterfaceGuid, InterfaceClassGuid)) + SetLastError(ERROR_INVALID_PARAMETER); + else { memcpy(&DeviceInterfaceData->InterfaceClassGuid, &DevInfo->Interface.InterfaceGuid, @@ -1644,10 +1774,6 @@ DeviceInterfaceData->Reserved = (ULONG_PTR)DevInfo; ret = TRUE; } - else - { - SetLastError(ERROR_INVALID_PARAMETER); - } } } else @@ -1816,7 +1942,12 @@ &deviceInfo->Interface.ClassGuid, sizeof(GUID)); DeviceInfoData->DevInst = 0; /* FIXME */ - DeviceInfoData->Reserved = (ULONG_PTR)0; + /* Note: this appears to be dangerous, passing a private + * pointer a heap-allocated datum to the caller. However, the + * expected lifetime of the device data is the same as the + * HDEVINFO; once that is closed, the data are no longer valid. + */ + DeviceInfoData->Reserved = (ULONG_PTR)deviceInfo; } ret = TRUE; } @@ -1861,12 +1992,13 @@ PropertyBufferSizeW, &RequiredSizeW); - HeapFree(GetProcessHeap(), 0, PropertyBufferW); - if (!bResult) + { + HeapFree(GetProcessHeap(), 0, PropertyBufferW); return bResult; + } - bIsStringProperty = (RegType == REG_SZ || RegType == REG_MULTI_SZ); + bIsStringProperty = (RegType == REG_SZ || RegType == REG_MULTI_SZ || RegType == REG_EXPAND_SZ); if (bIsStringProperty) RequiredSizeA = RequiredSizeW / sizeof(WCHAR); @@ -1892,6 +2024,7 @@ bResult = FALSE; } + HeapFree(GetProcessHeap(), 0, PropertyBufferW); if (PropertyRegDataType) *PropertyRegDataType = RegType; if (RequiredSize) @@ -1903,7 +2036,7 @@ * SetupDiGetDeviceRegistryPropertyW (SETUPAPI.@) */ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( - HDEVINFO devinfo, + HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD Property, PDWORD PropertyRegDataType, @@ -1911,11 +2044,181 @@ DWORD PropertyBufferSize, PDWORD RequiredSize) { - FIXME("%04lx %p %ld %p %p %ld %p\n", (DWORD)devinfo, DeviceInfoData, + HKEY hEnumKey, hKey; + DWORD rc; + BOOL ret = FALSE; + + TRACE("%p %p %ld %p %p %ld %p\n", DeviceInfoSet, DeviceInfoData, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); - SetLastError(ERROR_GEN_FAILURE); - return FALSE; + + if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + SetLastError(ERROR_INVALID_HANDLE); + else if (((DeviceInfoList *)DeviceInfoSet)->magic != SETUP_DEV_INFO_LIST_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (!DeviceInfoData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (Property >= SPDRP_MAXIMUM_PROPERTY) + SetLastError(ERROR_INVALID_PARAMETER); + else if (!((DeviceInfo *)DeviceInfoData->Reserved)->IsDevice) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + DeviceInfoList *list = (DeviceInfoList *)DeviceInfoSet; + DeviceInfo* DevInfo = (DeviceInfo *)DeviceInfoData->Reserved; + + switch (Property) + { + LPCWSTR RegistryPropertyName; + DWORD BufferSize; + + case SPDRP_CAPABILITIES: + case SPDRP_CLASS: + case SPDRP_CLASSGUID: + case SPDRP_COMPATIBLEIDS: + case SPDRP_CONFIGFLAGS: + case SPDRP_DEVICEDESC: + case SPDRP_DRIVER: + case SPDRP_FRIENDLYNAME: + case SPDRP_HARDWAREID: + case SPDRP_LOCATION_INFORMATION: + case SPDRP_LOWERFILTERS: + case SPDRP_MFG: + case SPDRP_SECURITY: + case SPDRP_SERVICE: + case SPDRP_UI_NUMBER: + case SPDRP_UPPERFILTERS: + { + switch (Property) + { + case SPDRP_CAPABILITIES: + RegistryPropertyName = L"Capabilities"; break; + case SPDRP_CLASS: + RegistryPropertyName = L"Class"; break; + case SPDRP_CLASSGUID: + RegistryPropertyName = L"ClassGUID"; break; + case SPDRP_COMPATIBLEIDS: + RegistryPropertyName = L"CompatibleIDs"; break; + case SPDRP_CONFIGFLAGS: + RegistryPropertyName = L"ConfigFlags"; break; + case SPDRP_DEVICEDESC: + RegistryPropertyName = L"DeviceDesc"; break; + case SPDRP_DRIVER: + RegistryPropertyName = L"Driver"; break; + case SPDRP_FRIENDLYNAME: + RegistryPropertyName = L"FriendlyName"; break; + case SPDRP_HARDWAREID: + RegistryPropertyName = L"HardwareID"; break; + case SPDRP_LOCATION_INFORMATION: + RegistryPropertyName = L"LocationInformation"; break; + case SPDRP_LOWERFILTERS: + RegistryPropertyName = L"LowerFilters"; break; + case SPDRP_MFG: + RegistryPropertyName = L"Mfg"; break; + case SPDRP_SECURITY: + RegistryPropertyName = L"Security"; break; + case SPDRP_SERVICE: + RegistryPropertyName = L"Service"; break; + case SPDRP_UI_NUMBER: + RegistryPropertyName = L"UINumber"; break; + case SPDRP_UPPERFILTERS: + RegistryPropertyName = L"UpperFilters"; break; + default: + /* Should not happen */ + break; + } + + /* Open registry key name */ + rc = RegOpenKeyExW( + list->HKLM, + EnumKeyName, + 0, /* Options */ + KEY_ENUMERATE_SUB_KEYS, + &hEnumKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + break; + } + rc = RegOpenKeyExW( + hEnumKey, + DevInfo->Device.InstancePath, + 0, /* Options */ + KEY_QUERY_VALUE, + &hKey); + RegCloseKey(hEnumKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + break; + } + /* Read registry entry */ + BufferSize = PropertyBufferSize; + rc = RegQueryValueExW( + hKey, + RegistryPropertyName, + NULL, /* Reserved */ + PropertyRegDataType, + PropertyBuffer, + &BufferSize); + if (RequiredSize) + *RequiredSize = BufferSize; + if (rc == ERROR_SUCCESS) + ret = TRUE; + else + SetLastError(rc); + RegCloseKey(hKey); + break; + } + + case SPDRP_PHYSICAL_DEVICE_OBJECT_NAME: + { + DWORD required = wcslen(DevInfo->Device.InstancePath) * sizeof(WCHAR) + sizeof(UNICODE_NULL); + + if (PropertyRegDataType) + *PropertyRegDataType = REG_SZ; + if (RequiredSize) + *RequiredSize = required; + if (PropertyBufferSize >= required) + { + wcscpy((LPWSTR)PropertyBuffer, DevInfo->Device.InstancePath); + ret = TRUE; + } + else + SetLastError(ERROR_INSUFFICIENT_BUFFER); + break; + } + + /*case SPDRP_BUSTYPEGUID: + case SPDRP_LEGACYBUSTYPE: + case SPDRP_BUSNUMBER: + case SPDRP_ENUMERATOR_NAME: + case SPDRP_SECURITY_SDS: + case SPDRP_DEVTYPE: + case SPDRP_EXCLUSIVE: + case SPDRP_CHARACTERISTICS: + case SPDRP_ADDRESS: + case SPDRP_UI_NUMBER_DESC_FORMAT: + case SPDRP_DEVICE_POWER_DATA:*/ +#if (WINVER >= 0x501) + /*case SPDRP_REMOVAL_POLICY: + case SPDRP_REMOVAL_POLICY_HW_DEFAULT: + case SPDRP_REMOVAL_POLICY_OVERRIDE: + case SPDRP_INSTALL_STATE:*/ +#endif + + default: + { + FIXME("Property 0x%lx not implemented\n", Property); + SetLastError(ERROR_NOT_SUPPORTED); + } + } + } + + TRACE("Returning %d\n", ret); + return ret; }

1 0

[jimtabor] 16630: Implement ShowOwnedPopups and ArrangeIconicWindows. Based on Wine. More work is needed on both.
by jimtabor＠svn.reactos.com 18 Jul '05

18 Jul '05

Implement ShowOwnedPopups and ArrangeIconicWindows. Based on Wine. More work is needed on both. Modified: trunk/reactos/lib/user32/windows/defwnd.c Modified: trunk/reactos/lib/user32/windows/window.c Modified: trunk/reactos/lib/user32/windows/winpos.c _____ Modified: trunk/reactos/lib/user32/windows/defwnd.c --- trunk/reactos/lib/user32/windows/defwnd.c 2005-07-18 03:12:01 UTC (rev 16629) +++ trunk/reactos/lib/user32/windows/defwnd.c 2005-07-18 03:13:11 UTC (rev 16630) @@ -1269,14 +1269,15 @@ if (!lParam) return 0; Style = GetWindowLongW(hWnd, GWL_STYLE); - if (!(Style & WS_POPUP)) - return 0; +// if (!(Style & WS_POPUP)) +// return 0; if ((Style & WS_VISIBLE) && wParam) return 0; if (!(Style & WS_VISIBLE) && !wParam) return 0; if (!GetWindow(hWnd, GW_OWNER)) return 0; + NtUserCallTwoParam((DWORD) hWnd, (DWORD) wParam, TWOPARAM_ROUTINE_ROS_SHOWWINDOW); ShowWindow(hWnd, wParam ? SW_SHOWNA : SW_HIDE); break; } _____ Modified: trunk/reactos/lib/user32/windows/window.c --- trunk/reactos/lib/user32/windows/window.c 2005-07-18 03:12:01 UTC (rev 16629) +++ trunk/reactos/lib/user32/windows/window.c 2005-07-18 03:13:11 UTC (rev 16630) @@ -51,17 +51,6 @@ /* * @unimplemented */ -UINT STDCALL -ArrangeIconicWindows(HWND hWnd) -{ - UNIMPLEMENTED; - return 0; -} - - -/* - * @unimplemented - */ HDWP STDCALL BeginDeferWindowPos(int nNumWindows) { @@ -1084,15 +1073,15 @@ BOOL visible; visible = IsWindowVisible(hwnd); -// if(!IsWindow(hwnd) || -// (visible && !(dwFlags & AW_HIDE)) || -// (!visible && (dwFlags & AW_HIDE))) + if(!IsWindow(hwnd) || + (visible && !(dwFlags & AW_HIDE)) || + (!visible && (dwFlags & AW_HIDE))) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } -// ShowWindow(hwnd, (dwFlags & AW_HIDE) ? SW_HIDE : ((dwFlags & AW_ACTIVATE) ? SW_SHOW : SW_SHOWNA)); + ShowWindow(hwnd, (dwFlags & AW_HIDE) ? SW_HIDE : ((dwFlags & AW_ACTIVATE) ? SW_SHOW : SW_SHOWNA)); return TRUE; } @@ -1273,14 +1262,13 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL ShowOwnedPopups(HWND hWnd, BOOL fShow) { - UNIMPLEMENTED; - return FALSE; + return (BOOL)NtUserCallTwoParam((DWORD)hWnd, fShow, TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS); } _____ Modified: trunk/reactos/lib/user32/windows/winpos.c --- trunk/reactos/lib/user32/windows/winpos.c 2005-07-18 03:12:01 UTC (rev 16629) +++ trunk/reactos/lib/user32/windows/winpos.c 2005-07-18 03:13:11 UTC (rev 16630) @@ -55,3 +55,11 @@ return(NtUserSetActiveWindow(hWnd)); } +/* + * @unimplemented + */ +UINT STDCALL +ArrangeIconicWindows(HWND hWnd) +{ + return NtUserCallHwndLock( hWnd, HWNDLOCK_ROUTINE_ARRANGEICONICWINDOWS); +}

1 0

[jimtabor] 16629: Implement ShowOwnedPopups and ArrangeIconicWindows. Based on Wine.
by jimtabor＠svn.reactos.com 18 Jul '05

18 Jul '05

Implement ShowOwnedPopups and ArrangeIconicWindows. Based on Wine. Modified: trunk/reactos/subsys/win32k/include/window.h Modified: trunk/reactos/subsys/win32k/include/winpos.h Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: trunk/reactos/subsys/win32k/include/window.h --- trunk/reactos/subsys/win32k/include/window.h 2005-07-17 19:20:12 UTC (rev 16628) +++ trunk/reactos/subsys/win32k/include/window.h 2005-07-18 03:12:01 UTC (rev 16629) @@ -228,6 +228,9 @@ DWORD IntRemoveProcessWndProcHandles(HANDLE ProcessID); DWORD IntAddWndProcHandle(WNDPROC WindowProc, BOOL IsUnicode); +BOOL FASTCALL +IntShowOwnedPopups( HWND owner, BOOL fShow ); + #endif /* _WIN32K_WINDOW_H */ /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/include/winpos.h --- trunk/reactos/subsys/win32k/include/winpos.h 2005-07-17 19:20:12 UTC (rev 16628) +++ trunk/reactos/subsys/win32k/include/winpos.h 2005-07-18 03:12:01 UTC (rev 16629) @@ -14,6 +14,8 @@ NtGdiPtInRegion((WndObject)->WindowRegion, (INT)((x) - (WndObject)->WindowRect.left), \ (INT)((y) - (WndObject)->WindowRect.top)))) +UINT +FASTCALL WinPosArrangeIconicWindows(PWINDOW_OBJECT parent); BOOL FASTCALL IntGetClientOrigin(HWND hWnd, LPPOINT Point); LRESULT FASTCALL _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-07-17 19:20:12 UTC (rev 16628) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-07-18 03:12:01 UTC (rev 16629) @@ -11,7 +11,7 @@ #include <w32k.h> -#define NDEBUG +#define DEBUG #include <debug.h> /* registered Logon process */ @@ -453,9 +453,32 @@ return 0; case TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS: - UNIMPLEMENTED - return 0; + return (DWORD)IntShowOwnedPopups((HWND) Param1, (BOOL) Param2); + case TWOPARAM_ROUTINE_ROS_SHOWWINDOW: + { +#define WIN_NEEDS_SHOW_OWNEDPOPUP (0x00000040) + PWINDOW_OBJECT Window = IntGetWindowObject((HWND)Param1); + DPRINT1("ROS_SHOWWINDOW\n"); + if (Window == 0) + { + SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); + return FALSE; + } + if (Param2) + { + if (!(Window->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP)) + { + IntReleaseWindowObject(Window); + return TRUE; + } + Window->Flags &= ~WIN_NEEDS_SHOW_OWNEDPOPUP; + } + else Window->Flags |= WIN_NEEDS_SHOW_OWNEDPOPUP; + DPRINT1("ROS_SHOWWINDOW ---> 0x%x\n",Window->Flags); + IntReleaseWindowObject(Window); + return TRUE; + } case TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW: UNIMPLEMENTED return 0; @@ -570,6 +593,8 @@ ExFreePool(Buffer); } + + return Ret; } @@ -619,7 +644,6 @@ ExFreePool(Buffer.Pointer); } - return Ret; } @@ -630,6 +654,7 @@ return 0; } + /* * @unimplemented */ @@ -653,7 +678,7 @@ switch (Routine) { case HWNDLOCK_ROUTINE_ARRANGEICONICWINDOWS: - /* FIXME */ + WinPosArrangeIconicWindows(Window); break; case HWNDLOCK_ROUTINE_DRAWMENUBAR: _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-07-17 19:20:12 UTC (rev 16628) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-07-18 03:12:01 UTC (rev 16629) @@ -4314,4 +4314,65 @@ return TRUE; } +#define WIN_NEEDS_SHOW_OWNEDPOPUP (0x00000040) + +BOOL +FASTCALL +IntShowOwnedPopups( HWND owner, BOOL fShow ) +{ + int count = 0; + PWINDOW_OBJECT Window, pWnd; + HWND *win_array; + + if(!(Window = IntGetWindowObject(owner))) + { + SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); + return FALSE; + } + + win_array = IntWinListChildren( Window); + IntReleaseWindowObject(Window); + + if (!win_array) return TRUE; + + while (win_array[count]) count++; + while (--count >= 0) + { + if (NtUserGetWindow( win_array[count], GW_OWNER ) != owner) continue; + if (!(pWnd = IntGetWindowObject( win_array[count] ))) continue; +// if (pWnd == WND_OTHER_PROCESS) continue; + + if (fShow) + { + if (pWnd->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP) + { + IntReleaseWindowObject( pWnd ); + /* In Windows, ShowOwnedPopups(TRUE) generates + * WM_SHOWWINDOW messages with SW_PARENTOPENING, + * regardless of the state of the owner + */ + IntSendMessage(win_array[count], WM_SHOWWINDOW, SW_SHOWNORMAL, SW_PARENTOPENING); + continue; + } + } + else + { + if (pWnd->Style & WS_VISIBLE) + { + IntReleaseWindowObject( pWnd ); + /* In Windows, ShowOwnedPopups(FALSE) generates + * WM_SHOWWINDOW messages with SW_PARENTCLOSING, + * regardless of the state of the owner + */ + IntSendMessage(win_array[count], WM_SHOWWINDOW, SW_HIDE, SW_PARENTCLOSING); + continue; + } + } + IntReleaseWindowObject( pWnd ); + } + ExFreePool( win_array ); + return TRUE; +} + + /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-07-17 19:20:12 UTC (rev 16628) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-07-18 03:12:01 UTC (rev 16629) @@ -165,6 +165,47 @@ IntReleaseWindowObject(Wnd); } + +UINT +FASTCALL +WinPosArrangeIconicWindows(PWINDOW_OBJECT parent) +{ + RECT rectParent; + HWND hwndChild; + INT i, x, y, xspacing, yspacing; + HWND *List = IntWinListChildren(parent); + + IntGetClientRect( parent, &rectParent ); + x = rectParent.left; + y = rectParent.bottom; + + xspacing = NtUserGetSystemMetrics(SM_CXMINSPACING); + yspacing = NtUserGetSystemMetrics(SM_CYMINSPACING); + + DPRINT("X:%d Y:%d XS:%d YS:%d\n",x,y,xspacing,yspacing); + + for( i = 0; List[i]; i++) + { + hwndChild = List[i]; + + if((NtUserGetWindowLong( hwndChild, GWL_STYLE, FALSE) & WS_MINIMIZE) != 0 ) + { + WinPosSetWindowPos( hwndChild, 0, x + NtUserGetSystemMetrics(SM_CXBORDER), + y - yspacing - NtUserGetSystemMetrics(SM_CYBORDER) + , 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); + if (x <= rectParent.right - xspacing) x += xspacing; + else + { + x = rectParent.left; + y -= yspacing; + } + } + } + ExFreePool(List); + return yspacing; +} + + VOID STATIC FASTCALL WinPosFindIconPos(PWINDOW_OBJECT Window, POINT *Pos) { @@ -1210,8 +1251,9 @@ ObmDereferenceObject(Window); return(FALSE); } - Swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | - SWP_NOZORDER; + Swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE; + if (Window->Self != NtUserGetActiveWindow()) + Swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs