Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 72742: Revert 2 small changes that I didn't want to do.
by hbelusca＠svn.reactos.org 19 Sep '16

19 Sep '16

Author: hbelusca Date: Mon Sep 19 15:51:13 2016 New Revision: 72742 URL: http://svn.reactos.org/svn/reactos?rev=72742&view=rev Log: Revert 2 small changes that I didn't want to do. Modified: trunk/reactos/sdk/include/psdk/winwlx.h Modified: trunk/reactos/sdk/include/psdk/winwlx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winwlx.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/winwlx.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winwlx.h [iso-8859-1] Mon Sep 19 15:51:13 2016 @@ -31,7 +31,7 @@ #define WLX_VERSION_1_2 0x00010002 #define WLX_VERSION_1_3 0x00010003 #define WLX_VERSION_1_4 0x00010004 -#define WLX_CURRENT_VERSION WLX_VERSION_1_4 +#define WLX_CURRENT_VERSION (WLX_VERSION_1_4) #define WLX_SAS_TYPE_TIMEOUT 0x0000 #define WLX_SAS_TYPE_CTRL_ALT_DEL 0x0001 @@ -72,7 +72,7 @@ #define WLX_WM_SAS (WM_USER + 0x0259) #define WLX_DLG_SAS 0x0065 -#define WLX_DLG_INPUT_TIMEOUT 0x0066 /* (Input keys, ...) timed out */ +#define WLX_DLG_INPUT_TIMEOUT 0x0066 /* Input (keys, ...) timed out */ #define WLX_DLG_SCREEN_SAVER_TIMEOUT 0x0067 /* Screen saver activated */ #define WLX_DLG_USER_LOGOFF 0x0068 /* User logged off */

1 0

[hbelusca] 72741: [PSDK]: Add annotations & fix whitespace.
by hbelusca＠svn.reactos.org 19 Sep '16

19 Sep '16

Author: hbelusca Date: Mon Sep 19 15:49:45 2016 New Revision: 72741 URL: http://svn.reactos.org/svn/reactos?rev=72741&view=rev Log: [PSDK]: Add annotations & fix whitespace. Modified: trunk/reactos/sdk/include/psdk/winwlx.h Modified: trunk/reactos/sdk/include/psdk/winwlx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winwlx.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/winwlx.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winwlx.h [iso-8859-1] Mon Sep 19 15:49:45 2016 @@ -26,626 +26,646 @@ #endif -#define WLX_VERSION_1_0 (0x00010000) -#define WLX_VERSION_1_1 (0x00010001) -#define WLX_VERSION_1_2 (0x00010002) -#define WLX_VERSION_1_3 (0x00010003) -#define WLX_VERSION_1_4 (0x00010004) -#define WLX_CURRENT_VERSION (WLX_VERSION_1_4) - -#define WLX_SAS_TYPE_TIMEOUT (0x0000) -#define WLX_SAS_TYPE_CTRL_ALT_DEL (0x0001) -#define WLX_SAS_TYPE_SCRNSVR_TIMEOUT (0x0002) -#define WLX_SAS_TYPE_SCRNSVR_ACTIVITY (0x0003) -#define WLX_SAS_TYPE_USER_LOGOFF (0x0004) -#define WLX_SAS_TYPE_SC_INSERT (0x0005) -#define WLX_SAS_TYPE_SC_REMOVE (0x0006) -#define WLX_SAS_TYPE_AUTHENTICATED (0x0007) -#define WLX_SAS_TYPE_SC_FIRST_READER_ARRIVED (0x0008) -#define WLX_SAS_TYPE_SC_LAST_READER_REMOVED (0x0009) -#define WLX_SAS_TYPE_SWITCHUSER (0x000A) -#define WLX_SAS_TYPE_MAX_MSFT_VALUE (0x007F) - -#define WLX_LOGON_OPT_NO_PROFILE (0x0001) - -#define WLX_PROFILE_TYPE_V1_0 (0x0001) -#define WLX_PROFILE_TYPE_V2_0 (0x0002) /* default */ - -#define WLX_SAS_ACTION_LOGON (0x0001) -#define WLX_SAS_ACTION_NONE (0x0002) -#define WLX_SAS_ACTION_LOCK_WKSTA (0x0003) -#define WLX_SAS_ACTION_LOGOFF (0x0004) -#define WLX_SAS_ACTION_SHUTDOWN (0x0005) -#define WLX_SAS_ACTION_PWD_CHANGED (0x0006) -#define WLX_SAS_ACTION_TASKLIST (0x0007) -#define WLX_SAS_ACTION_UNLOCK_WKSTA (0x0008) -#define WLX_SAS_ACTION_FORCE_LOGOFF (0x0009) -#define WLX_SAS_ACTION_SHUTDOWN_POWER_OFF (0x000A) -#define WLX_SAS_ACTION_SHUTDOWN_REBOOT (0x000B) -#define WLX_SAS_ACTION_SHUTDOWN_SLEEP (0x000C) -#define WLX_SAS_ACTION_SHUTDOWN_SLEEP2 (0x000D) -#define WLX_SAS_ACTION_SHUTDOWN_HIBERNATE (0x000E) -#define WLX_SAS_ACTION_RECONNECTED (0x000F) -#define WLX_SAS_ACTION_DELAYED_FORCE_LOGOFF (0x0010) -#define WLX_SAS_ACTION_SWITCH_CONSOLE (0x0011) - -#define WLX_WM_SAS (WM_USER + 0x0259) - -#define WLX_DLG_SAS (0x0065) -#define WLX_DLG_INPUT_TIMEOUT (0x0066) /* Input (keys, ...) timed out */ -#define WLX_DLG_SCREEN_SAVER_TIMEOUT (0x0067) /* Screen saver activated */ -#define WLX_DLG_USER_LOGOFF (0x0068) /* User logged off */ - -#define WLX_DIRECTORY_LENGTH (0x0100) - -#define WLX_CREDENTIAL_TYPE_V1_0 (0x0001) -#define WLX_CREDENTIAL_TYPE_V2_0 (0x0002) - -#define WLX_CONSOLESWITCHCREDENTIAL_TYPE_V1_0 (0x0001) - -#define STATUSMSG_OPTION_NOANIMATION (0x0001) -#define STATUSMSG_OPTION_SETFOREGROUND (0x0002) +#define WLX_VERSION_1_0 0x00010000 +#define WLX_VERSION_1_1 0x00010001 +#define WLX_VERSION_1_2 0x00010002 +#define WLX_VERSION_1_3 0x00010003 +#define WLX_VERSION_1_4 0x00010004 +#define WLX_CURRENT_VERSION WLX_VERSION_1_4 + +#define WLX_SAS_TYPE_TIMEOUT 0x0000 +#define WLX_SAS_TYPE_CTRL_ALT_DEL 0x0001 +#define WLX_SAS_TYPE_SCRNSVR_TIMEOUT 0x0002 +#define WLX_SAS_TYPE_SCRNSVR_ACTIVITY 0x0003 +#define WLX_SAS_TYPE_USER_LOGOFF 0x0004 +#define WLX_SAS_TYPE_SC_INSERT 0x0005 +#define WLX_SAS_TYPE_SC_REMOVE 0x0006 +#define WLX_SAS_TYPE_AUTHENTICATED 0x0007 +#define WLX_SAS_TYPE_SC_FIRST_READER_ARRIVED 0x0008 +#define WLX_SAS_TYPE_SC_LAST_READER_REMOVED 0x0009 +#define WLX_SAS_TYPE_SWITCHUSER 0x000A +#define WLX_SAS_TYPE_MAX_MSFT_VALUE 0x007F + +#define WLX_LOGON_OPT_NO_PROFILE 0x0001 + +#define WLX_PROFILE_TYPE_V1_0 0x0001 +#define WLX_PROFILE_TYPE_V2_0 0x0002 /* Default */ + +#define WLX_SAS_ACTION_LOGON 0x0001 +#define WLX_SAS_ACTION_NONE 0x0002 +#define WLX_SAS_ACTION_LOCK_WKSTA 0x0003 +#define WLX_SAS_ACTION_LOGOFF 0x0004 +#define WLX_SAS_ACTION_SHUTDOWN 0x0005 +#define WLX_SAS_ACTION_PWD_CHANGED 0x0006 +#define WLX_SAS_ACTION_TASKLIST 0x0007 +#define WLX_SAS_ACTION_UNLOCK_WKSTA 0x0008 +#define WLX_SAS_ACTION_FORCE_LOGOFF 0x0009 +#define WLX_SAS_ACTION_SHUTDOWN_POWER_OFF 0x000A +#define WLX_SAS_ACTION_SHUTDOWN_REBOOT 0x000B +#define WLX_SAS_ACTION_SHUTDOWN_SLEEP 0x000C +#define WLX_SAS_ACTION_SHUTDOWN_SLEEP2 0x000D +#define WLX_SAS_ACTION_SHUTDOWN_HIBERNATE 0x000E +#define WLX_SAS_ACTION_RECONNECTED 0x000F +#define WLX_SAS_ACTION_DELAYED_FORCE_LOGOFF 0x0010 +#define WLX_SAS_ACTION_SWITCH_CONSOLE 0x0011 + +#define WLX_WM_SAS (WM_USER + 0x0259) + +#define WLX_DLG_SAS 0x0065 +#define WLX_DLG_INPUT_TIMEOUT 0x0066 /* (Input keys, ...) timed out */ +#define WLX_DLG_SCREEN_SAVER_TIMEOUT 0x0067 /* Screen saver activated */ +#define WLX_DLG_USER_LOGOFF 0x0068 /* User logged off */ + +#define WLX_DIRECTORY_LENGTH 0x0100 + +#define WLX_CREDENTIAL_TYPE_V1_0 0x0001 +#define WLX_CREDENTIAL_TYPE_V2_0 0x0002 + +#define WLX_CONSOLESWITCHCREDENTIAL_TYPE_V1_0 0x0001 + +#define STATUSMSG_OPTION_NOANIMATION 0x0001 +#define STATUSMSG_OPTION_SETFOREGROUND 0x0002 typedef struct _WLX_CLIENT_CREDENTIALS_INFO { - DWORD dwType; - PWSTR pszUserName; - PWSTR pszDomain; - PWSTR pszPassword; - BOOL fPromptForPassword; + DWORD dwType; + PWSTR pszUserName; + PWSTR pszDomain; + PWSTR pszPassword; + BOOL fPromptForPassword; } WLX_CLIENT_CREDENTIALS_INFO_V1_0, *PWLX_CLIENT_CREDENTIALS_INFO_V1_0; typedef struct _WLX_CLIENT_CREDENTIALS_INFO_2_0 { - DWORD dwType; - PWSTR pszUserName; - PWSTR pszDomain; - PWSTR pszPassword; - BOOL fPromptForPassword; - BOOL fDisconnectOnLogonFailure; + DWORD dwType; + PWSTR pszUserName; + PWSTR pszDomain; + PWSTR pszPassword; + BOOL fPromptForPassword; + BOOL fDisconnectOnLogonFailure; } WLX_CLIENT_CREDENTIALS_INFO_V2_0, *PWLX_CLIENT_CREDENTIALS_INFO_V2_0; typedef struct _WLX_CONSOLESWITCH_CREDENTIALS_INFO { - DWORD dwType; - HANDLE UserToken; - LUID LogonId; - QUOTA_LIMITS Quotas; - PWSTR UserName; - PWSTR Domain; - LARGE_INTEGER LogonTime; - BOOL SmartCardLogon; - ULONG ProfileLength; - DWORD MessageType; - USHORT LogonCount; - USHORT BadPasswordCount; - LARGE_INTEGER ProfileLogonTime; - LARGE_INTEGER LogoffTime; - LARGE_INTEGER KickOffTime; - LARGE_INTEGER PasswordLastSet; - LARGE_INTEGER PasswordCanChange; - LARGE_INTEGER PasswordMustChange; - PWSTR LogonScript; - PWSTR HomeDirectory; - PWSTR FullName; - PWSTR ProfilePath; - PWSTR HomeDirectoryDrive; - PWSTR LogonServer; - ULONG UserFlags; - ULONG PrivateDataLen; - PBYTE PrivateData; + DWORD dwType; + HANDLE UserToken; + LUID LogonId; + QUOTA_LIMITS Quotas; + PWSTR UserName; + PWSTR Domain; + LARGE_INTEGER LogonTime; + BOOL SmartCardLogon; + ULONG ProfileLength; + DWORD MessageType; + USHORT LogonCount; + USHORT BadPasswordCount; + LARGE_INTEGER ProfileLogonTime; + LARGE_INTEGER LogoffTime; + LARGE_INTEGER KickOffTime; + LARGE_INTEGER PasswordLastSet; + LARGE_INTEGER PasswordCanChange; + LARGE_INTEGER PasswordMustChange; + PWSTR LogonScript; + PWSTR HomeDirectory; + PWSTR FullName; + PWSTR ProfilePath; + PWSTR HomeDirectoryDrive; + PWSTR LogonServer; + ULONG UserFlags; + ULONG PrivateDataLen; + PBYTE PrivateData; } WLX_CONSOLESWITCH_CREDENTIALS_INFO_V1_0, *PWLX_CONSOLESWITCH_CREDENTIALS_INFO_V1_0; typedef struct _WLX_MPR_NOTIFY_INFO { - PWSTR pszUserName; - PWSTR pszDomain; - PWSTR pszPassword; - PWSTR pszOldPassword; + PWSTR pszUserName; + PWSTR pszDomain; + PWSTR pszPassword; + PWSTR pszOldPassword; } WLX_MPR_NOTIFY_INFO, *PWLX_MPR_NOTIFY_INFO; typedef struct _WLX_PROFILE_V1_0 { - DWORD dwType; - PWSTR pszProfile; + DWORD dwType; + PWSTR pszProfile; } WLX_PROFILE_V1_0, *PWLX_PROFILE_V1_0; typedef struct _WLX_PROFILE_V2_0 { - DWORD dwType; - PWSTR pszProfile; - PWSTR pszPolicy; - PWSTR pszNetworkDefaultUserProfile; - PWSTR pszServerName; - PWSTR pszEnvironment; + DWORD dwType; + PWSTR pszProfile; + PWSTR pszPolicy; + PWSTR pszNetworkDefaultUserProfile; + PWSTR pszServerName; + PWSTR pszEnvironment; } WLX_PROFILE_V2_0, *PWLX_PROFILE_V2_0; typedef struct _WLX_SC_NOTIFICATION_INFO { - PWSTR pszCard; - PWSTR pszReader; - PWSTR pszContainer; - PWSTR pszCryptoProvider; + PWSTR pszCard; + PWSTR pszReader; + PWSTR pszContainer; + PWSTR pszCryptoProvider; } WLX_SC_NOTIFICATION_INFO, *PWLX_SC_NOTIFICATION_INFO; typedef struct _WLX_TERMINAL_SERVICES_DATA { - WCHAR ProfilePath[WLX_DIRECTORY_LENGTH + 1]; - WCHAR HomeDir[WLX_DIRECTORY_LENGTH + 1]; - WCHAR HomeDirDrive[4]; + WCHAR ProfilePath[WLX_DIRECTORY_LENGTH + 1]; + WCHAR HomeDir[WLX_DIRECTORY_LENGTH + 1]; + WCHAR HomeDirDrive[4]; } WLX_TERMINAL_SERVICES_DATA, *PWLX_TERMINAL_SERVICES_DATA; /* GINA Version 1.0 */ -BOOL WINAPI +BOOL +WINAPI WlxActivateUserShell( - PVOID pWlxContext, - PWSTR pszDesktopName, - PWSTR pszMprLogonScript, - PVOID pEnvironment); - -VOID WINAPI + _In_ PVOID pWlxContext, + _In_ PWSTR pszDesktopName, + _In_ PWSTR pszMprLogonScript, + _In_ PVOID pEnvironment); + +VOID +WINAPI WlxDisplayLockedNotice( - PVOID pWlxContext); - -VOID WINAPI + _In_ PVOID pWlxContext); + +VOID +WINAPI WlxDisplaySASNotice( - PVOID pWlxContext); - -BOOL WINAPI + _In_ PVOID pWlxContext); + +BOOL +WINAPI WlxInitialize( - LPWSTR lpWinsta, - HANDLE hWlx, - PVOID pvReserved, - PVOID pWinlogonFunctions, - PVOID *pWlxContext); - -BOOL WINAPI + _In_ LPWSTR lpWinsta, + _In_ HANDLE hWlx, + _In_ PVOID pvReserved, + _In_ PVOID pWinlogonFunctions, + _Out_ PVOID *pWlxContext); + +BOOL +WINAPI WlxIsLockOk( - PVOID pWlxContext); - -BOOL WINAPI + _In_ PVOID pWlxContext); + +BOOL +WINAPI WlxIsLogoffOk( - PVOID pWlxContext); - -int WINAPI + _In_ PVOID pWlxContext); + +INT +WINAPI WlxLoggedOnSAS( - PVOID pWlxContext, - DWORD dwSasType, - PVOID pReserved); - -int WINAPI + _In_ PVOID pWlxContext, + _In_ DWORD dwSasType, + _In_ PVOID pReserved); + +INT +WINAPI WlxLoggedOutSAS( - PVOID pWlxContext, - DWORD dwSasType, - PLUID pAuthenticationId, - PSID pLogonSid, - PDWORD pdwOptions, - PHANDLE phToken, - PWLX_MPR_NOTIFY_INFO pNprNotifyInfo, - PVOID *pProfile); - -VOID WINAPI + _In_ PVOID pWlxContext, + _In_ DWORD dwSasType, + _Out_ PLUID pAuthenticationId, + _Inout_ PSID pLogonSid, + _Out_ PDWORD pdwOptions, + _Out_ PHANDLE phToken, + _Out_ PWLX_MPR_NOTIFY_INFO pNprNotifyInfo, + _Out_ PVOID *pProfile); + +VOID +WINAPI WlxLogoff( - PVOID pWlxContext); - -BOOL WINAPI + _In_ PVOID pWlxContext); + +BOOL +WINAPI WlxNegotiate( - DWORD dwWinlogonVersion, - PDWORD pdwDllVersion); - -VOID WINAPI + _In_ DWORD dwWinlogonVersion, + _Out_ PDWORD pdwDllVersion); + +VOID +WINAPI WlxShutdown( - PVOID pWlxContext, - DWORD ShutdownType); - -int WINAPI + _In_ PVOID pWlxContext, + _In_ DWORD ShutdownType); + +INT +WINAPI WlxWkstaLockedSAS( - PVOID pWlxContext, - DWORD dwSasType); + _In_ PVOID pWlxContext, + _In_ DWORD dwSasType); /* GINA Version 1.1 */ -BOOL WINAPI +BOOL +WINAPI WlxScreenSaverNotify( - PVOID pWlxContext, - BOOL *pSecure); - -BOOL WINAPI + _In_ PVOID pWlxContext, + _Inout_ BOOL *pSecure); + +BOOL +WINAPI WlxStartApplication( - PVOID pWlxContext, - PWSTR pszDesktopName, - PVOID pEnvironment, - PWSTR pszCmdLine); + _In_ PVOID pWlxContext, + _In_ PWSTR pszDesktopName, + _In_ PVOID pEnvironment, + _In_ PWSTR pszCmdLine); /* GINA Version 1.3 */ -BOOL WINAPI +BOOL +WINAPI WlxDisplayStatusMessage( - PVOID pWlxContext, - HDESK hDesktop, - DWORD dwOptions, - PWSTR pTitle, - PWSTR pMessage); - -BOOL WINAPI + _In_ PVOID pWlxContext, + _In_ HDESK hDesktop, + _In_ DWORD dwOptions, + _In_ PWSTR pTitle, + _In_ PWSTR pMessage); + +BOOL +WINAPI WlxGetStatusMessage( - PVOID pWlxContext, - DWORD *pdwOptions, - PWSTR pMessage, - DWORD dwBufferSize); + _In_ PVOID pWlxContext, + _Out_ DWORD *pdwOptions, + _Out_ PWSTR pMessage, + _In_ DWORD dwBufferSize); BOOL WINAPI WlxNetworkProviderLoad( - PVOID pWlxContext, - PWLX_MPR_NOTIFY_INFO pNprNotifyInfo); - -BOOL WINAPI + _In_ PVOID pWlxContext, + _Out_ PWLX_MPR_NOTIFY_INFO pNprNotifyInfo); + +BOOL +WINAPI WlxRemoveStatusMessage( - PVOID pWlxContext); + _In_ PVOID pWlxContext); /* GINA Version 1.4 */ -VOID WINAPI +VOID +WINAPI WlxDisconnectNotify( - PVOID pWlxContext); - -BOOL WINAPI + _In_ PVOID pWlxContext); + +BOOL +WINAPI WlxGetConsoleSwitchCredentials( - PVOID pWlxContext, - PVOID pCredInfo); - -VOID WINAPI + _In_ PVOID pWlxContext, + _Out_ PVOID pCredInfo); + +VOID +WINAPI WlxReconnectNotify( - PVOID pWlxContext); + _In_ PVOID pWlxContext); /* Services that Winlogon provides */ -#define WLX_DESKTOP_NAME (0x0001) /* Name present */ -#define WLX_DESKTOP_HANDLE (0x0002) /* Handle present */ - -#define WLX_CREATE_INSTANCE_ONLY (0x0001) -#define WLX_CREATE_USER (0x0002) - -#define WLX_OPTION_USE_CTRL_ALT_DEL (0x0001) -#define WLX_OPTION_CONTEXT_POINTER (0x0002) -#define WLX_OPTION_USE_SMART_CARD (0x0003) -#define WLX_OPTION_FORCE_LOGOFF_TIME (0x0004) -#define WLX_OPTION_IGNORE_AUTO_LOGON (0x0008) -#define WLX_OPTION_NO_SWITCH_ON_SAS (0x0009) - -#define WLX_OPTION_SMART_CARD_PRESENT (0x00010001) -#define WLX_OPTION_SMART_CARD_INFO (0x00010002) -#define WLX_OPTION_DISPATCH_TABLE_SIZE (0x00010003) +#define WLX_DESKTOP_NAME 0x0001 /* Name present */ +#define WLX_DESKTOP_HANDLE 0x0002 /* Handle present */ + +#define WLX_CREATE_INSTANCE_ONLY 0x0001 +#define WLX_CREATE_USER 0x0002 + +#define WLX_OPTION_USE_CTRL_ALT_DEL 0x0001 +#define WLX_OPTION_CONTEXT_POINTER 0x0002 +#define WLX_OPTION_USE_SMART_CARD 0x0003 +#define WLX_OPTION_FORCE_LOGOFF_TIME 0x0004 +#define WLX_OPTION_IGNORE_AUTO_LOGON 0x0008 +#define WLX_OPTION_NO_SWITCH_ON_SAS 0x0009 + +#define WLX_OPTION_SMART_CARD_PRESENT 0x00010001 +#define WLX_OPTION_SMART_CARD_INFO 0x00010002 +#define WLX_OPTION_DISPATCH_TABLE_SIZE 0x00010003 typedef struct _WLX_DESKTOP { - DWORD Size; - DWORD Flags; - HDESK hDesktop; - PWSTR pszDesktopName; + DWORD Size; + DWORD Flags; + HDESK hDesktop; + PWSTR pszDesktopName; } WLX_DESKTOP, *PWLX_DESKTOP; typedef -int (WINAPI *PWLX_ASSIGN_SHELL_PROTECTION)( - HANDLE hWlx, - HANDLE hToken, - HANDLE hProcess, - HANDLE hThread); +INT (WINAPI *PWLX_ASSIGN_SHELL_PROTECTION)( + _In_ HANDLE hWlx, + _In_ HANDLE hToken, + _In_ HANDLE hProcess, + _In_ HANDLE hThread); + +typedef +INT (WINAPI *PWLX_CHANGE_PASSWORD_NOTIFY)( + _In_ HANDLE hWlx, + _In_ PWLX_MPR_NOTIFY_INFO pMprInfo, + _In_ DWORD dwChangeInfo); + +typedef +INT (WINAPI *PWLX_CHANGE_PASSWORD_NOTIFY_EX)( + _In_ HANDLE hWlx, + _In_ PWLX_MPR_NOTIFY_INFO pMprInfo, + _In_ DWORD dwChangeInfo, + _In_ PWSTR ProviderName, + _In_ PVOID Reserved); typedef BOOL (WINAPI *PWLX_CLOSE_USER_DESKTOP)( - HANDLE hWlx, - PWLX_DESKTOP pDesktop, - HANDLE hToken); - -typedef -int (WINAPI *PWLX_CHANGE_PASSWORD_NOTIFY)( - HANDLE hWlx, - PWLX_MPR_NOTIFY_INFO pMprInfo, - DWORD dwChangeInfo); - -typedef -int (WINAPI *PWLX_CHANGE_PASSWORD_NOTIFY_EX)( - HANDLE hWlx, - PWLX_MPR_NOTIFY_INFO pMprInfo, - DWORD dwChangeInfo, - PWSTR ProviderName, - PVOID Reserved); + _In_ HANDLE hWlx, + _In_ PWLX_DESKTOP pDesktop, + _In_ HANDLE hToken); typedef BOOL (WINAPI *PWLX_CREATE_USER_DESKTOP)( - HANDLE hWlx, - HANDLE hToken, - DWORD Flags, - PWSTR pszDesktopName, - PWLX_DESKTOP *ppDesktop); - -typedef -int (WINAPI *PWLX_DIALOG_BOX)( - HANDLE hWlx, - HANDLE hInst, - LPWSTR lpszTemplate, - HWND hwndOwner, - DLGPROC dlgprc); - -typedef -int (WINAPI *PWLX_DIALOG_BOX_INDIRECT)( - HANDLE hWlx, - HANDLE hInst, - LPCDLGTEMPLATE hDialogTemplate, - HWND hwndOwner, - DLGPROC dlgprc); - -typedef -int (WINAPI *PWLX_DIALOG_BOX_INDIRECT_PARAM)( - HANDLE hWlx, - HANDLE hInst, - LPCDLGTEMPLATE hDialogTemplate, - HWND hwndOwner, - DLGPROC dlgprc, - LPARAM dwInitParam); - -typedef -int (WINAPI *PWLX_DIALOG_BOX_PARAM)( - HANDLE hWlx, - HANDLE hInst, - LPWSTR lpszTemplate, - HWND hwndOwner, - DLGPROC dlgprc, - LPARAM dwInitParam); - -typedef -BOOL (WINAPI *PWLX_DISCONNECT)(); + _In_ HANDLE hWlx, + _In_ HANDLE hToken, + _In_ DWORD Flags, + _In_ PWSTR pszDesktopName, + _Out_ PWLX_DESKTOP *ppDesktop); + +typedef +INT (WINAPI *PWLX_DIALOG_BOX)( + _In_ HANDLE hWlx, + _In_ HANDLE hInst, + _In_ LPWSTR lpszTemplate, + _In_ HWND hwndOwner, + _In_ DLGPROC dlgprc); + +typedef +INT (WINAPI *PWLX_DIALOG_BOX_INDIRECT)( + _In_ HANDLE hWlx, + _In_ HANDLE hInst, + _In_ LPCDLGTEMPLATE hDialogTemplate, + _In_ HWND hwndOwner, + _In_ DLGPROC dlgprc); + +typedef +INT (WINAPI *PWLX_DIALOG_BOX_INDIRECT_PARAM)( + _In_ HANDLE hWlx, + _In_ HANDLE hInst, + _In_ LPCDLGTEMPLATE hDialogTemplate, + _In_ HWND hwndOwner, + _In_ DLGPROC dlgprc, + _In_ LPARAM dwInitParam); + +typedef +INT (WINAPI *PWLX_DIALOG_BOX_PARAM)( + _In_ HANDLE hWlx, + _In_ HANDLE hInst, + _In_ LPWSTR lpszTemplate, + _In_ HWND hwndOwner, + _In_ DLGPROC dlgprc, + _In_ LPARAM dwInitParam); + +typedef +BOOL (WINAPI *PWLX_DISCONNECT)(VOID); typedef BOOL (WINAPI *PWLX_GET_OPTION)( - HANDLE hWlx, - DWORD Option, - ULONG_PTR *Value); + _In_ HANDLE hWlx, + _In_ DWORD Option, + _Out_ ULONG_PTR *Value); typedef BOOL (WINAPI *PWLX_GET_SOURCE_DESKTOP)( - HANDLE hWlx, - PWLX_DESKTOP *ppDesktop); - -typedef -int (WINAPI *PWLX_MESSAGE_BOX)( - HANDLE hWlx, - HWND hwndOwner, - LPWSTR lpszText, - LPWSTR lpszTitle, - UINT fuStyle); + _In_ HANDLE hWlx, + _Out_ PWLX_DESKTOP *ppDesktop); + +typedef +INT (WINAPI *PWLX_MESSAGE_BOX)( + _In_ HANDLE hWlx, + _In_ HWND hwndOwner, + _In_ LPWSTR lpszText, + _In_ LPWSTR lpszTitle, + _In_ UINT fuStyle); typedef BOOL (WINAPI *PWLX_QUERY_CLIENT_CREDENTIALS)( - PWLX_CLIENT_CREDENTIALS_INFO_V1_0 pCred); + _Out_ PWLX_CLIENT_CREDENTIALS_INFO_V1_0 pCred); typedef DWORD (WINAPI *PWLX_QUERY_CONSOLESWITCH_CREDENTIALS)( - PWLX_CONSOLESWITCH_CREDENTIALS_INFO_V1_0 pCred); + _Out_ PWLX_CONSOLESWITCH_CREDENTIALS_INFO_V1_0 pCred); typedef BOOL (WINAPI *PWLX_QUERY_IC_CREDENTIALS)( - PWLX_CLIENT_CREDENTIALS_INFO_V1_0 pCred); + _Out_ PWLX_CLIENT_CREDENTIALS_INFO_V1_0 pCred); typedef DWORD (WINAPI *PWLX_QUERY_TERMINAL_SERVICES_DATA)( - HANDLE hWlx, - PWLX_TERMINAL_SERVICES_DATA pTSData, - WCHAR *UserName, - WCHAR *Domain); + _In_ HANDLE hWlx, + _Out_ PWLX_TERMINAL_SERVICES_DATA pTSData, + _In_ WCHAR *UserName, + _In_ WCHAR *Domain); typedef BOOL (WINAPI *PWLX_QUERY_TS_LOGON_CREDENTIALS)( - PWLX_CLIENT_CREDENTIALS_INFO_V2_0 pCred); + _Out_ PWLX_CLIENT_CREDENTIALS_INFO_V2_0 pCred); typedef VOID (WINAPI *PWLX_SAS_NOTIFY)( - HANDLE hWlx, - DWORD dwSasType); + _In_ HANDLE hWlx, + _In_ DWORD dwSasType); typedef VOID (WINAPI *PWLX_SET_CONTEXT_POINTER)( - HANDLE hWlx, - PVOID pWlxContext); + _In_ HANDLE hWlx, + _In_ PVOID pWlxContext); + +typedef +BOOL (WINAPI *PWLX_SET_OPTION)( + _In_ HANDLE hWlx, + _In_ DWORD Option, + _In_ ULONG_PTR Value, + _Out_ ULONG_PTR *OldValue); typedef BOOL (WINAPI *PWLX_SET_RETURN_DESKTOP)( - HANDLE hWlx, - PWLX_DESKTOP pDesktop); - -typedef -BOOL (WINAPI *PWLX_SET_OPTION)( - HANDLE hWlx, - DWORD Option, - ULONG_PTR Value, - ULONG_PTR *OldValue); + _In_ HANDLE hWlx, + _In_ PWLX_DESKTOP pDesktop); typedef BOOL (WINAPI *PWLX_SET_TIMEOUT)( - HANDLE hWlx, - DWORD Timeout); - -typedef -int (WINAPI *PWLX_SWITCH_DESKTOP_TO_USER)( - HANDLE hWlx); - -typedef -int (WINAPI *PWLX_SWITCH_DESKTOP_TO_WINLOGON)( - HANDLE hWlx); + _In_ HANDLE hWlx, + _In_ DWORD Timeout); + +typedef +INT (WINAPI *PWLX_SWITCH_DESKTOP_TO_USER)( + _In_ HANDLE hWlx); + +typedef +INT (WINAPI *PWLX_SWITCH_DESKTOP_TO_WINLOGON)( + _In_ HANDLE hWlx); typedef VOID (WINAPI *PWLX_USE_CTRL_ALT_DEL)( - HANDLE hWlx); + _In_ HANDLE hWlx); typedef VOID (WINAPI *PWLX_WIN31_MIGRATE)( - HANDLE hWlx); - - -/* function dispatch tables */ + _In_ HANDLE hWlx); + + +/* Function dispatch tables */ typedef struct _WLX_DISPATCH_VERSION_1_0 { - PWLX_USE_CTRL_ALT_DEL WlxUseCtrlAltDel; - PWLX_SET_CONTEXT_POINTER WlxSetContextPointer; - PWLX_SAS_NOTIFY WlxSasNotify; - PWLX_SET_TIMEOUT WlxSetTimeout; - PWLX_ASSIGN_SHELL_PROTECTION WlxAssignShellProtection; - PWLX_MESSAGE_BOX WlxMessageBox; - PWLX_DIALOG_BOX WlxDialogBox; - PWLX_DIALOG_BOX_PARAM WlxDialogBoxParam; - PWLX_DIALOG_BOX_INDIRECT WlxDialogBoxIndirect; - PWLX_DIALOG_BOX_INDIRECT_PARAM WlxDialogBoxIndirectParam; - PWLX_SWITCH_DESKTOP_TO_USER WlxSwitchDesktopToUser; - PWLX_SWITCH_DESKTOP_TO_WINLOGON WlxSwitchDesktopToWinlogon; - PWLX_CHANGE_PASSWORD_NOTIFY WlxChangePasswordNotify; + PWLX_USE_CTRL_ALT_DEL WlxUseCtrlAltDel; + PWLX_SET_CONTEXT_POINTER WlxSetContextPointer; + PWLX_SAS_NOTIFY WlxSasNotify; + PWLX_SET_TIMEOUT WlxSetTimeout; + PWLX_ASSIGN_SHELL_PROTECTION WlxAssignShellProtection; + PWLX_MESSAGE_BOX WlxMessageBox; + PWLX_DIALOG_BOX WlxDialogBox; + PWLX_DIALOG_BOX_PARAM WlxDialogBoxParam; + PWLX_DIALOG_BOX_INDIRECT WlxDialogBoxIndirect; + PWLX_DIALOG_BOX_INDIRECT_PARAM WlxDialogBoxIndirectParam; + PWLX_SWITCH_DESKTOP_TO_USER WlxSwitchDesktopToUser; + PWLX_SWITCH_DESKTOP_TO_WINLOGON WlxSwitchDesktopToWinlogon; + PWLX_CHANGE_PASSWORD_NOTIFY WlxChangePasswordNotify; } WLX_DISPATCH_VERSION_1_0, *PWLX_DISPATCH_VERSION_1_0; typedef struct _WLX_DISPATCH_VERSION_1_1 { - PWLX_USE_CTRL_ALT_DEL WlxUseCtrlAltDel; - PWLX_SET_CONTEXT_POINTER WlxSetContextPointer; - PWLX_SAS_NOTIFY WlxSasNotify; - PWLX_SET_TIMEOUT WlxSetTimeout; - PWLX_ASSIGN_SHELL_PROTECTION WlxAssignShellProtection; - PWLX_MESSAGE_BOX WlxMessageBox; - PWLX_DIALOG_BOX WlxDialogBox; - PWLX_DIALOG_BOX_PARAM WlxDialogBoxParam; - PWLX_DIALOG_BOX_INDIRECT WlxDialogBoxIndirect; - PWLX_DIALOG_BOX_INDIRECT_PARAM WlxDialogBoxIndirectParam; - PWLX_SWITCH_DESKTOP_TO_USER WlxSwitchDesktopToUser; - PWLX_SWITCH_DESKTOP_TO_WINLOGON WlxSwitchDesktopToWinlogon; - PWLX_CHANGE_PASSWORD_NOTIFY WlxChangePasswordNotify; - PWLX_GET_SOURCE_DESKTOP WlxGetSourceDesktop; - PWLX_SET_RETURN_DESKTOP WlxSetReturnDesktop; - PWLX_CREATE_USER_DESKTOP WlxCreateUserDesktop; - PWLX_CHANGE_PASSWORD_NOTIFY_EX WlxChangePasswordNotifyEx; + PWLX_USE_CTRL_ALT_DEL WlxUseCtrlAltDel; + PWLX_SET_CONTEXT_POINTER WlxSetContextPointer; + PWLX_SAS_NOTIFY WlxSasNotify; + PWLX_SET_TIMEOUT WlxSetTimeout; + PWLX_ASSIGN_SHELL_PROTECTION WlxAssignShellProtection; + PWLX_MESSAGE_BOX WlxMessageBox; + PWLX_DIALOG_BOX WlxDialogBox; + PWLX_DIALOG_BOX_PARAM WlxDialogBoxParam; + PWLX_DIALOG_BOX_INDIRECT WlxDialogBoxIndirect; + PWLX_DIALOG_BOX_INDIRECT_PARAM WlxDialogBoxIndirectParam; + PWLX_SWITCH_DESKTOP_TO_USER WlxSwitchDesktopToUser; + PWLX_SWITCH_DESKTOP_TO_WINLOGON WlxSwitchDesktopToWinlogon; + PWLX_CHANGE_PASSWORD_NOTIFY WlxChangePasswordNotify; + PWLX_GET_SOURCE_DESKTOP WlxGetSourceDesktop; + PWLX_SET_RETURN_DESKTOP WlxSetReturnDesktop; + PWLX_CREATE_USER_DESKTOP WlxCreateUserDesktop; + PWLX_CHANGE_PASSWORD_NOTIFY_EX WlxChangePasswordNotifyEx; } WLX_DISPATCH_VERSION_1_1, *PWLX_DISPATCH_VERSION_1_1; typedef struct _WLX_DISPATCH_VERSION_1_2 { - PWLX_USE_CTRL_ALT_DEL WlxUseCtrlAltDel; - PWLX_SET_CONTEXT_POINTER WlxSetContextPointer; - PWLX_SAS_NOTIFY WlxSasNotify; - PWLX_SET_TIMEOUT WlxSetTimeout; - PWLX_ASSIGN_SHELL_PROTECTION WlxAssignShellProtection; - PWLX_MESSAGE_BOX WlxMessageBox; - PWLX_DIALOG_BOX WlxDialogBox; - PWLX_DIALOG_BOX_PARAM WlxDialogBoxParam; - PWLX_DIALOG_BOX_INDIRECT WlxDialogBoxIndirect; - PWLX_DIALOG_BOX_INDIRECT_PARAM WlxDialogBoxIndirectParam; - PWLX_SWITCH_DESKTOP_TO_USER WlxSwitchDesktopToUser; - PWLX_SWITCH_DESKTOP_TO_WINLOGON WlxSwitchDesktopToWinlogon; - PWLX_CHANGE_PASSWORD_NOTIFY WlxChangePasswordNotify; - PWLX_GET_SOURCE_DESKTOP WlxGetSourceDesktop; - PWLX_SET_RETURN_DESKTOP WlxSetReturnDesktop; - PWLX_CREATE_USER_DESKTOP WlxCreateUserDesktop; - PWLX_CHANGE_PASSWORD_NOTIFY_EX WlxChangePasswordNotifyEx; - PWLX_CLOSE_USER_DESKTOP WlxCloseUserDesktop ; + PWLX_USE_CTRL_ALT_DEL WlxUseCtrlAltDel; + PWLX_SET_CONTEXT_POINTER WlxSetContextPointer; + PWLX_SAS_NOTIFY WlxSasNotify; + PWLX_SET_TIMEOUT WlxSetTimeout; + PWLX_ASSIGN_SHELL_PROTECTION WlxAssignShellProtection; + PWLX_MESSAGE_BOX WlxMessageBox; + PWLX_DIALOG_BOX WlxDialogBox; + PWLX_DIALOG_BOX_PARAM WlxDialogBoxParam; + PWLX_DIALOG_BOX_INDIRECT WlxDialogBoxIndirect; + PWLX_DIALOG_BOX_INDIRECT_PARAM WlxDialogBoxIndirectParam; + PWLX_SWITCH_DESKTOP_TO_USER WlxSwitchDesktopToUser; + PWLX_SWITCH_DESKTOP_TO_WINLOGON WlxSwitchDesktopToWinlogon; + PWLX_CHANGE_PASSWORD_NOTIFY WlxChangePasswordNotify; + PWLX_GET_SOURCE_DESKTOP WlxGetSourceDesktop; + PWLX_SET_RETURN_DESKTOP WlxSetReturnDesktop; + PWLX_CREATE_USER_DESKTOP WlxCreateUserDesktop; + PWLX_CHANGE_PASSWORD_NOTIFY_EX WlxChangePasswordNotifyEx; + PWLX_CLOSE_USER_DESKTOP WlxCloseUserDesktop; } WLX_DISPATCH_VERSION_1_2, *PWLX_DISPATCH_VERSION_1_2; typedef struct _WLX_DISPATCH_VERSION_1_3 { - PWLX_USE_CTRL_ALT_DEL WlxUseCtrlAltDel; - PWLX_SET_CONTEXT_POINTER WlxSetContextPointer; - PWLX_SAS_NOTIFY WlxSasNotify; - PWLX_SET_TIMEOUT WlxSetTimeout; - PWLX_ASSIGN_SHELL_PROTECTION WlxAssignShellProtection; - PWLX_MESSAGE_BOX WlxMessageBox; - PWLX_DIALOG_BOX WlxDialogBox; - PWLX_DIALOG_BOX_PARAM WlxDialogBoxParam; - PWLX_DIALOG_BOX_INDIRECT WlxDialogBoxIndirect; - PWLX_DIALOG_BOX_INDIRECT_PARAM WlxDialogBoxIndirectParam; - PWLX_SWITCH_DESKTOP_TO_USER WlxSwitchDesktopToUser; - PWLX_SWITCH_DESKTOP_TO_WINLOGON WlxSwitchDesktopToWinlogon; - PWLX_CHANGE_PASSWORD_NOTIFY WlxChangePasswordNotify; - PWLX_GET_SOURCE_DESKTOP WlxGetSourceDesktop; - PWLX_SET_RETURN_DESKTOP WlxSetReturnDesktop; - PWLX_CREATE_USER_DESKTOP WlxCreateUserDesktop; - PWLX_CHANGE_PASSWORD_NOTIFY_EX WlxChangePasswordNotifyEx; - PWLX_CLOSE_USER_DESKTOP WlxCloseUserDesktop ; - PWLX_SET_OPTION WlxSetOption; - PWLX_GET_OPTION WlxGetOption; - PWLX_WIN31_MIGRATE WlxWin31Migrate; - PWLX_QUERY_CLIENT_CREDENTIALS WlxQueryClientCredentials; - PWLX_QUERY_IC_CREDENTIALS WlxQueryInetConnectorCredentials; - PWLX_DISCONNECT WlxDisconnect; - PWLX_QUERY_TERMINAL_SERVICES_DATA WlxQueryTerminalServicesData; + PWLX_USE_CTRL_ALT_DEL WlxUseCtrlAltDel; + PWLX_SET_CONTEXT_POINTER WlxSetContextPointer; + PWLX_SAS_NOTIFY WlxSasNotify; + PWLX_SET_TIMEOUT WlxSetTimeout; + PWLX_ASSIGN_SHELL_PROTECTION WlxAssignShellProtection; + PWLX_MESSAGE_BOX WlxMessageBox; + PWLX_DIALOG_BOX WlxDialogBox; + PWLX_DIALOG_BOX_PARAM WlxDialogBoxParam; + PWLX_DIALOG_BOX_INDIRECT WlxDialogBoxIndirect; + PWLX_DIALOG_BOX_INDIRECT_PARAM WlxDialogBoxIndirectParam; + PWLX_SWITCH_DESKTOP_TO_USER WlxSwitchDesktopToUser; + PWLX_SWITCH_DESKTOP_TO_WINLOGON WlxSwitchDesktopToWinlogon; + PWLX_CHANGE_PASSWORD_NOTIFY WlxChangePasswordNotify; + PWLX_GET_SOURCE_DESKTOP WlxGetSourceDesktop; + PWLX_SET_RETURN_DESKTOP WlxSetReturnDesktop; + PWLX_CREATE_USER_DESKTOP WlxCreateUserDesktop; + PWLX_CHANGE_PASSWORD_NOTIFY_EX WlxChangePasswordNotifyEx; + PWLX_CLOSE_USER_DESKTOP WlxCloseUserDesktop; + PWLX_SET_OPTION WlxSetOption; + PWLX_GET_OPTION WlxGetOption; + PWLX_WIN31_MIGRATE WlxWin31Migrate; + PWLX_QUERY_CLIENT_CREDENTIALS WlxQueryClientCredentials; + PWLX_QUERY_IC_CREDENTIALS WlxQueryInetConnectorCredentials; + PWLX_DISCONNECT WlxDisconnect; + PWLX_QUERY_TERMINAL_SERVICES_DATA WlxQueryTerminalServicesData; } WLX_DISPATCH_VERSION_1_3, *PWLX_DISPATCH_VERSION_1_3; typedef struct _WLX_DISPATCH_VERSION_1_4 { - PWLX_USE_CTRL_ALT_DEL WlxUseCtrlAltDel; - PWLX_SET_CONTEXT_POINTER WlxSetContextPointer; - PWLX_SAS_NOTIFY WlxSasNotify; - PWLX_SET_TIMEOUT WlxSetTimeout; - PWLX_ASSIGN_SHELL_PROTECTION WlxAssignShellProtection; - PWLX_MESSAGE_BOX WlxMessageBox; - PWLX_DIALOG_BOX WlxDialogBox; - PWLX_DIALOG_BOX_PARAM WlxDialogBoxParam; - PWLX_DIALOG_BOX_INDIRECT WlxDialogBoxIndirect; - PWLX_DIALOG_BOX_INDIRECT_PARAM WlxDialogBoxIndirectParam; - PWLX_SWITCH_DESKTOP_TO_USER WlxSwitchDesktopToUser; - PWLX_SWITCH_DESKTOP_TO_WINLOGON WlxSwitchDesktopToWinlogon; - PWLX_CHANGE_PASSWORD_NOTIFY WlxChangePasswordNotify; - PWLX_GET_SOURCE_DESKTOP WlxGetSourceDesktop; - PWLX_SET_RETURN_DESKTOP WlxSetReturnDesktop; - PWLX_CREATE_USER_DESKTOP WlxCreateUserDesktop; - PWLX_CHANGE_PASSWORD_NOTIFY_EX WlxChangePasswordNotifyEx; - PWLX_CLOSE_USER_DESKTOP WlxCloseUserDesktop ; - PWLX_SET_OPTION WlxSetOption; - PWLX_GET_OPTION WlxGetOption; - PWLX_WIN31_MIGRATE WlxWin31Migrate; - PWLX_QUERY_CLIENT_CREDENTIALS WlxQueryClientCredentials; - PWLX_QUERY_IC_CREDENTIALS WlxQueryInetConnectorCredentials; - PWLX_DISCONNECT WlxDisconnect; - PWLX_QUERY_TERMINAL_SERVICES_DATA WlxQueryTerminalServicesData; - PWLX_QUERY_CONSOLESWITCH_CREDENTIALS WlxQueryConsoleSwitchCredentials; - PWLX_QUERY_TS_LOGON_CREDENTIALS WlxQueryTsLogonCredentials; + PWLX_USE_CTRL_ALT_DEL WlxUseCtrlAltDel; + PWLX_SET_CONTEXT_POINTER WlxSetContextPointer; + PWLX_SAS_NOTIFY WlxSasNotify; + PWLX_SET_TIMEOUT WlxSetTimeout; + PWLX_ASSIGN_SHELL_PROTECTION WlxAssignShellProtection; + PWLX_MESSAGE_BOX WlxMessageBox; + PWLX_DIALOG_BOX WlxDialogBox; + PWLX_DIALOG_BOX_PARAM WlxDialogBoxParam; + PWLX_DIALOG_BOX_INDIRECT WlxDialogBoxIndirect; + PWLX_DIALOG_BOX_INDIRECT_PARAM WlxDialogBoxIndirectParam; + PWLX_SWITCH_DESKTOP_TO_USER WlxSwitchDesktopToUser; + PWLX_SWITCH_DESKTOP_TO_WINLOGON WlxSwitchDesktopToWinlogon; + PWLX_CHANGE_PASSWORD_NOTIFY WlxChangePasswordNotify; + PWLX_GET_SOURCE_DESKTOP WlxGetSourceDesktop; + PWLX_SET_RETURN_DESKTOP WlxSetReturnDesktop; + PWLX_CREATE_USER_DESKTOP WlxCreateUserDesktop; + PWLX_CHANGE_PASSWORD_NOTIFY_EX WlxChangePasswordNotifyEx; + PWLX_CLOSE_USER_DESKTOP WlxCloseUserDesktop; + PWLX_SET_OPTION WlxSetOption; + PWLX_GET_OPTION WlxGetOption; + PWLX_WIN31_MIGRATE WlxWin31Migrate; + PWLX_QUERY_CLIENT_CREDENTIALS WlxQueryClientCredentials; + PWLX_QUERY_IC_CREDENTIALS WlxQueryInetConnectorCredentials; + PWLX_DISCONNECT WlxDisconnect; + PWLX_QUERY_TERMINAL_SERVICES_DATA WlxQueryTerminalServicesData; + PWLX_QUERY_CONSOLESWITCH_CREDENTIALS WlxQueryConsoleSwitchCredentials; + PWLX_QUERY_TS_LOGON_CREDENTIALS WlxQueryTsLogonCredentials; } WLX_DISPATCH_VERSION_1_4, *PWLX_DISPATCH_VERSION_1_4; -/* non-GINA notification DLLs*/ +/* Non-GINA notification DLLs */ typedef DWORD (CALLBACK *PFNMSGECALLBACK)( - BOOL bVerbose, - LPWSTR lpMessage); + _In_ BOOL bVerbose, + _In_ LPWSTR lpMessage); typedef struct _WLX_NOTIFICATION_INFO { - ULONG Size; - ULONG Flags; - PWSTR UserName; - PWSTR Domain; - PWSTR WindowStation; - HANDLE hToken; - HDESK hDesktop; - PFNMSGECALLBACK pStatusCallback; + ULONG Size; + ULONG Flags; + PWSTR UserName; + PWSTR Domain; + PWSTR WindowStation; + HANDLE hToken; + HDESK hDesktop; + PFNMSGECALLBACK pStatusCallback; } WLX_NOTIFICATION_INFO, *PWLX_NOTIFICATION_INFO;

1 0

[dchapyshev] 72740: [KERNEL32] Sync other functions with Wine 1.9.17 * Fixes 1 test for kernel32:locale
by dchapyshev＠svn.reactos.org 19 Sep '16

19 Sep '16

Author: dchapyshev Date: Mon Sep 19 11:28:20 2016 New Revision: 72740 URL: http://svn.reactos.org/svn/reactos?rev=72740&view=rev Log: [KERNEL32] Sync other functions with Wine 1.9.17 * Fixes 1 test for kernel32:locale Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] Mon Sep 19 11:28:20 2016 @@ -141,6 +141,100 @@ static LCID lcid_LC_PAPER; static LCID lcid_LC_MEASUREMENT; static LCID lcid_LC_TELEPHONE; + +static const WCHAR iCalendarTypeW[] = {'i','C','a','l','e','n','d','a','r','T','y','p','e',0}; +static const WCHAR iCountryW[] = {'i','C','o','u','n','t','r','y',0}; +static const WCHAR iCurrDigitsW[] = {'i','C','u','r','r','D','i','g','i','t','s',0}; +static const WCHAR iCurrencyW[] = {'i','C','u','r','r','e','n','c','y',0}; +static const WCHAR iDateW[] = {'i','D','a','t','e',0}; +static const WCHAR iDigitsW[] = {'i','D','i','g','i','t','s',0}; +static const WCHAR iFirstDayOfWeekW[] = {'i','F','i','r','s','t','D','a','y','O','f','W','e','e','k',0}; +static const WCHAR iFirstWeekOfYearW[] = {'i','F','i','r','s','t','W','e','e','k','O','f','Y','e','a','r',0}; +static const WCHAR iLDateW[] = {'i','L','D','a','t','e',0}; +static const WCHAR iLZeroW[] = {'i','L','Z','e','r','o',0}; +static const WCHAR iMeasureW[] = {'i','M','e','a','s','u','r','e',0}; +static const WCHAR iNegCurrW[] = {'i','N','e','g','C','u','r','r',0}; +static const WCHAR iNegNumberW[] = {'i','N','e','g','N','u','m','b','e','r',0}; +static const WCHAR iPaperSizeW[] = {'i','P','a','p','e','r','S','i','z','e',0}; +static const WCHAR iTLZeroW[] = {'i','T','L','Z','e','r','o',0}; +static const WCHAR iTimePrefixW[] = {'i','T','i','m','e','P','r','e','f','i','x',0}; +static const WCHAR iTimeW[] = {'i','T','i','m','e',0}; +static const WCHAR s1159W[] = {'s','1','1','5','9',0}; +static const WCHAR s2359W[] = {'s','2','3','5','9',0}; +static const WCHAR sCountryW[] = {'s','C','o','u','n','t','r','y',0}; +static const WCHAR sCurrencyW[] = {'s','C','u','r','r','e','n','c','y',0}; +static const WCHAR sDateW[] = {'s','D','a','t','e',0}; +static const WCHAR sDecimalW[] = {'s','D','e','c','i','m','a','l',0}; +static const WCHAR sGroupingW[] = {'s','G','r','o','u','p','i','n','g',0}; +static const WCHAR sLanguageW[] = {'s','L','a','n','g','u','a','g','e',0}; +static const WCHAR sListW[] = {'s','L','i','s','t',0}; +static const WCHAR sLongDateW[] = {'s','L','o','n','g','D','a','t','e',0}; +static const WCHAR sMonDecimalSepW[] = {'s','M','o','n','D','e','c','i','m','a','l','S','e','p',0}; +static const WCHAR sMonGroupingW[] = {'s','M','o','n','G','r','o','u','p','i','n','g',0}; +static const WCHAR sMonThousandSepW[] = {'s','M','o','n','T','h','o','u','s','a','n','d','S','e','p',0}; +static const WCHAR sNativeDigitsW[] = {'s','N','a','t','i','v','e','D','i','g','i','t','s',0}; +static const WCHAR sNegativeSignW[] = {'s','N','e','g','a','t','i','v','e','S','i','g','n',0}; +static const WCHAR sPositiveSignW[] = {'s','P','o','s','i','t','i','v','e','S','i','g','n',0}; +static const WCHAR sShortDateW[] = {'s','S','h','o','r','t','D','a','t','e',0}; +static const WCHAR sThousandW[] = {'s','T','h','o','u','s','a','n','d',0}; +static const WCHAR sTimeFormatW[] = {'s','T','i','m','e','F','o','r','m','a','t',0}; +static const WCHAR sTimeW[] = {'s','T','i','m','e',0}; +static const WCHAR sYearMonthW[] = {'s','Y','e','a','r','M','o','n','t','h',0}; +static const WCHAR NumShapeW[] = {'N','u','m','s','h','a','p','e',0}; + +static struct registry_value +{ + DWORD lctype; + const WCHAR *name; + WCHAR *cached_value; +} registry_values[] = +{ + { LOCALE_ICALENDARTYPE, iCalendarTypeW }, + { LOCALE_ICURRDIGITS, iCurrDigitsW }, + { LOCALE_ICURRENCY, iCurrencyW }, + { LOCALE_IDIGITS, iDigitsW }, + { LOCALE_IFIRSTDAYOFWEEK, iFirstDayOfWeekW }, + { LOCALE_IFIRSTWEEKOFYEAR, iFirstWeekOfYearW }, + { LOCALE_ILZERO, iLZeroW }, + { LOCALE_IMEASURE, iMeasureW }, + { LOCALE_INEGCURR, iNegCurrW }, + { LOCALE_INEGNUMBER, iNegNumberW }, + { LOCALE_IPAPERSIZE, iPaperSizeW }, + { LOCALE_ITIME, iTimeW }, + { LOCALE_S1159, s1159W }, + { LOCALE_S2359, s2359W }, + { LOCALE_SCURRENCY, sCurrencyW }, + { LOCALE_SDATE, sDateW }, + { LOCALE_SDECIMAL, sDecimalW }, + { LOCALE_SGROUPING, sGroupingW }, + { LOCALE_SLIST, sListW }, + { LOCALE_SLONGDATE, sLongDateW }, + { LOCALE_SMONDECIMALSEP, sMonDecimalSepW }, + { LOCALE_SMONGROUPING, sMonGroupingW }, + { LOCALE_SMONTHOUSANDSEP, sMonThousandSepW }, + { LOCALE_SNEGATIVESIGN, sNegativeSignW }, + { LOCALE_SPOSITIVESIGN, sPositiveSignW }, + { LOCALE_SSHORTDATE, sShortDateW }, + { LOCALE_STHOUSAND, sThousandW }, + { LOCALE_STIME, sTimeW }, + { LOCALE_STIMEFORMAT, sTimeFormatW }, + { LOCALE_SYEARMONTH, sYearMonthW }, + /* The following are not listed under MSDN as supported, + * but seem to be used and also stored in the registry. + */ + { LOCALE_ICOUNTRY, iCountryW }, + { LOCALE_IDATE, iDateW }, + { LOCALE_ILDATE, iLDateW }, + { LOCALE_ITLZERO, iTLZeroW }, + { LOCALE_SCOUNTRY, sCountryW }, + { LOCALE_SABBREVLANGNAME, sLanguageW }, + /* The following are used in XP and later */ + { LOCALE_IDIGITSUBSTITUTION, NumShapeW }, + { LOCALE_SNATIVEDIGITS, sNativeDigitsW }, + { LOCALE_ITIMEMARKPOSN, iTimePrefixW } +}; + +static RTL_CRITICAL_SECTION cache_section = { NULL, -1, 0, 0, 0, 0 }; #ifndef __REACTOS__ /* Copy Ascii string to Unicode without using codepages */ @@ -491,107 +585,6 @@ return lang; } -/****************************************************************************** - * get_locale_value_name - * - * Gets the registry value name for a given lctype. - */ -static const WCHAR *get_locale_value_name( DWORD lctype ) -{ - static const WCHAR iCalendarTypeW[] = {'i','C','a','l','e','n','d','a','r','T','y','p','e',0}; - static const WCHAR iCountryW[] = {'i','C','o','u','n','t','r','y',0}; - static const WCHAR iCurrDigitsW[] = {'i','C','u','r','r','D','i','g','i','t','s',0}; - static const WCHAR iCurrencyW[] = {'i','C','u','r','r','e','n','c','y',0}; - static const WCHAR iDateW[] = {'i','D','a','t','e',0}; - static const WCHAR iDigitsW[] = {'i','D','i','g','i','t','s',0}; - static const WCHAR iFirstDayOfWeekW[] = {'i','F','i','r','s','t','D','a','y','O','f','W','e','e','k',0}; - static const WCHAR iFirstWeekOfYearW[] = {'i','F','i','r','s','t','W','e','e','k','O','f','Y','e','a','r',0}; - static const WCHAR iLDateW[] = {'i','L','D','a','t','e',0}; - static const WCHAR iLZeroW[] = {'i','L','Z','e','r','o',0}; - static const WCHAR iMeasureW[] = {'i','M','e','a','s','u','r','e',0}; - static const WCHAR iNegCurrW[] = {'i','N','e','g','C','u','r','r',0}; - static const WCHAR iNegNumberW[] = {'i','N','e','g','N','u','m','b','e','r',0}; - static const WCHAR iPaperSizeW[] = {'i','P','a','p','e','r','S','i','z','e',0}; - static const WCHAR iTLZeroW[] = {'i','T','L','Z','e','r','o',0}; - static const WCHAR iTimePrefixW[] = {'i','T','i','m','e','P','r','e','f','i','x',0}; - static const WCHAR iTimeW[] = {'i','T','i','m','e',0}; - static const WCHAR s1159W[] = {'s','1','1','5','9',0}; - static const WCHAR s2359W[] = {'s','2','3','5','9',0}; - static const WCHAR sCountryW[] = {'s','C','o','u','n','t','r','y',0}; - static const WCHAR sCurrencyW[] = {'s','C','u','r','r','e','n','c','y',0}; - static const WCHAR sDateW[] = {'s','D','a','t','e',0}; - static const WCHAR sDecimalW[] = {'s','D','e','c','i','m','a','l',0}; - static const WCHAR sGroupingW[] = {'s','G','r','o','u','p','i','n','g',0}; - static const WCHAR sLanguageW[] = {'s','L','a','n','g','u','a','g','e',0}; - static const WCHAR sListW[] = {'s','L','i','s','t',0}; - static const WCHAR sLongDateW[] = {'s','L','o','n','g','D','a','t','e',0}; - static const WCHAR sMonDecimalSepW[] = {'s','M','o','n','D','e','c','i','m','a','l','S','e','p',0}; - static const WCHAR sMonGroupingW[] = {'s','M','o','n','G','r','o','u','p','i','n','g',0}; - static const WCHAR sMonThousandSepW[] = {'s','M','o','n','T','h','o','u','s','a','n','d','S','e','p',0}; - static const WCHAR sNativeDigitsW[] = {'s','N','a','t','i','v','e','D','i','g','i','t','s',0}; - static const WCHAR sNegativeSignW[] = {'s','N','e','g','a','t','i','v','e','S','i','g','n',0}; - static const WCHAR sPositiveSignW[] = {'s','P','o','s','i','t','i','v','e','S','i','g','n',0}; - static const WCHAR sShortDateW[] = {'s','S','h','o','r','t','D','a','t','e',0}; - static const WCHAR sThousandW[] = {'s','T','h','o','u','s','a','n','d',0}; - static const WCHAR sTimeFormatW[] = {'s','T','i','m','e','F','o','r','m','a','t',0}; - static const WCHAR sTimeW[] = {'s','T','i','m','e',0}; - static const WCHAR sYearMonthW[] = {'s','Y','e','a','r','M','o','n','t','h',0}; - static const WCHAR NumShapeW[] = {'N','u','m','s','h','a','p','e',0}; - - switch (lctype) - { - /* These values are used by SetLocaleInfo and GetLocaleInfo, and - * the values are stored in the registry, confirmed under Windows. - */ - case LOCALE_ICALENDARTYPE: return iCalendarTypeW; - case LOCALE_ICURRDIGITS: return iCurrDigitsW; - case LOCALE_ICURRENCY: return iCurrencyW; - case LOCALE_IDIGITS: return iDigitsW; - case LOCALE_IFIRSTDAYOFWEEK: return iFirstDayOfWeekW; - case LOCALE_IFIRSTWEEKOFYEAR: return iFirstWeekOfYearW; - case LOCALE_ILZERO: return iLZeroW; - case LOCALE_IMEASURE: return iMeasureW; - case LOCALE_INEGCURR: return iNegCurrW; - case LOCALE_INEGNUMBER: return iNegNumberW; - case LOCALE_IPAPERSIZE: return iPaperSizeW; - case LOCALE_ITIME: return iTimeW; - case LOCALE_S1159: return s1159W; - case LOCALE_S2359: return s2359W; - case LOCALE_SCURRENCY: return sCurrencyW; - case LOCALE_SDATE: return sDateW; - case LOCALE_SDECIMAL: return sDecimalW; - case LOCALE_SGROUPING: return sGroupingW; - case LOCALE_SLIST: return sListW; - case LOCALE_SLONGDATE: return sLongDateW; - case LOCALE_SMONDECIMALSEP: return sMonDecimalSepW; - case LOCALE_SMONGROUPING: return sMonGroupingW; - case LOCALE_SMONTHOUSANDSEP: return sMonThousandSepW; - case LOCALE_SNEGATIVESIGN: return sNegativeSignW; - case LOCALE_SPOSITIVESIGN: return sPositiveSignW; - case LOCALE_SSHORTDATE: return sShortDateW; - case LOCALE_STHOUSAND: return sThousandW; - case LOCALE_STIME: return sTimeW; - case LOCALE_STIMEFORMAT: return sTimeFormatW; - case LOCALE_SYEARMONTH: return sYearMonthW; - - /* The following are not listed under MSDN as supported, - * but seem to be used and also stored in the registry. - */ - case LOCALE_ICOUNTRY: return iCountryW; - case LOCALE_IDATE: return iDateW; - case LOCALE_ILDATE: return iLDateW; - case LOCALE_ITLZERO: return iTLZeroW; - case LOCALE_SCOUNTRY: return sCountryW; - case LOCALE_SABBREVLANGNAME: return sLanguageW; - - /* The following are used in XP and later */ - case LOCALE_IDIGITSUBSTITUTION: return NumShapeW; - case LOCALE_SNATIVEDIGITS: return sNativeDigitsW; - case LOCALE_ITIMEMARKPOSN: return iTimePrefixW; - } - return NULL; -} - /****************************************************************************** * get_registry_locale_info @@ -599,7 +592,7 @@ * Retrieve user-modified locale info from the registry. * Return length, 0 on error, -1 if not found. */ -static INT get_registry_locale_info( LPCWSTR value, LPWSTR buffer, INT len ) +static INT get_registry_locale_info( struct registry_value *registry_value, LPWSTR buffer, INT len ) { DWORD size; INT ret; @@ -609,54 +602,103 @@ KEY_VALUE_PARTIAL_INFORMATION *info; static const int info_size = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); - if (!(hkey = create_registry_key())) return -1; - - RtlInitUnicodeString( &nameW, value ); - size = info_size + len * sizeof(WCHAR); - - if (!(info = HeapAlloc( GetProcessHeap(), 0, size ))) - { + RtlEnterCriticalSection( &cache_section ); + + if (!registry_value->cached_value) + { + if (!(hkey = create_registry_key())) + { + RtlLeaveCriticalSection( &cache_section ); + return -1; + } + + RtlInitUnicodeString( &nameW, registry_value->name ); + size = info_size + len * sizeof(WCHAR); + + if (!(info = HeapAlloc( GetProcessHeap(), 0, size ))) + { + NtClose( hkey ); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + RtlLeaveCriticalSection( &cache_section ); + return 0; + } + + status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, info, size, &size ); + + /* try again with a bigger buffer when we have to return the correct size */ + if (status == STATUS_BUFFER_OVERFLOW && !buffer && size > info_size) + { + KEY_VALUE_PARTIAL_INFORMATION *new_info; + if ((new_info = HeapReAlloc( GetProcessHeap(), 0, info, size ))) + { + info = new_info; + status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, info, size, &size ); + } + } + NtClose( hkey ); - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return 0; - } - - status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, info, size, &size ); - - if (!status) - { - ret = (size - info_size) / sizeof(WCHAR); - /* append terminating null if needed */ - if (!ret || ((WCHAR *)info->Data)[ret-1]) - { - if (ret < len || !buffer) ret++; + + if (!status) + { + INT length = (size - info_size) / sizeof(WCHAR); + LPWSTR cached_value; + + if (!length || ((WCHAR *)&info->Data)[length-1]) + length++; + + cached_value = HeapAlloc( GetProcessHeap(), 0, length * sizeof(WCHAR) ); + + if (!cached_value) + { + HeapFree( GetProcessHeap(), 0, info ); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + RtlLeaveCriticalSection( &cache_section ); + return 0; + } + + memcpy( cached_value, info->Data, (length-1) * sizeof(WCHAR) ); + cached_value[length-1] = 0; + HeapFree( GetProcessHeap(), 0, info ); + registry_value->cached_value = cached_value; + } + else + { + if (status == STATUS_BUFFER_OVERFLOW && !buffer) + { + ret = (size - info_size) / sizeof(WCHAR); + } + else if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + ret = -1; + } else { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( RtlNtStatusToDosError(status) ); ret = 0; } - } - if (ret && buffer) - { - memcpy( buffer, info->Data, (ret-1) * sizeof(WCHAR) ); - buffer[ret-1] = 0; - } - } - else if (status == STATUS_BUFFER_OVERFLOW && !buffer) - { - ret = (size - info_size) / sizeof(WCHAR) + 1; - } - else if (status == STATUS_OBJECT_NAME_NOT_FOUND) - { - ret = -1; - } - else - { - SetLastError( RtlNtStatusToDosError(status) ); - ret = 0; - } - NtClose( hkey ); - HeapFree( GetProcessHeap(), 0, info ); + HeapFree( GetProcessHeap(), 0, info ); + RtlLeaveCriticalSection( &cache_section ); + return ret; + } + } + + ret = lstrlenW( registry_value->cached_value ) + 1; + + if (buffer) + { + if (ret > len) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + ret = 0; + } + else + { + lstrcpyW( buffer, registry_value->cached_value ); + } + } + + RtlLeaveCriticalSection( &cache_section ); + return ret; } @@ -694,7 +736,8 @@ SetLastError( ERROR_INVALID_PARAMETER ); return 0; } - if (lctype & LOCALE_RETURN_GENITIVE_NAMES ) + if (((lctype & ~LOCALE_LOCALEINFOFLAGSMASK) == LOCALE_SSHORTTIME) || + (lctype & LOCALE_RETURN_GENITIVE_NAMES)) { SetLastError( ERROR_INVALID_FLAGS ); return 0; @@ -743,6 +786,20 @@ } /****************************************************************************** + * get_locale_registry_value + * + * Gets the registry value name and cache for a given lctype. + */ +static struct registry_value *get_locale_registry_value( DWORD lctype ) +{ + int i; + for (i=0; i < sizeof(registry_values)/sizeof(registry_values[0]); i++) + if (registry_values[i].lctype == lctype) + return &registry_values[i]; + return NULL; +} + +/****************************************************************************** * GetLocaleInfoW (KERNEL32.@) * * See GetLocaleInfoA. @@ -783,7 +840,7 @@ if (!(lcflags & LOCALE_NOUSEROVERRIDE) && lcid == convert_default_lcid( LOCALE_USER_DEFAULT, lctype )) { - const WCHAR *value = get_locale_value_name(lctype); + struct registry_value *value = get_locale_registry_value(lctype); if (value) { @@ -950,14 +1007,14 @@ */ BOOL WINAPI SetLocaleInfoW( LCID lcid, LCTYPE lctype, LPCWSTR data ) { - const WCHAR *value; + struct registry_value *value; static const WCHAR intlW[] = {'i','n','t','l',0 }; UNICODE_STRING valueW; NTSTATUS status; HANDLE hkey; lctype &= 0xffff; - value = get_locale_value_name( lctype ); + value = get_locale_registry_value( lctype ); if (!data || !value) { @@ -971,16 +1028,21 @@ return FALSE; } - TRACE("setting %x (%s) to %s\n", lctype, debugstr_w(value), debugstr_w(data) ); + TRACE("setting %x (%s) to %s\n", lctype, debugstr_w(value->name), debugstr_w(data) ); /* FIXME: should check that data to set is sane */ /* FIXME: profile functions should map to registry */ - WriteProfileStringW( intlW, value, data ); + WriteProfileStringW( intlW, value->name, data ); if (!(hkey = create_registry_key())) return FALSE; - RtlInitUnicodeString( &valueW, value ); + RtlInitUnicodeString( &valueW, value->name ); status = NtSetValueKey( hkey, &valueW, 0, REG_SZ, (PVOID)data, (strlenW(data)+1)*sizeof(WCHAR) ); + + RtlEnterCriticalSection( &cache_section ); + HeapFree( GetProcessHeap(), 0, value->cached_value ); + value->cached_value = NULL; + RtlLeaveCriticalSection( &cache_section ); if (lctype == LOCALE_SSHORTDATE || lctype == LOCALE_SLONGDATE) { @@ -1011,12 +1073,17 @@ else lctype = LOCALE_ILDATE; - value = get_locale_value_name( lctype ); - - WriteProfileStringW( intlW, value, szBuff ); - - RtlInitUnicodeString( &valueW, value ); + value = get_locale_registry_value( lctype ); + + WriteProfileStringW( intlW, value->name, szBuff ); + + RtlInitUnicodeString( &valueW, value->name ); status = NtSetValueKey( hkey, &valueW, 0, REG_SZ, szBuff, sizeof(szBuff) ); + + RtlEnterCriticalSection( &cache_section ); + HeapFree( GetProcessHeap(), 0, value->cached_value ); + value->cached_value = NULL; + RtlLeaveCriticalSection( &cache_section ); } NtClose( hkey ); @@ -1095,6 +1162,9 @@ switch (lcid) { + case LOCALE_INVARIANT: + /* keep as-is */ + break; case LOCALE_SYSTEM_DEFAULT: lcid = GetSystemDefaultLCID(); break; @@ -1426,7 +1496,11 @@ if (version) FIXME("unsupported version structure %p\n", version); if (reserved) FIXME("unsupported reserved pointer %p\n", reserved); - if (lparam) FIXME("unsupported lparam %lx\n", lparam); + if (lparam) + { + static int once; + if (!once++) FIXME("unsupported lparam %lx\n", lparam); + } if (!src || !srclen || dstlen < 0) { @@ -1756,20 +1830,21 @@ } /****************************************************************************** - * CompareStringW (KERNEL32.@) - * - * See CompareStringA. - */ -INT WINAPI CompareStringW(LCID lcid, DWORD flags, - LPCWSTR str1, INT len1, LPCWSTR str2, INT len2) -{ - static const DWORD supported_flags = NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS|SORT_STRINGSORT - |NORM_IGNOREKANATYPE|NORM_IGNOREWIDTH|LOCALE_USE_CP_ACP - |NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000; - static DWORD semistub_flags = NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000; + * CompareStringEx (KERNEL32.@) + */ +INT WINAPI CompareStringEx(LPCWSTR locale, DWORD flags, LPCWSTR str1, INT len1, + LPCWSTR str2, INT len2, LPNLSVERSIONINFO version, LPVOID reserved, LPARAM lParam) +{ + DWORD supported_flags = NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS|SORT_STRINGSORT + |NORM_IGNOREKANATYPE|NORM_IGNOREWIDTH|LOCALE_USE_CP_ACP; + DWORD semistub_flags = NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000; /* 0x10000000 is related to diacritics in Arabic, Japanese, and Hebrew */ INT ret; - + static int once; + + if (version) FIXME("unexpected version parameter\n"); + if (reserved) FIXME("unexpected reserved value\n"); + if (lParam) FIXME("unexpected lParam\n"); if (!str1 || !str2) { @@ -1777,7 +1852,7 @@ return 0; } - if (flags & ~supported_flags) + if (flags & ~(supported_flags|semistub_flags)) { SetLastError(ERROR_INVALID_FLAGS); return 0; @@ -1785,8 +1860,8 @@ if (flags & semistub_flags) { - FIXME("semi-stub behavior for flag(s) 0x%x\n", flags & semistub_flags); - semistub_flags &= ~flags; + if (!once++) + FIXME("semi-stub behavior for flag(s) 0x%x\n", flags & semistub_flags); } if (len1 < 0) len1 = strlenW(str1); @@ -1797,6 +1872,17 @@ if (ret) /* need to translate result */ return (ret < 0) ? CSTR_LESS_THAN : CSTR_GREATER_THAN; return CSTR_EQUAL; +} + +/****************************************************************************** + * CompareStringW (KERNEL32.@) + * + * See CompareStringA. + */ +INT WINAPI CompareStringW(LCID lcid, DWORD flags, + LPCWSTR str1, INT len1, LPCWSTR str2, INT len2) +{ + return CompareStringEx(NULL, flags, str1, len1, str2, len2, NULL, NULL, 0); } /****************************************************************************** @@ -1883,7 +1969,7 @@ str2W = buf2W; } - ret = CompareStringW(lcid, flags, str1W, len1W, str2W, len2W); + ret = CompareStringEx(NULL, flags, str1W, len1W, str2W, len2W, NULL, NULL, 0); if (str1W != buf1W) HeapFree(GetProcessHeap(), 0, str1W); if (str2W != buf2W) HeapFree(GetProcessHeap(), 0, str2W); @@ -1897,7 +1983,7 @@ HANDLE hkey; RtlInitUnicodeString( &keyName, szKeyName ); - InitializeObjectAttributes(&attr, &keyName, OBJ_CASE_INSENSITIVE, hRootKey, NULL); + InitializeObjectAttributes(&attr, &keyName, 0, hRootKey, NULL); if (NtOpenKey( &hkey, KEY_READ, &attr ) != STATUS_SUCCESS) hkey = 0; @@ -2041,7 +2127,7 @@ if (NLS_RegEnumValue( hKey, ulIndex, szNumber, sizeof(szNumber), szValue, sizeof(szValue) )) { - BOOL bInstalled = szValue[0] == '1' ? TRUE : FALSE; + BOOL bInstalled = szValue[0] == '1'; LGRPID lgrpid = strtoulW( szNumber, NULL, 16 ); TRACE("grpid %s (%sinstalled)\n", debugstr_w(szNumber),

1 0

[dchapyshev] 72739: [KERNEL32] Sync GetStringTypeW with Wine * Fixes 255 tests for kernel32:locale
by dchapyshev＠svn.reactos.org 19 Sep '16

19 Sep '16

Author: dchapyshev Date: Mon Sep 19 10:11:19 2016 New Revision: 72739 URL: http://svn.reactos.org/svn/reactos?rev=72739&view=rev Log: [KERNEL32] Sync GetStringTypeW with Wine * Fixes 255 tests for kernel32:locale Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] Mon Sep 19 10:11:19 2016 @@ -1255,11 +1255,12 @@ C2_OTHERNEUTRAL /* LRE, LRO, RLE, RLO, PDF */ }; - if (!src) /* Abort and return FALSE when src is null */ + if (!src) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } + if (count == -1) count = strlenW(src) + 1; switch(type) { @@ -1284,7 +1285,7 @@ if ((c>=0x30A0)&&(c<=0x30FF)) type3 |= C3_KATAKANA; if ((c>=0x3040)&&(c<=0x309F)) type3 |= C3_HIRAGANA; if ((c>=0x4E00)&&(c<=0x9FAF)) type3 |= C3_IDEOGRAPH; - if ((c>=0x0600)&&(c<=0x06FF)) type3 |= C3_KASHIDA; + if (c == 0x0640) type3 |= C3_KASHIDA; if ((c>=0x3000)&&(c<=0x303F)) type3 |= C3_SYMBOL; if ((c>=0xD800)&&(c<=0xDBFF)) type3 |= C3_HIGHSURROGATE;

1 0

[tfaber] 72738: [AFD] - Fix MDL leak in failure case of AfdGetSockName. Patch by Volodymyr Shcherbyna. CID 1322161. CORE-11096 #resolve
by tfaber＠svn.reactos.org 19 Sep '16

19 Sep '16

Author: tfaber Date: Mon Sep 19 08:15:24 2016 New Revision: 72738 URL: http://svn.reactos.org/svn/reactos?rev=72738&view=rev Log: [AFD] - Fix MDL leak in failure case of AfdGetSockName. Patch by Volodymyr Shcherbyna. CID 1322161. CORE-11096 #resolve Modified: trunk/reactos/drivers/network/afd/afd/info.c Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Mon Sep 19 08:15:24 2016 @@ -198,6 +198,7 @@ PMDL Mdl = NULL; UNREFERENCED_PARAMETER(DeviceObject); + ASSERT(Irp->MdlAddress == NULL); if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); @@ -226,6 +227,11 @@ TDI_QUERY_ADDRESS_INFO, Mdl ); } + + /* Check if MmProbeAndLockPages or TdiQueryInformation failed and + * clean up Mdl */ + if (!NT_SUCCESS(Status) && Irp->MdlAddress != Mdl) + IoFreeMdl(Mdl); } else Status = STATUS_INSUFFICIENT_RESOURCES;

1 0

[hbelusca] 72737: [WINLOGON] - CreateUserEnvironment: if user impersonation fails, just fail the call. - SetDefaultLanguage: Use the *correct* HKEY_CURRENT_USER key to retrieve the lang., that is, ...
by hbelusca＠svn.reactos.org 18 Sep '16

18 Sep '16

Author: hbelusca Date: Sun Sep 18 23:32:02 2016 New Revision: 72737 URL: http://svn.reactos.org/svn/reactos?rev=72737&view=rev Log: [WINLOGON] - CreateUserEnvironment: if user impersonation fails, just fail the call. - SetDefaultLanguage: Use the *correct* HKEY_CURRENT_USER key to retrieve the lang., that is, first impersonate the user, then, call RegOpenCurrentUser. We do that because otherwise calling RegOpenKey(Ex) for HKEY_CURRENT_USER just uses the process cached value of HKEY_CURRENT_USER, which does not change *even if* one impersonates an user. [MSGINA] - Correctly impersonate the user when opening & initializing the shutdown dialog (in the same way as winlogon does), i.e. call ImpersonateLoggedOnUser and use RegOpenCurrentUser. - Fill few (but not all) code holes in WlxScreenSaverNotify. Modified: trunk/reactos/base/system/winlogon/environment.c trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/screensaver.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/shutdown.c Modified: trunk/reactos/base/system/winlogon/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/envir… ============================================================================== --- trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] Sun Sep 18 23:32:02 2016 @@ -134,9 +134,13 @@ TRACE("WL: CreateUserEnvironment called\n"); /* Impersonate the new user */ - ImpersonateLoggedOnUser(Session->UserToken); + if (!ImpersonateLoggedOnUser(Session->UserToken)) + { + ERR("ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); + return FALSE; + } - /* Open the new users HKCU key */ + /* Open the new user HKCU key */ lError = RegOpenCurrentUser(KEY_CREATE_SUB_KEY, &hKeyCurrentUser); if (lError == ERROR_SUCCESS) 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] Sun Sep 18 23:32:02 2016 @@ -106,51 +106,69 @@ BOOL SetDefaultLanguage( - IN BOOL UserProfile) -{ - HKEY BaseKey; - LPCWSTR SubKey; - LPCWSTR ValueName; + IN PWLSESSION Session) +{ + BOOL ret = FALSE; + BOOL UserProfile; LONG rc; - HKEY hKey = NULL; + HKEY UserKey, hKey = NULL; + LPCWSTR SubKey, ValueName; DWORD dwType, dwSize; LPWSTR Value = NULL; UNICODE_STRING ValueString; NTSTATUS Status; LCID Lcid; - BOOL ret = FALSE; + + UserProfile = (Session && Session->UserToken); + + if (UserProfile && !ImpersonateLoggedOnUser(Session->UserToken)) + { + ERR("WL: ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); + return FALSE; + // FIXME: ... or use the default language of the system?? + // UserProfile = FALSE; + } if (UserProfile) { - BaseKey = HKEY_CURRENT_USER; + rc = RegOpenCurrentUser(MAXIMUM_ALLOWED, &UserKey); + if (rc != ERROR_SUCCESS) + { + TRACE("RegOpenCurrentUser() failed with error %lu\n", rc); + goto cleanup; + } + SubKey = L"Control Panel\\International"; ValueName = L"Locale"; } else { - BaseKey = HKEY_LOCAL_MACHINE; + UserKey = NULL; SubKey = L"System\\CurrentControlSet\\Control\\Nls\\Language"; ValueName = L"Default"; } - rc = RegOpenKeyExW( - BaseKey, - SubKey, - 0, - KEY_READ, - &hKey); + rc = RegOpenKeyExW(UserKey ? UserKey : HKEY_LOCAL_MACHINE, + SubKey, + 0, + KEY_READ, + &hKey); + + if (UserKey) + RegCloseKey(UserKey); + if (rc != ERROR_SUCCESS) { TRACE("RegOpenKeyEx() failed with error %lu\n", rc); goto cleanup; } - rc = RegQueryValueExW( - hKey, - ValueName, - NULL, - &dwType, - NULL, - &dwSize); + + rc = RegQueryValueExW(hKey, + ValueName, + NULL, + &dwType, + NULL, + &dwSize); if (rc != ERROR_SUCCESS) { TRACE("RegQueryValueEx() failed with error %lu\n", rc); @@ -169,13 +187,12 @@ TRACE("HeapAlloc() failed\n"); goto cleanup; } - rc = RegQueryValueExW( - hKey, - ValueName, - NULL, - NULL, - (LPBYTE)Value, - &dwSize); + rc = RegQueryValueExW(hKey, + ValueName, + NULL, + NULL, + (LPBYTE)Value, + &dwSize); if (rc != ERROR_SUCCESS) { TRACE("RegQueryValueEx() failed with error %lu\n", rc); @@ -204,10 +221,15 @@ ret = TRUE; cleanup: + if (Value) + HeapFree(GetProcessHeap(), 0, Value); + if (hKey) RegCloseKey(hKey); - if (Value) - HeapFree(GetProcessHeap(), 0, Value); + + if (UserProfile) + RevertToSelf(); + return ret; } @@ -272,6 +294,11 @@ ULONG Index = 0; SC_HANDLE hSCManager, hService; + // + // FIXME: Isn't it possible to *JUST* impersonate the current user + // *AND* open its HKCU?? + // + /* Get SID of current user */ Status = NtQueryInformationToken((HANDLE)lpParameter, TokenUser, @@ -336,7 +363,7 @@ return 0; } - /* Open service manager */ + /* Open the service manager */ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); if (!hSCManager) { @@ -344,17 +371,17 @@ return 0; } - /* Open wdmaud service */ + /* Open the wdmaud service */ hService = OpenServiceW(hSCManager, L"wdmaud", GENERIC_READ); if (!hService) { - /* Sound is not installed */ + /* The service is not installed */ TRACE("Failed to open wdmaud service (%x)\n", GetLastError()); CloseServiceHandle(hSCManager); return 0; } - /* Wait for wdmaud start */ + /* Wait for wdmaud to start */ do { if (!QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (LPBYTE)&Info, sizeof(SERVICE_STATUS_PROCESS), &dwSize)) @@ -451,8 +478,8 @@ DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); UpdatePerUserSystemParameters(0, TRUE); - /* Set default language */ - if (!SetDefaultLanguage(TRUE)) + /* Set default user language */ + if (!SetDefaultLanguage(Session)) { WARN("WL: SetDefaultLanguage() failed\n"); goto cleanup; @@ -1530,7 +1557,7 @@ goto cleanup; } - if (!SetDefaultLanguage(FALSE)) + if (!SetDefaultLanguage(NULL)) return FALSE; ret = TRUE; Modified: trunk/reactos/base/system/winlogon/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree… ============================================================================== --- trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] Sun Sep 18 23:32:02 2016 @@ -177,13 +177,14 @@ } cleanup: - RevertToSelf(); if (Session->hUserActivity) CloseHandle(Session->hUserActivity); if (Session->hEndOfScreenSaver) CloseHandle(Session->hEndOfScreenSaver); + RevertToSelf(); + #ifndef USE_GETLASTINPUTINFO if (Session->KeyboardHook) UnhookWindowsHookEx(Session->KeyboardHook); @@ -194,6 +195,7 @@ CloseHandle(Session->hEndOfScreenSaverThread); CloseHandle(Session->hScreenSaverParametersChanged); + return 0; } @@ -368,13 +370,14 @@ CallNotificationDlls(Session, StopScreenSaverHandler); cleanup: - RevertToSelf(); if (hKey) RegCloseKey(hKey); if (hCurrentUser) RegCloseKey(hCurrentUser); + RevertToSelf(); + if (!ret) { PostMessageW(Session->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_SCRNSVR_ACTIVITY, 0); 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] Sun Sep 18 23:32:02 2016 @@ -160,7 +160,7 @@ /* Open registry key with preloaded layouts */ if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Keyboard Layout\\Preload", 0, KEY_READ, &hKey) == ERROR_SUCCESS) { - while(TRUE) + while (TRUE) { /* Read values with integer names only */ swprintf(wszKeyName, L"%d", i++); 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] Sun Sep 18 23:32:02 2016 @@ -293,7 +293,7 @@ /* sas.c */ BOOL -SetDefaultLanguage(IN BOOL UserProfile); +SetDefaultLanguage(IN PWLSESSION Session); BOOL InitializeSAS(IN OUT PWLSESSION Session); Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sun Sep 18 23:32:02 2016 @@ -624,15 +624,33 @@ INT ret; DWORD ShutdownOptions; - // FIXME: User impersonation!! - pgContext->nShutdownAction = LoadShutdownSelState(); - ShutdownOptions = GetAllowedShutdownOptions(); + if (ImpersonateLoggedOnUser(pgContext->UserToken)) + { + pgContext->nShutdownAction = LoadShutdownSelState(); + ShutdownOptions = GetAllowedShutdownOptions(); + RevertToSelf(); + } + else + { + ERR("WL: ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); + pgContext->nShutdownAction = 0; + ShutdownOptions = 0; + } ret = ShutdownDialog(hwndDlg, ShutdownOptions, pgContext); - // FIXME: User impersonation!! if (ret == IDOK) - SaveShutdownSelState(pgContext->nShutdownAction); + { + if (ImpersonateLoggedOnUser(pgContext->UserToken)) + { + SaveShutdownSelState(pgContext->nShutdownAction); + RevertToSelf(); + } + else + { + ERR("WL: ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); + } + } return ret; } Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Sun Sep 18 23:32:02 2016 @@ -352,8 +352,9 @@ BOOL *pSecure) { #if 0 + PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext; WCHAR szBuffer[2]; - HKEY hKey; + HKEY hKeyCurrentUser, hKey; DWORD bufferSize = sizeof(szBuffer); DWORD varType = REG_SZ; LONG rc; @@ -369,14 +370,29 @@ * HKCU\Control Panel\Desktop : ScreenSaverIsSecure */ - // FIXME: User impersonation!! - - rc = RegOpenKeyExW(HKEY_CURRENT_USER, - L"Control Panel\\Desktop", - 0, - KEY_QUERY_VALUE, - &hKey); - TRACE("RegOpenKeyExW: %ld\n", rc); + if (!ImpersonateLoggedOnUser(pgContext->UserToken)) + { + ERR("WL: ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); + *pSecure = FALSE; + return TRUE; + } + + /* Open the current user HKCU key */ + rc = RegOpenCurrentUser(MAXIMUM_ALLOWED, &hKeyCurrentUser); + TRACE("RegOpenCurrentUser: %ld\n", rc); + if (rc == ERROR_SUCCESS) + { + /* Open the subkey */ + rc = RegOpenKeyExW(hKeyCurrentUser, + L"Control Panel\\Desktop", + 0, + KEY_QUERY_VALUE, + &hKey); + TRACE("RegOpenKeyExW: %ld\n", rc); + RegCloseKey(hKeyCurrentUser); + } + + /* Read the value */ if (rc == ERROR_SUCCESS) { rc = RegQueryValueExW(hKey, @@ -396,6 +412,9 @@ RegCloseKey(hKey); } + + /* Revert the impersonation */ + RevertToSelf(); TRACE("*pSecure: %ld\n", *pSecure); #endif @@ -820,10 +839,10 @@ pProfile->pszEnvironment = lpEnvironment; if (!GetTokenInformation(pgContext->UserToken, - TokenStatistics, - (PVOID)&Stats, - sizeof(TOKEN_STATISTICS), - &cbStats)) + TokenStatistics, + &Stats, + sizeof(Stats), + &cbStats)) { WARN("Couldn't get Authentication id from user token!\n"); goto cleanup; Modified: trunk/reactos/dll/win32/msgina/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/shutdown.… ============================================================================== --- trunk/reactos/dll/win32/msgina/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/shutdown.c [iso-8859-1] Sun Sep 18 23:32:02 2016 @@ -32,18 +32,26 @@ LoadShutdownSelState(VOID) { LONG lRet; - HKEY hKey; + HKEY hKeyCurrentUser, hKey; DWORD dwValue, dwTemp, dwSize; /* Default to shutdown */ dwValue = WLX_SAS_ACTION_SHUTDOWN_POWER_OFF; - lRet = RegOpenKeyExW(HKEY_CURRENT_USER, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer", - 0, KEY_QUERY_VALUE, &hKey); + /* Open the current user HKCU key */ + lRet = RegOpenCurrentUser(MAXIMUM_ALLOWED, &hKeyCurrentUser); + if (lRet == ERROR_SUCCESS) + { + /* Open the subkey */ + lRet = RegOpenKeyExW(hKeyCurrentUser, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer", + 0, KEY_QUERY_VALUE, &hKey); + RegCloseKey(hKeyCurrentUser); + } if (lRet != ERROR_SUCCESS) return dwValue; + /* Read the value */ dwSize = sizeof(dwTemp); lRet = RegQueryValueExW(hKey, L"Shutdown Setting", @@ -90,18 +98,25 @@ SaveShutdownSelState( IN DWORD ShutdownCode) { - HKEY hKey; + LONG lRet; + HKEY hKeyCurrentUser, hKey; DWORD dwValue = 0; - if (RegCreateKeyExW(HKEY_CURRENT_USER, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer", - 0, NULL, - REG_OPTION_NON_VOLATILE, - KEY_SET_VALUE, - NULL, &hKey, NULL) != ERROR_SUCCESS) - { + /* Open the current user HKCU key */ + lRet = RegOpenCurrentUser(MAXIMUM_ALLOWED, &hKeyCurrentUser); + if (lRet == ERROR_SUCCESS) + { + /* Create the subkey */ + lRet = RegCreateKeyExW(hKeyCurrentUser, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer", + 0, NULL, + REG_OPTION_NON_VOLATILE, + KEY_SET_VALUE, + NULL, &hKey, NULL); + RegCloseKey(hKeyCurrentUser); + } + if (lRet != ERROR_SUCCESS) return; - } switch (ShutdownCode) {

1 0

[hbelusca] 72736: [NTOS]: Code formatting only.
by hbelusca＠svn.reactos.org 18 Sep '16

18 Sep '16

Author: hbelusca Date: Sun Sep 18 23:28:32 2016 New Revision: 72736 URL: http://svn.reactos.org/svn/reactos?rev=72736&view=rev Log: [NTOS]: Code formatting only. Modified: trunk/reactos/ntoskrnl/ex/locale.c Modified: trunk/reactos/ntoskrnl/ex/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/locale.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] Sun Sep 18 23:28:32 2016 @@ -221,7 +221,7 @@ { /* Open the user's key */ Status = RtlOpenCurrentUser(KEY_WRITE, &UserKey); - if (!NT_SUCCESS(Status)) return(Status); + if (!NT_SUCCESS(Status)) return Status; /* Initialize the registry location */ RtlInitUnicodeString(&KeyName, L"Control Panel\\International"); @@ -239,10 +239,10 @@ /* Initialize the object attributes */ InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, - UserKey, - NULL); + &KeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + UserKey, + NULL); /* Check if we don't have a default locale yet */ if (!DefaultLocaleId)

1 0

[akhaldi] 72735: [MSWSOCK] Partially implement Name Service Provider in mswsock. Brought to you by Andreas Maier aka andy-123 with small fixes by Peter Hater and formatting by me. CORE-10024 CORE-1...
by akhaldi＠svn.reactos.org 18 Sep '16

18 Sep '16

Author: akhaldi Date: Sun Sep 18 21:21:28 2016 New Revision: 72735 URL: http://svn.reactos.org/svn/reactos?rev=72735&view=rev Log: [MSWSOCK] Partially implement Name Service Provider in mswsock. Brought to you by Andreas Maier aka andy-123 with small fixes by Peter Hater and formatting by me. CORE-10024 CORE-10440 Added: trunk/reactos/dll/win32/mswsock/mswhelper.c (with props) trunk/reactos/dll/win32/mswsock/mswhelper.h (with props) trunk/reactos/dll/win32/mswsock/nsplookup.c (with props) Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt trunk/reactos/dll/win32/mswsock/stubs.c Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] Sun Sep 18 21:21:28 2016 @@ -5,6 +5,8 @@ list(APPEND SOURCE extensions.c + mswhelper.c + nsplookup.c stubs.c precomp.h) @@ -13,7 +15,7 @@ mswsock.rc ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def) -set_module_type(mswsock win32dll UNICODE) -add_importlibs(mswsock ws2_32 msvcrt kernel32) +set_module_type(mswsock win32dll) +add_importlibs(mswsock ws2_32 dnsapi msvcrt kernel32) add_pch(mswsock precomp.h SOURCE) add_cd_file(TARGET mswsock DESTINATION reactos/system32 FOR all) Added: trunk/reactos/dll/win32/mswsock/mswhelper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/mswhelpe… ============================================================================== --- trunk/reactos/dll/win32/mswsock/mswhelper.c (added) +++ trunk/reactos/dll/win32/mswsock/mswhelper.c [iso-8859-1] Sun Sep 18 21:21:28 2016 @@ -0,0 +1,576 @@ + +#include "precomp.h" + +#include <winuser.h> +#include <winnls.h> +#include <wchar.h> +#include <sal.h> + +#include "mswhelper.h" + +#define MSW_BUFSIZE 512 +#define MAX_ARRAY_SIZE 5 + +void +mswBufferInit(_Inout_ PMSW_BUFFER mswBuf, + _In_ BYTE* buffer, + _In_ DWORD bufferSize) +{ + RtlZeroMemory(mswBuf, sizeof(*mswBuf)); + RtlZeroMemory(buffer, bufferSize); + mswBuf->bytesMax = bufferSize; + mswBuf->buffer = buffer; + mswBuf->bufendptr = buffer; + mswBuf->bufok = TRUE; +} + +BOOL +mswBufferCheck(_Inout_ PMSW_BUFFER mswBuf, + _In_ DWORD count) +{ + if (mswBuf->bytesUsed + count <= mswBuf->bytesMax) + return TRUE; + + mswBuf->bufok = FALSE; + return FALSE; +} + +BOOL +mswBufferIncUsed(_Inout_ PMSW_BUFFER mswBuf, + _In_ DWORD count) +{ + if (!mswBufferCheck(mswBuf, count)) + return FALSE; + + mswBuf->bytesUsed += count; + mswBuf->bufendptr += count; + return TRUE; +} + +inline +BYTE* +mswBufferEndPtr(_Inout_ PMSW_BUFFER mswBuf) +{ + return mswBuf->bufendptr; +} + +BOOL +mswBufferAppend(_Inout_ PMSW_BUFFER mswBuf, + _In_ void *dataToAppend, + _In_ DWORD dataSize) +{ + if (!mswBufferCheck(mswBuf, dataSize)) + return FALSE; + + RtlCopyMemory(mswBuf->bufendptr, dataToAppend, dataSize); + mswBuf->bytesUsed += dataSize; + mswBuf->bufendptr += dataSize; + + return TRUE; +} + +BOOL mswBufferAppendStrA(_Inout_ PMSW_BUFFER mswBuf, + _In_ char* str) +{ + return mswBufferAppend(mswBuf, str, strlen(str) + sizeof(char)); +} + +BOOL +mswBufferAppendStrW(_Inout_ PMSW_BUFFER mswBuf, + _In_ WCHAR* str) +{ + int bytelen = (wcslen(str) + 1) * sizeof(WCHAR); + return mswBufferAppend(mswBuf, str, bytelen); +} + +BOOL +mswBufferAppendPtr(_Inout_ PMSW_BUFFER mswBuf, + _In_ void* ptr) +{ + return mswBufferAppend(mswBuf, &ptr, sizeof(ptr)); +} + +/* lst = pointer to pointer of items + + *lst[0] = 1st item + *lst[1] = 2nd item + ... + lst[n] = NULL = End of List + + itemLength = data in Bytes for each item. + + ptrofs = delta relative to mswBuf.buffer +*/ +BOOL +mswBufferAppendLst(_Inout_ PMSW_BUFFER mswBuf, + _In_ void **lst, + _In_ DWORD itemByteLength, + _In_opt_ int ptrofs) +{ + DWORD lstItemCount; + DWORD lstByteSize; + DWORD lstDataPos; + DWORD i1; + UINT_PTR *ptrSrcLstPos; + + /* calculate size of list */ + ptrSrcLstPos = (UINT_PTR*)lst; + lstItemCount = 0; + while (*ptrSrcLstPos != (UINT_PTR)NULL) + { + lstItemCount++; + ptrSrcLstPos++; + } + + lstByteSize = ((lstItemCount + 1) * sizeof(UINT_PTR)) + /* item-pointer + null-ptr (for end) */ + (lstItemCount * itemByteLength); /* item-data */ + + if (mswBuf->bytesUsed + lstByteSize > mswBuf->bytesMax) + return FALSE; + + /* calculate position for the data of the first item */ + lstDataPos = ((lstItemCount + 1) * sizeof(UINT_PTR)) + + (DWORD)mswBufferEndPtr(mswBuf); + /* add ptrofs */ + lstDataPos += ptrofs; + + /* write array of Pointer to data */ + for (i1 = 0; i1 < lstItemCount; i1++) + { + if (!mswBufferAppendPtr(mswBuf, (void*)lstDataPos)) + return FALSE; + + lstDataPos += sizeof(UINT_PTR); + } + + /* end of list */ + if (!mswBufferAppendPtr(mswBuf, NULL)) + return FALSE; + + /* write data */ + ptrSrcLstPos = (UINT_PTR*)lst; + for (i1 = 0; i1 < lstItemCount; i1++) + { + mswBufferAppend(mswBuf, *(BYTE**)ptrSrcLstPos, itemByteLength); + ptrSrcLstPos++; + } + return mswBuf->bufok; +} + +BOOL +mswBufferAppendStrLstA(_Inout_ PMSW_BUFFER mswBuf, + _In_ void **lst, + _In_opt_ int ptrofs) +{ + DWORD lstItemLen[MAX_ARRAY_SIZE]; + DWORD lstItemCount; + DWORD lstByteSize; + DWORD lstDataPos; + DWORD lstDataSize; + DWORD i1; + UINT_PTR *ptrSrcLstPos; + + /* calculate size of list */ + ptrSrcLstPos = (UINT_PTR*)lst; + lstItemCount = 0; + lstDataSize = 0; + + while (*ptrSrcLstPos != (UINT_PTR)NULL) + { + if (lstItemCount >= MAX_ARRAY_SIZE) + return FALSE; + + i1 = strlen((char*)*ptrSrcLstPos) + sizeof(char); + lstItemLen[lstItemCount] = i1; + lstItemCount++; + lstDataSize += i1; + ptrSrcLstPos++; + } + + lstByteSize = ((lstItemCount + 1) * sizeof(UINT_PTR)) + /* item-pointer + null-ptr (for end) */ + lstDataSize; /* item-data */ + + if (mswBuf->bytesUsed + lstByteSize > mswBuf->bytesMax) + return FALSE; + + /* calculate position for the data of the first item */ + lstDataPos = ((lstItemCount + 1) * sizeof(UINT_PTR)) + + (DWORD)mswBufferEndPtr(mswBuf); + + /* add ptrofs */ + lstDataPos += ptrofs; + + for (i1 = 0; i1 < lstItemCount; i1++) + { + if (!mswBufferAppendPtr(mswBuf, (void*)lstDataPos)) + return FALSE; + + lstDataPos += lstItemLen[i1]; + } + + /* end of list */ + if (!mswBufferAppendPtr(mswBuf, NULL)) + return FALSE; + + /* write data */ + ptrSrcLstPos = (UINT_PTR*)lst; + for (i1 = 0; i1 < lstItemCount; i1++) + { + if (!mswBufferAppendStrA(mswBuf, *(char**)ptrSrcLstPos)) + return FALSE; + + ptrSrcLstPos++; + } + return mswBuf->bufok; +} + +BOOL +mswBufferAppendBlob_Hostent(_Inout_ PMSW_BUFFER mswBuf, + _Inout_ LPWSAQUERYSETW lpRes, + _In_ char* hostnameA, + _In_ DWORD ip4addr) +{ + PHOSTENT phe; + void* lst[2]; + BYTE* bytesOfs; + + /* blob */ + lpRes->lpBlob = (LPBLOB)mswBufferEndPtr(mswBuf); + + if (!mswBufferIncUsed(mswBuf, sizeof(*lpRes->lpBlob))) + return FALSE; + + /* cbSize will be set later */ + lpRes->lpBlob->cbSize = 0; + lpRes->lpBlob->pBlobData = mswBufferEndPtr(mswBuf); + + /* hostent */ + phe = (PHOSTENT)lpRes->lpBlob->pBlobData; + bytesOfs = mswBufferEndPtr(mswBuf); + + if (!mswBufferIncUsed(mswBuf, sizeof(*phe))) + return FALSE; + + phe->h_addrtype = AF_INET; + phe->h_length = 4; /* 4 Byte (IPv4) */ + + /* aliases */ + phe->h_aliases = (char**)(mswBufferEndPtr(mswBuf) - bytesOfs); + + if (!mswBufferAppendPtr(mswBuf, NULL)) + return FALSE; + + /* addr_list */ + RtlZeroMemory(lst, sizeof(lst)); + + if (ip4addr != 0) + lst[0] = (void*)&ip4addr; + + phe->h_addr_list = (char**)(mswBufferEndPtr(mswBuf) - bytesOfs); + + if (!mswBufferAppendLst(mswBuf, lst, 4, -(DWORD)bytesOfs)) + return FALSE; + + /* name */ + phe->h_name = (char*)(mswBufferEndPtr(mswBuf) - bytesOfs); + + if (!mswBufferAppendStrA(mswBuf, hostnameA)) + return FALSE; + + lpRes->lpBlob->cbSize = (DWORD)(mswBufferEndPtr(mswBuf) - bytesOfs); + return mswBuf->bufok; +} + +BOOL +mswBufferAppendBlob_Servent(_Inout_ PMSW_BUFFER mswBuf, + _Inout_ LPWSAQUERYSETW lpRes, + _In_ char* serviceNameA, + _In_ char** serviceAliasesA, + _In_ char* protocolNameA, + _In_ WORD port) +{ + PSERVENT pse; + BYTE* bytesOfs; + + /* blob */ + lpRes->lpBlob = (LPBLOB)mswBufferEndPtr(mswBuf); + + if (!mswBufferIncUsed(mswBuf, sizeof(*lpRes->lpBlob))) + return FALSE; + + lpRes->lpBlob->cbSize = 0;//later + lpRes->lpBlob->pBlobData = mswBufferEndPtr(mswBuf); + + /* servent */ + pse = (LPSERVENT)lpRes->lpBlob->pBlobData; + bytesOfs = mswBufferEndPtr(mswBuf); + + if (!mswBufferIncUsed(mswBuf, sizeof(*pse))) + return FALSE; + + pse->s_aliases = (char**)(mswBufferEndPtr(mswBuf) - bytesOfs); + + if (!mswBufferAppendStrLstA(mswBuf, + (void**)serviceAliasesA, + -(DWORD)bytesOfs)) + return FALSE; + + pse->s_name = (char*)(mswBufferEndPtr(mswBuf) - bytesOfs); + + if (!mswBufferAppendStrA(mswBuf, serviceNameA)) + return FALSE; + + pse->s_port = htons(port); + + pse->s_proto = (char*)(mswBufferEndPtr(mswBuf) - bytesOfs); + + if (!mswBufferAppendStrA(mswBuf, protocolNameA)) + return FALSE; + + lpRes->lpBlob->cbSize = (DWORD)(mswBufferEndPtr(mswBuf) - bytesOfs); + return mswBuf->bufok; +} + +BOOL +mswBufferAppendAddr_AddrInfoW(_Inout_ PMSW_BUFFER mswBuf, + _Inout_ LPWSAQUERYSETW lpRes, + _In_ DWORD ip4addr) +{ + LPCSADDR_INFO paddrinfo; + LPSOCKADDR_IN psa; + + lpRes->dwNumberOfCsAddrs = 1; + lpRes->lpcsaBuffer = (LPCSADDR_INFO)mswBufferEndPtr(mswBuf); + + paddrinfo = lpRes->lpcsaBuffer; + + if (!mswBufferIncUsed(mswBuf, sizeof(*paddrinfo))) + return FALSE; + + paddrinfo->LocalAddr.lpSockaddr = (LPSOCKADDR)mswBufferEndPtr(mswBuf); + + if (!mswBufferIncUsed(mswBuf, sizeof(*paddrinfo->LocalAddr.lpSockaddr))) + return FALSE; + + paddrinfo->RemoteAddr.lpSockaddr = (LPSOCKADDR)mswBufferEndPtr(mswBuf); + + if (!mswBufferIncUsed(mswBuf, sizeof(*paddrinfo->RemoteAddr.lpSockaddr))) + return FALSE; + + paddrinfo->iSocketType = SOCK_DGRAM; + paddrinfo->iProtocol = IPPROTO_UDP; + + psa = (LPSOCKADDR_IN)paddrinfo->LocalAddr.lpSockaddr; + paddrinfo->LocalAddr.iSockaddrLength = sizeof(*psa); + psa->sin_family = AF_INET; + psa->sin_port = 0; + psa->sin_addr.s_addr = 0; + RtlZeroMemory(psa->sin_zero, sizeof(psa->sin_zero)); + + psa = (LPSOCKADDR_IN)paddrinfo->RemoteAddr.lpSockaddr; + paddrinfo->RemoteAddr.iSockaddrLength = sizeof(*psa); + psa->sin_family = AF_INET; + psa->sin_port = 0; + psa->sin_addr.s_addr = ip4addr; + RtlZeroMemory(psa->sin_zero, sizeof(psa->sin_zero)); + + return TRUE; +} + +/* ansicode <-> unicode */ +WCHAR* +StrA2WHeapAlloc(_In_opt_ HANDLE hHeap, + _In_ char* aStr) +{ + int aStrByteLen; + int wStrByteLen; + int charLen; + int ret; + WCHAR* wStr; + + if (aStr == NULL) + return NULL; + + charLen = strlen(aStr) + 1; + + aStrByteLen = (charLen * sizeof(char)); + wStrByteLen = (charLen * sizeof(WCHAR)); + + if (hHeap == 0) + hHeap = GetProcessHeap(); + + wStr = HeapAlloc(hHeap, 0, wStrByteLen); + if (wStr == NULL) + { + HeapFree(hHeap, 0, wStr); + return NULL; + } + + ret = MultiByteToWideChar(1252, + 0, + aStr, + aStrByteLen, + wStr, + charLen); + + if (ret != charLen) + { + HeapFree(hHeap, 0, wStr); + return NULL; + } + return wStr; +} + +char* +StrW2AHeapAlloc(_In_opt_ HANDLE hHeap, + _In_ WCHAR* wStr) +{ + int charLen; + int aStrByteLen; + int ret; + char* aStr; + + if (wStr == NULL) + return NULL; + + charLen = wcslen(wStr) + 1; + + aStrByteLen = (charLen * sizeof(char)); + + if (hHeap == 0) + hHeap = GetProcessHeap(); + + aStr = HeapAlloc(hHeap, 0, aStrByteLen); + if (aStr == NULL) + { + HeapFree(hHeap, 0, aStr); + return NULL; + } + + ret = WideCharToMultiByte(1252, + 0, + wStr, + charLen, + aStr, + aStrByteLen, + NULL, + NULL); + if (ret != aStrByteLen) + { + HeapFree(hHeap, 0, aStr); + return NULL; + } + return aStr; +} + +WCHAR* +StrCpyHeapAllocW(_In_opt_ HANDLE hHeap, + _In_ WCHAR* wStr) +{ + int chLen; + int bLen; + WCHAR* resW; + + if (wStr == NULL) + return NULL; + + if (hHeap == 0) + hHeap = GetProcessHeap(); + + chLen = wcslen(wStr); + + bLen = (chLen + 1) * sizeof(WCHAR); + + resW = HeapAlloc(hHeap, 0, bLen); + RtlCopyMemory(resW, wStr, bLen); + return resW; +} + +char* +StrCpyHeapAllocA(_In_opt_ HANDLE hHeap, + _In_ char* aStr) +{ + int chLen; + int bLen; + char* resA; + + if (aStr == NULL) + return NULL; + + if (hHeap == 0) + hHeap = GetProcessHeap(); + + chLen = strlen(aStr); + + bLen = (chLen + 1) * sizeof(char); + + resA = HeapAlloc(hHeap, 0, bLen); + RtlCopyMemory(resA, aStr, bLen); + return resA; +} + +char** +StrAryCpyHeapAllocA(_In_opt_ HANDLE hHeap, + _In_ char** aStrAry) +{ + char** aSrcPtr; + char** aDstPtr; + char* aDstNextStr; + DWORD aStrByteLen[MAX_ARRAY_SIZE]; + int bLen; + int bItmLen; + int aCount; + int i1; + char** resA; + + if (hHeap == 0) + hHeap = GetProcessHeap(); + + /* Calculating size of array ... */ + aSrcPtr = aStrAry; + bLen = 0; + aCount = 0; + + while (*aSrcPtr != NULL) + { + if (aCount >= MAX_ARRAY_SIZE) + return NULL; + + bItmLen = (strlen(*aSrcPtr) + 1) * sizeof(char); + aStrByteLen[aCount] = bItmLen; + + bLen += sizeof(*aSrcPtr) + bItmLen; + + aSrcPtr++; + aCount++; + } + + /* size for NULL-terminator */ + bLen += sizeof(*aSrcPtr); + + /* get memory */ + resA = HeapAlloc(hHeap, 0, bLen); + + /* copy data */ + aSrcPtr = aStrAry; + aDstPtr = resA; + + /* pos for the first string */ + aDstNextStr = (char*)(resA + aCount + 1); + for (i1 = 0; i1 < aCount; i1++) + { + bItmLen = aStrByteLen[i1]; + + *aDstPtr = aDstNextStr; + RtlCopyMemory(*aDstPtr, *aSrcPtr, bItmLen); + + aDstNextStr = (char*)((DWORD)aDstNextStr + (DWORD)bItmLen); + aDstPtr++; + aSrcPtr++; + } + + /* terminate with NULL */ + *aDstPtr = NULL; + + return resA; +} Propchange: trunk/reactos/dll/win32/mswsock/mswhelper.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/mswsock/mswhelper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/mswhelpe… ============================================================================== --- trunk/reactos/dll/win32/mswsock/mswhelper.h (added) +++ trunk/reactos/dll/win32/mswsock/mswhelper.h [iso-8859-1] Sun Sep 18 21:21:28 2016 @@ -0,0 +1,121 @@ +#ifndef _MSWHELPER_H +#define _MSWHELPER_H + +#include <ws2spi.h> + +typedef struct { + DWORD bytesUsed; + DWORD bytesMax; + BYTE* buffer; + BYTE* bufendptr; // Pointer to the first "unused" byte + BOOL bufok; // FALSE if on mswBuffer-Function fails +} MSW_BUFFER, *PMSW_BUFFER; + +void +mswBufferInit( + _Out_ PMSW_BUFFER mswBuf, + _In_ BYTE* buffer, + _In_ DWORD bufferSize); + +inline +BOOL +mswBufferCheck( + _Inout_ PMSW_BUFFER mswBuf, + _In_ DWORD count); + +BOOL +mswBufferIncUsed( + _Inout_ PMSW_BUFFER mswBuf, + _In_ DWORD count); + +inline +BYTE* +mswBufferEndPtr( + _Inout_ PMSW_BUFFER mswBuf); + +BOOL +mswBufferAppend( + _Inout_ PMSW_BUFFER mswBuf, + _In_ void *dataToAppend, + _In_ DWORD dataSize); + +BOOL +mswBufferAppendStrA( + _Inout_ PMSW_BUFFER mswBuf, + _In_ char* str); + +BOOL +mswBufferAppendStrW( + _Inout_ PMSW_BUFFER mswBuf, + _In_ WCHAR* str); + +BOOL +mswBufferAppendPtr( + _Inout_ PMSW_BUFFER mswBuf, + _In_ void* ptr); + +BOOL +mswBufferAppendLst( + _Inout_ PMSW_BUFFER mswBuf, + _In_ void **lst, + _In_ DWORD itemByteLength, + _In_opt_ int deltaofs); + +BOOL +mswBufferAppendStrLstA( + _Inout_ PMSW_BUFFER mswBuf, + _In_ void **lst, + _In_opt_ int ptrofs); + +BOOL +mswBufferAppendBlob_Hostent( + _Inout_ PMSW_BUFFER mswBuf, + _Inout_ LPWSAQUERYSETW lpRes, + _In_ char* hostnameA, + _In_ DWORD ip4addr); + +BOOL +mswBufferAppendBlob_Servent( + _Inout_ PMSW_BUFFER mswBuf, + _Inout_ LPWSAQUERYSETW lpRes, + _In_ char* serviceNameA, + _In_ char** serviceAliasesA, + _In_ char* protocolNameA, + _In_ WORD port); + +BOOL +mswBufferAppendAddr_AddrInfoW( + _Inout_ PMSW_BUFFER mswBuf, + _Inout_ LPWSAQUERYSETW lpRes, + _In_ DWORD ip4addr); + +WCHAR* +StrA2WHeapAlloc( + _In_opt_ HANDLE hHeap, + _In_ char* aStr); + +char* +StrW2AHeapAlloc( + _In_opt_ HANDLE hHeap, + _In_ WCHAR* wStr); + +WCHAR* +StrCpyHeapAllocW( + _In_opt_ HANDLE hHeap, + _In_ WCHAR* wStr); + +char* +StrCpyHeapAllocA( + _In_opt_ HANDLE hHeap, + _In_ char* aStr); + +/* strary: + ptr1 ... ptrn \0 + data1 ... datan +*/ +char** +StrAryCpyHeapAllocA( + _In_opt_ HANDLE hHeap, + _In_ char** aStrAry); + +#endif // _MSWHELPER_H Propchange: trunk/reactos/dll/win32/mswsock/mswhelper.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/mswsock/nsplookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/nsplooku… ============================================================================== --- trunk/reactos/dll/win32/mswsock/nsplookup.c (added) +++ trunk/reactos/dll/win32/mswsock/nsplookup.c [iso-8859-1] Sun Sep 18 21:21:28 2016 @@ -0,0 +1,1233 @@ +#include "precomp.h" + +#include <stdlib.h> +#include <ws2spi.h> +#include <nspapi.h> +#include <windef.h> +#include <winuser.h> +#include <windns.h> +#include <guiddef.h> +#include <svcguid.h> +#include <iptypes.h> +#include <strsafe.h> + +#include "mswhelper.h" + +#define NSP_CALLID_DNS 0x0001 +#define NSP_CALLID_HOSTNAME 0x0002 +#define NSP_CALLID_HOSTBYNAME 0x0003 +#define NSP_CALLID_SERVICEBYNAME 0x0004 + +#ifndef BUFSIZ +#define BUFSIZ 1024 +#endif // BUFSIZ +#ifndef WS2_INTERNAL_MAX_ALIAS +#define WS2_INTERNAL_MAX_ALIAS 512 +#endif // WS2_INTERNAL_MAX_ALIAS + +//#define IP_LOCALHOST 0x0100007F + +//#define NSP_REDIRECT + +typedef struct { + WCHAR* hostnameW; + DWORD addr4; + WCHAR* servnameW; + WCHAR* servprotoW; + CHAR** servaliasesA; /* array */ + WORD servport; +} WSHOSTINFOINTERN, *PWSHOSTINFOINTERN; + +typedef struct { + GUID providerId; /* Provider-ID */ + DWORD dwControlFlags; /* dwControlFlags (WSALookupServiceBegin) */ + DWORD CallID; /* List for LookupServiceNext-Calls */ + DWORD CallIDCounter; /* call-count of the current CallID. */ + WCHAR* hostnameW; /* hostbyname */ +#ifdef NSP_REDIRECT + HANDLE rdrLookup; + NSP_ROUTINE rdrproc; +#endif +} WSHANDLEINTERN, *PWSHANDLEINTERN; + +static const GUID guid_NULL = {0}; +static const GUID guid_HOSTNAME = SVCID_HOSTNAME; +static const GUID guid_INET_HOSTADDRBYINETSTRING = SVCID_INET_HOSTADDRBYINETSTRING; +static const GUID guid_INET_HOSTADDRBYNAME = SVCID_INET_HOSTADDRBYNAME; +static const GUID guid_INET_SERVICEBYNAME = SVCID_INET_SERVICEBYNAME; + +/* GUIDs - maybe they should be loaded from registry? */ +/* Namespace: 32 */ +static const GUID guid_mswsock_TcpIp = {/*Data1:*/ 0x22059D40, + /*Data2:*/ 0x7E9E, + /*Data3:*/ 0x11CF, + /*Data4:*/ {0xAE, 0x5A, 0x00, 0xAA, 0x00, 0xA7, 0x11, 0x2B}}; + +/* {6642243A-3BA8-4AA6-BAA5-2E0BD71FDD83} */ +/* Namespace: 15 */ +static const GUID guid_mswsock_NLA = {/*Data1:*/ 0x6642243A, + /*Data2:*/ 0x3BA8, + /*Data3:*/ 0x4AA6, + /*Data4:*/ {0xBA, 0xA5, 0x2E, 0x0B, 0xD7, 0x1F, 0xDD, 0x83}}; + +#ifdef NSP_REDIRECT + +typedef INT +(CALLBACK *lpRdrNSPStartup)( + LPGUID lpProviderId, + LPNSP_ROUTINE lpRout); + +const rdrLib = "mswsock.dll-original"; +lpRdrNSPStartup rdrNSPStartup; +HANDLE hLib; +NSP_ROUTINE rdrproc_tcpip; +NSP_ROUTINE rdrproc_nla; + +#endif /* NSP_REDIRECT */ + +/* Forwards */ +INT +WINAPI +mswNSPStartup( + LPGUID lpProviderId, + LPNSP_ROUTINE lpRout); + +INT +NSP_LookupServiceBeginW( + PWSHANDLEINTERN data, + CHAR* hostnameA, + WCHAR* hostnameW, + DWORD CallID); + +INT +NSP_LookupServiceNextW( + _In_ PWSHANDLEINTERN data, + _In_ DWORD CallID, + _Inout_ LPWSAQUERYSETW lpRes, + _Inout_ LPDWORD lpResLen); + +INT +NSP_GetHostNameHeapAllocW( + _Out_ WCHAR** hostname); + +INT +NSP_GetHostByNameHeapAllocW( + _In_ WCHAR* name, + _In_ GUID* lpProviderId, + _Out_ PWSHOSTINFOINTERN hostinfo); + +INT +NSP_GetServiceByNameHeapAllocW( + _In_ WCHAR* nameW, + _In_ GUID* lpProviderId, + _Out_ PWSHOSTINFOINTERN hostinfo); + +/* Implementations - Internal */ + +INT +WSAAPI +mwsNSPCleanUp(_In_ LPGUID lpProviderId) +{ + //WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); + //return ERROR_CALL_NOT_IMPLEMENTED; + return ERROR_SUCCESS; +} + +INT +mwsNSPInit(VOID) +{ + return ERROR_SUCCESS; +} + +INT +WSAAPI +mwsNSPLookupServiceBegin(_In_ LPGUID lpProviderId, + _In_ LPWSAQUERYSETW lpqsRestrictions, + _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo, + _In_ DWORD dwControlFlags, + _Out_ LPHANDLE lphLookup) +{ + PWSHANDLEINTERN pLook; + int wsaErr; + + if (IsEqualGUID(lpProviderId, &guid_mswsock_TcpIp)) + { + //OK + } + else if (IsEqualGUID(lpProviderId, &guid_mswsock_NLA)) + { + WSASetLastError(WSASERVICE_NOT_FOUND); + return SOCKET_ERROR; + } + else + { + return ERROR_CALL_NOT_IMPLEMENTED; + } + + /* allocate internal structure */ + pLook = HeapAlloc(GetProcessHeap(), 0, sizeof(WSHANDLEINTERN)); + if (!pLook) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + + *lphLookup = (HANDLE)pLook; + + RtlZeroMemory(pLook, sizeof(*pLook)); + + /* Anyway the ControlFlags "should" be needed + in NSPLookupServiceNext. (see doku) But + thats not the fact ATM. */ + pLook->dwControlFlags = dwControlFlags; + pLook->providerId = *lpProviderId; + +#ifdef NSP_REDIRECT + + if (IsEqualGUID(lpProviderId, &guid_mswsock_TcpIp)) + { + pLook->rdrproc = rdrproc_tcpip; + } + else if (IsEqualGUID(lpProviderId, &guid_mswsock_NLA)) + { + pLook->rdrproc = rdrproc_nla; + } + else + { + return ERROR_CALL_NOT_IMPLEMENTED; + } + + if (pLook->rdrproc.NSPLookupServiceBegin(lpProviderId, + lpqsRestrictions, + lpServiceClassInfo, + dwControlFlags, + &pLook->rdrLookup) == NO_ERROR) + { + wsaErr = NO_ERROR; + } + else + { + wsaErr = WSAGetLastError(); + } + + /* + if (res) + res = WSAGetLastError(); + */ + +#else /* NSP_REDIRECT */ + + wsaErr = ERROR_CALL_NOT_IMPLEMENTED; + if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, &guid_NULL)) + { + wsaErr = ERROR_CALL_NOT_IMPLEMENTED; + } + else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, &guid_HOSTNAME)) + { + wsaErr = NSP_LookupServiceBeginW(pLook, + NULL, + NULL, + NSP_CALLID_HOSTNAME); + } + else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, + &guid_INET_HOSTADDRBYNAME)) + { + wsaErr = NSP_LookupServiceBeginW(pLook, + NULL, + lpqsRestrictions->lpszServiceInstanceName, + NSP_CALLID_HOSTBYNAME); + } + else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, + &guid_INET_SERVICEBYNAME)) + { + wsaErr = NSP_LookupServiceBeginW(pLook, + NULL, + lpqsRestrictions->lpszServiceInstanceName, + NSP_CALLID_SERVICEBYNAME); + } + else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, + &guid_INET_HOSTADDRBYINETSTRING)) + { + wsaErr = ERROR_CALL_NOT_IMPLEMENTED; + } + +#endif /* NSP_REDIRECT */ + + if (wsaErr != NO_ERROR) + { + WSASetLastError(wsaErr); + return SOCKET_ERROR; + } + return NO_ERROR; +} + +INT +WSAAPI +mwsNSPLookupServiceNext(_In_ HANDLE hLookup, + _In_ DWORD dwControlFlags, + _Inout_ LPDWORD lpdwBufferLength, + //_Out_writes_bytes_to_(*lpdwBufferLength, *lpdwBufferLength) + LPWSAQUERYSETW lpqsResults) +{ + PWSHANDLEINTERN pLook = hLookup; + int wsaErr = 0; + +#ifdef NSP_REDIRECT + + INT res = pLook->rdrproc.NSPLookupServiceNext(pLook->rdrLookup, + dwControlFlags, + lpdwBufferLength, + lpqsResults); + wsaErr = WSAGetLastError(); + if (res != ERROR_SUCCESS) + { + wsaErr = WSAGetLastError(); + + if (wsaErr == 0) + wsaErr = 0xFFFFFFFF; + } + +#else /* NSP_REDIRECT */ + + if ((lpdwBufferLength == NULL) || (*lpdwBufferLength == 0)) + { + wsaErr = WSA_NOT_ENOUGH_MEMORY; + goto End; + } + + RtlZeroMemory(lpqsResults, *lpdwBufferLength); + lpqsResults->dwSize = sizeof(*lpqsResults); + + wsaErr = NSP_LookupServiceNextW(pLook, + pLook->CallID, + lpqsResults, + lpdwBufferLength); + + +#endif /* NSP_REDIRECT */ + +End: + if (wsaErr != 0) + { + WSASetLastError(wsaErr); + return SOCKET_ERROR; + } + return NO_ERROR; +} + +INT +WSAAPI +mwsNSPIoCtl(_In_ HANDLE hLookup, + _In_ DWORD dwControlCode, + _In_reads_bytes_(cbInBuffer) LPVOID lpvInBuffer, + _In_ DWORD cbInBuffer, + _Out_writes_bytes_to_(cbOutBuffer, *lpcbBytesReturned) LPVOID lpvOutBuffer, + _In_ DWORD cbOutBuffer, + _Out_ LPDWORD lpcbBytesReturned, + _In_opt_ LPWSACOMPLETION lpCompletion, + _In_ LPWSATHREADID lpThreadId) +{ + WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +INT +WSAAPI +mwsNSPLookupServiceEnd(_In_ HANDLE hLookup) +{ + PWSHANDLEINTERN pLook; + HANDLE hHeap; + INT res; + + res = NO_ERROR; + pLook = (PWSHANDLEINTERN)hLookup; + hHeap = GetProcessHeap(); + +#ifdef NSP_REDIRECT + res = pLook->rdrproc.NSPLookupServiceEnd(pLook->rdrLookup); +#endif + + if (pLook->hostnameW != NULL) + HeapFree(hHeap, 0, pLook->hostnameW); + + HeapFree(hHeap, 0, pLook); + return res; +} + +INT +WSAAPI +mwsNSPSetService(_In_ LPGUID lpProviderId, + _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo, + _In_ LPWSAQUERYSETW lpqsRegInfo, + _In_ WSAESETSERVICEOP essOperation, + _In_ DWORD dwControlFlags) +{ + WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +INT +WSAAPI +mwsNSPInstallServiceClass(_In_ LPGUID lpProviderId, + _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo) +{ + WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +INT +WSAAPI +mwsNSPRemoveServiceClass(_In_ LPGUID lpProviderId, + _In_ LPGUID lpServiceClassId) +{ + WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +INT +WSAAPI +mwsNSPGetServiceClassInfo(_In_ LPGUID lpProviderId, + _In_ LPDWORD lpdwBufSize, + _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo) +{ + WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* + hostnameA / hostnameW + * only used by HOSTBYNAME + * only one should be set + +*/ +INT +NSP_LookupServiceBeginW(PWSHANDLEINTERN data, + CHAR* hostnameA, + WCHAR* hostnameW, + DWORD CallID) +{ + HANDLE hHeap; + + if (data->CallID != 0) + return WSAEFAULT; + + data->CallID = CallID; + + if ((CallID == NSP_CALLID_HOSTBYNAME) || + (CallID == NSP_CALLID_SERVICEBYNAME)) + { + hHeap = GetProcessHeap(); + + if (data->hostnameW != NULL) + HeapFree(hHeap, 0, data->hostnameW); + + if (hostnameA != NULL) + { + data->hostnameW = StrA2WHeapAlloc(hHeap, hostnameA); + } + else + { + data->hostnameW = StrCpyHeapAllocW(hHeap, hostnameW); + } + } + + WSASetLastError(0); + + return ERROR_SUCCESS; +} + +INT +NSP_GetHostNameHeapAllocW(_Out_ WCHAR** hostname) +{ + WCHAR* name; + HANDLE hHeap = GetProcessHeap(); + DWORD bufCharLen = MAX_COMPUTERNAME_LENGTH + 1; + DWORD bufByteLen = bufCharLen * sizeof(WCHAR); + + name = HeapAlloc(hHeap, 0, bufByteLen); + + if (!GetComputerNameExW(ComputerNameDnsHostname, + name, + &bufCharLen)) + { + HeapFree(hHeap, 0, name); + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + + *hostname = name; + return ERROR_SUCCESS; +} + +/* This function is far from perfect but it works enough */ +IP4_ADDRESS +FindEntryInHosts(IN CONST WCHAR FAR* wname) +{ + BOOL Found = FALSE; + HANDLE HostsFile; + CHAR HostsDBData[BUFSIZ] = {0}; + PCHAR SystemDirectory = HostsDBData; + PCHAR HostsLocation = "\\drivers\\etc\\hosts"; + PCHAR AddressStr, DnsName = NULL, AddrTerm, NameSt, NextLine, ThisLine, Comment; + UINT SystemDirSize = sizeof(HostsDBData) - 1, ValidData = 0; + DWORD ReadSize; + DWORD Address; + CHAR name[MAX_HOSTNAME_LEN + 1]; + + wcstombs(name, wname, MAX_HOSTNAME_LEN); + + /* We assume that the parameters are valid */ + if (!GetSystemDirectoryA(SystemDirectory, SystemDirSize)) + { + WSASetLastError(WSANO_RECOVERY); + //WS_DbgPrint(MIN_TRACE, ("Could not get windows system directory.\n")); + return 0; /* Can't get system directory */ + } + + strncat(SystemDirectory, HostsLocation, SystemDirSize); + + HostsFile = CreateFileA(SystemDirectory, + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, + NULL); + if (HostsFile == INVALID_HANDLE_VALUE) + { + WSASetLastError(WSANO_RECOVERY); + return 0; + } + + while (!Found && ReadFile(HostsFile, + HostsDBData + ValidData, + sizeof(HostsDBData) - ValidData, + &ReadSize, + NULL)) + { + ValidData += ReadSize; + ReadSize = 0; + NextLine = ThisLine = HostsDBData; + + /* Find the beginning of the next line */ + while ((NextLine < HostsDBData + ValidData) && + (*NextLine != '\r') && + (*NextLine != '\n')) + { + NextLine++; + } + + /* Zero and skip, so we can treat what we have as a string */ + if (NextLine > HostsDBData + ValidData) + break; + + *NextLine = 0; + NextLine++; + + Comment = strchr(ThisLine, '#'); + if (Comment) + *Comment = 0; /* Terminate at comment start */ + + AddressStr = ThisLine; + /* Find the first space separating the IP address from the DNS name */ + AddrTerm = strchr(ThisLine, ' '); + if (AddrTerm) + { + /* Terminate the address string */ + *AddrTerm = 0; + + /* Find the last space before the DNS name */ + NameSt = strrchr(ThisLine, ' '); + + /* If there is only one space (the one we removed above), then just use the address terminator */ + if (!NameSt) + NameSt = AddrTerm; + + /* Move from the space to the first character of the DNS name */ + NameSt++; + + DnsName = NameSt; + + if (!strcmp(name, DnsName)) + { + Found = TRUE; + break; + } + } + + /* Get rid of everything we read so far */ + while (NextLine <= HostsDBData + ValidData && + isspace (*NextLine)) + { + NextLine++; + } + + if (HostsDBData + ValidData - NextLine <= 0) + break; + + //WS_DbgPrint(MAX_TRACE,("About to move %d chars\n", + // HostsDBData + ValidData - NextLine)); + + memmove(HostsDBData, NextLine, HostsDBData + ValidData - NextLine); + ValidData -= NextLine - HostsDBData; + //WS_DbgPrint(MAX_TRACE,("Valid bytes: %d\n", ValidData)); + } + + CloseHandle(HostsFile); + + if (!Found) + { + //WS_DbgPrint(MAX_TRACE,("Not found\n")); + WSASetLastError(WSANO_DATA); + return 0; + } + + if (strstr(AddressStr, ":")) + { + //DbgPrint("AF_INET6 NOT SUPPORTED!\n"); + WSASetLastError(WSAEINVAL); + return 0; + } + + Address = inet_addr(AddressStr); + if (Address == INADDR_NONE) + { + WSASetLastError(WSAEINVAL); + return 0; + } + + return Address; +} + +INT +NSP_GetHostByNameHeapAllocW(_In_ WCHAR* name, + _In_ GUID* lpProviderId, + _Out_ PWSHOSTINFOINTERN hostinfo) +{ + HANDLE hHeap = GetProcessHeap(); + enum addr_type + { + GH_INVALID, + GH_IPV6, + GH_IPV4, + GH_RFC1123_DNS + }; + typedef enum addr_type addr_type; + addr_type addr; + INT ret = 0; + WCHAR* found = 0; + DNS_STATUS dns_status = {0}; + /* include/WinDNS.h -- look up DNS_RECORD on MSDN */ + PDNS_RECORD dp; + PDNS_RECORD curr; + WCHAR* tmpHostnameW; + CHAR* tmpHostnameA; + IP4_ADDRESS address; + INT result = ERROR_SUCCESS; + + /* needed to be cleaned up if != NULL */ + tmpHostnameW = NULL; + dp = NULL; + + addr = GH_INVALID; + + if (name == NULL) + { + result = ERROR_INVALID_PARAMETER; + goto cleanup; + } + + /* Hostname "" / "localhost" + - convert to "computername" */ + if ((wcscmp(L"", name) == 0) /*|| + (wcsicmp(L"localhost", name) == 0)*/) + { + ret = NSP_GetHostNameHeapAllocW(&tmpHostnameW); + if (ret != ERROR_SUCCESS) + { + result = ret; + goto cleanup; + } + name = tmpHostnameW; + } + + /* Is it an IPv6 address? */ + found = wcschr(name, L':'); + if (found != NULL) + { + addr = GH_IPV6; + goto act; + } + + /* Is it an IPv4 address? */ + if (!iswalpha(name[0])) + { + addr = GH_IPV4; + goto act; + } + + addr = GH_RFC1123_DNS; + +/* Broken out in case we want to get fancy later */ +act: + switch (addr) + { + case GH_IPV6: + WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); + result = ERROR_CALL_NOT_IMPLEMENTED; + goto cleanup; + break; + + case GH_INVALID: + WSASetLastError(WSAEFAULT); + result = ERROR_INVALID_PARAMETER; + goto cleanup; + break; + + /* Note: If passed an IP address, MSDN says that gethostbyname() + treats it as an unknown host. + This is different from the unix implementation. Use inet_addr() + */ + case GH_IPV4: + case GH_RFC1123_DNS: + /* DNS_TYPE_A: include/WinDNS.h */ + /* DnsQuery -- lib/dnsapi/dnsapi/query.c */ + + /* Look for the DNS name in the hosts file */ + if ((address = FindEntryInHosts(name)) != 0) + { + hostinfo->hostnameW = StrCpyHeapAllocW(hHeap, name); + hostinfo->addr4 = address; + result = ERROR_SUCCESS; + goto cleanup; + } + + tmpHostnameA = StrW2AHeapAlloc(hHeap, name); + dns_status = DnsQuery(tmpHostnameA, + DNS_TYPE_A, + DNS_QUERY_STANDARD, + /* extra dns servers */ 0, + &dp, + 0); + HeapFree(hHeap, 0, tmpHostnameA); + + if ((dns_status != 0) || (dp == NULL)) + { + result = WSAHOST_NOT_FOUND; + goto cleanup; + } + + //ASSERT(dp->wType == DNS_TYPE_A); + //ASSERT(dp->wDataLength == sizeof(DNS_A_DATA)); + curr = dp; + while ((curr->pNext != NULL) || (curr->wType != DNS_TYPE_A)) + { + curr = curr->pNext; + } + + if (curr->wType != DNS_TYPE_A) + { + result = WSASERVICE_NOT_FOUND; + goto cleanup; + } + + //WS_DbgPrint(MID_TRACE,("populating hostent\n")); + //WS_DbgPrint(MID_TRACE,("pName is (%s)\n", curr->pName)); + //populate_hostent(p->Hostent, + // (PCHAR)curr->pName, + // curr->Data.A.IpAddress); + hostinfo->hostnameW = StrA2WHeapAlloc(hHeap, curr->pName); + hostinfo->addr4 = curr->Data.A.IpAddress; + result = ERROR_SUCCESS; + goto cleanup; + + //WS_DbgPrint(MID_TRACE,("Called DnsQuery, but host not found. Err: %i\n", + // dns_status)); + //WSASetLastError(WSAHOST_NOT_FOUND); + //return NULL; + + break; + + default: + result = WSANO_RECOVERY; + goto cleanup; + break; + } + + result = WSANO_RECOVERY; + +cleanup: + if (dp != NULL) + DnsRecordListFree(dp, DnsFreeRecordList); + + if (tmpHostnameW != NULL) + HeapFree(hHeap, 0, tmpHostnameW); + + return result; +} + +#define SKIPWS(ptr, act) \ +{while(*ptr && isspace(*ptr)) ptr++; if(!*ptr) act;} + +#define SKIPANDMARKSTR(ptr, act) \ +{while(*ptr && !isspace(*ptr)) ptr++; \ + if(!*ptr) {act;} else { *ptr = 0; ptr++; }} + +static +BOOL +DecodeServEntFromString(IN PCHAR ServiceString, + OUT PCHAR *ServiceName, + OUT PCHAR *PortNumberStr, + OUT PCHAR *ProtocolStr, + IN PCHAR *Aliases, + IN DWORD MaxAlias) +{ + UINT NAliases = 0; + + //WS_DbgPrint(MAX_TRACE, ("Parsing service ent [%s]\n", ServiceString)); + + SKIPWS(ServiceString, return FALSE); + *ServiceName = ServiceString; + SKIPANDMARKSTR(ServiceString, return FALSE); + SKIPWS(ServiceString, return FALSE); + *PortNumberStr = ServiceString; + SKIPANDMARKSTR(ServiceString, ;); + + while (*ServiceString && NAliases < MaxAlias - 1) + { + SKIPWS(ServiceString, break); + if (*ServiceString) + { + SKIPWS(ServiceString, ;); + if (strlen(ServiceString)) + { + //WS_DbgPrint(MAX_TRACE, ("Alias: %s\n", ServiceString)); + *Aliases++ = ServiceString; + NAliases++; + } + SKIPANDMARKSTR(ServiceString, ;); + } + } + *Aliases = NULL; + + *ProtocolStr = strchr(*PortNumberStr, '/'); + + if (!*ProtocolStr) + return FALSE; + + **ProtocolStr = 0; + (*ProtocolStr)++; + + //WS_DbgPrint(MAX_TRACE, ("Parsing done: %s %s %s %d\n", + // *ServiceName, *ProtocolStr, *PortNumberStr, + // NAliases)); + + return TRUE; +} + +INT +NSP_GetServiceByNameHeapAllocW(_In_ WCHAR* nameW, + _In_ GUID* lpProviderId, + _Out_ PWSHOSTINFOINTERN hostinfo) +{ + BOOL Found = FALSE; + HANDLE ServicesFile; + CHAR ServiceDBData[BUFSIZ * sizeof(WCHAR)] = {0}; + PWCHAR SystemDirectory = (PWCHAR)ServiceDBData; /* Reuse this stack space */ + PWCHAR ServicesFileLocation = L"\\drivers\\etc\\services"; + PCHAR ThisLine = 0, NextLine = 0, ServiceName = 0, PortNumberStr = 0, + ProtocolStr = 0, Comment = 0, EndValid; + PCHAR Aliases[WS2_INTERNAL_MAX_ALIAS] = {0}; + PCHAR* AliasPtr; + UINT i = 0, + SystemDirSize = (sizeof(ServiceDBData) / sizeof(WCHAR)) - 1; + DWORD ReadSize = 0; + HANDLE hHeap; + PCHAR nameA = NULL; + PCHAR nameServiceA = NULL; + PCHAR nameProtoA = NULL; + INT res = WSANO_RECOVERY; + + if (!nameW) + { + res = WSANO_RECOVERY; + goto End; + } + + hHeap = GetProcessHeap(); + nameA = StrW2AHeapAlloc(hHeap, nameW); + + /* nameA has the form <service-name>/<protocol> + we split these now */ + nameProtoA = strchr(nameA, '/'); + if (nameProtoA == NULL) + { + res = WSANO_RECOVERY; + goto End; + } + + nameProtoA++; + i = (DWORD)(nameProtoA - nameA - 1); + nameServiceA = (PCHAR)HeapAlloc(hHeap, 0, i + 1); + StringCbCopyA(nameServiceA, i + 1, nameA); + nameServiceA[i] = '\0'; + + if (!GetSystemDirectoryW(SystemDirectory, SystemDirSize)) + { + /* Can't get system directory */ + res = WSANO_RECOVERY; + goto End; + } + + wcsncat(SystemDirectory, ServicesFileLocation, SystemDirSize); + + ServicesFile = CreateFileW(SystemDirectory, + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, + NULL); + + if (ServicesFile == INVALID_HANDLE_VALUE) + { + return WSANO_RECOVERY; + } + + /* Scan the services file ... + * + * We will be share the buffer on the lines. If the line does not fit in + * the buffer, then moving it to the beginning of the buffer and read + * the remnants of line from file. + */ + + /* Initial Read */ + ReadFile(ServicesFile, + ServiceDBData, + sizeof( ServiceDBData ) - 1, + &ReadSize, + NULL); + + ThisLine = NextLine = ServiceDBData; + EndValid = ServiceDBData + ReadSize; + ServiceDBData[sizeof(ServiceDBData) - 1] = '\0'; + + while (ReadSize) + { + for (; *NextLine != '\r' && *NextLine != '\n'; NextLine++) + { + if (NextLine == EndValid) + { + int LineLen = NextLine - ThisLine; + + if (ThisLine == ServiceDBData) + { + //WS_DbgPrint(MIN_TRACE,("Line too long")); + return WSANO_RECOVERY; + } + + memmove(ServiceDBData, ThisLine, LineLen); + + ReadFile(ServicesFile, + ServiceDBData + LineLen, + sizeof( ServiceDBData )-1 - LineLen, + &ReadSize, + NULL); + + EndValid = ServiceDBData + LineLen + ReadSize; + NextLine = ServiceDBData + LineLen; + ThisLine = ServiceDBData; + + if (!ReadSize) break; + } + } + + *NextLine = '\0'; + Comment = strchr(ThisLine, '#'); + + if (Comment) + *Comment = '\0'; /* Terminate at comment start */ + + if (DecodeServEntFromString(ThisLine, + &ServiceName, + &PortNumberStr, + &ProtocolStr, + Aliases, + WS2_INTERNAL_MAX_ALIAS) && + (strlen(nameProtoA) == 0 || strcmp(ProtocolStr, nameProtoA) == 0)) + { + Found = (strcmp(ServiceName, nameServiceA) == 0 || strcmp(PortNumberStr, nameServiceA) == 0); + AliasPtr = Aliases; + while ((!Found) && (*AliasPtr != NULL)) + { + Found = (strcmp(*AliasPtr, nameServiceA) == 0); + AliasPtr++; + } + if (Found) + break; + } + NextLine++; + ThisLine = NextLine; + } + + /* This we'll do no matter what */ + CloseHandle(ServicesFile); + + if (!Found) + { + return WSANO_DATA; + } + + hostinfo->addr4 = 0; + hostinfo->servnameW = StrA2WHeapAlloc(hHeap, ServiceName); + hostinfo->servprotoW = StrA2WHeapAlloc(hHeap, ProtocolStr); + hostinfo->servaliasesA = StrAryCpyHeapAllocA(hHeap, (char**)&Aliases); + hostinfo->servport = atoi(PortNumberStr); + + res = NO_ERROR; + +End: + if (nameA != NULL) + HeapFree(hHeap, 0, nameA); + + if (nameServiceA != NULL) + HeapFree(hHeap, 0, nameServiceA); + + return res; +} + +INT +NSP_LookupServiceNextW(_In_ PWSHANDLEINTERN data, + _In_ DWORD CallID, + _Inout_ LPWSAQUERYSETW lpRes, + _Inout_ LPDWORD lpResLen) +{ + MSW_BUFFER buf; + WSHOSTINFOINTERN hostinfo; + INT result; + HANDLE hHeap = GetProcessHeap(); + WCHAR* ServiceInstanceNameW = NULL; + /* cleanup-vars */ + CHAR* ServiceInstanceNameA = NULL; + CHAR* ServiceProtocolNameA = NULL; + + RtlZeroMemory(&hostinfo, sizeof(hostinfo)); + + /* init and build result-buffer */ + mswBufferInit(&buf, (BYTE*)lpRes, *lpResLen); + mswBufferIncUsed(&buf, sizeof(*lpRes)); + + /* QueryDataSet-Size without "blob-data"-size! */ + lpRes->dwSize = sizeof(*lpRes); + lpRes->dwNameSpace = NS_DNS; + + if ((CallID == NSP_CALLID_HOSTNAME) || + (CallID == NSP_CALLID_HOSTBYNAME) || + (CallID == NSP_CALLID_SERVICEBYNAME)) + { + if (data->CallIDCounter >= 1) + { + result = WSAENOMORE; + goto End; + } + } + else + { + result = WSANO_RECOVERY; + goto End; + } + data->CallIDCounter++; + + if (CallID == NSP_CALLID_HOSTNAME) + { + result = NSP_GetHostNameHeapAllocW(&hostinfo.hostnameW); + + if (result != ERROR_SUCCESS) + goto End; + + hostinfo.addr4 = 0; + } + else if (CallID == NSP_CALLID_HOSTBYNAME) + { + result = NSP_GetHostByNameHeapAllocW(data->hostnameW, + &data->providerId, + &hostinfo); + if (result != ERROR_SUCCESS) + goto End; + } + else if (CallID == NSP_CALLID_SERVICEBYNAME) + { + result = NSP_GetServiceByNameHeapAllocW(data->hostnameW, + &data->providerId, + &hostinfo); + if (result != ERROR_SUCCESS) + goto End; + } + else + { + result = WSANO_RECOVERY; // Internal error! + goto End; + } + + if (((LUP_RETURN_BLOB & data->dwControlFlags) != 0) || + ((LUP_RETURN_NAME & data->dwControlFlags) != 0)) + { + if (CallID == NSP_CALLID_HOSTNAME || CallID == NSP_CALLID_HOSTBYNAME) + { + ServiceInstanceNameW = hostinfo.hostnameW; + ServiceInstanceNameA = StrW2AHeapAlloc(hHeap, ServiceInstanceNameW); + if (ServiceInstanceNameA == NULL) + { + result = WSAEFAULT; + goto End; + + } + } + if (CallID == NSP_CALLID_SERVICEBYNAME) + { + ServiceInstanceNameW = hostinfo.servnameW; + ServiceInstanceNameA = StrW2AHeapAlloc(hHeap, ServiceInstanceNameW); + if (ServiceInstanceNameA == NULL) + { + result = WSAEFAULT; + goto End; + + } + ServiceProtocolNameA = StrW2AHeapAlloc(hHeap, hostinfo.servprotoW); + if (ServiceProtocolNameA == NULL) + { + result = WSAEFAULT; + goto End; + + } + } + } + + if ((LUP_RETURN_ADDR & data->dwControlFlags) != 0) + { + if (!mswBufferAppendAddr_AddrInfoW(&buf, lpRes, hostinfo.addr4)) + { + *lpResLen = buf.bytesUsed; + result = WSAEFAULT; + goto End; + } + } + + if ((LUP_RETURN_BLOB & data->dwControlFlags) != 0) + { + if (CallID == NSP_CALLID_HOSTBYNAME) + { + /* Write data for PBLOB (hostent) */ + if (!mswBufferAppendBlob_Hostent(&buf, + lpRes, + ServiceInstanceNameA, + hostinfo.addr4)) + { + *lpResLen = buf.bytesUsed; + result = WSAEFAULT; + goto End; + } + } + else if (CallID == NSP_CALLID_SERVICEBYNAME) + { + /* Write data for PBLOB (servent) */ + if (!mswBufferAppendBlob_Servent(&buf, + lpRes, + ServiceInstanceNameA,/* ServiceName */ + hostinfo.servaliasesA, + ServiceProtocolNameA, + hostinfo.servport)) + { + *lpResLen = buf.bytesUsed; + result = WSAEFAULT; + goto End; + } + } + else + { + result = WSANO_RECOVERY; + goto End; + } + } + + if ((LUP_RETURN_NAME & data->dwControlFlags) != 0) + { + /* HostByName sets the ServiceInstanceName to a + (UNICODE)copy of hostent.h_name */ + lpRes->lpszServiceInstanceName = (LPWSTR)mswBufferEndPtr(&buf); + if (!mswBufferAppendStrW(&buf, ServiceInstanceNameW)) + { + lpRes->lpszServiceInstanceName = NULL; + *lpResLen = buf.bytesUsed; + result = WSAEFAULT; + goto End; + } + } + + *lpResLen = buf.bytesUsed; + + result = ERROR_SUCCESS; +End: + /* cleanup */ + if (ServiceInstanceNameA != NULL) + HeapFree(hHeap, 0, ServiceInstanceNameA); + + if (ServiceProtocolNameA != NULL) + HeapFree(hHeap, 0, ServiceProtocolNameA); + + if (hostinfo.hostnameW != NULL) + HeapFree(hHeap, 0, hostinfo.hostnameW); + + if (hostinfo.servnameW != NULL) + HeapFree(hHeap, 0, hostinfo.servnameW); + + if (hostinfo.servprotoW != NULL) + HeapFree(hHeap, 0, hostinfo.servprotoW); + + return result; +} + +/* Implementations - Exports */ +/* + * @implemented + */ +int +WINAPI +NSPStartup(_In_ LPGUID lpProviderId, + _Out_ LPNSP_ROUTINE lpRout) +{ + INT ret; + + if ((lpRout == NULL) || + (lpRout->cbSize != sizeof(NSP_ROUTINE))) + { + WSASetLastError(ERROR_INVALID_PARAMETER); + return ERROR_INVALID_PARAMETER; + } + + mwsNSPInit(); + + /* set own Provider GUID - maybe we need + here to set the original mswsock-GUID?! */ + + /* Win2k3 returns + - Version 1.1 + - no NSPIoctl + - sets cbSize to 44! */ + lpRout->dwMajorVersion = 1; + lpRout->dwMinorVersion = 1; + lpRout->cbSize = sizeof(*lpRout) - sizeof(lpRout->NSPIoctl); + lpRout->NSPCleanup = &mwsNSPCleanUp; + lpRout->NSPLookupServiceBegin = &mwsNSPLookupServiceBegin; + lpRout->NSPLookupServiceNext = &mwsNSPLookupServiceNext; + lpRout->NSPLookupServiceEnd = &mwsNSPLookupServiceEnd; + lpRout->NSPSetService = &mwsNSPSetService; + lpRout->NSPInstallServiceClass = &mwsNSPInstallServiceClass; + lpRout->NSPRemoveServiceClass = &mwsNSPRemoveServiceClass; + lpRout->NSPGetServiceClassInfo = &mwsNSPGetServiceClassInfo; + lpRout->NSPIoctl = NULL;// &mwsNSPIoCtl; + + ret = NO_ERROR; + + return ret; +} Propchange: trunk/reactos/dll/win32/mswsock/nsplookup.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mswsock/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/mswsock/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/stubs.c [iso-8859-1] Sun Sep 18 21:21:28 2016 @@ -9,6 +9,7 @@ #include "precomp.h" +#include <windef.h> #include <ws2spi.h> #include <nspapi.h> @@ -417,21 +418,6 @@ return TRUE; } - -/* - * @unimplemented - */ -INT -WINAPI -NSPStartup( - LPGUID lpProviderId, - LPNSP_ROUTINE lpnspRoutines - ) -{ - return TRUE; -} - - /* * @unimplemented */

1 0

[dchapyshev] 72734: [KERNEL32] - Remove unneded checks (these values can be received from table). - We have to insert UNICODE_NULL if it is the end of string or in string contains 0. * Fixes 12 tes...
by dchapyshev＠svn.reactos.org 18 Sep '16

18 Sep '16

Author: dchapyshev Date: Sun Sep 18 21:10:07 2016 New Revision: 72734 URL: http://svn.reactos.org/svn/reactos?rev=72734&view=rev Log: [KERNEL32] - Remove unneded checks (these values can be received from table). - We have to insert UNICODE_NULL if it is the end of string or in string contains 0. * Fixes 12 tests for kernel32:codepage Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Sun Sep 18 21:10:07 2016 @@ -523,9 +523,6 @@ { Char = *MultiByteString++; - if (Char < 0x80) - continue; - DBCSOffset = CodePageTable->DBCSOffsets[Char]; if (!DBCSOffset) @@ -542,12 +539,6 @@ { Char = *MultiByteString++; - if (Char < 0x80) - { - *WideCharString++ = Char; - continue; - } - DBCSOffset = CodePageTable->DBCSOffsets[Char]; if (!DBCSOffset) @@ -556,8 +547,19 @@ continue; } - if (MultiByteString < MbsEnd) - *WideCharString++ = CodePageTable->DBCSOffsets[DBCSOffset + *(PUCHAR)MultiByteString++]; + if (MultiByteString == MbsEnd) + { + *WideCharString++ = UNICODE_NULL; + } + else if (*MultiByteString == 0) + { + *WideCharString++ = UNICODE_NULL; + MultiByteString++; + } + else + { + *WideCharString++ = CodePageTable->DBCSOffsets[DBCSOffset + (UCHAR)*MultiByteString++]; + } } if (MultiByteString < MbsEnd) @@ -902,41 +904,43 @@ SetLastError(ERROR_INVALID_PARAMETER); return 0; } + CodePageTable = &CodePageEntry->CodePageTable; /* Different handling for DBCS code pages. */ - if (CodePageTable->MaximumCharacterSize > 1) + if (CodePageTable->DBCSCodePage) { /* If Flags, DefaultChar or UsedDefaultChar were given, we have to do some more work */ - if(Flags || DefaultChar || UsedDefaultChar) + if (Flags || DefaultChar || UsedDefaultChar) { BOOL TempUsedDefaultChar; USHORT DefChar; /* If UsedDefaultChar is not set, set it to a temporary value, so we don't have to check on every character */ - if(!UsedDefaultChar) + if (!UsedDefaultChar) UsedDefaultChar = &TempUsedDefaultChar; *UsedDefaultChar = FALSE; /* Use the CodePage's TransDefaultChar if none was given. Don't modify the DefaultChar pointer here. */ - if(DefaultChar) + if (DefaultChar) DefChar = DefaultChar[1] ? ((DefaultChar[0] << 8) | DefaultChar[1]) : DefaultChar[0]; else DefChar = CodePageTable->TransDefaultChar; /* Does caller query for output buffer size? */ - if(!MultiByteCount) - { - for(TempLength = 0; WideCharCount; WideCharCount--, WideCharString++, TempLength++) + if (!MultiByteCount) + { + for (TempLength = 0; WideCharCount; WideCharCount--, WideCharString++, TempLength++) { USHORT uChar; if ((Flags & WC_COMPOSITECHECK) && WideCharCount > 1) { /* FIXME: Handle WC_COMPOSITECHECK */ + DPRINT1("WC_COMPOSITECHECK flag UNIMPLEMENTED\n"); } uChar = ((PUSHORT) CodePageTable->WideCharTable)[*WideCharString]; @@ -957,15 +961,16 @@ } /* Convert the WideCharString to the MultiByteString and verify if the mapping is valid */ - for(TempLength = MultiByteCount; - WideCharCount && TempLength; - TempLength--, WideCharString++, WideCharCount--) + for (TempLength = MultiByteCount; + WideCharCount && TempLength; + TempLength--, WideCharString++, WideCharCount--) { USHORT uChar; if ((Flags & WC_COMPOSITECHECK) && WideCharCount > 1) { /* FIXME: Handle WC_COMPOSITECHECK */ + DPRINT1("WC_COMPOSITECHECK flag UNIMPLEMENTED\n"); } uChar = ((PUSHORT)CodePageTable->WideCharTable)[*WideCharString]; @@ -1044,7 +1049,7 @@ return MultiByteCount - TempLength; } - else /* Not DBCS code page */ + else /* SBCS code page */ { INT nReturn; @@ -1070,6 +1075,7 @@ if ((Flags & WC_COMPOSITECHECK) && WideCharCount > 1) { /* FIXME: Handle WC_COMPOSITECHECK */ + DPRINT1("WC_COMPOSITECHECK flag UNIMPLEMENTED\n"); } if (!*UsedDefaultChar) @@ -1096,6 +1102,7 @@ if ((Flags & WC_COMPOSITECHECK) && WideCharCount > 1) { /* FIXME: Handle WC_COMPOSITECHECK */ + DPRINT1("WC_COMPOSITECHECK flag UNIMPLEMENTED\n"); } *MultiByteString = ((PCHAR)CodePageTable->WideCharTable)[*WideCharString];

1 0

[dchapyshev] 72733: [KERNEL32] Add missed type-casting * Fixes 28 tests for kernel32:codepage
by dchapyshev＠svn.reactos.org 18 Sep '16

18 Sep '16

Author: dchapyshev Date: Sun Sep 18 20:11:05 2016 New Revision: 72733 URL: http://svn.reactos.org/svn/reactos?rev=72733&view=rev Log: [KERNEL32] Add missed type-casting * Fixes 28 tests for kernel32:codepage Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Sun Sep 18 20:11:05 2016 @@ -476,7 +476,7 @@ while (TempString < MbsEnd) { - DBCSOffset = CodePageTable->DBCSOffsets[*TempString]; + DBCSOffset = CodePageTable->DBCSOffsets[(UCHAR)*TempString]; if (DBCSOffset) { @@ -487,7 +487,7 @@ return 0; } - WideChar = CodePageTable->DBCSOffsets[*(TempString + 1) + DBCSOffset]; + WideChar = CodePageTable->DBCSOffsets[DBCSOffset + *(TempString + 1)]; if (WideChar == CodePageTable->UniDefaultChar && MAKEWORD(*(TempString + 1), *TempString) != CodePageTable->TransUniDefaultChar) @@ -500,7 +500,7 @@ } else { - USHORT WideChar = MultiByteTable[(UCHAR)*TempString]; + WideChar = MultiByteTable[(UCHAR)*TempString]; if ((WideChar == CodePageTable->UniDefaultChar && *TempString != CodePageTable->TransUniDefaultChar) || @@ -568,7 +568,7 @@ return Count; } - else /* Not DBCS code page */ + else /* SBCS code page */ { /* Check for invalid characters. */ if (Flags & MB_ERR_INVALID_CHARS) @@ -609,7 +609,7 @@ SetLastError(ERROR_INSUFFICIENT_BUFFER); return 0; } - return MultiByteCount; + return MultiByteCount; } }

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