Ros-diffs March 2013

ros-diffs@reactos.org

14 participants
249 discussions

[spetreolle] 58471: [AUDIOSRV] Fix log message.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Mon Mar 11 20:59:01 2013 New Revision: 58471 URL: http://svn.reactos.org/svn/reactos?rev=58471&view=rev Log: [AUDIOSRV] Fix log message. Modified: trunk/reactos/base/services/audiosrv/main.c Modified: trunk/reactos/base/services/audiosrv/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/mai… ============================================================================== --- trunk/reactos/base/services/audiosrv/main.c [iso-8859-1] (original) +++ trunk/reactos/base/services/audiosrv/main.c [iso-8859-1] Mon Mar 11 20:59:01 2013 @@ -149,7 +149,7 @@ return; } - logmsg("* Service started"); + logmsg("* Service started\n"); /* Tell SCM we are now running, and we may be stopped */ service_status.dwCurrentState = SERVICE_RUNNING; service_status.dwControlsAccepted = SERVICE_ACCEPT_STOP;

11 years, 9 months

[akhaldi] 58470: [DDK] * Annotate ntpoapi.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 11 19:49:26 2013 New Revision: 58470 URL: http://svn.reactos.org/svn/reactos?rev=58470&view=rev Log: [DDK] * Annotate ntpoapi.h. Modified: trunk/reactos/include/ddk/ntpoapi.h Modified: trunk/reactos/include/ddk/ntpoapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntpoapi.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] Mon Mar 11 19:49:26 2013 @@ -150,9 +150,11 @@ ULONG IdleHandlerReserved[4]; } PROCESSOR_IDLE_TIMES, *PPROCESSOR_IDLE_TIMES; -typedef BOOLEAN -(FASTCALL*PPROCESSOR_IDLE_HANDLER)( - IN OUT PPROCESSOR_IDLE_TIMES IdleTimes); +_Function_class_(PROCESSOR_IDLE_HANDLER) +typedef NTSTATUS +(FASTCALL *PPROCESSOR_IDLE_HANDLER)( + _In_ ULONG_PTR Context, + _Inout_ PPROCESSOR_IDLE_TIMES IdleTimes); typedef struct _PROCESSOR_IDLE_HANDLER_INFO { ULONG HardwareLatency; @@ -188,17 +190,21 @@ PowerStateMaximum } POWER_STATE_HANDLER_TYPE, *PPOWER_STATE_HANDLER_TYPE; +_Function_class_(ENTER_STATE_SYSTEM_HANDLER) +_IRQL_requires_same_ typedef NTSTATUS -(NTAPI*PENTER_STATE_SYSTEM_HANDLER)( - IN PVOID SystemContext); - +(NTAPI *PENTER_STATE_SYSTEM_HANDLER)( + _In_ PVOID SystemContext); + +_Function_class_(ENTER_STATE_HANDLER) +_IRQL_requires_same_ typedef NTSTATUS -(NTAPI*PENTER_STATE_HANDLER)( - IN PVOID Context, - IN PENTER_STATE_SYSTEM_HANDLER SystemHandler OPTIONAL, - IN PVOID SystemContext, - IN LONG NumberProcessors, - IN LONG volatile *Number); +(NTAPI *PENTER_STATE_HANDLER)( + _In_opt_ PVOID Context, + _In_opt_ PENTER_STATE_SYSTEM_HANDLER SystemHandler, + _In_opt_ PVOID SystemContext, + _In_ LONG NumberProcessors, + _In_opt_ LONG volatile *Number); typedef struct _POWER_STATE_HANDLER { POWER_STATE_HANDLER_TYPE Type; @@ -208,26 +214,30 @@ PVOID Context; } POWER_STATE_HANDLER, *PPOWER_STATE_HANDLER; +_Function_class_(ENTER_STATE_NOTIFY_HANDLER) +_IRQL_requires_same_ typedef NTSTATUS -(NTAPI*PENTER_STATE_NOTIFY_HANDLER)( - IN POWER_STATE_HANDLER_TYPE State, - IN PVOID Context, - IN BOOLEAN Entering); +(NTAPI *PENTER_STATE_NOTIFY_HANDLER)( + _In_ POWER_STATE_HANDLER_TYPE State, + _In_ PVOID Context, + _In_ BOOLEAN Entering); typedef struct _POWER_STATE_NOTIFY_HANDLER { PENTER_STATE_NOTIFY_HANDLER Handler; PVOID Context; } POWER_STATE_NOTIFY_HANDLER, *PPOWER_STATE_NOTIFY_HANDLER; +_IRQL_requires_max_(APC_LEVEL) +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtPowerInformation( - IN POWER_INFORMATION_LEVEL InformationLevel, - IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferLength, - OUT PVOID OutputBuffer OPTIONAL, - IN ULONG OutputBufferLength); + _In_ POWER_INFORMATION_LEVEL InformationLevel, + _In_reads_bytes_opt_(InputBufferLength) PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_writes_bytes_opt_(OutputBufferLength) PVOID OutputBuffer, + _In_ ULONG OutputBufferLength); #define PROCESSOR_STATE_TYPE_PERFORMANCE 1 #define PROCESSOR_STATE_TYPE_THROTTLE 2 @@ -261,49 +271,59 @@ PROCESSOR_PERF_LEVEL PerfLevel[1]; } PROCESSOR_STATE_HANDLER2, *PPROCESSOR_STATE_HANDLER2; +_IRQL_requires_max_(PASSIVE_LEVEL) +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtSetThreadExecutionState( - IN EXECUTION_STATE esFlags, - OUT EXECUTION_STATE *PreviousFlags); + _In_ EXECUTION_STATE esFlags, + _Out_ EXECUTION_STATE *PreviousFlags); NTSYSCALLAPI NTSTATUS NTAPI NtRequestWakeupLatency( - IN LATENCY_TIME latency); - + _In_ LATENCY_TIME latency); + +_IRQL_requires_max_(APC_LEVEL) +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtInitiatePowerAction( - IN POWER_ACTION SystemAction, - IN SYSTEM_POWER_STATE MinSystemState, - IN ULONG Flags, - IN BOOLEAN Asynchronous); - + _In_ POWER_ACTION SystemAction, + _In_ SYSTEM_POWER_STATE MinSystemState, + _In_ ULONG Flags, + _In_ BOOLEAN Asynchronous); + +_IRQL_requires_max_(APC_LEVEL) +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtSetSystemPowerState( - IN POWER_ACTION SystemAction, - IN SYSTEM_POWER_STATE MinSystemState, - IN ULONG Flags); - + _In_ POWER_ACTION SystemAction, + _In_ SYSTEM_POWER_STATE MinSystemState, + _In_ ULONG Flags); + +_IRQL_requires_max_(APC_LEVEL) +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtGetDevicePowerState( - IN HANDLE Device, - OUT DEVICE_POWER_STATE *State); + _In_ HANDLE Device, + _Out_ DEVICE_POWER_STATE *State); NTSYSCALLAPI NTSTATUS NTAPI NtCancelDeviceWakeupRequest( - IN HANDLE Device); - + _In_ HANDLE Device); + +_IRQL_requires_max_(APC_LEVEL) +__kernel_entry NTSYSCALLAPI BOOLEAN NTAPI @@ -313,7 +333,7 @@ NTSTATUS NTAPI NtRequestDeviceWakeup( - IN HANDLE Device); + _In_ HANDLE Device); #define WINLOGON_LOCK_ON_SLEEP 0x00000001

11 years, 9 months

[akhaldi] 58469: [PSDK] * Annotate some structures in ntddstor.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 11 19:48:21 2013 New Revision: 58469 URL: http://svn.reactos.org/svn/reactos?rev=58469&view=rev Log: [PSDK] * Annotate some structures in ntddstor.h. Modified: trunk/reactos/include/psdk/ntddstor.h Modified: trunk/reactos/include/psdk/ntddstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddstor.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddstor.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddstor.h [iso-8859-1] Mon Mar 11 19:48:21 2013 @@ -435,12 +435,12 @@ UCHAR AdditionalParameters[1]; } STORAGE_PROPERTY_QUERY, *PSTORAGE_PROPERTY_QUERY; -typedef struct _STORAGE_DESCRIPTOR_HEADER { +typedef _Struct_size_bytes_(Size) struct _STORAGE_DESCRIPTOR_HEADER { ULONG Version; ULONG Size; } STORAGE_DESCRIPTOR_HEADER, *PSTORAGE_DESCRIPTOR_HEADER; -typedef struct _STORAGE_DEVICE_DESCRIPTOR { +typedef _Struct_size_bytes_(Size) struct _STORAGE_DEVICE_DESCRIPTOR { ULONG Version; ULONG Size; UCHAR DeviceType; @@ -456,7 +456,7 @@ UCHAR RawDeviceProperties[1]; } STORAGE_DEVICE_DESCRIPTOR, *PSTORAGE_DEVICE_DESCRIPTOR; -typedef struct _STORAGE_ADAPTER_DESCRIPTOR { +typedef _Struct_size_bytes_(Size) struct _STORAGE_ADAPTER_DESCRIPTOR { ULONG Version; ULONG Size; ULONG MaximumTransferLength; @@ -475,7 +475,7 @@ USHORT BusMinorVersion; } STORAGE_ADAPTER_DESCRIPTOR, *PSTORAGE_ADAPTER_DESCRIPTOR; -typedef struct _STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR { +typedef _Struct_size_bytes_(Size) struct _STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR { ULONG Version; ULONG Size; ULONG BytesPerCacheLine; @@ -539,7 +539,7 @@ UCHAR Identifier[1]; } STORAGE_IDENTIFIER, *PSTORAGE_IDENTIFIER; -typedef struct _STORAGE_DEVICE_ID_DESCRIPTOR { +typedef _Struct_size_bytes_(Size) struct _STORAGE_DEVICE_ID_DESCRIPTOR { ULONG Version; ULONG Size; ULONG NumberOfIdentifiers; @@ -646,7 +646,7 @@ #endif /* defined(_MSC_EXTENSIONS) */ -typedef struct _STORAGE_READ_CAPACITY { +typedef _Struct_size_bytes_(Size) struct _STORAGE_READ_CAPACITY { ULONG Version; ULONG Size; ULONG BlockLength; @@ -679,7 +679,7 @@ WriteThroughSupported } WRITE_THROUGH; -typedef struct _STORAGE_WRITE_CACHE_PROPERTY { +typedef _Struct_size_bytes_(Size) struct _STORAGE_WRITE_CACHE_PROPERTY { ULONG Version; ULONG Size; WRITE_CACHE_TYPE WriteCacheType;

11 years, 9 months

[akhaldi] 58468: [SAL] * Add _Outptr_opt_result_buffer_ and _Outptr_opt_result_bytebuffer_ annotations.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 11 19:31:40 2013 New Revision: 58468 URL: http://svn.reactos.org/svn/reactos?rev=58468&view=rev Log: [SAL] * Add _Outptr_opt_result_buffer_ and _Outptr_opt_result_bytebuffer_ annotations. Modified: trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=584… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Mon Mar 11 19:31:40 2013 @@ -807,13 +807,13 @@ //#define _Out_z_capcount_(capcount) #define _Outptr_ _SAL2_NAME(_Outptr_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,ValidElements="\n""1")]) #define _Outptr_opt_ _SAL2_NAME(_Outptr_opt_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,ValidElements="\n""1")]) -//#define _Outptr_opt_result_buffer_(size) +#define _Outptr_opt_result_buffer_(size) _SAL2_NAME(_Outptr_opt_result_buffer_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,WritableElements="\n" _SA_SPECSTRIZE(size))]) //#define _Outptr_opt_result_buffer_all_(size) //#define _Outptr_opt_result_buffer_all_maybenull_(size) //#define _Outptr_opt_result_buffer_maybenull_(size) //#define _Outptr_opt_result_buffer_to_(size, count) //#define _Outptr_opt_result_buffer_to_maybenull_(size, count) -//#define _Outptr_opt_result_bytebuffer_(size) +#define _Outptr_opt_result_bytebuffer_(size) _SAL2_NAME(_Outptr_opt_result_bytebuffer_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,WritableBytes="\n" _SA_SPECSTRIZE(size))]) //#define _Outptr_opt_result_bytebuffer_all_(size) #define _Outptr_opt_result_bytebuffer_all_maybenull_(size) _SAL2_NAME(_Outptr_opt_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_Maybe,Notref=1,ValidBytes="\n" _SA_SPECSTRIZE(size))]) //#define _Outptr_opt_result_bytebuffer_maybenull_(size)

11 years, 9 months

[ekohl] 58467: [SAMSRV] Implement SamIFree_SAMPR_PSID_ARRAY.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Mar 10 22:28:26 2013 New Revision: 58467 URL: http://svn.reactos.org/svn/reactos?rev=58467&view=rev Log: [SAMSRV] Implement SamIFree_SAMPR_PSID_ARRAY. Modified: trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.spec Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Sun Mar 10 22:28:26 2013 @@ -66,6 +66,20 @@ VOID NTAPI +SamIFree_SAMPR_PSID_ARRAY(PSAMPR_PSID_ARRAY Ptr) +{ + if (Ptr != NULL) + { + if (Ptr->Sids !=0) + { + MIDL_user_free(Ptr->Sids); + } + } +} + + +VOID +NTAPI SamIFree_SAMPR_RETURNED_USTRING_ARRAY(PSAMPR_RETURNED_USTRING_ARRAY Ptr) { ULONG i; Modified: trunk/reactos/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.sp… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] Sun Mar 10 22:28:26 2013 @@ -24,7 +24,7 @@ @ stub SamIFree_SAMPR_GET_GROUPS_BUFFER @ stub SamIFree_SAMPR_GET_MEMBERS_BUFFER @ stub SamIFree_SAMPR_GROUP_INFO_BUFFER -@ stub SamIFree_SAMPR_PSID_ARRAY +@ stdcall SamIFree_SAMPR_PSID_ARRAY(ptr) @ stdcall SamIFree_SAMPR_RETURNED_USTRING_ARRAY(ptr) @ stub SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR @ stdcall SamIFree_SAMPR_ULONG_ARRAY(ptr)

11 years, 9 months

[ekohl] 58466: [SAMSRV] Update .spec file to Windows XP SP3.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Mar 10 21:49:10 2013 New Revision: 58466 URL: http://svn.reactos.org/svn/reactos?rev=58466&view=rev Log: [SAMSRV] Update .spec file to Windows XP SP3. Modified: trunk/reactos/dll/win32/samsrv/samsrv.spec Modified: trunk/reactos/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.sp… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] Sun Mar 10 21:49:10 2013 @@ -1,7 +1,22 @@ @ stub SamIAccountRestrictions +@ stub SamIAddDSNameToAlias +@ stub SamIAddDSNameToGroup +@ stub SamIAmIGC +@ stub SamIChangePasswordForeignUser +@ stub SamIChangePasswordForeignUser2 @ stub SamIConnect @ stub SamICreateAccountByRid +@ stub SamIDemote +@ stub SamIDemoteUndo +@ stub SamIDoFSMORoleChange +@ stub SamIDsCreateObjectInDomain +@ stub SamIDsSetObjectInformation @ stub SamIEnumerateAccountRids +@ stub SamIEnumerateInterdomainTrustAccountsForUpgrade +@ stub SamIFloatingSingleMasterOpEx +@ stub SamIFreeSidAndAttributesList +@ stub SamIFreeSidArray +@ stub SamIFreeVoid @ stub SamIFree_SAMPR_ALIAS_INFO_BUFFER @ stub SamIFree_SAMPR_DISPLAY_INFO_BUFFER @ stub SamIFree_SAMPR_DOMAIN_INFO_BUFFER @@ -14,15 +29,83 @@ @ stub SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR @ stdcall SamIFree_SAMPR_ULONG_ARRAY(ptr) @ stub SamIFree_SAMPR_USER_INFO_BUFFER +@ stub SamIFree_UserInternal6Information +@ stub SamIGCLookupNames +@ stub SamIGCLookupSids +@ stub SamIGetAliasMembership +@ stub SamIGetBootKeyInformation +@ stub SamIGetDefaultAdministratorName +@ stub SamIGetFixedAttributes +@ stub SamIGetinterdomainTrustAccountPasswordsForUpgrade @ stub SamIGetPrivateData +@ stub SamIGetResourceGroupmembershipsTransitive @ stub SamIGetSerialNumberDomain +@ stub SamIGetuserLogonInformation +@ stub SamIGetuserLogonInformation2 +@ stub SamIGetuserLogonInformationEx +@ stub SamIImpersonateNullSession +@ stub SamIIncrementPerformanceCounter @ stdcall SamIInitialize() +@ stub SamIIsDownlevelDcUpgrade +@ stub SamIIsExtendedSidMode +@ stub SamIIsRebootAfterPromotion +@ stub SamIIsSetupInProgress +@ stub SamILoadDownlevelDatabase +@ stub SamILoopbackConnect +@ stub SamIMixedDomain +@ stub SamIMixedDomain2 +@ stub SamINT4UpgradeInProgress +@ stub SamINetLogonPing @ stub SamINotifyDelta +@ stub SamINotifyRoleChange +@ stub SamINotifyServerDelta +@ stub SamIOpenAccount +@ stub SamIOpenUserByAlternateId +@ stub SamIPromote +@ stub SamIPromoteUndo +@ stub SamIQueryServerRole +@ stub SamIQueryServerRole2 +@ stub SamIRemoveDSNameFromAlias +@ stub SamIRemoveDSNameFromGroup +@ stub SamIRelaceDownlevelDatabase +@ stub SamIResetBadPwdCountOnPdc +@ stub SamIRetrievePrimaryCredentials +@ stub SamIRevertNullSession +@ stub SamISameSite @ stub SamISetAuditingInformation +@ stub SamISetMixedDomainFlag +@ stub SamISetPasswordForeignUser +@ stub SamISetPasswordForeignUser2 +@ stub SamISetPasswordInfoOnPdc @ stub SamISetPrivateData @ stub SamISetSerialNumberDomain +@ stub SamIStorePrimaryCredentials +@ stub SamIUPNFromUserHandle +@ stub SamIUnLoadDownlevelDatabase +@ stub SamIUpdateLogonStatistics +@ stub SampAbortSingleLoopbackTask +@ stub SampAccountControlToFlags +@ stub SampAcquireSamLockExclusive +@ stub SampAcquireWriteLock +@ stub SampCommitBufferedWrites +@ stub SampConvertNt4SdToNt5Sd +@ stub SampDsChangePasswordUser +@ stub SampFlagsToAccountControl +@ stub SampGetDefaultSecurityDescriptorForClass +@ stub SampGetSerialNumberDomain2 @ stdcall SampInitializeRegistry() +@ stub SampInitializeSdConversion +@ stub SampInvalidateDomainCache +@ stub SampInvalidateRidRange +@ stub SampNetLogonNotificationRequired +@ stub SampNotifyReplicatedInChange +@ stub SampProcessSingleLoopbackTask +@ stub SampReleaseSamLockExclusive +@ stub SampReleaseWriteLock @ stub SampRtlConvertUlongToUnicodeString +@ stub SampSetSerialNumberDomain2 +@ stub SampUsingDsData +@ stub SampWriteGroupType @ stdcall SamrAddMemberToAlias(ptr ptr) @ stdcall SamrAddMemberToGroup(ptr long long) @ stdcall SamrAddMultipleMembersToAlias(ptr ptr) @@ -31,6 +114,7 @@ @ stdcall SamrConnect(ptr ptr long) @ stdcall SamrCreateAliasInDomain(ptr ptr long ptr ptr) @ stdcall SamrCreateGroupInDomain(ptr ptr long ptr ptr) +@ stdcall SamrCreateUser2InDomain(ptr ptr long long ptr ptr ptr) @ stdcall SamrCreateUserInDomain(ptr ptr long ptr ptr) @ stdcall SamrDeleteAlias(ptr) @ stdcall SamrDeleteGroup(ptr) @@ -61,6 +145,7 @@ @ stdcall SamrRemoveMemberFromForeignDomain(ptr ptr) @ stdcall SamrRemoveMemberFromGroup(ptr long) @ stdcall SamrRemoveMultipleMembersFromAlias(ptr ptr) +@ stdcall SamrRidToSid(ptr long ptr) @ stdcall SamrSetInformationAlias(ptr long ptr) @ stdcall SamrSetInformationDomain(ptr long ptr) @ stdcall SamrSetInformationGroup(ptr long ptr) @@ -70,4 +155,5 @@ @ stdcall SamrShutdownSamServer(ptr) @ stdcall SamrTestPrivateFunctionsDomain(ptr) @ stdcall SamrTestPrivateFunctionsUser(ptr) +@ stdcall SamrUnicodeChangePasswordUser2(ptr ptr ptr ptr ptr long ptr ptr) ; EOF

11 years, 9 months

[hbelusca] 58465: [CSRSRV] Clarify this one, too.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 10 19:44:48 2013 New Revision: 58465 URL: http://svn.reactos.org/svn/reactos?rev=58465&view=rev Log: [CSRSRV] Clarify this one, too. Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] Sun Mar 10 19:44:48 2013 @@ -560,7 +560,7 @@ Status); /* It's not fatal if the session ID isn't zero */ - if (SessionId) return Status; + if (SessionId != 0) return Status; ASSERT(NT_SUCCESS(Status)); } @@ -578,7 +578,7 @@ if (_stricmp(ParameterName, "ObjectDirectory") == 0) { /* Check if a session ID is specified */ - if (SessionId) + if (SessionId != 0) { DPRINT1("Sessions not yet implemented\n"); ASSERT(SessionId);

11 years, 9 months

[hbelusca] 58464: [CSRSRV] Clarify few parts of code; remove unneeded comments and DPRINTs; start documentation of the CsrCreateProcess routine. [BASESRV-CONSRV-WINSRV] Correct the sizes of the API...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 10 19:37:33 2013 New Revision: 58464 URL: http://svn.reactos.org/svn/reactos?rev=58464&view=rev Log: [CSRSRV] Clarify few parts of code; remove unneeded comments and DPRINTs; start documentation of the CsrCreateProcess routine. [BASESRV-CONSRV-WINSRV] Correct the sizes of the API tables. [SM] Correct the API names. Modified: branches/ros-csrss/base/system/smss/smloop.c branches/ros-csrss/include/reactos/subsys/csr/csr.h branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h branches/ros-csrss/include/reactos/subsys/sm/smmsg.h branches/ros-csrss/lib/smlib/smclient.c branches/ros-csrss/subsystems/win/basesrv/init.c branches/ros-csrss/subsystems/win32/csrsrv/api.c branches/ros-csrss/subsystems/win32/csrsrv/api.h branches/ros-csrss/subsystems/win32/csrsrv/init.c branches/ros-csrss/subsystems/win32/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrsrv/server.c branches/ros-csrss/subsystems/win32/csrsrv/session.c branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/init.c branches/ros-csrss/win32ss/user/winsrv/init.c Modified: branches/ros-csrss/base/system/smss/smloop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/smss/smlo… ============================================================================== --- branches/ros-csrss/base/system/smss/smloop.c [iso-8859-1] (original) +++ branches/ros-csrss/base/system/smss/smloop.c [iso-8859-1] Sun Mar 10 19:37:33 2013 @@ -166,7 +166,7 @@ return STATUS_NOT_IMPLEMENTED; } -PSM_API_HANDLER SmpApiDispatch[SmMaxApiNumber] = +PSM_API_HANDLER SmpApiDispatch[SmpMaxApiNumber - SmpCreateForeignSessionApi] = { SmpCreateForeignSession, SmpSessionComplete, @@ -401,13 +401,13 @@ RequestMsg.ReturnValue = STATUS_PENDING; /* Check if the API is valid */ - if (RequestMsg.ApiNumber >= SmMaxApiNumber) + if (RequestMsg.ApiNumber >= SmpMaxApiNumber) { /* It isn't, fail */ DPRINT1("Invalid API: %lx\n", RequestMsg.ApiNumber); Status = STATUS_NOT_IMPLEMENTED; } - else if ((RequestMsg.ApiNumber <= SmTerminateForeignSessionApi) && + else if ((RequestMsg.ApiNumber <= SmpTerminateForeignSessionApi) && !(ClientContext->Subsystem)) { /* It's valid, but doesn't have a subsystem with it */ Modified: branches/ros-csrss/include/reactos/subsys/csr/csr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csr.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csr.h [iso-8859-1] Sun Mar 10 19:37:33 2013 @@ -11,17 +11,6 @@ #define _CSR_H #include "csrmsg.h" - -/* -BOOLEAN -NTAPI -CsrCaptureArguments(IN PCSR_THREAD CsrThread, - IN PCSR_API_MESSAGE ApiMessage); - -VOID -NTAPI -CsrReleaseCapturedArguments(IN PCSR_API_MESSAGE ApiMessage); -*/ NTSTATUS NTAPI Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] Sun Mar 10 19:37:33 2013 @@ -107,7 +107,7 @@ PORT_MESSAGE Header; union { - CSR_CONNECTION_INFO ConnectionInfo; // Uniquely used in csrss/csrsrv for internal signaling (opening a new connection). + CSR_CONNECTION_INFO ConnectionInfo; // Uniquely used in CSRSRV for internal signaling (opening a new connection). struct { PCSR_CAPTURE_BUFFER CsrCaptureData; 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] Sun Mar 10 19:37:33 2013 @@ -247,19 +247,6 @@ /* PROTOTYPES ****************************************************************/ -/////////// -BOOLEAN -NTAPI -CsrCaptureArguments(IN PCSR_THREAD CsrThread, - IN PCSR_API_MESSAGE ApiMessage); - -VOID -NTAPI -CsrReleaseCapturedArguments(IN PCSR_API_MESSAGE ApiMessage); -////////// - - - NTSTATUS NTAPI CsrServerInitialization(IN ULONG ArgumentCount, Modified: branches/ros-csrss/include/reactos/subsys/sm/smmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/sm/smmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/sm/smmsg.h [iso-8859-1] Sun Mar 10 19:37:33 2013 @@ -18,17 +18,21 @@ // in the checked build of SMSS, which is probably a close approximation. We add // "p" to use the similar nomenclature seen/leaked out in the Base CSRSS APIs. // +// The enumeration finishes with an enumeratee holding the maximum API number. +// Its name is based on BasepMaxApiNumber, UserpMaxApiNumber... +// // typedef enum _SMSRV_API_NUMBER { - SmCreateForeignSessionApi, - SmSessionCompleteApi, - SmTerminateForeignSessionApi, - SmExecPgmApi, - SmLoadDeferedSubsystemApi, - SmStartCsrApi, - SmStopCsrApi, - SmMaxApiNumber // Based on BasepMaxApiNumber, UserpMaxApiNumber... + SmpCreateForeignSessionApi, + SmpSessionCompleteApi, + SmpTerminateForeignSessionApi, + SmpExecPgmApi, + SmpLoadDeferedSubsystemApi, + SmpStartCsrApi, + SmpStopCsrApi, + + SmpMaxApiNumber } SMSRV_API_NUMBER; // @@ -108,7 +112,7 @@ #endif // -// There are the APIs that the SMSS Serve can send to a client (such as CSRSS) +// There are the APIs that the SMSS Server can send to a client (such as CSRSS). // // These are called "SB" APIs. // @@ -117,6 +121,9 @@ // We add "p" to use the similar nomenclature seen/leaked out in the Base CSRSS // APIs. // +// The enumeration finishes with an enumeratee holding the maximum API number. +// Its name is based on BasepMaxApiNumber, UserpMaxApiNumber... +// // typedef enum _SB_API_NUMBER { @@ -124,7 +131,8 @@ SbpTerminateSession, SbpForeignSessionComplete, SbpCreateProcess, - SbpMaxApiNumber // Based on BasepMaxApiNumber, UserpMaxApiNumber... + + SbpMaxApiNumber } SB_API_NUMBER; // Modified: branches/ros-csrss/lib/smlib/smclient.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/smlib/smclient.c?… ============================================================================== --- branches/ros-csrss/lib/smlib/smclient.c [iso-8859-1] (original) +++ branches/ros-csrss/lib/smlib/smclient.c [iso-8859-1] Sun Mar 10 19:37:33 2013 @@ -38,7 +38,7 @@ SmApiMsg.h.u1.s1.TotalLength = sizeof(SmApiMsg); /* Initalize this specific API's parameters */ - SmApiMsg.ApiNumber = SmExecPgmApi; + SmApiMsg.ApiNumber = SmpExecPgmApi; RtlCopyMemory(&SmApiMsg.u.ExecPgm.ProcessInformation, ProcessInformation, sizeof(SmApiMsg.u.ExecPgm.ProcessInformation)); @@ -144,7 +144,7 @@ SessionComplete->SessionStatus = SessionStatus; /* Set the API Message Port Message header */ - ApiMessage.ApiNumber = SmSessionCompleteApi; + ApiMessage.ApiNumber = SmpSessionCompleteApi; ApiMessage.h.u1.s1.DataLength = sizeof(SM_SESSION_COMPLETE_MSG) + 8; ApiMessage.h.u1.s1.TotalLength = sizeof(SM_API_MSG); ApiMessage.h.u2.ZeroInit = 0; Modified: branches/ros-csrss/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… ============================================================================== --- branches/ros-csrss/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win/basesrv/init.c [iso-8859-1] Sun Mar 10 19:37:33 2013 @@ -23,7 +23,7 @@ PBASE_STATIC_SERVER_DATA BaseStaticServerData = NULL; // Data that we can share amongst processes. Initialized inside BaseSrvSharedHeap. // Windows Server 2003 table from http://j00ru.vexillium.org/csrss_list/api_list.html#Windows_2k3 -PCSR_API_ROUTINE BaseServerApiDispatchTable[BasepMaxApiNumber] = +PCSR_API_ROUTINE BaseServerApiDispatchTable[BasepMaxApiNumber - BASESRV_FIRST_API_NUMBER] = { BaseSrvCreateProcess, BaseSrvCreateThread, @@ -57,7 +57,7 @@ // BaseSrvNlsGetUserInfo, }; -BOOLEAN BaseServerApiServerValidTable[BasepMaxApiNumber] = +BOOLEAN BaseServerApiServerValidTable[BasepMaxApiNumber - BASESRV_FIRST_API_NUMBER] = { TRUE, // BaseSrvCreateProcess TRUE, // BaseSrvCreateThread @@ -91,7 +91,7 @@ // FALSE, // BaseSrvNlsGetUserInfo }; -PCHAR BaseServerApiNameTable[BasepMaxApiNumber] = +PCHAR BaseServerApiNameTable[BasepMaxApiNumber - BASESRV_FIRST_API_NUMBER] = { "BaseCreateProcess", "BaseCreateThread", 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] Sun Mar 10 19:37:33 2013 @@ -269,7 +269,7 @@ NTSTATUS Status; /* Decrease the count, and see if we're out */ - if (!(_InterlockedDecrement(&CsrpStaticThreadCount))) + if (_InterlockedDecrement(&CsrpStaticThreadCount) == 0) { /* Check if we've still got space for a Dynamic Thread */ if (CsrpDynamicThreadTotal < CsrMaxApiRequestThreads) @@ -879,8 +879,7 @@ * * @param None * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks None. * @@ -1010,7 +1009,7 @@ NTAPI CsrConnectToUser(VOID) { -#if 0 // This code is OK, however it is ClientThreadSetup which sucks. +#if 0 // FIXME: This code is OK, however it is ClientThreadSetup which sucks. NTSTATUS Status; ANSI_STRING DllName; UNICODE_STRING TempName; @@ -1074,7 +1073,9 @@ PCSR_THREAD CsrThread; /* Save pointer to this thread in TEB */ + CsrAcquireProcessLock(); CsrThread = CsrLocateThreadInProcess(NULL, &Teb->ClientId); + CsrReleaseProcessLock(); if (CsrThread) Teb->CsrClientThread = CsrThread; /* Return it */ @@ -1099,7 +1100,6 @@ NTAPI CsrQueryApiPort(VOID) { - DPRINT("CSRSRV: %s called\n", __FUNCTION__); return CsrApiPort; } @@ -1309,7 +1309,6 @@ RtlFreeHeap(CsrHeap, 0, RemoteCaptureBuffer); } - /*++ * @name CsrValidateMessageBuffer * @implemented NT5.1 @@ -1404,36 +1403,6 @@ return FALSE; } -/*** This is what we have in consrv/server.c *** - -/\* Ensure that a captured buffer is safe to access *\/ -BOOL FASTCALL -Win32CsrValidateBuffer(PCSR_PROCESS ProcessData, PVOID Buffer, - SIZE_T NumElements, SIZE_T ElementSize) -{ - /\* Check that the following conditions are true: - * 1. The start of the buffer is somewhere within the process's - * shared memory section view. - * 2. The remaining space in the view is at least as large as the buffer. - * (NB: Please don't try to "optimize" this by using multiplication - * instead of division; remember that 2147483648 * 2 = 0.) - * 3. The buffer is DWORD-aligned. - *\/ - ULONG_PTR Offset = (BYTE *)Buffer - (BYTE *)ProcessData->ClientViewBase; - if (Offset >= ProcessData->ClientViewBounds - || NumElements > (ProcessData->ClientViewBounds - Offset) / ElementSize - || (Offset & (sizeof(DWORD) - 1)) != 0) - { - DPRINT1("Invalid buffer %p(%u*%u); section view is %p(%u)\n", - Buffer, NumElements, ElementSize, - ProcessData->ClientViewBase, ProcessData->ClientViewBounds); - return FALSE; - } - return TRUE; -} - -***********************************************/ - /*++ * @name CsrValidateMessageString * @implemented NT5.1 Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/api.h [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/api.h [iso-8859-1] Sun Mar 10 19:37:33 2013 @@ -64,7 +64,6 @@ extern RTL_CRITICAL_SECTION CsrProcessLock; extern RTL_CRITICAL_SECTION CsrWaitListsLock; extern HANDLE CsrObjectDirectory; -extern PSB_API_ROUTINE CsrServerSbApiDispatch[5]; /****************************************************/ @@ -75,24 +74,19 @@ CSR_API(CsrSrvSetPriorityClass); -/*** - -BOOLEAN -NTAPI -CsrCaptureArguments( - IN PCSR_THREAD CsrThread, - IN PCSR_API_MESSAGE ApiMessage -); +NTSTATUS +NTAPI +CsrServerDllInitialization(IN PCSR_SERVER_DLL LoadedServerDll); + + +BOOLEAN +NTAPI +CsrCaptureArguments(IN PCSR_THREAD CsrThread, + IN PCSR_API_MESSAGE ApiMessage); VOID NTAPI CsrReleaseCapturedArguments(IN PCSR_API_MESSAGE ApiMessage); - -NTSTATUS -NTAPI -CsrServerDllInitialization(IN PCSR_SERVER_DLL LoadedServerDll); - -***/ NTSTATUS NTAPI @@ -115,16 +109,16 @@ VOID NTAPI -CsrRemoveProcess(IN PCSR_PROCESS CsrProcess); - -VOID -NTAPI CsrInsertProcess(IN PCSR_PROCESS ParentProcess OPTIONAL, IN PCSR_PROCESS CsrProcess); -NTSTATUS -NTAPI -CsrApiRequestThread(IN PVOID Parameter); // HANDLE ServerPort ?? +VOID +NTAPI +CsrRemoveProcess(IN PCSR_PROCESS CsrProcess); + +NTSTATUS +NTAPI +CsrApiRequestThread(IN PVOID Parameter); VOID NTAPI Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] Sun Mar 10 19:37:33 2013 @@ -48,8 +48,7 @@ * * @param None. * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks None. * @@ -163,8 +162,7 @@ * @param ObjectDirectory * Handle fo the Object Directory to protect. * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks None. * @@ -186,8 +184,7 @@ * @param DosDevicesSd * Pointer to the Security Descriptor to return. * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks Depending on the DOS Devices Protection Mode (set in the registry), * regular users may or may not have full access to the directory. @@ -403,8 +400,7 @@ * @param Session * Session ID for which to create the directories. * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks None. * @@ -534,8 +530,7 @@ * @param Arguments * Array of arguments. * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks None. * @@ -714,8 +709,7 @@ * * @param None. * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks None. * @@ -777,7 +771,6 @@ if (ServerDll && ServerDll->NewProcessCallback) { /* Call the callback */ - DPRINT1("Call NewProcessCallback(NULL, 0x%p) called\n", CsrRootProcess); ServerDll->NewProcessCallback(NULL, CsrRootProcess); } } @@ -794,8 +787,7 @@ * @param LocalSystemSd * Pointer to a pointer to the security descriptor to create. * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks None. * @@ -871,8 +863,7 @@ * * @param None * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks None. * @@ -960,7 +951,7 @@ * @implemented NT4 * * The CsrServerInitialization routine is the native (not Server) entrypoint - * of this Server DLL. It serves as the entrypoint for csrss. + * of this Server DLL. It serves as the entrypoint for CSRSS. * * @param ArgumentCount * Number of arguments on the command line. @@ -968,8 +959,7 @@ * @param Arguments * Array of arguments from the command line. * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks None. * @@ -980,7 +970,6 @@ IN PCHAR Arguments[]) { NTSTATUS Status = STATUS_SUCCESS; - DPRINT("CSRSRV: %s called\n", __FUNCTION__); /* Create the Init Event */ Status = NtCreateEvent(&CsrInitializationEvent, Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Sun Mar 10 19:37:33 2013 @@ -41,7 +41,7 @@ * * @return None. * - * @remarks The "Normal" Priority corresponds to the Normal Forground + * @remarks The "Normal" Priority corresponds to the Normal Foreground * Priority (9) plus a boost of 4. * *--*/ @@ -69,7 +69,7 @@ * * @return None. * - * @remarks The "Shutdown" Priority corresponds to the Normal Forground + * @remarks The "Shutdown" Priority corresponds to the Normal Foreground * Priority (9) plus a boost of 6. * *--*/ @@ -264,7 +264,7 @@ /* Decrease reference count */ LockCount = --CsrProcess->ReferenceCount; ASSERT(LockCount >= 0); - if (!LockCount) + if (LockCount == 0) { /* Call the generic cleanup code */ DPRINT1("Should kill process: %p\n", CsrProcess); @@ -345,8 +345,7 @@ * * @param None. * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks None. * @@ -495,18 +494,25 @@ * @name CsrCreateProcess * @implemented NT4 * - * Do nothing for 500ms. - * - * @param ArgumentCount - * Description of the parameter. Wrapped to more lines on ~70th - * column. - * - * @param Arguments - * Description of the parameter. Wrapped to more lines on ~70th - * column. - * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * The CsrCreateProcess routine creates a CSR Process object for an NT Process. + * + * @param hProcess + * Handle to an existing NT Process to which to associate this + * CSR Process. + * + * @param hThread + * Handle to an existing NT Thread to which to create its + * corresponding CSR Thread for this CSR Process. + * + * @param ClientId + * Pointer to the Client ID structure of the NT Process to associate + * with this CSR Process. + * + * @param NtSession + * @param Flags + * @param DebugCid + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks None. * @@ -597,7 +603,7 @@ } /* Check if CreateProcess got CREATE_NEW_PROCESS_GROUP */ - if (!(Flags & CsrProcessCreateNewGroup)) + if ((Flags & CsrProcessCreateNewGroup) == 0) { /* Create new data */ CsrProcess->ProcessGroupId = HandleToUlong(ClientId->UniqueProcess); @@ -781,7 +787,7 @@ /* Decrease reference count */ LockCount = --CsrProcess->ReferenceCount; ASSERT(LockCount >= 0); - if (!LockCount) + if (LockCount == 0) { /* Call the generic cleanup code */ CsrProcessRefcountZero(CsrProcess); @@ -891,16 +897,15 @@ * @name CsrGetProcessLuid * @implemented NT4 * - * Do nothing for 500ms. + * The CsrGetProcessLuid routine gets the LUID of the given process. * * @param hProcess * Optional handle to the process whose LUID should be returned. * * @param Luid - * Pointer to a LUID Pointer which will receive the CSR Process' LUID - * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * Pointer to a LUID Pointer which will receive the CSR Process' LUID. + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks If hProcess is not supplied, then the current thread's token will * be used. If that too is missing, then the current process' token @@ -1000,7 +1005,7 @@ * @param CsrThread * Pointer to the CSR Thread to impersonate. * - * @return TRUE if impersonation succeeded, false otherwise. + * @return TRUE if impersonation succeeded, FALSE otherwise. * * @remarks Impersonation can be recursive. * @@ -1030,10 +1035,8 @@ if (!NT_SUCCESS(Status)) { /* Failure */ -/* DPRINT1("CSRSS: Can't impersonate client thread - Status = %lx\n", Status); - if (Status != STATUS_BAD_IMPERSONATION_LEVEL) DbgBreakPoint(); -*/ + // if (Status != STATUS_BAD_IMPERSONATION_LEVEL) DbgBreakPoint(); return FALSE; } @@ -1058,8 +1061,7 @@ * Optional pointer to a CSR Process pointer which will hold the * CSR Process corresponding to the given Process ID. * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks Locking a CSR Process is defined as acquiring an extra * reference to it and returning with the Process Lock held. @@ -1124,7 +1126,7 @@ * * @param None. * - * @return TRUE if the reversion was succesful, false otherwise. + * @return TRUE if the reversion was succesful, FALSE otherwise. * * @remarks Impersonation can be recursive; as such, the impersonation token * will only be deleted once the CSR Thread's impersonaton count @@ -1145,11 +1147,11 @@ /* Make sure impersonation is on */ if (!CurrentThread->ImpersonationCount) { - // DPRINT1("CSRSS: CsrRevertToSelf called while not impersonating\n"); + DPRINT1("CSRSS: CsrRevertToSelf called while not impersonating\n"); // DbgBreakPoint(); return FALSE; } - else if (--CurrentThread->ImpersonationCount > 0) + else if ((--CurrentThread->ImpersonationCount) > 0) { /* Success; impersonation count decreased but still not zero */ return TRUE; @@ -1242,8 +1244,7 @@ * @param Flags * Flags to send to the shutdown notification routine. * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks None. * 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] Sun Mar 10 19:37:33 2013 @@ -55,8 +55,8 @@ * @name CsrServerDllInitialization * @implemented NT4 * - * The CsrServerDllInitialization is the initialization routine for - * the this Server DLL. + * The CsrServerDllInitialization is the initialization routine + * for this Server DLL. * * @param LoadedServerDll * Pointer to the CSR Server DLL structure representing this Server DLL. @@ -86,18 +86,17 @@ * @name CsrLoadServerDll * @implemented NT4 * - * The CsrLoadServerDll routine loads a CSR Server DLL and calls its entrypoint + * The CsrLoadServerDll routine loads a CSR Server DLL and calls its entrypoint. * * @param DllString * Pointer to the CSR Server DLL to load and call. * * @param EntryPoint - * Pointer to the name of the server's initialization function. If - * this parameter is NULL, the default ServerDllInitialize will be - * assumed. - * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * Pointer to the name of the server's initialization function. + * If this parameter is NULL, the default ServerDllInitialize + * will be assumed. + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks None. * @@ -119,8 +118,6 @@ PCSR_SERVER_DLL_INIT_CALLBACK ServerDllInitProcedure; ULONG Response; - DPRINT1("CsrLoadServerDll(%s, 0x%p, %lu)\n", DllString, EntryPoint, ServerId); - /* Check if it's beyond the maximum we support */ if (ServerId >= CSR_SERVER_DLL_MAX) return STATUS_TOO_MANY_NAMES; @@ -225,15 +222,10 @@ CsrSrvSharedStaticServerData[ServerDll->ServerId] = ServerDll->SharedSection; } } - else - { - /* Use shared failure code */ - goto LoadFailed; - } - } - else - { -LoadFailed: + } + + if (!NT_SUCCESS(Status)) + { /* Server Init failed, unload it */ if (hServerDll) LdrUnloadDll(hServerDll); @@ -316,15 +308,14 @@ /*++ * @name CsrSrvCreateSharedSection * - * The CsrSrvCreateSharedSection creates the Shared Section that all CSR Server - * DLLs and Clients can use to share data. + * The CsrSrvCreateSharedSection creates the Shared Section that all + * CSR Server DLLs and Clients can use to share data. * * @param ParameterValue * Specially formatted string from our registry command-line which * specifies various arguments for the shared section. * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks None. * @@ -445,8 +436,7 @@ * Pointer to the CSR Connection Info structure for the incoming * connection. * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks None. * @@ -463,7 +453,6 @@ if (CsrProcess) { /* Map the section into this process */ - DPRINT("CSR Process Handle: %p. CSR Process: %p\n", CsrProcess->ProcessHandle, CsrProcess); Status = NtMapViewOfSection(CsrSrvSharedSection, CsrProcess->ProcessHandle, &CsrSrvSharedSectionBase, @@ -553,8 +542,8 @@ * * @return STATUS_INVALID_PARAMETER. * - * @remarks CsrSrvSetPriorityClass does not use this stub because it must - * return success. + * @remarks CsrSrvSetPriorityClass does not use this stub because + * it must return success. * *--*/ CSR_API(CsrSrvUnusedFunction) @@ -621,12 +610,12 @@ NULL); /* Check if this is Session 0, and the Debugger is Enabled */ - if ((NtCurrentPeb()->SessionId) && (NT_SUCCESS(Status)) && + if ((NtCurrentPeb()->SessionId != 0) && (NT_SUCCESS(Status)) && (DebuggerInfo.KernelDebuggerEnabled)) { /* Call the Unhandled Exception Filter */ - if ((Result = RtlUnhandledExceptionFilter(ExceptionInfo)) != - EXCEPTION_CONTINUE_EXECUTION) + Result = RtlUnhandledExceptionFilter(ExceptionInfo); + if (Result != EXCEPTION_CONTINUE_EXECUTION) { /* We're going to raise an error. Get Shutdown Privilege first */ Status = RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, Modified: branches/ros-csrss/subsystems/win32/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/session.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/session.c [iso-8859-1] Sun Mar 10 19:37:33 2013 @@ -18,23 +18,20 @@ RTL_CRITICAL_SECTION CsrNtSessionLock; LIST_ENTRY CsrNtSessionList; -// Does it exist a enumeration associated with it ? -PSB_API_ROUTINE CsrServerSbApiDispatch[5] = +PSB_API_ROUTINE CsrServerSbApiDispatch[SbpMaxApiNumber - SbpCreateSession] = { CsrSbCreateSession, CsrSbTerminateSession, CsrSbForeignSessionComplete, - CsrSbCreateProcess, - NULL + CsrSbCreateProcess }; -PCHAR CsrServerSbApiName[5] = +PCHAR CsrServerSbApiName[SbpMaxApiNumber - SbpCreateSession] = { "SbCreateSession", "SbTerminateSession", "SbForeignSessionComplete", - "SbCreateProcess", - "Unknown Csr Sb Api Number" + "SbCreateProcess" }; /* PRIVATE FUNCTIONS **********************************************************/ @@ -55,8 +52,6 @@ NTAPI CsrInitializeNtSessionList(VOID) { - DPRINT("CSRSRV: %s called\n", __FUNCTION__); - /* Initialize the Session List */ InitializeListHead(&CsrNtSessionList); @@ -170,7 +165,7 @@ ASSERT(Session->ReferenceCount != 0); /* Dereference the Session Object */ - if (!(--Session->ReferenceCount)) + if ((--Session->ReferenceCount) == 0) { /* Remove it from the list */ RemoveEntryList(&Session->SessionLink); @@ -537,8 +532,8 @@ } /* - * It's an API Message, check if it's within limits. If it's not, the - * NT Behaviour is to set this to the Maximum API. + * It's an API Message, check if it's within limits. If it's not, + * the NT Behaviour is to set this to the Maximum API. */ if (ReceiveMsg.ApiNumber > SbpMaxApiNumber) { @@ -555,6 +550,9 @@ /* Call the API */ if (!CsrServerSbApiDispatch[ReceiveMsg.ApiNumber](&ReceiveMsg)) { + DPRINT1("CSRSS: %s Session Api called and failed\n", + CsrServerSbApiName[ReceiveMsg.ApiNumber]); + /* It failed, so return nothing */ ReplyMsg = NULL; } Modified: branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Sun Mar 10 19:37:33 2013 @@ -14,8 +14,7 @@ #define NDEBUG #include <debug.h> -#define CsrHashThread(t) \ - (HandleToUlong(t)&(256 - 1)) +#define CsrHashThread(t) (HandleToUlong(t)&(256 - 1)) /* GLOBALS ********************************************************************/ @@ -215,7 +214,6 @@ if (Process) *Process = FoundThread->Process; /* Return thread too */ -// DPRINT1("Found: %p %p\n", FoundThread, FoundThread->Process); return FoundThread; } } @@ -257,7 +255,6 @@ if (!CsrProcess) CsrProcess = CsrRootProcess; /* Save the List pointers */ -// DPRINT1("Searching in: %p %d\n", CsrProcess, CsrProcess->ThreadCount); ListHead = &CsrProcess->ThreadList; NextEntry = ListHead->Flink; @@ -275,7 +272,6 @@ } /* Return what we found */ -// DPRINT1("Found: %p\n", FoundThread); return FoundThread; } @@ -312,7 +308,6 @@ /* Hash the Thread */ i = CsrHashThread(Thread->ClientId.UniqueThread); -// DPRINT1("TID %lx HASH: %lx\n", Thread->ClientId.UniqueThread, i); /* Insert it there too */ InsertHeadList(&CsrThreadHashTable[i], &Thread->HashLinks); @@ -377,10 +372,10 @@ if (CsrThread->HashLinks.Flink) RemoveEntryList(&CsrThread->HashLinks); /* Check if this is the last Thread */ - if (!CsrThread->Process->ThreadCount) + if (CsrThread->Process->ThreadCount == 0) { /* Check if it's not already been marked for deletion */ - if (!(CsrThread->Process->Flags & CsrProcessLastThreadTerminated)) + if ((CsrThread->Process->Flags & CsrProcessLastThreadTerminated) == 0) { /* Let everyone know this process is about to lose the thread */ CsrThread->Process->Flags |= CsrProcessLastThreadTerminated; @@ -464,7 +459,7 @@ /* Decrease reference count */ LockCount = --CsrThread->ReferenceCount; ASSERT(LockCount >= 0); - if (!LockCount) + if (LockCount == 0) { /* Call the generic cleanup code */ CsrAcquireProcessLock(); @@ -551,8 +546,7 @@ * Pointer to the Client ID structure of the NT Thread to associate * with this CSR Thread. * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks None. * @@ -567,7 +561,6 @@ PCSR_THREAD CsrThread; PCSR_PROCESS CsrProcess; KERNEL_USER_TIMES KernelTimes; - DPRINT("CSRSRV: %s called\n", __FUNCTION__); /* Get the Thread Create Time */ Status = NtQueryInformationThread(hThread, @@ -602,7 +595,7 @@ CsrThread = CsrAllocateThread(CsrProcess); if (!CsrThread) { - DPRINT1("CSRSRV:%s: out of memory!\n", __FUNCTION__); + DPRINT1("CSRSRV: %s: out of memory!\n", __FUNCTION__); CsrUnlockProcess(CsrProcess); return STATUS_NO_MEMORY; } @@ -654,8 +647,7 @@ * Pointer to the Client ID structure of the NT Thread to associate * with this CSR Thread. * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks None. * @@ -673,8 +665,6 @@ CLIENT_ID CurrentCid; KERNEL_USER_TIMES KernelTimes; - DPRINT("CSRSRV: %s called\n", __FUNCTION__); - if (HaveClient) { /* Get the current thread and CID */ @@ -690,7 +680,7 @@ /* Something is wrong if we get an empty thread back */ if (!CurrentThread) { - DPRINT1("CSRSRV:%s: invalid thread!\n", __FUNCTION__); + DPRINT1("CSRSRV: %s: invalid thread!\n", __FUNCTION__); CsrReleaseProcessLock(); return STATUS_THREAD_IS_TERMINATING; } @@ -717,7 +707,7 @@ CsrThread = CsrAllocateThread(CsrProcess); if (!CsrThread) { - DPRINT1("CSRSRV:%s: out of memory!\n", __FUNCTION__); + DPRINT1("CSRSRV: %s: out of memory!\n", __FUNCTION__); CsrReleaseProcessLock(); return STATUS_NO_MEMORY; } @@ -762,7 +752,7 @@ /* Decrease reference count */ ASSERT(CsrThread->ReferenceCount > 0); - if (!(--CsrThread->ReferenceCount)) + if ((--CsrThread->ReferenceCount) == 0) { /* Call the generic cleanup code */ CsrThreadRefcountZero(CsrThread); @@ -807,7 +797,7 @@ &ClientId); /* Make sure we got one back, and that it's not already gone */ - if (!CsrThread || CsrThread->Flags & CsrThreadTerminated) + if (!CsrThread || (CsrThread->Flags & CsrThreadTerminated)) { /* Release the lock and return failure */ CsrReleaseProcessLock(); @@ -856,8 +846,7 @@ * @param Flags * Initial CSR Thread Flags to set to the CSR Thread. * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks This routine is similar to CsrAddStaticServerThread, but it * also creates an NT Thread instead of expecting one to already @@ -937,8 +926,7 @@ * Optional pointer to a CSR Thread pointer which will hold the * CSR Thread corresponding to the given Thread ID. * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * otherwise. + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL otherwise. * * @remarks Locking a CSR Thread is defined as acquiring an extra * reference to it and returning with the Process Lock held. @@ -975,7 +963,7 @@ /* Check for PID Match */ if ((CurrentThread->ClientId.UniqueThread == Tid) && - !(CurrentThread->Flags & CsrThreadTerminated)) + (CurrentThread->Flags & CsrThreadTerminated) == 0) { /* Get out of here */ break; Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Sun Mar 10 19:37:33 2013 @@ -666,7 +666,6 @@ /* If we don't need a console, then get out of here */ if (!ConnectInfo->ConsoleNeeded || !ProcessData->ConsoleApp) // In fact, it is for GUI apps. { - DPRINT("ConSrvConnect - No console needed\n"); return STATUS_SUCCESS; } Modified: branches/ros-csrss/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] Sun Mar 10 19:37:33 2013 @@ -23,7 +23,7 @@ // Windows Server 2003 table from http://j00ru.vexillium.org/csrss_list/api_list.html#Windows_2k3 // plus a little bit of Windows 7. -PCSR_API_ROUTINE ConsoleServerApiDispatchTable[ConsolepMaxApiNumber] = +PCSR_API_ROUTINE ConsoleServerApiDispatchTable[ConsolepMaxApiNumber - CONSRV_FIRST_API_NUMBER] = { SrvOpenConsole, SrvGetConsoleInput, @@ -114,7 +114,7 @@ SrvSetConsoleHistory, }; -BOOLEAN ConsoleServerApiServerValidTable[ConsolepMaxApiNumber] = +BOOLEAN ConsoleServerApiServerValidTable[ConsolepMaxApiNumber - CONSRV_FIRST_API_NUMBER] = { FALSE, // SrvOpenConsole, FALSE, // SrvGetConsoleInput, @@ -205,7 +205,7 @@ FALSE, // SrvSetConsoleHistory }; -PCHAR ConsoleServerApiNameTable[ConsolepMaxApiNumber] = +PCHAR ConsoleServerApiNameTable[ConsolepMaxApiNumber - CONSRV_FIRST_API_NUMBER] = { "OpenConsole", "GetConsoleInput", Modified: branches/ros-csrss/win32ss/user/winsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] Sun Mar 10 19:37:33 2013 @@ -22,7 +22,7 @@ HANDLE UserServerHeap = NULL; // Our own heap. // Windows Server 2003 table from http://j00ru.vexillium.org/csrss_list/api_list.html#Windows_2k3 -PCSR_API_ROUTINE UserServerApiDispatchTable[UserpMaxApiNumber] = +PCSR_API_ROUTINE UserServerApiDispatchTable[UserpMaxApiNumber - USERSRV_FIRST_API_NUMBER] = { SrvExitWindowsEx, // SrvEndTask, @@ -39,7 +39,7 @@ // SrvGetSetShutdownBlockReason, // Added in Vista }; -BOOLEAN UserServerApiServerValidTable[UserpMaxApiNumber] = +BOOLEAN UserServerApiServerValidTable[UserpMaxApiNumber - USERSRV_FIRST_API_NUMBER] = { FALSE, // SrvExitWindowsEx // FALSE, // SrvEndTask @@ -56,7 +56,7 @@ // FALSE, // SrvGetSetShutdownBlockReason }; -PCHAR UserServerApiNameTable[UserpMaxApiNumber] = +PCHAR UserServerApiNameTable[UserpMaxApiNumber - USERSRV_FIRST_API_NUMBER] = { "SrvExitWindowsEx", // "SrvEndTask",

11 years, 9 months

[hbelusca] 58463: [CONSRV] Attempt to fix terminal window positioning at initialization. Some work also needs to be done in console.dll.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 10 15:56:35 2013 New Revision: 58463 URL: http://svn.reactos.org/svn/reactos?rev=58463&view=rev Log: [CONSRV] Attempt to fix terminal window positioning at initialization. Some work also needs to be done in console.dll. Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] Sun Mar 10 15:56:35 2013 @@ -205,7 +205,9 @@ GuiDrawRegion(PCONSOLE Console, SMALL_RECT* Region); static NTSTATUS WINAPI GuiResizeBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Size); -VOID FASTCALL +static VOID +GuiConsoleMoveWindow(PGUI_CONSOLE_DATA GuiData); +static VOID GuiConsoleResizeWindow(PGUI_CONSOLE_DATA GuiData); @@ -482,8 +484,10 @@ SizeChanged = TRUE; } + /* Move the window to the user's values */ GuiData->GuiInfo.AutoPosition = pConInfo->ci.u.GuiInfo.AutoPosition; GuiData->GuiInfo.WindowOrigin = pConInfo->ci.u.GuiInfo.WindowOrigin; + GuiConsoleMoveWindow(GuiData); if (SizeChanged) { @@ -516,8 +520,23 @@ return ( ((GuiData == NULL) || (GuiData->hWindow == hWnd && GuiData->Console != NULL)) ? GuiData : NULL ); } -VOID -FASTCALL +static VOID +GuiConsoleMoveWindow(PGUI_CONSOLE_DATA GuiData) +{ + /* Move the window if needed (not positioned by the system) */ + if (!GuiData->GuiInfo.AutoPosition) + { + SetWindowPos(GuiData->hWindow, + NULL, + GuiData->GuiInfo.WindowOrigin.x, + GuiData->GuiInfo.WindowOrigin.y, + 0, + 0, + SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE); + } +} + +static VOID GuiConsoleResizeWindow(PGUI_CONSOLE_DATA GuiData) { PCONSOLE Console = GuiData->Console; @@ -560,13 +579,8 @@ ShowScrollBar(GuiData->hWindow, SB_HORZ, FALSE); } - /* Resize and reposition the window */ - SetWindowPos(GuiData->hWindow, - NULL, - (GuiData->GuiInfo.AutoPosition ? 0 : GuiData->GuiInfo.WindowOrigin.x), - (GuiData->GuiInfo.AutoPosition ? 0 : GuiData->GuiInfo.WindowOrigin.y), - Width, - Height, + /* Resize the window */ + SetWindowPos(GuiData->hWindow, NULL, 0, 0, Width, Height, SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE); } @@ -662,7 +676,8 @@ SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL); GuiConsoleCreateSysMenu(GuiData->hWindow); - /* Resize the window to the user's values */ + /* Move and resize the window to the user's values */ + GuiConsoleMoveWindow(GuiData); GuiData->WindowSizeLock = TRUE; GuiConsoleResizeWindow(GuiData); GuiData->WindowSizeLock = FALSE;

11 years, 9 months

[hbelusca] 58462: [CONSRV] - Fix console initialization / uninitialization and resources release when initialization fails. - Remove unneeded DPRINTs.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 10 15:37:22 2013 New Revision: 58462 URL: http://svn.reactos.org/svn/reactos?rev=58462&view=rev Log: [CONSRV] - Fix console initialization / uninitialization and resources release when initialization fails. - Remove unneeded DPRINTs. Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/guiconsole.c branches/ros-csrss/win32ss/user/consrv/handle.c Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] Sun Mar 10 15:37:22 2013 @@ -145,6 +145,7 @@ ASSERT(ConsoleInitialized); RtlEnterCriticalSection(&ConsoleLock); + nExitCode = 0; if ((nCode != CTRL_C_EVENT) || (NtCurrentPeb()->ProcessParameters->ConsoleFlags != 1)) { @@ -175,6 +176,7 @@ } RtlLeaveCriticalSection(&ConsoleLock); + ExitThread(nExitCode); return STATUS_SUCCESS; } Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Sun Mar 10 15:37:22 2013 @@ -54,7 +54,7 @@ return; } - DPRINT1("We succeeded at creating ProcessData->CtrlDispatcher remote thread, ProcessId = %x, Process = 0x%p\n", ProcessData->Process->ClientId.UniqueProcess, ProcessData->Process); + DPRINT("We succeeded at creating ProcessData->CtrlDispatcher remote thread, ProcessId = %x, Process = 0x%p\n", ProcessData->Process->ClientId.UniqueProcess, ProcessData->Process); WaitForSingleObject(Thread, Timeout); CloseHandle(Thread); } @@ -513,13 +513,9 @@ PCONSOLE_OPENCONSOLE OpenConsoleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.OpenConsoleRequest; PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); - DPRINT("SrvOpenConsole\n"); - OpenConsoleRequest->ConsoleHandle = INVALID_HANDLE_VALUE; RtlEnterCriticalSection(&ProcessData->HandleTableLock); - - DPRINT1("ProcessData = 0x%p ; ProcessData->Console = 0x%p\n", ProcessData, ProcessData->Console); if (ProcessData->Console) { @@ -529,9 +525,7 @@ PCONSOLE Console = ProcessData->Console; Object_t *Object; - DPRINT1("SrvOpenConsole - Checkpoint 1\n"); EnterCriticalSection(&Console->Lock); - DPRINT1("SrvOpenConsole - Checkpoint 2\n"); if (OpenConsoleRequest->HandleType == HANDLE_OUTPUT) { @@ -574,8 +568,6 @@ PCONSOLE_ALLOCCONSOLE AllocConsoleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.AllocConsoleRequest; PCSR_PROCESS CsrProcess = CsrGetClientThread()->Process; PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrProcess); - - DPRINT("SrvAllocConsole\n"); if (ProcessData->Console != NULL) { @@ -632,7 +624,6 @@ /* Set the Ctrl Dispatcher */ ProcessData->CtrlDispatcher = AllocConsoleRequest->CtrlDispatcher; - DPRINT("CONSRV: CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher); return STATUS_SUCCESS; } @@ -646,8 +637,6 @@ HANDLE ProcessId = ULongToHandle(AttachConsoleRequest->ProcessId); PCONSOLE_PROCESS_DATA SourceProcessData, TargetProcessData; - DPRINT("SrvAttachConsole\n"); - TargetProcessData = ConsoleGetPerProcessData(TargetProcess); if (TargetProcessData->Console != NULL) @@ -674,19 +663,15 @@ return Status; } - DPRINT("We, process (ID) %lu;%lu\n", TargetProcess->ClientId.UniqueProcess, TargetProcess->ClientId.UniqueThread); ProcessId = ULongToHandle(ProcessInfo.InheritedFromUniqueProcessId); - DPRINT("Parent process ID = %lu\n", ProcessId); } /* Lock the source process via its PID */ Status = CsrLockProcessByClientId(ProcessId, &SourceProcess); - DPRINT1("Lock process Id %lu - Status %lu\n", ProcessId, Status); if (!NT_SUCCESS(Status)) return Status; SourceProcessData = ConsoleGetPerProcessData(SourceProcess); - DPRINT1("SourceProcessData->Console = 0x%p\n", SourceProcessData->Console); if (SourceProcessData->Console == NULL) { Status = STATUS_INVALID_HANDLE; @@ -733,7 +718,6 @@ /* Set the Ctrl Dispatcher */ TargetProcessData->CtrlDispatcher = AttachConsoleRequest->CtrlDispatcher; - DPRINT("CONSRV: CtrlDispatcher address: %x\n", TargetProcessData->CtrlDispatcher); Status = STATUS_SUCCESS; @@ -762,8 +746,6 @@ PCONSOLE_GETSETCONSOLEMODE ConsoleModeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ConsoleModeRequest; Object_t* Object = NULL; - DPRINT("SrvSetConsoleMode\n"); - Status = ConSrvGetObject(ConsoleGetPerProcessData(CsrGetClientThread()->Process), ConsoleModeRequest->ConsoleHandle, &Object, NULL, GENERIC_WRITE, TRUE, 0); @@ -797,8 +779,6 @@ PCONSOLE_GETSETCONSOLEMODE ConsoleModeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ConsoleModeRequest; Object_t* Object = NULL; - DPRINT("SrvGetConsoleMode\n"); - Status = ConSrvGetObject(ConsoleGetPerProcessData(CsrGetClientThread()->Process), ConsoleModeRequest->ConsoleHandle, &Object, NULL, GENERIC_READ, TRUE, 0); @@ -833,8 +813,6 @@ // PCSR_PROCESS Process = CsrGetClientThread()->Process; PCONSOLE Console; PWCHAR Buffer; - - DPRINT("SrvSetConsoleTitle\n"); if (!CsrValidateMessageBuffer(ApiMessage, (PVOID)&TitleRequest->Title, @@ -886,8 +864,6 @@ // PCSR_PROCESS Process = CsrGetClientThread()->Process; PCONSOLE Console; DWORD Length; - - DPRINT("SrvGetConsoleTitle\n"); if (!CsrValidateMessageBuffer(ApiMessage, (PVOID)&TitleRequest->Title, @@ -960,8 +936,6 @@ PCONSOLE_SCREEN_BUFFER Buff; PCONSOLE Console; - DPRINT("SrvGetConsoleHardwareState\n"); - Status = ConSrvGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), HardwareStateRequest->OutputHandle, &Buff, @@ -988,8 +962,6 @@ PCONSOLE_SCREEN_BUFFER Buff; PCONSOLE Console; - DPRINT("SrvSetConsoleHardwareState\n"); - Status = ConSrvGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), HardwareStateRequest->OutputHandle, &Buff, @@ -1016,8 +988,6 @@ PCONSOLE_GETWINDOW GetWindowRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetWindowRequest; PCONSOLE Console; - DPRINT("SrvGetConsoleWindow\n"); - Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; @@ -1032,8 +1002,6 @@ NTSTATUS Status; PCONSOLE_SETICON SetIconRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetIconRequest; PCONSOLE Console; - - DPRINT("SrvSetConsoleIcon\n"); Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; @@ -1103,8 +1071,6 @@ PLIST_ENTRY current_entry; ULONG nItems = 0; - DPRINT("SrvGetConsoleProcessList\n"); - if (!CsrValidateMessageBuffer(ApiMessage, (PVOID)&GetProcessListRequest->pProcessIds, GetProcessListRequest->nMaxIds, Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] Sun Mar 10 15:37:22 2013 @@ -206,7 +206,7 @@ static NTSTATUS WINAPI GuiResizeBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Size); VOID FASTCALL -GuiConsoleInitScrollbar(PGUI_CONSOLE_DATA GuiData); +GuiConsoleResizeWindow(PGUI_CONSOLE_DATA GuiData); static LRESULT @@ -482,10 +482,14 @@ SizeChanged = TRUE; } + GuiData->GuiInfo.AutoPosition = pConInfo->ci.u.GuiInfo.AutoPosition; + GuiData->GuiInfo.WindowOrigin = pConInfo->ci.u.GuiInfo.WindowOrigin; + if (SizeChanged) { + /* Resize the window to the user's values */ GuiData->WindowSizeLock = TRUE; - GuiConsoleInitScrollbar(GuiData); + GuiConsoleResizeWindow(GuiData); GuiData->WindowSizeLock = FALSE; } @@ -514,15 +518,17 @@ VOID FASTCALL -GuiConsoleInitScrollbar(PGUI_CONSOLE_DATA GuiData) +GuiConsoleResizeWindow(PGUI_CONSOLE_DATA GuiData) { PCONSOLE Console = GuiData->Console; SCROLLINFO sInfo; - DWORD Width = Console->Size.X * GuiData->CharWidth + 2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE)); - DWORD Height = Console->Size.Y * GuiData->CharHeight + 2 * (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYEDGE)) + GetSystemMetrics(SM_CYCAPTION); - - /* set scrollbar sizes */ + DWORD Width = Console->Size.X * GuiData->CharWidth + + 2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE)); + DWORD Height = Console->Size.Y * GuiData->CharHeight + + 2 * (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYEDGE)) + GetSystemMetrics(SM_CYCAPTION); + + /* Set scrollbar sizes */ sInfo.cbSize = sizeof(SCROLLINFO); sInfo.fMask = SIF_RANGE | SIF_PAGE | SIF_POS; sInfo.nMin = 0; @@ -548,14 +554,19 @@ SetScrollInfo(GuiData->hWindow, SB_HORZ, &sInfo, TRUE); Height += GetSystemMetrics(SM_CYHSCROLL); ShowScrollBar(GuiData->hWindow, SB_HORZ, TRUE); - } else { ShowScrollBar(GuiData->hWindow, SB_HORZ, FALSE); } - SetWindowPos(GuiData->hWindow, NULL, 0, 0, Width, Height, + /* Resize and reposition the window */ + SetWindowPos(GuiData->hWindow, + NULL, + (GuiData->GuiInfo.AutoPosition ? 0 : GuiData->GuiInfo.WindowOrigin.x), + (GuiData->GuiInfo.AutoPosition ? 0 : GuiData->GuiInfo.WindowOrigin.y), + Width, + Height, SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE); } @@ -563,21 +574,21 @@ GuiConsoleHandleNcCreate(HWND hWnd, LPCREATESTRUCTW Create) { PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)Create->lpCreateParams; - PCONSOLE Console = GuiData->Console; + PCONSOLE Console; HDC Dc; HFONT OldFont; TEXTMETRICW Metrics; SIZE CharSize; + if (NULL == GuiData) + { + DPRINT1("GuiConsoleNcCreate: No GUI data\n"); + return FALSE; + } + + Console = GuiData->Console; + GuiData->hWindow = hWnd; - - if (NULL == GuiData) - { - DPRINT1("GuiConsoleNcCreate: RtlAllocateHeap failed\n"); - return FALSE; - } - - InitializeCriticalSection(&GuiData->Lock); GuiData->Font = CreateFontW(LOWORD(GuiData->GuiInfo.FontSize), 0, // HIWORD(GuiData->GuiInfo.FontSize), @@ -593,11 +604,12 @@ NONANTIALIASED_QUALITY, FIXED_PITCH | GuiData->GuiInfo.FontFamily /* FF_DONTCARE */, GuiData->GuiInfo.FaceName); + if (NULL == GuiData->Font) { DPRINT1("GuiConsoleNcCreate: CreateFont failed\n"); - DeleteCriticalSection(&GuiData->Lock); - RtlFreeHeap(ConSrvHeap, 0, GuiData); + GuiData->hWindow = NULL; + SetEvent(GuiData->hGuiInitEvent); return FALSE; } Dc = GetDC(GuiData->hWindow); @@ -605,8 +617,8 @@ { DPRINT1("GuiConsoleNcCreate: GetDC failed\n"); DeleteObject(GuiData->Font); - DeleteCriticalSection(&GuiData->Lock); - RtlFreeHeap(ConSrvHeap, 0, GuiData); + GuiData->hWindow = NULL; + SetEvent(GuiData->hGuiInitEvent); return FALSE; } OldFont = SelectObject(Dc, GuiData->Font); @@ -615,8 +627,8 @@ DPRINT1("GuiConsoleNcCreate: SelectObject failed\n"); ReleaseDC(GuiData->hWindow, Dc); DeleteObject(GuiData->Font); - DeleteCriticalSection(&GuiData->Lock); - RtlFreeHeap(ConSrvHeap, 0, GuiData); + GuiData->hWindow = NULL; + SetEvent(GuiData->hGuiInitEvent); return FALSE; } if (!GetTextMetricsW(Dc, &Metrics)) @@ -625,11 +637,11 @@ SelectObject(Dc, OldFont); ReleaseDC(GuiData->hWindow, Dc); DeleteObject(GuiData->Font); - DeleteCriticalSection(&GuiData->Lock); - RtlFreeHeap(ConSrvHeap, 0, GuiData); + GuiData->hWindow = NULL; + SetEvent(GuiData->hGuiInitEvent); return FALSE; } - GuiData->CharWidth = Metrics.tmMaxCharWidth; + GuiData->CharWidth = Metrics.tmMaxCharWidth; GuiData->CharHeight = Metrics.tmHeight + Metrics.tmExternalLeading; /* Measure real char width more precisely if possible. */ @@ -645,14 +657,14 @@ Console->ActiveBuffer->ForceCursorOff = FALSE; //////////////////////////////////////////////////////////////////////////// - DPRINT("Console %p GuiData %p\n", Console, GuiData); SetWindowLongPtrW(GuiData->hWindow, GWLP_USERDATA, (DWORD_PTR)GuiData); SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL); GuiConsoleCreateSysMenu(GuiData->hWindow); + /* Resize the window to the user's values */ GuiData->WindowSizeLock = TRUE; - GuiConsoleInitScrollbar(GuiData); + GuiConsoleResizeWindow(GuiData); GuiData->WindowSizeLock = FALSE; SetEvent(GuiData->hGuiInitEvent); @@ -1041,16 +1053,13 @@ } static VOID -GuiConsoleHandleNcDestroy(PGUI_CONSOLE_DATA GuiData, HWND hWnd) -{ - PCONSOLE Console = GuiData->Console; - - KillTimer(hWnd, 1); - Console->TermIFace.Data = NULL; - DeleteCriticalSection(&GuiData->Lock); - GetSystemMenu(hWnd, TRUE); - - RtlFreeHeap(ConSrvHeap, 0, GuiData); +GuiConsoleHandleNcDestroy(PGUI_CONSOLE_DATA GuiData) +{ + KillTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER); + GetSystemMenu(GuiData->hWindow, TRUE); + + SetWindowLongPtrW(GuiData->hWindow, GWLP_USERDATA, (DWORD_PTR)NULL); + GuiData->hWindow = NULL; } static COORD @@ -1269,7 +1278,8 @@ { PCONSOLE Console = GuiData->Console; - if ((GuiData->WindowSizeLock == FALSE) && (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED || wParam == SIZE_MINIMIZED)) + if ((GuiData->WindowSizeLock == FALSE) && + (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED || wParam == SIZE_MINIMIZED)) { PCONSOLE_SCREEN_BUFFER Buff = Console->ActiveBuffer; DWORD windx, windy, charx, chary; @@ -1308,7 +1318,7 @@ Console->Size.Y = (chary <= Buff->ScreenBufferSize.Y) ? chary : Buff->ScreenBufferSize.Y; } - GuiConsoleInitScrollbar(GuiData); + GuiConsoleResizeWindow(GuiData); // Adjust the start of the visible area if we are attempting to show nonexistent areas if((Buff->ScreenBufferSize.X - Buff->ShowX) < Console->Size.X) Buff->ShowX = Buff->ScreenBufferSize.X - Console->Size.X; @@ -1489,7 +1499,7 @@ break; case WM_NCDESTROY: - GuiConsoleHandleNcDestroy(GuiData, hWnd); + GuiConsoleHandleNcDestroy(GuiData); break; case WM_PAINT: @@ -1642,18 +1652,21 @@ TranslateMessage(&Msg); DispatchMessageW(&Msg); } - DestroyWindow(GuiData->hWindow); - GuiData->hWindow = NULL; - - WindowCount = GetWindowLongW(hWnd, GWL_USERDATA); - WindowCount--; - SetWindowLongW(hWnd, GWL_USERDATA, WindowCount); - if (0 == WindowCount) + + if (GuiData->hWindow != NULL) /* && DestroyWindow(GuiData->hWindow) */ { - NotifyWnd = NULL; - DestroyWindow(hWnd); - DPRINT1("CONSRV: Going to quit the Gui Thread!!\n"); - PostQuitMessage(0); + DestroyWindow(GuiData->hWindow); + + WindowCount = GetWindowLongW(hWnd, GWL_USERDATA); + WindowCount--; + SetWindowLongW(hWnd, GWL_USERDATA, WindowCount); + if (0 == WindowCount) + { + NotifyWnd = NULL; + DestroyWindow(hWnd); + DPRINT1("CONSRV: Going to quit the Gui Thread!!\n"); + PostQuitMessage(0); + } } return 0; @@ -1843,6 +1856,10 @@ DPRINT1("Destroy hIconSm\n"); DestroyIcon(GuiData->hIconSm); } + + Console->TermIFace.Data = NULL; + DeleteCriticalSection(&GuiData->Lock); + RtlFreeHeap(ConSrvHeap, 0, GuiData); } static VOID WINAPI @@ -2149,6 +2166,8 @@ GuiData->Console = Console; GuiData->hWindow = NULL; + InitializeCriticalSection(&GuiData->Lock); + /* Set up the GUI data */ wcsncpy(GuiData->GuiInfo.FaceName, ConsoleInfo->u.GuiInfo.FaceName, LF_FACESIZE); GuiData->GuiInfo.FontFamily = ConsoleInfo->u.GuiInfo.FontFamily; @@ -2195,15 +2214,23 @@ */ GuiData->hGuiInitEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - /* Create the GUI console */ + /* Create the terminal window */ PostMessageW(NotifyWnd, PM_CREATE_CONSOLE, GuiData->GuiInfo.ShowWindow, (LPARAM)GuiData); /* Wait until initialization has finished */ WaitForSingleObject(GuiData->hGuiInitEvent, INFINITE); - DPRINT1("Received event Console %p GuiData %p X %d Y %d\n", Console, GuiData, Console->Size.X, Console->Size.Y); CloseHandle(GuiData->hGuiInitEvent); GuiData->hGuiInitEvent = NULL; + /* Check whether we really succeeded in initializing the terminal window */ + if (GuiData->hWindow == NULL) + { + DPRINT1("GuiInitConsole - We failed at creating a new terminal window\n"); + // ConioCleanupConsole(Console); + GuiCleanupConsole(Console); + return STATUS_UNSUCCESSFUL; + } + return STATUS_SUCCESS; } Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Sun Mar 10 15:37:22 2013 @@ -598,14 +598,8 @@ PCONSOLE_PROCESS_DATA SourceProcessData, TargetProcessData; - DPRINT1("ConSrvNewProcess\n"); - DPRINT1("SourceProcess = 0x%p ; TargetProcess = 0x%p\n", SourceProcess, TargetProcess); - /* An empty target process is invalid */ - if (!TargetProcess) - return STATUS_INVALID_PARAMETER; - - DPRINT1("ConSrvNewProcess - OK\n"); + if (!TargetProcess) return STATUS_INVALID_PARAMETER; TargetProcessData = ConsoleGetPerProcessData(TargetProcess); @@ -624,8 +618,7 @@ RtlInitializeCriticalSection(&TargetProcessData->HandleTableLock); /* Do nothing if the source process is NULL */ - if (!SourceProcess) - return STATUS_SUCCESS; + if (!SourceProcess) return STATUS_SUCCESS; SourceProcessData = ConsoleGetPerProcessData(SourceProcess); @@ -644,10 +637,6 @@ /* Temporary save the parent's console */ TargetProcessData->ParentConsole = SourceProcessData->Console; } - else - { - DPRINT1("ConSrvNewProcess - We don't inherit a handle table : SourceProcessData->Console = 0x%p ; TargetProcess->Flags = %lu\n", SourceProcessData->Console, TargetProcess->Flags); - } return STATUS_SUCCESS; } @@ -665,8 +654,6 @@ NTSTATUS Status = STATUS_SUCCESS; PCONSOLE_CONNECTION_INFO ConnectInfo = (PCONSOLE_CONNECTION_INFO)ConnectionInfo; PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrProcess); - - DPRINT1("ConSrvConnect\n"); if ( ConnectionInfo == NULL || ConnectionInfoLength == NULL || @@ -743,7 +730,6 @@ /* Set the Ctrl Dispatcher */ ProcessData->CtrlDispatcher = ConnectInfo->CtrlDispatcher; - DPRINT("CONSRV: CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher); return STATUS_SUCCESS; }

11 years, 9 months

← Newer
1
...
14
15
16
17
18
19
20
...
25
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 March 2013