Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 57556: [CSRSRV] - Remove $Id$ property. - Correct misspellings : "othwerwise" --> "otherwise" and "(de)refence" --> "(de)reference". - Add missing functions' documentation (from the old ...
by hbelusca＠svn.reactos.org 13 Oct '12

13 Oct '12

Author: hbelusca Date: Sat Oct 13 20:32:44 2012 New Revision: 57556 URL: http://svn.reactos.org/svn/reactos?rev=57556&view=rev Log: [CSRSRV] - Remove $Id$ property. - Correct misspellings : "othwerwise" --> "otherwise" and "(de)refence" --> "(de)reference". - Add missing functions' documentation (from the old CSRSRV). - Add some useful comments. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c (props changed) trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c (contents, props changed) trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c (contents, props changed) trunk/reactos/subsystems/win32/csrss/csrsrv/init.c trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c trunk/reactos/subsystems/win32/csrss/csrsrv/server.c (contents, props changed) trunk/reactos/subsystems/win32/csrss/csrsrv/session.c (contents, props changed) trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c (contents, props changed) trunk/reactos/subsystems/win32/csrss/csrss.c (props changed) trunk/reactos/subsystems/win32/csrss/csrss.rc (props changed) trunk/reactos/subsystems/win32/csrss/include/api.h (contents, props changed) trunk/reactos/subsystems/win32/csrss/include/csrplugin.h (contents, props changed) Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * subsystems/win32/csrss/csrsrv/api/user.c * * User functions Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * subsystems/win32/csrss/csrsrv/api/wapi.c * * CSRSS port message processing @@ -206,7 +205,9 @@ /* Return success */ return STATUS_SUCCESS; + #else // Hacky reactos code + PCSR_PROCESS ProcessData; /* Get the Process Data */ @@ -249,7 +250,7 @@ * @param None * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -298,8 +299,8 @@ /* Create the Port Object */ Status = NtCreatePort(&CsrApiPort, &ObjectAttributes, - LPC_MAX_DATA_LENGTH, // hack - LPC_MAX_MESSAGE_LENGTH, // hack + LPC_MAX_DATA_LENGTH, // hack ; sizeof(CSR_CONNECTION_INFO), + LPC_MAX_MESSAGE_LENGTH, // hack ; sizeof(CSR_API_MESSAGE), 16 * PAGE_SIZE); if (NT_SUCCESS(Status)) { @@ -745,7 +746,7 @@ } NTSTATUS WINAPI -CsrpHandleConnectionRequest (PPORT_MESSAGE Request) +CsrpHandleConnectionRequest(PPORT_MESSAGE Request) { NTSTATUS Status; HANDLE ServerPort = NULL;//, ServerThread = NULL; @@ -844,6 +845,19 @@ return Status; } +/*++ + * @name CsrConnectToUser + * @implemented NT4 + * + * The CsrConnectToUser connects to the User subsystem. + * + * @param None + * + * @return A pointer to the CSR Thread + * + * @remarks None. + * + *--*/ PCSR_THREAD NTAPI CsrConnectToUser(VOID) Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -3,7 +3,8 @@ * PROJECT: ReactOS CSR Sub System * FILE: subsystems/win32/csrss/csrsrv/init.c * PURPOSE: CSR Server DLL Initialization - * PROGRAMMERS: ReactOS Portable Systems Group + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * ReactOS Portable Systems Group */ /* INCLUDES *******************************************************************/ @@ -111,7 +112,7 @@ * @param None. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -226,7 +227,7 @@ * Handle fo the Object Directory to protect. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -249,7 +250,7 @@ * Pointer to the Security Descriptor to return. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks Depending on the DOS Devices Protection Mode (set in the registry), * regular users may or may not have full access to the directory. @@ -466,7 +467,7 @@ * Session ID for which to create the directories. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -597,7 +598,7 @@ * Array of arguments. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -754,6 +755,7 @@ // { // Status = CsrLoadServerDll(ParameterValue, EntryPoint, 2); // } + // Status = CsrLoadServerDll(ParameterValue, EntryPoint, DllIndex); if (!NT_SUCCESS(Status)) { DPRINT1("CSRSS: *** Failed loading ServerDll=%s (Status == 0x%x)\n", @@ -786,7 +788,7 @@ * Pointer to a pointer to the security descriptor to create. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -826,7 +828,7 @@ return Status; } - /* Create the DACL for it*/ + /* Create the DACL for it */ RtlCreateAcl(Dacl, Length, ACL_REVISION2); /* Create the ACE */ @@ -863,7 +865,7 @@ * @param None * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -945,6 +947,25 @@ /* PUBLIC FUNCTIONS ***********************************************************/ +/*++ + * @name CsrServerInitialization + * @implemented NT4 + * + * The CsrServerInitialization routine is the native (not Server) entrypoint + * of this Server DLL. It serves as the entrypoint for csrss. + * + * @param ArgumentCount + * Number of arguments on the command line. + * + * @param Arguments + * Array of arguments from the command line. + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * otherwise. + * + * @remarks None. + * + *--*/ NTSTATUS NTAPI CsrServerInitialization(IN ULONG ArgumentCount, @@ -1085,11 +1106,33 @@ return Status; } +/*++ + * @name CsrPopulateDosDevices + * @unimplemented NT5.1 + * + * The CsrPopulateDosDevices routine uses the DOS Device Map from the Kernel + * to populate the Dos Devices Object Directory for the session. + * + * @param None. + * + * @return None. + * + * @remarks None. + * + *--*/ +VOID +NTAPI +CsrPopulateDosDevices(VOID) +{ + DPRINT1("Deprecated API\n"); + return; +} + BOOL NTAPI -DllMain(HANDLE hDll, - DWORD dwReason, - LPVOID lpReserved) +DllMain(IN HANDLE hDll, + IN DWORD dwReason, + IN LPVOID lpReserved) { /* We don't do much */ UNREFERENCED_PARAMETER(hDll); Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -17,7 +17,7 @@ /* GLOBALS ********************************************************************/ RTL_CRITICAL_SECTION ProcessDataLock; -PCSR_PROCESS CsrRootProcess; +PCSR_PROCESS CsrRootProcess = NULL; SECURITY_QUALITY_OF_SERVICE CsrSecurityQos = { sizeof(SECURITY_QUALITY_OF_SERVICE), @@ -25,7 +25,7 @@ SECURITY_STATIC_TRACKING, FALSE }; -LONG CsrProcessSequenceCount = 5; +ULONG CsrProcessSequenceCount = 5; extern ULONG CsrTotalPerProcessDataLength; /* FUNCTIONS ******************************************************************/ @@ -64,6 +64,26 @@ } } +/*++ + * @name CsrGetProcessLuid + * @implemented NT4 + * + * Do nothing for 500ms. + * + * @param hProcess + * Optional handle to the process whose LUID should be returned. + * + * @param Luid + * Pointer to a LUID Pointer which will receive the CSR Process' LUID + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * otherwise. + * + * @remarks If hProcess is not supplied, then the current thread's token will + * be used. If that too is missing, then the current process' token + * will be used. + * + *--*/ NTSTATUS NTAPI CsrGetProcessLuid(HANDLE hProcess OPTIONAL, @@ -148,6 +168,20 @@ return Status; } +/*++ + * @name CsrImpersonateClient + * @implemented NT4 + * + * The CsrImpersonateClient will impersonate the given CSR Thread. + * + * @param CsrThread + * Pointer to the CSR Thread to impersonate. + * + * @return TRUE if impersionation suceeded, false otherwise. + * + * @remarks Impersonation can be recursive. + * + *--*/ BOOLEAN NTAPI CsrImpersonateClient(IN PCSR_THREAD CsrThread) @@ -173,6 +207,10 @@ if (!NT_SUCCESS(Status)) { /* Failure */ +/* + DPRINT1("CSRSS: Can't impersonate client thread - Status = %lx\n", Status); + if (Status != STATUS_BAD_IMPERSONATION_LEVEL) DbgBreakPoint(); +*/ return FALSE; } @@ -183,6 +221,21 @@ return TRUE; } +/*++ + * @name CsrRevertToSelf + * @implemented NT4 + * + * The CsrRevertToSelf routine will attempt to remove an active impersonation. + * + * @param None. + * + * @return TRUE if the reversion was succesful, false otherwise. + * + * @remarks Impersonation can be recursive; as such, the impersonation token + * will only be deleted once the CSR Thread's impersonaton count + * has reached zero. + * + *--*/ BOOLEAN NTAPI CsrRevertToSelf(VOID) @@ -197,6 +250,7 @@ /* Make sure impersonation is on */ if (!CurrentThread->ImpersonationCount) { + // DPRINT1("CSRSS: CsrRevertToSelf called while not impersonating\n"); return FALSE; } else if (--CurrentThread->ImpersonationCount > 0) @@ -216,18 +270,33 @@ return NT_SUCCESS(Status); } +/*++ + * @name FindProcessForShutdown + * + * The FindProcessForShutdown routine returns a CSR Process which is ready + * to be shutdown, and sets the appropriate shutdown flags for it. + * + * @param CallerLuid + * Pointer to the LUID of the CSR Process calling this routine. + * + * @return Pointer to a CSR Process which is ready to be shutdown. + * + * @remarks None. + * + *--*/ PCSR_PROCESS NTAPI FindProcessForShutdown(IN PLUID CallerLuid) { PCSR_PROCESS CsrProcess, ReturnCsrProcess = NULL; + // PCSR_THREAD CsrThread; NTSTATUS Status; ULONG Level = 0; LUID ProcessLuid; LUID SystemLuid = SYSTEM_LUID; - BOOLEAN IsSystemLuid = FALSE, IsOurLuid = FALSE; + // BOOLEAN IsSystemLuid = FALSE, IsOurLuid = FALSE; PLIST_ENTRY NextEntry; - + /* Set the List Pointers */ NextEntry = CsrRootProcess->ListLink.Flink; while (NextEntry != &CsrRootProcess->ListLink) @@ -237,10 +306,10 @@ /* Move to the next entry */ NextEntry = NextEntry->Flink; - + /* Skip this process if it's already been processed */ if (CsrProcess->Flags & CsrProcessSkipShutdown) continue; - + /* Get the LUID of this Process */ Status = CsrGetProcessLuid(CsrProcess->ProcessHandle, &ProcessLuid); @@ -248,29 +317,41 @@ if (Status == STATUS_ACCESS_DENIED) { /* FIXME:Check if we have any threads */ - } - +/* + if (CsrProcess->ThreadCount) + { + /\* Impersonate one of the threads and retry *\/ + CsrThread = CONTAINING_RECORD(CsrProcess->ThreadList.Flink, + CSR_THREAD, + Link); + CsrImpersonateClient(CsrThread); + Status = CsrGetProcessLuid(NULL, &ProcessLuid); + CsrRevertToSelf(); + } +*/ + } + if (!NT_SUCCESS(Status)) { /* We didn't have access, so skip it */ CsrProcess->Flags |= CsrProcessSkipShutdown; continue; } - + /* Check if this is the System LUID */ - if ((IsSystemLuid = RtlEqualLuid(&ProcessLuid, &SystemLuid))) + if ((/*IsSystemLuid =*/ RtlEqualLuid(&ProcessLuid, &SystemLuid))) { /* Mark this process */ CsrProcess->ShutdownFlags |= CsrShutdownSystem; } - else if (!(IsOurLuid = RtlEqualLuid(&ProcessLuid, CallerLuid))) + else if (!(/*IsOurLuid =*/ RtlEqualLuid(&ProcessLuid, CallerLuid))) { /* Our LUID doesn't match with the caller's */ CsrProcess->ShutdownFlags |= CsrShutdownOther; } - + /* Check if we're past the previous level */ - if (CsrProcess->ShutdownLevel > Level) + if (CsrProcess->ShutdownLevel > Level /* || !ReturnCsrProcess */) { /* Update the level */ Level = CsrProcess->ShutdownLevel; @@ -279,14 +360,14 @@ ReturnCsrProcess = CsrProcess; } } - + /* Check if we found a process */ if (ReturnCsrProcess) { /* Skip this one next time */ ReturnCsrProcess->Flags |= CsrProcessSkipShutdown; } - + return ReturnCsrProcess; } @@ -604,7 +685,7 @@ * column. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -903,7 +984,7 @@ /*++ * @name CsrLockedReferenceProcess * - * The CsrLockedReferenceProcess refences a CSR Process while the + * The CsrLockedReferenceProcess references a CSR Process while the * Process Lock is already being held. * * @param CsrProcess @@ -923,7 +1004,7 @@ } /*++ - * @name CsrServerInitialization + * @name CsrInitializeProcessStructure * @implemented NT4 * * The CsrInitializeProcessStructure routine sets up support for CSR Processes @@ -932,7 +1013,7 @@ * @param None. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -1099,7 +1180,7 @@ * CSR Process corresponding to the given Process ID. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks Locking a CSR Process is defined as acquiring an extra * reference to it and returning with the Process Lock held. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -98,7 +98,7 @@ * assumed. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -340,7 +340,7 @@ * specifies various arguments for the shared section. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -463,7 +463,7 @@ * connection. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/session.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/session.c [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -192,7 +192,7 @@ * @param ApiMessage * Pointer to the Session Manager API Message. * - * @return TRUE in case of success, FALSE othwerwise. + * @return TRUE in case of success, FALSE otherwise. * * @remarks The CsrSbCreateSession routine will initialize a new CSR NT * Session and allocate a new CSR Process for the subsystem process. @@ -339,7 +339,7 @@ * @param ApiMessage * Pointer to the Session Manager API Message. * - * @return TRUE in case of success, FALSE othwerwise. + * @return TRUE in case of success, FALSE otherwise. * * @remarks The CsrSbForeignSessionComplete API is not yet implemented. * @@ -362,7 +362,7 @@ * @param ApiMessage * Pointer to the Session Manager API Message. * - * @return TRUE in case of success, FALSE othwerwise. + * @return TRUE in case of success, FALSE otherwise. * * @remarks The CsrSbTerminateSession API is not yet implemented. * @@ -384,7 +384,7 @@ * @param ApiMessage * Pointer to the Session Manager API Message. * - * @return TRUE in case of success, FALSE othwerwise. + * @return TRUE in case of success, FALSE otherwise. * * @remarks The CsrSbCreateProcess API is not yet implemented. * Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/session.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CSR Sub System * FILE: subsystems/win32/csrss/csrsrv/thredsup.c - * PURPOSE: CSR Process Management + * PURPOSE: CSR Server DLL Thread Implementation * PROGRAMMERS: ReactOS Portable Systems Group * Alex Ionescu */ @@ -101,6 +101,19 @@ return FALSE; } +/*++ + * @name CsrAllocateThread + * + * The CsrAllocateThread routine allocates a new CSR Thread object. + * + * @param CsrProcess + * Pointer to the CSR Process which will contain this CSR Thread. + * + * @return Pointer to the newly allocated CSR Thread. + * + * @remarks None. + * + *--*/ PCSR_THREAD NTAPI CsrAllocateThread(IN PCSR_PROCESS CsrProcess) @@ -125,7 +138,7 @@ /*++ * @name CsrLockedReferenceThread * - * The CsrLockedReferenceThread refences a CSR Thread while the + * The CsrLockedReferenceThread references a CSR Thread while the * Process Lock is already being held. * * @param CsrThread @@ -144,6 +157,26 @@ ++CsrThread->ReferenceCount; } +/*++ + * @name CsrLocateThreadByClientId + * + * The CsrLocateThreadByClientId routine locates the CSR Thread and, + * optionally, its parent CSR Process, corresponding to a Client ID. + * + * @param Process + * Optional pointer to a CSR Process pointer which will contain + * the CSR Thread's parent. + * + * @param ClientId + * Pointer to a Client ID structure containing the Unique Thread ID + * to look up. + * + * @return Pointer to the CSR Thread corresponding to this CID, or NULL if + * none was found. + * + * @remarks None. + * + *--*/ PCSR_THREAD NTAPI CsrLocateThreadByClientId(OUT PCSR_PROCESS *Process OPTIONAL, @@ -152,6 +185,7 @@ ULONG i; PLIST_ENTRY ListHead, NextEntry; PCSR_THREAD FoundThread; + // ASSERT(ProcessStructureListLocked()); /* Hash the Thread */ i = CsrHashThread(ClientId->UniqueThread); @@ -185,6 +219,27 @@ return NULL; } +/*++ + * @name CsrLocateThreadInProcess + * + * The CsrLocateThreadInProcess routine locates the CSR Thread + * corresponding to a Client ID inside a specific CSR Process. + * + * @param Process + * Optional pointer to the CSR Process which contains the CSR Thread + * that will be looked up. + * + * @param ClientId + * Pointer to a Client ID structure containing the Unique Thread ID + * to look up. + * + * @return Pointer to the CSR Thread corresponding to this CID, or NULL if + * none was found. + * + * @remarks If the CsrProcess argument is NULL, the lookup will be done inside + * CsrRootProcess. + * + *--*/ PCSR_THREAD NTAPI CsrLocateThreadInProcess(IN PCSR_PROCESS CsrProcess OPTIONAL, @@ -219,12 +274,30 @@ return FoundThread; } +/*++ + * @name CsrInsertThread + * + * The CsrInsertThread routine inserts a CSR Thread into its parent's + * Thread List and into the Thread Hash Table. + * + * @param Process + * Pointer to the CSR Process containing this CSR Thread. + * + * @param Thread + * Pointer to the CSR Thread to be inserted. + * + * @return None. + * + * @remarks None. + * + *--*/ VOID NTAPI CsrInsertThread(IN PCSR_PROCESS Process, IN PCSR_THREAD Thread) { ULONG i; + // ASSERT(ProcessStructureListLocked()); /* Insert it into the Regular List */ InsertTailList(&Process->ThreadList, &Thread->Link); @@ -240,14 +313,49 @@ InsertHeadList(&CsrThreadHashTable[i], &Thread->HashLinks); } +/*++ + * @name CsrDeallocateThread + * + * The CsrDeallocateThread frees the memory associated with a CSR Thread. + * + * @param CsrThread + * Pointer to the CSR Thread to be freed. + * + * @return None. + * + * @remarks Do not call this routine. It is reserved for the internal + * thread management routines when a CSR Thread has been cleanly + * dereferenced and killed. + * + *--*/ VOID NTAPI CsrDeallocateThread(IN PCSR_THREAD CsrThread) { /* Free the process object from the heap */ + // ASSERT(CsrThread->WaitBlock == NULL); RtlFreeHeap(CsrHeap, 0, CsrThread); } +/*++ + * @name CsrRemoveThread + * + * The CsrRemoveThread function undoes a CsrInsertThread operation and + * removes the CSR Thread from the the Hash Table and Thread List. + * + * @param CsrThread + * Pointer to the CSR Thread to remove. + * + * @return None. + * + * @remarks If this CSR Thread is the last one inside a CSR Process, the + * parent will be dereferenced and the CsrProcessLastThreadTerminated + * flag will be set. + * + * After executing this routine, the CSR Thread will have the + * CsrThreadInTermination flag set. + * + *--*/ VOID NTAPI CsrRemoveThread(IN PCSR_THREAD CsrThread) @@ -297,7 +405,7 @@ * with this CSR Thread. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -382,6 +490,24 @@ return STATUS_SUCCESS; } +/*++ + * @name CsrThreadRefcountZero + * + * The CsrThreadRefcountZero routine is executed when a CSR Thread has lost + * all its active references. It removes and de-allocates the CSR Thread. + * + * @param CsrThread + * Pointer to the CSR Thread that is to be deleted. + * + * @return None. + * + * @remarks Do not call this routine. It is reserved for the internal + * thread management routines when a CSR Thread has lost all + * its references. + * + * This routine is called with the Process Lock held. + * + *--*/ VOID NTAPI CsrThreadRefcountZero(IN PCSR_THREAD CsrThread) @@ -483,7 +609,7 @@ /*++ * @name CsrLockedDereferenceThread * - * The CsrLockedDereferenceThread derefences a CSR Thread while the + * The CsrLockedDereferenceThread dereferences a CSR Thread while the * Process Lock is already being held. * * @param CsrThread @@ -511,6 +637,29 @@ } } +/*++ + * @name CsrCreateThread + * @implemented NT4 + * + * The CsrCreateThread routine creates a CSR Thread object for an NT Thread. + * + * @param CsrProcess + * Pointer to the CSR Process which will contain the CSR Thread. + * + * @param hThread + * Handle to an existing NT Thread to which to associate this + * CSR Thread. + * + * @param ClientId + * Pointer to the Client ID structure of the NT Thread to associate + * with this CSR Thread. + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * otherwise. + * + * @remarks None. + * + *--*/ NTSTATUS NTAPI CsrCreateThread(IN PCSR_PROCESS CsrProcess, Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -40,7 +40,7 @@ * @param NewWaitBlock * Pointed to the initialized CSR Wait Block for this wait. * - * @return TRUE in case of success, FALSE othwerwise. + * @return TRUE in case of success, FALSE otherwise. * * @remarks None. * @@ -262,7 +262,7 @@ * @name CsrDereferenceWait * @implemented NT4 * - * The CsrDereferenceWait routine derefences a CSR Wait Block. + * The CsrDereferenceWait routine dereferences a CSR Wait Block. * * @param WaitList * Pointer to the Wait List associated to the wait. @@ -394,7 +394,7 @@ * @param WaitArgument[1-2] * User-defined argument to pass on to the wait function. * - * @return TRUE in case of success, FALSE othwerwise. + * @return TRUE in case of success, FALSE otherwise. * * @remarks None. * Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/subsystems/win32/csrss/csrss.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/subsystems/win32/csrss/csrss.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: subsys/csrss/include/api.h Propchange: trunk/reactos/subsystems/win32/csrss/include/api.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/subsystems/win32/csrss/include/csrplugin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/csrplugin.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/csrplugin.h [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: subsys/csrss/include/csrplugin.h Propchange: trunk/reactos/subsystems/win32/csrss/include/csrplugin.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision

1 0

[hbelusca] 57555: [USER32] - Change the French keyboard accelerators of the windows' system menu to match those of Win2k3.
by hbelusca＠svn.reactos.org 13 Oct '12

13 Oct '12

Author: hbelusca Date: Sat Oct 13 18:19:31 2012 New Revision: 57555 URL: http://svn.reactos.org/svn/reactos?rev=57555&view=rev Log: [USER32] - Change the French keyboard accelerators of the windows' system menu to match those of Win2k3. Modified: trunk/reactos/win32ss/user/user32/lang/fr-FR.rc Modified: trunk/reactos/win32ss/user/user32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/f… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/fr-FR.rc [iso-8859-1] Sat Oct 13 18:19:31 2012 @@ -44,10 +44,10 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE BEGIN MENUITEM "&Restaurer", SC_RESTORE - MENUITEM "&DÃ©placer", SC_MOVE + MENUITEM "DÃ©p&lacer", SC_MOVE MENUITEM "&Taille", SC_SIZE - MENUITEM "RÃ©&duire", SC_MINIMIZE - MENUITEM "A&grandir", SC_MAXIMIZE + MENUITEM "RÃ©d&uire", SC_MINIMIZE + MENUITEM "Agra&ndir", SC_MAXIMIZE MENUITEM SEPARATOR MENUITEM "&Fermer\tAlt-F4", SC_CLOSE END

1 0

[spetreolle] 57554: [BOOTDATA] Clean up svn properties.
by spetreolle＠svn.reactos.org 13 Oct '12

13 Oct '12

Author: spetreolle Date: Sat Oct 13 16:22:48 2012 New Revision: 57554 URL: http://svn.reactos.org/svn/reactos?rev=57554&view=rev Log: [BOOTDATA] Clean up svn properties. Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf (props changed) trunk/reactos/boot/bootdata/hivecls_i386.inf (props changed) trunk/reactos/boot/bootdata/hivedef_arm.inf (props changed) trunk/reactos/boot/bootdata/hivedef_i386.inf (props changed) trunk/reactos/boot/bootdata/hiveinst_arm.inf (props changed) trunk/reactos/boot/bootdata/hiveinst_i386.inf (props changed) trunk/reactos/boot/bootdata/hivesft_arm.inf (props changed) trunk/reactos/boot/bootdata/hivesft_i386.inf (props changed) trunk/reactos/boot/bootdata/hivesys_arm.inf (props changed) trunk/reactos/boot/bootdata/hivesys_i386.inf (props changed) Propchange: trunk/reactos/boot/bootdata/hivecls_arm.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/boot/bootdata/hivecls_i386.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/boot/bootdata/hivedef_arm.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/boot/bootdata/hivedef_i386.inf ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1,1 +1,0 @@ -application/octet-stream Propchange: trunk/reactos/boot/bootdata/hiveinst_arm.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/boot/bootdata/hiveinst_i386.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/boot/bootdata/hivesft_arm.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/boot/bootdata/hivesft_i386.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/boot/bootdata/hivesft_i386.inf ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1,1 +1,0 @@ -application/octet-stream Propchange: trunk/reactos/boot/bootdata/hivesys_arm.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/boot/bootdata/hivesys_i386.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision

1 0

[hbelusca] 57553: [RAPPS] - Use COM for calling SHBrowseForFolder. - Allow choosing a directory for downloading. - Correct a typo in the name of a function.
by hbelusca＠svn.reactos.org 13 Oct '12

13 Oct '12

Author: hbelusca Date: Sat Oct 13 13:35:55 2012 New Revision: 57553 URL: http://svn.reactos.org/svn/reactos?rev=57553&view=rev Log: [RAPPS] - Use COM for calling SHBrowseForFolder. - Allow choosing a directory for downloading. - Correct a typo in the name of a function. Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt trunk/reactos/base/applications/rapps/rapps.h trunk/reactos/base/applications/rapps/settingsdlg.c trunk/reactos/base/applications/rapps/winmain.c Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CM… ============================================================================== --- trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Sat Oct 13 13:35:55 2012 @@ -29,7 +29,7 @@ set_module_type(rapps win32gui UNICODE) target_link_libraries(rapps uuid) -add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi msvcrt kernel32 ntdll) +add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll) add_dependencies(rapps rappsmsg) add_message_headers(ANSI rappsmsg.mc) add_cd_file(TARGET rapps DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Sat Oct 13 13:35:55 2012 @@ -115,7 +115,7 @@ extern INT SelectedEnumType; extern SETTINGS_INFO SettingsInfo; VOID SaveSettings(HWND hwnd); -VOID FillDafaultSettings(PSETTINGS_INFO pSettingsInfo); +VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo); /* listview.c */ extern HWND hListView; Modified: trunk/reactos/base/applications/rapps/settingsdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/se… ============================================================================== --- trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] Sat Oct 13 13:35:55 2012 @@ -6,6 +6,7 @@ * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) */ +#define _WIN32_DCOM // For CoInitializeEx, etc... #include "rapps.h" SETTINGS_INFO NewSettingsInfo; @@ -16,27 +17,35 @@ BOOL ChooseFolder(HWND hwnd) { - BROWSEINFO fi; - LPCITEMIDLIST lpItemList; + BOOL bRet = FALSE; + BROWSEINFO bi; WCHAR szPath[MAX_PATH], szBuf[MAX_STR_LEN]; LoadStringW(hInst, IDS_CHOOSE_FOLDER_TEXT, szBuf, sizeof(szBuf) / sizeof(TCHAR)); - ZeroMemory(&fi, sizeof(BROWSEINFO)); - fi.hwndOwner = hwnd; - fi.lpszTitle = szBuf; - fi.ulFlags = BIF_DONTGOBELOWDOMAIN | BIF_RETURNONLYFSDIRS | BIF_BROWSEFORCOMPUTER | BIF_NEWDIALOGSTYLE; - fi.lpfn = NULL; - fi.lParam = -1; - fi.iImage = 0; + ZeroMemory(&bi, sizeof(bi)); + bi.hwndOwner = hwnd; + bi.pidlRoot = NULL; + bi.lpszTitle = szBuf; + bi.ulFlags = BIF_USENEWUI | BIF_DONTGOBELOWDOMAIN | BIF_RETURNONLYFSDIRS | /* BIF_BROWSEFILEJUNCTIONS | */ BIF_VALIDATE; - if (!(lpItemList = SHBrowseForFolder(&fi))) return FALSE; - SHGetPathFromIDList(lpItemList, szPath); + if (SUCCEEDED(CoInitializeEx(NULL, COINIT_APARTMENTTHREADED))) + { + LPITEMIDLIST lpItemList = SHBrowseForFolder(&bi); + if (lpItemList && SHGetPathFromIDList(lpItemList, szPath)) + { + if (szPath[0] != 0) + { + SetDlgItemTextW(hwnd, IDC_DOWNLOAD_DIR_EDIT, szPath); + bRet = TRUE; + } + } - if (wcslen(szPath) == 0) return FALSE; - SetDlgItemTextW(hwnd, IDC_DOWNLOAD_DIR_EDIT, szPath); + CoTaskMemFree(lpItemList); + CoUninitialize(); + } - return TRUE; + return bRet; } static VOID @@ -89,7 +98,7 @@ break; case IDC_DEFAULT_SETTINGS: - FillDafaultSettings(&NewSettingsInfo); + FillDefaultSettings(&NewSettingsInfo); InitSettingsControls(hDlg, NewSettingsInfo); break; Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Sat Oct 13 13:35:55 2012 @@ -16,7 +16,7 @@ VOID -FillDafaultSettings(PSETTINGS_INFO pSettingsInfo) +FillDefaultSettings(PSETTINGS_INFO pSettingsInfo) { pSettingsInfo->bSaveWndPos = TRUE; pSettingsInfo->bUpdateAtStart = FALSE; @@ -782,7 +782,7 @@ if (!LoadSettings()) { - FillDafaultSettings(&SettingsInfo); + FillDefaultSettings(&SettingsInfo); } InitLogs();

1 0

[tkreuzer] 57552: [RTL] Implement LdrEnumResources
by tkreuzer＠svn.reactos.org 13 Oct '12

13 Oct '12

Author: tkreuzer Date: Sat Oct 13 13:32:49 2012 New Revision: 57552 URL: http://svn.reactos.org/svn/reactos?rev=57552&view=rev Log: [RTL] Implement LdrEnumResources Modified: trunk/reactos/lib/rtl/res.c Modified: trunk/reactos/lib/rtl/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/res.c?rev=57552&r1… ============================================================================== --- trunk/reactos/lib/rtl/res.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/res.c [iso-8859-1] Sat Oct 13 13:32:49 2012 @@ -283,18 +283,220 @@ } -/* - * @unimplemented - */ +#define NAME_FROM_RESOURCE_ENTRY(RootDirectory, Entry) \ + ((Entry)->NameIsString ? (ULONG_PTR)(RootDirectory) + (Entry)->NameOffset : (Entry)->Id) + +static +LONG +LdrpCompareResourceNames_U( + _In_ PUCHAR ResourceData, + _In_ PIMAGE_RESOURCE_DIRECTORY_ENTRY Entry, + _In_ ULONG_PTR CompareName) +{ + PIMAGE_RESOURCE_DIR_STRING_U ResourceString; + PWSTR String1, String2; + USHORT ResourceStringLength; + WCHAR Char1, Char2; + + /* Check if the resource name is an ID */ + if (CompareName <= USHRT_MAX) + { + /* Just compare the 2 IDs */ + return (CompareName - Entry->Id); + } + else + { + /* Fail if ResourceName2 is an ID */ + if (Entry->Id <= USHRT_MAX) return -1; + + /* Get the resource string */ + ResourceString = (PIMAGE_RESOURCE_DIR_STRING_U)(ResourceData + + Entry->NameOffset); + + /* Get the string length */ + ResourceStringLength = ResourceString->Length; + + String1 = ResourceString->NameString; + String2 = (PWSTR)CompareName; + + /* Loop all characters of the resource string */ + while (ResourceStringLength--) + { + /* Get the next characters */ + Char1 = *String1++; + Char2 = *String2++; + + /* Check if they don't match, or if the compare string ends */ + if ((Char1 != Char2) || (Char2 == 0)) + { + /* They don't match, fail */ + return Char2 - Char1; + } + } + + /* All characters match, check if the compare string ends here */ + return (*String2 == 0) ? 0 : 1; + } +} + NTSTATUS NTAPI LdrEnumResources( - IN PVOID BaseAddress, - IN PLDR_RESOURCE_INFO ResourceInfo, - IN ULONG Level, - IN OUT PULONG ResourceCount, - OUT PLDR_ENUM_RESOURCE_INFO Resources OPTIONAL) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + _In_ PVOID ImageBase, + _In_ PLDR_RESOURCE_INFO ResourceInfo, + _In_ ULONG Level, + _Inout_ ULONG *ResourceCount, + _Out_opt_ LDR_ENUM_RESOURCE_INFO *Resources) +{ + PUCHAR ResourceData; + NTSTATUS Status; + ULONG i, j, k; + ULONG NumberOfTypeEntries, NumberOfNameEntries, NumberOfLangEntries; + ULONG Count, MaxResourceCount; + PIMAGE_RESOURCE_DIRECTORY TypeDirectory, NameDirectory, LangDirectory; + PIMAGE_RESOURCE_DIRECTORY_ENTRY TypeEntry, NameEntry, LangEntry; + PIMAGE_RESOURCE_DATA_ENTRY DataEntry; + ULONG Size; + LONG Result; + + /* If the caller wants data, get the maximum count of entries */ + MaxResourceCount = (Resources != NULL) ? *ResourceCount : 0; + + /* Default to 0 */ + *ResourceCount = 0; + + /* Locate the resource directory */ + ResourceData = RtlImageDirectoryEntryToData(ImageBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_RESOURCE, + &Size); + if (ResourceData == NULL) + return STATUS_RESOURCE_DATA_NOT_FOUND; + + /* The type directory is at the root, followed by the entries */ + TypeDirectory = (PIMAGE_RESOURCE_DIRECTORY)ResourceData; + TypeEntry = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(TypeDirectory + 1); + + /* Get the number of entries in the type directory */ + NumberOfTypeEntries = TypeDirectory->NumberOfNamedEntries + + TypeDirectory->NumberOfIdEntries; + + /* Start with 0 resources and status success */ + Status = STATUS_SUCCESS; + Count = 0; + + /* Loop all entries in the type directory */ + for (i = 0; i < NumberOfTypeEntries; ++i, ++TypeEntry) + { + /* Check if comparison of types is requested */ + if (Level > RESOURCE_TYPE_LEVEL) + { + /* Compare the type with the requested Type */ + Result = LdrpCompareResourceNames_U(ResourceData, + TypeEntry, + ResourceInfo->Type); + + /* Not equal, continue with next entry */ + if (Result != 0) continue; + } + + /* The entry must point to the name directory */ + if (!TypeEntry->DataIsDirectory) + { + return STATUS_INVALID_IMAGE_FORMAT; + } + + /* Get a pointer to the name subdirectory and it's first entry */ + NameDirectory = (PIMAGE_RESOURCE_DIRECTORY)(ResourceData + + TypeEntry->OffsetToDirectory); + NameEntry = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(NameDirectory + 1); + + /* Get the number of entries in the name directory */ + NumberOfNameEntries = NameDirectory->NumberOfNamedEntries + + NameDirectory->NumberOfIdEntries; + + /* Loop all entries in the name directory */ + for (j = 0; j < NumberOfNameEntries; ++j, ++NameEntry) + { + /* Check if comparison of names is requested */ + if (Level > RESOURCE_NAME_LEVEL) + { + /* Compare the name with the requested name */ + Result = LdrpCompareResourceNames_U(ResourceData, + NameEntry, + ResourceInfo->Name); + + /* Not equal, continue with next entry */ + if (Result != 0) continue; + } + + /* The entry must point to the language directory */ + if (!NameEntry->DataIsDirectory) + { + return STATUS_INVALID_IMAGE_FORMAT; + } + + /* Get a pointer to the language subdirectory and it's first entry */ + LangDirectory = (PIMAGE_RESOURCE_DIRECTORY)(ResourceData + + NameEntry->OffsetToDirectory); + LangEntry = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(LangDirectory + 1); + + /* Get the number of entries in the language directory */ + NumberOfLangEntries = LangDirectory->NumberOfNamedEntries + + LangDirectory->NumberOfIdEntries; + + /* Loop all entries in the language directory */ + for (k = 0; k < NumberOfLangEntries; ++k, ++LangEntry) + { + /* Check if comparison of languages is requested */ + if (Level > RESOURCE_LANGUAGE_LEVEL) + { + /* Compare the language with the requested language */ + Result = LdrpCompareResourceNames_U(ResourceData, + LangEntry, + ResourceInfo->Language); + + /* Not equal, continue with next entry */ + if (Result != 0) continue; + } + + /* This entry must point to data */ + if (LangEntry->DataIsDirectory) + { + return STATUS_INVALID_IMAGE_FORMAT; + } + + /* Get a pointer to the data entry */ + DataEntry = (PIMAGE_RESOURCE_DATA_ENTRY)(ResourceData + + LangEntry->OffsetToData); + + /* Check if there is still space to store the data */ + if (Count < MaxResourceCount) + { + /* There is, fill the entry */ + Resources[Count].Type = + NAME_FROM_RESOURCE_ENTRY(ResourceData, TypeEntry); + Resources[Count].Name = + NAME_FROM_RESOURCE_ENTRY(ResourceData, NameEntry); + Resources[Count].Language = + NAME_FROM_RESOURCE_ENTRY(ResourceData, LangEntry); + Resources[Count].Data = (PUCHAR)ImageBase + DataEntry->OffsetToData; + Resources[Count].Reserved = 0; + Resources[Count].Size = DataEntry->Size; + } + else + { + /* There is not enough space, save error status */ + Status = STATUS_INFO_LENGTH_MISMATCH; + } + + /* Count this resource */ + ++Count; + } + } + } + + /* Return the number of matching resources */ + *ResourceCount = Count; + return Status; +}

1 0

[tkreuzer] 57551: [[NTDLL_APITEST} Fix a bug
by tkreuzer＠svn.reactos.org 13 Oct '12

13 Oct '12

Author: tkreuzer Date: Sat Oct 13 13:09:15 2012 New Revision: 57551 URL: http://svn.reactos.org/svn/reactos?rev=57551&view=rev Log: [[NTDLL_APITEST} Fix a bug Modified: trunk/rostests/apitests/ntdll/LdrEnumResources.c Modified: trunk/rostests/apitests/ntdll/LdrEnumResources.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/LdrEnumRes… ============================================================================== --- trunk/rostests/apitests/ntdll/LdrEnumResources.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/LdrEnumResources.c [iso-8859-1] Sat Oct 13 13:09:15 2012 @@ -182,7 +182,7 @@ ResourceDirectory->VirtualAddress = FIELD_OFFSET(TEST_IMAGE, Resources); ResourceDirectory->Size = sizeof(TEST_RESOURCES); - strcpy(TestImage->SectionHeaders[0].Name, ".rsrc"); + strcpy((char*)TestImage->SectionHeaders[0].Name, ".rsrc"); TestImage->SectionHeaders[0].Misc.VirtualSize = sizeof(TEST_IMAGE); TestImage->SectionHeaders[0].VirtualAddress = FIELD_OFFSET(TEST_IMAGE, Resources); TestImage->SectionHeaders[0].SizeOfRawData = sizeof(TEST_IMAGE);

1 0

[tkreuzer] 57550: [NTDLL_APITEST} Add tests for LdrEnumResources
by tkreuzer＠svn.reactos.org 13 Oct '12

13 Oct '12

Author: tkreuzer Date: Sat Oct 13 13:07:17 2012 New Revision: 57550 URL: http://svn.reactos.org/svn/reactos?rev=57550&view=rev Log: [NTDLL_APITEST} Add tests for LdrEnumResources Added: trunk/rostests/apitests/ntdll/LdrEnumResources.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sat Oct 13 13:07:17 2012 @@ -1,5 +1,6 @@ list(APPEND SOURCE + LdrEnumResources.c NtAllocateVirtualMemory.c NtFreeVirtualMemory.c NtQuerySystemEnvironmentValue.c Added: trunk/rostests/apitests/ntdll/LdrEnumResources.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/LdrEnumRes… ============================================================================== --- trunk/rostests/apitests/ntdll/LdrEnumResources.c (added) +++ trunk/rostests/apitests/ntdll/LdrEnumResources.c [iso-8859-1] Sat Oct 13 13:07:17 2012 @@ -1,0 +1,371 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for LdrEnumResources + * PROGRAMMER: Timo Kreuzer + */ + +#define WIN32_NO_STATUS +#define UNICODE +#include <stdio.h> +#include <wine/test.h> +#include <pseh/pseh2.h> +#include <ndk/ldrfuncs.h> + +typedef struct _TEST_RESOURCES +{ + IMAGE_RESOURCE_DIRECTORY TypeDirectory; + IMAGE_RESOURCE_DIRECTORY_ENTRY TypeEntries[2]; + IMAGE_RESOURCE_DIRECTORY Name1Directory; + IMAGE_RESOURCE_DIRECTORY_ENTRY Name1Entries[2]; + IMAGE_RESOURCE_DIRECTORY Name2Directory; + IMAGE_RESOURCE_DIRECTORY_ENTRY Name2Entries[2]; + IMAGE_RESOURCE_DIRECTORY Lang1Directory; + IMAGE_RESOURCE_DIRECTORY_ENTRY Lang1Entries[2]; + IMAGE_RESOURCE_DIRECTORY Lang2Directory; + IMAGE_RESOURCE_DIRECTORY_ENTRY Lang2Entries[2]; + IMAGE_RESOURCE_DIRECTORY Lang3Directory; + IMAGE_RESOURCE_DIRECTORY_ENTRY Lang3Entries[2]; + IMAGE_RESOURCE_DIRECTORY Lang4Directory; + IMAGE_RESOURCE_DIRECTORY_ENTRY Lang4Entries[2]; + IMAGE_RESOURCE_DATA_ENTRY DataEntries[8]; + IMAGE_RESOURCE_DIRECTORY_STRING Name1String; + ULONG StringIndex; + WCHAR StringBuffer[20]; +} TEST_RESOURCES, *PTEST_RESOURCES; + +typedef struct _TEST_IMAGE +{ + IMAGE_DOS_HEADER DosHeader; + IMAGE_NT_HEADERS NtHeaders; + IMAGE_SECTION_HEADER SectionHeaders[1]; + TEST_RESOURCES Resources; +} TEST_IMAGE, *PTEST_IMAGE; + +static +VOID +InitializeResourceDirectory( + PIMAGE_RESOURCE_DIRECTORY ResourceDirectory, + USHORT NumberOfNamedEntries, + USHORT NumberOfIdEntries) +{ + ResourceDirectory->Characteristics = 0; + ResourceDirectory->TimeDateStamp = 0; + ResourceDirectory->MajorVersion = 0; + ResourceDirectory->MinorVersion = 0; + ResourceDirectory->NumberOfNamedEntries = NumberOfNamedEntries; + ResourceDirectory->NumberOfIdEntries = NumberOfIdEntries; +} + +static +VOID +InitializeNamedEntry( + PTEST_RESOURCES Resource, + PIMAGE_RESOURCE_DIRECTORY_ENTRY DirEntry, + PWCHAR Name, + PVOID Data) +{ + DirEntry->Name = Resource->StringIndex * 2 + FIELD_OFFSET(TEST_RESOURCES, StringBuffer); + DirEntry->NameIsString = 1; + DirEntry->OffsetToData = (PUCHAR)Data - (PUCHAR)Resource; + if (DirEntry < Resource->Lang1Entries) + DirEntry->DataIsDirectory = 1; + Resource->StringBuffer[Resource->StringIndex] = wcslen(Name); + wcscpy(&Resource->StringBuffer[Resource->StringIndex + 1], Name); + Resource->StringIndex += Resource->StringBuffer[Resource->StringIndex] * 2 + 1; +} + +static +VOID +InitializeIdEntry( + PTEST_RESOURCES Resource, + PIMAGE_RESOURCE_DIRECTORY_ENTRY DirEntry, + USHORT Id, + PVOID Data) +{ + DirEntry->Name = Id; + DirEntry->NameIsString = 0; + DirEntry->OffsetToData = (PUCHAR)Data - (PUCHAR)Resource; + if (DirEntry < Resource->Lang1Entries) + DirEntry->DataIsDirectory = 1; +} + +static +VOID +InitializeDataEntry( + PVOID ImageBase, + PIMAGE_RESOURCE_DATA_ENTRY DataEntry, + PVOID Data, + ULONG Size) +{ + + DataEntry->OffsetToData = (PUCHAR)Data - (PUCHAR)ImageBase; + DataEntry->Size = Size; + DataEntry->CodePage = 0; + DataEntry->Reserved = 0; +} + +static +VOID +InitializeTestResource( + PVOID ImageBase, + PTEST_RESOURCES Resource) +{ + + memset(Resource->StringBuffer, 0, sizeof(Resource->StringBuffer)); + Resource->StringIndex = 0; + + InitializeResourceDirectory(&Resource->TypeDirectory, 0, 2); + InitializeIdEntry(Resource, &Resource->TypeEntries[0], 1, &Resource->Name1Directory); + InitializeIdEntry(Resource, &Resource->TypeEntries[1], 2, &Resource->Name2Directory); + + InitializeResourceDirectory(&Resource->Name1Directory, 1, 1); + InitializeNamedEntry(Resource, &Resource->Name1Entries[0], L"TEST", &Resource->Lang1Directory); + InitializeIdEntry(Resource, &Resource->Name1Entries[1], 7, &Resource->Lang2Directory); + + InitializeResourceDirectory(&Resource->Name2Directory, 2, 0); + InitializeNamedEntry(Resource, &Resource->Name2Entries[0], L"LOL", &Resource->Lang3Directory); + InitializeNamedEntry(Resource, &Resource->Name2Entries[1], L"xD", &Resource->Lang4Directory); + + InitializeResourceDirectory(&Resource->Lang1Directory, 0, 2); + InitializeIdEntry(Resource, &Resource->Lang1Entries[0], 0x409, &Resource->DataEntries[0]); + InitializeIdEntry(Resource, &Resource->Lang1Entries[1], 0x407, &Resource->DataEntries[1]); + + InitializeResourceDirectory(&Resource->Lang2Directory, 0, 2); + InitializeIdEntry(Resource, &Resource->Lang2Entries[0], 0x408, &Resource->DataEntries[2]); + InitializeIdEntry(Resource, &Resource->Lang2Entries[1], 0x406, &Resource->DataEntries[3]); + + InitializeResourceDirectory(&Resource->Lang3Directory, 0, 2); + InitializeIdEntry(Resource, &Resource->Lang3Entries[0], 0x405, &Resource->DataEntries[4]); + InitializeIdEntry(Resource, &Resource->Lang3Entries[1], 0x403, &Resource->DataEntries[5]); + + InitializeResourceDirectory(&Resource->Lang4Directory, 0, 2); + InitializeIdEntry(Resource, &Resource->Lang4Entries[0], 0x402, &Resource->DataEntries[6]); + InitializeIdEntry(Resource, &Resource->Lang4Entries[1], 0x404, &Resource->DataEntries[7]); + + InitializeDataEntry(ImageBase, &Resource->DataEntries[0], Resource->StringBuffer + 0, 2); + InitializeDataEntry(ImageBase, &Resource->DataEntries[1], Resource->StringBuffer + 2, 4); + InitializeDataEntry(ImageBase, &Resource->DataEntries[2], Resource->StringBuffer + 4, 6); + InitializeDataEntry(ImageBase, &Resource->DataEntries[3], Resource->StringBuffer + 6, 8); + InitializeDataEntry(ImageBase, &Resource->DataEntries[4], Resource->StringBuffer + 8, 10); + InitializeDataEntry(ImageBase, &Resource->DataEntries[5], Resource->StringBuffer + 10, 12); + InitializeDataEntry(ImageBase, &Resource->DataEntries[6], Resource->StringBuffer + 12, 14); + InitializeDataEntry(ImageBase, &Resource->DataEntries[7], Resource->StringBuffer + 14, 16); + +} + +VOID +InitializeTestImage( + PTEST_IMAGE TestImage) +{ + PIMAGE_DATA_DIRECTORY ResourceDirectory; + + TestImage->DosHeader.e_magic = IMAGE_DOS_SIGNATURE; + TestImage->DosHeader.e_lfanew = sizeof(IMAGE_DOS_HEADER); + + TestImage->NtHeaders.Signature = IMAGE_NT_SIGNATURE; + + TestImage->NtHeaders.FileHeader.Machine = IMAGE_FILE_MACHINE_I386; + TestImage->NtHeaders.FileHeader.NumberOfSections = 1; + TestImage->NtHeaders.FileHeader.TimeDateStamp = 0; + TestImage->NtHeaders.FileHeader.PointerToSymbolTable = 0; + TestImage->NtHeaders.FileHeader.NumberOfSymbols = 0; + TestImage->NtHeaders.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); + TestImage->NtHeaders.FileHeader.Characteristics = 0; + + TestImage->NtHeaders.OptionalHeader.Magic = IMAGE_NT_OPTIONAL_HDR32_MAGIC; + TestImage->NtHeaders.OptionalHeader.ImageBase = (DWORD)TestImage; + TestImage->NtHeaders.OptionalHeader.SizeOfImage = sizeof(TEST_IMAGE); + TestImage->NtHeaders.OptionalHeader.SizeOfHeaders = sizeof(IMAGE_DOS_HEADER) + sizeof(IMAGE_NT_HEADERS); + + ResourceDirectory = &TestImage->NtHeaders.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE]; + ResourceDirectory->VirtualAddress = FIELD_OFFSET(TEST_IMAGE, Resources); + ResourceDirectory->Size = sizeof(TEST_RESOURCES); + + strcpy(TestImage->SectionHeaders[0].Name, ".rsrc"); + TestImage->SectionHeaders[0].Misc.VirtualSize = sizeof(TEST_IMAGE); + TestImage->SectionHeaders[0].VirtualAddress = FIELD_OFFSET(TEST_IMAGE, Resources); + TestImage->SectionHeaders[0].SizeOfRawData = sizeof(TEST_IMAGE); + TestImage->SectionHeaders[0].PointerToRawData = FIELD_OFFSET(TEST_IMAGE, Resources); + TestImage->SectionHeaders[0].PointerToRelocations = 0; + TestImage->SectionHeaders[0].PointerToLinenumbers = 0; + TestImage->SectionHeaders[0].NumberOfRelocations = 0; + TestImage->SectionHeaders[0].NumberOfLinenumbers = 0; + TestImage->SectionHeaders[0].Characteristics = 0; + + InitializeTestResource(TestImage, &TestImage->Resources); +} + +#define ok_nwstr(str1, str2, count) \ + ok(wcsncmp((PWCHAR)str1, (PWCHAR)str2, count) == 0, \ + "string is wrong, expected: '%S', got '%S'\n", str1, str2); \ + +#define ok_enumres(_Res, _Type, _Name, _Lang, _Data, _Size) \ + ok_dec((_Res)->Type, _Type); \ + if ((ULONG_PTR)(_Name) > 0xFFFF) \ + { \ + ok_dec(*(WORD*)((_Res)->Name), wcslen((PWCHAR)(_Name))); \ + ok_nwstr((PWCHAR)((_Res)->Name + 2), (PWCHAR)_Name, *(WORD*)((_Res)->Name)); \ + } \ + else \ + { \ + ok_dec((_Res)->Name, (ULONG_PTR)_Name); \ + } \ + ok_hex((_Res)->Language, _Lang); \ + ok_ptr((PVOID)(_Res)->Data, _Data); \ + ok_dec((_Res)->Size, _Size); \ + ok_dec((_Res)->Reserved, 0); + +static +void +Test_Data(PTEST_IMAGE TestImage) +{ + LDR_RESOURCE_INFO ResourceInfo; + LDR_ENUM_RESOURCE_INFO EnumRes[8]; + ULONG ResourceCount; + NTSTATUS Status; + + InitializeTestImage(TestImage); + + memset(EnumRes, 0xcc, sizeof(EnumRes)); + + ResourceInfo.Type = 1; + ResourceInfo.Name = 1; + ResourceInfo.Language = 0x408; + ResourceCount = 8; + Status = LdrEnumResources(TestImage, &ResourceInfo, 0, &ResourceCount, EnumRes); + ok_hex(Status, STATUS_SUCCESS); + ok_dec(ResourceCount, 8); + + ok_ptr((PVOID)EnumRes[0].Data, TestImage->Resources.StringBuffer); + ok_dec(EnumRes[0].Size, 2); + + ok_enumres(&EnumRes[0], 1, L"TEST", 0x409, TestImage->Resources.StringBuffer, 2) + ok_enumres(&EnumRes[1], 1, L"TEST", 0x407, TestImage->Resources.StringBuffer + 2, 4) + ok_enumres(&EnumRes[2], 1, 7, 0x408, TestImage->Resources.StringBuffer + 4, 6) + ok_enumres(&EnumRes[3], 1, 7, 0x406, TestImage->Resources.StringBuffer + 6, 8) + ok_enumres(&EnumRes[4], 2, L"LOL", 0x405, TestImage->Resources.StringBuffer + 8, 10) + ok_enumres(&EnumRes[5], 2, L"LOL", 0x403, TestImage->Resources.StringBuffer + 10, 12) + ok_enumres(&EnumRes[6], 2, L"xD", 0x402, TestImage->Resources.StringBuffer + 12, 14) + ok_enumres(&EnumRes[7], 2, L"xD", 0x404, TestImage->Resources.StringBuffer + 14, 16) + + Status = LdrEnumResources(TestImage, &ResourceInfo, 1, &ResourceCount, EnumRes); + ok_hex(Status, STATUS_SUCCESS); + ok_dec(ResourceCount, 4); + +} + + +static +void +Test_Parameters(PTEST_IMAGE TestImage) +{ + LDR_RESOURCE_INFO ResourceInfo; + LDR_ENUM_RESOURCE_INFO Resources[8]; + ULONG ResourceCount; + NTSTATUS Status; + + InitializeTestImage(TestImage); + + ResourceInfo.Type = 6; + ResourceInfo.Name = 1; + ResourceInfo.Language = 0x409; + + ResourceCount = 8; + Status = LdrEnumResources(TestImage, &ResourceInfo, 3, &ResourceCount, Resources); + ok_hex(Status, STATUS_SUCCESS); + ok_dec(ResourceCount, 0); + + ResourceInfo.Type = 1; + ResourceInfo.Name = 7; + ResourceInfo.Language = 0x406; + ResourceCount = 8; + Status = LdrEnumResources(TestImage, &ResourceInfo, 0, &ResourceCount, Resources); + ok_hex(Status, STATUS_SUCCESS); + ok_dec(ResourceCount, 8); + + ResourceCount = 8; + Status = LdrEnumResources(TestImage, &ResourceInfo, 1, &ResourceCount, Resources); + ok_hex(Status, STATUS_SUCCESS); + ok_dec(ResourceCount, 4); + + ResourceCount = 8; + Status = LdrEnumResources(TestImage, &ResourceInfo, 2, &ResourceCount, Resources); + ok_hex(Status, STATUS_SUCCESS); + ok_dec(ResourceCount, 2); + + ResourceCount = 8; + Status = LdrEnumResources(TestImage, &ResourceInfo, 3, &ResourceCount, Resources); + ok_hex(Status, STATUS_SUCCESS); + ok_dec(ResourceCount, 1); + + ResourceCount = 8; + Status = LdrEnumResources(TestImage, &ResourceInfo, 99, &ResourceCount, Resources); + ok_hex(Status, STATUS_SUCCESS); + ok_dec(ResourceCount, 1); + + ResourceCount = 0; + Status = LdrEnumResources(TestImage, &ResourceInfo, 0, &ResourceCount, Resources); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + ok_dec(ResourceCount, 8); + + ResourceCount = 7; + Status = LdrEnumResources(TestImage, &ResourceInfo, 0, &ResourceCount, Resources); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + ok_dec(ResourceCount, 8); + + ResourceCount = 8; + Status = LdrEnumResources(NULL, &ResourceInfo, 1, &ResourceCount, Resources); + ok_hex(Status, STATUS_RESOURCE_DATA_NOT_FOUND); + ok_dec(ResourceCount, 0); + + ResourceCount = 8; + Status = LdrEnumResources(TestImage, &ResourceInfo, 1, &ResourceCount, NULL); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + ok_dec(ResourceCount, 4); + + ResourceCount = 8; + _SEH2_TRY + { + Status = LdrEnumResources(NULL, NULL, 0, NULL, NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = 0xDeadC0de; + } + _SEH2_END + ok_hex(Status, 0xDeadC0de); + + ResourceCount = 42; + _SEH2_TRY + { + Status = LdrEnumResources(TestImage, &ResourceInfo, 1, NULL, Resources); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = 0xDeadC0de; + } + _SEH2_END + ok_hex(Status, 0xDeadC0de); + ok_dec(ResourceCount, 42); + + ResourceCount = 8; + Status = LdrEnumResources(TestImage + 2, &ResourceInfo, 1, &ResourceCount, NULL); + ok_hex(Status, STATUS_RESOURCE_DATA_NOT_FOUND); + ok_dec(ResourceCount, 0); + + TestImage->Resources.TypeEntries[0].DataIsDirectory = 0; + Status = LdrEnumResources(TestImage, &ResourceInfo, 1, &ResourceCount, NULL); + ok_hex(Status, STATUS_INVALID_IMAGE_FORMAT); + ok_dec(ResourceCount, 0); + +} + +START_TEST(LdrEnumResources) +{ + TEST_IMAGE TestImage; + + Test_Parameters(&TestImage); + Test_Data(&TestImage); + +} Propchange: trunk/rostests/apitests/ntdll/LdrEnumResources.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sat Oct 13 13:07:17 2012 @@ -5,6 +5,7 @@ #define STANDALONE #include "wine/test.h" +extern void func_LdrEnumResources(void); extern void func_NtAllocateVirtualMemory(void); extern void func_NtFreeVirtualMemory(void); extern void func_NtQuerySystemEnvironmentValue(void); @@ -24,6 +25,7 @@ const struct test winetest_testlist[] = { + { "LdrEnumResources", func_LdrEnumResources }, { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, { "NtQuerySystemEnvironmentValue", func_NtQuerySystemEnvironmentValue },

1 0

[tkreuzer] 57549: [RTL] Fix RtlEnumResources prototype
by tkreuzer＠svn.reactos.org 13 Oct '12

13 Oct '12

Author: tkreuzer Date: Sat Oct 13 13:02:16 2012 New Revision: 57549 URL: http://svn.reactos.org/svn/reactos?rev=57549&view=rev Log: [RTL] Fix RtlEnumResources prototype Modified: trunk/reactos/lib/rtl/res.c Modified: trunk/reactos/lib/rtl/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/res.c?rev=57549&r1… ============================================================================== --- trunk/reactos/lib/rtl/res.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/res.c [iso-8859-1] Sat Oct 13 13:02:16 2012 @@ -286,12 +286,14 @@ /* * @unimplemented */ -NTSTATUS NTAPI -LdrEnumResources(IN PVOID BaseAddress, - IN PLDR_RESOURCE_INFO ResourceInfo, - IN ULONG Level, - IN OUT PULONG ResourceCount, - OUT PVOID Resources OPTIONAL) +NTSTATUS +NTAPI +LdrEnumResources( + IN PVOID BaseAddress, + IN PLDR_RESOURCE_INFO ResourceInfo, + IN ULONG Level, + IN OUT PULONG ResourceCount, + OUT PLDR_ENUM_RESOURCE_INFO Resources OPTIONAL) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED;

1 0

[tkreuzer] 57548: [NDK] Add LdrEnumResources() and _LDR_ENUM_RESOURCE_INFO, fix _LDR_RESOURCE_INFO
by tkreuzer＠svn.reactos.org 13 Oct '12

13 Oct '12

Author: tkreuzer Date: Sat Oct 13 12:53:09 2012 New Revision: 57548 URL: http://svn.reactos.org/svn/reactos?rev=57548&view=rev Log: [NDK] Add LdrEnumResources() and _LDR_ENUM_RESOURCE_INFO, fix _LDR_RESOURCE_INFO Modified: trunk/reactos/include/ndk/ldrfuncs.h trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/include/ndk/ldrfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] Sat Oct 13 12:53:09 2012 @@ -48,6 +48,17 @@ IN ULONG Level, OUT PIMAGE_RESOURCE_DATA_ENTRY *ResourceDataEntry ); + +NTSTATUS +NTAPI +LdrEnumResources( + IN PVOID BaseAddress, + IN PLDR_RESOURCE_INFO ResourceInfo, + IN ULONG Level, + IN OUT ULONG *ResourceCount, + OUT PLDR_ENUM_RESOURCE_INFO Resources OPTIONAL +); + NTSTATUS NTAPI Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Sat Oct 13 12:53:09 2012 @@ -170,8 +170,18 @@ { ULONG_PTR Type; ULONG_PTR Name; - ULONG Language; + ULONG_PTR Language; } LDR_RESOURCE_INFO, *PLDR_RESOURCE_INFO; + +typedef struct _LDR_ENUM_RESOURCE_INFO +{ + ULONG_PTR Type; + ULONG_PTR Name; + ULONG_PTR Language; + PVOID Data; + SIZE_T Size; + ULONG_PTR Reserved; +} LDR_ENUM_RESOURCE_INFO, *PLDR_ENUM_RESOURCE_INFO; // // DLL Notifications

1 0

[mnordell] 57547: [WINETEST:MSVCRT][LOCALE] Locale inherently broken. Not even worth to test currently (source: Amine). Disabled by ROSTESTS_91_IS_FIXED
by mnordell＠svn.reactos.org 12 Oct '12

12 Oct '12

Author: mnordell Date: Fri Oct 12 23:04:58 2012 New Revision: 57547 URL: http://svn.reactos.org/svn/reactos?rev=57547&view=rev Log: [WINETEST:MSVCRT][LOCALE] Locale inherently broken. Not even worth to test currently (source: Amine). Disabled by ROSTESTS_91_IS_FIXED Modified: trunk/rostests/winetests/msvcrt/locale.c Modified: trunk/rostests/winetests/msvcrt/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/locale.c… ============================================================================== --- trunk/rostests/winetests/msvcrt/locale.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/locale.c [iso-8859-1] Fri Oct 12 23:04:58 2012 @@ -618,6 +618,7 @@ ok(!ret, "ret == TRUE\n"); } +#if ROSTESTS_91_IS_FIXED static void test__Gettnames(void) { struct { @@ -737,6 +738,7 @@ setlocale(LC_ALL, "C"); } +#endif /* ROSTESTS_91_IS_FIXED */ START_TEST(locale) { @@ -744,5 +746,7 @@ test_crtGetStringTypeW(); test_setlocale(); +#if ROSTESTS_91_IS_FIXED test__Gettnames(); +#endif }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs