Ros-diffs March 2013

ros-diffs@reactos.org

14 participants
249 discussions

[hbelusca] 58481: *** INFORMATIONAL COMMIT !! NO CODE CHANGES !! (but svn properties, yes !) *** The previous commit r58480 was the Part 2/2 of the commit r58305 from 4 weeks ago.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 13 01:44:48 2013 New Revision: 58481 URL: http://svn.reactos.org/svn/reactos?rev=58481&view=rev Log: *** INFORMATIONAL COMMIT !! NO CODE CHANGES !! (but svn properties, yes !) *** The previous commit r58480 was the Part 2/2 of the commit r58305 from 4 weeks ago. Modified: branches/ros-csrss/dll/win32/shell32/TODO.txt (props changed) branches/ros-csrss/dll/win32/shell32/drvdefext.h (props changed) branches/ros-csrss/dll/win32/shell32/filedefext.h (props changed) Propchange: branches/ros-csrss/dll/win32/shell32/TODO.txt ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Rev URL Propchange: branches/ros-csrss/dll/win32/shell32/drvdefext.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Rev URL Propchange: branches/ros-csrss/dll/win32/shell32/filedefext.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Rev URL

11 years, 9 months

[hbelusca] 58480: [SHELL32] Implement the usage of the STARTF_TITLEISLINKNAME flag (in a STARTUPINFO structure, it signals that the program was started from a shell link, and therefore its lpTitle ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 13 01:35:46 2013 New Revision: 58480 URL: http://svn.reactos.org/svn/reactos?rev=58480&view=rev Log: [SHELL32] Implement the usage of the STARTF_TITLEISLINKNAME flag (in a STARTUPINFO structure, it signals that the program was started from a shell link, and therefore its lpTitle member holds the path of the link). What I do is that, in CShellLink::InvokeCommand (called when a shortcut is being executed), I initialize the SHELLEXECUTEINFO structure such that we know that we are starting from a shortcut (use the SEE_MASK_HASLINKNAME flag), and to hold the path to the flag I use its lpClass member (which is not used for other things in this code path). Then the whole thing is passed to ShellExecuteExW which, in turn, calls the SHELL_ExecuteW function. This function reads the SHELLEXECUTEINFO structure and, if it has the flag SEE_MASK_HASLINKNAME (or SEE_MASK_HASTITLE too, if somebody also uses lpClass to pass a particular title for the startup), we use the forementioned lpClass member, holding the link path, as the title (lpTitle member) of a new STARTUPINFO object used when calling CreateProcess (and thus, launching the new application). So that this application will be aware that she was launched via a link (therefore we become compliant with the STARTF_TITLEISLINKNAME documentation). Modified: branches/ros-csrss/dll/win32/shell32/shelllink.cpp branches/ros-csrss/dll/win32/shell32/shelllink.h branches/ros-csrss/dll/win32/shell32/shlexec.cpp Modified: branches/ros-csrss/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/she… ============================================================================== --- branches/ros-csrss/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/shell32/shelllink.cpp [iso-8859-1] Wed Mar 13 01:35:46 2013 @@ -1825,10 +1825,10 @@ else path = strdupW(sPath); - if (lpici->cbSize == sizeof (CMINVOKECOMMANDINFOEX) && - (lpici->fMask & CMIC_MASK_UNICODE)) - { - LPCMINVOKECOMMANDINFOEX iciex = (LPCMINVOKECOMMANDINFOEX) lpici; + if ( lpici->cbSize == sizeof(CMINVOKECOMMANDINFOEX) && + (lpici->fMask & CMIC_MASK_UNICODE) ) + { + LPCMINVOKECOMMANDINFOEX iciex = (LPCMINVOKECOMMANDINFOEX)lpici; DWORD len = 2; if (sArgs) @@ -1854,8 +1854,10 @@ SHELLEXECUTEINFOW sei; memset(&sei, 0, sizeof sei); sei.cbSize = sizeof sei; - sei.fMask = SEE_MASK_UNICODE | (lpici->fMask & (SEE_MASK_NOASYNC | SEE_MASK_ASYNCOK | SEE_MASK_FLAG_NO_UI)); + sei.fMask = SEE_MASK_HASLINKNAME | SEE_MASK_UNICODE | + (lpici->fMask & (SEE_MASK_NOASYNC | SEE_MASK_ASYNCOK | SEE_MASK_FLAG_NO_UI)); sei.lpFile = path; + sei.lpClass = sLinkPath; sei.nShow = iShowCmd; sei.lpDirectory = sWorkDir; sei.lpParameters = args; Modified: branches/ros-csrss/dll/win32/shell32/shelllink.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/she… ============================================================================== --- branches/ros-csrss/dll/win32/shell32/shelllink.h [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/shell32/shelllink.h [iso-8859-1] Wed Mar 13 01:35:46 2013 @@ -67,11 +67,11 @@ LPWSTR sWorkDir; LPWSTR sDescription; LPWSTR sPathRel; - LPWSTR sProduct; - LPWSTR sComponent; + LPWSTR sProduct; + LPWSTR sComponent; volume_info volume; - LPWSTR sLinkPath; - BOOL bRunAs; + LPWSTR sLinkPath; + BOOL bRunAs; BOOL bDirty; INT iIdOpen; /* id of the "Open" entry in the context menu */ CComPtr<IUnknown> site; Modified: branches/ros-csrss/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/shl… ============================================================================== --- branches/ros-csrss/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/shell32/shlexec.cpp [iso-8859-1] Wed Mar 13 01:35:46 2013 @@ -450,6 +450,11 @@ startup.cb = sizeof(STARTUPINFOW); startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = psei->nShow; + startup.lpTitle = (LPWSTR)(psei->fMask & (SEE_MASK_HASLINKNAME | SEE_MASK_HASTITLE) ? psei->lpClass : NULL); + + if (psei->fMask & SEE_MASK_HASLINKNAME) + startup.dwFlags |= STARTF_TITLEISLINKNAME; + dwCreationFlags = CREATE_UNICODE_ENVIRONMENT; if (psei->fMask & SEE_MASK_NO_CONSOLE)

11 years, 9 months

[hbelusca] 58479: [PSDK] - Define all the missing STARTF_* flags needed for the STARTUPINFO structure (taken from http://msdn.microsoft.com/en-us/library/windows/desktop/ms686331(v=vs.85).aspx). Am...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 13 01:19:43 2013 New Revision: 58479 URL: http://svn.reactos.org/svn/reactos?rev=58479&view=rev Log: [PSDK] - Define all the missing STARTF_* flags needed for the STARTUPINFO structure (taken from http://msdn.microsoft.com/en-us/library/windows/desktop/ms686331(v=vs.85).a…). Amongst them is the STARTF_TITLEISLINKNAME flag that I use in the console server to determine whether a console app was started from a shell link, and if so, extract the name of the link and its icon. - Define all the missing SEE_MASK_* flags needed for the SHELLEXECUTEINFO structure, but the Windows 8 flag (taken from http://msdn.microsoft.com/en-us/library/windows/desktop/bb759784(v=vs.85).a…). Furthermore I add three undocumented flags, SEE_MASK_HASLINKNAME, SEE_MASK_HASTITLE and SEE_MASK_FLAG_SEPVDM. These three flags are undocumented and even not present in the official Windows SDK. However they are used in shobjidl.idl to define some CMIC_MASK_* flags, these ones being mentioned in the MSDN documentation of the CMINVOKECOMMANDINFOEX structure (see http://msdn.microsoft.com/en-us/library/windows/desktop/bb773217(v=vs.85).a…). So I affect them a range of values which seems to be strangely empty (see the code). Of course their values may differ from the real ones, however I have no way of discovering them. If somebody else can verify them, it would be great. Modified: branches/ros-csrss/include/psdk/shellapi.h branches/ros-csrss/include/psdk/winbase.h Modified: branches/ros-csrss/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/shellapi… ============================================================================== --- branches/ros-csrss/include/psdk/shellapi.h [iso-8859-1] (original) +++ branches/ros-csrss/include/psdk/shellapi.h [iso-8859-1] Wed Mar 13 01:19:43 2013 @@ -20,23 +20,42 @@ #define ABE_BOTTOM 3 #define ABS_AUTOHIDE 1 #define ABS_ALWAYSONTOP 2 -#define SEE_MASK_CLASSNAME 1 -#define SEE_MASK_CLASSKEY 3 -#define SEE_MASK_IDLIST 4 -#define SEE_MASK_INVOKEIDLIST 12 -#define SEE_MASK_ICON 0x10 -#define SEE_MASK_HOTKEY 0x20 -#define SEE_MASK_NOCLOSEPROCESS 0x40 -#define SEE_MASK_CONNECTNETDRV 0x80 + +#define SEE_MASK_DEFAULT 0x00000000 +#define SEE_MASK_CLASSNAME 0x00000001 +#define SEE_MASK_CLASSKEY 0x00000003 +#define SEE_MASK_IDLIST 0x00000004 +#define SEE_MASK_INVOKEIDLIST 0x0000000C +#define SEE_MASK_ICON 0x00000010 +#define SEE_MASK_HOTKEY 0x00000020 +#define SEE_MASK_NOCLOSEPROCESS 0x00000040 +#define SEE_MASK_CONNECTNETDRV 0x00000080 #define SEE_MASK_NOASYNC 0x00000100 #define SEE_MASK_FLAG_DDEWAIT SEE_MASK_NOASYNC -#define SEE_MASK_DOENVSUBST 0x200 -#define SEE_MASK_FLAG_NO_UI 0x400 -#define SEE_MASK_NO_CONSOLE 0x8000 -#define SEE_MASK_UNICODE 0x10000 -#define SEE_MASK_ASYNCOK 0x100000 -#define SEE_MASK_HMONITOR 0x200000 -#define SEE_MASK_NOZONECHECKS 0x00800000 +#define SEE_MASK_DOENVSUBST 0x00000200 +#define SEE_MASK_FLAG_NO_UI 0x00000400 +#define SEE_MASK_UNICODE 0x00004000 +#define SEE_MASK_NO_CONSOLE 0x00008000 +/* + * NOTE: The following three flags are undocumented and are not present in the + * official Windows SDK. However they are used in shobjidl.idl to define some + * CMIC_MASK_* flags, these ones being mentioned in the MSDN documentation of + * the CMINVOKECOMMANDINFOEX structure. + * I affect them this range of values which seems to be strangely empty. Of + * course their values may differ from the real ones, however I have no way + * of discovering them. If somebody else can verify them, it would be great. + */ +#define SEE_MASK_HASLINKNAME 0x00010000 +#define SEE_MASK_HASTITLE 0x00020000 +#define SEE_MASK_FLAG_SEPVDM 0x00040000 +/* END NOTE */ +#define SEE_MASK_ASYNCOK 0x00100000 +#define SEE_MASK_HMONITOR 0x00200000 +#define SEE_MASK_NOZONECHECKS 0x00800000 +#define SEE_MASK_NOQUERYCLASSSTORE 0x01000000 +#define SEE_MASK_WAITFORINPUTIDLE 0x02000000 +#define SEE_MASK_FLAG_LOG_USAGE 0x04000000 + #define ABM_NEW 0 #define ABM_REMOVE 1 #define ABM_QUERYPOS 2 Modified: branches/ros-csrss/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/winbase.… ============================================================================== --- branches/ros-csrss/include/psdk/winbase.h [iso-8859-1] (original) +++ branches/ros-csrss/include/psdk/winbase.h [iso-8859-1] Wed Mar 13 01:19:43 2013 @@ -467,16 +467,23 @@ #define STREAM_MODIFIED_WHEN_READ 1 #define STREAM_CONTAINS_SECURITY 2 #define STREAM_CONTAINS_PROPERTIES 4 -#define STARTF_USESHOWWINDOW 1 -#define STARTF_USESIZE 2 -#define STARTF_USEPOSITION 4 -#define STARTF_USECOUNTCHARS 8 -#define STARTF_USEFILLATTRIBUTE 16 -#define STARTF_RUNFULLSCREEN 32 -#define STARTF_FORCEONFEEDBACK 64 -#define STARTF_FORCEOFFFEEDBACK 128 -#define STARTF_USESTDHANDLES 256 -#define STARTF_USEHOTKEY 512 + +#define STARTF_USESHOWWINDOW 0x00000001 +#define STARTF_USESIZE 0x00000002 +#define STARTF_USEPOSITION 0x00000004 +#define STARTF_USECOUNTCHARS 0x00000008 +#define STARTF_USEFILLATTRIBUTE 0x00000010 +#define STARTF_RUNFULLSCREEN 0x00000020 +#define STARTF_FORCEONFEEDBACK 0x00000040 +#define STARTF_FORCEOFFFEEDBACK 0x00000080 +#define STARTF_USESTDHANDLES 0x00000100 +#if (WINVER >= 0x400) +#define STARTF_USEHOTKEY 0x00000200 +#define STARTF_TITLEISLINKNAME 0x00000800 +#define STARTF_TITLEISAPPID 0x00001000 +#define STARTF_PREVENTPINNING 0x00002000 +#endif /* (WINVER >= 0x400) */ + #define TC_NORMAL 0 #define TC_HARDERR 1 #define TC_GP_TRAP 2

11 years, 9 months

[ekohl] 58478: [SAMSRV] Set MaxPasswordAge, LockoutDuration and LockoutObservationWindow for domains during setup.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Mar 12 21:27:35 2013 New Revision: 58478 URL: http://svn.reactos.org/svn/reactos?rev=58478&view=rev Log: [SAMSRV] Set MaxPasswordAge, LockoutDuration and LockoutObservationWindow for domains during setup. Modified: trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/setup.c Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Tue Mar 12 21:27:35 2013 @@ -69,11 +69,11 @@ ULONG Reserved; LARGE_INTEGER CreationTime; LARGE_INTEGER DomainModifiedCount; - LARGE_INTEGER MaxPasswordAge; - LARGE_INTEGER MinPasswordAge; - LARGE_INTEGER ForceLogoff; - LARGE_INTEGER LockoutDuration; - LARGE_INTEGER LockoutObservationWindow; + LARGE_INTEGER MaxPasswordAge; /* relative Time */ + LARGE_INTEGER MinPasswordAge; /* relative Time */ + LARGE_INTEGER ForceLogoff; /* relative Time */ + LARGE_INTEGER LockoutDuration; /* relative Time */ + LARGE_INTEGER LockoutObservationWindow; /* relative Time */ LARGE_INTEGER ModifiedCountAtLastPromotion; ULONG NextRid; ULONG PasswordProperties; Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Tue Mar 12 21:27:35 2013 @@ -13,9 +13,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(samsrv); + /* GLOBALS *****************************************************************/ +#define TICKS_PER_SECOND 10000000LL + SID_IDENTIFIER_AUTHORITY SecurityNtAuthority = {SECURITY_NT_AUTHORITY}; + /* FUNCTIONS ***************************************************************/ @@ -423,11 +427,11 @@ FixedData.Version = 1; NtQuerySystemTime(&FixedData.CreationTime); FixedData.DomainModifiedCount.QuadPart = 0; -// FixedData.MaxPasswordAge // 6 Weeks - FixedData.MinPasswordAge.QuadPart = 0; // Now -// FixedData.ForceLogoff -// FixedData.LockoutDuration // 30 minutes -// FixedData.LockoutObservationWindow // 30 minutes + FixedData.MaxPasswordAge.QuadPart = -(6LL * 7LL * 24LL * 60LL * 60LL * TICKS_PER_SECOND); /* 6 weeks */ + FixedData.MinPasswordAge.QuadPart = 0; /* right now */ +// FixedData.ForceLogoff.QuadPart = // very far in the future aka never + FixedData.LockoutDuration.QuadPart = -(30LL * 60LL * TICKS_PER_SECOND); /* 30 minutes */ + FixedData.LockoutObservationWindow.QuadPart = -(30LL * 60LL * TICKS_PER_SECOND); /* 30 minutes */ FixedData.ModifiedCountAtLastPromotion.QuadPart = 0; FixedData.NextRid = 1000; FixedData.PasswordProperties = 0;

11 years, 9 months

[akhaldi] 58477: [PSDK] * Annotate batclass.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 12 21:16:25 2013 New Revision: 58477 URL: http://svn.reactos.org/svn/reactos?rev=58477&view=rev Log: [PSDK] * Annotate batclass.h. Modified: trunk/reactos/include/psdk/batclass.h Modified: trunk/reactos/include/psdk/batclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/batclass.h?re… ============================================================================== --- trunk/reactos/include/psdk/batclass.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/batclass.h [iso-8859-1] Tue Mar 12 21:16:25 2013 @@ -163,28 +163,40 @@ #define BATTERY_CLASS_MAJOR_VERSION 0x0001 #define BATTERY_CLASS_MINOR_VERSION 0x0000 +_Function_class_(BCLASS_QUERY_TAG_CALLBACK) +_IRQL_requires_same_ +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ typedef NTSTATUS (NTAPI BCLASS_QUERY_TAG_CALLBACK)( - IN PVOID Context, - OUT PULONG BatteryTag); + _In_ PVOID Context, + _Out_ PULONG BatteryTag); typedef BCLASS_QUERY_TAG_CALLBACK *PBCLASS_QUERY_TAG_CALLBACK; +_Function_class_(BCLASS_QUERY_INFORMATION_CALLBACK) +_IRQL_requires_same_ +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ typedef NTSTATUS (NTAPI BCLASS_QUERY_INFORMATION_CALLBACK)( - IN PVOID Context, - IN ULONG BatteryTag, - IN BATTERY_QUERY_INFORMATION_LEVEL Level, - IN LONG AtRate, - OUT PVOID Buffer, - IN ULONG BufferLength, - OUT PULONG ReturnedLength); + _In_ PVOID Context, + _In_ ULONG BatteryTag, + _In_ BATTERY_QUERY_INFORMATION_LEVEL Level, + _In_ LONG AtRate, + _Out_writes_bytes_to_(BufferLength, *ReturnedLength) PVOID Buffer, + _In_ ULONG BufferLength, + _Out_ PULONG ReturnedLength); typedef BCLASS_QUERY_INFORMATION_CALLBACK *PBCLASS_QUERY_INFORMATION_CALLBACK; +_Function_class_(BCLASS_QUERY_STATUS_CALLBACK) +_IRQL_requires_same_ +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ typedef NTSTATUS (NTAPI BCLASS_QUERY_STATUS_CALLBACK)( - IN PVOID Context, - IN ULONG BatteryTag, - OUT PBATTERY_STATUS BatteryStatus); + _In_ PVOID Context, + _In_ ULONG BatteryTag, + _Out_ PBATTERY_STATUS BatteryStatus); typedef BCLASS_QUERY_STATUS_CALLBACK *PBCLASS_QUERY_STATUS_CALLBACK; typedef struct _BATTERY_NOTIFY { @@ -193,24 +205,36 @@ ULONG HighCapacity; } BATTERY_NOTIFY, *PBATTERY_NOTIFY; +_Function_class_(BCLASS_SET_STATUS_NOTIFY_CALLBACK) +_IRQL_requires_same_ +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ typedef NTSTATUS (NTAPI BCLASS_SET_STATUS_NOTIFY_CALLBACK)( - IN PVOID Context, - IN ULONG BatteryTag, - IN PBATTERY_NOTIFY BatteryNotify); + _In_ PVOID Context, + _In_ ULONG BatteryTag, + _In_ PBATTERY_NOTIFY BatteryNotify); typedef BCLASS_SET_STATUS_NOTIFY_CALLBACK *PBCLASS_SET_STATUS_NOTIFY_CALLBACK; +_Function_class_(BCLASS_SET_INFORMATION_CALLBACK) +_IRQL_requires_same_ +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ typedef NTSTATUS (NTAPI BCLASS_SET_INFORMATION_CALLBACK)( - IN PVOID Context, - IN ULONG BatteryTag, - IN BATTERY_SET_INFORMATION_LEVEL Level, - IN PVOID Buffer OPTIONAL); + _In_ PVOID Context, + _In_ ULONG BatteryTag, + _In_ BATTERY_SET_INFORMATION_LEVEL Level, + _In_opt_ PVOID Buffer); typedef BCLASS_SET_INFORMATION_CALLBACK *PBCLASS_SET_INFORMATION_CALLBACK; +_Function_class_(BCLASS_DISABLE_STATUS_NOTIFY_CALLBACK) +_IRQL_requires_same_ +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ typedef NTSTATUS (NTAPI BCLASS_DISABLE_STATUS_NOTIFY_CALLBACK)( - IN PVOID Context); + _In_ PVOID Context); typedef BCLASS_DISABLE_STATUS_NOTIFY_CALLBACK *PBCLASS_DISABLE_STATUS_NOTIFY_CALLBACK; typedef PBCLASS_QUERY_TAG_CALLBACK BCLASS_QUERY_TAG; @@ -302,57 +326,67 @@ #define BCLASSAPI DECLSPEC_IMPORT #endif +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ BCLASSAPI NTSTATUS NTAPI BatteryClassInitializeDevice( - IN PBATTERY_MINIPORT_INFO MiniportInfo, - IN PVOID *ClassData); - + _In_ PBATTERY_MINIPORT_INFO MiniportInfo, + _Out_ PVOID *ClassData); + +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ BCLASSAPI NTSTATUS NTAPI BatteryClassIoctl( - IN PVOID ClassData, - IN OUT PIRP Irp); - + _In_ PVOID ClassData, + _Inout_ PIRP Irp); + +_IRQL_requires_max_(DISPATCH_LEVEL) BCLASSAPI NTSTATUS NTAPI BatteryClassStatusNotify( - IN PVOID ClassData); + _In_ PVOID ClassData); #if (NTDDI_VERSION >= NTDDI_WINXP) +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ BCLASSAPI NTSTATUS NTAPI BatteryClassQueryWmiDataBlock( - IN PVOID ClassData, - IN OUT PDEVICE_OBJECT DeviceObject, - IN OUT PIRP Irp, - IN ULONG GuidIndex, - OUT PULONG InstanceLengthArray, - IN ULONG OutBufferSize, - OUT PUCHAR Buffer OPTIONAL); - + _In_ PVOID ClassData, + _Inout_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp, + _In_ ULONG GuidIndex, + _Out_writes_(1) PULONG InstanceLengthArray, + _In_ ULONG OutBufferSize, + _Out_writes_bytes_opt_(OutBufferSize) PUCHAR Buffer); + +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ BCLASSAPI NTSTATUS NTAPI BatteryClassSystemControl( - IN PVOID ClassData, - IN PVOID WmiLibContext, /* PWMILIB_CONTEXT */ - IN PDEVICE_OBJECT DeviceObject, - IN OUT PIRP Irp, - OUT PVOID Disposition); /* PSYSCTL_IRP_DISPOSITION */ + _In_ PVOID ClassData, + _In_ PVOID WmiLibContext, /* PWMILIB_CONTEXT */ + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp, + _Out_ PVOID Disposition); /* PSYSCTL_IRP_DISPOSITION */ #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ +_IRQL_requires_max_(PASSIVE_LEVEL) BCLASSAPI NTSTATUS NTAPI BatteryClassUnload( - IN PVOID ClassData); + _In_ PVOID ClassData); #endif /* _WINDOWS_H */

11 years, 9 months

[ekohl] 58476: [SAMSRV] Add helper functions SampOpenAliasObject, SampOpenGroupObject and SampRemoveUserFromAllGroups.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Mar 12 20:07:56 2013 New Revision: 58476 URL: http://svn.reactos.org/svn/reactos?rev=58476&view=rev Log: [SAMSRV] Add helper functions SampOpenAliasObject, SampOpenGroupObject and SampRemoveUserFromAllGroups. Added: trunk/reactos/dll/win32/samsrv/alias.c (with props) Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt trunk/reactos/dll/win32/samsrv/group.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/user.c Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Tue Mar 12 20:07:56 2013 @@ -8,6 +8,7 @@ spec2def(samsrv.dll samsrv.spec ADD_IMPORTLIB) list(APPEND SOURCE + alias.c database.c domain.c group.c Added: trunk/reactos/dll/win32/samsrv/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/alias.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/alias.c (added) +++ trunk/reactos/dll/win32/samsrv/alias.c [iso-8859-1] Tue Mar 12 20:07:56 2013 @@ -1,0 +1,42 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/samsrv/alias.c + * PURPOSE: Alias specific helper functions + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "samsrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(samsrv); + + +/* FUNCTIONS ***************************************************************/ + +NTSTATUS +SampOpenAliasObject(IN PSAM_DB_OBJECT DomainObject, + IN ULONG AliasId, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_DB_OBJECT *AliasObject) +{ + WCHAR szRid[9]; + + TRACE("(%p %lu %lx %p)\n", + DomainObject, AliasId, DesiredAccess, AliasObject); + + /* Convert the RID into a string (hex) */ + swprintf(szRid, L"%08lX", AliasId); + + /* Create the user object */ + return SampOpenDbObject(DomainObject, + L"Aliases", + szRid, + AliasId, + SamDbAliasObject, + DesiredAccess, + AliasObject); +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/samsrv/alias.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/samsrv/alias.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/samsrv/group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/group.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/group.c [iso-8859-1] Tue Mar 12 20:07:56 2013 @@ -14,6 +14,30 @@ /* FUNCTIONS ***************************************************************/ + +NTSTATUS +SampOpenGroupObject(IN PSAM_DB_OBJECT DomainObject, + IN ULONG GroupId, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_DB_OBJECT *GroupObject) +{ + WCHAR szRid[9]; + + TRACE("(%p %lu %lx %p)\n", + DomainObject, GroupId, DesiredAccess, GroupObject); + + /* Convert the RID into a string (hex) */ + swprintf(szRid, L"%08lX", GroupId); + + /* Create the user object */ + return SampOpenDbObject(DomainObject, + L"Groups", + szRid, + GroupId, + SamDbGroupObject, + DesiredAccess, + GroupObject); +} NTSTATUS Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Tue Mar 12 20:07:56 2013 @@ -117,6 +117,15 @@ extern PGENERIC_MAPPING pServerMapping; +/* alias.c */ + +NTSTATUS +SampOpenAliasObject(IN PSAM_DB_OBJECT DomainObject, + IN ULONG AliasId, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_DB_OBJECT *AliasObject); + + /* database.c */ NTSTATUS @@ -193,6 +202,12 @@ /* group.h */ NTSTATUS +SampOpenGroupObject(IN PSAM_DB_OBJECT DomainObject, + IN ULONG GroupId, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_DB_OBJECT *GroupObject); + +NTSTATUS SampAddMemberToGroup(IN PSAM_DB_OBJECT GroupObject, IN ULONG MemberId); @@ -302,6 +317,9 @@ IN ULONG GroupAttributes); NTSTATUS +SampRemoveUserFromAllGroups(IN PSAM_DB_OBJECT UserObject); + +NTSTATUS SampSetUserPassword(IN PSAM_DB_OBJECT UserObject, IN PENCRYPTED_NT_OWF_PASSWORD NtPassword, IN BOOLEAN NtPasswordPresent, Modified: trunk/reactos/dll/win32/samsrv/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/user.c?re… ============================================================================== --- trunk/reactos/dll/win32/samsrv/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/user.c [iso-8859-1] Tue Mar 12 20:07:56 2013 @@ -321,6 +321,69 @@ NTSTATUS +SampRemoveUserFromAllGroups(IN PSAM_DB_OBJECT UserObject) +{ + PGROUP_MEMBERSHIP GroupsBuffer = NULL; + PSAM_DB_OBJECT GroupObject; + ULONG Length = 0; + ULONG i; + NTSTATUS Status; + + SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + NULL, + &Length); + + if (Length == 0) + return STATUS_SUCCESS; + + GroupsBuffer = midl_user_allocate(Length); + if (GroupsBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + GroupsBuffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + for (i = 0; i < (Length / sizeof(GROUP_MEMBERSHIP)); i++) + { + Status = SampOpenGroupObject(UserObject->ParentObject, + GroupsBuffer[i].RelativeId, + 0, + &GroupObject); + if (!NT_SUCCESS(Status)) + { + goto done; + } + + Status = SampRemoveMemberFromGroup(GroupObject, + UserObject->RelativeId); + + SampCloseDbObject(GroupObject); + + if (!NT_SUCCESS(Status)) + { + goto done; + } + } + +done: + if (GroupsBuffer != NULL) + midl_user_free(GroupsBuffer); + + return Status; +} + + +NTSTATUS SampSetUserPassword(IN PSAM_DB_OBJECT UserObject, IN PENCRYPTED_NT_OWF_PASSWORD NtPassword, IN BOOLEAN NtPasswordPresent,

11 years, 9 months

[akhaldi] 58475: [PSDK] * Annotate evntprov.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 12 11:40:11 2013 New Revision: 58475 URL: http://svn.reactos.org/svn/reactos?rev=58475&view=rev Log: [PSDK] * Annotate evntprov.h. Modified: trunk/reactos/include/psdk/evntprov.h Modified: trunk/reactos/include/psdk/evntprov.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/evntprov.h?re… ============================================================================== --- trunk/reactos/include/psdk/evntprov.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/evntprov.h [iso-8859-1] Tue Mar 12 11:40:11 2013 @@ -90,72 +90,72 @@ typedef VOID (NTAPI *PENABLECALLBACK)( - IN LPCGUID SourceId, - IN ULONG IsEnabled, - IN UCHAR Level, - IN ULONGLONG MatchAnyKeyword, - IN ULONGLONG MatchAllKeyword, - IN PEVENT_FILTER_DESCRIPTOR FilterData OPTIONAL, - IN OUT PVOID CallbackContext OPTIONAL); + _In_ LPCGUID SourceId, + _In_ ULONG IsEnabled, + _In_ UCHAR Level, + _In_ ULONGLONG MatchAnyKeyword, + _In_ ULONGLONG MatchAllKeyword, + _In_opt_ PEVENT_FILTER_DESCRIPTOR FilterData, + _Inout_opt_ PVOID CallbackContext); #if (WINVER >= _WIN32_WINNT_VISTA) ULONG EVNTAPI EventRegister( - IN LPCGUID ProviderId, - IN PENABLECALLBACK EnableCallback OPTIONAL, - IN PVOID CallbackContext OPTIONAL, - OUT PREGHANDLE RegHandle); + _In_ LPCGUID ProviderId, + _In_opt_ PENABLECALLBACK EnableCallback, + _In_opt_ PVOID CallbackContext, + _Out_ PREGHANDLE RegHandle); ULONG EVNTAPI EventUnregister( - IN REGHANDLE RegHandle); + _In_ REGHANDLE RegHandle); BOOLEAN EVNTAPI EventEnabled( - IN REGHANDLE RegHandle, - IN PCEVENT_DESCRIPTOR EventDescriptor); + _In_ REGHANDLE RegHandle, + _In_ PCEVENT_DESCRIPTOR EventDescriptor); BOOLEAN EVNTAPI EventProviderEnabled( - IN REGHANDLE RegHandle, - IN UCHAR Level, - IN ULONGLONG Keyword); + _In_ REGHANDLE RegHandle, + _In_ UCHAR Level, + _In_ ULONGLONG Keyword); ULONG EVNTAPI EventWrite( - IN REGHANDLE RegHandle, - IN PCEVENT_DESCRIPTOR EventDescriptor, - IN ULONG UserDataCount, - IN PEVENT_DATA_DESCRIPTOR UserData); + _In_ REGHANDLE RegHandle, + _In_ PCEVENT_DESCRIPTOR EventDescriptor, + _In_ ULONG UserDataCount, + _In_reads_opt_(UserDataCount) PEVENT_DATA_DESCRIPTOR UserData); ULONG EVNTAPI EventWriteTransfer( - IN REGHANDLE RegHandle, - IN PCEVENT_DESCRIPTOR EventDescriptor, - IN LPCGUID ActivityId OPTIONAL, - IN LPCGUID RelatedActivityId OPTIONAL, - IN ULONG UserDataCount, - IN PEVENT_DATA_DESCRIPTOR UserData OPTIONAL); + _In_ REGHANDLE RegHandle, + _In_ PCEVENT_DESCRIPTOR EventDescriptor, + _In_opt_ LPCGUID ActivityId, + _In_opt_ LPCGUID RelatedActivityId, + _In_ ULONG UserDataCount, + _In_reads_opt_(UserDataCount) PEVENT_DATA_DESCRIPTOR UserData); ULONG EVNTAPI EventWriteString( - IN REGHANDLE RegHandle, - IN UCHAR Level, - IN ULONGLONG Keyword, - IN PCWSTR String); + _In_ REGHANDLE RegHandle, + _In_ UCHAR Level, + _In_ ULONGLONG Keyword, + _In_ PCWSTR String); ULONG EVNTAPI EventActivityIdControl( - IN ULONG ControlCode, - IN OUT LPGUID ActivityId); + _In_ ULONG ControlCode, + _Inout_ LPGUID ActivityId); #endif /* (WINVER >= _WIN32_WINNT_VISTA) */ @@ -163,14 +163,14 @@ ULONG EVNTAPI EventWriteEx( - IN REGHANDLE RegHandle, - IN PCEVENT_DESCRIPTOR EventDescriptor, - IN ULONG64 Filter, - IN ULONG Flags, - IN LPCGUID ActivityId OPTIONAL, - IN LPCGUID RelatedActivityId OPTIONAL, - IN ULONG UserDataCount, - IN PEVENT_DATA_DESCRIPTOR UserData OPTIONAL); + _In_ REGHANDLE RegHandle, + _In_ PCEVENT_DESCRIPTOR EventDescriptor, + _In_ ULONG64 Filter, + _In_ ULONG Flags, + _In_opt_ LPCGUID ActivityId, + _In_opt_ LPCGUID RelatedActivityId, + _In_ ULONG UserDataCount, + _In_reads_opt_(UserDataCount) PEVENT_DATA_DESCRIPTOR UserData); #endif #endif // _ETW_KM_ @@ -178,9 +178,9 @@ FORCEINLINE VOID EventDataDescCreate( - OUT PEVENT_DATA_DESCRIPTOR EventDataDescriptor, - IN const VOID* DataPtr, - IN ULONG DataSize) + _Out_ PEVENT_DATA_DESCRIPTOR EventDataDescriptor, + _In_reads_bytes_(DataSize) const VOID* DataPtr, + _In_ ULONG DataSize) { EventDataDescriptor->Ptr = (ULONGLONG)(ULONG_PTR)DataPtr; EventDataDescriptor->Size = DataSize; @@ -190,14 +190,14 @@ FORCEINLINE VOID EventDescCreate( - OUT PEVENT_DESCRIPTOR EventDescriptor, - IN USHORT Id, - IN UCHAR Version, - IN UCHAR Channel, - IN UCHAR Level, - IN USHORT Task, - IN UCHAR Opcode, - IN ULONGLONG Keyword) + _Out_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ USHORT Id, + _In_ UCHAR Version, + _In_ UCHAR Channel, + _In_ UCHAR Level, + _In_ USHORT Task, + _In_ UCHAR Opcode, + _In_ ULONGLONG Keyword) { EventDescriptor->Id = Id; EventDescriptor->Version = Version; @@ -211,7 +211,7 @@ FORCEINLINE VOID EventDescZero( - OUT PEVENT_DESCRIPTOR EventDescriptor) + _Out_ PEVENT_DESCRIPTOR EventDescriptor) { memset(EventDescriptor, 0, sizeof(EVENT_DESCRIPTOR)); } @@ -219,7 +219,7 @@ FORCEINLINE USHORT EventDescGetId( - IN PCEVENT_DESCRIPTOR EventDescriptor) + _In_ PCEVENT_DESCRIPTOR EventDescriptor) { return (EventDescriptor->Id); } @@ -227,7 +227,7 @@ FORCEINLINE UCHAR EventDescGetVersion( - IN PCEVENT_DESCRIPTOR EventDescriptor) + _In_ PCEVENT_DESCRIPTOR EventDescriptor) { return (EventDescriptor->Version); } @@ -235,7 +235,7 @@ FORCEINLINE USHORT EventDescGetTask( - IN PCEVENT_DESCRIPTOR EventDescriptor) + _In_ PCEVENT_DESCRIPTOR EventDescriptor) { return (EventDescriptor->Task); } @@ -243,7 +243,7 @@ FORCEINLINE UCHAR EventDescGetOpcode( - IN PCEVENT_DESCRIPTOR EventDescriptor) + _In_ PCEVENT_DESCRIPTOR EventDescriptor) { return (EventDescriptor->Opcode); } @@ -251,7 +251,7 @@ FORCEINLINE UCHAR EventDescGetChannel( - IN PCEVENT_DESCRIPTOR EventDescriptor) + _In_ PCEVENT_DESCRIPTOR EventDescriptor) { return (EventDescriptor->Channel); } @@ -259,7 +259,7 @@ FORCEINLINE UCHAR EventDescGetLevel( - IN PCEVENT_DESCRIPTOR EventDescriptor) + _In_ PCEVENT_DESCRIPTOR EventDescriptor) { return (EventDescriptor->Level); } @@ -267,7 +267,7 @@ FORCEINLINE ULONGLONG EventDescGetKeyword( - IN PCEVENT_DESCRIPTOR EventDescriptor) + _In_ PCEVENT_DESCRIPTOR EventDescriptor) { return (EventDescriptor->Keyword); } @@ -275,8 +275,8 @@ FORCEINLINE PEVENT_DESCRIPTOR EventDescSetId( - IN PEVENT_DESCRIPTOR EventDescriptor, - IN USHORT Id) + _In_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ USHORT Id) { EventDescriptor->Id = Id; return (EventDescriptor); @@ -285,8 +285,8 @@ FORCEINLINE PEVENT_DESCRIPTOR EventDescSetVersion( - IN PEVENT_DESCRIPTOR EventDescriptor, - IN UCHAR Version) + _In_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ UCHAR Version) { EventDescriptor->Version = Version; return (EventDescriptor); @@ -295,8 +295,8 @@ FORCEINLINE PEVENT_DESCRIPTOR EventDescSetTask( - IN PEVENT_DESCRIPTOR EventDescriptor, - IN USHORT Task) + _In_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ USHORT Task) { EventDescriptor->Task = Task; return (EventDescriptor); @@ -305,8 +305,8 @@ FORCEINLINE PEVENT_DESCRIPTOR EventDescSetOpcode( - IN PEVENT_DESCRIPTOR EventDescriptor, - IN UCHAR Opcode) + _In_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ UCHAR Opcode) { EventDescriptor->Opcode = Opcode; return (EventDescriptor); @@ -315,8 +315,8 @@ FORCEINLINE PEVENT_DESCRIPTOR EventDescSetLevel( - IN PEVENT_DESCRIPTOR EventDescriptor, - IN UCHAR Level) + _In_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ UCHAR Level) { EventDescriptor->Level = Level; return (EventDescriptor); @@ -325,8 +325,8 @@ FORCEINLINE PEVENT_DESCRIPTOR EventDescSetChannel( - IN PEVENT_DESCRIPTOR EventDescriptor, - IN UCHAR Channel) + _In_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ UCHAR Channel) { EventDescriptor->Channel = Channel; return (EventDescriptor); @@ -335,8 +335,8 @@ FORCEINLINE PEVENT_DESCRIPTOR EventDescSetKeyword( - IN PEVENT_DESCRIPTOR EventDescriptor, - IN ULONGLONG Keyword) + _In_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ ULONGLONG Keyword) { EventDescriptor->Keyword = Keyword; return (EventDescriptor); @@ -346,8 +346,8 @@ FORCEINLINE PEVENT_DESCRIPTOR EventDescOrKeyword( - IN PEVENT_DESCRIPTOR EventDescriptor, - IN ULONGLONG Keyword) + _In_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ ULONGLONG Keyword) { EventDescriptor->Keyword |= Keyword; return (EventDescriptor); @@ -356,4 +356,3 @@ #ifdef __cplusplus } #endif -

11 years, 9 months

[akhaldi] 58474: [CRT] * Annotate malloc.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 11 22:06:16 2013 New Revision: 58474 URL: http://svn.reactos.org/svn/reactos?rev=58474&view=rev Log: [CRT] * Annotate malloc.h. Modified: trunk/reactos/include/crt/malloc.h Modified: trunk/reactos/include/crt/malloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/malloc.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/malloc.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/malloc.h [iso-8859-1] Mon Mar 11 22:06:16 2013 @@ -69,23 +69,129 @@ #ifndef _CRT_ALLOCATION_DEFINED #define _CRT_ALLOCATION_DEFINED - void *__cdecl calloc(size_t _NumOfElements,size_t _SizeOfElements); - void __cdecl free(void *_Memory); - void *__cdecl malloc(size_t _Size); - void *__cdecl realloc(void *_Memory,size_t _NewSize); - _CRTIMP void *__cdecl _recalloc(void *_Memory,size_t _Count,size_t _Size); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_NumOfElements * _SizeOfElements) + void* + __cdecl + calloc( + _In_ size_t _NumOfElements, + _In_ size_t _SizeOfElements); + + void + __cdecl + free( + _Pre_maybenull_ _Post_invalid_ void *_Memory); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + void* + __cdecl + malloc( + _In_ size_t _Size); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_NewSize) + void* + __cdecl + realloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _NewSize); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Count * _Size) + _CRTIMP + void* + __cdecl + _recalloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Count, + _In_ size_t _Size); #ifdef __DO_ALIGN_DEFINES - _CRTIMP void __cdecl _aligned_free(void *_Memory); - _CRTIMP void *__cdecl _aligned_malloc(size_t _Size,size_t _Alignment); -#endif - - _CRTIMP void *__cdecl _aligned_offset_malloc(size_t _Size,size_t _Alignment,size_t _Offset); - _CRTIMP void *__cdecl _aligned_realloc(void *_Memory,size_t _Size,size_t _Alignment); - _CRTIMP void *__cdecl _aligned_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment); - _CRTIMP void *__cdecl _aligned_offset_realloc(void *_Memory,size_t _Size,size_t _Alignment,size_t _Offset); - _CRTIMP void *__cdecl _aligned_offset_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment,size_t _Offset); -#endif + + _CRTIMP + void + __cdecl + _aligned_free( + _Pre_maybenull_ _Post_invalid_ void *_Memory); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + _CRTIMP + void* + __cdecl + _aligned_malloc( + _In_ size_t _Size, + _In_ size_t _Alignment); + +#endif /* __DO_ALIGN_DEFINES */ + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + _CRTIMP + void* + __cdecl + _aligned_offset_malloc( + _In_ size_t _Size, + _In_ size_t _Alignment, + _In_ size_t _Offset); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + _CRTIMP + void* + __cdecl + _aligned_realloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Size, + _In_ size_t _Alignment); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Count * _Size) + _CRTIMP + void* + __cdecl + _aligned_recalloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Count, + _In_ size_t _Size, + _In_ size_t _Alignment); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + _CRTIMP + void* + __cdecl + _aligned_offset_realloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Size, + _In_ size_t _Alignment, + _In_ size_t _Offset); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Count * _Size) + _CRTIMP + void* + __cdecl + _aligned_offset_recalloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Count, + _In_ size_t _Size, + _In_ size_t _Alignment, + _In_ size_t _Offset); + +#endif /* _CRT_ALLOCATION_DEFINED */ #ifdef __DO_ALIGN_DEFINES #undef __DO_ALIGN_DEFINES @@ -98,27 +204,109 @@ #define _MAX_WAIT_MALLOC_CRT 60000 _CRTIMP int __cdecl _resetstkoflw (void); - _CRTIMP unsigned long __cdecl _set_malloc_crt_max_wait(unsigned long _NewValue); - - _CRTIMP void *__cdecl _expand(void *_Memory,size_t _NewSize); - _CRTIMP size_t __cdecl _msize(void *_Memory); + + _CRTIMP + unsigned long + __cdecl + _set_malloc_crt_max_wait( + _In_ unsigned long _NewValue); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_NewSize) + _CRTIMP + void* + __cdecl + _expand( + _In_opt_ void *_Memory, + _In_ size_t _NewSize); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _msize( + _In_ void *_Memory); + #ifdef __GNUC__ #undef _alloca #define _alloca(x) __builtin_alloca((x)) #else - void *__cdecl _alloca(size_t _Size); -#endif - _CRTIMP size_t __cdecl _get_sbh_threshold(void); - _CRTIMP int __cdecl _set_sbh_threshold(size_t _NewValue); - _CRTIMP errno_t __cdecl _set_amblksiz(size_t _Value); - _CRTIMP errno_t __cdecl _get_amblksiz(size_t *_Value); - _CRTIMP int __cdecl _heapadd(void *_Memory,size_t _Size); - _CRTIMP int __cdecl _heapchk(void); - _CRTIMP int __cdecl _heapmin(void); - _CRTIMP int __cdecl _heapset(unsigned int _Fill); - _CRTIMP int __cdecl _heapwalk(_HEAPINFO *_EntryInfo); - _CRTIMP size_t __cdecl _heapused(size_t *_Used,size_t *_Commit); - _CRTIMP intptr_t __cdecl _get_heap_handle(void); + _Ret_notnull_ + _Post_writable_byte_size_(_Size) + void* + __cdecl + _alloca( + _In_ size_t _Size); +#endif + + _Check_return_ + _CRTIMP + size_t + __cdecl + _get_sbh_threshold(void); + + _CRTIMP + int + __cdecl + _set_sbh_threshold( + _In_ size_t _NewValue); + + _CRTIMP + errno_t + __cdecl + _set_amblksiz( + _In_ size_t _Value); + + _CRTIMP + errno_t + __cdecl + _get_amblksiz( + _Out_ size_t *_Value); + + _Check_return_ + _CRTIMP + int + __cdecl + _heapadd( + _In_ void *_Memory, + _In_ size_t _Size); + + _Check_return_ + _CRTIMP + int + __cdecl + _heapchk(void); + + _Check_return_ + _CRTIMP + int + __cdecl + _heapmin(void); + + _CRTIMP + int + __cdecl + _heapset( + _In_ unsigned int _Fill); + + _CRTIMP + int + __cdecl + _heapwalk( + _Inout_ _HEAPINFO *_EntryInfo); + + _CRTIMP + size_t + __cdecl + _heapused( + size_t *_Used, + size_t *_Commit); + + _CRTIMP + intptr_t + __cdecl + _get_heap_handle(void); #define _ALLOCA_S_THRESHOLD 1024 #define _ALLOCA_S_STACK_MARKER 0xCCCC @@ -179,14 +367,18 @@ typedef int (__cdecl *_HEAPHOOK)(int,size_t,void *,void **); #endif - _CRTIMP _HEAPHOOK __cdecl _setheaphook(_HEAPHOOK _NewHook); - -#define _HEAP_MALLOC 1 -#define _HEAP_CALLOC 2 -#define _HEAP_FREE 3 + _CRTIMP + _HEAPHOOK + __cdecl + _setheaphook( + _In_opt_ _HEAPHOOK _NewHook); + +#define _HEAP_MALLOC 1 +#define _HEAP_CALLOC 2 +#define _HEAP_FREE 3 #define _HEAP_REALLOC 4 -#define _HEAP_MSIZE 5 -#define _HEAP_EXPAND 6 +#define _HEAP_MSIZE 5 +#define _HEAP_EXPAND 6 #endif #ifdef __cplusplus

11 years, 9 months

[ekohl] 58473: [SAMSRV] Implement SamrShutdownSamServer.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Mar 11 21:49:11 2013 New Revision: 58473 URL: http://svn.reactos.org/svn/reactos?rev=58473&view=rev Log: [SAMSRV] Implement SamrShutdownSamServer. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Mon Mar 11 21:49:11 2013 @@ -205,8 +205,23 @@ NTAPI SamrShutdownSamServer(IN SAMPR_HANDLE ServerHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT ServerObject; + NTSTATUS Status; + + TRACE("(%p)\n", ServerHandle); + + /* Validate the server handle */ + Status = SampValidateDbObject(ServerHandle, + SamDbServerObject, + SAM_SERVER_SHUTDOWN, + &ServerObject); + if (!NT_SUCCESS(Status)) + return Status; + + /* Shut the server down */ + RpcMgmtStopServerListening(0); + + return STATUS_SUCCESS; }

11 years, 9 months

[ekohl] 58472: [SAMSRV] - Implement SamIConnect. - Add a trusted caller flag to the database object type and inherit it to opened or created sub objects. - Restrict access to SamrQueryInformationUs...

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Mar 11 21:01:30 2013 New Revision: 58472 URL: http://svn.reactos.org/svn/reactos?rev=58472&view=rev Log: [SAMSRV] - Implement SamIConnect. - Add a trusted caller flag to the database object type and inherit it to opened or created sub objects. - Restrict access to SamrQueryInformationUser.UserInternal1Information for non-trusted callers. Modified: trunk/reactos/dll/win32/samsrv/database.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/samsrv.spec Modified: trunk/reactos/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/database.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] Mon Mar 11 21:01:30 2013 @@ -210,7 +210,7 @@ } NewObject = RtlAllocateHeap(RtlGetProcessHeap(), - 0, + HEAP_ZERO_MEMORY, sizeof(SAM_DB_OBJECT)); if (NewObject == NULL) { @@ -243,6 +243,9 @@ NewObject->RelativeId = RelativeId; NewObject->ParentObject = ParentObject; + if (ParentObject != NULL) + NewObject->Trusted = ParentObject->Trusted; + *DbObject = NewObject; return STATUS_SUCCESS; @@ -359,7 +362,7 @@ } NewObject = RtlAllocateHeap(RtlGetProcessHeap(), - 0, + HEAP_ZERO_MEMORY, sizeof(SAM_DB_OBJECT)); if (NewObject == NULL) { @@ -391,6 +394,9 @@ NewObject->RelativeId = RelativeId; NewObject->ParentObject = ParentObject; + if (ParentObject != NULL) + NewObject->Trusted = ParentObject->Trusted; + *DbObject = NewObject; return STATUS_SUCCESS; Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Mon Mar 11 21:01:30 2013 @@ -56,6 +56,8 @@ USER_EXECUTE, USER_ALL_ACCESS }; + +PGENERIC_MAPPING pServerMapping = &ServerMapping; /* FUNCTIONS *****************************************************************/ @@ -6043,13 +6045,18 @@ } -static NTSTATUS +static +NTSTATUS SampQueryUserInternal1(PSAM_DB_OBJECT UserObject, - PSAMPR_USER_INFO_BUFFER *Buffer) + PSAMPR_USER_INFO_BUFFER *Buffer) { PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; ULONG Length = 0; NTSTATUS Status = STATUS_SUCCESS; + + /* Fail, if the caller is not a trusted caller */ + if (UserObject->Trusted == FALSE) + return STATUS_INVALID_INFO_CLASS; *Buffer = NULL; 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] Mon Mar 11 21:01:30 2013 @@ -24,6 +24,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(samsrv); /* FUNCTIONS ****************************************************************/ + +NTSTATUS +NTAPI +SamIConnect(IN PSAMPR_SERVER_NAME ServerName, + OUT SAMPR_HANDLE *ServerHandle, + IN ACCESS_MASK DesiredAccess, + IN BOOLEAN Trusted) +{ + PSAM_DB_OBJECT ServerObject; + NTSTATUS Status; + + TRACE("SamIConnect(%p %p %lx %ld)\n", + ServerName, ServerHandle, DesiredAccess, Trusted); + + /* Map generic access rights */ + RtlMapGenericMask(&DesiredAccess, + pServerMapping); + + /* Open the Server Object */ + Status = SampOpenDbObject(NULL, + NULL, + L"SAM", + 0, + SamDbServerObject, + DesiredAccess, + &ServerObject); + if (NT_SUCCESS(Status)) + { + ServerObject->Trusted = Trusted; + *ServerHandle = (SAMPR_HANDLE)ServerObject; + } + + TRACE("SamIConnect done (Status 0x%08lx)\n", Status); + + return Status; +} + NTSTATUS NTAPI Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Mon Mar 11 21:01:30 2013 @@ -50,6 +50,7 @@ HANDLE KeyHandle; HANDLE MembersKeyHandle; // only used by Aliases ULONG RelativeId; + BOOLEAN Trusted; struct _SAM_DB_OBJECT *ParentObject; } SAM_DB_OBJECT, *PSAM_DB_OBJECT; @@ -113,6 +114,9 @@ } SAM_USER_FIXED_DATA, *PSAM_USER_FIXED_DATA; +extern PGENERIC_MAPPING pServerMapping; + + /* database.c */ NTSTATUS 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] Mon Mar 11 21:01:30 2013 @@ -4,7 +4,7 @@ @ stub SamIAmIGC @ stub SamIChangePasswordForeignUser @ stub SamIChangePasswordForeignUser2 -@ stub SamIConnect +@ stdcall SamIConnect(ptr ptr long long) @ stub SamICreateAccountByRid @ stub SamIDemote @ stub SamIDemoteUndo @@ -156,4 +156,4 @@ @ stdcall SamrTestPrivateFunctionsDomain(ptr) @ stdcall SamrTestPrivateFunctionsUser(ptr) @ stdcall SamrUnicodeChangePasswordUser2(ptr ptr ptr ptr ptr long ptr ptr) -; EOF +; EOF

11 years, 9 months

← Newer
1
...
13
14
15
16
17
18
19
...
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