Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 57807: [HIDCLASS] - Don't assert on initialization error
by janderwald＠svn.reactos.org 06 Dec '12

06 Dec '12

Author: janderwald Date: Thu Dec 6 02:09:54 2012 New Revision: 57807 URL: http://svn.reactos.org/svn/reactos?rev=57807&view=rev Log: [HIDCLASS] - Don't assert on initialization error Modified: trunk/reactos/drivers/hid/hidclass/fdo.c Modified: trunk/reactos/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/fdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] Thu Dec 6 02:09:54 2012 @@ -357,7 +357,13 @@ // IoSkipCurrentIrpStackLocation(Irp); Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); - ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + { + DPRINT1("[HIDCLASS] Failed to start lower device with %x\n", Status); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } // // lets get the descriptors

1 0

[hbelusca] 57806: [CSRSRV] - Comment on the size of some members of the CSR_WAIT_BLOCK structure. - Initialize the WaitBlock member of CSR_THREAD to a valid value when creating a wait block, and NU...
by hbelusca＠svn.reactos.org 05 Dec '12

05 Dec '12

Author: hbelusca Date: Wed Dec 5 23:21:41 2012 New Revision: 57806 URL: http://svn.reactos.org/svn/reactos?rev=57806&view=rev Log: [CSRSRV] - Comment on the size of some members of the CSR_WAIT_BLOCK structure. - Initialize the WaitBlock member of CSR_THREAD to a valid value when creating a wait block, and NULLify it when we release a wait block. - ALWAYS USE offsets in CSR_CAPTURE_BUFFER structure, instead of real pointers !! It is needed when their base address change (eg. during a CSR wait, their base address, corresponding to the address of an CSR API message, change) (found when testing CSR waits with the console). Modified: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h branches/ros-csrss/subsystems/win32/csrsrv/api.c branches/ros-csrss/subsystems/win32/csrsrv/wait.c Modified: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Wed Dec 5 23:21:41 2012 @@ -156,13 +156,13 @@ typedef struct _CSR_WAIT_BLOCK { - ULONG Size; + ULONG Size; // Size of the wait block (variable-sized) LIST_ENTRY WaitList; LIST_ENTRY UserWaitList; PVOID WaitContext; PCSR_THREAD WaitThread; CSR_WAIT_FUNCTION WaitFunction; - CSR_API_MESSAGE WaitApiMessage; + CSR_API_MESSAGE WaitApiMessage; // Variable-sized CSR API message } CSR_WAIT_BLOCK, *PCSR_WAIT_BLOCK; Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] Wed Dec 5 23:21:41 2012 @@ -504,7 +504,7 @@ if ((ServerDll) && (ServerDll->HardErrorCallback)) { /* Call it */ - ServerDll->HardErrorCallback(NULL /* CsrThread == NULL */, HardErrorMsg); + ServerDll->HardErrorCallback(NULL /* == CsrThread */, HardErrorMsg); /* If it's handled, get out of here */ if (HardErrorMsg->Response != ResponseNotHandled) break; @@ -524,6 +524,7 @@ else { ReplyMsg = &ReceiveMsg; + ReplyPort = CsrApiPort; } } else if (MessageType == LPC_REQUEST) @@ -1178,20 +1179,21 @@ BufferDistance = (ULONG_PTR)RemoteCaptureBuffer - (ULONG_PTR)LocalCaptureBuffer; /* - * Convert all the pointer offsets into real pointers, and make - * them point to the remote data buffer instead of the local one. + * All the pointer offsets correspond to pointers which point + * to the remote data buffer instead of the local one. */ for (i = 0 ; i < RemoteCaptureBuffer->PointerCount ; ++i) { if (RemoteCaptureBuffer->PointerOffsetsArray[i] != 0) { + /* Temporarily transform the offset into a pointer */ RemoteCaptureBuffer->PointerOffsetsArray[i] += (ULONG_PTR)ApiMessage; - /* Validate the bounds of the current pointer */ + /* Validate the bounds of the current pointed pointer */ if ((*(PULONG_PTR)RemoteCaptureBuffer->PointerOffsetsArray[i] >= CsrThread->Process->ClientViewBase) && (*(PULONG_PTR)RemoteCaptureBuffer->PointerOffsetsArray[i] < CsrThread->Process->ClientViewBounds)) { - /* Modify the pointer to take into account its new position */ + /* Modify the pointed pointer to take into account its new position */ *(PULONG_PTR)RemoteCaptureBuffer->PointerOffsetsArray[i] += BufferDistance; } else @@ -1201,19 +1203,22 @@ DbgBreakPoint(); ApiMessage->Status = STATUS_INVALID_PARAMETER; } + + /* Transform back into an offset */ + RemoteCaptureBuffer->PointerOffsetsArray[i] -= (ULONG_PTR)ApiMessage; } } /* Check if we got success */ if (ApiMessage->Status != STATUS_SUCCESS) { - /* Failure. Free the buffer and return*/ + /* Failure. Free the buffer and return */ RtlFreeHeap(CsrHeap, 0, RemoteCaptureBuffer); return FALSE; } else { - /* Success, save the previous buffer */ + /* Success, save the previous buffer and use the remote capture buffer */ RemoteCaptureBuffer->PreviousCaptureBuffer = LocalCaptureBuffer; ApiMessage->CsrCaptureData = RemoteCaptureBuffer; } @@ -1246,29 +1251,38 @@ SIZE_T BufferDistance; ULONG i; - /* Get the capture buffers */ + /* Get the remote capture buffer */ RemoteCaptureBuffer = ApiMessage->CsrCaptureData; - LocalCaptureBuffer = RemoteCaptureBuffer->PreviousCaptureBuffer; /* Do not continue if there is no captured buffer */ if (!RemoteCaptureBuffer) return; - /* Free the previous one */ + /* If there is one, get the corresponding local capture buffer */ + LocalCaptureBuffer = RemoteCaptureBuffer->PreviousCaptureBuffer; + + /* Free the previous one and use again the local capture buffer */ RemoteCaptureBuffer->PreviousCaptureBuffer = NULL; + ApiMessage->CsrCaptureData = LocalCaptureBuffer; /* Calculate the difference between our buffer and the client's */ BufferDistance = (ULONG_PTR)RemoteCaptureBuffer - (ULONG_PTR)LocalCaptureBuffer; /* - * Convert back all the pointers into pointer offsets, and make them - * point to the local data buffer instead of the remote one (revert + * All the pointer offsets correspond to pointers which point + * to the local data buffer instead of the remote one (revert * the logic of CsrCaptureArguments). */ for (i = 0 ; i < RemoteCaptureBuffer->PointerCount ; ++i) { if (RemoteCaptureBuffer->PointerOffsetsArray[i] != 0) { + /* Temporarily transform the offset into a pointer */ + RemoteCaptureBuffer->PointerOffsetsArray[i] += (ULONG_PTR)ApiMessage; + + /* Modify the pointed pointer to take into account its new position */ *(PULONG_PTR)RemoteCaptureBuffer->PointerOffsetsArray[i] -= BufferDistance; + + /* Transform back into an offset */ RemoteCaptureBuffer->PointerOffsetsArray[i] -= (ULONG_PTR)ApiMessage; } } @@ -1313,7 +1327,7 @@ IN ULONG ElementSize) { PCSR_CAPTURE_BUFFER CaptureBuffer = ApiMessage->CsrCaptureData; - // SIZE_T BufferDistance = (ULONG_PTR)Buffer - (ULONG_PTR)ApiMessage; + SIZE_T BufferDistance = (ULONG_PTR)Buffer - (ULONG_PTR)ApiMessage; ULONG i; /* @@ -1353,10 +1367,10 @@ for (i = 0 ; i < CaptureBuffer->PointerCount ; ++i) { /* - * If the pointer offset is in fact equal to the - * real address of the buffer then it's OK. + * The pointer offset must be equal to the delta between + * the addresses of the buffer and of the API message. */ - if (CaptureBuffer->PointerOffsetsArray[i] == (ULONG_PTR)Buffer /* BufferDistance + (ULONG_PTR)ApiMessage */) + if (CaptureBuffer->PointerOffsetsArray[i] == BufferDistance) { return TRUE; } Modified: branches/ros-csrss/subsystems/win32/csrsrv/wait.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/wait.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/wait.c [iso-8859-1] Wed Dec 5 23:21:41 2012 @@ -73,6 +73,7 @@ /* Initialize it */ WaitBlock->Size = Size; WaitBlock->WaitThread = CsrWaitThread; + CsrWaitThread->WaitBlock = WaitBlock; WaitBlock->WaitContext = WaitContext; WaitBlock->WaitFunction = WaitFunction; WaitBlock->UserWaitList.Flink = NULL; @@ -242,6 +243,7 @@ if (CsrWaitThread->Flags & CsrThreadTerminated) { /* Fail the wait */ + CsrWaitThread->WaitBlock = NULL; RtlFreeHeap(CsrHeap, 0, WaitBlock); CsrReleaseWaitLock(); return FALSE;

1 0

[janderwald] 57805: [HIDUSB] - Add check if interface descriptor was parsed - Correct error message - Set device idle after a configuration has been selected - CORE-6574
by janderwald＠svn.reactos.org 05 Dec '12

05 Dec '12

Author: janderwald Date: Wed Dec 5 08:26:39 2012 New Revision: 57805 URL: http://svn.reactos.org/svn/reactos?rev=57805&view=rev Log: [HIDUSB] - Add check if interface descriptor was parsed - Correct error message - Set device idle after a configuration has been selected - CORE-6574 Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Wed Dec 5 08:26:39 2012 @@ -1168,6 +1168,13 @@ USB_DEVICE_CLASS_HUMAN_INTERFACE, -1, -1); + if (!InterfaceDescriptor) + { + // + // bogus configuration descriptor + // + return STATUS_INVALID_PARAMETER; + } // // sanity check @@ -1472,7 +1479,7 @@ // // no interface class // - DPRINT1("[HIDUSB] HID Class found\n"); + DPRINT1("[HIDUSB] HID Interface descriptor not found\n"); return STATUS_UNSUCCESSFUL; } @@ -1484,11 +1491,6 @@ ASSERT(InterfaceDescriptor->bLength == sizeof(USB_INTERFACE_DESCRIPTOR)); // - // now set the device idle - // - Hid_SetIdle(DeviceObject); - - // // move to next descriptor // HidDescriptor = (PHID_DESCRIPTOR)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); @@ -1512,10 +1514,15 @@ // // done // - DPRINT("[HIDUSB] SelectConfiguration %x\n", Status); + DPRINT1("[HIDUSB] SelectConfiguration %x\n", Status); if (NT_SUCCESS(Status)) { + // + // now set the device idle + // + Hid_SetIdle(DeviceObject); + // // get protocol // @@ -1523,18 +1530,18 @@ return Status; } } - - // - // FIXME parse hid descriptor - // - UNIMPLEMENTED - ASSERT(FALSE); - - // - // get protocol - // - Hid_GetProtocol(DeviceObject); - return STATUS_SUCCESS; + else + { + // + // FIXME parse hid descriptor + // select configuration + // set idle + // and get protocol + // + UNIMPLEMENTED + ASSERT(FALSE); + } + return Status; }

1 0

[hbelusca] 57804: [CSRSRV] Add the CSRSRV status file from trunk/reactos/subsystems/csr/csrsrv/ and update it.
by hbelusca＠svn.reactos.org 04 Dec '12

04 Dec '12

Author: hbelusca Date: Tue Dec 4 23:10:07 2012 New Revision: 57804 URL: http://svn.reactos.org/svn/reactos?rev=57804&view=rev Log: [CSRSRV] Add the CSRSRV status file from trunk/reactos/subsystems/csr/csrsrv/ and update it. Added: branches/ros-csrss/subsystems/win32/csrsrv/status.h (with props) Added: branches/ros-csrss/subsystems/win32/csrsrv/status.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/status.h (added) +++ branches/ros-csrss/subsystems/win32/csrsrv/status.h [iso-8859-1] Tue Dec 4 23:10:07 2012 @@ -1,0 +1,111 @@ +/* + * CSRSRV Status + */ + +/* Organization + * + * api.c - Handles the LPC Reply/Request Threads which wait on Sb and Csr APIs. + * Also in charge of creating those threads and setting up the ports. + * Finally, it provides external APIs for validating the API buffers + * and doing server-to-server API calls. + * + * init.c - Handles initialization of CSRSRV, including command-line parsing, + * loading the Server DLLs, creating the Session Directories, setting + * up the DosDevices Object Directory, and initializing each component. + * + * procsup.c - Handles all internal functions dealing with the CSR Process Object, + * including de/allocation, de/referencing, un/locking, prority, and + * lookups. Also handles all external APIs which touch the CSR Process Object. + * + * server.c - Handles all internal functions related to loading and managing Server + * DLLs, as well as the routines handling the Shared Static Memory Section. + * Holds the API Dispatch/Valid/Name Tables and the public CSR_SERVER API + * interface. Also home of the SEH handler. + * + * session.c - Handles all internal functions dealing with the CSR Session Object, + * including de/allocation, de/referencing, and un/locking. Holds the SB API + * Dispatch/Name Tables and the public CsrSv API Interface for commmunication + * with the Session Manager. + * + * thredsup.c - Handles all internal functions dealing with the CSR Thread Object, + * including de/allocation, de/referencing, un/locking, impersonation, and + * lookups. Also handles all external APIs which touch the CSR Thread Object. + * + * wait.c - Handles all internal functions dealing with the CSR Wait Object, + * including de/allocation, de/referencing and un/locking. Also implements + * the external Wait API for creating, removing and/or notifying waits. + */ + +/* Exported APIs Location Status + *------------------------------------------------------------------- + * CsrAddStaticServerThread 753E679E 1 - server.c - IMPLEMENTED + * CsrCallServerFromServer 753E4FD9 2 - api.c - IMPLEMENTED + * CsrConnectToUser 753E4E48 3 - api.c - IMPLEMENTED + * CsrCreateProcess 753E6FD3 4 - procsup.c - IMPLEMENTED + * CsrCreateRemoteThread 753E73BD 5 - thredsup.c - IMPLEMENTED + * CsrCreateThread 753E72DA 6 - thredsup.c - IMPLEMENTED + * CsrCreateWait 753E770E 7 - wait.c - IMPLEMENTED + * CsrDebugProcess 753E7682 8 - procsup.c - IMPLEMENTED + * CsrDebugProcessStop 753E768A 9 - procsup.c - IMPLEMENTED + * CsrDereferenceProcess 753E6281 10 - procsup.c - IMPLEMENTED + * CsrDereferenceThread 753E6964 11 - thredsup.c - IMPLEMENTED + * CsrDereferenceWait 753E7886 12 - wait.c - IMPLEMENTED + * CsrDestroyProcess 753E7225 13 - procsup.c - IMPLEMENTED + * CsrDestroyThread 753E7478 14 - thredsup.c - IMPLEMENTED + * CsrExecServerThread 753E6841 15 - thredsup.c - IMPLEMENTED + * CsrGetProcessLuid 753E632F 16 - procsup.c - IMPLEMENTED + * CsrImpersonateClient 753E60F8 17 - thredsup.c - IMPLEMENTED + * CsrLockProcessByClientId 753E668F 18 - procsup.c - IMPLEMENTED + * CsrLockThreadByClientId 753E6719 19 - thredsup.c - IMPLEMENTED + * CsrMoveSatisfiedWait 753E7909 20 - wait.c - IMPLEMENTED + * CsrNotifyWait 753E782F 21 - wait.c - IMPLEMENTED + * CsrPopulateDosDevices 753E37A5 22 - init.c - IMPLEMENTED + * CsrQueryApiPort 753E4E42 23 - api.c - IMPLEMENTED + * CsrReferenceThread 753E61E5 24 - thredsup.c - IMPLEMENTED + * CsrRevertToSelf 753E615A 25 - thredsup.c - IMPLEMENTED + * CsrServerInitialization 753E3D75 26 - server.c - IMPLEMENTED + * CsrSetBackgroundPriority 753E5E87 27 - procsup.c - IMPLEMENTED + * CsrSetCallingSpooler 753E6425 28 - server.c - IMPLEMENTED + * CsrSetForegroundPriority 753E5E67 29 - procsup.c - IMPLEMENTED + * CsrShutdownProcesses 753E7547 30 - procsup.c - IMPLEMENTED + * CsrUnhandledExceptionFilter 753E3FE3 31 - server.c - IMPLEMENTED + * CsrUnlockProcess 753E66FD 32 - procsup.c - IMPLEMENTED + * CsrUnlockThread 753E7503 33 - thredsup.c - IMPLEMENTED + * CsrValidateMessageBuffer 753E528D 34 - api.c - IMPLEMENTED + * CsrValidateMessageString 753E5323 35 - api.c - IMPLEMENTED + */ + +/* Public CSR API Interface Status (server.c) + * CsrSrvClientConnect - IMPLEMENTED + * CsrSrvUnusedFunction - IMPLEMENTED + * CsrSrvIdentifyAlertableThread - IMPLEMENTED + * CsrSrvSetPriorityClass - IMPLEMENTED + */ + +/* Public SB API Interface Status (session.c) + * CsrSbCreateSession - IMPLEMENTED + * CsrSbForeignSessionComplete - IMPLEMENTED + * CsrSbTerminateSession - UNIMPLEMENTED + * CsrSbCreateProcess - UNIMPLEMENTED + */ + +/* What's missing: + * + * - SMSS needs to be partly re-written to match some things done here. + * Among other things, SmConnectToSm, SmCompleteSession and the other + * Sm* Exported APIs have to be properly implemented, as well as the + * callback calling and SM LPC APIs. [DONE!] + * + * - NTDLL needs to get the Csr* routines properly implemented. [DONE!] + * + * - KERNEL32, USER32 need to register with their servers properly. + * Additionally, user32 needs to have ClientThreadStartup implemented + * properly and do the syscall NtUserInitialize (I think) which also + * needs to be implemented in win32k.sys. All this should be less then + * 100 lines of code. [KERNEL32 50% DONE, USER32 NOT DONE] + * + * - The skeleton code for winsrv and basesrv which connects with CSR/CSRSRV + * needs to be written. [DONE!] + * + * - The kernel's LPC implementation needs to be made compatible. [DONE!] + */ Propchange: branches/ros-csrss/subsystems/win32/csrsrv/status.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 57803: [NDIS] - Set ParameterValue when NdisReadConfiguration is successful - Fixes crash when Belkin F5D8053 N Wireless USB Adapter is initializing - Introduced in rev 5338 (31/07/2003)
by janderwald＠svn.reactos.org 04 Dec '12

04 Dec '12

Author: janderwald Date: Tue Dec 4 23:09:48 2012 New Revision: 57803 URL: http://svn.reactos.org/svn/reactos?rev=57803&view=rev Log: [NDIS] - Set ParameterValue when NdisReadConfiguration is successful - Fixes crash when Belkin F5D8053 N Wireless USB Adapter is initializing - Introduced in rev 5338 (31/07/2003) Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Tue Dec 4 23:09:48 2012 @@ -432,7 +432,7 @@ PMINIPORT_CONFIGURATION_CONTEXT ConfigurationContext = (PMINIPORT_CONFIGURATION_CONTEXT)ConfigurationHandle; PVOID Buffer; - *ParameterValue = NULL; + //*ParameterValue = NULL; *Status = NDIS_STATUS_FAILURE; NDIS_DbgPrint(MAX_TRACE,("requested read of %wZ\n", Keyword));

1 0

[hbelusca] 57802: Well, "Types".
by hbelusca＠svn.reactos.org 04 Dec '12

04 Dec '12

Author: hbelusca Date: Tue Dec 4 23:04:54 2012 New Revision: 57802 URL: http://svn.reactos.org/svn/reactos?rev=57802&view=rev Log: Well, "Types". Modified: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h Modified: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Tue Dec 4 23:04:54 2012 @@ -22,7 +22,7 @@ #include "csrmsg.h" -/* STRUCTURES *****************************************************************/ +/* TYPES **********************************************************************/ // Used in ntdll/csr/connect.c #define CSR_CSRSS_SECTION_SIZE 65536

1 0

[hbelusca] 57801: [CSRSRV] - Correct a misspelling 'CsrThreadAltertable' -> 'CsrThreadAlertable'. - Introduce CSR_REPLY_CODEs instead of using hardcoded values, and use them with CSR_API_ROUTINE-ty...
by hbelusca＠svn.reactos.org 04 Dec '12

04 Dec '12

Author: hbelusca Date: Tue Dec 4 23:01:54 2012 New Revision: 57801 URL: http://svn.reactos.org/svn/reactos?rev=57801&view=rev Log: [CSRSRV] - Correct a misspelling 'CsrThreadAltertable' -> 'CsrThreadAlertable'. - Introduce CSR_REPLY_CODEs instead of using hardcoded values, and use them with CSR_API_ROUTINE-type functions. They correspond to which decision CSRSRV should take after a server function is called: answer to the client or not, and perform according tasks. [BASESRV] Use CSR_REPLY_CODEs. Modified: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h branches/ros-csrss/subsystems/win/basesrv/server.c branches/ros-csrss/subsystems/win32/csrsrv/api.c branches/ros-csrss/subsystems/win32/csrsrv/server.c Modified: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Tue Dec 4 23:01:54 2012 @@ -21,7 +21,8 @@ #include "csrmsg.h" -/* TYPES **********************************************************************/ + +/* STRUCTURES *****************************************************************/ // Used in ntdll/csr/connect.c #define CSR_CSRSS_SECTION_SIZE 65536 @@ -102,7 +103,7 @@ typedef enum _CSR_THREAD_FLAGS { - CsrThreadAltertable = 0x1, + CsrThreadAlertable = 0x1, CsrThreadInTermination = 0x2, CsrThreadTerminated = 0x4, CsrThreadIsServerThread = 0x10 @@ -127,6 +128,16 @@ CsrDebugProcessChildren = 2 } CSR_PROCESS_DEBUG_FLAGS, *PCSR_PROCESS_DEBUG_FLAGS; +typedef enum _CSR_REPLY_CODE +{ + CsrReplyImmediately = 0, + CsrReplyPending = 1, + CsrReplyDeadClient = 2, + CsrReplyAlreadyDone = 3 +} CSR_REPLY_CODE, *PCSR_REPLY_CODE; + + +/* FUNCTION TYPES AND STRUCTURES **********************************************/ /* * Wait block @@ -162,13 +173,12 @@ NTSTATUS (NTAPI *PCSR_API_ROUTINE)( IN OUT PCSR_API_MESSAGE ApiMessage, - OUT PULONG Reply + IN OUT PCSR_REPLY_CODE ReplyCode OPTIONAL ); #define CSR_API(n) \ NTSTATUS NTAPI n(IN OUT PCSR_API_MESSAGE ApiMessage, \ - OUT PULONG Reply) - // IN OUT PCSR_REPLY_STATUS ReplyStatus) + IN OUT PCSR_REPLY_CODE ReplyCode OPTIONAL) typedef NTSTATUS @@ -228,8 +238,6 @@ } CSR_SERVER_DLL, *PCSR_SERVER_DLL; -/* FUNCTION TYPES *************************************************************/ - typedef NTSTATUS (NTAPI *PCSR_SERVER_DLL_INIT_CALLBACK)(IN PCSR_SERVER_DLL LoadedServerDll); Modified: branches/ros-csrss/subsystems/win/basesrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… ============================================================================== --- branches/ros-csrss/subsystems/win/basesrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win/basesrv/server.c [iso-8859-1] Tue Dec 4 23:01:54 2012 @@ -94,6 +94,10 @@ if (Status == STATUS_THREAD_IS_TERMINATING) { DPRINT1("Thread already dead\n"); + + /* Set the special reply value so we don't reply this message back */ + *ReplyCode = CsrReplyDeadClient; + return Status; } @@ -189,7 +193,7 @@ ASSERT(CsrThread != NULL); /* Set the special reply value so we don't reply this message back */ - *Reply = 2; + *ReplyCode = CsrReplyDeadClient; /* Remove the CSR_THREADs and CSR_PROCESS */ return CsrDestroyProcess(&CsrThread->ClientId, Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] Tue Dec 4 23:01:54 2012 @@ -52,8 +52,7 @@ ULONG ServerId; PCSR_SERVER_DLL ServerDll; ULONG ApiId; - ULONG Reply; - NTSTATUS Status; + CSR_REPLY_CODE ReplyCode = CsrReplyImmediately; /* Get the Server ID */ ServerId = CSR_API_NUMBER_TO_SERVER_ID(ReceiveMsg->ApiNumber); @@ -97,12 +96,8 @@ /* Validation complete, start SEH */ _SEH2_TRY { - /* Call the API and get the result */ - /// CsrApiCallHandler(ReplyMsg, /*ProcessData*/ &ReplyCode); /// - Status = (ServerDll->DispatchTable[ApiId])(ReceiveMsg, &Reply); - - /* Return the result, no matter what it is */ - ReplyMsg->Status = Status; + /* Call the API, get the reply code and return the result */ + ReplyMsg->Status = ServerDll->DispatchTable[ApiId](ReceiveMsg, &ReplyCode); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -350,6 +345,7 @@ LARGE_INTEGER TimeOut; PCSR_THREAD CurrentThread, CsrThread; NTSTATUS Status; + CSR_REPLY_CODE ReplyCode; PCSR_API_MESSAGE ReplyMsg; CSR_API_MESSAGE ReceiveMsg; PCSR_PROCESS CsrProcess; @@ -358,7 +354,7 @@ PCSR_SERVER_DLL ServerDll; PCLIENT_DIED_MSG ClientDiedMsg; PDBGKM_MSG DebugMessage; - ULONG ServerId, ApiId, Reply, MessageType, i; + ULONG ServerId, ApiId, MessageType, i; HANDLE ReplyPort; /* Setup LPC loop port and message */ @@ -453,8 +449,9 @@ { /* Handle the Connection Request */ CsrApiHandleConnectionRequest(&ReceiveMsg); + + ReplyMsg = NULL; ReplyPort = CsrApiPort; - ReplyMsg = NULL; continue; } @@ -550,8 +547,9 @@ DPRINT1("CSRSS: %lx is invalid ServerDllIndex (%08x)\n", ServerId, ServerDll); DbgBreakPoint(); + + ReplyMsg = NULL; ReplyPort = CsrApiPort; - ReplyMsg = NULL; continue; } @@ -565,6 +563,7 @@ DPRINT1("CSRSS: %lx is invalid ApiTableIndex for %Z\n", CSR_API_NUMBER_TO_API_ID(ReceiveMsg.ApiNumber), &ServerDll->Name); + ReplyPort = CsrApiPort; ReplyMsg = NULL; continue; @@ -589,10 +588,10 @@ /* Make sure we have enough threads */ CsrpCheckRequestThreads(); - /* Call the API and get the result */ + /* Call the API and get the reply code */ ReplyMsg = NULL; ReplyPort = CsrApiPort; - ServerDll->DispatchTable[ApiId](&ReceiveMsg, &Reply); + ServerDll->DispatchTable[ApiId](&ReceiveMsg, &ReplyCode); /* Increase the static thread count */ _InterlockedIncrement(&CsrpStaticThreadCount); @@ -644,6 +643,7 @@ /* Release the lock and keep looping */ CsrReleaseProcessLock(); + ReplyMsg = NULL; ReplyPort = CsrApiPort; continue; @@ -807,36 +807,40 @@ Teb->CsrClientThread = CsrThread; - /* Call the API and get the result */ - Reply = 0; - ServerDll->DispatchTable[ApiId](&ReceiveMsg, &Reply); + /* Call the API, get the reply code and return the result */ + ReplyCode = CsrReplyImmediately; + ReplyMsg->Status = ServerDll->DispatchTable[ApiId](&ReceiveMsg, &ReplyCode); /* Increase the static thread count */ _InterlockedIncrement(&CsrpStaticThreadCount); Teb->CsrClientThread = CurrentThread; - if (Reply == 3) - { + if (ReplyCode == CsrReplyAlreadyDone) + { + if (ReceiveMsg.CsrCaptureData) + { + CsrReleaseCapturedArguments(&ReceiveMsg); + } ReplyMsg = NULL; - if (ReceiveMsg.CsrCaptureData) - { - CsrReleaseCapturedArguments(&ReceiveMsg); - } + ReplyPort = CsrApiPort; CsrDereferenceThread(CsrThread); + } + else if (ReplyCode == CsrReplyDeadClient) + { + /* Reply to the death message */ + NtReplyPort(ReplyPort, &ReplyMsg->Header); + + /* Reply back to the API port now */ + ReplyMsg = NULL; ReplyPort = CsrApiPort; - } - else if (Reply == 2) - { - NtReplyPort(ReplyPort, &ReplyMsg->Header); + + CsrDereferenceThread(CsrThread); + } + else if (ReplyCode == CsrReplyPending) + { + ReplyMsg = NULL; ReplyPort = CsrApiPort; - ReplyMsg = NULL; - CsrDereferenceThread(CsrThread); - } - else if (Reply == 1) - { - ReplyPort = CsrApiPort; - ReplyMsg = NULL; } else { Modified: branches/ros-csrss/subsystems/win32/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] Tue Dec 4 23:01:54 2012 @@ -253,7 +253,7 @@ * @param ApiMessage * Pointer to the CSR API Message for this request. * - * @param Reply + * @param ReplyCode * Optional reply to this request. * * @return STATUS_SUCCESS in case of success, STATUS_INVALID_PARAMETER @@ -262,10 +262,7 @@ * @remarks None. * *--*/ -NTSTATUS -NTAPI -CsrSrvClientConnect(IN OUT PCSR_API_MESSAGE ApiMessage, - IN OUT PULONG Reply OPTIONAL) +CSR_API(CsrSrvClientConnect) { NTSTATUS Status; PCSR_CLIENT_CONNECT ClientConnect = &ApiMessage->Data.CsrClientConnect; @@ -273,7 +270,7 @@ PCSR_PROCESS CurrentProcess = CsrGetClientThread()->Process; /* Set default reply */ - *Reply = 0; + *ReplyCode = CsrReplyImmediately; /* Validate the ServerID */ if (ClientConnect->ServerId >= CSR_SERVER_DLL_MAX) @@ -498,7 +495,7 @@ * @param ApiMessage * Pointer to the CSR API Message for this request. * - * @param Reply + * @param ReplyCode * Pointer to an optional reply to this request. * * @return STATUS_SUCCESS. @@ -506,15 +503,12 @@ * @remarks None. * *--*/ -NTSTATUS -NTAPI -CsrSrvIdentifyAlertableThread(IN OUT PCSR_API_MESSAGE ApiMessage, - IN OUT PULONG Reply) +CSR_API(CsrSrvIdentifyAlertableThread) { PCSR_THREAD CsrThread = CsrGetClientThread(); /* Set the alertable flag */ - CsrThread->Flags |= CsrThreadAltertable; + CsrThread->Flags |= CsrThreadAlertable; /* Return success */ return STATUS_SUCCESS; @@ -529,7 +523,7 @@ * @param ApiMessage * Pointer to the CSR API Message for this request. * - * @param Reply + * @param ReplyCode * Pointer to an optional reply to this request. * * @return STATUS_SUCCESS. @@ -537,10 +531,7 @@ * @remarks None. * *--*/ -NTSTATUS -NTAPI -CsrSrvSetPriorityClass(IN OUT PCSR_API_MESSAGE ApiMessage, - IN OUT PULONG Reply) +CSR_API(CsrSrvSetPriorityClass) { /* Deprecated */ return STATUS_SUCCESS; @@ -557,7 +548,7 @@ * @param ApiMessage * Pointer to the CSR API Message for this request. * - * @param Reply + * @param ReplyCode * Pointer to an optional reply to this request. * * @return STATUS_INVALID_PARAMETER. @@ -566,10 +557,7 @@ * return success. * *--*/ -NTSTATUS -NTAPI -CsrSrvUnusedFunction(IN OUT PCSR_API_MESSAGE ApiMessage, - IN OUT PULONG Reply) +CSR_API(CsrSrvUnusedFunction) { /* Deprecated */ return STATUS_INVALID_PARAMETER;

1 0

[janderwald] 57800: [USBD] - Add missing exports
by janderwald＠svn.reactos.org 04 Dec '12

04 Dec '12

Author: janderwald Date: Tue Dec 4 19:48:51 2012 New Revision: 57800 URL: http://svn.reactos.org/svn/reactos?rev=57800&view=rev Log: [USBD] - Add missing exports Modified: trunk/reactos/drivers/usb/usbd/usbd.spec Modified: trunk/reactos/drivers/usb/usbd/usbd.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/usbd.spec… ============================================================================== --- trunk/reactos/drivers/usb/usbd/usbd.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbd/usbd.spec [iso-8859-1] Tue Dec 4 19:48:51 2012 @@ -2,10 +2,12 @@ @ stdcall USBD_Debug_RetHeap(ptr long long) @ stdcall USBD_Debug_LogEntry(ptr ptr ptr ptr) @ stdcall USBD_CalculateUsbBandwidth(long long long) +@ stdcall _USBD_CreateConfigurationRequestEx@8(ptr ptr) USBD_CreateConfigurationRequestEx @ stdcall USBD_CreateConfigurationRequestEx(ptr ptr) @ stdcall USBD_CreateConfigurationRequest(ptr ptr) @ stdcall USBD_GetInterfaceLength(ptr ptr) @ stdcall USBD_ParseConfigurationDescriptor(ptr long long) +@ stdcall _USBD_ParseConfigurationDescriptorEx@28(ptr ptr long long long long long) USBD_ParseConfigurationDescriptorEx @ stdcall USBD_ParseConfigurationDescriptorEx(ptr ptr long long long long long) @ stdcall USBD_ParseDescriptors(ptr long ptr long) @ stdcall USBD_GetPdoRegistryParameter(ptr ptr long ptr long)

1 0

[janderwald] 57799: [USBHUB] - Handle devices which provide indicate a serial number but not provide one - Fixes device installation initialization for F5D8053 N Wireless USB Adapter
by janderwald＠svn.reactos.org 04 Dec '12

04 Dec '12

Author: janderwald Date: Tue Dec 4 19:20:12 2012 New Revision: 57799 URL: http://svn.reactos.org/svn/reactos?rev=57799&view=rev Log: [USBHUB] - Handle devices which provide indicate a serial number but not provide one - Fixes device installation initialization for F5D8053 N Wireless USB Adapter Modified: trunk/reactos/drivers/usb/usbhub/fdo.c Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Tue Dec 4 19:20:12 2012 @@ -1022,54 +1022,49 @@ 0, (PVOID*)&SerialBuffer, &UsbChildExtension->usInstanceId.Length); - if (!NT_SUCCESS(Status)) - { - DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); + if (NT_SUCCESS(Status)) + { + // construct instance id buffer + Index = swprintf(Buffer, L"%04d&%s", HubDeviceExtension->InstanceCount, SerialBuffer) + 1; + UsbChildExtension->usInstanceId.Buffer = (LPWSTR)ExAllocatePool(NonPagedPool, Index * sizeof(WCHAR)); + if (UsbChildExtension->usInstanceId.Buffer == NULL) + { + DPRINT1("Error: failed to allocate %lu bytes\n", Index * sizeof(WCHAR)); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // copy instance id + // + RtlCopyMemory(UsbChildExtension->usInstanceId.Buffer, Buffer, Index * sizeof(WCHAR)); + UsbChildExtension->usInstanceId.Length = UsbChildExtension->usInstanceId.MaximumLength = Index * sizeof(WCHAR); + ExFreePool(SerialBuffer); + + DPRINT("Usb InstanceId %wZ InstanceCount %x\n", &UsbChildExtension->usInstanceId, HubDeviceExtension->InstanceCount); return Status; } - - // construct instance id buffer - Index = swprintf(Buffer, L"%04d&%s", HubDeviceExtension->InstanceCount, SerialBuffer) + 1; - UsbChildExtension->usInstanceId.Buffer = (LPWSTR)ExAllocatePool(NonPagedPool, Index * sizeof(WCHAR)); - if (UsbChildExtension->usInstanceId.Buffer == NULL) - { - DPRINT1("Error: failed to allocate %lu bytes\n", Index * sizeof(WCHAR)); - Status = STATUS_INSUFFICIENT_RESOURCES; - return Status; - } - - // - // copy instance id - // - RtlCopyMemory(UsbChildExtension->usInstanceId.Buffer, Buffer, Index * sizeof(WCHAR)); - UsbChildExtension->usInstanceId.Length = UsbChildExtension->usInstanceId.MaximumLength = Index * sizeof(WCHAR); - ExFreePool(SerialBuffer); - - DPRINT("Usb InstanceId %wZ InstanceCount %x\n", &UsbChildExtension->usInstanceId, HubDeviceExtension->InstanceCount); - } - else - { - // - // the device did not provide a serial number, lets create a pseudo instance id - // - Index = swprintf(Buffer, L"%04d&%04d", HubDeviceExtension->InstanceCount, UsbChildExtension->PortNumber) + 1; - UsbChildExtension->usInstanceId.Buffer = (LPWSTR)ExAllocatePool(NonPagedPool, Index * sizeof(WCHAR)); - if (UsbChildExtension->usInstanceId.Buffer == NULL) - { - DPRINT1("Error: failed to allocate %lu bytes\n", Index * sizeof(WCHAR)); - Status = STATUS_INSUFFICIENT_RESOURCES; - return Status; - } - - // - // copy instance id - // - RtlCopyMemory(UsbChildExtension->usInstanceId.Buffer, Buffer, Index * sizeof(WCHAR)); - UsbChildExtension->usInstanceId.Length = UsbChildExtension->usInstanceId.MaximumLength = Index * sizeof(WCHAR); - - DPRINT("usDeviceId %wZ\n", &UsbChildExtension->usInstanceId); - } - + } + + // + // the device did not provide a serial number, or failed to retrieve the serial number + // lets create a pseudo instance id + // + Index = swprintf(Buffer, L"%04d&%04d", HubDeviceExtension->InstanceCount, UsbChildExtension->PortNumber) + 1; + UsbChildExtension->usInstanceId.Buffer = (LPWSTR)ExAllocatePool(NonPagedPool, Index * sizeof(WCHAR)); + if (UsbChildExtension->usInstanceId.Buffer == NULL) + { + DPRINT1("Error: failed to allocate %lu bytes\n", Index * sizeof(WCHAR)); + Status = STATUS_INSUFFICIENT_RESOURCES; + return Status; + } + + // + // copy instance id + // + RtlCopyMemory(UsbChildExtension->usInstanceId.Buffer, Buffer, Index * sizeof(WCHAR)); + UsbChildExtension->usInstanceId.Length = UsbChildExtension->usInstanceId.MaximumLength = Index * sizeof(WCHAR); + + DPRINT("usDeviceId %wZ\n", &UsbChildExtension->usInstanceId); return STATUS_SUCCESS; }

1 0

[jgardou] 57798: [NTOSKRNL/fsrtl] - Remove the right element from the list when uninitializing a file lock - Do not modify the content of the table range while looping on its elements - Fix rebuild...
by jgardou＠svn.reactos.org 04 Dec '12

04 Dec '12

Author: jgardou Date: Tue Dec 4 12:09:59 2012 New Revision: 57798 URL: http://svn.reactos.org/svn/reactos?rev=57798&view=rev Log: [NTOSKRNL/fsrtl] - Remove the right element from the list when uninitializing a file lock - Do not modify the content of the table range while looping on its elements - Fix rebuilding the table when unlocking a shared range Thanks go to Pierre for the hint for where to look at CORE-6615 #comment fixed by r57798 #resolve CIRE-6535 #comment fixed by r55798 #resolve Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/filelock.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] Tue Dec 4 12:09:59 2012 @@ -514,33 +514,30 @@ } return FALSE; } - else - { - DPRINT("Overlapping shared lock %wZ %08x%08x %08x%08x\n", - &FileObject->FileName, - Conflict->Exclusive.FileLock.StartingByte.HighPart, - Conflict->Exclusive.FileLock.StartingByte.LowPart, - Conflict->Exclusive.FileLock.EndingByte.HighPart, - Conflict->Exclusive.FileLock.EndingByte.LowPart); - Conflict = FsRtlpRebuildSharedLockRange(FileLock, - LockInfo, - &ToInsert); - if (!Conflict) - { - IoStatus->Status = STATUS_NO_MEMORY; - if (Irp) - { - FsRtlCompleteLockIrpReal - (FileLock->CompleteLockIrpRoutine, - Context, - Irp, - IoStatus->Status, - &Status, - FileObject); - } - break; - } - } + } + } + + DPRINT("Overlapping shared lock %wZ %08x%08x %08x%08x\n", + &FileObject->FileName, + Conflict->Exclusive.FileLock.StartingByte.HighPart, + Conflict->Exclusive.FileLock.StartingByte.LowPart, + Conflict->Exclusive.FileLock.EndingByte.HighPart, + Conflict->Exclusive.FileLock.EndingByte.LowPart); + Conflict = FsRtlpRebuildSharedLockRange(FileLock, + LockInfo, + &ToInsert); + if (!Conflict) + { + IoStatus->Status = STATUS_NO_MEMORY; + if (Irp) + { + FsRtlCompleteLockIrpReal + (FileLock->CompleteLockIrpRoutine, + Context, + Irp, + IoStatus->Status, + &Status, + FileObject); } } @@ -567,8 +564,8 @@ return FALSE; } DPRINT("Adding shared lock %wZ\n", &FileObject->FileName); - NewSharedRange->Start = ToInsert.Exclusive.FileLock.StartingByte; - NewSharedRange->End = ToInsert.Exclusive.FileLock.EndingByte; + NewSharedRange->Start = *FileOffset; + NewSharedRange->End.QuadPart = FileOffset->QuadPart + Length->QuadPart; NewSharedRange->Key = Key; NewSharedRange->ProcessId = ToInsert.Exclusive.FileLock.ProcessId; InsertTailList(&LockInfo->SharedLocks, &NewSharedRange->Entry); @@ -639,10 +636,10 @@ return FALSE; } DPRINT("Adding shared lock %wZ\n", &FileObject->FileName); - NewSharedRange->Start = ToInsert.Exclusive.FileLock.StartingByte; - NewSharedRange->End = ToInsert.Exclusive.FileLock.EndingByte; + NewSharedRange->Start = *FileOffset; + NewSharedRange->End.QuadPart = FileOffset->QuadPart + Length->QuadPart; NewSharedRange->Key = Key; - NewSharedRange->ProcessId = ToInsert.Exclusive.FileLock.ProcessId; + NewSharedRange->ProcessId = Process->UniqueProcessId; InsertTailList(&LockInfo->SharedLocks, &NewSharedRange->Entry); } @@ -918,12 +915,7 @@ } if (FoundShared) { - PLIST_ENTRY SharedRangeEntry; - PLOCK_SHARED_RANGE WatchSharedRange; - COMBINED_LOCK_ELEMENT RemadeElement; - Find.Exclusive.FileLock.StartingByte = SharedRange->Start; - Find.Exclusive.FileLock.EndingByte = SharedRange->End; - SharedEntry = SharedRange->Entry.Flink; + /* Remove the found range from the shared range lists */ RemoveEntryList(&SharedRange->Entry); ExFreePoolWithTag(SharedRange, 'FSRA'); /* We need to rebuild the list of shared ranges. */ @@ -933,19 +925,25 @@ Entry->Exclusive.FileLock.StartingByte.LowPart, Entry->Exclusive.FileLock.EndingByte.HighPart, Entry->Exclusive.FileLock.EndingByte.LowPart); - /* Copy */ - RemadeElement = *Entry; - RtlDeleteElementGenericTable(&InternalInfo->RangeTable, Entry); + + /* Remember what was in there and remove it from the table */ + Find = *Entry; + RtlDeleteElementGenericTable(&InternalInfo->RangeTable, &Find); /* Put shared locks back in place */ - for (SharedRangeEntry = InternalInfo->SharedLocks.Flink; - SharedRangeEntry != &InternalInfo->SharedLocks; - SharedRangeEntry = SharedRangeEntry->Flink) + for (SharedEntry = InternalInfo->SharedLocks.Flink; + SharedEntry != &InternalInfo->SharedLocks; + SharedEntry = SharedEntry->Flink) { COMBINED_LOCK_ELEMENT LockElement; - WatchSharedRange = CONTAINING_RECORD(SharedRangeEntry, LOCK_SHARED_RANGE, Entry); - LockElement.Exclusive.FileLock.StartingByte = WatchSharedRange->Start; - LockElement.Exclusive.FileLock.EndingByte = WatchSharedRange->End; - if (LockCompare(&InternalInfo->RangeTable, &RemadeElement, &LockElement) != GenericEqual) + SharedRange = CONTAINING_RECORD(SharedEntry, LOCK_SHARED_RANGE, Entry); + LockElement.Exclusive.FileLock.FileObject = FileObject; + LockElement.Exclusive.FileLock.StartingByte = SharedRange->Start; + LockElement.Exclusive.FileLock.EndingByte = SharedRange->End; + LockElement.Exclusive.FileLock.ProcessId = SharedRange->ProcessId; + LockElement.Exclusive.FileLock.Key = SharedRange->Key; + LockElement.Exclusive.FileLock.ExclusiveLock = FALSE; + + if (LockCompare(&InternalInfo->RangeTable, &Find, &LockElement) != GenericEqual) { DPRINT("Skipping range %08x%08x:%08x%08x\n", LockElement.Exclusive.FileLock.StartingByte.HighPart, @@ -959,10 +957,7 @@ LockElement.Exclusive.FileLock.StartingByte.LowPart, LockElement.Exclusive.FileLock.EndingByte.HighPart, LockElement.Exclusive.FileLock.EndingByte.LowPart); - RtlZeroMemory(&RemadeElement, sizeof(RemadeElement)); - RemadeElement.Exclusive.FileLock.StartingByte = WatchSharedRange->Start; - RemadeElement.Exclusive.FileLock.EndingByte = WatchSharedRange->End; - FsRtlpRebuildSharedLockRange(FileLock, InternalInfo, &RemadeElement); + FsRtlpRebuildSharedLockRange(FileLock, InternalInfo, &LockElement); } } else @@ -970,7 +965,8 @@ return STATUS_RANGE_NOT_LOCKED; } } - + +#ifndef NDEBUG DPRINT("Lock still has:\n"); for (SharedEntry = InternalInfo->SharedLocks.Flink; SharedEntry != &InternalInfo->SharedLocks; @@ -985,6 +981,7 @@ SharedRange->End.LowPart, SharedRange->Key); } +#endif // this is definitely the thing we want InternalInfo->Generation++; @@ -1286,7 +1283,7 @@ { SharedRange = CONTAINING_RECORD(SharedEntry, LOCK_SHARED_RANGE, Entry); SharedEntry = SharedEntry->Flink; - RemoveEntryList(SharedEntry); + RemoveEntryList(&SharedRange->Entry); ExFreePoolWithTag(SharedRange, 'FSRA'); } while ((Entry = RtlGetElementGenericTable(&InternalInfo->RangeTable, 0)) != NULL)

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