Ros-diffs June 2013

ros-diffs@reactos.org

14 participants
274 discussions

[hbelusca] 59284: [CMAKE] As ThFabba said: " - Properly escape exclamation mark in configure message " <-- It's for delayed variable expansions in CMD scripts !! That's the true reason ! See r59281...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jun 22 11:11:35 2013 New Revision: 59284 URL: http://svn.reactos.org/svn/reactos?rev=59284&view=rev Log: [CMAKE] As ThFabba said: " - Properly escape exclamation mark in configure message " <-- It's for delayed variable expansions in CMD scripts !! That's the true reason ! See r59281. (The r59283 was a commit I've done because, independently (i.e. without seeing r59281), it happened for some reason that this phenomenon didn't appear at home, and after updating my local copy and rerunning a configure.cmd, I saw ^ characters before the ! . In fact it was because I temporarily disabled the delayed expansion vars in my configure script). Therefore revert my error, shame on me :) Modified: trunk/reactos/configure.cmd Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=59284&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sat Jun 22 11:11:35 2013 @@ -186,7 +186,7 @@ cd.. -echo Configure script complete! Enter directories and execute appropriate build commands (ex: ninja, make, nmake, etc...). +echo Configure script complete^^! Enter directories and execute appropriate build commands (ex: ninja, make, nmake, etc...). exit /b :cmake_notfound

11 years, 2 months

[hbelusca] 59283: - Remove two strange characters in configure.cmd - Add a space between a word and an opening parenthese (in the informative message) in configure.sh

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jun 22 10:54:11 2013 New Revision: 59283 URL: http://svn.reactos.org/svn/reactos?rev=59283&view=rev Log: - Remove two strange characters in configure.cmd - Add a space between a word and an opening parenthese (in the informative message) in configure.sh Modified: trunk/reactos/configure.cmd trunk/reactos/configure.sh Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=59283&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sat Jun 22 10:54:11 2013 @@ -186,7 +186,7 @@ cd.. -echo Configure script complete^^! Enter directories and execute appropriate build commands (ex: ninja, make, nmake, etc...). +echo Configure script complete! Enter directories and execute appropriate build commands (ex: ninja, make, nmake, etc...). exit /b :cmake_notfound Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=59283&r1=… ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Sat Jun 22 10:54:11 2013 @@ -59,4 +59,4 @@ cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR" -echo Configure script complete! Enter directories and execute appropriate build commands$ex: ninja, make, makex, etc...$. +echo Configure script complete! Enter directories and execute appropriate build commands $ex: ninja, make, makex, etc...$.

11 years, 2 months

[ekohl] 59282: [SAMSRV] Clean-up the setup code: - Use SampRegXxx functions instead of RegXxx functions. - Let the setup functions return NTSTATUS instead of BOOL. - Use a separate function to crea...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jun 22 09:13:53 2013 New Revision: 59282 URL: http://svn.reactos.org/svn/reactos?rev=59282&view=rev Log: [SAMSRV] Clean-up the setup code: - Use SampRegXxx functions instead of RegXxx functions. - Let the setup functions return NTSTATUS instead of BOOL. - Use a separate function to create the server object. Modified: trunk/reactos/dll/win32/samsrv/setup.c Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Sat Jun 22 09:13:53 2013 @@ -88,63 +88,71 @@ } -static BOOL -SampSetupCreateAliasAccount(HKEY hDomainKey, +static +NTSTATUS +SampSetupCreateAliasAccount(HANDLE hDomainKey, LPCWSTR lpAccountName, LPCWSTR lpDescription, ULONG ulRelativeId) { - DWORD dwDisposition; WCHAR szAccountKeyName[32]; - HKEY hAccountKey = NULL; - HKEY hNamesKey = NULL; + HANDLE hAccountKey = NULL; + HANDLE hNamesKey = NULL; + NTSTATUS Status; swprintf(szAccountKeyName, L"Aliases\\%08lX", ulRelativeId); - if (!RegCreateKeyExW(hDomainKey, - szAccountKeyName, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hAccountKey, - &dwDisposition)) - { - RegSetValueEx(hAccountKey, - L"Name", - 0, - REG_SZ, - (LPVOID)lpAccountName, - (wcslen(lpAccountName) + 1) * sizeof(WCHAR)); - - RegSetValueEx(hAccountKey, - L"Description", - 0, - REG_SZ, - (LPVOID)lpDescription, - (wcslen(lpDescription) + 1) * sizeof(WCHAR)); - - RegCloseKey(hAccountKey); - } - - if (!RegOpenKeyExW(hDomainKey, - L"Aliases\\Names", - 0, - KEY_ALL_ACCESS, - &hNamesKey)) - { - RegSetValueEx(hNamesKey, - lpAccountName, - 0, - REG_DWORD, - (LPVOID)&ulRelativeId, - sizeof(ULONG)); - - RegCloseKey(hNamesKey); - } - - return TRUE; + Status = SampRegCreateKey(hDomainKey, + szAccountKeyName, + KEY_ALL_ACCESS, + &hAccountKey); + if (!NT_SUCCESS(Status)) + return Status; + + Status = SampRegSetValue(hAccountKey, + L"Name", + REG_SZ, + (LPVOID)lpAccountName, + (wcslen(lpAccountName) + 1) * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegSetValue(hAccountKey, + L"Description", + REG_SZ, + (LPVOID)lpDescription, + (wcslen(lpDescription) + 1) * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + goto done; + + + Status = SampRegOpenKey(hDomainKey, + L"Aliases\\Names", + KEY_ALL_ACCESS, + &hNamesKey); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegSetValue(hNamesKey, + lpAccountName, + REG_DWORD, + (LPVOID)&ulRelativeId, + sizeof(ULONG)); + +done: + if (hNamesKey != NULL) + SampRegCloseKey(hNamesKey); + + if (hAccountKey != NULL) + { + SampRegCloseKey(hAccountKey); + + if (!NT_SUCCESS(Status)) + SampRegDeleteKey(hDomainKey, + szAccountKeyName); + } + + return Status; } @@ -310,8 +318,9 @@ } -static BOOL -SampSetupCreateUserAccount(HKEY hDomainKey, +static +NTSTATUS +SampSetupCreateUserAccount(HANDLE hDomainKey, LPCWSTR lpAccountName, LPCWSTR lpComment, ULONG ulRelativeId, @@ -321,10 +330,10 @@ GROUP_MEMBERSHIP GroupMembership; UCHAR LogonHours[23]; LPWSTR lpEmptyString = L""; - DWORD dwDisposition; WCHAR szAccountKeyName[32]; - HKEY hAccountKey = NULL; - HKEY hNamesKey = NULL; + HANDLE hAccountKey = NULL; + HANDLE hNamesKey = NULL; + NTSTATUS Status; /* Initialize fixed user data */ FixedUserData.Version = 1; @@ -347,189 +356,213 @@ swprintf(szAccountKeyName, L"Users\\%08lX", ulRelativeId); - if (!RegCreateKeyExW(hDomainKey, - szAccountKeyName, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hAccountKey, - &dwDisposition)) - { - RegSetValueEx(hAccountKey, - L"F", - 0, - REG_BINARY, - (LPVOID)&FixedUserData, - sizeof(SAM_USER_FIXED_DATA)); - - RegSetValueEx(hAccountKey, - L"Name", - 0, - REG_SZ, - (LPVOID)lpAccountName, - (wcslen(lpAccountName) + 1) * sizeof(WCHAR)); - - RegSetValueEx(hAccountKey, - L"FullName", - 0, - REG_SZ, - (LPVOID)lpEmptyString, - sizeof(WCHAR)); - - RegSetValueEx(hAccountKey, - L"HomeDirectory", - 0, - REG_SZ, - (LPVOID)lpEmptyString, - sizeof(WCHAR)); - - RegSetValueEx(hAccountKey, - L"HomeDirectoryDrive", - 0, - REG_SZ, - (LPVOID)lpEmptyString, - sizeof(WCHAR)); - - RegSetValueEx(hAccountKey, - L"ScriptPath", - 0, - REG_SZ, - (LPVOID)lpEmptyString, - sizeof(WCHAR)); - - RegSetValueEx(hAccountKey, - L"ProfilePath", - 0, - REG_SZ, - (LPVOID)lpEmptyString, - sizeof(WCHAR)); - - RegSetValueEx(hAccountKey, - L"AdminComment", - 0, - REG_SZ, - (LPVOID)lpComment, - (wcslen(lpComment) + 1) * sizeof(WCHAR)); - - RegSetValueEx(hAccountKey, - L"UserComment", - 0, - REG_SZ, - (LPVOID)lpEmptyString, - sizeof(WCHAR)); - - RegSetValueEx(hAccountKey, - L"WorkStations", - 0, - REG_SZ, - (LPVOID)lpEmptyString, - sizeof(WCHAR)); - - RegSetValueEx(hAccountKey, - L"Parameters", - 0, - REG_SZ, - (LPVOID)lpEmptyString, - sizeof(WCHAR)); - - /* Set LogonHours attribute*/ - *((PUSHORT)LogonHours) = 168; - memset(&(LogonHours[2]), 0xff, 21); - - RegSetValueEx(hAccountKey, - L"LogonHours", - 0, - REG_BINARY, - (LPVOID)LogonHours, - sizeof(LogonHours)); - - /* Set Groups attribute*/ - GroupMembership.RelativeId = DOMAIN_GROUP_RID_USERS; - GroupMembership.Attributes = SE_GROUP_MANDATORY | - SE_GROUP_ENABLED | - SE_GROUP_ENABLED_BY_DEFAULT; - - RegSetValueEx(hAccountKey, - L"Groups", - 0, - REG_BINARY, - (LPVOID)&GroupMembership, - sizeof(GROUP_MEMBERSHIP)); - - /* Set LMPwd attribute*/ - RegSetValueEx(hAccountKey, - L"LMPwd", - 0, - REG_BINARY, - (LPVOID)&EmptyLmHash, - sizeof(ENCRYPTED_LM_OWF_PASSWORD)); - - /* Set NTPwd attribute*/ - RegSetValueEx(hAccountKey, - L"NTPwd", - 0, - REG_BINARY, - (LPVOID)&EmptyNtHash, - sizeof(ENCRYPTED_NT_OWF_PASSWORD)); - - /* Set LMPwdHistory attribute*/ - RegSetValueEx(hAccountKey, - L"LMPwdHistory", - 0, - REG_BINARY, - NULL, - 0); - - /* Set NTPwdHistory attribute*/ - RegSetValueEx(hAccountKey, - L"NTPwdHistory", - 0, - REG_BINARY, - NULL, - 0); - - /* FIXME: Set SecDesc attribute*/ - - RegCloseKey(hAccountKey); - } - - if (!RegOpenKeyExW(hDomainKey, - L"Users\\Names", - 0, - KEY_ALL_ACCESS, - &hNamesKey)) - { - RegSetValueEx(hNamesKey, - lpAccountName, - 0, - REG_DWORD, - (LPVOID)&ulRelativeId, - sizeof(ULONG)); - - RegCloseKey(hNamesKey); - } - - return TRUE; + Status = SampRegCreateKey(hDomainKey, + szAccountKeyName, + KEY_ALL_ACCESS, + &hAccountKey); + if (!NT_SUCCESS(Status)) + return Status; + + Status = SampRegSetValue(hAccountKey, + L"F", + REG_BINARY, + (LPVOID)&FixedUserData, + sizeof(SAM_USER_FIXED_DATA)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegSetValue(hAccountKey, + L"Name", + REG_SZ, + (LPVOID)lpAccountName, + (wcslen(lpAccountName) + 1) * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegSetValue(hAccountKey, + L"FullName", + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegSetValue(hAccountKey, + L"HomeDirectory", + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegSetValue(hAccountKey, + L"HomeDirectoryDrive", + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegSetValue(hAccountKey, + L"ScriptPath", + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegSetValue(hAccountKey, + L"ProfilePath", + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegSetValue(hAccountKey, + L"AdminComment", + REG_SZ, + (LPVOID)lpComment, + (wcslen(lpComment) + 1) * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegSetValue(hAccountKey, + L"UserComment", + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegSetValue(hAccountKey, + L"WorkStations", + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegSetValue(hAccountKey, + L"Parameters", + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set LogonHours attribute*/ + *((PUSHORT)LogonHours) = 168; + memset(&(LogonHours[2]), 0xff, 21); + + Status = SampRegSetValue(hAccountKey, + L"LogonHours", + REG_BINARY, + (LPVOID)LogonHours, + sizeof(LogonHours)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set Groups attribute*/ + GroupMembership.RelativeId = DOMAIN_GROUP_RID_USERS; + GroupMembership.Attributes = SE_GROUP_MANDATORY | + SE_GROUP_ENABLED | + SE_GROUP_ENABLED_BY_DEFAULT; + + Status = SampRegSetValue(hAccountKey, + L"Groups", + REG_BINARY, + (LPVOID)&GroupMembership, + sizeof(GROUP_MEMBERSHIP)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set LMPwd attribute*/ + Status = SampRegSetValue(hAccountKey, + L"LMPwd", + REG_BINARY, + (LPVOID)&EmptyLmHash, + sizeof(ENCRYPTED_LM_OWF_PASSWORD)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set NTPwd attribute*/ + Status = SampRegSetValue(hAccountKey, + L"NTPwd", + REG_BINARY, + (LPVOID)&EmptyNtHash, + sizeof(ENCRYPTED_NT_OWF_PASSWORD)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set LMPwdHistory attribute*/ + Status = SampRegSetValue(hAccountKey, + L"LMPwdHistory", + REG_BINARY, + NULL, + 0); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set NTPwdHistory attribute*/ + Status = SampRegSetValue(hAccountKey, + L"NTPwdHistory", + REG_BINARY, + NULL, + 0); + if (!NT_SUCCESS(Status)) + goto done; + + /* FIXME: Set SecDesc attribute*/ + + + Status = SampRegOpenKey(hDomainKey, + L"Users\\Names", + KEY_ALL_ACCESS, + &hNamesKey); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegSetValue(hNamesKey, + lpAccountName, + REG_DWORD, + (LPVOID)&ulRelativeId, + sizeof(ULONG)); + +done: + if (hNamesKey != NULL) + SampRegCloseKey(hNamesKey); + + if (hAccountKey != NULL) + { + SampRegCloseKey(hAccountKey); + + if (!NT_SUCCESS(Status)) + SampRegDeleteKey(hDomainKey, + szAccountKeyName); + } + + return Status; } -static BOOL -SampSetupCreateDomain(IN HKEY hDomainsKey, +static +NTSTATUS +SampSetupCreateDomain(IN HANDLE hServerKey, IN LPCWSTR lpKeyName, IN LPCWSTR lpDomainName, IN PSID lpDomainSid, - OUT PHKEY lpDomainKey) + OUT HANDLE *lpDomainKey) { SAM_DOMAIN_FIXED_DATA FixedData; + WCHAR szDomainKeyName[32]; LPWSTR lpEmptyString = L""; - DWORD dwDisposition; - HKEY hDomainKey = NULL; - HKEY hAliasesKey = NULL; - HKEY hGroupsKey = NULL; - HKEY hUsersKey = NULL; - HKEY hNamesKey = NULL; + HANDLE hDomainKey = NULL; + HANDLE hAliasesKey = NULL; + HANDLE hGroupsKey = NULL; + HANDLE hUsersKey = NULL; + HANDLE hNamesKey = NULL; + NTSTATUS Status; if (lpDomainKey != NULL) *lpDomainKey = NULL; @@ -554,137 +587,164 @@ FixedData.DomainServerRole = DomainServerRolePrimary; FixedData.UasCompatibilityRequired = TRUE; - if (RegCreateKeyExW(hDomainsKey, - lpKeyName, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hDomainKey, - &dwDisposition)) - return FALSE; + wcscpy(szDomainKeyName, L"Domains\\"); + wcscat(szDomainKeyName, lpKeyName); + + Status = SampRegCreateKey(hServerKey, + szDomainKeyName, + KEY_ALL_ACCESS, + &hDomainKey); + if (!NT_SUCCESS(Status)) + return Status; /* Set the fixed data value */ - if (RegSetValueEx(hDomainKey, - L"F", - 0, - REG_BINARY, - (LPVOID)&FixedData, - sizeof(SAM_DOMAIN_FIXED_DATA))) - return FALSE; + Status = SampRegSetValue(hDomainKey, + L"F", + REG_BINARY, + (LPVOID)&FixedData, + sizeof(SAM_DOMAIN_FIXED_DATA)); + if (!NT_SUCCESS(Status)) + goto done; if (lpDomainSid != NULL) { - RegSetValueEx(hDomainKey, - L"Name", - 0, - REG_SZ, - (LPVOID)lpDomainName, - (wcslen(lpDomainName) + 1) * sizeof(WCHAR)); - - RegSetValueEx(hDomainKey, - L"SID", - 0, - REG_BINARY, - (LPVOID)lpDomainSid, - RtlLengthSid(lpDomainSid)); - } - - RegSetValueEx(hDomainKey, - L"OemInformation", - 0, - REG_SZ, - (LPVOID)lpEmptyString, - sizeof(WCHAR)); - - RegSetValueEx(hDomainKey, - L"ReplicaSourceNodeName", - 0, - REG_SZ, - (LPVOID)lpEmptyString, - sizeof(WCHAR)); + Status = SampRegSetValue(hDomainKey, + L"Name", + REG_SZ, + (LPVOID)lpDomainName, + (wcslen(lpDomainName) + 1) * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegSetValue(hDomainKey, + L"SID", + REG_BINARY, + (LPVOID)lpDomainSid, + RtlLengthSid(lpDomainSid)); + if (!NT_SUCCESS(Status)) + goto done; + } + + Status = SampRegSetValue(hDomainKey, + L"OemInformation", + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegSetValue(hDomainKey, + L"ReplicaSourceNodeName", + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + goto done; /* Create the Alias container */ - if (!RegCreateKeyExW(hDomainKey, - L"Aliases", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hAliasesKey, - &dwDisposition)) - { - if (!RegCreateKeyExW(hAliasesKey, - L"Names", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hNamesKey, - &dwDisposition)) - RegCloseKey(hNamesKey); - - RegCloseKey(hAliasesKey); - } + Status = SampRegCreateKey(hDomainKey, + L"Aliases", + KEY_ALL_ACCESS, + &hAliasesKey); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegCreateKey(hAliasesKey, + L"Names", + KEY_ALL_ACCESS, + &hNamesKey); + if (!NT_SUCCESS(Status)) + goto done; + + SampRegCloseKey(hNamesKey); /* Create the Groups container */ - if (!RegCreateKeyExW(hDomainKey, - L"Groups", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hGroupsKey, - &dwDisposition)) - { - if (!RegCreateKeyExW(hGroupsKey, - L"Names", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hNamesKey, - &dwDisposition)) - RegCloseKey(hNamesKey); - - RegCloseKey(hGroupsKey); - } - + Status = SampRegCreateKey(hDomainKey, + L"Groups", + KEY_ALL_ACCESS, + &hGroupsKey); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegCreateKey(hGroupsKey, + L"Names", + KEY_ALL_ACCESS, + &hNamesKey); + if (!NT_SUCCESS(Status)) + goto done; + + SampRegCloseKey(hNamesKey); /* Create the Users container */ - if (!RegCreateKeyExW(hDomainKey, - L"Users", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hUsersKey, - &dwDisposition)) - { - if (!RegCreateKeyExW(hUsersKey, - L"Names", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hNamesKey, - &dwDisposition)) - RegCloseKey(hNamesKey); - - RegCloseKey(hUsersKey); - } + Status = SampRegCreateKey(hDomainKey, + L"Users", + KEY_ALL_ACCESS, + &hUsersKey); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampRegCreateKey(hUsersKey, + L"Names", + KEY_ALL_ACCESS, + &hNamesKey); + if (!NT_SUCCESS(Status)) + goto done; + + SampRegCloseKey(hNamesKey); if (lpDomainKey != NULL) *lpDomainKey = hDomainKey; - return TRUE; +done: + if (hAliasesKey != NULL) + SampRegCloseKey(hAliasesKey); + + if (hGroupsKey != NULL) + SampRegCloseKey(hGroupsKey); + + if (hUsersKey != NULL) + SampRegCloseKey(hUsersKey); + + if (!NT_SUCCESS(Status)) + { + if (hDomainKey != NULL) + SampRegCloseKey(hDomainKey); + } + + return Status; +} + + +static +NTSTATUS +SampSetupCreateServer(IN HANDLE hSamKey, + OUT HANDLE *lpServerKey) +{ + HANDLE hServerKey = NULL; + HANDLE hDomainsKey = NULL; + NTSTATUS Status; + + Status = SampRegCreateKey(hSamKey, + L"SAM", + KEY_ALL_ACCESS, + &hServerKey); + if (!NT_SUCCESS(Status)) + return Status; + + Status = SampRegCreateKey(hServerKey, + L"Domains", + KEY_ALL_ACCESS, + &hDomainsKey); + if (!NT_SUCCESS(Status)) + goto done; + + SampRegCloseKey(hDomainsKey); + + *lpServerKey = hServerKey; + +done: + + return Status; } @@ -724,10 +784,10 @@ SampInitializeSAM(VOID) { PPOLICY_ACCOUNT_DOMAIN_INFO AccountDomainInfo = NULL; - DWORD dwDisposition; - HKEY hSamKey = NULL; - HKEY hDomainsKey = NULL; - HKEY hDomainKey = NULL; + HANDLE hSamKey = NULL; + HANDLE hServerKey = NULL; + HANDLE hBuiltinDomainKey = NULL; + HANDLE hAccountDomainKey = NULL; PSID pBuiltinSid = NULL; BOOL bResult = TRUE; PSID pSid; @@ -740,37 +800,25 @@ hInstance = GetModuleHandleW(L"samsrv.dll"); - if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, - L"SAM\\SAM", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hSamKey, - &dwDisposition)) - { - ERR("Failed to create 'Sam' key! (Error %lu)\n", GetLastError()); + /* Open the SAM key */ + Status = SampRegOpenKey(NULL, + L"\\Registry\\Machine\\SAM", + KEY_READ | KEY_CREATE_SUB_KEY | KEY_ENUMERATE_SUB_KEYS, + &hSamKey); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to open the SAM key (Status: 0x%08lx)\n", Status); return FALSE; } - if (RegCreateKeyExW(hSamKey, - L"Domains", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hDomainsKey, - &dwDisposition)) - { - ERR("Failed to create 'Domains' key! (Error %lu)\n", GetLastError()); + /* Create the SAM Server object */ + Status = SampSetupCreateServer(hSamKey, + &hServerKey); + if (!NT_SUCCESS(Status)) + { bResult = FALSE; goto done; } - - RegCloseKey(hSamKey); - hSamKey = NULL; /* Create and initialize the Builtin Domain SID */ pBuiltinSid = RtlAllocateHeap(RtlGetProcessHeap(), 0, RtlLengthRequiredSid(1)); @@ -796,16 +844,21 @@ SampLoadString(hInstance, IDS_DOMAIN_BUILTIN_NAME, szName, 80); /* Create the Builtin domain */ - if (SampSetupCreateDomain(hDomainsKey, - L"Builtin", - szName, - pBuiltinSid, - &hDomainKey)) - { - SampLoadString(hInstance, IDS_ALIAS_ADMINISTRATORS_NAME, szName, 80); - SampLoadString(hInstance, IDS_ALIAS_ADMINISTRATORS_COMMENT, szComment, 256); - - SampSetupCreateAliasAccount(hDomainKey, + Status = SampSetupCreateDomain(hServerKey, + L"Builtin", + szName, + pBuiltinSid, + &hBuiltinDomainKey); + if (!NT_SUCCESS(Status)) + { + bResult = FALSE; + goto done; + } + + SampLoadString(hInstance, IDS_ALIAS_ADMINISTRATORS_NAME, szName, 80); + SampLoadString(hInstance, IDS_ALIAS_ADMINISTRATORS_COMMENT, szComment, 256); + + SampSetupCreateAliasAccount(hBuiltinDomainKey, szName, szComment, DOMAIN_ALIAS_RID_ADMINS); @@ -813,7 +866,7 @@ SampLoadString(hInstance, IDS_ALIAS_USERS_NAME, szName, 80); SampLoadString(hInstance, IDS_ALIAS_USERS_COMMENT, szComment, 256); - SampSetupCreateAliasAccount(hDomainKey, + SampSetupCreateAliasAccount(hBuiltinDomainKey, szName, szComment, DOMAIN_ALIAS_RID_USERS); @@ -821,7 +874,7 @@ SampLoadString(hInstance, IDS_ALIAS_GUESTS_NAME, szName, 80); SampLoadString(hInstance, IDS_ALIAS_GUESTS_COMMENT, szComment, 256); - SampSetupCreateAliasAccount(hDomainKey, + SampSetupCreateAliasAccount(hBuiltinDomainKey, szName, szComment, DOMAIN_ALIAS_RID_GUESTS); @@ -829,7 +882,7 @@ SampLoadString(hInstance, IDS_ALIAS_POWER_USERS_NAME, szName, 80); SampLoadString(hInstance, IDS_ALIAS_POWER_USERS_COMMENT, szComment, 256); - SampSetupCreateAliasAccount(hDomainKey, + SampSetupCreateAliasAccount(hBuiltinDomainKey, szName, szComment, DOMAIN_ALIAS_RID_POWER_USERS); @@ -839,7 +892,7 @@ DOMAIN_USER_RID_ADMIN); if (pSid != NULL) { - SampSetupAddMemberToAlias(hDomainKey, + SampSetupAddMemberToAlias(hBuiltinDomainKey, DOMAIN_ALIAS_RID_ADMINS, pSid); @@ -851,27 +904,30 @@ DOMAIN_USER_RID_GUEST); if (pSid != NULL) { - SampSetupAddMemberToAlias(hDomainKey, + SampSetupAddMemberToAlias(hBuiltinDomainKey, DOMAIN_ALIAS_RID_GUESTS, pSid); RtlFreeHeap(RtlGetProcessHeap(), 0, pSid); } - RegCloseKey(hDomainKey); - } /* Create the Account domain */ - if (SampSetupCreateDomain(hDomainsKey, - L"Account", - L"", - AccountDomainInfo->DomainSid, - &hDomainKey)) - { + Status = SampSetupCreateDomain(hServerKey, + L"Account", + L"", + AccountDomainInfo->DomainSid, + &hAccountDomainKey); + if (!NT_SUCCESS(Status)) + { + bResult = FALSE; + goto done; + } + SampLoadString(hInstance, IDS_GROUP_NONE_NAME, szName, 80); SampLoadString(hInstance, IDS_GROUP_NONE_COMMENT, szComment, 256); - SampSetupCreateGroupAccount(hDomainKey, + SampSetupCreateGroupAccount(hAccountDomainKey, szName, szComment, DOMAIN_GROUP_RID_USERS); @@ -879,31 +935,28 @@ SampLoadString(hInstance, IDS_USER_ADMINISTRATOR_NAME, szName, 80); SampLoadString(hInstance, IDS_USER_ADMINISTRATOR_COMMENT, szComment, 256); - SampSetupCreateUserAccount(hDomainKey, + SampSetupCreateUserAccount(hAccountDomainKey, szName, szComment, DOMAIN_USER_RID_ADMIN, USER_DONT_EXPIRE_PASSWORD | USER_NORMAL_ACCOUNT); - SampSetupAddMemberToGroup(hDomainKey, + SampSetupAddMemberToGroup(hAccountDomainKey, DOMAIN_GROUP_RID_USERS, DOMAIN_USER_RID_ADMIN); SampLoadString(hInstance, IDS_USER_GUEST_NAME, szName, 80); SampLoadString(hInstance, IDS_USER_GUEST_COMMENT, szComment, 256); - SampSetupCreateUserAccount(hDomainKey, + SampSetupCreateUserAccount(hAccountDomainKey, szName, szComment, DOMAIN_USER_RID_GUEST, USER_ACCOUNT_DISABLED | USER_DONT_EXPIRE_PASSWORD | USER_NORMAL_ACCOUNT); - SampSetupAddMemberToGroup(hDomainKey, + SampSetupAddMemberToGroup(hAccountDomainKey, DOMAIN_GROUP_RID_USERS, DOMAIN_USER_RID_GUEST); - - RegCloseKey(hDomainKey); - } done: if (AccountDomainInfo) @@ -912,11 +965,17 @@ if (pBuiltinSid) RtlFreeHeap(RtlGetProcessHeap(), 0, pBuiltinSid); - if (hDomainsKey) - RegCloseKey(hDomainsKey); - - if (hSamKey) - RegCloseKey(hSamKey); + if (hAccountDomainKey != NULL) + SampRegCloseKey(hAccountDomainKey); + + if (hBuiltinDomainKey != NULL) + SampRegCloseKey(hBuiltinDomainKey); + + if (hServerKey != NULL) + SampRegCloseKey(hServerKey); + + if (hSamKey != NULL) + SampRegCloseKey(hSamKey); TRACE("SampInitializeSAM() done\n");

11 years, 2 months

[tfaber] 59281: [CMAKE] - configure no longer defaults to nmake, don't confuse the user - Properly escape exclamation mark in configure message

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jun 22 08:05:50 2013 New Revision: 59281 URL: http://svn.reactos.org/svn/reactos?rev=59281&view=rev Log: [CMAKE] - configure no longer defaults to nmake, don't confuse the user - Properly escape exclamation mark in configure message Modified: trunk/reactos/configure.cmd Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=59281&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sat Jun 22 08:05:50 2013 @@ -21,7 +21,7 @@ :: Get the source root directory set REACTOS_SOURCE_DIR=%~dp0 -set USE_NMAKE=0 +set USE_VSCMD=0 :: Detect presence of cmake cmd /c cmake --version 2>&1 | find "cmake version" > NUL || goto cmake_notfound @@ -49,7 +49,7 @@ ) else if "%_BUILDARCH%" == "AMD64" ( set ARCH=amd64 ) - set USE_NMAKE=1 + set USE_VSCMD=1 set USE_WDK_HEADERS=0 ) else if defined VCINSTALLDIR ( @@ -96,8 +96,8 @@ ) ) ) else ( - set USE_NMAKE=1 - echo This script defaults to nmake. To use Visual Studio GUI specify "VSSolution" as a parameter. + set USE_VSCMD=1 + echo This script defaults to Ninja. To use Visual Studio GUI specify "VSSolution" as a parameter. ) ) else if defined sdkdir ( @@ -109,7 +109,7 @@ ) set BUILD_ENVIRONMENT=SDK - set USE_NMAKE=1 + set USE_VSCMD=1 ) else ( echo Error: Unable to detect build environment. Configure script failure. @@ -122,8 +122,8 @@ exit /b ) -:: Detect nmake generator -if %USE_NMAKE% == 1 ( +:: Detect VS command line generator +if %USE_VSCMD% == 1 ( if /I "%1" == "CodeBlocks" ( set CMAKE_GENERATOR="CodeBlocks - NMake Makefiles" ) else if /I "%1" == "Eclipse" ( @@ -186,9 +186,9 @@ cd.. -echo Configure script complete! Enter directories and execute appropriate build commands(ex: ninja, make, nmake, etc...). +echo Configure script complete^^! Enter directories and execute appropriate build commands (ex: ninja, make, nmake, etc...). exit /b :cmake_notfound - echo Unable to find cmake, if it is installed, check your PATH variable. - exit /b +echo Unable to find cmake, if it is installed, check your PATH variable. +exit /b

11 years, 2 months

[hbelusca] 59280: [NTVDM] Use correctly NDEBUG, and use ReactOS macro: ASSERT, instead of the assert() CRT function.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jun 22 01:48:28 2013 New Revision: 59280 URL: http://svn.reactos.org/svn/reactos?rev=59280&view=rev Log: [NTVDM] Use correctly NDEBUG, and use ReactOS macro: ASSERT, instead of the assert() CRT function. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ntvdm.h Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Sat Jun 22 01:48:28 2013 @@ -91,7 +91,7 @@ if (!GetConsoleScreenBufferInfo(ConsoleOutput, &ConsoleInfo)) { - assert(0); + ASSERT(FALSE); return Result; } Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sat Jun 22 01:48:28 2013 @@ -7,8 +7,6 @@ */ #include "ntvdm.h" - -#define NDEBUG BOOLEAN VdmRunning = TRUE; LPVOID BaseAddress = NULL; Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Sat Jun 22 01:48:28 2013 @@ -12,8 +12,9 @@ #include <tchar.h> #include <stdio.h> #include <conio.h> -#include <assert.h> #include <stdarg.h> + +#define NDEBUG #include <debug.h> /* DEFINES ********************************************************************/

11 years, 3 months

[aandrejevic] 59279: [NTVDM] Improve keyboard IRQ performance. Add debug output to measure number of instructions per second.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Jun 22 01:41:51 2013 New Revision: 59279 URL: http://svn.reactos.org/svn/reactos?rev=59279&view=rev Log: [NTVDM] Improve keyboard IRQ performance. Add debug output to measure number of instructions per second. Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ntvdm.h Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Sat Jun 22 01:41:51 2013 @@ -12,6 +12,6 @@ add_executable(ntvdm ${SOURCE}) set_module_type(ntvdm win32cui UNICODE) target_link_libraries(ntvdm softx86 softx87) -add_importlibs(ntvdm msvcrt user32 kernel32) +add_importlibs(ntvdm msvcrt user32 kernel32 ntdll) add_dependencies(ntvdm softx86 softx87) add_cd_file(TARGET ntvdm DESTINATION reactos/system32 FOR all) Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sat Jun 22 01:41:51 2013 @@ -7,6 +7,8 @@ */ #include "ntvdm.h" + +#define NDEBUG BOOLEAN VdmRunning = TRUE; LPVOID BaseAddress = NULL; @@ -57,6 +59,7 @@ INT i; BOOLEAN PrintUsage = TRUE; CHAR CommandLine[128]; + DWORD CurrentTickCount, LastTickCount = 0, Cycles = 0, LastCyclePrintout = 0; LARGE_INTEGER Frequency, LastTimerTick, Counter; LONGLONG TimerTicks; @@ -133,7 +136,10 @@ /* Main loop */ while (VdmRunning) { - /* Get the current time */ + /* Get the current number of ticks */ + CurrentTickCount = GetTickCount(); + + /* Get the current performance counter value */ QueryPerformanceCounter(&Counter); /* Get the number of PIT ticks that have passed */ @@ -144,11 +150,23 @@ for (i = 0; i < TimerTicks; i++) PitDecrementCount(); LastTimerTick = Counter; - /* Check for console input events */ - CheckForInputEvents(); + /* Check for console input events every millisecond */ + if (CurrentTickCount != LastTickCount) + { + CheckForInputEvents(); + LastTickCount = CurrentTickCount; + } /* Continue CPU emulation */ EmulatorStep(); + + Cycles++; + if ((CurrentTickCount - LastCyclePrintout) >= 1000) + { + DPRINT1("NTVDM: %d Instructions Per Second\n", Cycles); + LastCyclePrintout = CurrentTickCount; + Cycles = 0; + } } Cleanup: Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Sat Jun 22 01:41:51 2013 @@ -14,6 +14,7 @@ #include <conio.h> #include <assert.h> #include <stdarg.h> +#include <debug.h> /* DEFINES ********************************************************************/

11 years, 3 months

[ekohl] 59278: [SAMSRV] Changing user account names requires more than just changing the name attribute. Do it properly.

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Jun 21 23:19:37 2013 New Revision: 59278 URL: http://svn.reactos.org/svn/reactos?rev=59278&view=rev Log: [SAMSRV] Changing user account names requires more than just changing the name attribute. Do it properly. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Fri Jun 21 23:19:37 2013 @@ -6752,6 +6752,71 @@ static NTSTATUS +SampSetUserName(PSAM_DB_OBJECT UserObject, + PRPC_UNICODE_STRING NewUserName) +{ + UNICODE_STRING OldUserName = {0, 0, NULL}; + NTSTATUS Status; + + Status = SampGetObjectAttributeString(UserObject, + L"Name", + (PRPC_UNICODE_STRING)&OldUserName); + if (!NT_SUCCESS(Status)) + { + TRACE("SampGetObjectAttributeString failed (Status 0x%08lx)\n", Status); + goto done; + } + + if (!RtlEqualUnicodeString(&OldUserName, (PCUNICODE_STRING)NewUserName, TRUE)) + { + Status = SampCheckAccountNameInDomain(UserObject->ParentObject, + NewUserName->Buffer); + if (!NT_SUCCESS(Status)) + { + TRACE("User name \'%S\' already exists in domain (Status 0x%08lx)\n", + NewUserName->Buffer, Status); + goto done; + } + } + + Status = SampSetAccountNameInDomain(UserObject->ParentObject, + L"Users", + NewUserName->Buffer, + UserObject->RelativeId); + if (!NT_SUCCESS(Status)) + { + TRACE("SampSetAccountNameInDomain failed (Status 0x%08lx)\n", Status); + goto done; + } + + Status = SampRemoveAccountNameFromDomain(UserObject->ParentObject, + L"Users", + OldUserName.Buffer); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRemoveAccountNameFromDomain failed (Status 0x%08lx)\n", Status); + goto done; + } + + Status = SampSetObjectAttribute(UserObject, + L"Name", + REG_SZ, + NewUserName->Buffer, + NewUserName->Length + sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + TRACE("SampSetObjectAttribute failed (Status 0x%08lx)\n", Status); + } + +done: + if (OldUserName.Buffer != NULL) + midl_user_free(OldUserName.Buffer); + + return Status; +} + + +static NTSTATUS SampSetUserGeneral(PSAM_DB_OBJECT UserObject, PSAMPR_USER_INFO_BUFFER Buffer) { @@ -6778,11 +6843,8 @@ if (!NT_SUCCESS(Status)) goto done; - Status = SampSetObjectAttribute(UserObject, - L"Name", - REG_SZ, - Buffer->General.UserName.Buffer, - Buffer->General.UserName.MaximumLength); + Status = SampSetUserName(UserObject, + &Buffer->General.UserName); if (!NT_SUCCESS(Status)) goto done; @@ -7011,11 +7073,8 @@ if (WhichFields & USER_ALL_USERNAME) { - Status = SampSetObjectAttribute(UserObject, - L"Name", - REG_SZ, - Buffer->All.UserName.Buffer, - Buffer->All.UserName.MaximumLength); + Status = SampSetUserName(UserObject, + &Buffer->All.UserName); if (!NT_SUCCESS(Status)) goto done; } @@ -7265,11 +7324,8 @@ break; case UserNameInformation: - Status = SampSetObjectAttribute(UserObject, - L"Name", - REG_SZ, - Buffer->Name.UserName.Buffer, - Buffer->Name.UserName.MaximumLength); + Status = SampSetUserName(UserObject, + &Buffer->Name.UserName); if (!NT_SUCCESS(Status)) break; @@ -7281,11 +7337,8 @@ break; case UserAccountNameInformation: - Status = SampSetObjectAttribute(UserObject, - L"Name", - REG_SZ, - Buffer->AccountName.UserName.Buffer, - Buffer->AccountName.UserName.MaximumLength); + Status = SampSetUserName(UserObject, + &Buffer->AccountName.UserName); break; case UserFullNameInformation:

11 years, 3 months

[aandrejevic] 59277: [NTVDM] Use local time instead of system time for the clock. Implement the "set system date" and "set system time" DOS functions.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Jun 21 22:14:07 2013 New Revision: 59277 URL: http://svn.reactos.org/svn/reactos?rev=59277&view=rev Log: [NTVDM] Use local time instead of system time for the clock. Implement the "set system date" and "set system time" DOS functions. Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Fri Jun 21 22:14:07 2013 @@ -570,7 +570,7 @@ /* Get system date */ case 0x2A: { - GetSystemTime(&SystemTime); + GetLocalTime(&SystemTime); EmulatorSetRegister(EMULATOR_REG_CX, (Ecx & 0xFFFF0000) | SystemTime.wYear); EmulatorSetRegister(EMULATOR_REG_DX, @@ -581,11 +581,33 @@ (Eax & 0xFFFFFF00) | SystemTime.wDayOfWeek); break; } + + /* Set system date */ + case 0x2B: + { + GetLocalTime(&SystemTime); + SystemTime.wYear = LOWORD(Ecx); + SystemTime.wMonth = HIBYTE(Edx); + SystemTime.wDay = LOBYTE(Edx); + + if (SetLocalTime(&SystemTime)) + { + /* Return success */ + EmulatorSetRegister(EMULATOR_REG_AX, Eax & 0xFFFFFF00); + } + else + { + /* Return failure */ + EmulatorSetRegister(EMULATOR_REG_AX, Eax | 0xFF); + } + + break; + } /* Get system time */ case 0x2C: { - GetSystemTime(&SystemTime); + GetLocalTime(&SystemTime); EmulatorSetRegister(EMULATOR_REG_CX, (Ecx & 0xFFFF0000) | (SystemTime.wHour << 8) @@ -594,6 +616,29 @@ (Edx & 0xFFFF0000) | (SystemTime.wSecond << 8) | (SystemTime.wMilliseconds / 10)); + break; + } + + /* Set system time */ + case 0x2D: + { + GetLocalTime(&SystemTime); + SystemTime.wHour = HIBYTE(Ecx); + SystemTime.wMinute = LOBYTE(Ecx); + SystemTime.wSecond = HIBYTE(Edx); + SystemTime.wMilliseconds = LOBYTE(Edx) * 10; + + if (SetLocalTime(&SystemTime)) + { + /* Return success */ + EmulatorSetRegister(EMULATOR_REG_AX, Eax & 0xFFFFFF00); + } + else + { + /* Return failure */ + EmulatorSetRegister(EMULATOR_REG_AX, Eax | 0xFF); + } + break; }

11 years, 3 months

[aandrejevic] 59276: [NTVDM] Implement the keyboard IRQ.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Jun 21 21:25:01 2013 New Revision: 59276 URL: http://svn.reactos.org/svn/reactos?rev=59276&view=rev Log: [NTVDM] Implement the keyboard IRQ. Modified: branches/ntvdm/subsystems/ntvdm/hardware.c branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ntvdm.h Modified: branches/ntvdm/subsystems/ntvdm/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] Fri Jun 21 21:25:01 2013 @@ -49,6 +49,52 @@ static PIC MasterPic, SlavePic; static PIT_CHANNEL PitChannels[PIT_CHANNELS]; +static BYTE KeyboardQueue[KEYBOARD_BUFFER_SIZE]; +static BOOLEAN KeyboardQueueEmpty = TRUE; +static UINT KeyboardQueueStart = 0; +static UINT KeyboardQueueEnd = 0; + +static BOOLEAN KeyboardQueuePush(BYTE ScanCode) +{ + /* Check if the keyboard queue is full */ + if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd)) + { + return FALSE; + } + + /* Insert the value in the queue */ + KeyboardQueue[KeyboardQueueEnd] = ScanCode; + KeyboardQueueEnd++; + KeyboardQueueEnd %= KEYBOARD_BUFFER_SIZE; + + /* Since we inserted a value, it's not empty anymore */ + KeyboardQueueEmpty = FALSE; + + return TRUE; +} + +#if 0 +static BOOLEAN KeyboardQueuePop(BYTE *ScanCode) +{ + /* Make sure the keyboard queue is not empty */ + if (KeyboardQueueEmpty) return FALSE; + + /* Get the scan code */ + *ScanCode = KeyboardQueue[KeyboardQueueStart]; + + /* Remove the value from the queue */ + KeyboardQueueStart++; + KeyboardQueueStart %= KEYBOARD_BUFFER_SIZE; + + /* Check if the queue is now empty */ + if (KeyboardQueueStart == KeyboardQueueEnd) + { + KeyboardQueueEmpty = TRUE; + } + + return TRUE; +} +#endif /* PUBLIC FUNCTIONS ***********************************************************/ @@ -451,3 +497,48 @@ } } +VOID CheckForInputEvents() +{ + PINPUT_RECORD Buffer; + HANDLE ConsoleInput = GetStdHandle(STD_INPUT_HANDLE); + DWORD i, j, Count, TotalEvents; + BYTE ScanCode; + + /* Get the number of input events */ + if (!GetNumberOfConsoleInputEvents(ConsoleInput, &Count)) return; + if (Count == 0) return; + + /* Allocate the buffer */ + Buffer = (PINPUT_RECORD)HeapAlloc(GetProcessHeap(), 0, Count * sizeof(INPUT_RECORD)); + if (Buffer == NULL) return; + + /* Peek the input events */ + if (!ReadConsoleInput(ConsoleInput, Buffer, Count, &TotalEvents)) goto Cleanup; + + for (i = 0; i < TotalEvents; i++) + { + /* Check if this is a key event */ + if (Buffer[i].EventType != KEY_EVENT) continue; + + /* Get the scan code */ + ScanCode = Buffer[i].Event.KeyEvent.wVirtualScanCode; + + /* If this is a key release, set the highest bit in the scan code */ + if (!Buffer[i].Event.KeyEvent.bKeyDown) ScanCode |= 0x80; + + /* Push the scan code onto the keyboard queue */ + for (j = 0; j < Buffer[i].Event.KeyEvent.wRepeatCount; j++) + { + KeyboardQueuePush(ScanCode); + } + + /* Yes, IRQ 1 */ + PicInterruptRequest(1); + + /* Stop the loop */ + break; + } + +Cleanup: + HeapFree(GetProcessHeap(), 0, Buffer); +} Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Fri Jun 21 21:25:01 2013 @@ -144,6 +144,9 @@ for (i = 0; i < TimerTicks; i++) PitDecrementCount(); LastTimerTick = Counter; + /* Check for console input events */ + CheckForInputEvents(); + /* Continue CPU emulation */ EmulatorStep(); } Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Fri Jun 21 21:25:01 2013 @@ -66,6 +66,11 @@ #define PIC_OCW2_SL (1 << 6) #define PIC_OCW3 (1 << 3) #define PIC_OCW3_READ_ISR 0x0B + +/* 8042 PS/2 controller */ +#define KEYBOARD_BUFFER_SIZE 32 +#define PS2_DATA_PORT 0x60 +#define PS2_CONTROL_PORT 0x64 #define EMULATOR_FLAG_CF (1 << 0) #define EMULATOR_FLAG_PF (1 << 2) @@ -219,6 +224,7 @@ BYTE PitReadData(BYTE Channel); VOID PitWriteData(BYTE Channel, BYTE Value); VOID PitDecrementCount(); +VOID CheckForInputEvents(); VOID EmulatorSetStack(WORD Segment, WORD Offset); VOID EmulatorExecute(WORD Segment, WORD Offset); VOID EmulatorInterrupt(BYTE Number);

11 years, 3 months

[tfaber] 59275: [MSHTML_WINETEST] - Fix warnings about missing sprintf

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Jun 21 17:28:53 2013 New Revision: 59275 URL: http://svn.reactos.org/svn/reactos?rev=59275&view=rev Log: [MSHTML_WINETEST] - Fix warnings about missing sprintf Modified: trunk/rostests/winetests/mshtml/activex.c trunk/rostests/winetests/mshtml/events.c trunk/rostests/winetests/mshtml/htmldoc.c trunk/rostests/winetests/mshtml/script.c Modified: trunk/rostests/winetests/mshtml/activex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/activex.… ============================================================================== --- trunk/rostests/winetests/mshtml/activex.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/activex.c [iso-8859-1] Fri Jun 21 17:28:53 2013 @@ -21,7 +21,7 @@ #include <wine/test.h> //#include <stdarg.h> -//#include <stdio.h> +#include <stdio.h> //#include "windef.h" //#include "winbase.h" Modified: trunk/rostests/winetests/mshtml/events.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/events.c… ============================================================================== --- trunk/rostests/winetests/mshtml/events.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/events.c [iso-8859-1] Fri Jun 21 17:28:53 2013 @@ -21,7 +21,7 @@ #include <wine/test.h> //#include <stdarg.h> -//#include <stdio.h> +#include <stdio.h> //#include "windef.h" //#include "winbase.h" Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… ============================================================================== --- trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] Fri Jun 21 17:28:53 2013 @@ -21,7 +21,7 @@ #include <wine/test.h> //#include <stdarg.h> -//#include <stdio.h> +#include <stdio.h> //#include "windef.h" //#include "winbase.h" Modified: trunk/rostests/winetests/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/script.c… ============================================================================== --- trunk/rostests/winetests/mshtml/script.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/script.c [iso-8859-1] Fri Jun 21 17:28:53 2013 @@ -21,7 +21,7 @@ #include <wine/test.h> //#include <stdarg.h> -//#include <stdio.h> +#include <stdio.h> //#include "windef.h" //#include "winbase.h"

11 years, 3 months

← Newer
1
...
10
11
12
13
14
15
16
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2013