Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[greatlrd] 22815: patch from LMH1 : see bug 1606 NORWEGIAN translations

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jul 4 02:28:49 2006 New Revision: 22815 URL: http://svn.reactos.org/svn/reactos?rev=22815&view=rev Log: patch from LMH1 : see bug 1606 NORWEGIAN translations Added: trunk/reactos/base/setup/reactos/No.rc (with props) Modified: trunk/reactos/base/setup/reactos/reactos.rc Added: trunk/reactos/base/setup/reactos/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/No.rc?r… ============================================================================== --- trunk/reactos/base/setup/reactos/No.rc (added) +++ trunk/reactos/base/setup/reactos/No.rc Tue Jul 4 02:28:49 2006 @@ -1,0 +1,12 @@ +/* $Id: No.rc 21305 15:55 15.06.2006 LMH1 $ */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +/* String Tables */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAPTION "ReactOS Installering" + IDS_TEXT "Du kan ikke installere ReactOS direkte fra denne CD!\n\nVennligst restart din datamaskin fra denne CD i anvisning for å installere ReactOS." +END + +/* EOF */ Propchange: trunk/reactos/base/setup/reactos/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/reactos/reactos.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rc (original) +++ trunk/reactos/base/setup/reactos/reactos.rc Tue Jul 4 02:28:49 2006 @@ -25,6 +25,7 @@ #include "It.rc" #include "Ja.rc" #include "Nl.rc" +#include "No.rc" #include "Ru.rc" #include "Sv.rc" #include "Uk.rc"

18 years, 4 months

[janderwald] 22814: [AUDIT] * unlock win32csr * win32csr is totally different implemented from NT Version * audit reviewed by Alex_Ionescu

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jul 4 02:08:47 2006 New Revision: 22814 URL: http://svn.reactos.org/svn/reactos?rev=22814&view=rev Log: [AUDIT] * unlock win32csr * win32csr is totally different implemented from NT Version * audit reviewed by Alex_Ionescu Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (props changed) trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c (props changed) trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c (props changed) trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c (props changed) trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (props changed) trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c (props changed) Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 4 months

[jimtabor] 22813: Move hBmpClose to the MDICLIENTINFO structure and modified MDI_RestoreFrameMenu to support the change.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jul 4 02:04:42 2006 New Revision: 22813 URL: http://svn.reactos.org/svn/reactos?rev=22813&view=rev Log: Move hBmpClose to the MDICLIENTINFO structure and modified MDI_RestoreFrameMenu to support the change. Modified: trunk/reactos/dll/win32/user32/windows/mdi.c Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c Tue Jul 4 02:04:42 2006 @@ -110,14 +110,15 @@ UINT nTotalCreated; UINT mdiFlags; UINT sbRecalc; /* SB_xxx flags for scrollbar fixup */ + HBITMAP hBmpClose; /* ReactOS modification */ } MDICLIENTINFO; -static HBITMAP hBmpClose = 0; +//static HBITMAP hBmpClose = 0; /* ----------------- declarations ----------------- */ static void MDI_UpdateFrameText( HWND, HWND, LPCWSTR); static BOOL MDI_AugmentFrameMenu( HWND, HWND ); -static BOOL MDI_RestoreFrameMenu( HWND, HWND ); +static BOOL MDI_RestoreFrameMenu( HWND, HWND, HBITMAP ); static LONG MDI_ChildActivate( HWND, HWND ); static LRESULT MDI_RefreshMenu(MDICLIENTINFO *); @@ -357,7 +358,7 @@ if (hmenuFrame == ci->hFrameMenu) return (LRESULT)hmenuFrame; if (IsZoomed(ci->hwndActiveChild)) - MDI_RestoreFrameMenu( hwndFrame, ci->hwndActiveChild ); + MDI_RestoreFrameMenu( hwndFrame, ci->hwndActiveChild, ci->hBmpClose ); } if( hmenuWindow && hmenuWindow != ci->hWindowMenu ) @@ -588,7 +589,7 @@ ShowWindow(child, SW_HIDE); if (IsZoomed(child)) { - MDI_RestoreFrameMenu(GetParent(client), child); + MDI_RestoreFrameMenu(GetParent(client), child, ci->hBmpClose); MDI_UpdateFrameText(GetParent(client), client, NULL); } MDI_ChildActivate(client, 0); @@ -931,7 +932,7 @@ /********************************************************************** * MDI_RestoreFrameMenu */ -static BOOL MDI_RestoreFrameMenu( HWND frame, HWND hChild ) +static BOOL MDI_RestoreFrameMenu( HWND frame, HWND hChild, HBITMAP hBmpClose ) { MENUITEMINFOW menuInfo; HMENU menu = GetMenu( frame ); @@ -1077,6 +1078,7 @@ if (!(ci = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ci)))) return FALSE; SetWindowLongPtrW( hwnd, 0, (LONG_PTR)ci ); + ci->hBmpClose = 0; return TRUE; #endif @@ -1118,7 +1120,7 @@ ci->mdiFlags = 0; ci->hFrameMenu = GetMenu(cs->hwndParent); - if (!hBmpClose) hBmpClose = CreateMDIMenuBitmap(); + if (!ci->hBmpClose) ci->hBmpClose = CreateMDIMenuBitmap(); TRACE("Client created: hwnd %p, Window menu %p, idFirst = %04x\n", hwnd, ci->hWindowMenu, ci->idFirstChild ); @@ -1128,7 +1130,7 @@ case WM_DESTROY: { if( IsZoomed(ci->hwndActiveChild) ) - MDI_RestoreFrameMenu(GetParent(hwnd), ci->hwndActiveChild); + MDI_RestoreFrameMenu(GetParent(hwnd), ci->hwndActiveChild, ci->hBmpClose); ci->nActiveChildren = 0; MDI_RefreshMenu(ci); @@ -1588,7 +1590,7 @@ MDI_AugmentFrameMenu( GetParent(client), hwnd ); } else - MDI_RestoreFrameMenu( GetParent(client), hwnd ); + MDI_RestoreFrameMenu( GetParent(client), hwnd , ci->hBmpClose); } MDI_UpdateFrameText( GetParent(client), client, NULL );

18 years, 4 months

[greatlrd] 22812: Commit bug 1347, patch from w3seek This patch implements the function TreeResetNamedSecurityInfoA. However, as it's not even implemented in windows, the code is disabled by default.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jul 4 01:43:04 2006 New Revision: 22812 URL: http://svn.reactos.org/svn/reactos?rev=22812&view=rev Log: Commit bug 1347, patch from w3seek This patch implements the function TreeResetNamedSecurityInfoA. However, as it's not even implemented in windows, the code is disabled by default. Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c Tue Jul 4 01:43:04 2006 @@ -1915,9 +1915,68 @@ return ErrorCode; } +#ifdef HAS_FN_PROGRESSW + +typedef struct _INERNAL_FNPROGRESSW_DATA +{ + FN_PROGRESSA fnProgress; + PVOID Args; +} INERNAL_FNPROGRESSW_DATA, *PINERNAL_FNPROGRESSW_DATA; + +static VOID STDCALL +InternalfnProgressW(LPWSTR pObjectName, + DWORD Status, + PPROG_INVOKE_SETTING pInvokeSetting, + PVOID Args, + BOOL SecuritySet) +{ + PINERNAL_FNPROGRESSW_DATA pifnProgressData = (PINERNAL_FNPROGRESSW_DATA)Args; + INT ObjectNameSize; + LPSTR pObjectNameA; + + ObjectNameSize = WideCharToMultiByte(CP_ACP, + 0, + pObjectName, + -1, + NULL, + 0, + NULL, + NULL); + + if (ObjectNameSize > 0) + { + pObjectNameA = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + ObjectNameSize); + if (pObjectNameA != NULL) + { + pObjectNameA[0] = '\0'; + WideCharToMultiByte(CP_ACP, + 0, + pObjectName, + -1, + pObjectNameA, + ObjectNameSize, + NULL, + NULL); + + pifnProgressData->fnProgress(pObjectNameA, + Status, + pInvokeSetting, + pifnProgressData->Args, + SecuritySet); + + RtlFreeHeap(RtlGetProcessHeap(), + 0, + pObjectNameA); + } + } +} +#endif + /* - * @unimplemented + * @implemented */ DWORD STDCALL TreeResetNamedSecurityInfoA(LPSTR pObjectName, @@ -1932,9 +1991,42 @@ PROG_INVOKE_SETTING ProgressInvokeSetting, PVOID Args) { +#ifndef HAS_FN_PROGRESSW /* That's all this function does, at least up to w2k3... Even MS was too lazy to implement it... */ return ERROR_CALL_NOT_IMPLEMENTED; +#else + INERNAL_FNPROGRESSW_DATA ifnProgressData; + UNICODE_STRING ObjectName; + NTSTATUS Status; + DWORD Ret; + + Status = RtlCreateUnicodeStringFromAsciiz(&ObjectName, + pObjectName); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + + ifnProgressData.fnProgress = fnProgress; + ifnProgressData.Args = Args; + + Ret = TreeResetNamedSecurityInfoW(ObjectName.Buffer, + ObjectType, + SecurityInfo, + pOwner, + pGroup, + pDacl, + pSacl, + KeepExplicit, + (fnProgress != NULL ? InternalfnProgressW : NULL), + ProgressInvokeSetting, + &ifnProgressData); + + RtlFreeUnicodeString(&ObjectName); + + return Ret; +#endif } /* EOF */

18 years, 4 months

[greatlrd] 22811: forget this file sorry

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jul 4 01:40:20 2006 New Revision: 22811 URL: http://svn.reactos.org/svn/reactos?rev=22811&view=rev Log: forget this file sorry Added: trunk/reactos/lib/rtl/workitem.c (with props) Added: trunk/reactos/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/workitem.c?rev=228… ============================================================================== --- trunk/reactos/lib/rtl/workitem.c (added) +++ trunk/reactos/lib/rtl/workitem.c Tue Jul 4 01:40:20 2006 @@ -1,0 +1,881 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: Work Item implementation + * FILE: lib/rtl/workitem.c + * PROGRAMMER: + */ + +/* INCLUDES *****************************************************************/ + +#include <rtl.h> + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ***************************************************************/ + +#define MAX_WORKERTHREADS 0x100 +#define WORKERTHREAD_CREATION_THRESHOLD 0x5 + +typedef struct _RTLP_IOWORKERTHREAD +{ + LIST_ENTRY ListEntry; + HANDLE ThreadHandle; + ULONG Flags; +} RTLP_IOWORKERTHREAD, *PRTLP_IOWORKERTHREAD; + +typedef struct _RTLP_WORKITEM +{ + WORKERCALLBACKFUNC Function; + PVOID Context; + ULONG Flags; + HANDLE TokenHandle; +} RTLP_WORKITEM, *PRTLP_WORKITEM; + +static LONG ThreadPoolInitialized = 0; +static RTL_CRITICAL_SECTION ThreadPoolLock; +static PRTLP_IOWORKERTHREAD PersistentIoThread; +static LIST_ENTRY ThreadPoolIOWorkerThreadsList; +static HANDLE ThreadPoolCompletionPort; +static LONG ThreadPoolWorkerThreads; +static LONG ThreadPoolWorkerThreadsRequests; +static LONG ThreadPoolWorkerThreadsLongRequests; +static LONG ThreadPoolIOWorkerThreads; +static LONG ThreadPoolIOWorkerThreadsRequests; +static LONG ThreadPoolIOWorkerThreadsLongRequests; + +#define IsThreadPoolInitialized() ((volatile LONG)ThreadPoolInitialized == 1) + +static NTSTATUS +RtlpInitializeThreadPool(VOID) +{ + NTSTATUS Status = STATUS_SUCCESS; + LONG InitStatus; + + do + { + InitStatus = InterlockedCompareExchange(&ThreadPoolInitialized, + 2, + 0); + if (InitStatus == 0) + { + /* We're the first thread to initialize the thread pool */ + + InitializeListHead(&ThreadPoolIOWorkerThreadsList); + + PersistentIoThread = NULL; + + ThreadPoolWorkerThreads = 0; + ThreadPoolWorkerThreadsRequests = 0; + ThreadPoolWorkerThreadsLongRequests = 0; + ThreadPoolIOWorkerThreads = 0; + ThreadPoolIOWorkerThreadsRequests = 0; + ThreadPoolIOWorkerThreadsLongRequests = 0; + + /* Initialize the lock */ + Status = RtlInitializeCriticalSection(&ThreadPoolLock); + if (!NT_SUCCESS(Status)) + goto Finish; + + /* Create the complection port */ + Status = NtCreateIoCompletion(&ThreadPoolCompletionPort, + IO_COMPLETION_ALL_ACCESS, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + RtlDeleteCriticalSection(&ThreadPoolLock); + goto Finish; + } + +Finish: + /* Initialization done */ + InterlockedExchange(&ThreadPoolInitialized, + 1); + break; + } + else if (InitStatus == 2) + { + LARGE_INTEGER Timeout; + + /* Another thread is currently initializing the thread pool! + Poll after a short period of time to see if the initialization + was completed */ + + Timeout.QuadPart = -10000000LL; /* Wait for a second */ + NtDelayExecution(FALSE, + &Timeout); + } + } while (InitStatus != 1); + + return Status; +} + +static NTSTATUS +RtlpGetImpersonationToken(OUT PHANDLE TokenHandle) +{ + NTSTATUS Status; + + Status = NtOpenThreadToken(NtCurrentThread(), + TOKEN_IMPERSONATE, + TRUE, + TokenHandle); + if (Status == STATUS_NO_TOKEN || Status == STATUS_CANT_OPEN_ANONYMOUS) + { + *TokenHandle = NULL; + Status = STATUS_SUCCESS; + } + + return Status; +} + +static NTSTATUS +RtlpStartWorkerThread(PTHREAD_START_ROUTINE StartRoutine) +{ + NTSTATUS Status; + HANDLE ThreadHandle; + LARGE_INTEGER Timeout; + volatile LONG WorkerInitialized = 0; + + Timeout.QuadPart = -10000LL; /* Wait for 100ms */ + + /* Start the thread */ + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, + FALSE, + 0, + 0, + 0, + StartRoutine, + (PVOID)&WorkerInitialized, + &ThreadHandle, + NULL); + + if (NT_SUCCESS(Status)) + { + /* Poll until the thread got a chance to initialize */ + while (WorkerInitialized == 0) + { + NtDelayExecution(FALSE, + &Timeout); + } + + NtClose(ThreadHandle); + } + + return Status; +} + +static VOID +NTAPI +RtlpExecuteWorkItem(IN OUT PVOID NormalContext, + IN OUT PVOID SystemArgument1, + IN OUT PVOID SystemArgument2) +{ + NTSTATUS Status; + BOOLEAN Impersonated = FALSE; + RTLP_WORKITEM WorkItem = *(volatile RTLP_WORKITEM *)SystemArgument2; + + RtlFreeHeap(RtlGetProcessHeap(), + 0, + SystemArgument2); + + if (WorkItem.TokenHandle != NULL) + { + Status = NtSetInformationThread(NtCurrentThread(), + ThreadImpersonationToken, + &WorkItem.TokenHandle, + sizeof(HANDLE)); + + NtClose(WorkItem.TokenHandle); + + if (NT_SUCCESS(Status)) + { + Impersonated = TRUE; + } + } + + _SEH_TRY + { + DPRINT("RtlpExecuteWorkItem: Function: 0x%p Context: 0x%p ImpersonationToken: 0x%p\n", WorkItem.Function, WorkItem.Context, WorkItem.TokenHandle); + + /* Execute the function */ + WorkItem.Function(WorkItem.Context); + } + _SEH_HANDLE + { + DPRINT1("Exception 0x%x while executing IO work item 0x%p\n", _SEH_GetExceptionCode(), WorkItem.Function); + } + _SEH_END; + + if (Impersonated) + { + WorkItem.TokenHandle = NULL; + Status = NtSetInformationThread(NtCurrentThread(), + ThreadImpersonationToken, + &WorkItem.TokenHandle, + sizeof(HANDLE)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to revert worker thread to self!!! Status: 0x%x\n", Status); + } + } + + /* update the requests counter */ + InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); + + if (WorkItem.Flags & WT_EXECUTELONGFUNCTION) + { + InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); + } +} + + +static NTSTATUS +RtlpQueueWorkerThread(IN OUT PRTLP_WORKITEM WorkItem) +{ + NTSTATUS Status = STATUS_SUCCESS; + + InterlockedIncrement(&ThreadPoolWorkerThreadsRequests); + + if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) + { + InterlockedIncrement(&ThreadPoolWorkerThreadsLongRequests); + } + + if (WorkItem->Flags & WT_EXECUTEINPERSISTENTTHREAD) + { + Status = RtlpInitializeTimerThread(); + + if (NT_SUCCESS(Status)) + { + /* Queue an APC in the timer thread */ + Status = NtQueueApcThread(TimerThreadHandle, + RtlpExecuteWorkItem, + NULL, + NULL, + WorkItem); + } + } + else + { + /* Queue an IO completion message */ + Status = NtSetIoCompletion(ThreadPoolCompletionPort, + RtlpExecuteWorkItem, + WorkItem, + STATUS_SUCCESS, + 0); + } + + if (!NT_SUCCESS(Status)) + { + InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); + + if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) + { + InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); + } + } + + return Status; +} + +static VOID +NTAPI +RtlpExecuteIoWorkItem(IN OUT PVOID NormalContext, + IN OUT PVOID SystemArgument1, + IN OUT PVOID SystemArgument2) +{ + NTSTATUS Status; + BOOLEAN Impersonated = FALSE; + PRTLP_IOWORKERTHREAD IoThread = (PRTLP_IOWORKERTHREAD)NormalContext; + RTLP_WORKITEM WorkItem = *(volatile RTLP_WORKITEM *)SystemArgument2; + + ASSERT(IoThread != NULL); + + RtlFreeHeap(RtlGetProcessHeap(), + 0, + SystemArgument2); + + if (WorkItem.TokenHandle != NULL) + { + Status = NtSetInformationThread(NtCurrentThread(), + ThreadImpersonationToken, + &WorkItem.TokenHandle, + sizeof(HANDLE)); + + NtClose(WorkItem.TokenHandle); + + if (NT_SUCCESS(Status)) + { + Impersonated = TRUE; + } + } + + _SEH_TRY + { + DPRINT("RtlpExecuteIoWorkItem: Function: 0x%p Context: 0x%p ImpersonationToken: 0x%p\n", WorkItem.Function, WorkItem.Context, WorkItem.TokenHandle); + + /* Execute the function */ + WorkItem.Function(WorkItem.Context); + } + _SEH_HANDLE + { + DPRINT1("Exception 0x%x while executing IO work item 0x%p\n", _SEH_GetExceptionCode(), WorkItem.Function); + } + _SEH_END; + + if (Impersonated) + { + WorkItem.TokenHandle = NULL; + Status = NtSetInformationThread(NtCurrentThread(), + ThreadImpersonationToken, + &WorkItem.TokenHandle, + sizeof(HANDLE)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to revert worker thread to self!!! Status: 0x%x\n", Status); + } + } + + /* remove the long function flag */ + if (WorkItem.Flags & WT_EXECUTELONGFUNCTION) + { + Status = RtlEnterCriticalSection(&ThreadPoolLock); + if (NT_SUCCESS(Status)) + { + IoThread->Flags &= ~WT_EXECUTELONGFUNCTION; + RtlLeaveCriticalSection(&ThreadPoolLock); + } + } + + /* update the requests counter */ + InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); + + if (WorkItem.Flags & WT_EXECUTELONGFUNCTION) + { + InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); + } +} + +static NTSTATUS +RtlpQueueIoWorkerThread(IN OUT PRTLP_WORKITEM WorkItem) +{ + PLIST_ENTRY CurrentEntry; + PRTLP_IOWORKERTHREAD IoThread = NULL; + NTSTATUS Status = STATUS_SUCCESS; + + if (WorkItem->Flags & WT_EXECUTEINPERSISTENTIOTHREAD) + { + if (PersistentIoThread != NULL) + { + /* We already have a persistent IO worker thread */ + IoThread = PersistentIoThread; + } + else + { + /* We're not aware of any persistent IO worker thread. Search for a unused + worker thread that doesn't have a long function queued */ + CurrentEntry = ThreadPoolIOWorkerThreadsList.Flink; + while (CurrentEntry != &ThreadPoolIOWorkerThreadsList) + { + IoThread = CONTAINING_RECORD(CurrentEntry, + RTLP_IOWORKERTHREAD, + ListEntry); + + if (!(IoThread->Flags & WT_EXECUTELONGFUNCTION)) + break; + + CurrentEntry = CurrentEntry->Flink; + } + + if (CurrentEntry != &ThreadPoolIOWorkerThreadsList) + { + /* Found a worker thread we can use. */ + ASSERT(IoThread != NULL); + + IoThread->Flags |= WT_EXECUTEINPERSISTENTIOTHREAD; + PersistentIoThread = IoThread; + } + else + { + DPRINT1("Failed to find a worker thread for the persistent IO thread!\n"); + return STATUS_NO_MEMORY; + } + } + } + else + { + /* Find a worker thread that is not currently executing a long function */ + CurrentEntry = ThreadPoolIOWorkerThreadsList.Flink; + while (CurrentEntry != &ThreadPoolIOWorkerThreadsList) + { + IoThread = CONTAINING_RECORD(CurrentEntry, + RTLP_IOWORKERTHREAD, + ListEntry); + + if (!(IoThread->Flags & WT_EXECUTELONGFUNCTION)) + { + /* if we're trying to queue a long function then make sure we're not dealing + with the persistent thread */ + if ((WorkItem->Flags & WT_EXECUTELONGFUNCTION) && !(IoThread->Flags & WT_EXECUTEINPERSISTENTIOTHREAD)) + { + /* found a candidate */ + break; + } + } + + CurrentEntry = CurrentEntry->Flink; + } + + if (CurrentEntry == &ThreadPoolIOWorkerThreadsList) + { + /* Couldn't find an appropriate thread, see if we can use the persistent thread (if it exists) for now */ + if (ThreadPoolIOWorkerThreads == 0) + { + DPRINT1("Failed to find a worker thread for the work item 0x%p!\n"); + ASSERT(IsListEmpty(&ThreadPoolIOWorkerThreadsList)); + return STATUS_NO_MEMORY; + } + else + { + /* pick the first worker thread */ + CurrentEntry = ThreadPoolIOWorkerThreadsList.Flink; + IoThread = CONTAINING_RECORD(CurrentEntry, + RTLP_IOWORKERTHREAD, + ListEntry); + + /* Since this might be the persistent worker thread, don't run as a + long function */ + WorkItem->Flags &= ~WT_EXECUTELONGFUNCTION; + } + } + + /* Move the picked thread to the end of the list. Since we're always searching + from the beginning, this improves distribution of work items */ + RemoveEntryList(&IoThread->ListEntry); + InsertTailList(&ThreadPoolIOWorkerThreadsList, + &IoThread->ListEntry); + } + + ASSERT(IoThread != NULL); + + InterlockedIncrement(&ThreadPoolIOWorkerThreadsRequests); + + if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) + { + /* We're about to queue a long function, mark the thread */ + IoThread->Flags |= WT_EXECUTELONGFUNCTION; + + InterlockedIncrement(&ThreadPoolIOWorkerThreadsLongRequests); + } + + /* It's time to queue the work item */ + Status = NtQueueApcThread(IoThread->ThreadHandle, + RtlpExecuteIoWorkItem, + IoThread, + NULL, + WorkItem); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to queue APC for work item 0x%p\n", WorkItem->Function); + InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); + + if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) + { + InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); + } + } + + return Status; +} + +static BOOLEAN +RtlpIsIoPending(IN HANDLE ThreadHandle OPTIONAL) +{ + NTSTATUS Status; + ULONG IoPending; + BOOLEAN CreatedHandle = FALSE; + BOOLEAN IsIoPending = TRUE; + + if (ThreadHandle == NULL) + { + Status = NtDuplicateObject(NtCurrentProcess(), + NtCurrentThread(), + NtCurrentProcess(), + &ThreadHandle, + 0, + 0, + DUPLICATE_SAME_ACCESS); + if (!NT_SUCCESS(Status)) + { + return IsIoPending; + } + + CreatedHandle = TRUE; + } + + Status = NtQueryInformationThread(ThreadHandle, + ThreadIsIoPending, + &IoPending, + sizeof(IoPending), + NULL); + if (NT_SUCCESS(Status) && IoPending == 0) + { + IsIoPending = FALSE; + } + + if (CreatedHandle) + { + NtClose(ThreadHandle); + } + + return IsIoPending; +} + +static ULONG +NTAPI +RtlpIoWorkerThreadProc(IN PVOID Parameter) +{ + volatile RTLP_IOWORKERTHREAD ThreadInfo; + LARGE_INTEGER Timeout; + BOOLEAN Terminate; + NTSTATUS Status = STATUS_SUCCESS; + + if (InterlockedIncrement(&ThreadPoolIOWorkerThreads) > MAX_WORKERTHREADS) + { + /* Oops, too many worker threads... */ + goto InitFailed; + } + + /* Get a thread handle to ourselves */ + Status = NtDuplicateObject(NtCurrentProcess(), + NtCurrentThread(), + NtCurrentProcess(), + (PHANDLE)&ThreadInfo.ThreadHandle, + 0, + 0, + DUPLICATE_SAME_ACCESS); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create handle to own thread! Status: 0x%x\n", Status); + +InitFailed: + InterlockedDecrement(&ThreadPoolIOWorkerThreads); + + /* Signal initialization completion */ + InterlockedExchange((PLONG)Parameter, + 1); + + RtlExitUserThread(Status); + return 0; + } + + ThreadInfo.Flags = 0; + + /* Insert the thread into the list */ + InsertHeadList((PLIST_ENTRY)&ThreadPoolIOWorkerThreadsList, + (PLIST_ENTRY)&ThreadInfo.ListEntry); + + /* Signal initialization completion */ + InterlockedExchange((PLONG)Parameter, + 1); + + for (;;) + { + Timeout.QuadPart = -50000000LL; /* Wait for 5 seconds by default */ + +Wait: + do + { + /* Perform an alertable wait, the work items are going to be executed as APCs */ + Status = NtDelayExecution(TRUE, + &Timeout); + + /* Loop as long as we executed an APC */ + } while (Status != STATUS_SUCCESS); + + /* We timed out, let's see if we're allowed to terminate */ + Terminate = FALSE; + + Status = RtlEnterCriticalSection(&ThreadPoolLock); + if (NT_SUCCESS(Status)) + { + if (ThreadInfo.Flags & WT_EXECUTEINPERSISTENTIOTHREAD) + { + /* This thread is supposed to be persistent. Don't terminate! */ + RtlLeaveCriticalSection(&ThreadPoolLock); + + Timeout.QuadPart = -0x7FFFFFFFFFFFFFFFLL; + goto Wait; + } + + /* FIXME - figure out an effective method to determine if it's appropriate to + lower the number of threads. For now let's always terminate if there's + at least one thread and no queued items. */ + Terminate = ((volatile LONG)ThreadPoolIOWorkerThreads - (volatile LONG)ThreadPoolIOWorkerThreadsLongRequests >= WORKERTHREAD_CREATION_THRESHOLD) && + ((volatile LONG)ThreadPoolIOWorkerThreadsRequests == 0); + + if (Terminate) + { + /* Prevent termination as long as IO is pending */ + Terminate = !RtlpIsIoPending(ThreadInfo.ThreadHandle); + } + + if (Terminate) + { + /* Rundown the thread and unlink it from the list */ + InterlockedDecrement(&ThreadPoolIOWorkerThreads); + RemoveEntryList((PLIST_ENTRY)&ThreadInfo.ListEntry); + } + + RtlLeaveCriticalSection(&ThreadPoolLock); + + if (Terminate) + { + /* Break the infinite loop and terminate */ + Status = STATUS_SUCCESS; + break; + } + } + else + { + DPRINT1("Failed to acquire the thread pool lock!!! Status: 0x%x\n", Status); + break; + } + } + + NtClose(ThreadInfo.ThreadHandle); + RtlExitUserThread(Status); + return 0; +} + +static ULONG +NTAPI +RtlpWorkerThreadProc(IN PVOID Parameter) +{ + LARGE_INTEGER Timeout; + BOOLEAN Terminate; + PVOID SystemArgument2; + IO_STATUS_BLOCK IoStatusBlock; + ULONG TimeoutCount = 0; + PKNORMAL_ROUTINE ApcRoutine; + NTSTATUS Status = STATUS_SUCCESS; + + if (InterlockedIncrement(&ThreadPoolWorkerThreads) > MAX_WORKERTHREADS) + { + /* Signal initialization completion */ + InterlockedExchange((PLONG)Parameter, + 1); + + /* Oops, too many worker threads... */ + RtlExitUserThread(Status); + return 0; + } + + /* Signal initialization completion */ + InterlockedExchange((PLONG)Parameter, + 1); + + for (;;) + { + Timeout.QuadPart = -50000000LL; /* Wait for 5 seconds by default */ + + /* Dequeue a completion message */ + Status = NtRemoveIoCompletion(ThreadPoolCompletionPort, + (PVOID*)&ApcRoutine, + &SystemArgument2, + &IoStatusBlock, + &Timeout); + + if (Status == STATUS_SUCCESS) + { + TimeoutCount = 0; + + _SEH_TRY + { + /* Call the APC routine */ + ApcRoutine(NULL, + (PVOID)IoStatusBlock.Information, + SystemArgument2); + } + _SEH_HANDLE + { + } + _SEH_END; + } + else + { + Terminate = FALSE; + + if (!NT_SUCCESS(RtlEnterCriticalSection(&ThreadPoolLock))) + continue; + + /* FIXME - this should be optimized, check if there's requests, etc */ + + if (Status == STATUS_TIMEOUT) + { + /* FIXME - we might want to optimize this */ + if (TimeoutCount++ > 2 && + (volatile LONG)ThreadPoolWorkerThreads - (volatile LONG)ThreadPoolWorkerThreadsLongRequests >= WORKERTHREAD_CREATION_THRESHOLD) + { + Terminate = TRUE; + } + } + else + Terminate = TRUE; + + RtlLeaveCriticalSection(&ThreadPoolLock); + + if (Terminate) + { + /* Prevent termination as long as IO is pending */ + Terminate = !RtlpIsIoPending(NULL); + } + + if (Terminate) + { + InterlockedDecrement(&ThreadPoolWorkerThreads); + Status = STATUS_SUCCESS; + break; + } + } + } + + RtlExitUserThread(Status); + return 0; + +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlQueueWorkItem(IN WORKERCALLBACKFUNC Function, + IN PVOID Context OPTIONAL, + IN ULONG Flags) +{ + LONG FreeWorkers; + NTSTATUS Status; + PRTLP_WORKITEM WorkItem; + + DPRINT("RtlQueueWorkItem(0x%p, 0x%p, 0x%x)\n", Function, Context, Flags); + + /* Initialize the thread pool if not already initialized */ + if (!IsThreadPoolInitialized()) + { + Status = RtlpInitializeThreadPool(); + + if (!NT_SUCCESS(Status)) + return Status; + } + + /* Allocate a work item */ + WorkItem = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + sizeof(RTLP_WORKITEM)); + if (WorkItem == NULL) + return STATUS_NO_MEMORY; + + WorkItem->Function = Function; + WorkItem->Context = Context; + WorkItem->Flags = Flags; + + if (Flags & WT_TRANSFER_IMPERSONATION) + { + Status = RtlpGetImpersonationToken(&WorkItem->TokenHandle); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get impersonation token! Status: 0x%x\n", Status); + goto Cleanup; + } + } + else + WorkItem->TokenHandle = NULL; + + Status = RtlEnterCriticalSection(&ThreadPoolLock); + if (NT_SUCCESS(Status)) + { + if (Flags & (WT_EXECUTEINIOTHREAD | WT_EXECUTEINUITHREAD | WT_EXECUTEINPERSISTENTIOTHREAD)) + { + /* FIXME - We should optimize the algorithm used to determine whether to grow the thread pool! */ + + FreeWorkers = ThreadPoolIOWorkerThreads - ThreadPoolIOWorkerThreadsLongRequests; + + if (((Flags & (WT_EXECUTEINPERSISTENTIOTHREAD | WT_EXECUTELONGFUNCTION)) == WT_EXECUTELONGFUNCTION) && + PersistentIoThread != NULL) + { + /* We shouldn't queue a long function into the persistent IO thread */ + FreeWorkers--; + } + + /* See if it's a good idea to grow the pool */ + if (ThreadPoolIOWorkerThreads < MAX_WORKERTHREADS && + (FreeWorkers <= 0 || ThreadPoolIOWorkerThreads - ThreadPoolIOWorkerThreadsRequests < WORKERTHREAD_CREATION_THRESHOLD)) + { + /* Grow the thread pool */ + Status = RtlpStartWorkerThread(RtlpIoWorkerThreadProc); + + if (!NT_SUCCESS(Status) && (volatile LONG)ThreadPoolIOWorkerThreads != 0) + { + /* We failed to create the thread, but there's at least one there so + we can at least queue the request */ + Status = STATUS_SUCCESS; + } + } + + if (NT_SUCCESS(Status)) + { + /* Queue a IO worker thread */ + Status = RtlpQueueIoWorkerThread(WorkItem); + } + } + else + { + /* FIXME - We should optimize the algorithm used to determine whether to grow the thread pool! */ + + FreeWorkers = ThreadPoolWorkerThreads - ThreadPoolWorkerThreadsLongRequests; + + /* See if it's a good idea to grow the pool */ + if (ThreadPoolWorkerThreads < MAX_WORKERTHREADS && + (FreeWorkers <= 0 || ThreadPoolWorkerThreads - ThreadPoolWorkerThreadsRequests < WORKERTHREAD_CREATION_THRESHOLD)) + { + /* Grow the thread pool */ + Status = RtlpStartWorkerThread(RtlpWorkerThreadProc); + + if (!NT_SUCCESS(Status) && (volatile LONG)ThreadPoolWorkerThreads != 0) + { + /* We failed to create the thread, but there's at least one there so + we can at least queue the request */ + Status = STATUS_SUCCESS; + } + } + + if (NT_SUCCESS(Status)) + { + /* Queue a normal worker thread */ + Status = RtlpQueueWorkerThread(WorkItem); + } + } + + RtlLeaveCriticalSection(&ThreadPoolLock); + } + + if (!NT_SUCCESS(Status)) + { + if (WorkItem->TokenHandle != NULL) + { + NtClose(WorkItem->TokenHandle); + } + +Cleanup: + RtlFreeHeap(RtlGetProcessHeap(), + 0, + WorkItem); + } + + return Status; +} Propchange: trunk/reactos/lib/rtl/workitem.c ------------------------------------------------------------------------------ svn:eol-style = native

18 years, 4 months

[greatlrd] 22810: test case for QueueUserWorkItem from bug 1609 by w3seek

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jul 4 01:29:32 2006 New Revision: 22810 URL: http://svn.reactos.org/svn/reactos?rev=22810&view=rev Log: test case for QueueUserWorkItem from bug 1609 by w3seek Added: trunk/reactos/regtests/queuetest/ trunk/reactos/regtests/queuetest/queuetest.c (with props) trunk/reactos/regtests/queuetest/queuetest.rbuild (with props) Modified: trunk/reactos/regtests/directory.rbuild Modified: trunk/reactos/regtests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/directory.rbuild?… ============================================================================== --- trunk/reactos/regtests/directory.rbuild (original) +++ trunk/reactos/regtests/directory.rbuild Tue Jul 4 01:29:32 2006 @@ -1,6 +1,9 @@ <group> <directory name="kmtloader"> <xi:include href="kmtloader/kmtloader.rbuild" /> +</directory> +<directory name="queuetest"> + <xi:include href="queuetest/queuetest.rbuild" /> </directory> <directory name="regtests"> <xi:include href="regtests/regtests.rbuild" /> Added: trunk/reactos/regtests/queuetest/queuetest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/queuetest/queuete… ============================================================================== --- trunk/reactos/regtests/queuetest/queuetest.c (added) +++ trunk/reactos/regtests/queuetest/queuetest.c Tue Jul 4 01:29:32 2006 @@ -1,0 +1,35 @@ +/* Compile with gcc -o queuetest.exe queuetest.c */ + +#include <windows.h> +#include <stdio.h> + +#define WT_EXECUTEINPERSISTENTIOTHREAD 0x00000040 +BOOL WINAPI QueueUserWorkItem(LPTHREAD_START_ROUTINE,PVOID,ULONG); + +#define TestProc(n) \ +DWORD CALLBACK TestProc##n(void *ctx)\ +{\ + printf("TestProc%d thread 0x%x context 0x%p\n", n, GetCurrentThreadId(), ctx);\ + return 0;\ +} + +TestProc(1) +TestProc(2) +TestProc(3) +TestProc(4) +TestProc(5) +TestProc(6) + +int __cdecl +main(int argc, char* argv[]) +{ + PVOID x = (PVOID)0x12345; + QueueUserWorkItem(TestProc1, x, 0); + QueueUserWorkItem(TestProc2, x, WT_EXECUTELONGFUNCTION); + QueueUserWorkItem(TestProc3, x, WT_EXECUTEINIOTHREAD); + QueueUserWorkItem(TestProc4, x, WT_EXECUTEINIOTHREAD | WT_EXECUTELONGFUNCTION); + QueueUserWorkItem(TestProc5, x, WT_EXECUTEINPERSISTENTTHREAD); + QueueUserWorkItem(TestProc6, x, WT_EXECUTEINPERSISTENTIOTHREAD); + Sleep(INFINITE); + return 0; +} Propchange: trunk/reactos/regtests/queuetest/queuetest.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/regtests/queuetest/queuetest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/queuetest/queuete… ============================================================================== --- trunk/reactos/regtests/queuetest/queuetest.rbuild (added) +++ trunk/reactos/regtests/queuetest/queuetest.rbuild Tue Jul 4 01:29:32 2006 @@ -1,0 +1,4 @@ +<module name="queuetest" type="win32cui" installbase="system32" installname="queuetest.exe" allowwarnings="true"> + <define name="__USE_W32API" /> + <file>queuetest.c</file> +</module> Propchange: trunk/reactos/regtests/queuetest/queuetest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

18 years, 4 months

[janderwald] 22809: set svn:eol-style:native

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jul 4 00:27:46 2006 New Revision: 22809 URL: http://svn.reactos.org/svn/reactos?rev=22809&view=rev Log: set svn:eol-style:native Modified: trunk/reactos/subsystems/win32/csrss/win32csr/en.rc (contents, props changed) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/en.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/en.rc Tue Jul 4 00:27:46 2006 @@ -1,28 +1,28 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -IDD_END_NOW DIALOG DISCARDABLE 0, 0, 200, 95 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "End Program - " -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Ending Program... Please wait",IDC_STATIC,7,7,186,11 - CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, - 7,20,186,13 - LTEXT "If you choose to end the program immediately, you will lose any unsaved data. To end the program now, click End Now.", - IDC_STATIC,7,40,186,26 - DEFPUSHBUTTON "&End Now",IDC_END_NOW,150,71,43,17 -END - -IDD_NOT_RESPONDING DIALOG DISCARDABLE 0, 0, 192, 122 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "End Program - " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "Cancel",IDCANCEL,142,98,43,17 - PUSHBUTTON "&End Now",IDC_END_NOW,78,98,43,17 - LTEXT "This program is not responding",IDC_STATIC,7,7,178,8 - LTEXT "To return to ReactOS and check the status of the program, click Cancel", - IDC_STATIC,7,26,178,16 - LTEXT "If you choose to end the program immediately, you will loose any unsaved data. To end the program now, click End Now", - IDC_STATIC,7,53,178,26 -END +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_END_NOW DIALOG DISCARDABLE 0, 0, 200, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "End Program - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ending Program... Please wait",IDC_STATIC,7,7,186,11 + CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "If you choose to end the program immediately, you will lose any unsaved data. To end the program now, click End Now.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&End Now",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOG DISCARDABLE 0, 0, 192, 122 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "End Program - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Cancel",IDCANCEL,142,98,43,17 + PUSHBUTTON "&End Now",IDC_END_NOW,78,98,43,17 + LTEXT "This program is not responding",IDC_STATIC,7,7,178,8 + LTEXT "To return to ReactOS and check the status of the program, click Cancel", + IDC_STATIC,7,26,178,16 + LTEXT "If you choose to end the program immediately, you will loose any unsaved data. To end the program now, click End Now", + IDC_STATIC,7,53,178,26 +END Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/en.rc ------------------------------------------------------------------------------ svn:eol-style = native

18 years, 4 months

[greatlrd] 22808: 5 of 4 commit (sorry my svn clinet is crazy for moment) Commit w3seek patch from bug 1609 : file attachment (id=910) The attached patch implements QueueUserWorkItem()/RtlQueueWorkItem() (lacks optimizations!!!). WINE's latest rpcrt4 relies on it. 1. Implement QueueUserWorkItem()/RtlQueueWorkItem() : 2. A slightly optimized 3. Supports WT_TRANSFER_IMPERSONATION 4. Slightly improved handling of growing/shrinking the pool by assuming work items with WT_EXECUTELONGFUNCTION run long

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jul 4 00:27:38 2006 New Revision: 22808 URL: http://svn.reactos.org/svn/reactos?rev=22808&view=rev Log: 5 of 4 commit (sorry my svn clinet is crazy for moment) Commit w3seek patch from bug 1609 : file attachment (id=910) The attached patch implements QueueUserWorkItem()/RtlQueueWorkItem() (lacks optimizations!!!). WINE's latest rpcrt4 relies on it. 1. Implement QueueUserWorkItem()/RtlQueueWorkItem() : 2. A slightly optimized 3. Supports WT_TRANSFER_IMPERSONATION 4. Slightly improved handling of growing/shrinking the pool by assuming work items with WT_EXECUTELONGFUNCTION run longer 5. Fixes a hack that made a worker thread always terminate if there were at least one more thread available Modified: trunk/reactos/dll/ntdll/def/ntdll.def Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?re… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def Tue Jul 4 00:27:38 2006 @@ -601,6 +601,7 @@ RtlQuerySecurityObject@20 RtlQueryTagHeap@20 RtlQueryTimeZoneInformation@4 +RtlQueueWorkItem@12 RtlRaiseException@4 RtlRaiseStatus@4 RtlRandom@4

18 years, 4 months

[greatlrd] 22807: 4 of 4 commit (sorry my svn clinet is crazy for moment) Commit w3seek patch from bug 1609 : file attachment (id=910) The attached patch implements QueueUserWorkItem()/RtlQueueWorkItem() (lacks optimizations!!!). WINE's latest rpcrt4 relies on it. 1. Implement QueueUserWorkItem()/RtlQueueWorkItem() : 2. A slightly optimized 3. Supports WT_TRANSFER_IMPERSONATION 4. Slightly improved handling of growing/shrinking the pool by assuming work items with WT_EXECUTELONGFUNCTION run long

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jul 4 00:26:58 2006 New Revision: 22807 URL: http://svn.reactos.org/svn/reactos?rev=22807&view=rev Log: 4 of 4 commit (sorry my svn clinet is crazy for moment) Commit w3seek patch from bug 1609 : file attachment (id=910) The attached patch implements QueueUserWorkItem()/RtlQueueWorkItem() (lacks optimizations!!!). WINE's latest rpcrt4 relies on it. 1. Implement QueueUserWorkItem()/RtlQueueWorkItem() : 2. A slightly optimized 3. Supports WT_TRANSFER_IMPERSONATION 4. Slightly improved handling of growing/shrinking the pool by assuming work items with WT_EXECUTELONGFUNCTION run longer 5. Fixes a hack that made a worker thread always terminate if there were at least one more thread available Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/dll/win32/kernel32/thread/thread.c Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c Tue Jul 4 00:26:58 2006 @@ -625,24 +625,6 @@ */ BOOL STDCALL -QueueUserWorkItem( - LPTHREAD_START_ROUTINE Function, - PVOID Context, - ULONG Flags - ) -{ - STUB; - return 0; -} - - - - -/* - * @unimplemented - */ -BOOL -STDCALL ReadFileScatter( HANDLE hFile, FILE_SEGMENT_ELEMENT aSegmentArray[], Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/thread.c (original) +++ trunk/reactos/dll/win32/kernel32/thread/thread.c Tue Jul 4 00:26:58 2006 @@ -873,4 +873,79 @@ return 0; } + +typedef struct _QUEUE_USER_WORKITEM_CONTEXT +{ + LPTHREAD_START_ROUTINE Function; + PVOID Context; +} QUEUE_USER_WORKITEM_CONTEXT, *PQUEUE_USER_WORKITEM_CONTEXT; + +static VOID +NTAPI +InternalWorkItemTrampoline(PVOID Context) +{ + QUEUE_USER_WORKITEM_CONTEXT Info; + + ASSERT(Context != NULL); + + /* Save the context to the stack */ + Info = *(volatile QUEUE_USER_WORKITEM_CONTEXT *)Context; + + /* Free the context before calling the callback. This avoids + a memory leak in case the thread dies... */ + RtlFreeHeap(RtlGetProcessHeap(), + 0, + Context); + + /* Call the real callback */ + Info.Function(Info.Context); +} + + +/* + * @implemented + */ +BOOL +STDCALL +QueueUserWorkItem( + LPTHREAD_START_ROUTINE Function, + PVOID Context, + ULONG Flags + ) +{ + PQUEUE_USER_WORKITEM_CONTEXT WorkItemContext; + NTSTATUS Status; + + /* Save the context for the trampoline function */ + WorkItemContext = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + sizeof(*WorkItemContext)); + if (WorkItemContext == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + WorkItemContext->Function = Function; + WorkItemContext->Context = Context; + + /* NOTE: Don't use Function directly since the callback signature + differs. This might cause problems on certain platforms... */ + Status = RtlQueueWorkItem(InternalWorkItemTrampoline, + WorkItemContext, + Flags); + if (!NT_SUCCESS(Status)) + { + /* Free the allocated context in case of failure */ + RtlFreeHeap(RtlGetProcessHeap(), + 0, + WorkItemContext); + + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; +} + /* EOF */

18 years, 4 months

[greatlrd] 22806: 3 of 4 commit (sorry my svn clinet is crazy for moment) Commit w3seek patch from bug 1609 : file attachment (id=910) The attached patch implements QueueUserWorkItem()/RtlQueueWorkItem() (lacks optimizations!!!). WINE's latest rpcrt4 relies on it. 1. Implement QueueUserWorkItem()/RtlQueueWorkItem() : 2. A slightly optimized 3. Supports WT_TRANSFER_IMPERSONATION 4. Slightly improved handling of growing/shrinking the pool by assuming work items with WT_EXECUTELONGFUNCTION run long

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jul 4 00:24:46 2006 New Revision: 22806 URL: http://svn.reactos.org/svn/reactos?rev=22806&view=rev Log: 3 of 4 commit (sorry my svn clinet is crazy for moment) Commit w3seek patch from bug 1609 : file attachment (id=910) The attached patch implements QueueUserWorkItem()/RtlQueueWorkItem() (lacks optimizations!!!). WINE's latest rpcrt4 relies on it. 1. Implement QueueUserWorkItem()/RtlQueueWorkItem() : 2. A slightly optimized 3. Supports WT_TRANSFER_IMPERSONATION 4. Slightly improved handling of growing/shrinking the pool by assuming work items with WT_EXECUTELONGFUNCTION run longer 5. Fixes a hack that made a worker thread always terminate if there were at least one more thread available Modified: trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/lib/rtl/rtlp.h trunk/reactos/lib/rtl/timerqueue.c Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=228… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild (original) +++ trunk/reactos/lib/rtl/rtl.rbuild Tue Jul 4 00:24:46 2006 @@ -94,5 +94,6 @@ <file>unicodeprefix.c</file> <file>vectoreh.c</file> <file>version.c</file> + <file>workitem.c</file> <pch>rtl.h</pch> </module> Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=22806&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h (original) +++ trunk/reactos/lib/rtl/rtlp.h Tue Jul 4 00:24:46 2006 @@ -114,4 +114,11 @@ #define TAG_ASTR TAG('A', 'S', 'T', 'R') #define TAG_OSTR TAG('O', 'S', 'T', 'R') +/* Timer Queue */ + +extern HANDLE TimerThreadHandle; + +NTSTATUS +RtlpInitializeTimerThread(VOID); + /* EOF */ Modified: trunk/reactos/lib/rtl/timerqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/timerqueue.c?rev=2… ============================================================================== --- trunk/reactos/lib/rtl/timerqueue.c (original) +++ trunk/reactos/lib/rtl/timerqueue.c Tue Jul 4 00:24:46 2006 @@ -16,6 +16,14 @@ /* FUNCTIONS ***************************************************************/ typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN ); + +HANDLE TimerThreadHandle = NULL; + +NTSTATUS +RtlpInitializeTimerThread(VOID) +{ + return STATUS_NOT_IMPLEMENTED; +} /* * @unimplemented

18 years, 4 months

← Newer
1
...
56
57
58
59
60
61
62
...
67
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 July 2006