Ros-diffs March 2013

ros-diffs@reactos.org

14 participants
249 discussions

[ekohl] 58391: [WINLOGON] - Replace the old LogonStatus variable by a LOGON_STATE enum type. - Declare and document all new states and their transitions.
by ekohl＠svn.reactos.org 02 Mar '13

02 Mar '13

Author: ekohl Date: Sat Mar 2 11:58:26 2013 New Revision: 58391 URL: http://svn.reactos.org/svn/reactos?rev=58391&view=rev Log: [WINLOGON] - Replace the old LogonStatus variable by a LOGON_STATE enum type. - Declare and document all new states and their transitions. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sat Mar 2 11:58:26 2013 @@ -700,7 +700,7 @@ UnloadUserProfile(Session->UserToken, Session->hProfileInfo); CloseHandle(Session->UserToken); UpdatePerUserSystemParameters(0, FALSE); - Session->LogonStatus = WKSTA_IS_LOGGED_OFF; + Session->LogonState = STATE_LOGGED_OFF; Session->UserToken = NULL; return STATUS_SUCCESS; } @@ -828,7 +828,7 @@ if (HandleLogon(Session)) { SwitchDesktop(Session->ApplicationDesktop); - Session->LogonStatus = WKSTA_IS_LOGGED_ON; + Session->LogonState = STATE_LOGGED_ON; } else Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); @@ -839,7 +839,7 @@ if (Session->Gina.Functions.WlxIsLockOk(Session->Gina.Context)) { SwitchDesktop(WLSession->WinlogonDesktop); - Session->LogonStatus = WKSTA_IS_LOCKED; + Session->LogonState = STATE_LOCKED; Session->Gina.Functions.WlxDisplayLockedNotice(Session->Gina.Context); } break; @@ -847,7 +847,7 @@ case WLX_SAS_ACTION_SHUTDOWN: /* 0x05 */ case WLX_SAS_ACTION_SHUTDOWN_POWER_OFF: /* 0x0a */ case WLX_SAS_ACTION_SHUTDOWN_REBOOT: /* 0x0b */ - if (Session->LogonStatus != WKSTA_IS_LOGGED_OFF) + if (Session->LogonState != STATE_LOGGED_OFF) { if (!Session->Gina.Functions.WlxIsLogoffOk(Session->Gina.Context)) break; @@ -880,7 +880,7 @@ break; case WLX_SAS_ACTION_UNLOCK_WKSTA: /* 0x08 */ SwitchDesktop(WLSession->ApplicationDesktop); - Session->LogonStatus = WKSTA_IS_LOGGED_ON; + Session->LogonState = STATE_LOGGED_ON; break; default: WARN("Unknown SAS action 0x%lx\n", wlxAction); @@ -894,9 +894,9 @@ { DWORD wlxAction = WLX_SAS_ACTION_NONE; - if (Session->LogonStatus == WKSTA_IS_LOGGED_ON) + if (Session->LogonState == STATE_LOGGED_ON) wlxAction = (DWORD)Session->Gina.Functions.WlxLoggedOnSAS(Session->Gina.Context, dwSasType, NULL); - else if (Session->LogonStatus == WKSTA_IS_LOCKED) + else if (Session->LogonState == STATE_LOCKED) wlxAction = (DWORD)Session->Gina.Functions.WlxWkstaLockedSAS(Session->Gina.Context, dwSasType); else { Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sat Mar 2 11:58:26 2013 @@ -412,7 +412,7 @@ //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGCOMPUTERSETTINGS); /* Display logged out screen */ - WLSession->LogonStatus = WKSTA_IS_LOGGED_OFF; + WLSession->LogonState = STATE_LOGGED_OFF; RemoveStatusMessage(WLSession); /* Check for pending setup */ Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Sat Mar 2 11:58:26 2013 @@ -119,11 +119,87 @@ BOOL UseCtrlAltDelete; } GINAINSTANCE, *PGINAINSTANCE; -/* FIXME: put in an enum */ -/* See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/secauthn/s… */ -#define WKSTA_IS_LOGGED_OFF 0 -#define WKSTA_IS_LOGGED_ON 1 -#define WKSTA_IS_LOCKED 2 + +/* + * The picture Microfoft is trying to paint here + * (http://msdn.microsoft.com/en-us/library/windows/desktop/aa380547%28v=vs.85%…) + * about the Winlogon states is a little too simple. + * + * The real picture should look more like this: + * + * STATE_INIT + * Initial state. Required for session initialization. After intialization, + * the state will automatically change to STATE_LOGGED_OFF. + * + * STATE_LOGGED_OFF + * User is logged of. Winlogon shows the "Press Ctrl-Alt-Del for logon" + * dialog. The state changes to STATE_LOGGED_OFF_SAS when the user presses + * "Ctrl-Alt-Del". If DisableCAD is true, the state will automatically + * change to STATE_LOGGED_OFF_SAS without showing the dialog. + * + * STATE_LOGGED_OFF_SAS + * State shows the logon dialog. Entering the right credentials an pressing + * "OK" changes the state to STATE_LOGGED_ON. Pressing "Cancel" or a Timeout + * changes the state back to STATE_LOGGED_OFF. + * + * STATE_LOGGED_ON + * User is logged on. Winlogon does not show any dialog. Pressing + * "Ctrl-Alt-Del" changes the state to STATE_LOGGED_ON_SAS and user + * inactivity changes the state to STATE_SCREENSAVER. + * + * STATE_LOGGED_ON_SAS + * Winlogon shows the security dialog. Pressing "Cancel" or "Task Manager" + * or a Timeout change the state back to STATE_LOGGED_ON. Pressing "Change + * Password" does not change the state, because the security dialog is still + * visible behind the change password dialog. Pressing "Log off" changes the + * state to STATE_LOGGING_OFF. Pressing "Lock Computer" changes the state to + * STATE_LOCKED. Pressing "Shutdown" changes the state to + * STATE_SUUTTING_DOWN. + * + * STATE_SCREENSAVER + * Winlogon runs the screen saver. Upon user activity, the screensaver + * terminates and the state changes back to STATE_LOGGED_ON if the secure + * screen saver option is off. Otherwise, the state changes to STATE_LOCKED. + * + * STATE_LOGGING_OFF + * Winlogon shows the logoff dialog. Pressing "Cancel" or a timeout changes + * the state back to STATE_LOGGED_ON_SAS. Pressing "OK" logs off the user + * and changes the state to STATE_LOGGED_OFF. + * + * STATE_LOCKED + * Winlogon shows the locked message dialog. When the user presses "Ctrl- + * Alt-Del" the state changes to STATE_LOCKED_SAS. If DisableCAD is true, + * the state will automatically change to STATE_LOCKED_SAS without showing + * the dialog. + * + * STATE_LOCKED_SAS + * Winlogon shows the unlock dialog. Presing "Cancel" or a timeout will + * change the state back to STATE_LOCKED. Entering the right credentials and + * pressing "OK" unlocks the computer and changes the state to + * STATE_LOGGED_ON. + * + * STATE_SHUTTING_DOWN + * Winlogon shows the shutdown dialog. Presing "Cancel" or a timeout will + * change the state back to STATE_LOGGED_ON_SAS. Pressing "OK" will change + * the state to STATE_SHUT_DOWN. + * + * STATE_SHUT_DOWN + * Terminates winlogon and initiates shut-down. + */ +typedef enum _LOGON_STATE +{ + STATE_INIT, // not user yet + STATE_LOGGED_OFF, + STATE_LOGGED_OFF_SAS, // not user yet + STATE_LOGGED_ON, + STATE_LOGGED_ON_SAS, // not user yet + STATE_SCREENSAVER, // not user yet + STATE_LOCKED, + STATE_LOCKED_SAS, // not user yet + STATE_LOGGING_OFF, // not user yet + STATE_SHUTTING_DOWN, // not user yet + STATE_SHUT_DOWN // not user yet +} LOGON_STATE, *PLOGON_STATE; #define LockWorkstation(Session) #define UnlockWorkstation(Session) @@ -143,7 +219,7 @@ LUID LogonId; HANDLE UserToken; HANDLE hProfileInfo; - DWORD LogonStatus; + LOGON_STATE LogonState; DWORD DialogTimeout; /* Timeout for dialog boxes, in seconds */ /* Screen-saver informations */

1 0

[akhaldi] 58390: [PSDK] * Annotate winsvc.h.
by akhaldi＠svn.reactos.org 01 Mar '13

01 Mar '13

Author: akhaldi Date: Fri Mar 1 21:50:20 2013 New Revision: 58390 URL: http://svn.reactos.org/svn/reactos?rev=58390&view=rev Log: [PSDK] * Annotate winsvc.h. Modified: trunk/reactos/include/psdk/winsvc.h Modified: trunk/reactos/include/psdk/winsvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsvc.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winsvc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsvc.h [iso-8859-1] Fri Mar 1 21:50:20 2013 @@ -205,51 +205,253 @@ SC_ACTION * lpsaActions; } SERVICE_FAILURE_ACTIONSW,*LPSERVICE_FAILURE_ACTIONSW; -BOOL WINAPI ChangeServiceConfigA(SC_HANDLE,DWORD,DWORD,DWORD,LPCSTR,LPCSTR,LPDWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR); -BOOL WINAPI ChangeServiceConfigW(SC_HANDLE,DWORD,DWORD,DWORD,LPCWSTR,LPCWSTR,LPDWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); -BOOL WINAPI ChangeServiceConfig2A(SC_HANDLE,DWORD,LPVOID); -BOOL WINAPI ChangeServiceConfig2W(SC_HANDLE,DWORD,LPVOID); -BOOL WINAPI CloseServiceHandle(SC_HANDLE); -BOOL WINAPI ControlService(SC_HANDLE,DWORD,LPSERVICE_STATUS); -SC_HANDLE WINAPI CreateServiceA(SC_HANDLE,LPCSTR,LPCSTR,DWORD,DWORD,DWORD,DWORD,LPCSTR,LPCSTR,PDWORD,LPCSTR,LPCSTR,LPCSTR); -SC_HANDLE WINAPI CreateServiceW(SC_HANDLE,LPCWSTR,LPCWSTR,DWORD,DWORD,DWORD,DWORD,LPCWSTR,LPCWSTR,PDWORD,LPCWSTR,LPCWSTR,LPCWSTR); -BOOL WINAPI DeleteService(SC_HANDLE); -BOOL WINAPI EnumDependentServicesA(SC_HANDLE,DWORD,LPENUM_SERVICE_STATUSA,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumDependentServicesW(SC_HANDLE,DWORD,LPENUM_SERVICE_STATUSW,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumServicesStatusA(SC_HANDLE,DWORD,DWORD,LPENUM_SERVICE_STATUSA,DWORD,PDWORD,PDWORD,PDWORD); -BOOL WINAPI EnumServicesStatusW(SC_HANDLE,DWORD,DWORD,LPENUM_SERVICE_STATUSW,DWORD,PDWORD,PDWORD,PDWORD); -BOOL WINAPI EnumServicesStatusExA(SC_HANDLE,SC_ENUM_TYPE,DWORD,DWORD,LPBYTE,DWORD,LPDWORD,LPDWORD,LPDWORD,LPCSTR); -BOOL WINAPI EnumServicesStatusExW(SC_HANDLE,SC_ENUM_TYPE,DWORD,DWORD,LPBYTE,DWORD,LPDWORD,LPDWORD,LPDWORD,LPCWSTR); -BOOL WINAPI GetServiceDisplayNameA(SC_HANDLE,LPCSTR,LPSTR,PDWORD); -BOOL WINAPI GetServiceDisplayNameW(SC_HANDLE,LPCWSTR,LPWSTR,PDWORD); -BOOL WINAPI GetServiceKeyNameA(SC_HANDLE,LPCSTR,LPSTR,PDWORD); -BOOL WINAPI GetServiceKeyNameW(SC_HANDLE,LPCWSTR,LPWSTR,PDWORD); -SC_LOCK WINAPI LockServiceDatabase(SC_HANDLE); -BOOL WINAPI NotifyBootConfigStatus(BOOL); -SC_HANDLE WINAPI OpenSCManagerA(LPCSTR,LPCSTR,DWORD); -SC_HANDLE WINAPI OpenSCManagerW(LPCWSTR,LPCWSTR,DWORD); -SC_HANDLE WINAPI OpenServiceA(SC_HANDLE,LPCSTR,DWORD); -SC_HANDLE WINAPI OpenServiceW(SC_HANDLE,LPCWSTR,DWORD); -BOOL WINAPI QueryServiceConfigA(SC_HANDLE,LPQUERY_SERVICE_CONFIGA,DWORD,PDWORD); -BOOL WINAPI QueryServiceConfigW(SC_HANDLE,LPQUERY_SERVICE_CONFIGW,DWORD,PDWORD); -BOOL WINAPI QueryServiceConfig2A(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); -BOOL WINAPI QueryServiceConfig2W(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); -BOOL WINAPI QueryServiceLockStatusA(SC_HANDLE,LPQUERY_SERVICE_LOCK_STATUSA,DWORD,PDWORD); -BOOL WINAPI QueryServiceLockStatusW(SC_HANDLE,LPQUERY_SERVICE_LOCK_STATUSW,DWORD,PDWORD); -BOOL WINAPI QueryServiceObjectSecurity(SC_HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD); -BOOL WINAPI QueryServiceStatus(SC_HANDLE,LPSERVICE_STATUS); -BOOL WINAPI QueryServiceStatusEx(SC_HANDLE,SC_STATUS_TYPE,LPBYTE,DWORD,LPDWORD); -SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerA(LPCSTR,LPHANDLER_FUNCTION); -SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerW(LPCWSTR,LPHANDLER_FUNCTION); -SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExA(LPCSTR,LPHANDLER_FUNCTION_EX,LPVOID); -SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW(LPCWSTR,LPHANDLER_FUNCTION_EX,LPVOID); -BOOL WINAPI SetServiceObjectSecurity(SC_HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); -BOOL WINAPI SetServiceStatus(SERVICE_STATUS_HANDLE,LPSERVICE_STATUS); -BOOL WINAPI StartServiceA(SC_HANDLE,DWORD,LPCSTR*); -BOOL WINAPI StartServiceCtrlDispatcherA(const SERVICE_TABLE_ENTRYA*); -BOOL WINAPI StartServiceCtrlDispatcherW(const SERVICE_TABLE_ENTRYW*); -BOOL WINAPI StartServiceW(SC_HANDLE,DWORD,LPCWSTR*); -BOOL WINAPI UnlockServiceDatabase(SC_LOCK); +typedef struct _SERVICE_REQUIRED_PRIVILEGES_INFOA { + LPSTR pmszRequiredPrivileges; +} SERVICE_REQUIRED_PRIVILEGES_INFOA, *LPSERVICE_REQUIRED_PRIVILEGES_INFOA; + +typedef struct _SERVICE_REQUIRED_PRIVILEGES_INFOW { + LPWSTR pmszRequiredPrivileges; +} SERVICE_REQUIRED_PRIVILEGES_INFOW, *LPSERVICE_REQUIRED_PRIVILEGES_INFOW; + +BOOL WINAPI ChangeServiceConfigA(_In_ SC_HANDLE, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _Out_opt_ LPDWORD, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_opt_ LPCSTR); +BOOL WINAPI ChangeServiceConfigW(_In_ SC_HANDLE, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _Out_opt_ LPDWORD, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR); +BOOL WINAPI ChangeServiceConfig2A(_In_ SC_HANDLE, _In_ DWORD, _In_opt_ LPVOID); +BOOL WINAPI ChangeServiceConfig2W(_In_ SC_HANDLE, _In_ DWORD, _In_opt_ LPVOID); +BOOL WINAPI CloseServiceHandle(_In_ SC_HANDLE); +BOOL WINAPI ControlService(_In_ SC_HANDLE, _In_ DWORD, _Out_ LPSERVICE_STATUS); +_Must_inspect_result_ SC_HANDLE WINAPI CreateServiceA(_In_ SC_HANDLE, _In_ LPCSTR, _In_opt_ LPCSTR, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _Out_opt_ PDWORD, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_opt_ LPCSTR); +_Must_inspect_result_ SC_HANDLE WINAPI CreateServiceW(_In_ SC_HANDLE, _In_ LPCWSTR, _In_opt_ LPCWSTR, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _Out_opt_ PDWORD, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR); +BOOL WINAPI DeleteService(_In_ SC_HANDLE); + +_Must_inspect_result_ +BOOL +WINAPI +EnumDependentServicesA( + _In_ SC_HANDLE hService, + _In_ DWORD dwServiceState, + _Out_writes_bytes_opt_(cbBufSize) LPENUM_SERVICE_STATUSA lpServices, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded, + _Out_ LPDWORD lpServicesReturned); + +_Must_inspect_result_ +BOOL +WINAPI +EnumDependentServicesW( + _In_ SC_HANDLE hService, + _In_ DWORD dwServiceState, + _Out_writes_bytes_opt_(cbBufSize) LPENUM_SERVICE_STATUSW lpServices, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded, + _Out_ LPDWORD lpServicesReturned); + +_Must_inspect_result_ +BOOL +WINAPI +EnumServicesStatusA( + _In_ SC_HANDLE hSCManager, + _In_ DWORD dwServiceType, + _In_ DWORD dwServiceState, + _Out_writes_bytes_opt_(cbBufSize) LPENUM_SERVICE_STATUSA lpServices, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded, + _Out_ LPDWORD lpServicesReturned, + _Inout_opt_ LPDWORD lpResumeHandle); + +_Must_inspect_result_ +BOOL +WINAPI +EnumServicesStatusW( + _In_ SC_HANDLE hSCManager, + _In_ DWORD dwServiceType, + _In_ DWORD dwServiceState, + _Out_writes_bytes_opt_(cbBufSize) LPENUM_SERVICE_STATUSW lpServices, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded, + _Out_ LPDWORD lpServicesReturned, + _Inout_opt_ LPDWORD lpResumeHandle); + +_Must_inspect_result_ +BOOL +WINAPI +EnumServicesStatusExA( + _In_ SC_HANDLE hSCManager, + _In_ SC_ENUM_TYPE InfoLevel, + _In_ DWORD dwServiceType, + _In_ DWORD dwServiceState, + _Out_writes_bytes_opt_(cbBufSize) LPBYTE lpServices, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded, + _Out_ LPDWORD lpServicesReturned, + _Inout_opt_ LPDWORD lpResumeHandle, + _In_opt_ LPCSTR pszGroupName); + +_Must_inspect_result_ +BOOL +WINAPI +EnumServicesStatusExW( + _In_ SC_HANDLE hSCManager, + _In_ SC_ENUM_TYPE InfoLevel, + _In_ DWORD dwServiceType, + _In_ DWORD dwServiceState, + _Out_writes_bytes_opt_(cbBufSize) LPBYTE lpServices, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded, + _Out_ LPDWORD lpServicesReturned, + _Inout_opt_ LPDWORD lpResumeHandle, + _In_opt_ LPCWSTR pszGroupName); + +_Must_inspect_result_ +BOOL +WINAPI +GetServiceDisplayNameA( + _In_ SC_HANDLE hSCManager, + _In_ LPCSTR lpServiceName, + _Out_writes_opt_(*lpcchBuffer) LPSTR lpDisplayName, + _Inout_ LPDWORD lpcchBuffer); + +_Must_inspect_result_ +BOOL +WINAPI +GetServiceDisplayNameW( + _In_ SC_HANDLE hSCManager, + _In_ LPCWSTR lpServiceName, + _Out_writes_opt_(*lpcchBuffer) LPWSTR lpDisplayName, + _Inout_ LPDWORD lpcchBuffer); + +_Must_inspect_result_ +BOOL +WINAPI +GetServiceKeyNameA( + _In_ SC_HANDLE hSCManager, + _In_ LPCSTR lpDisplayName, + _Out_writes_opt_(*lpcchBuffer) LPSTR lpServiceName, + _Inout_ LPDWORD lpcchBuffer); + +_Must_inspect_result_ +BOOL +WINAPI +GetServiceKeyNameW( + _In_ SC_HANDLE hSCManager, + _In_ LPCWSTR lpDisplayName, + _Out_writes_opt_(*lpcchBuffer) LPWSTR lpServiceName, + _Inout_ LPDWORD lpcchBuffer); + +SC_LOCK WINAPI LockServiceDatabase(_In_ SC_HANDLE); +BOOL WINAPI NotifyBootConfigStatus(_In_ BOOL); +_Must_inspect_result_ SC_HANDLE WINAPI OpenSCManagerA(_In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_ DWORD); +_Must_inspect_result_ SC_HANDLE WINAPI OpenSCManagerW(_In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_ DWORD); +_Must_inspect_result_ SC_HANDLE WINAPI OpenServiceA(_In_ SC_HANDLE, _In_ LPCSTR, _In_ DWORD); +_Must_inspect_result_ SC_HANDLE WINAPI OpenServiceW(_In_ SC_HANDLE, _In_ LPCWSTR, _In_ DWORD); + +_Must_inspect_result_ +BOOL +WINAPI +QueryServiceConfigA( + _In_ SC_HANDLE hService, + _Out_writes_bytes_opt_(cbBufSize) LPQUERY_SERVICE_CONFIGA lpServiceConfig, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded); + +_Must_inspect_result_ +BOOL +WINAPI +QueryServiceConfigW( + _In_ SC_HANDLE hService, + _Out_writes_bytes_opt_(cbBufSize) LPQUERY_SERVICE_CONFIGW lpServiceConfig, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded); + +_When_(dwInfoLevel == SERVICE_CONFIG_DESCRIPTION, _At_(cbBufSize, _In_range_(>=, sizeof(LPSERVICE_DESCRIPTIONA)))) +_When_(dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS, _At_(cbBufSize, _In_range_(>=, sizeof(LPSERVICE_FAILURE_ACTIONSA)))) +_When_(dwInfoLevel == SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO, _At_(cbBufSize, _In_range_(>=, sizeof(LPSERVICE_REQUIRED_PRIVILEGES_INFOA)))) +_Must_inspect_result_ +BOOL +WINAPI +QueryServiceConfig2A( + _In_ SC_HANDLE hService, + _In_ DWORD dwInfoLevel, + _Out_writes_bytes_opt_(cbBufSize) LPBYTE lpBuffer, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded); + +_When_(dwInfoLevel == SERVICE_CONFIG_DESCRIPTION, _At_(cbBufSize, _In_range_(>=, sizeof(LPSERVICE_DESCRIPTIONW)))) +_When_(dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS, _At_(cbBufSize, _In_range_(>=, sizeof(LPSERVICE_FAILURE_ACTIONSW)))) +_When_(dwInfoLevel == SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO, _At_(cbBufSize, _In_range_(>=, sizeof(LPSERVICE_REQUIRED_PRIVILEGES_INFOW)))) +_Must_inspect_result_ +BOOL +WINAPI +QueryServiceConfig2W( + _In_ SC_HANDLE hService, + _In_ DWORD dwInfoLevel, + _Out_writes_bytes_opt_(cbBufSize) LPBYTE lpBuffer, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded); + +_Must_inspect_result_ +BOOL +WINAPI +QueryServiceLockStatusA( + _In_ SC_HANDLE hSCManager, + _Out_writes_bytes_opt_(cbBufSize) LPQUERY_SERVICE_LOCK_STATUSA lpLockStatus, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded); + +_Must_inspect_result_ +BOOL +WINAPI +QueryServiceLockStatusW( + _In_ SC_HANDLE hSCManager, + _Out_writes_bytes_opt_(cbBufSize) LPQUERY_SERVICE_LOCK_STATUSW lpLockStatus, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded); + +_Must_inspect_result_ +BOOL +WINAPI +QueryServiceObjectSecurity( + _In_ SC_HANDLE hService, + _In_ SECURITY_INFORMATION dwSecurityInformation, + _Out_writes_bytes_opt_(cbBufSize) PSECURITY_DESCRIPTOR lpSecurityDescriptor, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded); + +_Must_inspect_result_ BOOL WINAPI QueryServiceStatus(_In_ SC_HANDLE, _Out_ LPSERVICE_STATUS); + +_Must_inspect_result_ +BOOL +WINAPI +QueryServiceStatusEx( + _In_ SC_HANDLE hService, + _In_ SC_STATUS_TYPE InfoLevel, + _Out_writes_bytes_opt_(cbBufSize) LPBYTE lpBuffer, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded); + +_Must_inspect_result_ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerA(_In_ LPCSTR, _In_ LPHANDLER_FUNCTION); +_Must_inspect_result_ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerW(_In_ LPCWSTR, _In_ LPHANDLER_FUNCTION); +_Must_inspect_result_ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExA(_In_ LPCSTR, _In_ LPHANDLER_FUNCTION_EX, _In_opt_ LPVOID); +_Must_inspect_result_ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW(_In_ LPCWSTR, _In_ LPHANDLER_FUNCTION_EX, _In_opt_ LPVOID); +BOOL WINAPI SetServiceObjectSecurity(_In_ SC_HANDLE, _In_ SECURITY_INFORMATION, _In_ PSECURITY_DESCRIPTOR); +BOOL WINAPI SetServiceStatus(_In_ SERVICE_STATUS_HANDLE, _In_ LPSERVICE_STATUS); + +BOOL +WINAPI +StartServiceA( + _In_ SC_HANDLE hService, + _In_ DWORD dwNumServiceArgs, + _In_reads_opt_(dwNumServiceArgs) LPCSTR *lpServiceArgVectors); + +BOOL +WINAPI +StartServiceW( + _In_ SC_HANDLE hService, + _In_ DWORD dwNumServiceArgs, + _In_reads_opt_(dwNumServiceArgs) LPCWSTR *lpServiceArgVectors); + +BOOL WINAPI StartServiceCtrlDispatcherA(_In_ const SERVICE_TABLE_ENTRYA*); +BOOL WINAPI StartServiceCtrlDispatcherW(_In_ const SERVICE_TABLE_ENTRYW*); +BOOL WINAPI UnlockServiceDatabase(_In_ SC_LOCK); #ifdef UNICODE typedef ENUM_SERVICE_STATUSW ENUM_SERVICE_STATUS,*LPENUM_SERVICE_STATUS; @@ -263,6 +465,8 @@ typedef LPSERVICE_DESCRIPTIONW LPSERVICE_DESCRIPTION; typedef SERVICE_FAILURE_ACTIONSW SERVICE_FAILURE_ACTIONS; typedef LPSERVICE_FAILURE_ACTIONSW LPSERVICE_FAILURE_ACTIONS; +typedef SERVICE_REQUIRED_PRIVILEGES_INFOW SERVICE_REQUIRED_PRIVILEGES_INFO; +typedef LPSERVICE_REQUIRED_PRIVILEGES_INFOW LPSERVICE_REQUIRED_PRIVILEGES_INFO; #define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEW #define SERVICES_FAILED_DATABASE SERVICES_FAILED_DATABASEW #define SC_GROUP_IDENTIFIER SC_GROUP_IDENTIFIERW @@ -295,6 +499,8 @@ typedef LPSERVICE_DESCRIPTIONA LPSERVICE_DESCRIPTION; typedef SERVICE_FAILURE_ACTIONSA SERVICE_FAILURE_ACTIONS; typedef LPSERVICE_FAILURE_ACTIONSA LPSERVICE_FAILURE_ACTIONS; +typedef SERVICE_REQUIRED_PRIVILEGES_INFOA SERVICE_REQUIRED_PRIVILEGES_INFO; +typedef LPSERVICE_REQUIRED_PRIVILEGES_INFOA LPSERVICE_REQUIRED_PRIVILEGES_INFO; #define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEA #define SERVICES_FAILED_DATABASE SERVICES_FAILED_DATABASEA #define SC_GROUP_IDENTIFIER SC_GROUP_IDENTIFIERA

1 0

[akhaldi] 58389: [DDK] * Add some annotations in acpiioct.h.
by akhaldi＠svn.reactos.org 01 Mar '13

01 Mar '13

Author: akhaldi Date: Fri Mar 1 21:47:38 2013 New Revision: 58389 URL: http://svn.reactos.org/svn/reactos?rev=58389&view=rev Log: [DDK] * Add some annotations in acpiioct.h. Modified: trunk/reactos/include/ddk/acpiioct.h Modified: trunk/reactos/include/ddk/acpiioct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/acpiioct.h?rev… ============================================================================== --- trunk/reactos/include/ddk/acpiioct.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/acpiioct.h [iso-8859-1] Fri Mar 1 21:47:38 2013 @@ -57,7 +57,7 @@ ULONG MethodNameAsUlong; } DUMMYUNIONNAME; ULONG StringLength; - UCHAR String[ANYSIZE_ARRAY]; + _Field_size_bytes_(StringLength) _Null_terminated_ UCHAR String[ANYSIZE_ARRAY]; } ACPI_EVAL_INPUT_BUFFER_SIMPLE_STRING, *PACPI_EVAL_INPUT_BUFFER_SIMPLE_STRING; typedef struct _ACPI_METHOD_ARGUMENT { @@ -65,7 +65,7 @@ USHORT DataLength; _ANONYMOUS_UNION union { ULONG Argument; - UCHAR Data[ANYSIZE_ARRAY]; + _Field_size_bytes_(DataLength) UCHAR Data[ANYSIZE_ARRAY]; } DUMMYUNIONNAME; } ACPI_METHOD_ARGUMENT; typedef ACPI_METHOD_ARGUMENT UNALIGNED *PACPI_METHOD_ARGUMENT; @@ -85,7 +85,7 @@ ULONG Signature; ULONG Length; ULONG Count; - ACPI_METHOD_ARGUMENT Argument[ANYSIZE_ARRAY]; + _Field_size_bytes_(Length) ACPI_METHOD_ARGUMENT Argument[ANYSIZE_ARRAY]; } ACPI_EVAL_OUTPUT_BUFFER; typedef ACPI_EVAL_OUTPUT_BUFFER UNALIGNED *PACPI_EVAL_OUTPUT_BUFFER; @@ -96,12 +96,12 @@ typedef struct _ACPI_EVAL_INPUT_BUFFER_EX { ULONG Signature; - CHAR MethodName[256]; + _Null_terminated_ CHAR MethodName[256]; } ACPI_EVAL_INPUT_BUFFER_EX, *PACPI_EVAL_INPUT_BUFFER_EX; typedef struct _ACPI_EVAL_INPUT_BUFFER_SIMPLE_INTEGER_EX { ULONG Signature; - CHAR MethodName[256]; + _Null_terminated_ CHAR MethodName[256]; ULONG64 IntegerArgument; } ACPI_EVAL_INPUT_BUFFER_SIMPLE_INTEGER_EX, *PACPI_EVAL_INPUT_BUFFER_SIMPLE_INTEGER_EX; @@ -109,7 +109,7 @@ ULONG Signature; CHAR MethodName[256]; ULONG StringLength; - UCHAR String[ANYSIZE_ARRAY]; + _Field_size_(StringLength) _Null_terminated_ UCHAR String[ANYSIZE_ARRAY]; } ACPI_EVAL_INPUT_BUFFER_SIMPLE_STRING_EX, *PACPI_EVAL_INPUT_BUFFER_SIMPLE_STRING_EX; typedef struct _ACPI_EVAL_INPUT_BUFFER_COMPLEX_EX { @@ -117,20 +117,20 @@ CHAR MethodName[256]; ULONG Size; ULONG ArgumentCount; - ACPI_METHOD_ARGUMENT Argument[ANYSIZE_ARRAY]; + _Field_size_(ArgumentCount) ACPI_METHOD_ARGUMENT Argument[ANYSIZE_ARRAY]; } ACPI_EVAL_INPUT_BUFFER_COMPLEX_EX, *PACPI_EVAL_INPUT_BUFFER_COMPLEX_EX; typedef struct _ACPI_ENUM_CHILDREN_INPUT_BUFFER { ULONG Signature; ULONG Flags; ULONG NameLength; - CHAR Name[ANYSIZE_ARRAY]; + _Field_size_bytes_(NameLength) _Null_terminated_ CHAR Name[ANYSIZE_ARRAY]; } ACPI_ENUM_CHILDREN_INPUT_BUFFER, *PACPI_ENUM_CHILDREN_INPUT_BUFFER; typedef struct _ACPI_ENUM_CHILD { ULONG Flags; ULONG NameLength; - CHAR Name[ANYSIZE_ARRAY]; + _Field_size_bytes_(NameLength) _Null_terminated_ CHAR Name[ANYSIZE_ARRAY]; } ACPI_ENUM_CHILD; typedef ACPI_ENUM_CHILD UNALIGNED *PACPI_ENUM_CHILD;

1 0

[akhaldi] 58388: [PSDK] * Annotate winreg.h.
by akhaldi＠svn.reactos.org 01 Mar '13

01 Mar '13

Author: akhaldi Date: Fri Mar 1 18:18:36 2013 New Revision: 58388 URL: http://svn.reactos.org/svn/reactos?rev=58388&view=rev Log: [PSDK] * Annotate winreg.h. Modified: trunk/reactos/include/psdk/winreg.h Modified: trunk/reactos/include/psdk/winreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winreg.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winreg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winreg.h [iso-8859-1] Fri Mar 1 18:18:36 2013 @@ -62,7 +62,7 @@ #ifndef RC_INVOKED typedef ACCESS_MASK REGSAM; -typedef LONG LSTATUS; +typedef _Return_type_success_(return==ERROR_SUCCESS) LONG LSTATUS; typedef struct value_entA { LPSTR ve_valuename; DWORD ve_valuelen; @@ -75,103 +75,367 @@ DWORD ve_valueptr; DWORD ve_type; } VALENTW,*PVALENTW; -BOOL WINAPI AbortSystemShutdownA(LPCSTR); -BOOL WINAPI AbortSystemShutdownW(LPCWSTR); -#if (_WIN32_WINNT >= 0x0600) -DWORD WINAPI InitiateShutdownA(LPSTR, LPSTR, DWORD, DWORD, DWORD); -DWORD WINAPI InitiateShutdownW(LPWSTR, LPWSTR, DWORD, DWORD, DWORD); -#endif -BOOL WINAPI InitiateSystemShutdownA(LPSTR,LPSTR,DWORD,BOOL,BOOL); -BOOL WINAPI InitiateSystemShutdownW(LPWSTR,LPWSTR,DWORD,BOOL,BOOL); -BOOL WINAPI InitiateSystemShutdownExA(LPSTR,LPSTR,DWORD,BOOL,BOOL,DWORD); -BOOL WINAPI InitiateSystemShutdownExW(LPWSTR,LPWSTR,DWORD,BOOL,BOOL,DWORD); -LONG WINAPI RegCloseKey(HKEY); -LONG WINAPI RegConnectRegistryA(LPCSTR,HKEY,PHKEY); -LONG WINAPI RegConnectRegistryW(LPCWSTR,HKEY,PHKEY); -#if (_WIN32_WINNT >= 0x0600) -LONG WINAPI RegCopyTreeA(HKEY,LPCSTR,HKEY); -LONG WINAPI RegCopyTreeW(HKEY,LPCWSTR,HKEY); -#endif -LONG WINAPI RegCreateKeyA(HKEY,LPCSTR,PHKEY); -LONG WINAPI RegCreateKeyExA(HKEY,LPCSTR,DWORD,LPSTR,DWORD,REGSAM,LPSECURITY_ATTRIBUTES,PHKEY,PDWORD); -LONG WINAPI RegCreateKeyExW(HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSAM,LPSECURITY_ATTRIBUTES,PHKEY,PDWORD); -LONG WINAPI RegCreateKeyW(HKEY,LPCWSTR,PHKEY); -LONG WINAPI RegDeleteKeyA(HKEY,LPCSTR); -LONG WINAPI RegDeleteKeyExA (HKEY,LPCSTR,REGSAM,DWORD); -LONG WINAPI RegDeleteKeyExW (HKEY,LPCWSTR,REGSAM,DWORD); -#if (_WIN32_WINNT >= 0x0600) -LONG WINAPI RegDeleteKeyValueA(HKEY,LPCSTR,LPCSTR); -LONG WINAPI RegDeleteKeyValueW(HKEY,LPCWSTR,LPCWSTR); -#endif -LONG WINAPI RegDeleteKeyW(HKEY,LPCWSTR); -#if (_WIN32_WINNT >= 0x0600) -LONG WINAPI RegDeleteTreeA(HKEY,LPCSTR); -LONG WINAPI RegDeleteTreeW(HKEY,LPCWSTR); -#endif -LONG WINAPI RegDeleteValueA(HKEY,LPCSTR); -LONG WINAPI RegDeleteValueW(HKEY,LPCWSTR); + +BOOL WINAPI AbortSystemShutdownA(_In_opt_ LPCSTR); +BOOL WINAPI AbortSystemShutdownW(_In_opt_ LPCWSTR); + +#if (_WIN32_WINNT >= 0x0600) +DWORD WINAPI InitiateShutdownA(_In_opt_ LPSTR, _In_opt_ LPSTR, _In_ DWORD, _In_ DWORD, _In_ DWORD); +DWORD WINAPI InitiateShutdownW(_In_opt_ LPWSTR, _In_opt_ LPWSTR, _In_ DWORD, _In_ DWORD, _In_ DWORD); +#endif + +BOOL WINAPI InitiateSystemShutdownA(_In_opt_ LPSTR, _In_opt_ LPSTR, _In_ DWORD, _In_ BOOL, _In_ BOOL); +BOOL WINAPI InitiateSystemShutdownW(_In_opt_ LPWSTR, _In_opt_ LPWSTR, _In_ DWORD, _In_ BOOL, _In_ BOOL); +BOOL WINAPI InitiateSystemShutdownExA(_In_opt_ LPSTR, _In_opt_ LPSTR, _In_ DWORD, _In_ BOOL, _In_ BOOL, _In_ DWORD); +BOOL WINAPI InitiateSystemShutdownExW(_In_opt_ LPWSTR, _In_opt_ LPWSTR, _In_ DWORD, _In_ BOOL, _In_ BOOL, _In_ DWORD); +LSTATUS WINAPI RegCloseKey(_In_ HKEY); +LSTATUS WINAPI RegConnectRegistryA(_In_opt_ LPCSTR, _In_ HKEY, _Out_ PHKEY); +LSTATUS WINAPI RegConnectRegistryW(_In_opt_ LPCWSTR,_In_ HKEY, _Out_ PHKEY); + +#if (_WIN32_WINNT >= 0x0600) +LSTATUS WINAPI RegCopyTreeA(_In_ HKEY, _In_opt_ LPCSTR, _In_ HKEY); +LSTATUS WINAPI RegCopyTreeW(_In_ HKEY, _In_opt_ LPCWSTR, _In_ HKEY); +#endif + +LSTATUS WINAPI RegCreateKeyA(_In_ HKEY, _In_opt_ LPCSTR, _Out_ PHKEY); +LSTATUS WINAPI RegCreateKeyW(_In_ HKEY, _In_opt_ LPCWSTR, _Out_ PHKEY); +LSTATUS WINAPI RegCreateKeyExA(_In_ HKEY, _In_ LPCSTR, _Reserved_ DWORD, _In_opt_ LPSTR, _In_ DWORD, _In_ REGSAM, _In_opt_ LPSECURITY_ATTRIBUTES, _Out_ PHKEY, _Out_opt_ PDWORD); +LSTATUS WINAPI RegCreateKeyExW(_In_ HKEY, _In_ LPCWSTR, _Reserved_ DWORD, _In_opt_ LPWSTR, _In_ DWORD, _In_ REGSAM, _In_opt_ LPSECURITY_ATTRIBUTES, _Out_ PHKEY, _Out_opt_ PDWORD); +LSTATUS WINAPI RegDeleteKeyA(_In_ HKEY, _In_ LPCSTR); +LSTATUS WINAPI RegDeleteKeyW(_In_ HKEY, _In_ LPCWSTR); +LSTATUS WINAPI RegDeleteKeyExA(_In_ HKEY, _In_ LPCSTR, _In_ REGSAM, _Reserved_ DWORD); +LSTATUS WINAPI RegDeleteKeyExW(_In_ HKEY, _In_ LPCWSTR, _In_ REGSAM, _Reserved_ DWORD); + +#if (_WIN32_WINNT >= 0x0600) +LSTATUS WINAPI RegDeleteKeyValueA(_In_ HKEY, _In_opt_ LPCSTR, _In_opt_ LPCSTR); +LSTATUS WINAPI RegDeleteKeyValueW(_In_ HKEY, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR); +LSTATUS WINAPI RegDeleteTreeA(_In_ HKEY, _In_opt_ LPCSTR); +LSTATUS WINAPI RegDeleteTreeW(_In_ HKEY, _In_opt_ LPCWSTR); +#endif + +LSTATUS WINAPI RegDeleteValueA(_In_ HKEY, _In_opt_ LPCSTR); +LSTATUS WINAPI RegDeleteValueW(_In_ HKEY, _In_opt_ LPCWSTR); + #if (_WIN32_WINNT >= 0x0500) LONG WINAPI RegDisablePredefinedCache(VOID); -LONG WINAPI RegSaveKeyExA(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES,DWORD); -LONG WINAPI RegSaveKeyExW(HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES,DWORD); -#endif +LSTATUS WINAPI RegSaveKeyExA(_In_ HKEY, _In_ LPCSTR, _In_opt_ LPSECURITY_ATTRIBUTES, _In_ DWORD); +LSTATUS WINAPI RegSaveKeyExW(_In_ HKEY, _In_ LPCWSTR, _In_opt_ LPSECURITY_ATTRIBUTES, _In_ DWORD); +#endif + #if (_WIN32_WINNT >= 0x0600) LONG WINAPI RegDisablePredefinedCacheEx(VOID); -LONG WINAPI RegDisableReflectionKey(HKEY); -LONG WINAPI RegEnableReflectionKey(HKEY); -#endif -LONG WINAPI RegEnumKeyA(HKEY,DWORD,LPSTR,DWORD); -LONG WINAPI RegEnumKeyW(HKEY,DWORD,LPWSTR,DWORD); -LONG WINAPI RegEnumKeyExA(HKEY,DWORD,LPSTR,PDWORD,PDWORD,LPSTR,PDWORD,PFILETIME); -LONG WINAPI RegEnumKeyExW(HKEY,DWORD,LPWSTR,PDWORD,PDWORD,LPWSTR,PDWORD,PFILETIME); -LONG WINAPI RegEnumValueA(HKEY,DWORD,LPSTR,PDWORD,PDWORD,PDWORD,LPBYTE,PDWORD); -LONG WINAPI RegEnumValueW(HKEY,DWORD,LPWSTR,PDWORD,PDWORD,PDWORD,LPBYTE,PDWORD); -#if (_WIN32_WINNT >= 0x0600) -LONG WINAPI RegGetValueA(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD); -LONG WINAPI RegGetValueW(HKEY,LPCWSTR,LPCWSTR,DWORD,LPDWORD,PVOID,LPDWORD); -#endif -LONG WINAPI RegFlushKey(HKEY); -LONG WINAPI RegGetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,PDWORD); -LONG WINAPI RegLoadKeyA(HKEY,LPCSTR,LPCSTR); -LONG WINAPI RegLoadKeyW(HKEY,LPCWSTR,LPCWSTR); -#if (_WIN32_WINNT >= 0x0600) -LONG WINAPI RegLoadMUIStringA(HKEY,LPCSTR,LPSTR,DWORD,LPDWORD,DWORD,LPCSTR); -LONG WINAPI RegLoadMUIStringW(HKEY,LPCWSTR,LPWSTR,DWORD,LPDWORD,DWORD,LPCWSTR); -#endif -LONG WINAPI RegNotifyChangeKeyValue(HKEY,BOOL,DWORD,HANDLE,BOOL); -LONG WINAPI RegOpenCurrentUser(REGSAM,PHKEY); -LONG WINAPI RegOpenKeyA(HKEY,LPCSTR,PHKEY); -LONG WINAPI RegOpenKeyExA(HKEY,LPCSTR,DWORD,REGSAM,PHKEY); -LONG WINAPI RegOpenKeyExW(HKEY,LPCWSTR,DWORD,REGSAM,PHKEY); -LONG WINAPI RegOpenKeyW(HKEY,LPCWSTR,PHKEY); -LONG WINAPI RegQueryInfoKeyA(HKEY,LPSTR,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PFILETIME); -LONG WINAPI RegQueryInfoKeyW(HKEY,LPWSTR,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PFILETIME); -LONG WINAPI RegQueryMultipleValuesA(HKEY,PVALENTA,DWORD,LPSTR,LPDWORD); -LONG WINAPI RegQueryMultipleValuesW(HKEY,PVALENTW,DWORD,LPWSTR,LPDWORD); -#if (_WIN32_WINNT >= 0x0600) -LONG WINAPI RegQueryReflectionKey(HKEY,BOOL*); -#endif -LONG WINAPI RegQueryValueA(HKEY,LPCSTR,LPSTR,PLONG); -LONG WINAPI RegQueryValueExA(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); -LONG WINAPI RegQueryValueExW(HKEY,LPCWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); -LONG WINAPI RegQueryValueW(HKEY,LPCWSTR,LPWSTR,PLONG); -LONG WINAPI RegReplaceKeyA(HKEY,LPCSTR,LPCSTR,LPCSTR); -LONG WINAPI RegReplaceKeyW(HKEY,LPCWSTR,LPCWSTR,LPCWSTR); -LONG WINAPI RegRestoreKeyA(HKEY,LPCSTR,DWORD); -LONG WINAPI RegRestoreKeyW(HKEY,LPCWSTR,DWORD); -LONG WINAPI RegSaveKeyA(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES); -LONG WINAPI RegSaveKeyW(HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES); -LONG WINAPI RegSetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); -#if (_WIN32_WINNT >= 0x0600) -LONG WINAPI RegSetKeyValueA(HKEY,LPCSTR,LPCSTR,DWORD,LPCVOID,DWORD); -LONG WINAPI RegSetKeyValueW(HKEY,LPCWSTR,LPCWSTR,DWORD,LPCVOID,DWORD); -#endif -LONG WINAPI RegSetValueA(HKEY,LPCSTR,DWORD,LPCSTR,DWORD); -LONG WINAPI RegSetValueExA(HKEY,LPCSTR,DWORD,DWORD,const BYTE*,DWORD); -LONG WINAPI RegSetValueExW(HKEY,LPCWSTR,DWORD,DWORD,const BYTE*,DWORD); -LONG WINAPI RegSetValueW(HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD); -LONG WINAPI RegUnLoadKeyA(HKEY,LPCSTR); -LONG WINAPI RegUnLoadKeyW(HKEY,LPCWSTR); +LONG WINAPI RegDisableReflectionKey(_In_ HKEY); +LONG WINAPI RegEnableReflectionKey(_In_ HKEY); +#endif + +LSTATUS +WINAPI +RegEnumKeyA( + _In_ HKEY hKey, + _In_ DWORD dwIndex, + _Out_writes_opt_(cchName) LPSTR lpName, + _In_ DWORD cchName); + +LSTATUS +WINAPI +RegEnumKeyW( + _In_ HKEY hKey, + _In_ DWORD dwIndex, + _Out_writes_opt_(cchName) LPWSTR lpName, + _In_ DWORD cchName); + +LSTATUS +WINAPI +RegEnumKeyExA( + _In_ HKEY hKey, + _In_ DWORD dwIndex, + _Out_writes_to_opt_(*lpcchName, *lpcchName + 1) LPSTR lpName, + _Inout_ LPDWORD lpcchName, + _Reserved_ LPDWORD lpReserved, + _Out_writes_to_opt_(*lpcchClass,*lpcchClass + 1) LPSTR lpClass, + _Inout_opt_ LPDWORD lpcchClass, + _Out_opt_ PFILETIME lpftLastWriteTime); + +LSTATUS +WINAPI +RegEnumKeyExW( + _In_ HKEY hKey, + _In_ DWORD dwIndex, + _Out_writes_to_opt_(*lpcchName, *lpcchName + 1) LPWSTR lpName, + _Inout_ LPDWORD lpcchName, + _Reserved_ LPDWORD lpReserved, + _Out_writes_to_opt_(*lpcchClass,*lpcchClass + 1) LPWSTR lpClass, + _Inout_opt_ LPDWORD lpcchClass, + _Out_opt_ PFILETIME lpftLastWriteTime); + +LSTATUS +WINAPI +RegEnumValueA( + _In_ HKEY hKey, + _In_ DWORD dwIndex, + _Out_writes_to_opt_(*lpcchValueName, *lpcchValueName + 1) LPSTR lpValueName, + _Inout_ LPDWORD lpcchValueName, + _Reserved_ LPDWORD lpReserved, + _Out_opt_ LPDWORD lpType, + _Out_writes_bytes_to_opt_(*lpcbData, *lpcbData) __out_data_source(REGISTRY) LPBYTE lpData, + _Inout_opt_ LPDWORD lpcbData); + +LSTATUS +WINAPI +RegEnumValueW( + _In_ HKEY hKey, + _In_ DWORD dwIndex, + _Out_writes_to_opt_(*lpcchValueName, *lpcchValueName + 1) LPWSTR lpValueName, + _Inout_ LPDWORD lpcchValueName, + _Reserved_ LPDWORD lpReserved, + _Out_opt_ LPDWORD lpType, + _Out_writes_bytes_to_opt_(*lpcbData, *lpcbData) __out_data_source(REGISTRY) LPBYTE lpData, + _Inout_opt_ LPDWORD lpcbData); + +#if (_WIN32_WINNT >= 0x0600) + +LSTATUS +WINAPI +RegGetValueA( + _In_ HKEY hkey, + _In_opt_ LPCSTR lpSubKey, + _In_opt_ LPCSTR lpValue, + _In_ DWORD dwFlags, + _Out_opt_ LPDWORD pdwType, + _When_((dwFlags & 0x7F) == RRF_RT_REG_SZ || (dwFlags & 0x7F) == RRF_RT_REG_EXPAND_SZ || + (dwFlags & 0x7F) == (RRF_RT_REG_SZ | RRF_RT_REG_EXPAND_SZ) || *pdwType == REG_SZ || + *pdwType == REG_EXPAND_SZ, _Post_z_) + _When_((dwFlags & 0x7F) == RRF_RT_REG_MULTI_SZ || *pdwType == REG_MULTI_SZ, _Post_ _NullNull_terminated_) + _Out_writes_bytes_to_opt_(*pcbData,*pcbData) PVOID pvData, + _Inout_opt_ LPDWORD pcbData); + +LSTATUS +WINAPI +RegGetValueW( + _In_ HKEY hkey, + _In_opt_ LPCWSTR lpSubKey, + _In_opt_ LPCWSTR lpValue, + _In_ DWORD dwFlags, + _Out_opt_ LPDWORD pdwType, + _When_((dwFlags & 0x7F) == RRF_RT_REG_SZ || (dwFlags & 0x7F) == RRF_RT_REG_EXPAND_SZ || + (dwFlags & 0x7F) == (RRF_RT_REG_SZ | RRF_RT_REG_EXPAND_SZ) || *pdwType == REG_SZ || + *pdwType == REG_EXPAND_SZ, _Post_z_) + _When_((dwFlags & 0x7F) == RRF_RT_REG_MULTI_SZ || *pdwType == REG_MULTI_SZ, _Post_ _NullNull_terminated_) + _Out_writes_bytes_to_opt_(*pcbData,*pcbData) PVOID pvData, + _Inout_opt_ LPDWORD pcbData); + +#endif + +LSTATUS WINAPI RegFlushKey(_In_ HKEY); + +LSTATUS +WINAPI +RegGetKeySecurity( + _In_ HKEY hKey, + _In_ SECURITY_INFORMATION SecurityInformation, + _Out_writes_bytes_opt_(*lpcbSecurityDescriptor) PSECURITY_DESCRIPTOR pSecurityDescriptor, + _Inout_ LPDWORD lpcbSecurityDescriptor); + +LSTATUS WINAPI RegLoadKeyA(_In_ HKEY, _In_opt_ LPCSTR, _In_ LPCSTR); +LSTATUS WINAPI RegLoadKeyW(_In_ HKEY, _In_opt_ LPCWSTR, _In_ LPCWSTR); + +#if (_WIN32_WINNT >= 0x0600) + +LSTATUS +WINAPI +RegLoadMUIStringA( + _In_ HKEY hKey, + _In_opt_ LPCSTR pszValue, + _Out_writes_bytes_opt_(cbOutBuf) LPSTR pszOutBuf, + _In_ DWORD cbOutBuf, + _Out_opt_ LPDWORD pcbData, + _In_ DWORD Flags, + _In_opt_ LPCSTR pszDirectory); + +LSTATUS +WINAPI +RegLoadMUIStringW( + _In_ HKEY hKey, + _In_opt_ LPCWSTR pszValue, + _Out_writes_bytes_opt_(cbOutBuf) LPWSTR pszOutBuf, + _In_ DWORD cbOutBuf, + _Out_opt_ LPDWORD pcbData, + _In_ DWORD Flags, + _In_opt_ LPCWSTR pszDirectory); + +#endif + +LSTATUS WINAPI RegNotifyChangeKeyValue(_In_ HKEY, _In_ BOOL, _In_ DWORD, _In_opt_ HANDLE, _In_ BOOL); +LSTATUS WINAPI RegOpenCurrentUser(_In_ REGSAM, _Out_ PHKEY); +LSTATUS WINAPI RegOpenKeyA(_In_ HKEY, _In_opt_ LPCSTR, _Out_ PHKEY); +LSTATUS WINAPI RegOpenKeyW(_In_ HKEY, _In_opt_ LPCWSTR, _Out_ PHKEY); +LSTATUS WINAPI RegOpenKeyExA(_In_ HKEY, _In_opt_ LPCSTR, _In_opt_ DWORD, _In_ REGSAM, _Out_ PHKEY); +LSTATUS WINAPI RegOpenKeyExW(_In_ HKEY, _In_opt_ LPCWSTR, _In_opt_ DWORD, _In_ REGSAM, _Out_ PHKEY); + +LSTATUS +WINAPI +RegQueryInfoKeyA( + _In_ HKEY hKey, + _Out_writes_to_opt_(*lpcchClass, *lpcchClass + 1) LPSTR lpClass, + _Inout_opt_ LPDWORD lpcchClass, + _Reserved_ LPDWORD lpReserved, + _Out_opt_ LPDWORD lpcSubKeys, + _Out_opt_ LPDWORD lpcbMaxSubKeyLen, + _Out_opt_ LPDWORD lpcbMaxClassLen, + _Out_opt_ LPDWORD lpcValues, + _Out_opt_ LPDWORD lpcbMaxValueNameLen, + _Out_opt_ LPDWORD lpcbMaxValueLen, + _Out_opt_ LPDWORD lpcbSecurityDescriptor, + _Out_opt_ PFILETIME lpftLastWriteTime); + +LSTATUS +WINAPI +RegQueryInfoKeyW( + _In_ HKEY hKey, + _Out_writes_to_opt_(*lpcchClass, *lpcchClass + 1) LPWSTR lpClass, + _Inout_opt_ LPDWORD lpcchClass, + _Reserved_ LPDWORD lpReserved, + _Out_opt_ LPDWORD lpcSubKeys, + _Out_opt_ LPDWORD lpcbMaxSubKeyLen, + _Out_opt_ LPDWORD lpcbMaxClassLen, + _Out_opt_ LPDWORD lpcValues, + _Out_opt_ LPDWORD lpcbMaxValueNameLen, + _Out_opt_ LPDWORD lpcbMaxValueLen, + _Out_opt_ LPDWORD lpcbSecurityDescriptor, + _Out_opt_ PFILETIME lpftLastWriteTime); + +LSTATUS +WINAPI +RegQueryMultipleValuesA( + _In_ HKEY hKey, + _Out_writes_(num_vals) PVALENTA val_list, + _In_ DWORD num_vals, + _Out_writes_bytes_to_opt_(*ldwTotsize, *ldwTotsize) __out_data_source(REGISTRY) LPSTR lpValueBuf, + _Inout_opt_ LPDWORD ldwTotsize); + +LSTATUS +WINAPI +RegQueryMultipleValuesW( + _In_ HKEY hKey, + _Out_writes_(num_vals) PVALENTW val_list, + _In_ DWORD num_vals, + _Out_writes_bytes_to_opt_(*ldwTotsize, *ldwTotsize) __out_data_source(REGISTRY) LPWSTR lpValueBuf, + _Inout_opt_ LPDWORD ldwTotsize); + +#if (_WIN32_WINNT >= 0x0600) +LONG WINAPI RegQueryReflectionKey(_In_ HKEY, _Out_ BOOL*); +#endif + +LSTATUS +WINAPI +RegQueryValueA( + _In_ HKEY hKey, + _In_opt_ LPCSTR lpSubKey, + _Out_writes_bytes_to_opt_(*lpcbData, *lpcbData) __out_data_source(REGISTRY) LPSTR lpData, + _Inout_opt_ PLONG lpcbData); + +LSTATUS +WINAPI +RegQueryValueW( + _In_ HKEY hKey, + _In_opt_ LPCWSTR lpSubKey, + _Out_writes_bytes_to_opt_(*lpcbData, *lpcbData) __out_data_source(REGISTRY) LPWSTR lpData, + _Inout_opt_ PLONG lpcbData); + +LSTATUS +WINAPI +RegQueryValueExA( + _In_ HKEY hKey, + _In_opt_ LPCSTR lpValueName, + _Reserved_ LPDWORD lpReserved, + _Out_opt_ LPDWORD lpType, + _Out_writes_bytes_to_opt_(*lpcbData, *lpcbData) __out_data_source(REGISTRY) LPBYTE lpData, + _When_(lpData == NULL, _Out_opt_) + _When_(lpData != NULL, _Inout_opt_) LPDWORD lpcbData); + +LSTATUS +WINAPI +RegQueryValueExW( + _In_ HKEY hKey, + _In_opt_ LPCWSTR lpValueName, + _Reserved_ LPDWORD lpReserved, + _Out_opt_ LPDWORD lpType, + _Out_writes_bytes_to_opt_(*lpcbData, *lpcbData) __out_data_source(REGISTRY) LPBYTE lpData, + _When_(lpData == NULL, _Out_opt_) + _When_(lpData != NULL, _Inout_opt_) LPDWORD lpcbData); + +LSTATUS WINAPI RegReplaceKeyA(_In_ HKEY, _In_opt_ LPCSTR, _In_ LPCSTR, _In_ LPCSTR); +LSTATUS WINAPI RegReplaceKeyW(_In_ HKEY, _In_opt_ LPCWSTR, _In_ LPCWSTR, _In_ LPCWSTR); +LSTATUS WINAPI RegRestoreKeyA(_In_ HKEY, _In_ LPCSTR, _In_ DWORD); +LSTATUS WINAPI RegRestoreKeyW(_In_ HKEY, _In_ LPCWSTR, _In_ DWORD); +LSTATUS WINAPI RegSaveKeyA(_In_ HKEY, _In_ LPCSTR, _In_opt_ LPSECURITY_ATTRIBUTES); +LSTATUS WINAPI RegSaveKeyW(_In_ HKEY, _In_ LPCWSTR, _In_opt_ LPSECURITY_ATTRIBUTES); +LSTATUS WINAPI RegSetKeySecurity(_In_ HKEY, _In_ SECURITY_INFORMATION, _In_ PSECURITY_DESCRIPTOR); + +#if (_WIN32_WINNT >= 0x0600) + +LSTATUS +WINAPI +RegSetKeyValueA( + _In_ HKEY hKey, + _In_opt_ LPCSTR lpSubKey, + _In_opt_ LPCSTR lpValueName, + _In_ DWORD dwType, + _In_reads_bytes_opt_(cbData) LPCVOID lpData, + _In_ DWORD cbData); + +LSTATUS +WINAPI +RegSetKeyValueW( + _In_ HKEY hKey, + _In_opt_ LPCWSTR lpSubKey, + _In_opt_ LPCWSTR lpValueName, + _In_ DWORD dwType, + _In_reads_bytes_opt_(cbData) LPCVOID lpData, + _In_ DWORD cbData); + +#endif + +LSTATUS +WINAPI +RegSetValueA( + _In_ HKEY hKey, + _In_opt_ LPCSTR lpSubKey, + _In_ DWORD dwType, + _In_reads_bytes_opt_(cbData) LPCSTR lpData, + _In_ DWORD cbData); + +LSTATUS +WINAPI +RegSetValueW( + _In_ HKEY hKey, + _In_opt_ LPCWSTR lpSubKey, + _In_ DWORD dwType, + _In_reads_bytes_opt_(cbData) LPCWSTR lpData, + _In_ DWORD cbData); + +LSTATUS +WINAPI +RegSetValueExA( + _In_ HKEY hKey, + _In_opt_ LPCSTR lpValueName, + _Reserved_ DWORD Reserved, + _In_ DWORD dwType, + _In_reads_bytes_opt_(cbData) const BYTE *lpData, + _In_ DWORD cbData); + +LSTATUS +WINAPI +RegSetValueExW( + _In_ HKEY hKey, + _In_opt_ LPCWSTR lpValueName, + _Reserved_ DWORD Reserved, + _In_ DWORD dwType, + _In_reads_bytes_opt_(cbData) const BYTE *lpData, + _In_ DWORD cbData); + +LSTATUS WINAPI RegUnLoadKeyA(_In_ HKEY, _In_opt_ LPCSTR); +LSTATUS WINAPI RegUnLoadKeyW(_In_ HKEY, _In_opt_ LPCWSTR); #ifdef UNICODE typedef VALENTW VALENT,*PVALENT;

1 0

[akhaldi] 58387: [SAL] * Add _Outptr_result_buffer_maybenull_, _Pre_count_c_, _Pre_opt_z_ and _Pre_z_ annotations.
by akhaldi＠svn.reactos.org 01 Mar '13

01 Mar '13

Author: akhaldi Date: Fri Mar 1 18:09:26 2013 New Revision: 58387 URL: http://svn.reactos.org/svn/reactos?rev=58387&view=rev Log: [SAL] * Add _Outptr_result_buffer_maybenull_, _Pre_count_c_, _Pre_opt_z_ and _Pre_z_ 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=583… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Fri Mar 1 18:09:26 2013 @@ -826,7 +826,7 @@ #define _Outptr_result_buffer_(size) _SAL2_NAME(_Outptr_result_buffer_) _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,WritableElements="\n" _SA_SPECSTRIZE(size))] ) //#define _Outptr_result_buffer_all_(size) //#define _Outptr_result_buffer_all_maybenull_(size) -//#define _Outptr_result_buffer_maybenull_(size) +#define _Outptr_result_buffer_maybenull_(size) _SAL2_NAME(_Outptr_result_buffer_maybenull_) _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_Maybe,Notref=1,WritableElements="\n" _SA_SPECSTRIZE(size))]) //#define _Outptr_result_buffer_to_(size, count) //#define _Outptr_result_buffer_to_maybenull_(size, count) #define _Outptr_result_bytebuffer_(size) _SAL2_NAME(_Outptr_result_bytebuffer_) _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,WritableBytes="\n" _SA_SPECSTRIZE(size))]) @@ -897,7 +897,7 @@ //#define _Pre_cap_m_(mult,size) //#define _Pre_cap_x_(size) #define _Pre_count_(size) _SAL11_NAME(_Pre_count_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(ValidElements="\n" _SA_SPECSTRIZE(size))] [SA_Pre(Valid=SA_Yes)]) -//#define _Pre_count_c_(size) +#define _Pre_count_c_(size) _SAL11_NAME(_Pre_count_c_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(ValidElementsConst=size)] [SA_Pre(Valid=SA_Yes)]) //#define _Pre_count_x_(size) //#define _Pre_defensive_ //#define _Pre_equal_to_(expr) @@ -929,7 +929,7 @@ //#define _Pre_opt_valid_cap_(size) //#define _Pre_opt_valid_cap_c_(size) //#define _Pre_opt_valid_cap_x_(size) -//#define _Pre_opt_z_ +#define _Pre_opt_z_ _SAL11_NAME(_Pre_opt_z_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(NullTerminated=SA_Yes)] [SA_Pre(Valid=SA_Yes)]) //#define _Pre_opt_z_bytecap_(size) //#define _Pre_opt_z_bytecap_c_(size) //#define _Pre_opt_z_bytecap_x_(size) @@ -953,7 +953,7 @@ //#define _Pre_writable_byte_size_(size) //#define _Pre_writable_size_(size) //#define _Pre_writeonly_ -//#define _Pre_z_ +#define _Pre_z_ _SAL2_NAME(_Pre_z_) _Group_([SA_Pre(NullTerminated=SA_Yes)] [SA_Pre(Valid=SA_Yes)]) //#define _Pre_z_bytecap_(size) //#define _Pre_z_bytecap_c_(size) //#define _Pre_z_bytecap_x_(size)

1 0

[gadamopoulos] 58386: [win32k] - Make NtUserSwitchDesktop hide the previous desktop window and show the new one. This doesn't change much yet as winlogon still uses only one desktop
by gadamopoulos＠svn.reactos.org 01 Mar '13

01 Mar '13

Author: gadamopoulos Date: Fri Mar 1 14:43:00 2013 New Revision: 58386 URL: http://svn.reactos.org/svn/reactos?rev=58386&view=rev Log: [win32k] - Make NtUserSwitchDesktop hide the previous desktop window and show the new one. This doesn't change much yet as winlogon still uses only one desktop Modified: trunk/reactos/win32ss/gdi/ntgdi/device.c trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/desktop.h Modified: trunk/reactos/win32ss/gdi/ntgdi/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/device.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/device.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/device.c [iso-8859-1] Fri Mar 1 14:43:00 2013 @@ -57,7 +57,7 @@ DPRINT1("No DESKTOP Window!!!!!\n"); } } - co_IntShowDesktop(rpDesk, SurfSize.cx, SurfSize.cy); + co_IntShowDesktop(rpDesk, SurfSize.cx, SurfSize.cy, TRUE); // Init Primary Displays Device Capabilities. PDEVOBJ_vGetDeviceCaps(gppdevPrimary, &GdiHandleTable->DevCaps); Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Fri Mar 1 14:43:00 2013 @@ -647,7 +647,19 @@ { UserDereferenceObject(pcurOld); } + return TRUE; } + + case WM_WINDOWPOSCHANGING: + { + PWINDOWPOS pWindowPos = (PWINDOWPOS)lParam; + if((pWindowPos->flags & SWP_SHOWWINDOW) != 0) + { + HDESK hdesk = IntGetDesktopObjectHandle(gpdeskInputDesktop); + IntSetThreadDesktop(hdesk, FALSE); + } + } + } return TRUE; /* We are done. Do not do any callbacks to user mode */ } @@ -737,20 +749,20 @@ NTSTATUS FASTCALL -co_IntShowDesktop(PDESKTOP Desktop, ULONG Width, ULONG Height) -{ - PWND Window; - - Window = IntGetWindowObject(Desktop->DesktopWindow); - - if (!Window) - { - ERR("No Desktop window.\n"); - return STATUS_UNSUCCESSFUL; - } - co_WinPosSetWindowPos(Window, NULL, 0, 0, Width, Height, SWP_NOACTIVATE|SWP_NOZORDER|SWP_SHOWWINDOW); - - co_UserRedrawWindow( Window, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN); +co_IntShowDesktop(PDESKTOP Desktop, ULONG Width, ULONG Height, BOOL bRedraw) +{ + PWND pwnd = Desktop->pDeskInfo->spwnd; + UINT flags = SWP_NOACTIVATE|SWP_NOZORDER|SWP_SHOWWINDOW; + ASSERT(pwnd); + + if(!bRedraw) + flags |= SWP_NOREDRAW; + + co_WinPosSetWindowPos(pwnd, NULL, 0, 0, Width, Height, flags); + + if(bRedraw) + co_UserRedrawWindow( pwnd, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN | RDW_INVALIDATE ); + return STATUS_SUCCESS; } @@ -1607,6 +1619,7 @@ { PDESKTOP pdesk; NTSTATUS Status; + BOOL bRedrawDesktop; DECLARE_RETURN(BOOL); UserEnterExclusive(); @@ -1617,6 +1630,12 @@ { ERR("Validation of desktop handle (0x%p) failed\n", hdesk); RETURN(FALSE); + } + + if(pdesk == gpdeskInputDesktop) + { + WARN("NtUserSwitchDesktop called for active desktop\n"); + RETURN(TRUE); } /* @@ -1642,11 +1661,29 @@ desktop such as Winlogon or Screen-Saver */ /* FIXME: Connect to input device */ + TRACE("Switching from desktop 0x%p to 0x%p\n", gpdeskInputDesktop, pdesk); + + bRedrawDesktop = FALSE; + + /* The first time SwitchDesktop is called, gpdeskInputDesktop is NULL */ + if(gpdeskInputDesktop != NULL) + { + if((gpdeskInputDesktop->pDeskInfo->spwnd->style & WS_VISIBLE) == WS_VISIBLE) + bRedrawDesktop = TRUE; + + /* Hide the previous desktop window */ + IntHideDesktop(gpdeskInputDesktop); + } + /* Set the active desktop in the desktop's window station. */ InputWindowStation->ActiveDesktop = pdesk; /* Set the global state. */ gpdeskInputDesktop = pdesk; + + /* Show the new desktop window */ + co_IntShowDesktop(pdesk, UserGetSystemMetrics(SM_CXSCREEN), UserGetSystemMetrics(SM_CYSCREEN), bRedrawDesktop); + TRACE("SwitchDesktop gpdeskInputDesktop 0x%p\n",gpdeskInputDesktop); ObDereferenceObject(pdesk); Modified: trunk/reactos/win32ss/user/ntuser/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] Fri Mar 1 14:43:00 2013 @@ -132,7 +132,7 @@ IntGetActiveDesktop(VOID); NTSTATUS FASTCALL -co_IntShowDesktop(PDESKTOP Desktop, ULONG Width, ULONG Height); +co_IntShowDesktop(PDESKTOP Desktop, ULONG Width, ULONG Height, BOOL Redraw); NTSTATUS FASTCALL IntHideDesktop(PDESKTOP Desktop);

1 0

[akhaldi] 58385: [PSDK] * Add some annotations in winnt.h.
by akhaldi＠svn.reactos.org 01 Mar '13

01 Mar '13

Author: akhaldi Date: Fri Mar 1 12:00:19 2013 New Revision: 58385 URL: http://svn.reactos.org/svn/reactos?rev=58385&view=rev Log: [PSDK] * Add some annotations in winnt.h. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Fri Mar 1 12:00:19 2013 @@ -312,19 +312,33 @@ #endif typedef wchar_t WCHAR; -typedef WCHAR *PWCHAR,*LPWCH,*PWCH,*NWPSTR,*LPWSTR,*PWSTR,*PZZWSTR; -typedef CONST WCHAR *LPCWCH,*PCWCH,*LPCWSTR,*PCWSTR,*PCZZWSTR; -typedef CHAR *PCHAR,*LPCH,*PCH,*NPSTR,*LPSTR,*PSTR; -typedef CONST CHAR *LPCCH,*PCCH,*PCSTR,*LPCSTR; -typedef PWSTR *PZPWSTR; -typedef CONST PWSTR *PCZPWSTR; -typedef WCHAR UNALIGNED *LPUWSTR,*PUWSTR; -typedef PCWSTR *PZPCWSTR; -typedef CONST WCHAR UNALIGNED *LPCUWSTR,*PCUWSTR; -typedef PSTR *PZPSTR; -typedef CONST PSTR *PCZPSTR; -typedef PCSTR *PZPCSTR; - + +typedef _Null_terminated_ WCHAR *NWPSTR, *LPWSTR, *PWSTR; +typedef _Null_terminated_ PWSTR *PZPWSTR; +typedef _Null_terminated_ CONST PWSTR *PCZPWSTR; +typedef _Null_terminated_ WCHAR UNALIGNED *LPUWSTR, *PUWSTR; +typedef _Null_terminated_ CONST WCHAR *LPCWSTR, *PCWSTR; +typedef _Null_terminated_ PCWSTR *PZPCWSTR; +typedef _Null_terminated_ CONST WCHAR UNALIGNED *LPCUWSTR, *PCUWSTR; + +typedef _NullNull_terminated_ WCHAR *PZZWSTR; +typedef _NullNull_terminated_ CONST WCHAR *PCZZWSTR; +typedef _NullNull_terminated_ WCHAR UNALIGNED *PUZZWSTR; +typedef _NullNull_terminated_ CONST WCHAR UNALIGNED *PCUZZWSTR; + +typedef WCHAR *PWCHAR, *LPWCH, *PWCH; +typedef CONST WCHAR *LPCWCH, *PCWCH; +typedef CHAR *PCHAR, *LPCH, *PCH; +typedef CONST CHAR *LPCCH, *PCCH; + +typedef _Null_terminated_ CHAR *NPSTR, *LPSTR, *PSTR; +typedef _Null_terminated_ PSTR *PZPSTR; +typedef _Null_terminated_ CONST PSTR *PCZPSTR; +typedef _Null_terminated_ CONST CHAR *LPCSTR, *PCSTR; +typedef _Null_terminated_ PCSTR *PZPCSTR; + +typedef _NullNull_terminated_ CHAR *PZZSTR; +typedef _NullNull_terminated_ CONST CHAR *PCZZSTR; #ifdef UNICODE #ifndef _TCHAR_DEFINED @@ -2420,13 +2434,15 @@ } ACL_SIZE_INFORMATION, *PACL_SIZE_INFORMATION; typedef +_IRQL_requires_same_ +_Function_class_(EXCEPTION_ROUTINE) EXCEPTION_DISPOSITION NTAPI EXCEPTION_ROUTINE( - _Inout_ struct _EXCEPTION_RECORD *ExceptionRecord, - _In_ PVOID EstablisherFrame, - _Inout_ struct _CONTEXT *ContextRecord, - _In_ PVOID DispatcherContext); + _Inout_ struct _EXCEPTION_RECORD *ExceptionRecord, + _In_ PVOID EstablisherFrame, + _Inout_ struct _CONTEXT *ContextRecord, + _In_ PVOID DispatcherContext); typedef EXCEPTION_ROUTINE *PEXCEPTION_ROUTINE; @@ -2726,8 +2742,22 @@ UNWIND_HISTORY_TABLE_ENTRY Entry[UNWIND_HISTORY_TABLE_SIZE]; } UNWIND_HISTORY_TABLE, *PUNWIND_HISTORY_TABLE; -typedef PRUNTIME_FUNCTION (*PGET_RUNTIME_FUNCTION_CALLBACK)(DWORD64 ControlPc,PVOID Context); -typedef DWORD (*POUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK)(HANDLE Process,PVOID TableAddress,PDWORD Entries,PRUNTIME_FUNCTION *Functions); +typedef +_Function_class_(GET_RUNTIME_FUNCTION_CALLBACK) +PRUNTIME_FUNCTION +(*PGET_RUNTIME_FUNCTION_CALLBACK)( + _In_ DWORD64 ControlPc, + _In_opt_ PVOID Context); + +typedef +_Function_class_(OUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK) +_Must_inspect_result_ +DWORD +(*POUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK)( + _In_ HANDLE Process, + _In_ PVOID TableAddress, + _Out_ PDWORD Entries, + _Out_ PRUNTIME_FUNCTION *Functions); #define OUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK_EXPORT_NAME "OutOfProcessFunctionTableCallback" @@ -3817,45 +3847,40 @@ NTSYSAPI VOID NTAPI -RtlInitializeSListHead ( - IN PSLIST_HEADER ListHead - ); - +RtlInitializeSListHead( + _Out_ PSLIST_HEADER ListHead); + +_Must_inspect_result_ NTSYSAPI PSLIST_ENTRY NTAPI -RtlFirstEntrySList ( - IN const SLIST_HEADER *ListHead - ); +RtlFirstEntrySList( + _In_ const SLIST_HEADER *ListHead); NTSYSAPI PSLIST_ENTRY NTAPI -RtlInterlockedPopEntrySList ( - IN PSLIST_HEADER ListHead - ); +RtlInterlockedPopEntrySList( + _Inout_ PSLIST_HEADER ListHead); NTSYSAPI PSLIST_ENTRY NTAPI -RtlInterlockedPushEntrySList ( - IN PSLIST_HEADER ListHead, - IN PSLIST_ENTRY ListEntry - ); +RtlInterlockedPushEntrySList( + _Inout_ PSLIST_HEADER ListHead, + _Inout_ __drv_aliasesMem PSLIST_ENTRY ListEntry); NTSYSAPI PSLIST_ENTRY NTAPI -RtlInterlockedFlushSList ( - IN PSLIST_HEADER ListHead - ); +RtlInterlockedFlushSList( + _Inout_ PSLIST_HEADER ListHead); NTSYSAPI WORD NTAPI -RtlQueryDepthSList ( - IN PSLIST_HEADER ListHead - ); +RtlQueryDepthSList( + _In_ PSLIST_HEADER ListHead); #ifndef _RTL_RUN_ONCE_DEF #define _RTL_RUN_ONCE_DEF @@ -3921,9 +3946,8 @@ PVOID NTAPI RtlPcToFileHeader( - IN PVOID PcValue, - PVOID* BaseOfImage -); + _In_ PVOID PcValue, + _Out_ PVOID* BaseOfImage); NTSYSAPI VOID @@ -5321,7 +5345,7 @@ #define VER_SET_CONDITION(lc,t,c) ((lc) = VerSetConditionMask((lc),(t),(c))) #if (_WIN32_WINNT >= 0x0500) -ULONGLONG WINAPI VerSetConditionMask(ULONGLONG,DWORD,BYTE); +ULONGLONG WINAPI VerSetConditionMask(_In_ ULONGLONG, _In_ DWORD, _In_ BYTE); #endif typedef enum _HEAP_INFORMATION_CLASS { @@ -5370,14 +5394,14 @@ } DUMMYUNIONNAME; } SYSTEM_LOGICAL_PROCESSOR_INFORMATION, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION; +_Check_return_ NTSYSAPI SIZE_T NTAPI RtlCompareMemory ( - const VOID *Source1, - const VOID *Source2, - SIZE_T Length - ); + _In_ const VOID *Source1, + _In_ const VOID *Source2, + _In_ SIZE_T Length); #define RtlMoveMemory memmove #define RtlCopyMemory memcpy @@ -5386,8 +5410,8 @@ FORCEINLINE PVOID -RtlSecureZeroMemory(IN PVOID Buffer, - IN SIZE_T Length) +RtlSecureZeroMemory(_Out_writes_bytes_all_(Length) PVOID Buffer, + _In_ SIZE_T Length) { volatile char *VolatilePointer; @@ -5560,6 +5584,7 @@ #define YieldProcessor _mm_pause +__analysis_noreturn FORCEINLINE VOID DbgRaiseAssertionFailure(VOID)

1 0

[akhaldi] 58384: [DDK] * Fix a typo.
by akhaldi＠svn.reactos.org 01 Mar '13

01 Mar '13

Author: akhaldi Date: Fri Mar 1 10:56:02 2013 New Revision: 58384 URL: http://svn.reactos.org/svn/reactos?rev=58384&view=rev Log: [DDK] * Fix a typo. Modified: trunk/reactos/include/ddk/ndis.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=583… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Fri Mar 1 10:56:02 2013 @@ -5851,7 +5851,7 @@ NTAPI NdisWaitEvent( _In_ PNDIS_EVENT Event, - _In_ UINT Timeout); + _In_ UINT MsToWait); /* NDIS intermediate miniport structures */

1 0

[akhaldi] 58383: [SAL] * Add _Inout_updates_bytes_opt_, _Outptr_result_bytebuffer_to_ and _Outptr_result_maybenull_ annotations.
by akhaldi＠svn.reactos.org 01 Mar '13

01 Mar '13

Author: akhaldi Date: Fri Mar 1 10:52:17 2013 New Revision: 58383 URL: http://svn.reactos.org/svn/reactos?rev=58383&view=rev Log: [SAL] * Add _Inout_updates_bytes_opt_, _Outptr_result_bytebuffer_to_ and _Outptr_result_maybenull_ 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=583… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Fri Mar 1 10:52:17 2013 @@ -699,7 +699,7 @@ #define _Inout_updates_bytes_(size) _SAL2_NAME(_Inout_updates_bytes_) _Group_(_Pre_bytecap_(size) [SA_Pre(Valid=SA_Yes)] [SA_Post(Valid=SA_Yes)] ) //#define _Inout_updates_bytes_all_(size) //#define _Inout_updates_bytes_all_opt_(size) -//#define _Inout_updates_bytes_opt_(size) +#define _Inout_updates_bytes_opt_(size) _SAL2_NAME(_Inout_updates_bytes_opt_) _Group_(_Pre_opt_bytecap_(size) [SA_Pre(Valid=SA_Yes)] [SA_Post(Valid=SA_Yes)]) #define _Inout_updates_bytes_to_(size,count) _SAL2_NAME(_Inout_updates_bytes_to_) _Group_(_Out_writes_bytes_to_(size,count) [SA_Pre(Valid=SA_Yes)] [SA_Pre(ValidBytes="\n" _SA_SPECSTRIZE(count))] ) #define _Inout_updates_bytes_to_opt_(size,count) _SAL2_NAME(_Inout_updates_bytes_to_opt_) _Group_(_Out_writes_bytes_to_opt_(size,count) [SA_Pre(Valid=SA_Yes)] [SA_Pre(ValidBytes="\n" _SA_SPECSTRIZE(count))] ) #define _Inout_updates_opt_(size) _SAL2_NAME(_Inout_updates_opt_) _Group_(_Pre_opt_cap_(size) [SA_Pre(Valid=SA_Yes)] [SA_Post(Valid=SA_Yes)]) @@ -833,9 +833,9 @@ //#define _Outptr_result_bytebuffer_all_(size) //#define _Outptr_result_bytebuffer_all_maybenull_(size) //#define _Outptr_result_bytebuffer_maybenull_(size) -//#define _Outptr_result_bytebuffer_to_(size, count) +#define _Outptr_result_bytebuffer_to_(size, count) _SAL2_NAME(_Outptr_result_bytebuffer_to_) _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,WritableBytes="\n" _SA_SPECSTRIZE(size), ValidBytes="\n" _SA_SPECSTRIZE(count))]) //#define _Outptr_result_bytebuffer_to_maybenull_(size, count) -//#define _Outptr_result_maybenull_ +#define _Outptr_result_maybenull_ _SAL2_NAME(_Outptr_result_maybenull_) _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_Maybe,Notref=1,ValidElements="\n""1")] ) //#define _Outptr_result_maybenull_z_ #define _Outptr_result_nullonfailure_ _SAL2_NAME(_Outptr_result_nullonfailure_) _Group_(_Outptr_ [SAL_context(p1="SAL_failed")] _Group_([SAL_post] _Deref_post_null_) ) //#define _Outptr_result_z_

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2013