Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[hbirr] 20793: - We cannot access the OwnerTable without locking the resource.

by hbirr＠svn.reactos.org

- We cannot access the OwnerTable without locking the resource. - The shared waiters may wait also on the semaphore. It makes no sense to boost a waiting thread. - The thread header is initialized like KeWaitForSingleObject (?, ?, ?, TRUE, ?). During the boost, possible the dispatcher lock is released but the thread block (WaitNext) isn't changed. Modified: trunk/reactos/ntoskrnl/ex/resource.c _____ Modified: trunk/reactos/ntoskrnl/ex/resource.c --- trunk/reactos/ntoskrnl/ex/resource.c 2006-01-11 22:40:31 UTC (rev 20792) +++ trunk/reactos/ntoskrnl/ex/resource.c 2006-01-11 23:22:15 UTC (rev 20793) @@ -535,6 +535,11 @@ * @remarks None. * *--*/ +#if 0 + +/* + * Disabled, read the comments bellow. + */ VOID FASTCALL ExpBoostOwnerThread(IN PKTHREAD Thread, @@ -570,6 +575,7 @@ } } } +#endif /*++ * @name ExpWaitForResource @@ -596,7 +602,6 @@ ULONG Size, WaitCount = 0; KIRQL OldIrql; POWNER_ENTRY Owner; - PKTHREAD OwnerThread, Thread; NTSTATUS Status; LARGE_INTEGER Timeout; @@ -664,10 +669,20 @@ ExReleaseResourceLock(&Resource->SpinLock, OldIrql); #endif } +#if 0 +/* + * Disabled because: + * - We cannot access the OwnerTable without locking the resource. + * - The shared waiters may wait also on the semaphore. It makes no sense to boost a waiting thread. + * - The thread header is initialized like KeWaitForSingleObject (?, ?, ?, TRUE, ?). + * During the boost, possible the dispatcher lock is released but the thread block (WaitNext) isn't changed. + */ /* Check if we can boost */ if (!(Resource->Flag & ResourceHasDisabledPriorityBoost)) { + PKTHREAD Thread, OwnerThread; + /* Get the current kernel thread and lock the dispatcher */ Thread = KeGetCurrentThread(); Thread->WaitIrql = KeAcquireDispatcherDatabaseLock(); @@ -700,6 +715,7 @@ } } } +#endif } } @@ -881,10 +897,20 @@ Resource, Wait); if (!Resource->ActiveCount) { - /* Nobody owns it, so let's take control */ + if (Resource->NumberOfSharedWaiters == 0) + { + Owner = &Resource->OwnerThreads[1]; + } + else + { + /* Find a free entry */ + Owner = ExpFindFreeEntry(Resource, &OldIrql); + if (!Owner) goto TryAcquire; + } + + Owner->OwnerThread = Thread; + Owner->OwnerCount = 1; Resource->ActiveCount = 1; - Resource->OwnerThreads[1].OwnerThread = Thread; - Resource->OwnerThreads[1].OwnerCount = 1; /* Release the lock and return */ ExReleaseResourceLock(&Resource->SpinLock, OldIrql); @@ -946,7 +972,7 @@ { /* Release the lock and return */ ExReleaseResourceLock(&Resource->SpinLock, OldIrql); - return TRUE; + return FALSE; } /* Check if we have a shared waiters semaphore */ @@ -1769,6 +1795,7 @@ { /* Decrement owner count and check if we're done */ ASSERT(Resource->OwnerThreads[0].OwnerCount > 0); + ASSERT(Resource->ActiveCount == 1); if (--Resource->OwnerThreads[0].OwnerCount) { /* Done, release lock! */ @@ -1779,45 +1806,42 @@ /* Clear the owner */ Resource->OwnerThreads[0].OwnerThread = 0; - /* See if the resource isn't being owned anymore */ - ASSERT(Resource->ActiveCount > 0); - if (!(--Resource->ActiveCount)) + /* Check if there are shared waiters */ + if (IsSharedWaiting(Resource)) { - /* Check if there are shared waiters */ - if (IsSharedWaiting(Resource)) - { - /* Remove the exclusive flag */ - Resource->Flag &= ~ResourceOwnedExclusive; + /* Remove the exclusive flag */ + Resource->Flag &= ~ResourceOwnedExclusive; - /* Give ownage to another thread */ - Count = Resource->NumberOfSharedWaiters; - Resource->ActiveCount = (USHORT)Count; - Resource->NumberOfSharedWaiters = 0; + /* Give ownage to another thread */ + Count = Resource->NumberOfSharedWaiters; + Resource->ActiveCount = (USHORT)Count; + Resource->NumberOfSharedWaiters = 0; - /* Release lock and let someone else have it */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); - KeReleaseSemaphore(Resource->SharedWaiters, 0, Count, FALSE); - return; - } - else if (IsExclusiveWaiting(Resource)) - { - /* Give exclusive access */ - Resource->OwnerThreads[0].OwnerThread = 1; - Resource->OwnerThreads[0].OwnerCount = 1; - Resource->ActiveCount = 1; - Resource->NumberOfExclusiveWaiters--; + /* Release lock and let someone else have it */ + ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + KeReleaseSemaphore(Resource->SharedWaiters, 0, Count, FALSE); + return; + } + else if (IsExclusiveWaiting(Resource)) + { + /* Give exclusive access */ + Resource->OwnerThreads[0].OwnerThread = 1; + Resource->OwnerThreads[0].OwnerCount = 1; + Resource->ActiveCount = 1; + Resource->NumberOfExclusiveWaiters--; - /* Release the lock and give it away */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); - KeSetEventBoostPriority(Resource->ExclusiveWaiters, - (PKTHREAD*) - &Resource->OwnerThreads[0].OwnerThread); - return; - } + /* Release the lock and give it away */ + ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + KeSetEventBoostPriority(Resource->ExclusiveWaiters, + (PKTHREAD*) + &Resource->OwnerThreads[0].OwnerThread); + return; + } - /* Remove the exclusive flag */ - Resource->Flag &= ~ResourceOwnedExclusive; - } + /* Remove the exclusive flag */ + Resource->Flag &= ~ResourceOwnedExclusive; + + Resource->ActiveCount = 0; } else { @@ -1827,11 +1851,6 @@ /* Found it, get owner */ Owner = &Resource->OwnerThreads[1]; } - else if (Resource->OwnerThreads[0].OwnerThread == Thread) - { - /* Found it on the second list, get owner */ - Owner = &Resource->OwnerThreads[0]; - } else { /* Not in the list, do a full table look up */

18 years, 8 months

[weiden] 20792: - partially implemented RegisterGPNotification() and UnregisterGPNotification() (depends on GetModuleHandleEx which is not yet implemented)

by weiden＠svn.reactos.org

- partially implemented RegisterGPNotification() and UnregisterGPNotification() (depends on GetModuleHandleEx which is not yet implemented) - use debug.h Modified: trunk/reactos/lib/userenv/desktop.c Modified: trunk/reactos/lib/userenv/directory.c Modified: trunk/reactos/lib/userenv/environment.c Added: trunk/reactos/lib/userenv/gpolicy.c Modified: trunk/reactos/lib/userenv/internal.h Modified: trunk/reactos/lib/userenv/misc.c Modified: trunk/reactos/lib/userenv/profile.c Modified: trunk/reactos/lib/userenv/registry.c Modified: trunk/reactos/lib/userenv/setup.c Modified: trunk/reactos/lib/userenv/userenv.c Modified: trunk/reactos/lib/userenv/userenv.def Modified: trunk/reactos/lib/userenv/userenv.xml _____ Modified: trunk/reactos/lib/userenv/desktop.c --- trunk/reactos/lib/userenv/desktop.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/desktop.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -27,7 +27,10 @@ #include <precomp.h> +#define NDEBUG +#include <debug.h> + /* FUNCTIONS ***************************************************************/ static BOOL _____ Modified: trunk/reactos/lib/userenv/directory.c --- trunk/reactos/lib/userenv/directory.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/directory.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -27,7 +27,10 @@ #include <precomp.h> +#define NDEBUG +#include <debug.h> + /* FUNCTIONS ***************************************************************/ BOOL STDCALL _____ Modified: trunk/reactos/lib/userenv/environment.c --- trunk/reactos/lib/userenv/environment.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/environment.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -27,7 +27,10 @@ #include <precomp.h> +#define NDEBUG +#include <debug.h> + static BOOL SetUserEnvironmentVariable (LPVOID *Environment, LPWSTR lpName, _____ Added: trunk/reactos/lib/userenv/gpolicy.c --- trunk/reactos/lib/userenv/gpolicy.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/gpolicy.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -0,0 +1,403 @@ +/* + * ReactOS kernel + * Copyright (C) 2006 ReactOS Team + * + * This program is free software; 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. + * + * This 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/userenv/gpolicy.c + * PURPOSE: Group policy functions + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + */ + +#include <precomp.h> + +#define NDEBUG +#include <debug.h> + + +typedef struct _GP_NOTIFY +{ + struct _GP_NOTIFY *Next; + HANDLE hEvent; + BOOL bMachine; +} GP_NOTIFY, *PGP_NOTIFY; + +typedef enum +{ + gpaUpdate = 0, + gpaTerminate +} GP_ACTION; + +static const WCHAR szLocalGPApplied[] = L"userenv: User Group Policy has been applied"; +static const WCHAR szMachineGPApplied[] = L"Global\\userenv: Machine Group Policy has been applied"; + +static CRITICAL_SECTION GPNotifyLock; +static PGP_NOTIFY NotificationList = NULL; +static GP_ACTION GPNotificationAction = gpaUpdate; +static HANDLE hNotificationThread = NULL; +static HANDLE hNotificationThreadEvent = NULL; +static HANDLE hLocalGPAppliedEvent = NULL; +static HANDLE hMachineGPAppliedEvent = NULL; + +VOID +InitializeGPNotifications(VOID) +{ + InitializeCriticalSection(&GPNotifyLock); +} + +VOID +UninitializeGPNotifications(VOID) +{ + EnterCriticalSection(&GPNotifyLock); + + /* rundown the notification thread */ + if (hNotificationThread != NULL) + { + ASSERT(hNotificationThreadEvent != NULL); + + /* notify the thread */ + GPNotificationAction = gpaTerminate; + SetEvent(hNotificationThreadEvent); + + LeaveCriticalSection(&GPNotifyLock); + + /* wait for the thread to terminate itself */ + WaitForSingleObject(hNotificationThread, + INFINITE); + + EnterCriticalSection(&GPNotifyLock); + + if (hNotificationThread != NULL) + { + /* the handle should be closed by the thread, + just in case that didn't happen for an unknown reason */ + CloseHandle(hNotificationThread); + hNotificationThread = NULL; + } + } + + if (hNotificationThreadEvent != NULL) + { + CloseHandle(hNotificationThreadEvent); + hNotificationThreadEvent = NULL; + } + + LeaveCriticalSection(&GPNotifyLock); + + DeleteCriticalSection(&GPNotifyLock); +} + +static VOID +NotifyGPEvents(IN BOOL bMachine) +{ + PGP_NOTIFY Notify = NotificationList; + + while (Notify != NULL) + { + if (Notify->bMachine == bMachine) + { + SetEvent(Notify->hEvent); + } + + Notify = Notify->Next; + } +} + +static DWORD WINAPI +GPNotificationThreadProc(IN LPVOID lpParameter) +{ + HMODULE hModule; + DWORD WaitResult, WaitCount; + HANDLE WaitHandles[3]; + + /* reference the library so we don't screw up if the application + causes the DLL to unload while this thread is still running */ + if (GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (LPCWSTR)hInstance, + &hModule)) + { + ASSERT(hModule == hInstance); + + EnterCriticalSection(&GPNotifyLock); + + ASSERT(hNotificationThreadEvent != NULL); + WaitHandles[0] = hNotificationThreadEvent; + for (;;) + { + ASSERT(hMachineGPAppliedEvent != NULL); + + if (NotificationList == NULL) + break; + + WaitCount = 2; + WaitHandles[1] = hMachineGPAppliedEvent; + + if (hLocalGPAppliedEvent != NULL) + { + WaitHandles[2] = hLocalGPAppliedEvent; + WaitCount++; + } + + LeaveCriticalSection(&GPNotifyLock); + + WaitResult = WaitForMultipleObjects(WaitCount, + WaitHandles, + FALSE, + INFINITE); + + EnterCriticalSection(&GPNotifyLock); + + if (WaitResult != WAIT_FAILED) + { + if (WaitResult == WAIT_OBJECT_0) + { + ResetEvent(hNotificationThreadEvent); + + if (GPNotificationAction == gpaTerminate) + { + /* terminate the thread */ + break; + } + } + else if (WaitResult == WAIT_OBJECT_0 + 1 || WaitResult == WAIT_OBJECT_0 + 2) + { + /* group policies have been applied */ + if (NotificationList != NULL) + { + NotifyGPEvents((WaitResult == WAIT_OBJECT_0 + 1)); + } + } + else if (WaitResult == WAIT_ABANDONED_0 + 2) + { + /* In case the local group policies event was abandoned, keep watching! + But close the handle as it's no longer of any use. */ + if (hLocalGPAppliedEvent != NULL) + { + CloseHandle(hLocalGPAppliedEvent); + hLocalGPAppliedEvent = NULL; + } + } + else if (WaitResult == WAIT_ABANDONED_0 || WaitResult == WAIT_ABANDONED_0 + 1) + { + /* terminate the thread if the machine group policies event was abandoned + or for some reason the rundown event got abandoned. */ + break; + } + else + { + DPRINT("Unexpected wait result watching the group policy events: 0x%x\n", WaitResult); + ASSERT(FALSE); + break; + } + + if (NotificationList == NULL) + break; + } + else + break; + + } + + /* cleanup handles no longer used */ + ASSERT(hNotificationThread != NULL); + ASSERT(hNotificationThreadEvent != NULL); + + CloseHandle(hNotificationThread); + CloseHandle(hNotificationThreadEvent); + hNotificationThread = NULL; + hNotificationThreadEvent = NULL; + + if (hLocalGPAppliedEvent != NULL) + { + CloseHandle(hLocalGPAppliedEvent); + hLocalGPAppliedEvent = NULL; + } + if (hMachineGPAppliedEvent != NULL) + { + CloseHandle(hMachineGPAppliedEvent); + hMachineGPAppliedEvent = NULL; + } + + LeaveCriticalSection(&GPNotifyLock); + + /* dereference the library and exit */ + FreeLibraryAndExitThread(hModule, + 0); + } + else + { + DPRINT1("Referencing the library failed!\n"); + } + + return 1; +} + +static HANDLE +CreateGPEvent(IN BOOL bMachine, + IN PVOID lpSecurityDescriptor) +{ + HANDLE hEvent; + SECURITY_ATTRIBUTES SecurityAttributes; + + SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES); + SecurityAttributes.lpSecurityDescriptor = lpSecurityDescriptor; + SecurityAttributes.bInheritHandle = FALSE; + + hEvent = CreateEventW((lpSecurityDescriptor != NULL ? &SecurityAttributes : NULL), + TRUE, + FALSE, + (bMachine ? szMachineGPApplied : szLocalGPApplied)); + + return hEvent; +} + +BOOL WINAPI +RegisterGPNotification(IN HANDLE hEvent, + IN BOOL bMachine) +{ + PGP_NOTIFY Notify; + PVOID lpSecurityDescriptor = NULL; + BOOL Ret = FALSE; + + EnterCriticalSection(&GPNotifyLock); + + /* create the thread notification event */ + if (hNotificationThreadEvent == NULL) + { + hNotificationThreadEvent = CreateEvent(NULL, + TRUE, + FALSE, + NULL); + if (hNotificationThreadEvent == NULL) + { + goto Cleanup; + } + } + + /* create or open the machine group policy event */ + if (hMachineGPAppliedEvent == NULL) + { + lpSecurityDescriptor = CreateDefaultSD(); + + hMachineGPAppliedEvent = CreateGPEvent(TRUE, + lpSecurityDescriptor); + if (hMachineGPAppliedEvent == NULL) + { + goto Cleanup; + } + } + + /* create or open the local group policy event only if necessary */ + if (!bMachine && hLocalGPAppliedEvent == NULL) + { + if (lpSecurityDescriptor == NULL) + { + lpSecurityDescriptor = CreateDefaultSD(); + } + + hLocalGPAppliedEvent = CreateGPEvent(FALSE, + lpSecurityDescriptor); + if (hLocalGPAppliedEvent == NULL) + { + goto Cleanup; + } + } + + if (hNotificationThread == NULL) + { + hNotificationThread = CreateThread(NULL, + 0, + GPNotificationThreadProc, + NULL, + 0, + NULL); + } + + if (hNotificationThread != NULL) + { + Notify = (PGP_NOTIFY)LocalAlloc(LMEM_FIXED, + sizeof(GP_NOTIFY)); + if (Notify != NULL) + { + /* add the item to the beginning of the list */ + Notify->Next = NotificationList; + Notify->hEvent = hEvent; + Notify->bMachine = bMachine; + + NotificationList = Notify; + + /* notify the thread */ + GPNotificationAction = gpaUpdate; + SetEvent(hNotificationThreadEvent); + + Ret = TRUE; + } + } + +Cleanup: + LeaveCriticalSection(&GPNotifyLock); + + if (lpSecurityDescriptor != NULL) + { + LocalFree((HLOCAL)lpSecurityDescriptor); + } + + /* NOTE: don't delete the events or close the handles created */ + + return Ret; +} + +BOOL WINAPI +UnregisterGPNotification(IN HANDLE hEvent) +{ + PGP_NOTIFY Notify = NULL, *NotifyLink; + BOOL Ret = FALSE; + + EnterCriticalSection(&GPNotifyLock); + + Notify = NotificationList; + NotifyLink = &NotificationList; + + while (Notify != NULL) + { + if (Notify->hEvent == hEvent) + { + /* remove and free the item */ + *NotifyLink = Notify->Next; + LocalFree((HLOCAL)Notify); + + /* notify the thread */ + if (hNotificationThread != NULL && + hNotificationThreadEvent != NULL) + { + GPNotificationAction = gpaUpdate; + SetEvent(hNotificationThreadEvent); + } + + Ret = TRUE; + break; + } + + NotifyLink = &Notify->Next; + Notify = Notify->Next; + } + + LeaveCriticalSection(&GPNotifyLock); + + return Ret; +} Property changes on: trunk/reactos/lib/userenv/gpolicy.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/userenv/internal.h --- trunk/reactos/lib/userenv/internal.h 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/internal.h 2006-01-11 22:40:31 UTC (rev 20792) @@ -28,20 +28,6 @@ #ifndef _INTERNAL_H #define _INTERNAL_H -/* debug.h */ -void -DebugPrint (char* fmt,...); - -#define DPRINT1 DebugPrint("(%s:%d) ",__FILE__,__LINE__), DebugPrint -#define CHECKPOINT1 do { DebugPrint("%s:%d\n",__FILE__,__LINE__); } while(0); - -#ifdef __GNUC__ -#define DPRINT(args...) -#else -#define DPRINT -#endif /* __GNUC__ */ -#define CHECKPOINT - /* directory.c */ BOOL CopyDirectory (LPCWSTR lpDestinationPath, @@ -91,6 +77,9 @@ GetUserSidFromToken (HANDLE hToken, PUNICODE_STRING SidString); +PVOID +CreateDefaultSD(VOID); + /* profile.c */ BOOL AppendSystemPostfix (LPWSTR lpName, @@ -109,6 +98,14 @@ /* userenv.c */ extern HINSTANCE hInstance; +/* gpolicy.c */ + +VOID +InitializeGPNotifications(VOID); + +VOID +UninitializeGPNotifications(VOID); + #endif /* _INTERNAL_H */ /* EOF */ _____ Modified: trunk/reactos/lib/userenv/misc.c --- trunk/reactos/lib/userenv/misc.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/misc.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -27,7 +27,10 @@ #include <precomp.h> +#define NDEBUG +#include <debug.h> + /* FUNCTIONS ***************************************************************/ LPWSTR @@ -109,6 +112,13 @@ return TRUE; } +PVOID +CreateDefaultSD(VOID) +{ + /* FIXME - create a default security descriptor */ + return NULL; +} + /* Dynamic DLL loading interface **********************************************/ /* OLE32.DLL import table */ _____ Modified: trunk/reactos/lib/userenv/profile.c --- trunk/reactos/lib/userenv/profile.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/profile.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -27,7 +27,10 @@ #include <precomp.h> +#define NDEBUG +#include <debug.h> + /* FUNCTIONS ***************************************************************/ BOOL _____ Modified: trunk/reactos/lib/userenv/registry.c --- trunk/reactos/lib/userenv/registry.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/registry.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -27,7 +27,10 @@ #include <precomp.h> +#define NDEBUG +#include <debug.h> + /* FUNCTIONS ***************************************************************/ static BOOL _____ Modified: trunk/reactos/lib/userenv/setup.c --- trunk/reactos/lib/userenv/setup.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/setup.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -27,6 +27,10 @@ #include <precomp.h> +#define NDEBUG +#include <debug.h> + + typedef struct _FOLDERDATA { LPWSTR lpValueName; _____ Modified: trunk/reactos/lib/userenv/userenv.c --- trunk/reactos/lib/userenv/userenv.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/userenv.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -27,6 +27,9 @@ #include <precomp.h> +#define NDEBUG +#include <debug.h> + HINSTANCE hInstance = NULL; BOOL WINAPI @@ -37,9 +40,11 @@ if (fdwReason == DLL_PROCESS_ATTACH) { hInstance = hinstDLL; + InitializeGPNotifications(); } else if (fdwReason == DLL_PROCESS_DETACH) { + UninitializeGPNotifications(); } return TRUE; _____ Modified: trunk/reactos/lib/userenv/userenv.def --- trunk/reactos/lib/userenv/userenv.def 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/userenv.def 2006-01-11 22:40:31 UTC (rev 20792) @@ -31,5 +31,7 @@ GetUserProfileDirectoryW@12 LoadUserProfileA@8 LoadUserProfileW@8 +RegisterGPNotification@8 UnloadUserProfile@8 +UnregisterGPNotification@4 ;EOF _____ Modified: trunk/reactos/lib/userenv/userenv.xml --- trunk/reactos/lib/userenv/userenv.xml 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/userenv.xml 2006-01-11 22:40:31 UTC (rev 20792) @@ -13,6 +13,7 @@ <file>desktop.c</file> <file>directory.c</file> <file>environment.c</file> + <file>gpolicy.c</file> <file>misc.c</file> <file>profile.c</file> <file>registry.c</file>

18 years, 8 months

[hpoussin] 20791: Rewrite IoGetDeviceInterfaces: no more memory leaks, be ready to handle PhysicalDeviceObject and Flags parameters, less stack usage

by hpoussin＠svn.reactos.org

Rewrite IoGetDeviceInterfaces: no more memory leaks, be ready to handle PhysicalDeviceObject and Flags parameters, less stack usage IoRegisterPlugPlayNotification: notify caller for already registered interfaces Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/io/deviface.c Modified: trunk/reactos/ntoskrnl/io/pnpnotify.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/io.h --- trunk/reactos/ntoskrnl/include/internal/io.h 2006-01-11 21:59:52 UTC (rev 20790) +++ trunk/reactos/ntoskrnl/include/internal/io.h 2006-01-11 22:13:02 UTC (rev 20791) @@ -218,7 +218,7 @@ IopNotifyPlugPlayNotification( IN PDEVICE_OBJECT DeviceObject, IN IO_NOTIFICATION_EVENT_CATEGORY EventCategory, - IN GUID* Event, + IN LPCGUID Event, IN PVOID EventCategoryData1, IN PVOID EventCategoryData2 ); _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2006-01-11 21:59:52 UTC (rev 20790) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2006-01-11 22:13:02 UTC (rev 20791) @@ -17,6 +17,9 @@ #include <ntddk.h> #include <wdmguid.h> #include <ndk/ntndk.h> +#undef TEXT +#define TEXT(s) L##s +#include <regstr.h> /* FIXME: Temporary until CC Ros is gone */ #include <ccros.h> _____ Modified: trunk/reactos/ntoskrnl/io/deviface.c --- trunk/reactos/ntoskrnl/io/deviface.c 2006-01-11 21:59:52 UTC (rev 20790) +++ trunk/reactos/ntoskrnl/io/deviface.c 2006-01-11 22:13:02 UTC (rev 20791) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/io/deviface.c @@ -7,7 +6,7 @@ * * PROGRAMMERS: Filip Navara (xnavara(a)volny.cz) * Matthew Brace (ismarc(a)austin.rr.com) - * HervÚ Poussineau (hpoussin(a)reactos.com) + * HervÚ Poussineau (hpoussin(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -47,6 +46,93 @@ return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS +IopOpenInterfaceKey( + IN CONST GUID *InterfaceClassGuid, + IN ACCESS_MASK DesiredAccess, + OUT HANDLE *pInterfaceKey) +{ + UNICODE_STRING LocalMachine = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\"); + UNICODE_STRING GuidString; + UNICODE_STRING KeyName; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE InterfaceKey = INVALID_HANDLE_VALUE; + NTSTATUS Status; + + GuidString.Buffer = KeyName.Buffer = NULL; + + Status = RtlStringFromGUID(InterfaceClassGuid, &GuidString); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlStringFromGUID() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + KeyName.Length = 0; + KeyName.MaximumLength = LocalMachine.Length + (wcslen(REGSTR_PATH_DEVICE_CLASSES) + 1) * sizeof(WCHAR) + GuidString.Length; + KeyName.Buffer = ExAllocatePool(PagedPool, KeyName.MaximumLength); + if (!KeyName.Buffer) + { + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + + Status = RtlAppendUnicodeStringToString(&KeyName, &LocalMachine); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + Status = RtlAppendUnicodeToString(&KeyName, REGSTR_PATH_DEVICE_CLASSES); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + Status = RtlAppendUnicodeToString(&KeyName, L"\\"); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + Status = RtlAppendUnicodeStringToString(&KeyName, &GuidString); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + InitializeObjectAttributes( + &ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey( + &InterfaceKey, + DesiredAccess, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + *pInterfaceKey = InterfaceKey; + Status = STATUS_SUCCESS; + +cleanup: + if (!NT_SUCCESS(Status)) + { + if (InterfaceKey != INVALID_HANDLE_VALUE) + ZwClose(InterfaceKey); + } + RtlFreeUnicodeString(&GuidString); + RtlFreeUnicodeString(&KeyName); + return Status; +} + /* * IoGetDeviceInterfaces * @@ -81,9 +167,6 @@ * Status * @implemented * - * The parameters PhysicalDeviceObject and Flags aren't correctly - * processed. Rest of the cases was tested under Windows(R) XP and - * the function worked correctly. */ NTSTATUS STDCALL @@ -93,472 +176,341 @@ IN ULONG Flags, OUT PWSTR *SymbolicLinkList) { - PWCHAR BaseInterfaceString = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; - UNICODE_STRING GuidString; - UNICODE_STRING BaseKeyName; - UNICODE_STRING AliasKeyName; - UNICODE_STRING SymbolicLink; - UNICODE_STRING Control; - UNICODE_STRING SubKeyName; - UNICODE_STRING SymbolicLinkKeyName; - UNICODE_STRING ControlKeyName; - UNICODE_STRING TempString; - HANDLE InterfaceKey; - HANDLE SubKey; - HANDLE SymbolicLinkKey; - PKEY_FULL_INFORMATION fip; - PKEY_FULL_INFORMATION bfip = NULL; - PKEY_BASIC_INFORMATION bip; - PKEY_VALUE_PARTIAL_INFORMATION vpip = NULL; - PWCHAR SymLinkList = NULL; - ULONG SymLinkListSize = 0; - NTSTATUS Status; - ULONG Size = 0; - ULONG i = 0; - ULONG j = 0; + UNICODE_STRING Control = RTL_CONSTANT_STRING(L"Control"); + UNICODE_STRING SymbolicLink = RTL_CONSTANT_STRING(L"SymbolicLink"); + HANDLE InterfaceKey = INVALID_HANDLE_VALUE; + HANDLE DeviceKey = INVALID_HANDLE_VALUE; + HANDLE ReferenceKey = INVALID_HANDLE_VALUE; + HANDLE ControlKey = INVALID_HANDLE_VALUE; + PKEY_BASIC_INFORMATION DeviceBi = NULL; + PKEY_BASIC_INFORMATION ReferenceBi = NULL; + PKEY_VALUE_PARTIAL_INFORMATION bip = NULL; + UNICODE_STRING KeyName; OBJECT_ATTRIBUTES ObjectAttributes; + BOOLEAN FoundRightPDO = FALSE; + ULONG i = 0, j, Size; + UNICODE_STRING ReturnBuffer = {0,}; + NTSTATUS Status; - ASSERT_IRQL(PASSIVE_LEVEL); + PAGED_CODE(); - Status = RtlStringFromGUID(InterfaceClassGuid, &GuidString); + Status = IopOpenInterfaceKey(InterfaceClassGuid, KEY_ENUMERATE_SUB_KEYS, &InterfaceKey); if (!NT_SUCCESS(Status)) { - DPRINT("RtlStringFromGUID() Failed.\n"); - return STATUS_INVALID_HANDLE; + DPRINT("IopOpenInterfaceKey() failed with status 0x%08lx\n", Status); + goto cleanup; } - RtlInitUnicodeString(&AliasKeyName, BaseInterfaceString); - RtlInitUnicodeString(&SymbolicLink, L"SymbolicLink"); - RtlInitUnicodeString(&Control, L"\\Control"); - BaseKeyName.Length = wcslen(BaseKeyString) * sizeof(WCHAR); - BaseKeyName.MaximumLength = BaseKeyName.Length + (38 * sizeof(WCHAR)); - BaseKeyName.Buffer = ExAllocatePool( - PagedPool, - BaseKeyName.MaximumLength); - ASSERT(BaseKeyName.Buffer != NULL); - wcscpy(BaseKeyName.Buffer, BaseKeyString); - RtlAppendUnicodeStringToString(&BaseKeyName, &GuidString); - - if (PhysicalDeviceObject) + /* Enumerate subkeys (ie the different device objets) */ + while (TRUE) { - WCHAR GuidBuffer[40]; - UNICODE_STRING PdoGuidString; - - RtlFreeUnicodeString(&BaseKeyName); - - IoGetDeviceProperty( - PhysicalDeviceObject, - DevicePropertyClassGuid, - sizeof(GuidBuffer), - GuidBuffer, + Status = ZwEnumerateKey( + InterfaceKey, + i, + KeyBasicInformation, + NULL, + 0, &Size); + if (Status == STATUS_NO_MORE_ENTRIES) + break; + else if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) + { + DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } - RtlInitUnicodeString(&PdoGuidString, GuidBuffer); - if (RtlCompareUnicodeString(&GuidString, &PdoGuidString, TRUE)) + DeviceBi = ExAllocatePool(PagedPool, Size); + if (!DeviceBi) { - DPRINT("Inconsistent Guid's asked for in IoGetDeviceInterfaces()\n"); - return STATUS_INVALID_HANDLE; + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; } + Status = ZwEnumerateKey( + InterfaceKey, + i++, + KeyBasicInformation, + DeviceBi, + Size, + &Size); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } - DPRINT("IoGetDeviceInterfaces() called with PDO, not implemented.\n"); - return STATUS_NOT_IMPLEMENTED; - } - else - { + /* Open device key */ + KeyName.Length = KeyName.MaximumLength = DeviceBi->NameLength; + KeyName.Buffer = DeviceBi->Name; InitializeObjectAttributes( &ObjectAttributes, - &BaseKeyName, + &KeyName, OBJ_CASE_INSENSITIVE, - NULL, + InterfaceKey, NULL); - Status = ZwOpenKey( - &InterfaceKey, - KEY_READ, + &DeviceKey, + KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); - if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey() Failed. (0x%X)\n", Status); - RtlFreeUnicodeString(&BaseKeyName); - return Status; + DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + goto cleanup; } - Status = ZwQueryKey( - InterfaceKey, - KeyFullInformation, - NULL, - 0, - &Size); - - if (Status != STATUS_BUFFER_TOO_SMALL) + if (PhysicalDeviceObject) { - DPRINT("ZwQueryKey() Failed. (0x%X)\n", Status); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(InterfaceKey); - return Status; + /* Check if we are on the right physical device object, + * by reading the DeviceInstance string + */ + DPRINT1("PhysicalDeviceObject != NULL. Case not implemented.\n"); + //FoundRightPDO = TRUE; + Status = STATUS_NOT_IMPLEMENTED; + goto cleanup; } - fip = (PKEY_FULL_INFORMATION)ExAllocatePool(PagedPool, Size); - ASSERT(fip != NULL); - - Status = ZwQueryKey( - InterfaceKey, - KeyFullInformation, - fip, - Size, - &Size); - - if (!NT_SUCCESS(Status)) + /* Enumerate subkeys (ie the different reference strings) */ + j = 0; + while (TRUE) { - DPRINT("ZwQueryKey() Failed. (0x%X)\n", Status); - ExFreePool(fip); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(InterfaceKey); - return Status; - } - - for (; i < fip->SubKeys; i++) - { Status = ZwEnumerateKey( - InterfaceKey, - i, + DeviceKey, + j, KeyBasicInformation, NULL, 0, &Size); - - if (Status != STATUS_BUFFER_TOO_SMALL) + if (Status == STATUS_NO_MORE_ENTRIES) + break; + else if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) { - DPRINT("ZwEnumerateKey() Failed.(0x%X)\n", Status); - ExFreePool(fip); - if (SymLinkList != NULL) - ExFreePool(SymLinkList); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(InterfaceKey); - return Status; + DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); + goto cleanup; } - bip = (PKEY_BASIC_INFORMATION)ExAllocatePool(PagedPool, Size); - ASSERT(bip != NULL); - + ReferenceBi = ExAllocatePool(PagedPool, Size); + if (!ReferenceBi) + { + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } Status = ZwEnumerateKey( - InterfaceKey, - i, + DeviceKey, + j++, KeyBasicInformation, - bip, + ReferenceBi, Size, &Size); - if (!NT_SUCCESS(Status)) { - DPRINT("ZwEnumerateKey() Failed.(0x%X)\n", Status); - ExFreePool(fip); - ExFreePool(bip); - if (SymLinkList != NULL) - ExFreePool(SymLinkList); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(InterfaceKey); - return Status; + DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); + goto cleanup; } - SubKeyName.Length = 0; - SubKeyName.MaximumLength = BaseKeyName.Length + bip->NameLength + sizeof(WCHAR); - SubKeyName.Buffer = ExAllocatePool(PagedPool, SubKeyName.MaximumLength); - ASSERT(SubKeyName.Buffer != NULL); - TempString.Length = TempString.MaximumLength = bip->NameLength; - TempString.Buffer = bip->Name; - RtlCopyUnicodeString(&SubKeyName, &BaseKeyName); - RtlAppendUnicodeToString(&SubKeyName, L"\\"); - RtlAppendUnicodeStringToString(&SubKeyName, &TempString); + KeyName.Length = KeyName.MaximumLength = ReferenceBi->NameLength; + KeyName.Buffer = ReferenceBi->Name; + if (RtlEqualUnicodeString(&KeyName, &Control, TRUE)) + { + /* Skip Control subkey */ + goto NextReferenceString; + } - ExFreePool(bip); - + /* Open reference key */ InitializeObjectAttributes( &ObjectAttributes, - &SubKeyName, + &KeyName, OBJ_CASE_INSENSITIVE, - NULL, + DeviceKey, NULL); - Status = ZwOpenKey( - &SubKey, - KEY_READ, + &ReferenceKey, + KEY_QUERY_VALUE, &ObjectAttributes); - if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey() Failed. (0x%X)\n", Status); - ExFreePool(fip); - if (SymLinkList != NULL) - ExFreePool(SymLinkList); - RtlFreeUnicodeString(&SubKeyName); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(InterfaceKey); - return Status; + DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + goto cleanup; } - Status = ZwQueryKey( - SubKey, - KeyFullInformation, - NULL, - 0, - &Size); - - if (Status != STATUS_BUFFER_TOO_SMALL) + if (!(Flags & DEVICE_INTERFACE_INCLUDE_NONACTIVE)) { - DPRINT("ZwQueryKey() Failed. (0x%X)\n", Status); - ExFreePool(fip); - RtlFreeUnicodeString(&BaseKeyName); - RtlFreeUnicodeString(&SubKeyName); - ZwClose(SubKey); - ZwClose(InterfaceKey); - return Status; - } - - bfip = (PKEY_FULL_INFORMATION)ExAllocatePool(PagedPool, Size); - ASSERT(bfip != NULL); - - Status = ZwQueryKey( - SubKey, - KeyFullInformation, - bfip, - Size, - &Size); - - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwQueryKey() Failed. (0x%X)\n", Status); - ExFreePool(fip); - RtlFreeUnicodeString(&SubKeyName); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(SubKey); - ZwClose(InterfaceKey); - return Status; - } - - for(j = 0; j < bfip->SubKeys; j++) - { - Status = ZwEnumerateKey( - SubKey, - j, - KeyBasicInformation, - NULL, - 0, - &Size); - - if (Status == STATUS_NO_MORE_ENTRIES) - continue; - - if (Status != STATUS_BUFFER_TOO_SMALL) - { - DPRINT("ZwEnumerateKey() Failed.(0x%X)\n", Status); - ExFreePool(bfip); - ExFreePool(fip); - if (SymLinkList != NULL) - ExFreePool(SymLinkList); - RtlFreeUnicodeString(&SubKeyName); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(SubKey); - ZwClose(InterfaceKey); - return Status; - } - - bip = (PKEY_BASIC_INFORMATION)ExAllocatePool(PagedPool, Size); - ASSERT(bip != NULL); - - Status = ZwEnumerateKey( - SubKey, - j, - KeyBasicInformation, - bip, - Size, - &Size); - - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwEnumerateKey() Failed.(0x%X)\n", Status); - ExFreePool(fip); - ExFreePool(bfip); - ExFreePool(bip); - if (SymLinkList != NULL) - ExFreePool(SymLinkList); - RtlFreeUnicodeString(&SubKeyName); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(SubKey); - ZwClose(InterfaceKey); - return Status; - } - - if (!wcsncmp(bip->Name, L"Control", bip->NameLength)) - { - continue; - } - - SymbolicLinkKeyName.Length = 0; - SymbolicLinkKeyName.MaximumLength = SubKeyName.Length + bip->NameLength + sizeof(WCHAR); - SymbolicLinkKeyName.Buffer = ExAllocatePool(PagedPool, SymbolicLinkKeyName.MaximumLength); - ASSERT(SymbolicLinkKeyName.Buffer != NULL); - TempString.Length = TempString.MaximumLength = bip->NameLength; - TempString.Buffer = bip->Name; - RtlCopyUnicodeString(&SymbolicLinkKeyName, &SubKeyName); - RtlAppendUnicodeToString(&SymbolicLinkKeyName, L"\\"); - RtlAppendUnicodeStringToString(&SymbolicLinkKeyName, &TempString); - - ControlKeyName.Length = 0; - ControlKeyName.MaximumLength = SymbolicLinkKeyName.Length + Control.Length + sizeof(WCHAR); - ControlKeyName.Buffer = ExAllocatePool(PagedPool, ControlKeyName.MaximumLength); - ASSERT(ControlKeyName.Buffer != NULL); - RtlCopyUnicodeString(&ControlKeyName, &SymbolicLinkKeyName); - RtlAppendUnicodeStringToString(&ControlKeyName, &Control); - - ExFreePool(bip); - + /* We have to check if the interface is enabled, by + * reading the Linked value in the Control subkey + */ InitializeObjectAttributes( &ObjectAttributes, - &SymbolicLinkKeyName, + &Control, OBJ_CASE_INSENSITIVE, - NULL, + ReferenceKey, NULL); - Status = ZwOpenKey( - &SymbolicLinkKey, - KEY_READ, + &ControlKey, + KEY_QUERY_VALUE, &ObjectAttributes); - - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwOpenKey() Failed. (0x%X)\n", Status); - ExFreePool(fip); - ExFreePool(bfip); - if (SymLinkList != NULL) - ExFreePool(SymLinkList); - RtlFreeUnicodeString(&SymbolicLinkKeyName); - RtlFreeUnicodeString(&SubKeyName); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(SubKey); - ZwClose(InterfaceKey); - return Status; - } - - Status = ZwQueryValueKey( - SymbolicLinkKey, - &SymbolicLink, - KeyValuePartialInformation, - NULL, - 0, - &Size); - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - continue; - - if (Status != STATUS_BUFFER_TOO_SMALL) { - DPRINT("ZwQueryValueKey() Failed.(0x%X)\n", Status); - ExFreePool(fip); - ExFreePool(bfip); - if (SymLinkList != NULL) - ExFreePool(SymLinkList); - RtlFreeUnicodeString(&SymbolicLinkKeyName); - RtlFreeUnicodeString(&SubKeyName); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(SymbolicLinkKey); - ZwClose(SubKey); - ZwClose(InterfaceKey); - return Status; + /* That's OK. The key doesn't exist (yet) because + * the interface is not activated. + */ + goto NextReferenceString; } - - vpip = (PKEY_VALUE_PARTIAL_INFORMATION)ExAllocatePool(PagedPool, Size); - ASSERT(vpip != NULL); - - Status = ZwQueryValueKey( - SymbolicLinkKey, - &SymbolicLink, - KeyValuePartialInformation, - vpip, - Size, - &Size); - - if (!NT_SUCCESS(Status)) + else if (!NT_SUCCESS(Status)) { - DPRINT("ZwQueryValueKey() Failed.(0x%X)\n", Status); - ExFreePool(fip); - ExFreePool(bfip); - ExFreePool(vpip); - if (SymLinkList != NULL) - ExFreePool(SymLinkList); - RtlFreeUnicodeString(&SymbolicLinkKeyName); - RtlFreeUnicodeString(&SubKeyName); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(SymbolicLinkKey); - ZwClose(SubKey); - ZwClose(InterfaceKey); - return Status; + DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + goto cleanup; } + /* FIXME: Read the Linked value + * If it doesn't exist => ERROR + * If it is not a REG_DWORD or Size != sizeof(ULONG) => ERROR + * If its value is 0, go to NextReferenceString + * At the moment, do as if it is active... + */ + DPRINT1("Checking if device is enabled is not implemented yet!\n"); + } - Status = RtlCheckRegistryKey(RTL_REGISTRY_ABSOLUTE, ControlKeyName.Buffer); + /* Read the SymbolicLink string and add it into SymbolicLinkList */ + Status = ZwQueryValueKey( + ReferenceKey, + &SymbolicLink, + KeyValuePartialInformation, + NULL, + 0, + &Size); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) + { + DPRINT("ZwQueryValueKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + bip = ExAllocatePool(PagedPool, Size); + if (!bip) + { + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + Status = ZwQueryValueKey( + ReferenceKey, + &SymbolicLink, + KeyValuePartialInformation, + bip, + Size, + &Size); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwQueryValueKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + else if (bip->Type != REG_SZ) + { + DPRINT("Unexpected registry type 0x%lx (expected 0x%lx)\n", bip->Type, REG_SZ); + Status = STATUS_UNSUCCESSFUL; + goto cleanup; + } + else if (bip->DataLength < 5 * sizeof(WCHAR)) + { + DPRINT("Registry string too short (length %lu, expected %lu at least)\n", bip->DataLength < 5 * sizeof(WCHAR)); + Status = STATUS_UNSUCCESSFUL; + goto cleanup; + } + KeyName.Length = KeyName.MaximumLength = bip->DataLength - 4 * sizeof(WCHAR); + KeyName.Buffer = &((PWSTR)bip->Data)[4]; + if (KeyName.Length && KeyName.Buffer[KeyName.Length / sizeof(WCHAR)] == UNICODE_NULL) + /* Remove trailing NULL */ + KeyName.Length -= sizeof(WCHAR); - if (NT_SUCCESS(Status)) + /* Add new symbolic link to symbolic link list */ + if (ReturnBuffer.Length + KeyName.Length + sizeof(WCHAR) > ReturnBuffer.MaximumLength) + { + PWSTR NewBuffer; + ReturnBuffer.MaximumLength = max(ReturnBuffer.MaximumLength * 2, ReturnBuffer.Length + KeyName.Length + 2 * sizeof(WCHAR)); + NewBuffer = ExAllocatePool(PagedPool, ReturnBuffer.MaximumLength); + if (!NewBuffer) { - /* Put the name in the string here */ - if (SymLinkList == NULL) - { - SymLinkListSize = vpip->DataLength; - SymLinkList = ExAllocatePool(PagedPool, SymLinkListSize + sizeof(WCHAR)); - ASSERT(SymLinkList != NULL); - RtlCopyMemory(SymLinkList, vpip->Data, vpip->DataLength); - SymLinkList[vpip->DataLength / sizeof(WCHAR)] = 0; - SymLinkList[1] = '?'; - } - else - { - PWCHAR OldSymLinkList; - ULONG OldSymLinkListSize; - PWCHAR SymLinkListPtr; - - OldSymLinkList = SymLinkList; - OldSymLinkListSize = SymLinkListSize; - SymLinkListSize += vpip->DataLength; - SymLinkList = ExAllocatePool(PagedPool, SymLinkListSize + sizeof(WCHAR)); - ASSERT(SymLinkList != NULL); - RtlCopyMemory(SymLinkList, OldSymLinkList, OldSymLinkListSize); - ExFreePool(OldSymLinkList); - SymLinkListPtr = SymLinkList + (OldSymLinkListSize / sizeof(WCHAR)); - RtlCopyMemory(SymLinkListPtr, vpip->Data, vpip->DataLength); - SymLinkListPtr[vpip->DataLength / sizeof(WCHAR)] = 0; - SymLinkListPtr[1] = '?'; - } + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; } - - RtlFreeUnicodeString(&SymbolicLinkKeyName); - RtlFreeUnicodeString(&ControlKeyName); - ZwClose(SymbolicLinkKey); + RtlCopyMemory(NewBuffer, ReturnBuffer.Buffer, ReturnBuffer.Length); + ExFreePool(ReturnBuffer.Buffer); + ReturnBuffer.Buffer = NewBuffer; } + DPRINT("Adding symbolic link %wZ\n", &KeyName); + Status = RtlAppendUnicodeStringToString(&ReturnBuffer, &KeyName); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + /* RtlAppendUnicodeStringToString added a NULL at the end of the + * destination string, but didn't increase the Length field. + * Do it for it. + */ + ReturnBuffer.Length += sizeof(WCHAR); - ExFreePool(vpip); - RtlFreeUnicodeString(&SubKeyName); - ZwClose(SubKey); +NextReferenceString: + ExFreePool(ReferenceBi); + ReferenceBi = NULL; + ExFreePool(bip); + bip = NULL; + if (ReferenceKey != INVALID_HANDLE_VALUE) + { + ZwClose(ReferenceKey); + ReferenceKey = INVALID_HANDLE_VALUE; + } + if (ControlKey != INVALID_HANDLE_VALUE) + { + ZwClose(ControlKey); + ControlKey = INVALID_HANDLE_VALUE; + } } - - if (SymLinkList != NULL) + if (FoundRightPDO) { - SymLinkList[SymLinkListSize / sizeof(WCHAR)] = 0; + /* No need to go further, as we already have found what we searched */ + break; } - else - { - SymLinkList = ExAllocatePool(PagedPool, 2 * sizeof(WCHAR)); - SymLinkList[0] = 0; - } - *SymbolicLinkList = SymLinkList; + ExFreePool(DeviceBi); + DeviceBi = NULL; + ZwClose(DeviceKey); + DeviceKey = INVALID_HANDLE_VALUE; + } - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(InterfaceKey); - ExFreePool(bfip); - ExFreePool(fip); + /* Add final NULL to ReturnBuffer */ + if (ReturnBuffer.Length >= ReturnBuffer.MaximumLength) + { + PWSTR NewBuffer; + ReturnBuffer.MaximumLength += sizeof(WCHAR); + NewBuffer = ExAllocatePool(PagedPool, ReturnBuffer.MaximumLength); + if (!NewBuffer) + { + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + RtlCopyMemory(NewBuffer, ReturnBuffer.Buffer, ReturnBuffer.Length); + ExFreePool(ReturnBuffer.Buffer); + ReturnBuffer.Buffer = NewBuffer; } + ReturnBuffer.Buffer[ReturnBuffer.Length / sizeof(WCHAR)] = UNICODE_NULL; + *SymbolicLinkList = ReturnBuffer.Buffer; + Status = STATUS_SUCCESS; - return STATUS_SUCCESS; +cleanup: + if (!NT_SUCCESS(Status)) + ExFreePool(ReturnBuffer.Buffer); + if (InterfaceKey != INVALID_HANDLE_VALUE) + ZwClose(InterfaceKey); + if (DeviceKey != INVALID_HANDLE_VALUE) + ZwClose(DeviceKey); + if (ReferenceKey != INVALID_HANDLE_VALUE) + ZwClose(ReferenceKey); + if (ControlKey != INVALID_HANDLE_VALUE) + ZwClose(ControlKey); + ExFreePool(DeviceBi); + ExFreePool(ReferenceBi); + ExFreePool(bip); + return Status; } /* @@ -882,7 +834,7 @@ PWCHAR StartPosition; PWCHAR EndPosition; NTSTATUS Status; - GUID EventGuid; + LPCGUID EventGuid; if (SymbolicLinkName == NULL) return STATUS_INVALID_PARAMETER_1; @@ -918,11 +870,11 @@ return Status; } - EventGuid = Enable ? GUID_DEVICE_INTERFACE_ARRIVAL : GUID_DEVICE_INTERFACE_REMOVAL; + EventGuid = Enable ? &GUID_DEVICE_INTERFACE_ARRIVAL : &GUID_DEVICE_INTERFACE_REMOVAL; IopNotifyPlugPlayNotification( PhysicalDeviceObject, EventCategoryDeviceInterfaceChange, - &EventGuid, + EventGuid, &GuidString, (PVOID)SymbolicLinkName); _____ Modified: trunk/reactos/ntoskrnl/io/pnpnotify.c --- trunk/reactos/ntoskrnl/io/pnpnotify.c 2006-01-11 21:59:52 UTC (rev 20790) +++ trunk/reactos/ntoskrnl/io/pnpnotify.c 2006-01-11 22:13:02 UTC (rev 20791) @@ -1,12 +1,11 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/io/pnpnotify.c * PURPOSE: Plug & Play notification functions * * PROGRAMMERS: Filip Navara (xnavara(a)volny.cz) - * HervÚ Poussineau (hpoussin(a)reactos.com) + * HervÚ Poussineau (hpoussin(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -92,9 +91,13 @@ return STATUS_INSUFFICIENT_RESOURCES; } - if (EventCategory == EventCategoryTargetDeviceChange + if (EventCategory == EventCategoryDeviceInterfaceChange && EventCategoryFlags & PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES) { + DEVICE_INTERFACE_CHANGE_NOTIFICATION NotificationInfos; + UNICODE_STRING SymbolicLinkU; + PWSTR SymbolicLink; + Status = IoGetDeviceInterfaces( (LPGUID)EventCategoryData, NULL, /* PhysicalDeviceObject OPTIONAL */ @@ -107,8 +110,18 @@ ObDereferenceObject(DriverObject); return Status; } - /* FIXME: enumerate SymbolicLinkList */ - DPRINT1("IoRegisterPlugPlayNotification(): need to send notifications for existing interfaces!\n"); + /* Enumerate SymbolicLinkList */ + NotificationInfos.Version = 1; + NotificationInfos.Size = sizeof(DEVICE_INTERFACE_CHANGE_NOTIFICATION); + RtlCopyMemory(&NotificationInfos.Event, &GUID_DEVICE_INTERFACE_ARRIVAL, sizeof(GUID)); + RtlCopyMemory(&NotificationInfos.InterfaceClassGuid, EventCategoryData, sizeof(GUID)); + NotificationInfos.SymbolicLinkName = &SymbolicLinkU; + for (SymbolicLink = SymbolicLinkList; *SymbolicLink; SymbolicLink += wcslen(SymbolicLink) + 1) + { + RtlInitUnicodeString(&SymbolicLinkU, SymbolicLink); + DPRINT("Calling callback routine for %S\n", SymbolicLink); + (*CallbackRoutine)(&NotificationInfos, Context); + } ExFreePool(SymbolicLinkList); } @@ -184,7 +197,7 @@ IopNotifyPlugPlayNotification( IN PDEVICE_OBJECT DeviceObject, IN IO_NOTIFICATION_EVENT_CATEGORY EventCategory, - IN GUID* Event, + IN LPCGUID Event, IN PVOID EventCategoryData1, IN PVOID EventCategoryData2) { @@ -253,7 +266,7 @@ * list to find those that meet some criteria. */ - LIST_FOR_EACH(ChangeEntry,&PnpNotifyListHead, PNP_NOTIFY_ENTRY, PnpNotifyList) + LIST_FOR_EACH(ChangeEntry,&PnpNotifyListHead, PNP_NOTIFY_ENTRY, PnpNotifyList) { CallCurrentEntry = FALSE;

18 years, 8 months

[hpoussin] 20790: Add DEVICE_INTERFACE_INCLUDE_NONACTIVE constant

by hpoussin＠svn.reactos.org

Add DEVICE_INTERFACE_INCLUDE_NONACTIVE constant Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2006-01-11 21:31:25 UTC (rev 20789) +++ trunk/reactos/w32api/include/ddk/winddk.h 2006-01-11 21:59:52 UTC (rev 20790) @@ -7468,6 +7468,8 @@ IN CONST GUID *AliasInterfaceClassGuid, OUT PUNICODE_STRING AliasSymbolicLinkName); +#define DEVICE_INTERFACE_INCLUDE_NONACTIVE 0x00000001 + NTOSAPI NTSTATUS DDKAPI

18 years, 8 months

[gedmurphy] 20789: redo the toolbar and app icons and a few other minor changes

by gedmurphy＠svn.reactos.org

redo the toolbar and app icons and a few other minor changes Modified: trunk/reactos/subsys/system/servman/En.rc Modified: trunk/reactos/subsys/system/servman/res/system.ico Modified: trunk/reactos/subsys/system/servman/res/toolbar.bmp Modified: trunk/reactos/subsys/system/servman/resource.h Modified: trunk/reactos/subsys/system/servman/servman.c Modified: trunk/reactos/subsys/system/servman/servman.h _____ Modified: trunk/reactos/subsys/system/servman/En.rc --- trunk/reactos/subsys/system/servman/En.rc 2006-01-11 20:16:29 UTC (rev 20788) +++ trunk/reactos/subsys/system/servman/En.rc 2006-01-11 21:31:25 UTC (rev 20789) @@ -3,27 +3,27 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit",ID_EXIT + MENUITEM "E&xit", ID_EXIT END POPUP "Action" BEGIN - MENUITEM "Start",ID_START - MENUITEM "Stop",ID_STOP - MENUITEM "Pause",ID_PAUSE - MENUITEM "Resume",ID_RESUME - MENUITEM "Restart",ID_RESTART + MENUITEM "Start", ID_START + MENUITEM "Stop", ID_STOP + MENUITEM "Pause", ID_PAUSE + MENUITEM "Resume", ID_RESUME + MENUITEM "Restart", ID_RESTART MENUITEM SEPARATOR - MENUITEM "Refresh",ID_REFRESH + MENUITEM "Refresh", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Properties",ID_PROP + MENUITEM "Properties", ID_PROP END POPUP "View" BEGIN - MENUITEM "Customize",ID_VIEW_CUSTOMIZE + MENUITEM "Customize", ID_VIEW_CUSTOMIZE END POPUP "Help" BEGIN - MENUITEM "About",ID_ABOUT + MENUITEM "About", ID_ABOUT END END @@ -31,28 +31,28 @@ IDR_POPUP MENU BEGIN POPUP "popup" - BEGIN - MENUITEM "Start",ID_START - MENUITEM "Stop",ID_STOP - MENUITEM "Pause",ID_PAUSE - MENUITEM "Resume",ID_RESUME - MENUITEM "Restart",ID_RESTART + BEGIN + MENUITEM "Start", ID_START + MENUITEM "Stop", ID_STOP + MENUITEM "Pause", ID_PAUSE + MENUITEM "Resume", ID_RESUME + MENUITEM "Restart", ID_RESTART MENUITEM SEPARATOR POPUP "All tasks" BEGIN - MENUITEM "Start",ID_START - MENUITEM "Stop",ID_STOP - MENUITEM "Pause",ID_PAUSE - MENUITEM "Resume",ID_RESUME - MENUITEM "Restart",ID_RESTART - MENUITEM "Refresh",ID_REFRESH + MENUITEM "Start", ID_START + MENUITEM "Stop", ID_STOP + MENUITEM "Pause", ID_PAUSE + MENUITEM "Resume", ID_RESUME + MENUITEM "Restart", ID_RESTART + MENUITEM "Refresh", ID_REFRESH END MENUITEM SEPARATOR - MENUITEM "Refresh",ID_REFRESH + MENUITEM "Refresh", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Properties",ID_PROP + MENUITEM "Properties", ID_PROP MENUITEM SEPARATOR - MENUITEM "About",ID_HELP + MENUITEM "Help", ID_HELP END END @@ -119,21 +119,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Num Services: %d" - - IDS_LICENSE "This program 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.\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." - /*"This program 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.\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." */ - + IDS_LICENSE "This program is free software; 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., 675 Mass Ave, Cambridge, MA 02139, USA." END STRINGTABLE DISCARDABLE _____ Modified: trunk/reactos/subsys/system/servman/res/system.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/servman/res/toolbar.bmp (Binary files differ) _____ Modified: trunk/reactos/subsys/system/servman/resource.h --- trunk/reactos/subsys/system/servman/resource.h 2006-01-11 20:16:29 UTC (rev 20788) +++ trunk/reactos/subsys/system/servman/resource.h 2006-01-11 21:31:25 UTC (rev 20789) @@ -55,11 +55,11 @@ #define TBICON_PROP 0 #define TBICON_REFRESH 1 #define TBICON_EXPORT 2 -#define TBICON_START 3 -#define TBICON_STOP 4 -#define TBICON_PAUSE 5 -#define TBICON_RESTART 6 -#define TBICON_NEW 7 +#define TBICON_NEW 3 +#define TBICON_START 4 +#define TBICON_STOP 5 +#define TBICON_PAUSE 6 +#define TBICON_RESTART 7 #define TBICON_HELP 8 #define TBICON_EXIT 9 _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-11 20:16:29 UTC (rev 20788) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-11 21:31:25 UTC (rev 20789) @@ -25,8 +25,6 @@ { case WM_CREATE: { - //HFONT hfDefault; - TBADDBITMAP tbab; INT iImageOffset; INT statwidths[] = {110, -1}; /* widths of status bar */ @@ -41,18 +39,21 @@ {TBICON_EXPORT, ID_EXPORT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* export */ /* Note: First item for a seperator is its width in pixels */ - {25, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + {TBICON_NEW, ID_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* create */ + + {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + {TBICON_START, ID_START, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* start */ {TBICON_STOP, ID_STOP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* stop */ {TBICON_PAUSE, ID_PAUSE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* pause */ {TBICON_RESTART, ID_RESTART, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* restart */ - {25, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - {TBICON_NEW, ID_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* start */ - {TBICON_HELP, ID_HELP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* stop */ - {TBICON_EXIT, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* pause */ + {TBICON_HELP, ID_HELP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* help */ + {TBICON_EXIT, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* exit */ }; @@ -74,25 +75,20 @@ /* Send the TB_BUTTONSTRUCTSIZE message, which is required for backward compatibility */ SendMessage(hTool, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - /* Add standard image list */ - tbab.hInst = HINST_COMMCTRL; - tbab.nID = IDB_STD_SMALL_COLOR; - SendMessage(hTool, TB_ADDBITMAP, 0, (LPARAM) &tbab); - /* Add custom images */ tbab.hInst = hInstance; tbab.nID = IDB_BUTTONS; - iImageOffset = (INT)SendMessage(hTool, TB_ADDBITMAP, 11, (LPARAM)&tbab); + iImageOffset = (INT)SendMessage(hTool, TB_ADDBITMAP, NUM_BUTTONS, (LPARAM)&tbab); tbb[0].iBitmap += iImageOffset; /* properties */ tbb[1].iBitmap += iImageOffset; /* refresh */ tbb[2].iBitmap += iImageOffset; /* export */ - tbb[4].iBitmap += iImageOffset; /* start */ - tbb[5].iBitmap += iImageOffset; /* stop */ - tbb[6].iBitmap += iImageOffset; /* pause */ - tbb[7].iBitmap += iImageOffset; /* restart */ - tbb[9].iBitmap += iImageOffset; /* new */ - tbb[10].iBitmap += iImageOffset; /* help */ - tbb[11].iBitmap += iImageOffset; /* exit */ + tbb[4].iBitmap += iImageOffset; /* new */ + tbb[6].iBitmap += iImageOffset; /* start */ + tbb[7].iBitmap += iImageOffset; /* stop */ + tbb[8].iBitmap += iImageOffset; /* pause */ + tbb[9].iBitmap += iImageOffset; /* restart */ + tbb[11].iBitmap += iImageOffset; /* help */ + tbb[12].iBitmap += iImageOffset; /* exit */ /* Add buttons to toolbar */ SendMessage(hTool, TB_ADDBUTTONS, NUM_BUTTONS, (LPARAM) &tbb); @@ -126,21 +122,21 @@ /* name */ lvc.iSubItem = 0; - lvc.cx = 160; + lvc.cx = 150; LoadString(hInstance, IDS_FIRSTCOLUMN, szTemp, 256); lvc.pszText = szTemp; ListView_InsertColumn(hListView, 0, &lvc); /* description */ lvc.iSubItem = 1; - lvc.cx = 260; + lvc.cx = 240; LoadString(hInstance, IDS_SECONDCOLUMN, szTemp, 256); lvc.pszText = szTemp; ListView_InsertColumn(hListView, 1, &lvc); /* status */ lvc.iSubItem = 2; - lvc.cx = 75; + lvc.cx = 55; LoadString(hInstance, IDS_THIRDCOLUMN, szTemp, 256); lvc.pszText = szTemp; ListView_InsertColumn(hListView, 2, &lvc); @@ -232,8 +228,8 @@ case WM_NOTIFY: { LPNMITEMACTIVATE item; - + switch (((LPNMHDR) lParam)->code) { case NM_DBLCLK: @@ -247,10 +243,10 @@ UINT idButton; lpttt = (LPTOOLTIPTEXT) lParam; - lpttt->hinst = hInstance; + //lpttt->hinst = hInstance; - // Specify the resource identifier of the descriptive - // text for the given button. + /* Specify the resource identifier of the descriptive + * text for the given button. */ idButton = (UINT)lpttt->hdr.idFrom; switch (idButton) { @@ -318,10 +314,11 @@ { int xPos, yPos; - xPos = GET_X_LPARAM(lParam); + xPos = GET_X_LPARAM(lParam); yPos = GET_Y_LPARAM(lParam); - TrackPopupMenuEx(hShortcutMenu, TPM_RIGHTBUTTON, xPos, yPos, hwnd, NULL); + TrackPopupMenuEx(hShortcutMenu, TPM_RIGHTBUTTON, + xPos, yPos, hwnd, NULL); } break; @@ -333,8 +330,8 @@ break; case ID_REFRESH: - if (! RefreshServiceList() ) - GetError(0); + RefreshServiceList(); + break; case ID_EXPORT: break; @@ -425,7 +422,7 @@ ClassName, _T("ReactOS Service Manager"), WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, - CW_USEDEFAULT, CW_USEDEFAULT, 700, 500, + CW_USEDEFAULT, CW_USEDEFAULT, 650, 450, NULL, NULL, hInstance, NULL); if(hMainWnd == NULL) _____ Modified: trunk/reactos/subsys/system/servman/servman.h --- trunk/reactos/subsys/system/servman/servman.h 2006-01-11 20:16:29 UTC (rev 20788) +++ trunk/reactos/subsys/system/servman/servman.h 2006-01-11 21:31:25 UTC (rev 20789) @@ -10,7 +10,7 @@ #include "resource.h" #define MAX_KEY_LENGTH 256 -#define NUM_BUTTONS 12 +#define NUM_BUTTONS 13 BOOL RefreshServiceList(VOID);

18 years, 8 months

[ion] 20788: - Fix probably one of the most devastating hidden ROS bugs currently in trunk. KWAIT_BLOCK's WaitType was defined as USHORT instead of UCHAR, causing a KeWaitForMultipleObjects of 2 or more objects to overwrite the Thread's PreviousMode (an effect of this is that 99% of user-mode callbacks from win32k were being done with the mode set to Kernel-Mode instead of UserMode). A KeWaitForMultipleObjects of 3 or more objects, or the timer object itself in some cases would cause this confli

by ion＠svn.reactos.org

- Fix probably one of the most devastating hidden ROS bugs currently in trunk. KWAIT_BLOCK's WaitType was defined as USHORT instead of UCHAR, causing a KeWaitForMultipleObjects of 2 or more objects to overwrite the Thread's PreviousMode (an effect of this is that 99% of user-mode callbacks from win32k were being done with the mode set to Kernel-Mode instead of UserMode). A KeWaitForMultipleObjects of 3 or more objects, or the timer object itself in some cases would cause this conflict to occur with the ResourceIndex member, potentially corrupting the ERESOURCE owner table in my updated implementation. Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2006-01-11 20:01:03 UTC (rev 20787) +++ trunk/reactos/w32api/include/ddk/winddk.h 2006-01-11 20:16:29 UTC (rev 20788) @@ -4118,7 +4118,8 @@ PVOID Object; struct _KWAIT_BLOCK * RESTRICTED_POINTER NextWaitBlock; USHORT WaitKey; - USHORT WaitType; + UCHAR WaitType; + UCHAR SpareByte; } KWAIT_BLOCK, *PKWAIT_BLOCK, *RESTRICTED_POINTER PRKWAIT_BLOCK; typedef struct _IO_REMOVE_LOCK_TRACKING_BLOCK * PIO_REMOVE_LOCK_TRACKING_BLOCK;

18 years, 8 months

[frik85] 20787: RosCMS update:

by frik85＠svn.reactos.org

RosCMS update: * add RosCMS user group history page Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_history.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_admin.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin.php 2006-01-11 19:18:57 UTC (rev 20786) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin.php 2006-01-11 20:01:03 UTC (rev 20787) @@ -147,6 +147,9 @@ case "usergroups": include("inc/admin_user_groups.php"); break; + case "userhistory": + include("inc/admin_user_history.php"); + break; case "usrgrpmbr": if ($rpm_sec2=="view" || $rpm_sec2=="") { include("inc/admin_user_group_members.php"); _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members.php 2006-01-11 19:18:57 UTC (rev 20786) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members.php 2006-01-11 20:01:03 UTC (rev 20787) @@ -351,12 +351,14 @@ $roscms_SET_letter = "%"; } -$query_count_cat=mysql_query("SELECT COUNT('user_id') - FROM `users` - WHERE `user_account_enabled` = 'yes' - AND `user_account_hidden` = 'no' - AND `user_name` LIKE '" . $roscms_SET_letter . "%' - ORDER BY `user_name` ASC ;"); +$query_count_cat=mysql_query("SELECT COUNT('A1.user_id') + FROM users A1 + WHERE A1.user_account_enabled = 'yes' + AND A1.user_account_hidden = 'no' + AND A1.user_name LIKE '" . $roscms_SET_letter . "%' + $ros_cms_intern_users_filt + $ros_cms_intern_users_lang + ORDER BY A1.user_name ASC ;"); $result_count_cat = mysql_fetch_row($query_count_cat); echo ""; _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_history.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_history.php 2006-01-11 19:18:57 UTC (rev 20786) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_history.php 2006-01-11 20:01:03 UTC (rev 20787) @@ -0,0 +1,291 @@ +<?php + + // To prevent hacking activity: + if ( !defined('ROSCMS_SYSTEM') OR !defined('ROSCMS_SYSTEM_ADMIN') ) + { + if ( !defined('ROSCMS_SYSTEM_LOG') ) { + define ("ROSCMS_SYSTEM_LOG", "Hacking attempt"); + } + $seclog_section="roscms_admin_interface"; + $seclog_level="50"; + $seclog_reason="Hacking attempt: admin_users.php"; + define ("ROSCMS_SYSTEM", "Hacking attempt"); + include('securitylog.php'); // open security log + die("Hacking attempt"); + } + +?> +<div class="contentSmall"> Admin Interface - User History + <ul> + <li>User History</li> + </ul> + Action: <a href="?page=admin&sec=userhistory&sec2=view">reset + filters & sort</a> + <?php + + if ($rpm_lang_id == "") { + $rpm_lang_id="all"; + } + echo 'Language: '; + if ($rpm_lang_id == "all") { + echo 'All'; + $ros_cms_intern_users_lang = "AND A1.user_language LIKE '%'"; + } + else { + echo '<a href="?page=admin&sec=userhistory&sec2=view&sort='.$rpm_sort .'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid=all">All</a>'; + } + // Languages + $sql_lang="SELECT * + FROM languages + WHERE lang_level != '0' + ORDER BY 'lang_level' DESC"; + $sql_query_lang=mysql_query($sql_lang); + while($myrow_lang=mysql_fetch_row($sql_query_lang)) { + $roscms_sel_lang = $myrow_lang[0]; + echo ' | '; + if ($rpm_lang_id == $roscms_sel_lang) { + echo ''.$myrow_lang[1].''; + $ros_cms_intern_users_lang = "AND A1.user_language = '".$roscms_sel_lang."'"; + } + else { + echo '<a href="?page=admin&sec=userhistory&sec2=view&sort='.$rpm_sort .'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$roscms_sel_ lang.'">'.$myrow_lang[1].'</a>'; + } + } + + + if ($rpm_filt == "") { + $rpm_filt="active"; + } + echo 'Filter: '; + if ($rpm_filt == "active") { + echo 'active users'; + $ros_cms_intern_users_filt = "AND A1.user_account_enabled = 'yes'"; + } + else { + echo '<a href="?page=admin&sec=userhistory&sec2=view&sort='.$rpm_sort .'&filt=active&langid='.$rpm_lang_id.'">active users</a>'; + } + echo ' | '; + if ($rpm_filt == "all") { + echo 'all users'; + $ros_cms_intern_users_filt = "AND A1.user_account_enabled != ''"; + } + else { + echo '<a href="?page=admin&sec=userhistory&sec2=view&sort='.$rpm_sort .'&filt=all&langid='.$rpm_lang_id.'">all users</a>'; + } + echo ''; + + if ($rpm_sort == "") { + $rpm_sort="translator"; + } + echo 'Filter by Group: '; +/* if ($rpm_sort == "all") { + echo 'all'; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid LIKE '%'"; + } + else { + echo '<a href="?page=admin&sec=userhistory&sec2=view&sort=all&fil t='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'">all</a >'; + } + echo ' | ';*/ + if ($rpm_sort == "ros_sadmin") { + echo 'super admin'; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid = 'ros_sadmin'"; + } + else { + echo '<a href="?page=admin&sec=userhistory&sec2=view&sort=ros_sadmin& amp;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'" >super admin</a>'; + } + echo ' | '; + if ($rpm_sort == "ros_admin") { + echo 'admin'; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid = 'ros_admin'"; + } + else { + echo '<a href="?page=admin&sec=userhistory&sec2=view&sort=ros_admin&a mp;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'"> admin</a>'; + } + echo ' | '; + if ($rpm_sort == "developer") { + echo 'developer'; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid = 'developer'"; + } + else { + echo '<a href="?page=admin&sec=userhistory&sec2=view&sort=developer&a mp;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'"> developer</a>'; + } + echo ' | '; + if ($rpm_sort == "moderator") { + echo 'moderator'; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid = 'moderator'"; + } + else { + echo '<a href="?page=admin&sec=userhistory&sec2=view&sort=moderator&a mp;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'"> moderator</a>'; + } + echo ' | '; + if ($rpm_sort == "translator") { + echo 'translator'; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid = 'translator'"; + } + else { + echo '<a href="?page=admin&sec=userhistory&sec2=view&sort=translator& amp;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'" >translator</a>'; + } + echo ''; + +?> + <?php + +// Setting: +$roscms_intern_items_per_page = 50; + +$roscms_SET_curpos = ""; +$roscms_SET_letter = ""; +if (array_key_exists("curpos", $_GET)) $roscms_SET_curpos=htmlspecialchars($_GET["curpos"]); +if (array_key_exists("letter", $_GET)) $roscms_SET_letter=htmlspecialchars($_GET["letter"]); + + + + +?> + <table width="100%" border="0" cellpadding="1" cellspacing="1"> + <tr bgcolor="#5984C3"> + <td width="10%"> + <div align="center">Action</div></td> + <td width="20%" bgcolor="#5984C3"> + <div align="center">Name</div></td> + <td width="70%" bgcolor="#5984C3"> + <div align="center">History</div> </td> + </tr> + <?php + + + $roscms_TEMP_sql = "SELECT A1.user_id, A1.user_name, A2.usergroupmember_userid, A2.usergroupmember_usergroupid + FROM users A1, usergroup_members A2 + WHERE A1.user_id = A2.usergroupmember_userid + AND A1.user_name LIKE '%' + $ros_cms_intern_users_filt $ros_cms_intern_users_lang $ros_cms_intern_users_sortby + GROUP BY A1.user_name + ;"; +// echo $roscms_TEMP_sql; + $query_page = mysql_query($roscms_TEMP_sql) ; + + $color1=$roscms_intern_color1; + $color2=$roscms_intern_color2; + $colorcounter="0"; + //$farbe="#CCCCC"; + + while($result_page = mysql_fetch_array($query_page)) { // users +?> + <tr> + <td valign="top" bgcolor="<?php + $colorcounter++; + if ($colorcounter == "1") { + echo $color1; + $farbe = $color1; + } + elseif ($colorcounter == "2") { + $colorcounter="0"; + echo $color2; + $farbe = $color2; + } + ?>"> + <div align="center"><a href="?page=admin&sec=userhistory&sec2=edit&sec3=<?php echo $result_page['usergroupmember_usergroupid']; ?>&db_id=<?php echo $result_page['user_id']; ?>"><img src="images/view.gif" alt="Edit Membership" width="19" height="18" border="0"></a> <a href="?page=admin&sec=userhistory&sec2=add&sec3=new&db_i d=<?php echo $result_page['usergroupmember_userid']; ?>"><img src="images/tool.gif" alt="Add Membership" width="19" height="18" border="0"></a> <a href="?page=admin&sec=userhistory&sec2=delete&sec3=<?php echo $result_page['usergroupmember_usergroupid']; ?>&db_id=<?php echo $result_page['usergroupmember_userid']; ?>"><img src="images/delete.gif" alt="Delete Membership" width="19" height="18" border="0"></a></div></td> + <td valign="top" bgcolor="<?php echo $farbe; ?>"> <div align="left"> + <?php echo $result_page['user_id']. " - "; + $query_usra = mysql_query("SELECT user_id, user_name FROM users WHERE user_id = '".$result_page['user_id']."'") or die('DB error (membership script)!'); + $result_usra = mysql_fetch_array($query_usra); // or die('DB error (show_sessions script)'); + + echo "".$result_usra['user_name']." <a href='?page=user&sec=profil&sec2=".$result_page['user_id']."'>[P rofil]</a>"; ?> + + <?php + echo "<ul>"; + $query_grpmbr = mysql_query("SELECT * + FROM `usergroup_members` + WHERE `usergroupmember_userid` = ".$result_usra['user_id']." + ORDER BY `usergroupmember_usergroupid` ASC ;") ; + while($result_grpmbr = mysql_fetch_array($query_grpmbr)) { + echo "<li>".$result_grpmbr['usergroupmember_usergroupid']."</li>"; + } + echo "</ul>"; + ?> + + </div></td> + <td valign="top" bgcolor="<?php echo $farbe; ?>"><?php + + // Contents + echo "Contents: "; + $query_count_contents=mysql_query("SELECT COUNT('content_id') + FROM `content` + WHERE `content_usrname_id` = ".$result_page['user_id']." + ORDER BY `content_id` DESC;"); + $result_count_contents = mysql_fetch_row($query_count_contents); + echo $result_count_contents[0]." "; + if ($result_count_contents[0] != 0) { + $query_entries_contents = mysql_query("SELECT * + FROM `content` + WHERE `content_usrname_id` = ".$result_page['user_id']." + ORDER BY `content_id` DESC + LIMIT 0 , 25 ;") ; + while($result_entries_contents = mysql_fetch_array($query_entries_contents)) { + echo "     ".$result_entries_contents['content_id']. " - ".$result_entries_contents['content_name']." - ".$result_entries_contents['content_lang']." / ".$result_entries_contents['content_type']." (".$result_entries_contents['content_date']." ".$result_entries_contents['content_time'].") "; + } + if ($result_count_contents[0] > 25) { + echo "     ... "; + } + echo " "; + } + + + // Pages + echo "Pages: "; + $query_count_contents=mysql_query("SELECT COUNT('page_id') + FROM `pages` + WHERE `page_usrname_id` = ".$result_page['user_id']." + ORDER BY `page_id` DESC;"); + $result_count_contents = mysql_fetch_row($query_count_contents); + echo $result_count_contents[0]." "; + if ($result_count_contents[0] != 0) { + $query_entries_contents = mysql_query("SELECT * + FROM `pages` + WHERE `page_usrname_id` = ".$result_page['user_id']." + ORDER BY `page_id` DESC + LIMIT 0 , 25 ;") ; + while($result_entries_contents = mysql_fetch_array($query_entries_contents)) { + echo "     ".$result_entries_contents['page_id']." - ".$result_entries_contents['page_name']." - ".$result_entries_contents['page_language']." / ".$result_entries_contents['pages_extention']." (".$result_entries_contents['page_date']." ".$result_entries_contents['page_time'].") "; + } + if ($result_count_contents[0] > 25) { + echo "     ... "; + } + echo " "; + } + + + // Pages + echo "DynContent: "; + $query_count_contents=mysql_query("SELECT COUNT('dyn_id') + FROM `dyn_content` + WHERE `dyn_content_usrname_id` = ".$result_page['user_id']." + ORDER BY `dyn_id` DESC;"); + $result_count_contents = mysql_fetch_row($query_count_contents); + echo $result_count_contents[0]." "; + if ($result_count_contents[0] != 0) { + $query_entries_contents = mysql_query("SELECT * + FROM `dyn_content` + WHERE `dyn_content_usrname_id` = ".$result_page['user_id']." + ORDER BY `dyn_id` DESC + LIMIT 0 , 25 ;") ; + while($result_entries_contents = mysql_fetch_array($query_entries_contents)) { + echo "     ".$result_entries_contents['dyn_id']." - ".$result_entries_contents['dyn_content_name']."_".$result_entries_conte nts['dyn_content_id'].".".$result_entries_contents['dyn_content_nr']." - ".$result_entries_contents['dyn_content_lang']." (".$result_entries_contents['dyn_content_date']." ".$result_entries_contents['dyn_content_time'].") "; + } + if ($result_count_contents[0] > 25) { + echo "     ... "; + } + echo " "; + } + + ?></td> + </tr> + <?php + } // end while +?> + </table> + <?php + $roscms_infotable = "user"; + include("inc/inc_description_table.php"); +?> +</div> Property changes on: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_history.php ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_admin.php --- trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_admin.php 2006-01-11 19:18:57 UTC (rev 20786) +++ trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_admin.php 2006-01-11 20:01:03 UTC (rev 20787) @@ -34,11 +34,12 @@ ?> <li><a href="?page=admin&sec=users">User Accounts</a></li> <?php - if ($rpm_sec == "users" || $rpm_sec == "usergroups" || $rpm_sec == "usrgrpmbr" || $rpm_sec == "sessions") { + if ($rpm_sec == "users" || $rpm_sec == "usergroups" || $rpm_sec == "usrgrpmbr" || $rpm_sec == "userhistory" || $rpm_sec == "sessions") { ?> <li><a href="?page=admin&sec=usergroups"> - Usergroups</a></li> <li><a href="?page=admin&sec=usrgrpmbr"> - Group Members</a></li> <li><a href="?page=admin&sec=sessions"> - Sessions</a></li> + <li><a href="?page=admin&sec=userhistory"> - User History</a></li> <?php } ?>

18 years, 8 months

[weiden] 20786: add the GET_MODULE_HANDLE_EX_* flags

by weiden＠svn.reactos.org

add the GET_MODULE_HANDLE_EX_* flags Modified: trunk/reactos/w32api/include/winbase.h _____ Modified: trunk/reactos/w32api/include/winbase.h --- trunk/reactos/w32api/include/winbase.h 2006-01-11 15:47:22 UTC (rev 20785) +++ trunk/reactos/w32api/include/winbase.h 2006-01-11 19:18:57 UTC (rev 20786) @@ -520,6 +520,11 @@ #define RESTART_NOTIFY_SOLUTION 0x2 #define RESTART_NOTIFY_FAULT 0x4 #endif +#if (_WIN32_WINNT >= 0x0500) +#define GET_MODULE_HANDLE_EX_FLAG_PIN 0x1 +#define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT 0x2 +#define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS 0x4 +#endif #ifndef RC_INVOKED #ifndef _FILETIME_

18 years, 8 months

[cwittich] 20785: make_msvcX_install_[config] patch by Brezenbak

by cwittich＠svn.reactos.org

make_msvcX_install_[config] patch by Brezenbak (i.e. make_msvc71_install_speed) Modified: trunk/reactos/Makefile Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/configuration.cpp Modified: trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2006-01-11 10:00:09 UTC (rev 20784) +++ trunk/reactos/Makefile 2006-01-11 15:47:22 UTC (rev 20785) @@ -396,22 +396,22 @@ $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 msvc -.PHONY: msvc6 +.PHONY: msvc6_clean msvc6_clean: $(RBUILD_TARGET) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs6.00 msvc -.PHONY: msvc7 +.PHONY: msvc7_clean msvc7_clean: $(RBUILD_TARGET) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.00 msvc -.PHONY: msvc71 +.PHONY: msvc71_clean msvc71_clean: $(RBUILD_TARGET) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.10 msvc -.PHONY: msvc8 +.PHONY: msvc8_clean msvc8_clean: $(RBUILD_TARGET) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs8.00 msvc @@ -429,6 +429,52 @@ $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.10 msvc $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs8.10 msvc +.PHONY: msvc7_install_debug +msvc7_install_debug: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcdebug msvc + +.PHONY: msvc7_install_release +msvc7_install_release: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcrelease msvc + +.PHONY: msvc7_install_speed +msvc7_install_speed: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcspeed msvc + +.PHONY: msvc71_install_debug +msvc71_install_debug: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcdebug msvc + +.PHONY: msvc71_install_release +msvc71_install_release: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcrelease msvc + + +.PHONY: msvc71_install_speed +msvc71_install_speed: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcspeed msvc + +.PHONY: msvc8_install_debug +msvc8_install_debug: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcdebug msvc + +.PHONY: msvc8_install_release +msvc8_install_release: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcrelease msvc + +.PHONY: msvc8_install_speed +msvc8_install_speed: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcspeed msvc + .PHONY: makefile_auto_clean makefile_auto_clean: -@$(rm) $(ROS_AUTOMAKE) $(PREAUTO) 2>$(NUL) _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2006-01-11 10:00:09 UTC (rev 20784) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2006-01-11 15:47:22 UTC (rev 20785) @@ -60,7 +60,10 @@ _clean_project_files(); return; } - + if ( configuration.InstallFiles ) { + _install_files( _get_vc_dir(), configuration.VSConfigurationType ); + return; + } string filename_sln ( ProjectNode.name ); //string filename_rules = "gccasm.rules"; @@ -374,3 +377,42 @@ remove ( filename_dsw.c_str () ); } +bool +MSVCBackend::_copy_file ( const std::string& inputname, const std::string& targetname ) const +{ + FILE * input = fopen ( inputname.c_str (), "rb" ); + if ( !input ) + return false; + + FILE * output = fopen ( targetname.c_str (), "wb+" ); + if ( !output ) + { + fclose ( input ); + return false; + } + + char buffer[256]; + int num_read; + while ( (num_read = fread( buffer, sizeof(char), 256, input) ) || !feof( input ) ) + fwrite( buffer, sizeof(char), num_read, output ); + + fclose ( input ); + fclose ( output ); + return true; +} + +void +MSVCBackend::_install_files (const std::string& vcdir, const::string& config) +{ + for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) + { + Module& module = *ProjectNode.modules[i]; + if ( module.installBase == "" || module.installName == "" ) + continue; + + string inputname = Environment::GetOutputPath () + "\\" + module.GetBasePath () + "\\" + vcdir + "\\" + config + "\\" + module.GetTargetName (); + string installdir = Environment::GetInstallPath () + "\\" + module.installBase + "\\" + module.installName; + if ( _copy_file( inputname, installdir ) ) + printf ("Installed File :'%s'\n",installdir.c_str () ); + } +} _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h --- trunk/reactos/tools/rbuild/backend/msvc/msvc.h 2006-01-11 10:00:09 UTC (rev 20784) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h 2006-01-11 15:47:22 UTC (rev 20785) @@ -114,6 +114,8 @@ std::string vcproj_guid ); void _clean_project_files ( void ); void _get_object_files ( const Module& module, std::vector<std::string>& out ) const; + void _install_files ( const std::string& vcdir, const std::string& config ); + bool _copy_file ( const std::string& inputname, const std::string& targetname ) const; }; #endif // __MSVC_H__ _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-11 10:00:09 UTC (rev 20784) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-11 15:47:22 UTC (rev 20785) @@ -145,11 +145,10 @@ // this code is deactivated untill the tree builds fine with msvc // --- is appended to each library path which is later // replaced by the configuration - // i.e. ../output-i386/lib/rtl/---/rtl.lib becomes - // ../output-i386/lib/rtl/Debug/rtl.lib + // i.e. ../output-i386/lib/rtl/vcXX/---/rtl.lib becomes + // ../output-i386/lib/rtl/vcXX/Debug/rtl.lib // etc - libs[i]->importedModule-> - string libpath = outdir + "\\" + libs[i]->importedModule->GetBasePath() + "\\---\\" + libs[i]->name + ".lib"; + string libpath = outdir + "\\" + libs[i]->importedModule->GetBasePath() + "\\" + _get_vc_dir() + "\\---\\" + libs[i]->name + ".lib"; libraries.push_back ( libpath ); #else libraries.push_back ( libs[i]->name + ".lib" ); _____ Modified: trunk/reactos/tools/rbuild/configuration.cpp --- trunk/reactos/tools/rbuild/configuration.cpp 2006-01-11 10:00:09 UTC (rev 20784) +++ trunk/reactos/tools/rbuild/configuration.cpp 2006-01-11 15:47:22 UTC (rev 20785) @@ -29,6 +29,7 @@ CompilationUnitsEnabled = true; MakeHandlesInstallDirectories = false; GenerateProxyMakefilesInSourceTree = false; + InstallFiles = false; } Configuration::~Configuration () _____ Modified: trunk/reactos/tools/rbuild/project.cpp --- trunk/reactos/tools/rbuild/project.cpp 2006-01-11 10:00:09 UTC (rev 20784) +++ trunk/reactos/tools/rbuild/project.cpp 2006-01-11 15:47:22 UTC (rev 20785) @@ -298,6 +298,12 @@ (property->value == non_if_data.ifs[i]->value); if ( conditionTrue ) non_if_data.ifs[i]->data.ExtractModules( modules ); + else + { + If * if_data = non_if_data.ifs[i]; + non_if_data.ifs.erase ( non_if_data.ifs.begin () + i ); + delete if_data; + } } for ( i = 0; i < linkerFlags.size (); i++ ) linkerFlags[i]->ProcessXML (); _____ Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2006-01-11 10:00:09 UTC (rev 20784) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2006-01-11 15:47:22 UTC (rev 20785) @@ -107,6 +107,10 @@ configuration.VSProjectVersion.append("0"); break; + case 'c': + configuration.VSConfigurationType = string (&switchStart[3]); + configuration.InstallFiles = true; + break; default: printf ( "Unknown switch -d%c\n", switchChar2 ); @@ -155,7 +159,7 @@ switch ( switchChar ) { case 'v': - if (switchChar2 == 's') + if (switchChar2 == 's' || switchChar2 == 'c' ) { return ParseVCProjectSwitch ( switchChar2, _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2006-01-11 10:00:09 UTC (rev 20784) +++ trunk/reactos/tools/rbuild/rbuild.h 2006-01-11 15:47:22 UTC (rev 20785) @@ -141,8 +141,10 @@ bool CompilationUnitsEnabled; std::string CheckDependenciesForModuleOnlyModule; std::string VSProjectVersion; + std::string VSConfigurationType; bool MakeHandlesInstallDirectories; bool GenerateProxyMakefilesInSourceTree; + bool InstallFiles; }; class Environment

18 years, 8 months

[ion] 20784: - Fix more bugs in usercall_asm.S.

by ion＠svn.reactos.org

- Fix more bugs in usercall_asm.S. - Silence a debug print. Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S Modified: trunk/reactos/ntoskrnl/mm/process.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-11 06:44:06 UTC (rev 20783) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-11 10:00:09 UTC (rev 20784) @@ -30,6 +30,7 @@ mov eax, fs:[KPCR_CURRENT_THREAD] mov eax, [eax+KTHREAD_TRAP_FRAME] lea eax, [eax+KTRAP_FRAME_ESP] + ret .endfunc @@ -135,7 +136,7 @@ mov [ebx+KTHREAD_CALLBACK_STACK], esp /* Align stack on 16-byte boundary */ - and esp, ~16 + and esp, ~15 mov edi, esp /* Set destination and origin NPX Areas */ @@ -191,7 +192,7 @@ mov [esp+KTRAP_FRAME_EIP], eax /* Set the exception list */ - mov eax, [KPCR_EXCEPTION_LIST] + mov eax, fs:[KPCR_EXCEPTION_LIST] mov [esp+KTRAP_FRAME_EXCEPTION_LIST], eax /* Set the previous mode */ @@ -252,7 +253,6 @@ _NtCallbackReturn2@12: /* Get the current thread and make sure we have a callback stack */ - call _KeBugCheckEx@20 mov eax, fs:[KPCR_CURRENT_THREAD] mov ecx, [eax+KTHREAD_CALLBACK_STACK] test ecx, ecx @@ -283,7 +283,7 @@ cli /* Get the initial stack and restore it */ - mov esi, fs:[KPCR_INITIAL_STACK] + mov esi, [eax+KTHREAD_INITIAL_STACK] mov [eax+KTHREAD_INITIAL_STACK], ebx /* Set desination and origin NPX Frames */ _____ Modified: trunk/reactos/ntoskrnl/mm/process.c --- trunk/reactos/ntoskrnl/mm/process.c 2006-01-11 06:44:06 UTC (rev 20783) +++ trunk/reactos/ntoskrnl/mm/process.c 2006-01-11 10:00:09 UTC (rev 20784) @@ -215,9 +215,6 @@ Thread->Tcb.StackLimit -= KERNEL_STACK_SIZE; /* Return success */ - DPRINT1("Thread, Thread Limit, Stack %p %p %p\n", KeGetCurrentThread(), - KeGetCurrentThread()->StackLimit, - StackPointer); return STATUS_SUCCESS; }

18 years, 8 months

← Newer
1
...
27
28
29
30
31
32
33
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006