Ros-diffs November 2009

ros-diffs@reactos.org

23 participants
444 discussions

[cgutman] 44286: - Initialize SocketError to 0 to prevent a bogus error from GCC

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Nov 25 19:08:43 2009 New Revision: 44286 URL: http://svn.reactos.org/svn/reactos?rev=44286&view=rev Log: - Initialize SocketError to 0 to prevent a bogus error from GCC Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Wed Nov 25 19:08:43 2009 @@ -47,7 +47,7 @@ NTSTATUS Status; PIRP Irp; PMDL Mdl; - ULONG SocketError; + ULONG SocketError = 0; TI_DbgPrint(MID_TRACE,("Handling signalled state on %x (%x)\n", Connection, Connection->SocketContext));

14 years, 10 months

[fireball] 44285: [ntoskrnl/cm] - CmpSelectLeaf fixes: looking into an incorrect cell, returning wrong cell, slightly simplify code and add more comments for clarity. Thanks to Michael Martin for spotting these bugs.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Nov 24 23:56:43 2009 New Revision: 44285 URL: http://svn.reactos.org/svn/reactos?rev=44285&view=rev Log: [ntoskrnl/cm] - CmpSelectLeaf fixes: looking into an incorrect cell, returning wrong cell, slightly simplify code and add more comments for clarity. Thanks to Michael Martin for spotting these bugs. Modified: trunk/reactos/ntoskrnl/config/cmindex.c Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmindex.c [iso-8859-1] Tue Nov 24 23:56:43 2009 @@ -1344,6 +1344,8 @@ *RootCell = &IndexKey->List[SubKeyIndex]; return LeafCell; } + + /* It didn't fit, so proceed to splitting */ } else { @@ -1380,22 +1382,22 @@ /* Check if it's above */ if (Result >= 0) { - /* Get the first cell in the index */ - LeafCell = IndexKey->List[0]; + /* Get the cell in the index */ + LeafCell = IndexKey->List[SubKeyIndex]; LeafKey = (PCM_KEY_INDEX)HvGetCell(Hive, LeafCell); /* Return an error in case of problems */ if (!LeafKey) return HCELL_NIL; - /* Check if it fits into this leaf and break */ + /* Check if it fits into this leaf */ if (LeafKey->Count < CmpMaxIndexPerHblock) { /* Fill in the result and return the cell */ - *RootCell = &IndexKey->List[SubKeyIndex + 1]; + *RootCell = &IndexKey->List[SubKeyIndex]; return LeafCell; } - /* No, it doesn't fit, check the other leaf */ + /* No, it doesn't fit, check the next adjacent leaf */ if (SubKeyIndex < (IndexKey->Count - 1)) { /* Yes, there is space */ @@ -1413,6 +1415,8 @@ return LeafCell; } } + + /* It didn't fit, so proceed to splitting */ } else { @@ -1429,11 +1433,8 @@ /* Check if it fits and break */ if (LeafKey->Count < CmpMaxIndexPerHblock) { - /* Decrement the subkey index */ - SubKeyIndex--; - /* Fill in the result and return the cell */ - *RootCell = &IndexKey->List[SubKeyIndex]; + *RootCell = &IndexKey->List[SubKeyIndex - 1]; return LeafCell; } }

14 years, 10 months

[fireball] 44284: [WIDL] - Update widl to Wine-1.1.33.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Nov 24 23:42:40 2009 New Revision: 44284 URL: http://svn.reactos.org/svn/reactos?rev=44284&view=rev Log: [WIDL] - Update widl to Wine-1.1.33. Modified: trunk/reactos/tools/widl/expr.c trunk/reactos/tools/widl/expr.h trunk/reactos/tools/widl/hash.c trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/parser.yy.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typegen.h trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/typelib.h trunk/reactos/tools/widl/typetree.c trunk/reactos/tools/widl/typetree.h trunk/reactos/tools/widl/widltypes.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/widl/expr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/expr.c?rev=4428… Modified: trunk/reactos/tools/widl/expr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/expr.h?rev=4428… Modified: trunk/reactos/tools/widl/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/hash.c?rev=4428… Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=44… Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=44… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=44… Modified: trunk/reactos/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.yy.c?rev… Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=4… Modified: trunk/reactos/tools/widl/typegen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.h?rev=4… Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=4… Modified: trunk/reactos/tools/widl/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.h?rev=4… Modified: trunk/reactos/tools/widl/typetree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typetree.c?rev=… Modified: trunk/reactos/tools/widl/typetree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typetree.h?rev=… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev…

14 years, 10 months

[fireball] 44283: [IDL] - Make our IDLs files to not specify a [range] tag for string datatypes, and 0, 256 range for an unsigned type. Fixes compiling with newer WIDL and (probably) MIDL.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Nov 24 23:39:25 2009 New Revision: 44283 URL: http://svn.reactos.org/svn/reactos?rev=44283&view=rev Log: [IDL] - Make our IDLs files to not specify a [range] tag for string datatypes, and 0,256 range for an unsigned type. Fixes compiling with newer WIDL and (probably) MIDL. Modified: trunk/reactos/include/reactos/idl/eventlogrpc.idl trunk/reactos/include/reactos/idl/pnp.idl trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/include/reactos/idl/eventlogrpc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/eventl… ============================================================================== --- trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] Tue Nov 24 23:39:25 2009 @@ -115,7 +115,7 @@ [in] USHORT EventType, [in] USHORT EventCategory, [in] DWORD EventID, - [in, range(0, 256)] USHORT NumStrings, + [in/*, max_is(256)*/] USHORT NumStrings, [in, range(0, 61440)] DWORD DataSize, [in] PRPC_UNICODE_STRING ComputerName, [in, unique] PRPC_SID UserSID, @@ -178,7 +178,7 @@ [in] USHORT EventType, [in] USHORT EventCategory, [in] DWORD EventID, - [in, range(0, 256)] USHORT NumStrings, + [in/*, max_is(256)*/] USHORT NumStrings, [in, range(0, 61440)] DWORD DataSize, [in] PRPC_STRING ComputerName, [in, unique] PRPC_SID UserSID, @@ -229,7 +229,7 @@ [in] USHORT EventCategory, [in] ULONG EventID, [in] PRPC_UNICODE_STRING SourceName, - [in, range(0, 256)] USHORT NumStrings, + [in/*, max_is(256)*/] USHORT NumStrings, [in, range(0, 61440)] DWORD DataSize, [in] PRPC_UNICODE_STRING ComputerName, [in, unique] PRPC_SID UserSID, Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Tue Nov 24 23:39:25 2009 @@ -18,10 +18,14 @@ typedef unsigned long RESOURCEID; cpp_quote("#endif") typedef unsigned long DEVPROPTYPE; -typedef [range(0, PNP_MAX_PROP_SIZE)] unsigned long PNP_PROP_SIZE, *PPNP_PROP_SIZE; -typedef [range(0, PNP_MAX_PROP_COUNT)] unsigned long PNP_PROP_COUNT, *PPNP_PROP_COUNT; -typedef [range(0, PNP_MAX_STRING_LEN)] unsigned long PNP_RPC_STRING_LEN, *PPNP_RPC_STRING_LEN; -typedef [range(0, PNP_MAX_BUFFER_SIZE)] unsigned long PNP_RPC_BUFFER_SIZE, *PPNP_RPC_BUFFER_SIZE; +typedef [range(0, PNP_MAX_PROP_SIZE)] unsigned long PNP_PROP_SIZE; +typedef [range(0, PNP_MAX_PROP_COUNT)] unsigned long PNP_PROP_COUNT; +typedef [range(0, PNP_MAX_STRING_LEN)] unsigned long PNP_RPC_STRING_LEN; +typedef [range(0, PNP_MAX_BUFFER_SIZE)] unsigned long PNP_RPC_BUFFER_SIZE; +typedef PNP_PROP_SIZE *PPNP_PROP_SIZE; +typedef PNP_PROP_COUNT *PPNP_PROP_COUNT; +typedef PNP_RPC_STRING_LEN *PPNP_RPC_STRING_LEN; +typedef PNP_RPC_BUFFER_SIZE *PPNP_RPC_BUFFER_SIZE; cpp_quote("#ifndef _CFG_INCLUDED_") @@ -286,7 +290,7 @@ /* Function 6 */ DWORD PNP_ValidateDeviceInstance( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulFlags); /* Function 7 */ @@ -302,7 +306,7 @@ DWORD PNP_GetRelatedDeviceInstance( [in] handle_t hBinding, [in] DWORD ulRelationship, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref] LPWSTR pDeviceID, [out, string, size_is(*pulLength)] LPWSTR pRelatedDeviceId, [in, out] PNP_RPC_STRING_LEN *pulLength, [in] DWORD ulFlags); @@ -322,7 +326,7 @@ /* Function 10 */ DWORD PNP_GetDeviceList( [in] handle_t hBinding, - [in, string, unique, range(0, PNP_MAX_STRING_LEN)] LPWSTR pszFilter, + [in, string, unique] LPWSTR pszFilter, [out, size_is(*pulLength), length_is(*pulLength)] LPWSTR Buffer, [in, out] PNP_RPC_STRING_LEN *pulLength, [in] DWORD ulFlags); @@ -330,21 +334,21 @@ /* Function 11 */ DWORD PNP_GetDeviceListSize( [in] handle_t hBinding, - [in, string, unique, range(0, PNP_MAX_STRING_LEN)] LPWSTR pszFilter, + [in, string, unique] LPWSTR pszFilter, [out] PNP_RPC_BUFFER_SIZE *pulLen, [in] DWORD ulFlags); /* Function 12 */ DWORD PNP_GetDepth( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, + [in, string, ref] LPWSTR pszDeviceID, [out] DWORD *pulDepth, [in] DWORD ulFlags); /* Function 13 */ DWORD PNP_GetDeviceRegProp( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulProperty, [in, out] DWORD *pulRegDataType, [out, size_is(*pulTransferLen), length_is(*pulTransferLen)] BYTE *Buffer, @@ -355,7 +359,7 @@ /* Function 14 */ DWORD PNP_SetDeviceRegProp( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceId, + [in, string, ref] LPWSTR pDeviceId, [in] DWORD ulProperty, [in] DWORD ulDataType, [in, size_is(ulLength)] BYTE *Buffer, @@ -365,23 +369,23 @@ /* Function 15 */ DWORD PNP_GetClassInstance( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceId, + [in, string, ref] LPWSTR pDeviceId, [out, string, size_is(ulLength)] LPWSTR pszClassInstance, [in] PNP_RPC_STRING_LEN ulLength); /* Function 16 */ DWORD PNP_CreateKey( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_CM_PATH)] LPWSTR pszSubKey, + [in, string, ref] LPWSTR pszSubKey, [in] DWORD samDesired, [in] DWORD ulFlags); /* Function 17 */ DWORD PNP_DeleteRegistryKey( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, - [in, string, ref, range(0, PNP_MAX_CM_PATH)] LPWSTR pszParentKey, - [in, string, ref, range(0, PNP_MAX_CM_PATH)] LPWSTR pszChildKey, + [in, string, ref] LPWSTR pszDeviceID, + [in, string, ref] LPWSTR pszParentKey, + [in, string, ref] LPWSTR pszChildKey, [in] DWORD ulFlags); /* Function 18 */ @@ -393,7 +397,7 @@ /* Function 19 */ DWORD PNP_GetClassName( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_GUID_STRING_LEN)] LPWSTR pszClassGuid, + [in, string, ref] LPWSTR pszClassGuid, [out, string, size_is(*pulLength)] LPWSTR Buffer, [in, out] PNP_RPC_STRING_LEN *pulLength, [in] DWORD ulFlags); @@ -401,13 +405,13 @@ /* Function 20 */ DWORD PNP_DeleteClassKey( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_GUID_STRING_LEN)] LPWSTR pszClassGuid, + [in, string, ref] LPWSTR pszClassGuid, [in] DWORD ulFlags); /* Function 21 */ DWORD PNP_GetInterfaceDeviceAlias( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVINTERFACE_LEN)] LPWSTR pszInterfaceDevice, + [in, string, ref] LPWSTR pszInterfaceDevice, [in] GUID *AliasInterfaceGuid, [out, string, size_is(*pulTransferLen)] LPWSTR pszAliasInterfaceDevice, [in, out] PNP_RPC_STRING_LEN *pulLength, @@ -418,7 +422,7 @@ DWORD PNP_GetInterfaceDeviceList( [in] handle_t hBinding, [in] GUID *InterfaceGuid, - [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, + [in, string, unique] LPWSTR pszDeviceID, [out, size_is(*pulLength), length_is(*pulLength)] BYTE *Buffer, [in, out] PNP_RPC_BUFFER_SIZE *pulLength, [in] DWORD ulFlags); @@ -428,15 +432,15 @@ [in] handle_t hBinding, [out] PNP_RPC_BUFFER_SIZE *pulLen, [in] GUID *InterfaceGuid, - [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, + [in, string, unique] LPWSTR pszDeviceID, [in] DWORD ulFlags); /* Function 24 */ DWORD PNP_RegisterDeviceClassAssociation( [in] handle_t hBinding, - [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, + [in, string, unique] LPWSTR pszDeviceID, [in] GUID *InterfaceGuid, - [in, string, unique, range(0, PNP_MAX_STRING_LEN)] LPWSTR pszReference, + [in, string, unique] LPWSTR pszReference, [out, string, size_is(*pulTransferLen)] LPWSTR pszSymLink, [in, out] PNP_RPC_STRING_LEN *pulLength, [in, out] PNP_RPC_STRING_LEN *pulTransferLen, @@ -445,13 +449,13 @@ /* Function 25 */ DWORD PNP_UnregisterDeviceClassAssociation( [in] handle_t hBinding, - [in, string, unique, range(0, PNP_MAX_DEVINTERFACE_LEN)] LPWSTR pszInterfaceDevice, + [in, string, unique] LPWSTR pszInterfaceDevice, [in] DWORD ulFlags); /* Function 26 */ DWORD PNP_GetClassRegProp( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_GUID_STRING_LEN)] LPWSTR pszClassGuid, + [in, string, ref] LPWSTR pszClassGuid, [in] DWORD ulProperty, [in, out] DWORD *pulRegDataType, [out, size_is(*pulTransferLen), length_is(*pulTransferLen)] BYTE *Buffer, @@ -462,7 +466,7 @@ /* Function 27 */ DWORD PNP_SetClassRegProp( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_GUID_STRING_LEN)] LPWSTR *pszClassGuid, + [in, string, ref] LPWSTR *pszClassGuid, [in] DWORD ulProperty, [in] DWORD ulDataType, [in, size_is(ulLength)] BYTE *Buffer, @@ -473,7 +477,7 @@ DWORD PNP_CreateDevInst( [in] handle_t hBinding, [in, out, string, size_is(ulLength)] LPWSTR pszDeviceID, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszParentDeviceID, + [in, string, ref] LPWSTR pszParentDeviceID, [in] PNP_RPC_STRING_LEN ulLength, [in] DWORD ulFlags); @@ -482,13 +486,13 @@ [in] handle_t hBinding, [in] DWORD ulMajorAction, [in] DWORD ulMinorAction, - [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceInstance1, - [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceInstance2); + [in, string, unique] LPWSTR pszDeviceInstance1, + [in, string, unique] LPWSTR pszDeviceInstance2); /* Function 30 */ DWORD PNP_GetDeviceStatus( [in] handle_t hBinding, - [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, unique] LPWSTR pDeviceID, [out] DWORD *pulStatus, [out] DWORD *pulProblem, [in] DWORD ulFlags); @@ -496,56 +500,53 @@ /* Function 31 */ DWORD PNP_SetDeviceProblem( [in] handle_t hBinding, - [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, unique] LPWSTR pDeviceID, [in] DWORD ulProblem, [in] DWORD ulFlags); /* Function 32 */ DWORD PNP_DisableDevInst( [in] handle_t hBinding, - [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, unique] LPWSTR pDeviceID, [in, out, unique] PPNP_VETO_TYPE pVetoType, - [in, out, string, unique, size_is(ulNameLength), range(0, PNP_MAX_STRING_LEN)] LPWSTR pszVetoName, - /* FIXME: should be [in, out, string, unique, max_is(ulNameLength), range(0, PNP_MAX_STRING_LEN)] LPWSTR pszVetoName, */ + [in, out, string, unique, size_is(ulNameLength)] LPWSTR pszVetoName, [in] DWORD ulNameLength, [in] DWORD ulFlags); /* Function 33 */ DWORD PNP_UninstallDevInst( [in] handle_t hBinding, - [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, unique] LPWSTR pDeviceID, [in] DWORD ulFlags); /* Function 34 */ DWORD PNP_AddID( [in] handle_t hBinding, - [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszID, + [in, string, unique] LPWSTR pszDeviceID, + [in, string, ref] LPWSTR pszID, [in] DWORD ulFlags); /* Function 35 */ DWORD PNP_RegisterDriver( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, + [in, string, ref] LPWSTR pszDeviceID, [in] DWORD ulFlags); /* Function 36 */ DWORD PNP_QueryRemove( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, + [in, string, ref] LPWSTR pszDeviceID, [in, out, unique] PPNP_VETO_TYPE pVetoType, - [in, out, string, unique, size_is(ulNameLength), range(0, PNP_MAX_STRING_LEN)] LPWSTR pszVetoName, - /* FIXME: should be [in, out, string, unique, max_is(ulNameLength), range(0, PNP_MAX_STRING_LEN)] LPWSTR pszVetoName, */ + [in, out, string, unique, size_is(ulNameLength)] LPWSTR pszVetoName, [in] DWORD ulNameLength, [in] DWORD ulFlags); /* Function 37 */ DWORD PNP_RequestDeviceEject( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, + [in, string, ref] LPWSTR pszDeviceID, [in, out, unique] PPNP_VETO_TYPE pVetoType, - [in, out, string, unique, size_is(ulNameLength), range(0, PNP_MAX_STRING_LEN)] LPWSTR pszVetoName, - /* FIXME: should be [in, out, string, unique, max_is(ulNameLength), range(0, PNP_MAX_STRING_LEN)] LPWSTR pszVetoName, */ + [in, out, string, unique, size_is(ulNameLength)] LPWSTR pszVetoName, [in] DWORD ulNameLength, [in] DWORD ulFlags); @@ -564,12 +565,11 @@ DWORD PNP_HwProfFlags( [in] handle_t hBinding, [in] DWORD ulAction, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulConfig, [in, out] DWORD *pulValue, [in, out, unique] PPNP_VETO_TYPE pVetoType, - [in, out, string, unique, size_is(ulNameLength), range(0, PNP_MAX_STRING_LEN)] LPWSTR pszVetoName, - /* FIXME: should be [in, out, string, unique, max_is(ulNameLength), range(0, PNP_MAX_STRING_LEN)] LPWSTR pszVetoName, */ + [in, out, string, unique, size_is(ulNameLength)] LPWSTR pszVetoName, [in] DWORD ulNameLength, [in] DWORD ulFlags); @@ -585,7 +585,7 @@ /* Function 42 */ DWORD PNP_AddEmptyLogConf( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulPriority, [out] DWORD *pulLogConfTag, [in] DWORD ulFlags); @@ -593,7 +593,7 @@ /* Function 43 */ DWORD PNP_FreeLogConf( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfType, [in] DWORD ulLogConfTag, [in] DWORD ulFlags); @@ -601,7 +601,7 @@ /* Function 44 */ DWORD PNP_GetFirstLogConf( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfType, [out] DWORD *pulLogConfTag, [in] DWORD ulFlags); @@ -609,7 +609,7 @@ /* Function 45 */ DWORD PNP_GetNextLogConf( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfType, [in] DWORD ulCurrentTag, [out] DWORD *pulNextTag, @@ -618,7 +618,7 @@ /* Function 46 */ DWORD PNP_GetLogConfPriority( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulType, [in] DWORD ulTag, [out] DWORD *pPriority, @@ -627,7 +627,7 @@ /* Function 47 */ DWORD PNP_AddResDes( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfTag, [in] DWORD ulLogConfType, [in] RESOURCEID ResourceID, @@ -639,7 +639,7 @@ /* Function 48 */ DWORD PNP_FreeResDes( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfTag, [in] DWORD ulLogConfType, [in] RESOURCEID ResourceID, @@ -651,7 +651,7 @@ /* Function 49 */ DWORD PNP_GetNextResDes( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfTag, [in] DWORD ulLogConfType, [in] RESOURCEID ResourceID, @@ -663,7 +663,7 @@ /* Function 50 */ DWORD PNP_GetResDesData( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfTag, [in] DWORD ulLogConfType, [in] RESOURCEID ResourceID, @@ -675,7 +675,7 @@ /* Function 51 */ DWORD PNP_GetResDesDataSize( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfTag, [in] DWORD ulLogConfType, [in] RESOURCEID ResourceID, @@ -686,7 +686,7 @@ /* Function 52 */ DWORD PNP_ModifyResDes( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfTag, [in] DWORD ulLogConfType, [in] RESOURCEID CurrentResourceID, @@ -699,7 +699,7 @@ /* Function 53 */ DWORD PNP_DetectResourceConflict( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref] LPWSTR pDeviceID, [in] RESOURCEID ResourceID, [in, size_is(ResourceLen)] BYTE *ResourceData, [in] PNP_RPC_BUFFER_SIZE ResourceLen, @@ -709,7 +709,7 @@ /* Function 54 */ DWORD PNP_QueryResConfList( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref] LPWSTR pDeviceID, [in] RESOURCEID ResourceID, [in, size_is(ResourceLen)] BYTE *ResourceData, [in] PNP_RPC_BUFFER_SIZE ResourceLen, @@ -747,8 +747,8 @@ /* Function 61 */ DWORD PNP_GetCustomDevProp( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, - [in, string, ref, range(0, PNP_MAX_STRING_LEN)] LPWSTR CustomPropName, + [in, string, ref] LPWSTR pDeviceID, + [in, string, ref] LPWSTR CustomPropName, [out] DWORD *pulRegDataType, [out, size_is(*pulLength), length_is(*pulTransferLen)] BYTE *Buffer, [out] PNP_RPC_STRING_LEN *pulTransferLen, @@ -779,9 +779,9 @@ /* Function 65 */ DWORD PNP_GetObjectPropKeys( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_STRING_LEN)] LPWSTR ObjectName, + [in, string, ref] LPWSTR ObjectName, [in] DWORD ObjectType, - [in, string, unique, range(0, PNP_MAX_CULTURE_NAME_LEN)] LPWSTR PropertyCultureName, + [in, string, unique] LPWSTR PropertyCultureName, [in, out] PNP_PROP_COUNT *PropertyCount, [out] PNP_PROP_COUNT *TransferLen, [out, size_is(*PropertyCount), length_is(*TransferLen)] DEVPROPKEY *PropertyKeys, @@ -790,9 +790,9 @@ /* Function 66 */ DWORD PNP_GetObjectProp( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_STRING_LEN)] LPWSTR ObjectName, + [in, string, ref] LPWSTR ObjectName, [in] DWORD ObjectType, - [in, string, unique, range(0, PNP_MAX_CULTURE_NAME_LEN)] LPWSTR PropertyCultureName, + [in, string, unique] LPWSTR PropertyCultureName, [in] const DEVPROPKEY *PropertyKey, [out] DEVPROPTYPE *PropertyType, [in, out] PNP_PROP_SIZE *PropertySize, @@ -803,9 +803,9 @@ /* Function 67 */ DWORD PNP_SetObjectProp( [in] handle_t hBinding, - [in, string, ref, range(0, PNP_MAX_STRING_LEN)] LPWSTR ObjectName, + [in, string, ref] LPWSTR ObjectName, [in] DWORD ObjectType, - [in, string, unique, range(0, PNP_MAX_CULTURE_NAME_LEN)] LPWSTR PropertyCultureName, + [in, string, unique] LPWSTR PropertyCultureName, [in] const DEVPROPKEY *PropertyKey, [in] DEVPROPTYPE PropertyType, [in] PNP_PROP_SIZE PropertySize, Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Tue Nov 24 23:39:25 2009 @@ -56,26 +56,26 @@ } SERVICE_STATUS_PROCESS, *LPSERVICE_STATUS_PROCESS; typedef struct _ENUM_SERVICE_STATUSA { - [string, range(0, 8 * 1024)] LPSTR lpServiceName; - [string, range(0, 8 * 1024)] LPSTR lpDisplayName; + [string] LPSTR lpServiceName; + [string] LPSTR lpDisplayName; SERVICE_STATUS ServiceStatus; } ENUM_SERVICE_STATUSA, *LPENUM_SERVICE_STATUSA; typedef struct _ENUM_SERVICE_STATUSW { - [string, range(0, 8 * 1024)] LPWSTR lpServiceName; - [string, range(0, 8 * 1024)] LPWSTR lpDisplayName; + [string] LPWSTR lpServiceName; + [string] LPWSTR lpDisplayName; SERVICE_STATUS ServiceStatus; } ENUM_SERVICE_STATUSW, *LPENUM_SERVICE_STATUSW; typedef struct _ENUM_SERVICE_STATUS_PROCESSA { - [string, range(0, 8 * 1024)] LPSTR lpServiceName; - [string, range(0, 8 * 1024)] LPSTR lpDisplayName; + [string] LPSTR lpServiceName; + [string] LPSTR lpDisplayName; SERVICE_STATUS_PROCESS ServiceStatusProcess; } ENUM_SERVICE_STATUS_PROCESSA, *LPENUM_SERVICE_STATUS_PROCESSA; typedef struct _ENUM_SERVICE_STATUS_PROCESSW { - [string, range(0, 8 * 1024)] LPWSTR lpServiceName; - [string, range(0, 8 * 1024)] LPWSTR lpDisplayName; + [string] LPWSTR lpServiceName; + [string] LPWSTR lpDisplayName; SERVICE_STATUS_PROCESS ServiceStatusProcess; } ENUM_SERVICE_STATUS_PROCESSW, *LPENUM_SERVICE_STATUS_PROCESSW; @@ -83,11 +83,11 @@ DWORD dwServiceType; DWORD dwStartType; DWORD dwErrorControl; - [string, range(0, 8 * 1024)] LPSTR lpBinaryPathName; - [string, range(0, 8 * 1024)] LPSTR lpLoadOrderGroup; + [string] LPSTR lpBinaryPathName; + [string] LPSTR lpLoadOrderGroup; DWORD dwTagId; - [string, range(0, 8 * 1024)] LPSTR lpDependencies; - [string, range(0, 8 * 1024)] LPSTR lpServiceStartName; + [string] LPSTR lpDependencies; + [string] LPSTR lpServiceStartName; LPSTR lpDisplayName; } QUERY_SERVICE_CONFIGA, *LPQUERY_SERVICE_CONFIGA; @@ -95,23 +95,23 @@ DWORD dwServiceType; DWORD dwStartType; DWORD dwErrorControl; - [string, range(0, 8 * 1024)] LPWSTR lpBinaryPathName; - [string, range(0, 8 * 1024)] LPWSTR lpLoadOrderGroup; + [string] LPWSTR lpBinaryPathName; + [string] LPWSTR lpLoadOrderGroup; DWORD dwTagId; - [string, range(0, 8 * 1024)] LPWSTR lpDependencies; - [string, range(0, 8 * 1024)] LPWSTR lpServiceStartName; + [string] LPWSTR lpDependencies; + [string] LPWSTR lpServiceStartName; LPWSTR lpDisplayName; } QUERY_SERVICE_CONFIGW, *LPQUERY_SERVICE_CONFIGW; typedef struct _QUERY_SERVICE_LOCK_STATUSA { DWORD fIsLocked; - [string, range(0, 8 * 1024)] LPSTR lpLockOwner; + [string] LPSTR lpLockOwner; DWORD dwLockDuration; } QUERY_SERVICE_LOCK_STATUSA, *LPQUERY_SERVICE_LOCK_STATUSA; typedef struct _QUERY_SERVICE_LOCK_STATUSW { DWORD fIsLocked; - [string, range(0, 8 * 1024)] LPWSTR lpLockOwner; + [string] LPWSTR lpLockOwner; DWORD dwLockDuration; } QUERY_SERVICE_LOCK_STATUSW, *LPQUERY_SERVICE_LOCK_STATUSW; @@ -132,25 +132,25 @@ } SC_ENUM_TYPE; typedef struct _SERVICE_DESCRIPTIONA { - [string, range(0, 8 * 1024)] LPSTR lpDescription; + [string] LPSTR lpDescription; } SERVICE_DESCRIPTIONA, *LPSERVICE_DESCRIPTIONA; typedef struct _SERVICE_DESCRIPTIONW { - [string, range(0, 8 * 1024)] LPWSTR lpDescription; + [string] LPWSTR lpDescription; } SERVICE_DESCRIPTIONW, *LPSERVICE_DESCRIPTIONW; typedef struct _SERVICE_FAILURE_ACTIONSA { DWORD dwResetPeriod; - [string, range(0, 8 * 1024)] LPSTR lpRebootMsg; - [string, range(0, 8 * 1024)] LPSTR lpCommand; + [string] LPSTR lpRebootMsg; + [string] LPSTR lpCommand; [range(0, 1024)] DWORD cActions; [size_is(cActions)] SC_ACTION* lpsaActions; } SERVICE_FAILURE_ACTIONSA, *LPSERVICE_FAILURE_ACTIONSA; typedef struct _SERVICE_FAILURE_ACTIONSW { DWORD dwResetPeriod; - [string, range(0, 8 * 1024)] LPWSTR lpRebootMsg; - [string, range(0, 8 * 1024)] LPWSTR lpCommand; + [string] LPWSTR lpRebootMsg; + [string] LPWSTR lpCommand; [range(0, 1024)] DWORD cActions; [size_is(cActions)] SC_ACTION* lpsaActions; } SERVICE_FAILURE_ACTIONSW, *LPSERVICE_FAILURE_ACTIONSW; @@ -189,7 +189,7 @@ [case(6)] LPSERVICE_RPC_REQUIRED_PRIVILEGES_INFO psrp; [case(7)] LPSERVICE_PRESHUTDOWN_INFO psps; } DUMMYUNIONNAME; - [string, range(0, 8 * 1024)] LPSTR lpDescription; //FIXME + [string] LPSTR lpDescription; //FIXME } SC_RPC_CONFIG_INFOA, *LPSC_RPC_CONFIG_INFOA; typedef struct _SC_RPC_CONFIG_INFOW { @@ -224,7 +224,7 @@ DWORD dwNotificationStatus; DWORD dwSequence; DWORD dwNotificationTriggered; - [string, range(0, 64 * 1024)] PWSTR pszServiceNames; + [string] PWSTR pszServiceNames; } SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2, *PSERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2; typedef struct _SC_RPC_NOTIFY_PARAMS { @@ -270,12 +270,12 @@ typedef struct _SERVICE_CONTROL_STATUS_REASON_IN_PARAMSA { DWORD dwReason; - [string, range(0, SC_MAX_COMMENT_LENGTH)] LPSTR pszComment; + [string] LPSTR pszComment; } SERVICE_CONTROL_STATUS_REASON_IN_PARAMSA, *LPSERVICE_CONTROL_STATUS_REASON_IN_PARAMSA; typedef struct _SERVICE_CONTROL_STATUS_REASON_IN_PARAMSW { DWORD dwReason; - [string, range(0, SC_MAX_COMMENT_LENGTH)] LPWSTR pszComment; + [string] LPWSTR pszComment; } SERVICE_CONTROL_STATUS_REASON_IN_PARAMSW, *LPSERVICE_CONTROL_STATUS_REASON_IN_PARAMSW; typedef struct _SERVICE_CONTROL_STATUS_REASON_OUT_PARAMS { @@ -287,11 +287,11 @@ cpp_quote("#endif") typedef struct _STRING_PTRSA { - [string, range(0, SC_MAX_ARGUMENT_LENGTH)] LPSTR StringPtr; + [string] LPSTR StringPtr; } STRING_PTRSA, *PSTRING_PTRSA, *LPSTRING_PTRSA; typedef struct _STRING_PTRSW { - [string, range(0, SC_MAX_ARGUMENT_LENGTH)] LPWSTR StringPtr; + [string] LPWSTR StringPtr; } STRING_PTRSW, *PSTRING_PTRSW, *LPSTRING_PTRSW; [ @@ -351,7 +351,7 @@ /* Function 9 */ DWORD RNotifyBootConfigStatus( - [in, string, unique, range(0, SC_MAX_COMPUTER_NAME_LENGTH)] SVCCTL_HANDLEW lpMachineName, + [in, string, unique] SVCCTL_HANDLEW lpMachineName, [in] DWORD BootAcceptable); /* Function 10 */ @@ -368,31 +368,31 @@ [in] DWORD dwServiceType, [in] DWORD dwStartType, [in] DWORD dwErrorControl, - [in, string, unique, range(0, SC_MAX_PATH_LENGTH)] LPWSTR lpBinaryPathName, - [in, string, unique, range(0, SC_MAX_PATH_LENGTH)] LPWSTR lpLoadOrderGroup, + [in, string, unique] LPWSTR lpBinaryPathName, + [in, string, unique] LPWSTR lpLoadOrderGroup, [in, out, unique] LPDWORD lpdwTagId, [in, unique, size_is(dwDependSize)] LPBYTE lpDependencies, [in, range(0, SC_MAX_DEPEND_SIZE)] DWORD dwDependSize, - [in, string, unique, range(0, SC_MAX_ACCOUNT_NAME_LENGTH)] LPWSTR lpServiceStartName, + [in, string, unique] LPWSTR lpServiceStartName, [in, unique, size_is(dwPwSize)] LPBYTE lpPassword, [in, range(0, SC_MAX_PWD_SIZE)] DWORD dwPwSize, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpDisplayName); + [in, string, unique] LPWSTR lpDisplayName); /* Function 12 */ DWORD RCreateServiceW( [in] SC_RPC_HANDLE hSCManager, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR lpServiceName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR lpDisplayName, + [in, string] LPCWSTR lpServiceName, + [in, string, unique] LPCWSTR lpDisplayName, [in] DWORD dwDesiredAccess, [in] DWORD dwServiceType, [in] DWORD dwStartType, [in] DWORD dwErrorControl, - [in, string, range(0, SC_MAX_PATH_LENGTH)] LPCWSTR lpBinaryPathName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR lpLoadOrderGroup, + [in, string] LPCWSTR lpBinaryPathName, + [in, string, unique] LPCWSTR lpLoadOrderGroup, [in, out, unique] LPDWORD lpdwTagId, [in, unique, size_is(dwDependSize)] LPBYTE lpDependencies, [in, range(0, SC_MAX_DEPEND_SIZE)] DWORD dwDependSize, - [in, string, unique, range(0, SC_MAX_ACCOUNT_NAME_LENGTH)] LPCWSTR lpServiceStartName, + [in, string, unique] LPCWSTR lpServiceStartName, [in, unique, size_is(dwPwSize)] LPBYTE lpPassword, [in, range(0, SC_MAX_PWD_SIZE)] DWORD dwPwSize, [out] LPSC_RPC_HANDLE lpServiceHandle); @@ -419,15 +419,15 @@ /* Function 15 */ DWORD ROpenSCManagerW( - [in, string, unique, range(0, SC_MAX_COMPUTER_NAME_LENGTH)] SVCCTL_HANDLEW lpMachineName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpDatabaseName, + [in, string, unique] SVCCTL_HANDLEW lpMachineName, + [in, string, unique] LPWSTR lpDatabaseName, [in] DWORD dwDesiredAccess, [out] LPSC_RPC_HANDLE lpScHandle); /* Function 16 */ DWORD ROpenServiceW( [in] SC_RPC_HANDLE hSCManager, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpServiceName, + [in, string] LPWSTR lpServiceName, [in] DWORD dwDesiredAccess, [out] LPSC_RPC_HANDLE lpServiceHandle); @@ -455,15 +455,15 @@ /* Function 20 */ DWORD RGetServiceDisplayNameW( [in] SC_RPC_HANDLE hSCManager, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR lpServiceName, - [out, string, range(1, 4*1024+1), size_is(*lpcchBuffer + 1)] LPWSTR lpDisplayName, + [in, string] LPCWSTR lpServiceName, + [out, string, size_is(*lpcchBuffer + 1)] LPWSTR lpDisplayName, [in, out] DWORD* lpcchBuffer); /* Function 21 */ DWORD RGetServiceKeyNameW( [in] SC_RPC_HANDLE hSCManager, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR lpDisplayName, - [out, string, range(1, 4*1024+1), size_is(*lpcchBuffer + 1)] LPWSTR lpServiceName, + [in, string] LPCWSTR lpDisplayName, + [out, string, size_is(*lpcchBuffer + 1)] LPWSTR lpServiceName, [in, out] DWORD* lpcchBuffer); /* Function 22 */ @@ -480,31 +480,31 @@ [in] DWORD dwServiceType, [in] DWORD dwStartType, [in] DWORD dwErrorControl, - [in, string, unique, range(0, SC_MAX_PATH_LENGTH)] LPSTR lpBinaryPathName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpLoadOrderGroup, + [in, string, unique] LPSTR lpBinaryPathName, + [in, string, unique] LPSTR lpLoadOrderGroup, [in, out, unique] LPDWORD lpdwTagId, [in, unique, size_is(dwDependSize)] LPSTR lpDependencies, [in, range(0, SC_MAX_DEPEND_SIZE)] DWORD dwDependSize, - [in, string, unique, range(0, SC_MAX_ACCOUNT_NAME_LENGTH)] LPSTR lpServiceStartName, + [in, string, unique] LPSTR lpServiceStartName, [in, unique, size_is(dwPwSize)] LPBYTE lpPassword, [in, range(0, SC_MAX_PWD_SIZE)] DWORD dwPwSize, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDisplayName); + [in, string, unique] LPSTR lpDisplayName); /* Function 24 */ DWORD RCreateServiceA( [in] SC_RPC_HANDLE hSCManager, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpServiceName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDisplayName, + [in, string] LPSTR lpServiceName, + [in, string, unique] LPSTR lpDisplayName, [in] DWORD dwDesiredAccess, [in] DWORD dwServiceType, [in] DWORD dwStartType, [in] DWORD dwErrorControl, - [in, string, range(0, SC_MAX_PATH_LENGTH)] LPSTR lpBinaryPathName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpLoadOrderGroup, + [in, string] LPSTR lpBinaryPathName, + [in, string, unique] LPSTR lpLoadOrderGroup, [in, out, unique] LPDWORD lpdwTagId, [in, unique, size_is(dwDependSize)] LPBYTE lpDependencies, [in, range(0, SC_MAX_DEPEND_SIZE)] DWORD dwDependSize, - [in, string, unique, range(0, SC_MAX_ACCOUNT_NAME_LENGTH)] LPSTR lpServiceStartName, + [in, string, unique] LPSTR lpServiceStartName, [in, unique, size_is(dwPwSize)] LPBYTE lpPassword, [in, range(0, SC_MAX_PWD_SIZE)] DWORD dwPwSize, [out] LPSC_RPC_HANDLE lpServiceHandle); @@ -531,15 +531,15 @@ /* Function 27 */ DWORD ROpenSCManagerA( - [in, string, unique, range(0, SC_MAX_COMPUTER_NAME_LENGTH)] SVCCTL_HANDLEA lpMachineName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDatabaseName, + [in, string, unique] SVCCTL_HANDLEA lpMachineName, + [in, string, unique] LPSTR lpDatabaseName, [in] DWORD dwDesiredAccess, [out] LPSC_RPC_HANDLE lpScHandle); /* Function 28 */ DWORD ROpenServiceA( [in] SC_RPC_HANDLE hSCManager, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpServiceName, + [in, string] LPSTR lpServiceName, [in] DWORD dwDesiredAccess, [out] LPSC_RPC_HANDLE lpServiceHandle); @@ -567,21 +567,21 @@ /* Function 32 */ DWORD RGetServiceDisplayNameA( [in] SC_RPC_HANDLE hSCManager, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPCSTR lpServiceName, + [in, string] LPCSTR lpServiceName, [out, string, size_is(*lpcchBuffer)] LPSTR lpDisplayName, [in, out] LPBOUNDED_DWORD_4K lpcchBuffer); /* Function 33 */ DWORD RGetServiceKeyNameA( [in] SC_RPC_HANDLE hSCManager, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPCSTR lpDisplayName, + [in, string] LPCSTR lpDisplayName, [out, string, size_is(*lpcchBuffer)] LPSTR lpKeyName, [in, out] LPBOUNDED_DWORD_4K lpcchBuffer); /* Function 34 */ DWORD RI_ScGetCurrentGroupStateW( [in] SC_RPC_HANDLE hSCManager, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpLoadOrderGroup, + [in, string, unique] LPWSTR lpLoadOrderGroup, [out] LPDWORD lpState); /* Function 35 */ @@ -594,7 +594,7 @@ [out] LPBOUNDED_DWORD_256K pcbBytesNeeded, [out] LPBOUNDED_DWORD_256K lpServicesReturned, [in, out, unique] LPBOUNDED_DWORD_256K lpResumeIndex, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR pszGroupName); + [in, string, unique] LPCWSTR pszGroupName); /* Function 36 */ DWORD RChangeServiceConfig2A( @@ -641,7 +641,7 @@ [out] LPBOUNDED_DWORD_256K pcbBytesNeeded, [out] LPBOUNDED_DWORD_256K lpServicesReturned, [in, out, unique] LPBOUNDED_DWORD_256K lpResumeIndex, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPCSTR pszGroupName); + [in, string, unique] LPCSTR pszGroupName); /* Function 42 */ DWORD REnumServicesStatusExW( @@ -654,7 +654,7 @@ [out] LPBOUNDED_DWORD_256K pcbBytesNeeded, [out] LPBOUNDED_DWORD_256K lpServicesReturned, [in, out, unique] LPBOUNDED_DWORD_256K lpResumeIndex, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR pszGroupName); + [in, string, unique] LPCWSTR pszGroupName); /* Function 43 */ DWORD RSendTSMessage( @@ -663,18 +663,18 @@ /* Function 44 */ DWORD RCreateServiceWOW64A( [in] handle_t BindingHandle, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpServiceName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDisplayName, + [in, string] LPSTR lpServiceName, + [in, string, unique] LPSTR lpDisplayName, [in] DWORD dwDesiredAccess, [in] DWORD dwServiceType, [in] DWORD dwStartType, [in] DWORD dwErrorControl, - [in, string, range(0, SC_MAX_PATH_LENGTH)] LPSTR lpBinaryPathName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpLoadOrderGroup, + [in, string] LPSTR lpBinaryPathName, + [in, string, unique] LPSTR lpLoadOrderGroup, [in, out, unique] LPDWORD lpdwTagId, [in, unique, size_is(dwDependSize)] LPBYTE lpDependencies, [in, range(0, SC_MAX_DEPEND_SIZE)] DWORD dwDependSize, - [in, string, unique, range(0, SC_MAX_ACCOUNT_NAME_LENGTH)] LPSTR lpServiceStartName, + [in, string, unique] LPSTR lpServiceStartName, [in, unique, size_is(dwPwSize)] LPBYTE lpPassword, [in, range(0, SC_MAX_PWD_SIZE)] DWORD dwPwSize, [out] LPSC_RPC_HANDLE lpServiceHandle); @@ -682,18 +682,18 @@ /* Function 45 */ DWORD RCreateServiceWOW64W( [in] handle_t BindingHandle, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpServiceName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpDisplayName, + [in, string] LPWSTR lpServiceName, + [in, string, unique] LPWSTR lpDisplayName, [in] DWORD dwDesiredAccess, [in] DWORD dwServiceType, [in] DWORD dwStartType, [in] DWORD dwErrorControl, - [in, string, range(0, SC_MAX_PATH_LENGTH)] LPWSTR lpBinaryPathName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpLoadOrderGroup, + [in, string] LPWSTR lpBinaryPathName, + [in, string, unique] LPWSTR lpLoadOrderGroup, [in, out, unique] LPDWORD lpdwTagId, [in, unique, size_is(dwDependSize)] LPBYTE lpDependencies, [in, range(0, SC_MAX_DEPEND_SIZE)] DWORD dwDependSize, - [in, string, unique, range(0, SC_MAX_ACCOUNT_NAME_LENGTH)] LPWSTR lpServiceStartName, + [in, string, unique] LPWSTR lpServiceStartName, [in, unique, size_is(dwPwSize)] LPBYTE lpPassword, [in, range(0, SC_MAX_PWD_SIZE)] DWORD dwPwSize, [out] LPSC_RPC_HANDLE lpServiceHandle);

14 years, 10 months

[gschneider] 44282: [rosautotest]: Find the last underscore instead of the first one when building a module name, hurray for twain_32_winetest and ws2_32_winetest See issue #4929 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Tue Nov 24 21:36:53 2009 New Revision: 44282 URL: http://svn.reactos.org/svn/reactos?rev=44282&view=rev Log: [rosautotest]: Find the last underscore instead of the first one when building a module name, hurray for twain_32_winetest and ws2_32_winetest See issue #4929 for more details. Modified: trunk/rostests/rosautotest/CWineTest.cpp Modified: trunk/rostests/rosautotest/CWineTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.cpp… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] Tue Nov 24 21:36:53 2009 @@ -227,7 +227,7 @@ TestInfo->CommandLine += AsciiToUnicode(m_CurrentTest); /* Store the Module name */ - UnderscorePosition = m_CurrentFile.find('_'); + UnderscorePosition = m_CurrentFile.find_last_of('_'); if(UnderscorePosition == m_CurrentFile.npos) {

14 years, 10 months

[arty] 44281: Deprecate old separate lazy write thread Fix and enable MPW Fix page op's hash function (really, |?) Simplify section implementation to completely remove use of page ops in all section types. Yields a surprising speed improvement.

by arty＠svn.reactos.org

Author: arty Date: Tue Nov 24 18:45:24 2009 New Revision: 44281 URL: http://svn.reactos.org/svn/reactos?rev=44281&view=rev Log: Deprecate old separate lazy write thread Fix and enable MPW Fix page op's hash function (really, |?) Simplify section implementation to completely remove use of page ops in all section types. Yields a surprising speed improvement. Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c branches/arty-newcc/ntoskrnl/cache/lazyrite.c branches/arty-newcc/ntoskrnl/mm/balance.c branches/arty-newcc/ntoskrnl/mm/freelist.c branches/arty-newcc/ntoskrnl/mm/mpw.c branches/arty-newcc/ntoskrnl/mm/pageop.c branches/arty-newcc/ntoskrnl/mm/section/data.c branches/arty-newcc/ntoskrnl/mm/section/image.c branches/arty-newcc/ntoskrnl/mm/section/pagefile.c Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/fssup… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] Tue Nov 24 18:45:24 2009 @@ -17,12 +17,7 @@ PFSN_PREFETCHER_GLOBALS CcPfGlobals; extern LONG CcOutstandingDeletes; -extern KEVENT CcpLazyWriteEvent; extern KEVENT CcFinalizeEvent; -extern VOID NTAPI CcpUnmapThread(PVOID Unused); -extern VOID NTAPI CcpLazyWriteThread(PVOID Unused); -HANDLE CcUnmapThreadHandle, CcLazyWriteThreadHandle; -CLIENT_ID CcUnmapThreadId, CcLazyWriteThreadId; typedef struct _NOCC_PRIVATE_CACHE_MAP { @@ -48,7 +43,6 @@ KeInitializeEvent(&CcDeleteEvent, SynchronizationEvent, FALSE); KeInitializeEvent(&CcFinalizeEvent, SynchronizationEvent, FALSE); - KeInitializeEvent(&CcpLazyWriteEvent, SynchronizationEvent, FALSE); CcCacheBitmap->Buffer = ((PULONG)&CcCacheBitmap[1]); CcCacheBitmap->SizeOfBitMap = ROUND_UP(CACHE_NUM_SECTIONS, 32); Modified: branches/arty-newcc/ntoskrnl/cache/lazyrite.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/lazyr… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/lazyrite.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/lazyrite.c [iso-8859-1] Tue Nov 24 18:45:24 2009 @@ -14,21 +14,15 @@ /* GLOBALS ********************************************************************/ -KEVENT CcpLazyWriteEvent; +extern KEVENT MpwCompleteEvent; /* FUNCTIONS ******************************************************************/ - -VOID NTAPI -CcpLazyWriteThread(PVOID Unused) -{ - /* Not implemented */ -} NTSTATUS NTAPI CcWaitForCurrentLazyWriterActivity(VOID) { - //KeWaitForSingleObject(&CcpLazyWriteEvent, Executive, KernelMode, FALSE, NULL); + KeWaitForSingleObject(&MpwCompleteEvent, Executive, KernelMode, FALSE, NULL); return STATUS_SUCCESS; } Modified: branches/arty-newcc/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/balance.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/balance.c [iso-8859-1] Tue Nov 24 18:45:24 2009 @@ -138,10 +138,7 @@ else { KeReleaseSpinLock(&AllocationListLock, OldIrql); - if(Consumer == MC_USER) MmRemoveLRUUserPage(Page); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmDereferencePage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } return(STATUS_SUCCESS); Modified: branches/arty-newcc/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/freelist… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/freelist.c [iso-8859-1] Tue Nov 24 18:45:24 2009 @@ -99,6 +99,7 @@ return 0; } PageDescriptor = CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, ListEntry); + MmReferencePage(PageDescriptor - MmPfnDatabase); ASSERT_PFN(PageDescriptor); KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return PageDescriptor - MmPfnDatabase; @@ -137,10 +138,13 @@ NextListEntry = (PLIST_ENTRY)Page->ListEntry.Flink; if (NextListEntry == &UserPageListHead) { + MmDereferencePage(PreviousPfn); KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return 0; } PageDescriptor = CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, ListEntry); + MmReferencePage(PageDescriptor - MmPfnDatabase); + MmDereferencePage(PreviousPfn); KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return PageDescriptor - MmPfnDatabase; } @@ -906,6 +910,7 @@ NTAPI MmDereferencePage(PFN_TYPE Pfn) { + KIRQL oldIrql; PPHYSICAL_PAGE Page; DPRINT("MmDereferencePage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); @@ -928,7 +933,12 @@ if (Page->ReferenceCount == 0) { MmAvailablePages++; - if (Page->Flags.Consumer == MC_USER) RemoveEntryList(&Page->ListEntry); + if (Page->Flags.Consumer == MC_USER) + { + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + RemoveEntryList(&Page->ListEntry); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); + } if (Page->RmapListHead != (LONG)NULL) { DPRINT1("Freeing page with rmap entries.\n"); Modified: branches/arty-newcc/ntoskrnl/mm/mpw.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/mpw.c?re… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/mpw.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/mpw.c [iso-8859-1] Tue Nov 24 18:45:24 2009 @@ -18,7 +18,7 @@ HANDLE MpwThreadHandle; static CLIENT_ID MpwThreadId; -KEVENT MpwThreadEvent; +KEVENT MpwThreadEvent, MpwCompleteEvent; BOOLEAN MpwThreadShouldTerminate; /* FUNCTIONS *****************************************************************/ @@ -81,12 +81,11 @@ } PagesWritten = 0; -#if 0 /* * FIXME: MmWriteDirtyPages doesn't work correctly. */ MmWriteDirtyPages(128, &PagesWritten); -#endif + KeSetEvent(&MpwCompleteEvent, IO_NO_INCREMENT, TRUE); } } @@ -99,6 +98,7 @@ MpwThreadShouldTerminate = FALSE; KeInitializeEvent(&MpwThreadEvent, SynchronizationEvent, FALSE); + KeInitializeEvent(&MpwCompleteEvent, SynchronizationEvent, FALSE); Status = PsCreateSystemThread(&MpwThreadHandle, THREAD_ALL_ACCESS, Modified: branches/arty-newcc/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/pageop.c… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/pageop.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/pageop.c [iso-8859-1] Tue Nov 24 18:45:24 2009 @@ -83,11 +83,11 @@ */ if (MArea->Type == MEMORY_AREA_SECTION_VIEW) { - Hash = (((ULONG_PTR)Segment) | (((ULONG_PTR)Offset) / PAGE_SIZE)); + Hash = (((ULONG_PTR)Segment) ^ (((ULONG_PTR)Offset) / PAGE_SIZE)); } else { - Hash = (((ULONG_PTR)Pid) | (((ULONG_PTR)Address) / PAGE_SIZE)); + Hash = (((ULONG_PTR)Pid) ^ (((ULONG_PTR)Address) / PAGE_SIZE)); } Hash = Hash % PAGEOP_HASH_TABLE_SIZE; @@ -151,11 +151,11 @@ */ if (MArea->Type == MEMORY_AREA_SECTION_VIEW) { - Hash = (((ULONG_PTR)Segment) | (((ULONG_PTR)Offset) / PAGE_SIZE)); + Hash = (((ULONG_PTR)Segment) ^ (((ULONG_PTR)Offset) / PAGE_SIZE)); } else { - Hash = (((ULONG_PTR)Pid) | (((ULONG_PTR)Address) / PAGE_SIZE)); + Hash = (((ULONG_PTR)Pid) ^ (((ULONG_PTR)Address) / PAGE_SIZE)); } Hash = Hash % PAGEOP_HASH_TABLE_SIZE; Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] Tue Nov 24 18:45:24 2009 @@ -2333,50 +2333,6 @@ return(STATUS_SUCCESS); } -NTSTATUS -NTAPI -MiAwaitPageOps(PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PVOID BaseAddress) -{ - NTSTATUS Status; - PMM_PAGEOP PageOp; - ULONG Offset; - - while (MemoryArea->PageOpCount) - { - Offset = PAGE_ROUND_UP((ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress); - - while (Offset) - { - Offset -= PAGE_SIZE; - PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, - MemoryArea->Data.SectionData.Segment, - Offset); - if (PageOp) - { - MmUnlockAddressSpace(AddressSpace); - Status = MmspWaitForPageOpCompletionEvent(PageOp); - if (Status != STATUS_SUCCESS) - { - DPRINT1("Failed to wait for page op, status = %x\n", Status); - ASSERT(FALSE); - } - MmLockAddressSpace(AddressSpace); - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, - BaseAddress); - if (MemoryArea == NULL || - MemoryArea->Type != MEMORY_AREA_SECTION_VIEW) - { - MmUnlockAddressSpace(AddressSpace); - DPRINT("STATUS_NOT_MAPPED_VIEW\n"); - return STATUS_NOT_MAPPED_VIEW; - } - break; - } - } - } - return STATUS_SUCCESS; -} - /* * @implemented */ @@ -2409,18 +2365,14 @@ if (MemoryArea->Type == MEMORY_AREA_IMAGE_SECTION) { MemoryArea->DeleteInProgress = TRUE; - Status = MiAwaitPageOps(AddressSpace, MemoryArea, BaseAddress); - if (NT_SUCCESS(Status)) - Status = MiUnmapImageSection(AddressSpace, MemoryArea, BaseAddress); + Status = MiUnmapImageSection(AddressSpace, MemoryArea, BaseAddress); } else if (MemoryArea->Type == MEMORY_AREA_PHYSICAL_MEMORY_SECTION || MemoryArea->Type == MEMORY_AREA_PAGE_FILE_SECTION || MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) { MemoryArea->DeleteInProgress = TRUE; - Status = MiAwaitPageOps(AddressSpace, MemoryArea, BaseAddress); - if (NT_SUCCESS(Status)) - Status = MmUnmapViewOfSegment(AddressSpace, BaseAddress); + Status = MmUnmapViewOfSegment(AddressSpace, BaseAddress); } else { Modified: branches/arty-newcc/ntoskrnl/mm/section/image.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/image.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/image.c [iso-8859-1] Tue Nov 24 18:45:24 2009 @@ -1848,8 +1848,6 @@ //DPRINT("MiUnmapImageSection @ %x\n", BaseAddress); MemoryArea->DeleteInProgress = TRUE; - MiAwaitPageOps(AddressSpace, MemoryArea, BaseAddress); - Section = MemoryArea->Data.SectionData.Section; if (Section->AllocationAttributes & SEC_IMAGE) Modified: branches/arty-newcc/ntoskrnl/mm/section/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] Tue Nov 24 18:45:24 2009 @@ -69,9 +69,7 @@ PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; ULONG Entry; - ULONG Entry1; ULONG Attributes; - PMM_PAGEOP PageOp; PMM_REGION Region; BOOLEAN HasSwapEntry; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); @@ -100,10 +98,14 @@ Region = MmFindRegion(MemoryArea->StartingAddress, &MemoryArea->Data.SectionData.RegionListHead, Address, NULL); + /* * Lock the segment */ MmLockSectionSegment(Segment); + + Entry = MiGetPageEntrySectionSegment(Segment, &Offset); + HasSwapEntry = MmIsPageSwapEntry(Process, (PVOID)PAddress); /* * Check if this page needs to be mapped COW @@ -119,161 +121,38 @@ Attributes = Region->Protect; } - /* - * Get or create a page operation descriptor - */ - PageOp = MmGetPageOp(MemoryArea, NULL, 0, Segment, Offset.QuadPart, MM_PAGEOP_PAGEIN, FALSE); - if (PageOp == NULL) - { - DPRINT1("MmGetPageOp failed\n"); - ASSERT(FALSE); - } - - /* - * Check if someone else is already handling this fault, if so wait - * for them - */ - if (PageOp->Thread != PsGetCurrentThread()) - { - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - Status = MmspWaitForPageOpCompletionEvent(PageOp); - /* - * Check for various strange conditions - */ - if (Status != STATUS_SUCCESS) - { - DPRINT1("Failed to wait for page op, status = %x\n", Status); - ASSERT(FALSE); - } - if (PageOp->Status == STATUS_PENDING) - { - DPRINT1("Woke for page op before completion\n"); - ASSERT(FALSE); - } - MmLockAddressSpace(AddressSpace); - /* - * If this wasn't a pagein then restart the operation - */ - if (PageOp->OpType != MM_PAGEOP_PAGEIN) - { - MmspCompleteAndReleasePageOp(PageOp); - DPRINT("Address 0x%.8X\n", Address); - return(STATUS_MM_RESTART_OPERATION); - } - - /* - * If the thread handling this fault has failed then we don't retry - */ - if (!NT_SUCCESS(PageOp->Status)) - { - Status = PageOp->Status; - MmspCompleteAndReleasePageOp(PageOp); - DPRINT("Address 0x%.8X\n", Address); - return(Status); - } - MmLockSectionSegment(Segment); - /* - * If the completed fault was for another address space then set the - * page in this one. - */ - if (!MmIsPagePresent(Process, Address)) - { - DPRINT("!MmIsPagePresent(%p, %p)\n", Process, Address); - - Entry = MiGetPageEntrySectionSegment(Segment, &Offset); - HasSwapEntry = MmIsPageSwapEntry(Process, (PVOID)PAddress); - - if (PAGE_FROM_SSE(Entry) == 0 || HasSwapEntry) - { - /* - * The page was a private page in another or in our address space - */ - MmUnlockSectionSegment(Segment); - MmspCompleteAndReleasePageOp(PageOp); - return(STATUS_MM_RESTART_OPERATION); - } - - Page = PFN_FROM_SSE(Entry); - - MmSharePageEntrySectionSegment(Segment, &Offset); - - /* FIXME: Should we call MmCreateVirtualMappingUnsafe if - * (Section->AllocationAttributes & SEC_PHYSICALMEMORY) is true? - */ - Status = MmCreateVirtualMapping(Process, - Address, - Attributes, - &Page, - 1); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unable to create virtual mapping\n"); - ASSERT(FALSE); - } - MmInsertRmap(Page, Process, (PVOID)PAddress); - } - if (Locked) - { - MmLockPage(Page); - } - MmUnlockSectionSegment(Segment); - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); - DPRINT("Address 0x%.8X\n", Address); - return(STATUS_SUCCESS); - } - - /* - * Get the entry corresponding to the offset within the section - */ - Entry = MiGetPageEntrySectionSegment(Segment, &Offset); - if (Entry == 0) { - /* - * If the entry is zero (and it can't change because we have - * locked the segment) then we need to load the page. - */ - - /* - * Release all our locks and read in the page from disk - */ - MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); - Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); if (!NT_SUCCESS(Status)) { DPRINT1("MmRequestPageMemoryConsumer failed (Status %x)\n", Status); + MmLockAddressSpace(AddressSpace); + MmUnlockSectionSegment(Segment); + return Status; } + + DPRINT("Allocated page %x\n", Page); Status = MmCreateVirtualMapping(Process, - Address, + PAddress, Attributes, &Page, 1); if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - ASSERT(FALSE); + MmReleasePageMemoryConsumer(MC_USER, Page); + DPRINT("Release page %x\n", Page); + MmLockAddressSpace(AddressSpace); + MmUnlockSectionSegment(Segment); + return Status; } /* * Relock the address space and segment */ MmLockAddressSpace(AddressSpace); - MmLockSectionSegment(Segment); - - /* - * Check the entry. No one should change the status of a page - * that has a pending page-in. - */ - Entry1 = MiGetPageEntrySectionSegment(Segment, &Offset); - if (Entry != Entry1) - { - DPRINT1("Someone changed ppte entry while we slept\n"); - ASSERT(FALSE); - } /* * Mark the offset within the section as having valid, in-memory @@ -281,16 +160,14 @@ */ Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); MiSetPageEntrySectionSegment(Segment, &Offset, Entry); - MmUnlockSectionSegment(Segment); - MmInsertRmap(Page, Process, (PVOID)PAddress); if (Locked) { MmLockPage(Page); } - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); + + MmUnlockSectionSegment(Segment); DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } @@ -302,8 +179,6 @@ { MmLockPage(Page); } - PageOp->Status = Status; - MmspCompleteAndReleasePageOp(PageOp); return Status; } else @@ -333,8 +208,6 @@ { MmLockPage(Page); } - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } @@ -699,8 +572,6 @@ PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) { ULONG Entry; - PMM_PAGEOP PageOp; - NTSTATUS Status; LARGE_INTEGER Offset; PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; @@ -717,26 +588,6 @@ Section = MemoryArea->Data.SectionData.Section; Segment = MemoryArea->Data.SectionData.Segment; - - PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset.QuadPart); - - while (PageOp) - { - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - - Status = MmspWaitForPageOpCompletionEvent(PageOp); - if (Status != STATUS_SUCCESS) - { - DPRINT1("Failed to wait for page op, status = %x\n", Status); - ASSERT(FALSE); - } - - MmLockAddressSpace(AddressSpace); - MmLockSectionSegment(Segment); - MmspCompleteAndReleasePageOp(PageOp); - PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset.QuadPart); - } DPRINT("MmFreeSectionPage -> MmGetPageEntrySectionSegment(%p, %x)\n", Segment, Offset.u.LowPart); Entry = MiGetPageEntrySectionSegment(Segment, &Offset);

14 years, 10 months

[arty] 44280: Fix up elf support.

by arty＠svn.reactos.org

Author: arty Date: Tue Nov 24 16:57:31 2009 New Revision: 44280 URL: http://svn.reactos.org/svn/reactos?rev=44280&view=rev Log: Fix up elf support. Modified: branches/arty-newcc/ntoskrnl/mm/section/elf.inc.h Modified: branches/arty-newcc/ntoskrnl/mm/section/elf.inc.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/elf.inc.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/elf.inc.h [iso-8859-1] Tue Nov 24 16:57:31 2009 @@ -2,6 +2,50 @@ #include <debug.h> #include <reactos/exeformat.h> + +#define IMAGE_SUBSYSTEM_UNKNOWN 0 +#define IMAGE_SUBSYSTEM_NATIVE 1 +#define IMAGE_SUBSYSTEM_WINDOWS_GUI 2 +#define IMAGE_SUBSYSTEM_WINDOWS_CUI 3 +#define IMAGE_SUBSYSTEM_OS2_CUI 5 +#define IMAGE_SUBSYSTEM_POSIX_CUI 7 +#define IMAGE_SUBSYSTEM_NATIVE_WINDOWS 8 +#define IMAGE_SUBSYSTEM_WINDOWS_CE_GUI 9 +#define IMAGE_SUBSYSTEM_EFI_APPLICATION 10 +#define IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER 11 +#define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER 12 +#define IMAGE_SUBSYSTEM_EFI_ROM 13 +#define IMAGE_SUBSYSTEM_XBOX 14 + +#define IMAGE_FILE_MACHINE_UNKNOWN 0 +#define IMAGE_FILE_MACHINE_AM33 0x1d3 +#define IMAGE_FILE_MACHINE_AMD64 0x8664 +#define IMAGE_FILE_MACHINE_ARM 0x1c0 +#define IMAGE_FILE_MACHINE_EBC 0xebc +#define IMAGE_FILE_MACHINE_I386 0x14c +#define IMAGE_FILE_MACHINE_IA64 0x200 +#define IMAGE_FILE_MACHINE_M32R 0x9041 +#define IMAGE_FILE_MACHINE_MIPS16 0x266 +#define IMAGE_FILE_MACHINE_MIPSFPU 0x366 +#define IMAGE_FILE_MACHINE_MIPSFPU16 0x466 +#define IMAGE_FILE_MACHINE_POWERPC 0x1f0 +#define IMAGE_FILE_MACHINE_POWERPCFP 0x1f1 +#define IMAGE_FILE_MACHINE_R4000 0x166 +#define IMAGE_FILE_MACHINE_SH3 0x1a2 +#define IMAGE_FILE_MACHINE_SH3E 0x01a4 +#define IMAGE_FILE_MACHINE_SH3DSP 0x1a3 +#define IMAGE_FILE_MACHINE_SH4 0x1a6 +#define IMAGE_FILE_MACHINE_SH5 0x1a8 +#define IMAGE_FILE_MACHINE_THUMB 0x1c2 +#define IMAGE_FILE_MACHINE_WCEMIPSV2 0x169 +#define IMAGE_FILE_MACHINE_R3000 0x162 +#define IMAGE_FILE_MACHINE_R10000 0x168 +#define IMAGE_FILE_MACHINE_ALPHA 0x184 +#define IMAGE_FILE_MACHINE_ALPHA64 0x0284 +#define IMAGE_FILE_MACHINE_AXP64 IMAGE_FILE_MACHINE_ALPHA64 +#define IMAGE_FILE_MACHINE_CEE 0xC0EE +#define IMAGE_FILE_MACHINE_TRICORE 0x0520 +#define IMAGE_FILE_MACHINE_CEF 0x0CEF #ifndef __ELF_WORD_SIZE #error __ELF_WORD_SIZE must be defined @@ -560,8 +604,8 @@ ASSERT(nFileSize <= MAXULONG); - pssSegments[j].Length = (ULONG)(nVirtualSize & 0xFFFFFFFF); - pssSegments[j].RawLength = (ULONG)(nFileSize & 0xFFFFFFFF); + pssSegments[j].Length.QuadPart = (ULONG)(nVirtualSize & 0xFFFFFFFF); + pssSegments[j].RawLength.QuadPart = (ULONG)(nFileSize & 0xFFFFFFFF); /* File offset */ nFileOffset = ElfFmtpAlignDown(nFileOffset, nAlignment); @@ -573,7 +617,7 @@ DIE(("File offset of loadable segment is too large\n")); #endif - pssSegments[j].FileOffset = (LONG64)nFileOffset; + pssSegments[j].Image.FileOffset = (LONG64)nFileOffset; /* Virtual address */ nVirtualAddr = ElfFmtpAlignDown(nVirtualAddr, nAlignment); @@ -582,10 +626,10 @@ { /* First segment: its address is the base address of the image */ nImageBase = nVirtualAddr; - pssSegments[j].VirtualAddress = 0; + pssSegments[j].Image.VirtualAddress = 0; /* Several places make this assumption */ - if(pssSegments[j].FileOffset != 0) + if(pssSegments[j].Image.FileOffset != 0) DIE(("First loadable segment doesn't contain the ELF header\n")); } else @@ -601,9 +645,9 @@ if(nVirtualOffset > MAXULONG) DIE(("Virtual image larger than 4GB\n")); - pssSegments[j].VirtualAddress = (ULONG)(nVirtualOffset & 0xFFFFFFFF); - - if(pssSegments[j].VirtualAddress != nPrevVirtualEndOfSegment) + pssSegments[j].Image.VirtualAddress = (ULONG)(nVirtualOffset & 0xFFFFFFFF); + + if(pssSegments[j].Image.VirtualAddress != nPrevVirtualEndOfSegment) DIE(("Loadable segments are not sorted and contiguous\n")); } @@ -622,23 +666,23 @@ if(pssSegments[j].Protection & PAGE_IS_EXECUTABLE) { ImageSectionObject->Executable = TRUE; - pssSegments[j].Characteristics = IMAGE_SCN_CNT_CODE; + pssSegments[j].Image.Characteristics = IMAGE_SCN_CNT_CODE; } - else if(pssSegments[j].RawLength == 0) - pssSegments[j].Characteristics = IMAGE_SCN_CNT_UNINITIALIZED_DATA; + else if(pssSegments[j].RawLength.QuadPart == 0) + pssSegments[j].Image.Characteristics = IMAGE_SCN_CNT_UNINITIALIZED_DATA; else - pssSegments[j].Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA; + pssSegments[j].Image.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA; /* FIXME: see the TODO above. This is the safest way to load ELF drivers, for now, if a bit wasteful of memory */ - pssSegments[j].Characteristics |= IMAGE_SCN_MEM_NOT_PAGED; + pssSegments[j].Image.Characteristics |= IMAGE_SCN_MEM_NOT_PAGED; /* Copy-on-write */ pssSegments[j].WriteCopy = TRUE; - if(!Intsafe_AddULong32(&nPrevVirtualEndOfSegment, pssSegments[j].VirtualAddress, pssSegments[j].Length)) + if(!Intsafe_AddULong32(&nPrevVirtualEndOfSegment, pssSegments[j].Image.VirtualAddress, (ULONG)pssSegments[j].Length.QuadPart)) DIE(("Virtual image larger than 4GB\n")); ++ j;

14 years, 10 months

[arty] 44279: MiSwapInSectionPage releases the segment.

by arty＠svn.reactos.org

Author: arty Date: Tue Nov 24 02:12:27 2009 New Revision: 44279 URL: http://svn.reactos.org/svn/reactos?rev=44279&view=rev Log: MiSwapInSectionPage releases the segment. Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c branches/arty-newcc/ntoskrnl/mm/section/image.c branches/arty-newcc/ntoskrnl/mm/section/pagefile.c Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] Tue Nov 24 02:12:27 2009 @@ -523,11 +523,11 @@ else if (IS_SWAP_FROM_SSE(Entry)) { Status = MiSwapInSectionPage(AddressSpace, MemoryArea, Segment, Address, &Page); + // MiSwapInSectionPage unlocks the section segment if (Locked) { MmLockPage(Page); } - MmUnlockSectionSegment(Segment); DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } @@ -716,6 +716,7 @@ return(STATUS_SUCCESS); } +/* Unlocks section segment */ NTSTATUS NTAPI MiSwapInSectionPage Modified: branches/arty-newcc/ntoskrnl/mm/section/image.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/image.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/image.c [iso-8859-1] Tue Nov 24 02:12:27 2009 @@ -459,11 +459,11 @@ else if (IS_SWAP_FROM_SSE(Entry)) { Status = MiSwapInSectionPage(AddressSpace, MemoryArea, Segment, Address, &Page); + // MiSwapInSectionPage unlocks the section segment if (Locked) { MmLockPage(Page); } - MmUnlockSectionSegment(Segment); //DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } Modified: branches/arty-newcc/ntoskrnl/mm/section/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] Tue Nov 24 02:12:27 2009 @@ -297,6 +297,7 @@ else if (IS_SWAP_FROM_SSE(Entry)) { Status = MiSwapInSectionPage(AddressSpace, MemoryArea, Segment, Address, &Page); + // MiSwapInSectionPage unlocks the section segment if (NT_SUCCESS(Status) && Locked) { MmLockPage(Page);

14 years, 10 months

[arty] 44278: Fix bugs: io - weren't at DISPATCH_LEVEL when using hyperspace. data - simplify page free and writeback in data sections.

by arty＠svn.reactos.org

Author: arty Date: Tue Nov 24 01:48:06 2009 New Revision: 44278 URL: http://svn.reactos.org/svn/reactos?rev=44278&view=rev Log: Fix bugs: io - weren't at DISPATCH_LEVEL when using hyperspace. data - simplify page free and writeback in data sections. Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c branches/arty-newcc/ntoskrnl/mm/section/io.c Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] Tue Nov 24 01:48:06 2009 @@ -2216,8 +2216,6 @@ PFILE_OBJECT FileObject; LARGE_INTEGER Offset; SWAPENTRY SavedSwapEntry; - PMM_PAGEOP PageOp; - NTSTATUS Status; PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; PMMSUPPORT AddressSpace; @@ -2234,26 +2232,6 @@ Section = MemoryArea->Data.SectionData.Section; Segment = MemoryArea->Data.SectionData.Segment; FileObject = Section->FileObject; - - PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset.QuadPart); - - while (PageOp) - { - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - - Status = MmspWaitForPageOpCompletionEvent(PageOp); - if (Status != STATUS_SUCCESS) - { - DPRINT1("Failed to wait for page op, status = %x\n", Status); - ASSERT(FALSE); - } - - MmLockAddressSpace(AddressSpace); - MmLockSectionSegment(Segment); - MmspCompleteAndReleasePageOp(PageOp); - PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset.QuadPart); - } Entry = MiGetPageEntrySectionSegment(Segment, &Offset); @@ -2263,8 +2241,17 @@ */ if (Page == PFN_FROM_SSE(Entry) && Dirty) { - DPRINT("Writing back dirty section page %08x%08x\n", Offset.u.HighPart, Offset.u.LowPart); - Status = MiWriteBackPage(FileObject, &Offset, PAGE_SIZE, Page); + MmReferencePage(Page); + MmUnlockSectionSegment(Segment); + MiWriteBackPage(FileObject, &Offset, PAGE_SIZE, Page); + MmLockSectionSegment(Segment); + MmDereferencePage(Page); + Entry = MiGetPageEntrySectionSegment(Segment, &Offset); + if (Page != PFN_FROM_SSE(Entry)) + { + // Somebody else freed the page while we were unlocked + return; + } } if (SwapEntry != 0) Modified: branches/arty-newcc/ntoskrnl/mm/section/io.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/io.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/io.c [iso-8859-1] Tue Nov 24 01:48:06 2009 @@ -431,13 +431,16 @@ NTSTATUS Status; PVOID Hyperspace; IO_STATUS_BLOCK Iosb; + KIRQL OldIrql; PVOID PageBuffer = ExAllocatePool(NonPagedPool, PAGE_SIZE); if (!PageBuffer) return STATUS_NO_MEMORY; + OldIrql = KfRaiseIrql(DISPATCH_LEVEL); Hyperspace = MmCreateHyperspaceMapping(Page); RtlCopyMemory(PageBuffer, Hyperspace, PAGE_SIZE); MmDeleteHyperspaceMapping(Hyperspace); + KfLowerIrql(OldIrql); DPRINT("MiWriteBackPage(%wZ,%08x%08x)\n", &FileObject->FileName, FileOffset->u.HighPart, FileOffset->u.LowPart); Status = MiSimpleWrite

14 years, 10 months

[arty] 44277: Prevent deadlock by purging the cache (with delete) in CcUninitializeCacheMap.

by arty＠svn.reactos.org

Author: arty Date: Tue Nov 24 00:43:16 2009 New Revision: 44277 URL: http://svn.reactos.org/svn/reactos?rev=44277&view=rev Log: Prevent deadlock by purging the cache (with delete) in CcUninitializeCacheMap. Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c branches/arty-newcc/ntoskrnl/cache/fssup.c Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/cache… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] Tue Nov 24 00:43:16 2009 @@ -176,7 +176,7 @@ Bcb->Dirty = FALSE; ListEntry = ListEntry->Flink; - if (Delete && Bcb->RefCount == 2) + if (Delete && Bcb->RefCount < 2) { Bcb->RefCount = 1; CcpDereferenceCache(Bcb - CcCacheSections, FALSE); Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/fssup… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] Tue Nov 24 00:43:16 2009 @@ -160,6 +160,9 @@ ASSERT(UninitializeEvent == NULL); + if (Map) + CcpFlushCache(Map, NULL, 0, NULL, TRUE); + CcpLock(); if (PrivateCacheMap) {

14 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
...
45
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2009