Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[akhaldi] 60016: [NTOSKRNL] * Return the proper status when we attempt to illegally commit non-ARM3 section. We hit this assert with some kernel32 winetests (mainly loader and virtual). Brought to ...
by akhaldi＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: akhaldi Date: Tue Sep 10 21:57:52 2013 New Revision: 60016 URL: http://svn.reactos.org/svn/reactos?rev=60016&view=rev Log: [NTOSKRNL] * Return the proper status when we attempt to illegally commit non-ARM3 section. We hit this assert with some kernel32 winetests (mainly loader and virtual). Brought to you by Alex Ionescu. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Sep 10 21:57:52 2013 @@ -4095,7 +4095,12 @@ // Make sure this is an ARM3 section // MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, (PVOID)PAGE_ROUND_DOWN(PBaseAddress)); - ASSERT(MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3); + if (MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3) + { + DPRINT1("Illegal commit of non-ARM3 section!\n"); + Status = STATUS_ALREADY_COMMITTED; + goto FailPath; + } // Is this a previously reserved section being committed? If so, enter the // special section path

1 0

[hbelusca] 60015: [ADVAPI32] Use a correct control pipe sharing policy.
by hbelusca＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: hbelusca Date: Tue Sep 10 21:38:15 2013 New Revision: 60015 URL: http://svn.reactos.org/svn/reactos?rev=60015&view=rev Log: [ADVAPI32] Use a correct control pipe sharing policy. Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Tue Sep 10 21:38:15 2013 @@ -248,7 +248,7 @@ *hPipe = CreateFileW(NtControlPipeName, GENERIC_READ | GENERIC_WRITE, - 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,

1 0

[hbelusca] 60014: [USERENV][USER32] Use a correct return variable for RtlCreateUnicodeStringFromAsciiz. Advice: read the documentation before using functions...
by hbelusca＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: hbelusca Date: Tue Sep 10 21:26:37 2013 New Revision: 60014 URL: http://svn.reactos.org/svn/reactos?rev=60014&view=rev Log: [USERENV][USER32] Use a correct return variable for RtlCreateUnicodeStringFromAsciiz. Advice: read the documentation before using functions... Modified: trunk/reactos/dll/win32/userenv/desktop.c trunk/reactos/dll/win32/userenv/directory.c trunk/reactos/win32ss/user/user32/windows/menu.c trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/dll/win32/userenv/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/desktop.… ============================================================================== --- trunk/reactos/dll/win32/userenv/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/desktop.c [iso-8859-1] Tue Sep 10 21:26:37 2013 @@ -164,45 +164,40 @@ UNICODE_STRING IconLocation; UNICODE_STRING WorkingDirectory; BOOL bResult; - NTSTATUS Status; - - Status = RtlCreateUnicodeStringFromAsciiz(&ItemName, - (LPSTR)lpItemName); - if (!NT_SUCCESS(Status)) - { - SetLastError (RtlNtStatusToDosError (Status)); - return FALSE; - } - - Status = RtlCreateUnicodeStringFromAsciiz(&Arguments, - (LPSTR)lpArguments); - if (!NT_SUCCESS(Status)) + + if (!RtlCreateUnicodeStringFromAsciiz(&ItemName, + (LPSTR)lpItemName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (!RtlCreateUnicodeStringFromAsciiz(&Arguments, + (LPSTR)lpArguments)) { RtlFreeUnicodeString(&ItemName); - SetLastError (RtlNtStatusToDosError (Status)); - return FALSE; - } - - Status = RtlCreateUnicodeStringFromAsciiz(&IconLocation, - (LPSTR)lpIconLocation); - if (!NT_SUCCESS(Status)) + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (!RtlCreateUnicodeStringFromAsciiz(&IconLocation, + (LPSTR)lpIconLocation)) { RtlFreeUnicodeString(&Arguments); RtlFreeUnicodeString(&ItemName); - SetLastError (RtlNtStatusToDosError (Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } if (lpWorkingDirectory != NULL) { - Status = RtlCreateUnicodeStringFromAsciiz(&WorkingDirectory, - (LPSTR)lpWorkingDirectory); - if (!NT_SUCCESS(Status)) + if (!RtlCreateUnicodeStringFromAsciiz(&WorkingDirectory, + (LPSTR)lpWorkingDirectory)) { RtlFreeUnicodeString(&IconLocation); RtlFreeUnicodeString(&Arguments); RtlFreeUnicodeString(&ItemName); - SetLastError (RtlNtStatusToDosError (Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } } @@ -389,13 +384,11 @@ { UNICODE_STRING ItemName; BOOL bResult; - NTSTATUS Status; - - Status = RtlCreateUnicodeStringFromAsciiz(&ItemName, - (LPSTR)lpItemName); - if (!NT_SUCCESS(Status)) - { - SetLastError (RtlNtStatusToDosError (Status)); + + if (!RtlCreateUnicodeStringFromAsciiz(&ItemName, + (LPSTR)lpItemName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -437,13 +430,11 @@ { UNICODE_STRING GroupName; BOOL bResult; - NTSTATUS Status; - - Status = RtlCreateUnicodeStringFromAsciiz(&GroupName, - (LPSTR)lpGroupName); - if (!NT_SUCCESS(Status)) - { - SetLastError (RtlNtStatusToDosError (Status)); + + if (!RtlCreateUnicodeStringFromAsciiz(&GroupName, + (LPSTR)lpGroupName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -495,13 +486,11 @@ { UNICODE_STRING GroupName; BOOL bResult; - NTSTATUS Status; - - Status = RtlCreateUnicodeStringFromAsciiz(&GroupName, - (LPSTR)lpGroupName); - if (!NT_SUCCESS(Status)) - { - SetLastError (RtlNtStatusToDosError (Status)); + + if (!RtlCreateUnicodeStringFromAsciiz(&GroupName, + (LPSTR)lpGroupName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -564,54 +553,48 @@ UNICODE_STRING IconLocation; UNICODE_STRING WorkingDirectory; BOOL bResult; - NTSTATUS Status; - - Status = RtlCreateUnicodeStringFromAsciiz(&ItemName, - (LPSTR)lpItemName); - if (!NT_SUCCESS(Status)) - { - SetLastError (RtlNtStatusToDosError (Status)); - return FALSE; - } - - Status = RtlCreateUnicodeStringFromAsciiz(&Arguments, - (LPSTR)lpArguments); - if (!NT_SUCCESS(Status)) + + if (!RtlCreateUnicodeStringFromAsciiz(&ItemName, + (LPSTR)lpItemName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (!RtlCreateUnicodeStringFromAsciiz(&Arguments, + (LPSTR)lpArguments)) { RtlFreeUnicodeString(&ItemName); - SetLastError (RtlNtStatusToDosError (Status)); - return FALSE; - } - - Status = RtlCreateUnicodeStringFromAsciiz(&IconLocation, - (LPSTR)lpIconLocation); - if (!NT_SUCCESS(Status)) + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (!RtlCreateUnicodeStringFromAsciiz(&IconLocation, + (LPSTR)lpIconLocation)) { RtlFreeUnicodeString(&Arguments); RtlFreeUnicodeString(&ItemName); - SetLastError (RtlNtStatusToDosError (Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } if (lpGroupName != NULL) { - Status = RtlCreateUnicodeStringFromAsciiz(&GroupName, - (LPSTR)lpGroupName); - if (!NT_SUCCESS(Status)) + if (!RtlCreateUnicodeStringFromAsciiz(&GroupName, + (LPSTR)lpGroupName)) { RtlFreeUnicodeString(&IconLocation); RtlFreeUnicodeString(&Arguments); RtlFreeUnicodeString(&ItemName); - SetLastError (RtlNtStatusToDosError (Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } } if (lpWorkingDirectory != NULL) { - Status = RtlCreateUnicodeStringFromAsciiz(&WorkingDirectory, - (LPSTR)lpWorkingDirectory); - if (!NT_SUCCESS(Status)) + if (!RtlCreateUnicodeStringFromAsciiz(&WorkingDirectory, + (LPSTR)lpWorkingDirectory)) { if (lpGroupName != NULL) { @@ -620,7 +603,7 @@ RtlFreeUnicodeString(&IconLocation); RtlFreeUnicodeString(&Arguments); RtlFreeUnicodeString(&ItemName); - SetLastError (RtlNtStatusToDosError (Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } } @@ -821,29 +804,26 @@ UNICODE_STRING GroupName; UNICODE_STRING ItemName; BOOL bResult; - NTSTATUS Status; if (lpGroupName != NULL) { - Status = RtlCreateUnicodeStringFromAsciiz(&GroupName, - (LPSTR)lpGroupName); - if (!NT_SUCCESS(Status)) + if (!RtlCreateUnicodeStringFromAsciiz(&GroupName, + (LPSTR)lpGroupName)) { - SetLastError (RtlNtStatusToDosError (Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } } - Status = RtlCreateUnicodeStringFromAsciiz(&ItemName, - (LPSTR)lpItemName); - if (!NT_SUCCESS(Status)) + if (!RtlCreateUnicodeStringFromAsciiz(&ItemName, + (LPSTR)lpItemName)) { if (lpGroupName != NULL) { RtlFreeUnicodeString(&GroupName); } - SetLastError (RtlNtStatusToDosError (Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } Modified: trunk/reactos/dll/win32/userenv/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/director… ============================================================================== --- trunk/reactos/dll/win32/userenv/directory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/directory.c [iso-8859-1] Tue Sep 10 21:26:37 2013 @@ -39,23 +39,20 @@ { UNICODE_STRING SrcPath; UNICODE_STRING DstPath; - NTSTATUS Status; BOOL bResult; - Status = RtlCreateUnicodeStringFromAsciiz(&SrcPath, - (LPSTR)lpSourcePath); - if (!NT_SUCCESS(Status)) - { - SetLastError (RtlNtStatusToDosError (Status)); - return FALSE; - } - - Status = RtlCreateUnicodeStringFromAsciiz(&DstPath, - (LPSTR)lpDestinationPath); - if (!NT_SUCCESS(Status)) + if (!RtlCreateUnicodeStringFromAsciiz(&SrcPath, + (LPSTR)lpSourcePath)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (!RtlCreateUnicodeStringFromAsciiz(&DstPath, + (LPSTR)lpDestinationPath)) { RtlFreeUnicodeString(&SrcPath); - SetLastError (RtlNtStatusToDosError (Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Tue Sep 10 21:26:37 2013 @@ -5047,7 +5047,6 @@ { MENUITEMINFOW MenuItemInfoW; UNICODE_STRING UnicodeString; - NTSTATUS Status; ULONG Result = FALSE; RtlCopyMemory(&MenuItemInfoW, lpmii, min(lpmii->cbSize, sizeof(MENUITEMINFOW))); @@ -5069,12 +5068,11 @@ && MenuItemInfoW.dwTypeData != NULL) { /* cch is ignored when the content of a menu item is set by calling SetMenuItemInfo. */ - Status = RtlCreateUnicodeStringFromAsciiz(&UnicodeString, - (LPSTR)MenuItemInfoW.dwTypeData); - if (!NT_SUCCESS (Status)) - { - SetLastError (RtlNtStatusToDosError(Status)); - return FALSE; + if (!RtlCreateUnicodeStringFromAsciiz(&UnicodeString, + (LPSTR)MenuItemInfoW.dwTypeData)) + { + SetLastError (ERROR_NOT_ENOUGH_MEMORY); + return FALSE; } MenuItemInfoW.dwTypeData = UnicodeString.Buffer; MenuItemInfoW.cch = UnicodeString.Length / sizeof(WCHAR); Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Tue Sep 10 21:26:37 2013 @@ -2675,11 +2675,9 @@ RegisterWindowMessageA(LPCSTR lpString) { UNICODE_STRING String; - BOOLEAN Result; UINT Atom; - Result = RtlCreateUnicodeStringFromAsciiz(&String, (PCSZ)lpString); - if (!Result) + if (!RtlCreateUnicodeStringFromAsciiz(&String, (PCSZ)lpString)) { return(0); }

1 0

[ekohl] 60013: [LSASRV] - Allocate buffers for account and domain names in the well-known sid list instead of using pointers to strings. - Add a string load routine and convert all hard-coded SID n...
by ekohl＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: ekohl Date: Tue Sep 10 21:20:22 2013 New Revision: 60013 URL: http://svn.reactos.org/svn/reactos?rev=60013&view=rev Log: [LSASRV] - Allocate buffers for account and domain names in the well-known sid list instead of using pointers to strings. - Add a string load routine and convert all hard-coded SID names to resources. A german translation will follow soon. Added: trunk/reactos/dll/win32/lsasrv/lang/ (with props) trunk/reactos/dll/win32/lsasrv/lang/en-US.rc (with props) trunk/reactos/dll/win32/lsasrv/resources.h (with props) trunk/reactos/dll/win32/lsasrv/utils.c (with props) Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/lookup.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/lsasrv.rc Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Tue Sep 10 21:20:22 2013 @@ -18,6 +18,7 @@ privileges.c registry.c security.c + utils.c lsasrv.rc ${CMAKE_CURRENT_BINARY_DIR}/lsasrv_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def Propchange: trunk/reactos/dll/win32/lsasrv/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Sep 10 21:20:22 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/lsasrv/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/lsasrv/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/lsasrv/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/lsasrv/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lang/en-US.rc (added) +++ trunk/reactos/dll/win32/lsasrv/lang/en-US.rc [iso-8859-1] Tue Sep 10 21:20:22 2013 @@ -0,0 +1,44 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_NT_AUTHORITY "NT AUTHORITY" + IDS_NULL_RID "NULL SID" + IDS_WORLD_RID "Everyone" + IDS_LOCAL_RID "LOCAL" + IDS_CREATOR_OWNER_RID "CREATOR OWNER" + IDS_CREATOR_GROUP_RID "CREATOR GROUP" + IDS_CREATOR_OWNER_SERVER_RID "CREATOR OWNER SERVER" + IDS_CREATOR_GROUP_SERVER_RID "CREATOR GROUP SERVER" + IDS_DIALUP_RID "DIALUP" + IDS_NETWORK_RID "NETWORK" + IDS_BATCH_RID "BATCH" + IDS_INTERACTIVE_RID "INTERACTIVE" + IDS_SERVICE_RID "SERVICE" + IDS_ANONYMOUS_LOGON_RID "ANONYMOUS LOGON" + IDS_PROXY_RID "PROXY" + IDS_ENTERPRISE_CONTROLLERS_RID "ENTERPRISE DOMAIN CONTROLLERS" + IDS_PRINCIPAL_SELF_RID "SELF" + IDS_AUTHENTICATED_USER_RID "Authenticated Users" + IDS_RESTRICTED_CODE_RID "RESTRICTED" + IDS_TERMINAL_SERVER_RID "TERMINAL SERVER USER" + IDS_REMOTE_LOGON_RID "REMOTE INTERACTIVE LOGON" + IDS_THIS_ORGANIZATION_RID "This Organization" + IDS_LOCAL_SYSTEM_RID "SYSTEM" + IDS_LOCAL_SERVICE_RID "LOCAL SERVICE" + IDS_NETWORK_SERVICE_RID "NETWORK SERVICE" + IDS_BUILTIN_DOMAIN_RID "BUILTIN" + IDS_ALIAS_RID_ADMINS "Administrators" + IDS_ALIAS_RID_USERS "Users" + IDS_ALIAS_RID_GUESTS "Guests" + IDS_ALIAS_RID_POWER_USERS "Power Users" + IDS_ALIAS_RID_ACCOUNT_OPS "Account Operators" + IDS_ALIAS_RID_SYSTEM_OPS "Server Operators" + IDS_ALIAS_RID_PRINT_OPS "Print Operators" + IDS_ALIAS_RID_BACKUP_OPS "Backup Operators" + IDS_ALIAS_RID_REPLICATOR "Replicators" + IDS_ALIAS_RID_RAS_SERVERS "RAS and IAS Servers" + IDS_ALIAS_RID_PREW2KCOMPACCESS "Pre-Windows 2000 Compatible Access" + IDS_ALIAS_RID_REMOTE_DESKTOP_USERS "Remote Desktop Users" + IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS "Network Configuration Operators" +END Propchange: trunk/reactos/dll/win32/lsasrv/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/lsasrv/lookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lookup.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] Tue Sep 10 21:20:22 2013 @@ -235,11 +235,38 @@ *p = SubAuthorities[i]; } - RtlInitUnicodeString(&SidEntry->AccountName, - AccountName); - - RtlInitUnicodeString(&SidEntry->DomainName, - DomainName); +// RtlInitUnicodeString(&SidEntry->AccountName, +// AccountName); + SidEntry->AccountName.Length = wcslen(AccountName) * sizeof(WCHAR); + SidEntry->AccountName.MaximumLength = SidEntry->AccountName.Length + sizeof(WCHAR); + SidEntry->AccountName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, + SidEntry->AccountName.MaximumLength); + if (SidEntry->AccountName.Buffer == NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, SidEntry->Sid); + RtlFreeHeap(RtlGetProcessHeap(), 0, SidEntry); + return FALSE; + } + + wcscpy(SidEntry->AccountName.Buffer, + AccountName); + +// RtlInitUnicodeString(&SidEntry->DomainName, +// DomainName); + SidEntry->DomainName.Length = wcslen(DomainName) * sizeof(WCHAR); + SidEntry->DomainName.MaximumLength = SidEntry->DomainName.Length + sizeof(WCHAR); + SidEntry->DomainName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, + SidEntry->DomainName.MaximumLength); + if (SidEntry->DomainName.Buffer == NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, SidEntry->AccountName.Buffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, SidEntry->Sid); + RtlFreeHeap(RtlGetProcessHeap(), 0, SidEntry); + return FALSE; + } + + wcscpy(SidEntry->DomainName.Buffer, + DomainName); SidEntry->Use = Use; @@ -253,223 +280,278 @@ NTSTATUS LsapInitSids(VOID) { + WCHAR szAccountName[80]; + WCHAR szDomainName[80]; ULONG SubAuthorities[8]; + HINSTANCE hInstance; InitializeListHead(&WellKnownSidListHead); + hInstance = GetModuleHandleW(L"lsasrv.dll"); + /* NT Authority */ + + LsapLoadString(hInstance, IDS_NT_AUTHORITY, szAccountName, 80); + LsapLoadString(hInstance, IDS_NT_AUTHORITY, szDomainName, 80); LsapCreateSid(&NtAuthority, 0, NULL, - L"NT AUTHORITY", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeDomain); /* Null Sid */ + LsapLoadString(hInstance, IDS_NULL_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_NULL_RID; LsapCreateSid(&NullSidAuthority, 1, SubAuthorities, - L"NULL SID", + szAccountName, L"", SidTypeWellKnownGroup); /* World Sid */ + LsapLoadString(hInstance, IDS_WORLD_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_WORLD_RID; LsapCreateSid(&WorldSidAuthority, 1, SubAuthorities, - L"Everyone", + szAccountName, L"", SidTypeWellKnownGroup); /* Local Sid */ + LsapLoadString(hInstance, IDS_LOCAL_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_LOCAL_RID; LsapCreateSid(&LocalSidAuthority, 1, SubAuthorities, - L"LOCAL", + szAccountName, L"", SidTypeWellKnownGroup); /* Creator Owner Sid */ + LsapLoadString(hInstance, IDS_CREATOR_OWNER_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_CREATOR_OWNER_RID; LsapCreateSid(&CreatorSidAuthority, 1, SubAuthorities, - L"CREATOR OWNER", + szAccountName, L"", SidTypeWellKnownGroup); /* Creator Group Sid */ + LsapLoadString(hInstance, IDS_CREATOR_GROUP_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_CREATOR_GROUP_RID; LsapCreateSid(&CreatorSidAuthority, 1, SubAuthorities, - L"CREATOR GROUP", + szAccountName, L"", SidTypeWellKnownGroup); /* Creator Owner Server Sid */ + LsapLoadString(hInstance, IDS_CREATOR_OWNER_SERVER_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_CREATOR_OWNER_SERVER_RID; LsapCreateSid(&CreatorSidAuthority, 1, SubAuthorities, - L"CREATOR OWNER SERVER", + szAccountName, L"", SidTypeWellKnownGroup); /* Creator Group Server Sid */ + LsapLoadString(hInstance, IDS_CREATOR_GROUP_SERVER_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_CREATOR_GROUP_SERVER_RID; LsapCreateSid(&CreatorSidAuthority, 1, SubAuthorities, - L"CREATOR GROUP SERVER", + szAccountName, L"", SidTypeWellKnownGroup); /* Dialup Sid */ + LsapLoadString(hInstance, IDS_DIALUP_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_NT_AUTHORITY, szDomainName, 80); + SubAuthorities[0] = SECURITY_DIALUP_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"DIALUP", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Network Sid */ + LsapLoadString(hInstance, IDS_DIALUP_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_NETWORK_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"NETWORK", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Batch Sid*/ + LsapLoadString(hInstance, IDS_BATCH_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_BATCH_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"BATCH", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Interactive Sid */ + LsapLoadString(hInstance, IDS_INTERACTIVE_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_INTERACTIVE_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"INTERACTIVE", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Service Sid */ + LsapLoadString(hInstance, IDS_SERVICE_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_SERVICE_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"SERVICE", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Anonymous Logon Sid */ + LsapLoadString(hInstance, IDS_ANONYMOUS_LOGON_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_ANONYMOUS_LOGON_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"ANONYMOUS LOGON", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Proxy Sid */ + LsapLoadString(hInstance, IDS_PROXY_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_PROXY_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"PROXY", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Enterprise Controllers Sid */ + LsapLoadString(hInstance, IDS_ENTERPRISE_CONTROLLERS_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_ENTERPRISE_CONTROLLERS_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"ENTERPRISE DOMAIN CONTROLLERS", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Principal Self Sid */ + LsapLoadString(hInstance, IDS_PRINCIPAL_SELF_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_PRINCIPAL_SELF_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"SELF", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Authenticated Users Sid */ + LsapLoadString(hInstance, IDS_AUTHENTICATED_USER_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_AUTHENTICATED_USER_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"Authenticated Users", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Restricted Code Sid */ + LsapLoadString(hInstance, IDS_RESTRICTED_CODE_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_RESTRICTED_CODE_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"RESTRICTED", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Terminal Server Sid */ + LsapLoadString(hInstance, IDS_TERMINAL_SERVER_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_TERMINAL_SERVER_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"TERMINAL SERVER USER", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Remote Logon Sid */ + LsapLoadString(hInstance, IDS_REMOTE_LOGON_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_REMOTE_LOGON_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"REMOTE INTERACTIVE LOGON", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* This Organization Sid */ + LsapLoadString(hInstance, IDS_THIS_ORGANIZATION_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_THIS_ORGANIZATION_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"This Organization", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Local System Sid */ + LsapLoadString(hInstance, IDS_LOCAL_SYSTEM_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_LOCAL_SYSTEM_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"SYSTEM", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Local Service Sid */ + LsapLoadString(hInstance, IDS_LOCAL_SERVICE_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_LOCAL_SERVICE_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"LOCAL SERVICE", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); LsapCreateSid(&NtAuthority, @@ -480,12 +562,14 @@ SidTypeWellKnownGroup); /* Network Service Sid */ + LsapLoadString(hInstance, IDS_NETWORK_SERVICE_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_NETWORK_SERVICE_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"NETWORK SERVICE", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); LsapCreateSid(&NtAuthority, @@ -496,144 +580,171 @@ SidTypeWellKnownGroup); /* Builtin Domain Sid */ + LsapLoadString(hInstance, IDS_BUILTIN_DOMAIN_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_BUILTIN_DOMAIN_RID, szDomainName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"BUILTIN", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeDomain); /* Administrators Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_ADMINS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_ADMINS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Administrators", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Users Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_USERS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_USERS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Users", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Guests Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_GUESTS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_GUESTS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Guests", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Power User Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_POWER_USERS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_POWER_USERS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Power User", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Account Operators Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_ACCOUNT_OPS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_ACCOUNT_OPS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Account Operators", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* System Operators Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_SYSTEM_OPS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_SYSTEM_OPS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Server Operators", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Print Operators Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_PRINT_OPS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_PRINT_OPS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Print Operators", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Backup Operators Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_BACKUP_OPS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_BACKUP_OPS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Backup Operators", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Replicators Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_REPLICATOR, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_REPLICATOR; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Replicators", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); -#if 0 /* RAS Servers Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_RAS_SERVERS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_RAS_SERVERS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Backup Operators", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); -#endif /* Pre-Windows 2000 Compatible Access Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_PREW2KCOMPACCESS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_PREW2KCOMPACCESS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Pre-Windows 2000 Compatible Access", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Remote Desktop Users Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_REMOTE_DESKTOP_USERS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Remote Desktop Users", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Network Configuration Operators Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Network Configuration Operators", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* FIXME: Add more well known sids */ Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Tue Sep 10 21:20:22 2013 @@ -14,6 +14,7 @@ #include <windef.h> #include <winbase.h> #include <winreg.h> +#include <winuser.h> #define NTOS_MODE_USER #include <ndk/cmfuncs.h> #include <ndk/kefuncs.h> @@ -39,6 +40,7 @@ #include <wine/debug.h> +#include "resources.h" typedef enum _LSA_DB_OBJECT_TYPE { @@ -381,4 +383,11 @@ LsapCreateSecretSd(PSECURITY_DESCRIPTOR *SecretSd, PULONG SecretSdSize); +/* utils.c */ +INT +LsapLoadString(HINSTANCE hInstance, + UINT uId, + LPWSTR lpBuffer, + INT nBufferMax); + /* EOF */ Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rc… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.rc [iso-8859-1] Tue Sep 10 21:20:22 2013 @@ -1,5 +1,24 @@ +#include <windows.h> +#include "resources.h" + #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "LSA server DLL\0" #define REACTOS_STR_INTERNAL_NAME "lsasrv\0" #define REACTOS_STR_ORIGINAL_FILENAME "lsasrv.dll\0" +#define REACTOS_FILEVERSION 5,1,2600,0 +#define REACTOS_STR_FILE_VERSION "5.1.2600\0" #include <reactos/version.rc> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* + * Everything specific to any language goes in one of the specific + * files. Note that you can and may override resources which also have + * a neutral version. This is to get localized bitmaps for example. + */ + +/* UTF-8 */ +#pragma code_page(65001) +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif Added: trunk/reactos/dll/win32/lsasrv/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/resources… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/resources.h (added) +++ trunk/reactos/dll/win32/lsasrv/resources.h [iso-8859-1] Tue Sep 10 21:20:22 2013 @@ -0,0 +1,52 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/lsasrv/resource.h + * PURPOSE: Resource IDs + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +#pragma once + +#define IDS_NT_AUTHORITY 100 + +#define IDS_NULL_RID 110 +#define IDS_WORLD_RID 111 +#define IDS_LOCAL_RID 112 +#define IDS_CREATOR_OWNER_RID 113 +#define IDS_CREATOR_GROUP_RID 114 +#define IDS_CREATOR_OWNER_SERVER_RID 115 +#define IDS_CREATOR_GROUP_SERVER_RID 116 +#define IDS_DIALUP_RID 117 +#define IDS_NETWORK_RID 118 +#define IDS_BATCH_RID 119 +#define IDS_INTERACTIVE_RID 120 +#define IDS_SERVICE_RID 121 +#define IDS_ANONYMOUS_LOGON_RID 122 +#define IDS_PROXY_RID 123 +#define IDS_ENTERPRISE_CONTROLLERS_RID 124 +#define IDS_PRINCIPAL_SELF_RID 125 +#define IDS_AUTHENTICATED_USER_RID 126 +#define IDS_RESTRICTED_CODE_RID 127 +#define IDS_TERMINAL_SERVER_RID 128 +#define IDS_REMOTE_LOGON_RID 129 +#define IDS_THIS_ORGANIZATION_RID 130 +#define IDS_LOCAL_SYSTEM_RID 131 +#define IDS_LOCAL_SERVICE_RID 132 +#define IDS_NETWORK_SERVICE_RID 133 +#define IDS_BUILTIN_DOMAIN_RID 134 +#define IDS_ALIAS_RID_ADMINS 135 +#define IDS_ALIAS_RID_USERS 136 +#define IDS_ALIAS_RID_GUESTS 137 +#define IDS_ALIAS_RID_POWER_USERS 138 +#define IDS_ALIAS_RID_ACCOUNT_OPS 139 +#define IDS_ALIAS_RID_SYSTEM_OPS 140 +#define IDS_ALIAS_RID_PRINT_OPS 141 +#define IDS_ALIAS_RID_BACKUP_OPS 142 +#define IDS_ALIAS_RID_REPLICATOR 143 +#define IDS_ALIAS_RID_RAS_SERVERS 144 +#define IDS_ALIAS_RID_PREW2KCOMPACCESS 145 +#define IDS_ALIAS_RID_REMOTE_DESKTOP_USERS 146 +#define IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS 147 + +/* EOF */ Propchange: trunk/reactos/dll/win32/lsasrv/resources.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/lsasrv/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/utils.c?r… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/utils.c (added) +++ trunk/reactos/dll/win32/lsasrv/utils.c [iso-8859-1] Tue Sep 10 21:20:22 2013 @@ -0,0 +1,68 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Security Account Manager (SAM) Server + * FILE: reactos/dll/win32/lsasrv/utils.c + * PURPOSE: Utility functions + * + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "lsasrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); + + +/* GLOBALS *****************************************************************/ + + +/* FUNCTIONS ***************************************************************/ + +INT +LsapLoadString(HINSTANCE hInstance, + UINT uId, + LPWSTR lpBuffer, + INT nBufferMax) +{ + HGLOBAL hmem; + HRSRC hrsrc; + WCHAR *p; + int string_num; + int i; + + /* Use loword (incremented by 1) as resourceid */ + hrsrc = FindResourceW(hInstance, + MAKEINTRESOURCEW((LOWORD(uId) >> 4) + 1), + (LPWSTR)RT_STRING); + if (!hrsrc) + return 0; + + hmem = LoadResource(hInstance, hrsrc); + if (!hmem) + return 0; + + p = LockResource(hmem); + string_num = uId & 0x000f; + for (i = 0; i < string_num; i++) + p += *p + 1; + + i = min(nBufferMax - 1, *p); + if (i > 0) + { + memcpy(lpBuffer, p + 1, i * sizeof(WCHAR)); + lpBuffer[i] = 0; + } + else + { + if (nBufferMax > 1) + { + lpBuffer[0] = 0; + return 0; + } + } + + return i; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/lsasrv/utils.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 60012: [BASESRV] - Fix header formatting plus windows headers inclusion. - RtlCreateUnicodeString returns booleans, not ntstatuses, so fix the code appropriately.
by hbelusca＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: hbelusca Date: Tue Sep 10 20:45:53 2013 New Revision: 60012 URL: http://svn.reactos.org/svn/reactos?rev=60012&view=rev Log: [BASESRV] - Fix header formatting plus windows headers inclusion. - RtlCreateUnicodeString returns booleans, not ntstatuses, so fix the code appropriately. Modified: trunk/reactos/subsystems/win/basesrv/basesrv.h trunk/reactos/subsystems/win/basesrv/init.c Modified: trunk/reactos/subsystems/win/basesrv/basesrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/bas… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/basesrv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/basesrv.h [iso-8859-1] Tue Sep 10 20:45:53 2013 @@ -12,10 +12,18 @@ #pragma once /* PSDK/NDK Headers */ +#include <stdarg.h> #define WIN32_NO_STATUS -#include <windows.h> +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <windef.h> +#include <winbase.h> +#include <winreg.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> + +/* PSEH for SEH Support */ +#include <pseh/pseh2.h> /* CSRSS Header */ #include <csr/csrsrv.h> @@ -31,25 +39,24 @@ } BASESRV_KERNEL_IMPORTS, *PBASESRV_KERNEL_IMPORTS; /* FIXME: BASENLS.H */ -typedef NTSTATUS(*WINAPI POPEN_DATA_FILE) (HANDLE hFile, - PWCHAR FileName - ); +typedef NTSTATUS(*WINAPI POPEN_DATA_FILE)(HANDLE hFile, + PWCHAR FileName); -typedef BOOL(*WINAPI PGET_CP_FILE_NAME_FROM_REGISTRY)(UINT CodePage, - LPWSTR FileName, - ULONG FileNameSize - ); +typedef BOOL(*WINAPI PGET_CP_FILE_NAME_FROM_REGISTRY)(UINT CodePage, + LPWSTR FileName, + ULONG FileNameSize); -typedef BOOL(*WINAPI PGET_NLS_SECTION_NAME)(UINT CodePage, - UINT Base, - ULONG Unknown, - LPWSTR BaseName, - LPWSTR Result, - ULONG ResultSize - ); +typedef BOOL(*WINAPI PGET_NLS_SECTION_NAME)(UINT CodePage, + UINT Base, + ULONG Unknown, + LPWSTR BaseName, + LPWSTR Result, + ULONG ResultSize); typedef BOOL(*WINAPI PVALIDATE_LOCALE)(IN ULONG LocaleId); -typedef NTSTATUS(*WINAPI PCREATE_NLS_SECURTY_DESCRIPTOR)(IN PVOID Buffer, IN ULONG BufferSize, IN ULONG AceType); +typedef NTSTATUS(*WINAPI PCREATE_NLS_SECURTY_DESCRIPTOR)(IN PVOID Buffer, + IN ULONG BufferSize, + IN ULONG AceType); /* Globals */ extern HANDLE BaseSrvHeap; Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ini… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] Tue Sep 10 20:45:53 2013 @@ -280,6 +280,7 @@ BaseInitializeStaticServerData(IN PCSR_SERVER_DLL LoadedServerDll) { NTSTATUS Status; + BOOLEAN Success; WCHAR Buffer[MAX_PATH]; PWCHAR HeapBuffer; UNICODE_STRING SystemRootString; @@ -327,21 +328,21 @@ /* Create the base directory */ Buffer[SystemRootString.Length / sizeof(WCHAR)] = UNICODE_NULL; - Status = RtlCreateUnicodeString(&BaseSrvWindowsDirectory, - SystemRootString.Buffer); - ASSERT(NT_SUCCESS(Status)); + Success = RtlCreateUnicodeString(&BaseSrvWindowsDirectory, + SystemRootString.Buffer); + ASSERT(Success); /* Create the system directory */ wcscat(SystemRootString.Buffer, L"\\System32"); - Status = RtlCreateUnicodeString(&BaseSrvWindowsSystemDirectory, - SystemRootString.Buffer); - ASSERT(NT_SUCCESS(Status)); + Success = RtlCreateUnicodeString(&BaseSrvWindowsSystemDirectory, + SystemRootString.Buffer); + ASSERT(Success); /* Create the kernel32 path */ wcscat(SystemRootString.Buffer, L"\\kernel32.dll"); - Status = RtlCreateUnicodeString(&BaseSrvKernel32DllPath, - SystemRootString.Buffer); - ASSERT(NT_SUCCESS(Status)); + Success = RtlCreateUnicodeString(&BaseSrvKernel32DllPath, + SystemRootString.Buffer); + ASSERT(Success); /* FIXME: Check Session ID */ wcscpy(Buffer, L"\\BaseNamedObjects");

1 0

[aandrejevic] 60011: [SOFT386] Implement many instructions (including ADC, SUB, CDQ, CWDE, ...), and "stubplement" even more of them.
by aandrejevic＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: aandrejevic Date: Tue Sep 10 20:41:43 2013 New Revision: 60011 URL: http://svn.reactos.org/svn/reactos?rev=60011&view=rev Log: [SOFT386] Implement many instructions (including ADC, SUB, CDQ, CWDE, ...), and "stubplement" even more of them. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Tue Sep 10 20:41:43 2013 @@ -30,32 +30,32 @@ Soft386OpcodeAddModrm, Soft386OpcodeAddAl, Soft386OpcodeAddEax, - NULL, // TODO: OPCODE 0x06 NOT SUPPORTED - NULL, // TODO: OPCODE 0x07 NOT SUPPORTED + Soft386OpcodePushEs, + Soft386OpcodePopEs, Soft386OpcodeOrByteModrm, Soft386OpcodeOrModrm, Soft386OpcodeOrByteModrm, Soft386OpcodeOrModrm, Soft386OpcodeOrAl, Soft386OpcodeOrEax, - NULL, // TODO: OPCODE 0x0E NOT SUPPORTED + Soft386OpcodePushCs, NULL, // TODO: OPCODE 0x0F NOT SUPPORTED - NULL, // TODO: OPCODE 0x10 NOT SUPPORTED - NULL, // TODO: OPCODE 0x11 NOT SUPPORTED - NULL, // TODO: OPCODE 0x12 NOT SUPPORTED - NULL, // TODO: OPCODE 0x13 NOT SUPPORTED - NULL, // TODO: OPCODE 0x14 NOT SUPPORTED - NULL, // TODO: OPCODE 0x15 NOT SUPPORTED - NULL, // TODO: OPCODE 0x16 NOT SUPPORTED - NULL, // TODO: OPCODE 0x17 NOT SUPPORTED - NULL, // TODO: OPCODE 0x18 NOT SUPPORTED - NULL, // TODO: OPCODE 0x19 NOT SUPPORTED - NULL, // TODO: OPCODE 0x1A NOT SUPPORTED - NULL, // TODO: OPCODE 0x1B NOT SUPPORTED - NULL, // TODO: OPCODE 0x1C NOT SUPPORTED - NULL, // TODO: OPCODE 0x1D NOT SUPPORTED - NULL, // TODO: OPCODE 0x1E NOT SUPPORTED - NULL, // TODO: OPCODE 0x1F NOT SUPPORTED + Soft386OpcodeAdcByteModrm, + Soft386OpcodeAdcModrm, + Soft386OpcodeAdcByteModrm, + Soft386OpcodeAdcModrm, + Soft386OpcodeAdcAl, + Soft386OpcodeAdcEax, + Soft386OpcodePushSs, + Soft386OpcodePopSs, + Soft386OpcodeSbbByteModrm, + Soft386OpcodeSbbModrm, + Soft386OpcodeSbbByteModrm, + Soft386OpcodeSbbModrm, + Soft386OpcodeSbbAl, + Soft386OpcodeSbbEax, + Soft386OpcodePushDs, + Soft386OpcodePopDs, Soft386OpcodeAndByteModrm, Soft386OpcodeAndModrm, Soft386OpcodeAndByteModrm, @@ -63,15 +63,15 @@ Soft386OpcodeAndAl, Soft386OpcodeAndEax, Soft386OpcodePrefix, - NULL, // TODO: OPCODE 0x27 NOT SUPPORTED - NULL, // TODO: OPCODE 0x28 NOT SUPPORTED - NULL, // TODO: OPCODE 0x29 NOT SUPPORTED - NULL, // TODO: OPCODE 0x2A NOT SUPPORTED - NULL, // TODO: OPCODE 0x2B NOT SUPPORTED - NULL, // TODO: OPCODE 0x2C NOT SUPPORTED - NULL, // TODO: OPCODE 0x2D NOT SUPPORTED + Soft386OpcodeDaa, + Soft386OpcodeCmpSubByteModrm, + Soft386OpcodeCmpSubModrm, + Soft386OpcodeCmpSubByteModrm, + Soft386OpcodeCmpSubModrm, + Soft386OpcodeCmpSubAl, + Soft386OpcodeCmpSubEax, Soft386OpcodePrefix, - NULL, // TODO: OPCODE 0x2F NOT SUPPORTED + Soft386OpcodeDas, Soft386OpcodeXorByteModrm, Soft386OpcodeXorModrm, Soft386OpcodeXorByteModrm, @@ -79,15 +79,15 @@ Soft386OpcodeXorAl, Soft386OpcodeXorEax, Soft386OpcodePrefix, - NULL, // TODO: OPCODE 0x37 NOT SUPPORTED - NULL, // TODO: OPCODE 0x38 NOT SUPPORTED - NULL, // TODO: OPCODE 0x39 NOT SUPPORTED - NULL, // TODO: OPCODE 0x3A NOT SUPPORTED - NULL, // TODO: OPCODE 0x3B NOT SUPPORTED - NULL, // TODO: OPCODE 0x3C NOT SUPPORTED - NULL, // TODO: OPCODE 0x3D NOT SUPPORTED + Soft386OpcodeAaa, + Soft386OpcodeCmpSubByteModrm, + Soft386OpcodeCmpSubModrm, + Soft386OpcodeCmpSubByteModrm, + Soft386OpcodeCmpSubModrm, + Soft386OpcodeCmpSubAl, + Soft386OpcodeCmpSubEax, Soft386OpcodePrefix, - NULL, // TODO: OPCODE 0x3F NOT SUPPORTED + Soft386OpcodeAas, Soft386OpcodeIncrement, Soft386OpcodeIncrement, Soft386OpcodeIncrement, @@ -120,18 +120,18 @@ Soft386OpcodePopReg, Soft386OpcodePopReg, Soft386OpcodePopReg, - NULL, // TODO: OPCODE 0x60 NOT SUPPORTED - NULL, // TODO: OPCODE 0x61 NOT SUPPORTED - NULL, // TODO: OPCODE 0x62 NOT SUPPORTED - NULL, // TODO: OPCODE 0x63 NOT SUPPORTED + Soft386OpcodePushAll, + Soft386OpcodePopAll, + Soft386OpcodeBound, + Soft386OpcodeArpl, Soft386OpcodePrefix, Soft386OpcodePrefix, Soft386OpcodePrefix, Soft386OpcodePrefix, - NULL, // TODO: OPCODE 0x68 NOT SUPPORTED - NULL, // TODO: OPCODE 0x69 NOT SUPPORTED - NULL, // TODO: OPCODE 0x6A NOT SUPPORTED - NULL, // TODO: OPCODE 0x6B NOT SUPPORTED + Soft386OpcodePushImm, + Soft386OpcodeImulModrmImm, + Soft386OpcodePushByteImm, + Soft386OpcodeImulModrmByteImm, NULL, // TODO: OPCODE 0x6C NOT SUPPORTED NULL, // TODO: OPCODE 0x6D NOT SUPPORTED NULL, // TODO: OPCODE 0x6E NOT SUPPORTED @@ -160,13 +160,13 @@ Soft386OpcodeTestModrm, Soft386OpcodeXchgByteModrm, Soft386OpcodeXchgModrm, - NULL, // TODO: OPCODE 0x88 NOT SUPPORTED - NULL, // TODO: OPCODE 0x89 NOT SUPPORTED - NULL, // TODO: OPCODE 0x8A NOT SUPPORTED - NULL, // TODO: OPCODE 0x8B NOT SUPPORTED - NULL, // TODO: OPCODE 0x8C NOT SUPPORTED - NULL, // TODO: OPCODE 0x8D NOT SUPPORTED - NULL, // TODO: OPCODE 0x8E NOT SUPPORTED + Soft386OpcodeMovByteModrm, + Soft386OpcodeMovModrm, + Soft386OpcodeMovByteModrm, + Soft386OpcodeMovModrm, + Soft386OpcodeMovStoreSeg, + Soft386OpcodeLea, + Soft386OpcodeMovLoadSeg, NULL, // TODO: OPCODE 0x8F NOT SUPPORTED Soft386OpcodeNop, Soft386OpcodeExchangeEax, @@ -176,14 +176,14 @@ Soft386OpcodeExchangeEax, Soft386OpcodeExchangeEax, Soft386OpcodeExchangeEax, - NULL, // TODO: OPCODE 0x98 NOT SUPPORTED - NULL, // TODO: OPCODE 0x99 NOT SUPPORTED - NULL, // TODO: OPCODE 0x9A NOT SUPPORTED - NULL, // TODO: OPCODE 0x9B NOT SUPPORTED - NULL, // TODO: OPCODE 0x9C NOT SUPPORTED - NULL, // TODO: OPCODE 0x9D NOT SUPPORTED - NULL, // TODO: OPCODE 0x9E NOT SUPPORTED - NULL, // TODO: OPCODE 0x9F NOT SUPPORTED + Soft386OpcodeCwde, + Soft386OpcodeCdq, + Soft386OpcodeCallAbs, + Soft386OpcodeWait, + Soft386OpcodePushFlags, + Soft386OpcodePopFlags, + Soft386OpcodeSahf, + Soft386OpcodeLahf, NULL, // TODO: OPCODE 0xA0 NOT SUPPORTED NULL, // TODO: OPCODE 0xA1 NOT SUPPORTED NULL, // TODO: OPCODE 0xA2 NOT SUPPORTED @@ -192,8 +192,8 @@ NULL, // TODO: OPCODE 0xA5 NOT SUPPORTED NULL, // TODO: OPCODE 0xA6 NOT SUPPORTED NULL, // TODO: OPCODE 0xA7 NOT SUPPORTED - NULL, // TODO: OPCODE 0xA8 NOT SUPPORTED - NULL, // TODO: OPCODE 0xA9 NOT SUPPORTED + Soft386OpcodeTestAl, + Soft386OpcodeTestEax, NULL, // TODO: OPCODE 0xAA NOT SUPPORTED NULL, // TODO: OPCODE 0xAB NOT SUPPORTED NULL, // TODO: OPCODE 0xAC NOT SUPPORTED @@ -218,28 +218,28 @@ Soft386OpcodeMovRegImm, NULL, // TODO: OPCODE 0xC0 NOT SUPPORTED NULL, // TODO: OPCODE 0xC1 NOT SUPPORTED - NULL, // TODO: OPCODE 0xC2 NOT SUPPORTED - NULL, // TODO: OPCODE 0xC3 NOT SUPPORTED - NULL, // TODO: OPCODE 0xC4 NOT SUPPORTED - NULL, // TODO: OPCODE 0xC5 NOT SUPPORTED + Soft386OpcodeRetImm, + Soft386OpcodeRet, + Soft386OpcodeLes, + Soft386OpcodeLds, NULL, // TODO: OPCODE 0xC6 NOT SUPPORTED NULL, // TODO: OPCODE 0xC7 NOT SUPPORTED - NULL, // TODO: OPCODE 0xC8 NOT SUPPORTED - NULL, // TODO: OPCODE 0xC9 NOT SUPPORTED - NULL, // TODO: OPCODE 0xCA NOT SUPPORTED - NULL, // TODO: OPCODE 0xCB NOT SUPPORTED - NULL, // TODO: OPCODE 0xCC NOT SUPPORTED - NULL, // TODO: OPCODE 0xCD NOT SUPPORTED - NULL, // TODO: OPCODE 0xCE NOT SUPPORTED - NULL, // TODO: OPCODE 0xCF NOT SUPPORTED + Soft386OpcodeEnter, + Soft386OpcodeLeave, + Soft386OpcodeRetFarImm, + Soft386OpcodeRetFar, + Soft386OpcodeInt3, + Soft386OpcodeInt, + Soft386OpcodeIntOverflow, + Soft386OpcodeIret, NULL, // TODO: OPCODE 0xD0 NOT SUPPORTED NULL, // TODO: OPCODE 0xD1 NOT SUPPORTED NULL, // TODO: OPCODE 0xD2 NOT SUPPORTED NULL, // TODO: OPCODE 0xD3 NOT SUPPORTED - NULL, // TODO: OPCODE 0xD4 NOT SUPPORTED - NULL, // TODO: OPCODE 0xD5 NOT SUPPORTED + Soft386OpcodeAam, + Soft386OpcodeAad, NULL, // TODO: OPCODE 0xD6 NOT SUPPORTED - NULL, // TODO: OPCODE 0xD7 NOT SUPPORTED + Soft386OpcodeXlat, NULL, // TODO: OPCODE 0xD8 NOT SUPPORTED NULL, // TODO: OPCODE 0xD9 NOT SUPPORTED NULL, // TODO: OPCODE 0xDA NOT SUPPORTED @@ -248,17 +248,17 @@ NULL, // TODO: OPCODE 0xDD NOT SUPPORTED NULL, // TODO: OPCODE 0xDE NOT SUPPORTED NULL, // TODO: OPCODE 0xDF NOT SUPPORTED - NULL, // TODO: OPCODE 0xE0 NOT SUPPORTED - NULL, // TODO: OPCODE 0xE1 NOT SUPPORTED - NULL, // TODO: OPCODE 0xE2 NOT SUPPORTED - NULL, // TODO: OPCODE 0xE3 NOT SUPPORTED + Soft386OpcodeLoopnz, + Soft386OpcodeLoopz, + Soft386OpcodeLoop, + Soft386OpcodeJecxz, Soft386OpcodeInByte, Soft386OpcodeIn, Soft386OpcodeOutByte, Soft386OpcodeOut, - NULL, // TODO: OPCODE 0xE8 NOT SUPPORTED - NULL, // TODO: OPCODE 0xE9 NOT SUPPORTED - NULL, // TODO: OPCODE 0xEA NOT SUPPORTED + Soft386OpcodeCall, + Soft386OpcodeJmp, + Soft386OpcodeJmpAbs, Soft386OpcodeShortJump, Soft386OpcodeInByte, Soft386OpcodeIn, @@ -2610,3 +2610,1286 @@ /* The result is discarded */ return TRUE; } + +SOFT386_OPCODE_HANDLER(Soft386OpcodePushEs) +{ + /* Call the internal API */ + return Soft386StackPush(State, State->SegmentRegs[SOFT386_REG_ES].Selector); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePopEs) +{ + ULONG NewSelector; + + if (!Soft386StackPop(State, &NewSelector)) + { + /* Exception occurred */ + return FALSE; + } + + /* Call the internal API */ + return Soft386LoadSegment(State, SOFT386_REG_ES, LOWORD(NewSelector)); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePushCs) +{ + /* Call the internal API */ + return Soft386StackPush(State, State->SegmentRegs[SOFT386_REG_CS].Selector); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAdcByteModrm) +{ + UCHAR FirstValue, SecondValue, Result; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFD) == 0x10); + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + else if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (!Soft386ReadModrmByteOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue + SecondValue + State->Flags.Cf; + + /* Special exception for CF */ + State->Flags.Cf = State->Flags.Cf + && ((FirstValue == 0xFF) || (SecondValue == 0xFF)); + + /* Update the flags */ + State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); + State->Flags.Of = ((FirstValue & SIGN_FLAG_BYTE) == (SecondValue & SIGN_FLAG_BYTE)) + && ((FirstValue & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmByteOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAdcModrm) +{ + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFD) == 0x11); + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the address size */ + AddressSize = !AddressSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the operand size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_OPSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check the operand size */ + if (OperandSize) + { + ULONG FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmDwordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue + SecondValue + State->Flags.Cf; + + /* Special exception for CF */ + State->Flags.Cf = State->Flags.Cf + && ((FirstValue == 0xFFFFFFFF) || (SecondValue == 0xFFFFFFFF)); + + /* Update the flags */ + State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); + State->Flags.Of = ((FirstValue & SIGN_FLAG_LONG) == (SecondValue & SIGN_FLAG_LONG)) + && ((FirstValue & SIGN_FLAG_LONG) != (Result & SIGN_FLAG_LONG)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmDwordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } + else + { + USHORT FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmWordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue + SecondValue + State->Flags.Cf; + + /* Special exception for CF */ + State->Flags.Cf = State->Flags.Cf + && ((FirstValue == 0xFFFF) || (SecondValue == 0xFFFF)); + + /* Update the flags */ + State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); + State->Flags.Of = ((FirstValue & SIGN_FLAG_WORD) == (SecondValue & SIGN_FLAG_WORD)) + && ((FirstValue & SIGN_FLAG_WORD) != (Result & SIGN_FLAG_WORD)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmWordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } + +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAdcAl) +{ + UCHAR FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + UCHAR SecondValue, Result; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x14); + + if (State->PrefixFlags) + { + /* This opcode doesn't take any prefixes */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (!Soft386FetchByte(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue + SecondValue + State->Flags.Cf; + + /* Special exception for CF */ + State->Flags.Cf = State->Flags.Cf && + ((FirstValue == 0xFF) || (SecondValue == 0xFF)); + + /* Update the flags */ + State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); + State->Flags.Of = ((FirstValue & SIGN_FLAG_BYTE) == (SecondValue & SIGN_FLAG_BYTE)) + && ((FirstValue & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte = Result; + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAdcEax) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x15); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Size) + { + ULONG FirstValue = State->GeneralRegs[SOFT386_REG_EAX].Long; + ULONG SecondValue, Result; + + if (!Soft386FetchDword(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue + SecondValue + State->Flags.Cf; + + /* Special exception for CF */ + State->Flags.Cf = State->Flags.Cf && + ((FirstValue == 0xFFFFFFFF) || (SecondValue == 0xFFFFFFFF)); + + /* Update the flags */ + State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); + State->Flags.Of = ((FirstValue & SIGN_FLAG_LONG) == (SecondValue & SIGN_FLAG_LONG)) + && ((FirstValue & SIGN_FLAG_LONG) != (Result & SIGN_FLAG_LONG)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].Long = Result; + } + else + { + USHORT FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowWord; + USHORT SecondValue, Result; + + if (!Soft386FetchWord(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue + SecondValue + State->Flags.Cf; + + /* Special exception for CF */ + State->Flags.Cf = State->Flags.Cf && + ((FirstValue == 0xFFFF) || (SecondValue == 0xFFFF)); + + /* Update the flags */ + State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); + State->Flags.Of = ((FirstValue & SIGN_FLAG_WORD) == (SecondValue & SIGN_FLAG_WORD)) + && ((FirstValue & SIGN_FLAG_WORD) != (Result & SIGN_FLAG_WORD)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowWord = Result; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePushSs) +{ + /* Call the internal API */ + return Soft386StackPush(State, State->SegmentRegs[SOFT386_REG_SS].Selector); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePopSs) +{ + ULONG NewSelector; + + if (!Soft386StackPop(State, &NewSelector)) + { + /* Exception occurred */ + return FALSE; + } + + /* Call the internal API */ + return Soft386LoadSegment(State, SOFT386_REG_SS, LOWORD(NewSelector)); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbByteModrm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbModrm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbAl) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbEax) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePushDs) +{ + /* Call the internal API */ + return Soft386StackPush(State, State->SegmentRegs[SOFT386_REG_DS].Selector); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePopDs) +{ + ULONG NewSelector; + + if (!Soft386StackPop(State, &NewSelector)) + { + /* Exception occurred */ + return FALSE; + } + + /* Call the internal API */ + return Soft386LoadSegment(State, SOFT386_REG_DS, LOWORD(NewSelector)); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeDaa) +{ + UCHAR Value = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + BOOLEAN Carry = State->Flags.Cf; + + /* Clear the carry flag */ + State->Flags.Cf = FALSE; + + /* Check if the first BCD digit is invalid or there was a carry from it */ + if (((Value & 0x0F) > 9) || State->Flags.Af) + { + /* Correct it */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte += 0x06; + if (State->GeneralRegs[SOFT386_REG_EAX].LowByte < 0x06) + { + /* A carry occurred */ + State->Flags.Cf = TRUE; + } + + /* Set the adjust flag */ + State->Flags.Af = TRUE; + } + + /* Check if the second BCD digit is invalid or there was a carry from it */ + if ((Value > 0x99) || Carry) + { + /* Correct it */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte += 0x60; + + /* There was a carry */ + State->Flags.Cf = TRUE; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmpSubByteModrm) +{ + UCHAR FirstValue, SecondValue, Result; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xED) == 0x28); + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + else if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (!Soft386ReadModrmByteOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check if this is the instruction that writes to R/M */ + if (!(Opcode & SOFT386_OPCODE_WRITE_REG)) + { + /* Swap the order */ + FirstValue ^= SecondValue; + SecondValue ^= FirstValue; + FirstValue ^= SecondValue; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue; + + /* Update the flags */ + State->Flags.Cf = FirstValue < SecondValue; + State->Flags.Of = ((FirstValue & SIGN_FLAG_BYTE) != (SecondValue & SIGN_FLAG_BYTE)) + && ((FirstValue & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); + State->Flags.Af = (FirstValue & 0x0F) < (SecondValue & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Check if this is not a CMP */ + if (!(Opcode & 0x10)) + { + /* Write back the result */ + return Soft386WriteModrmByteOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } + else + { + /* Discard the result */ + return TRUE; + } +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmpSubModrm) +{ + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xED) == 0x29); + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the address size */ + AddressSize = !AddressSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the operand size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_OPSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check the operand size */ + if (OperandSize) + { + ULONG FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmDwordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check if this is the instruction that writes to R/M */ + if (!(Opcode & SOFT386_OPCODE_WRITE_REG)) + { + /* Swap the order */ + FirstValue ^= SecondValue; + SecondValue ^= FirstValue; + FirstValue ^= SecondValue; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue; + + /* Update the flags */ + State->Flags.Cf = FirstValue < SecondValue; + State->Flags.Of = ((FirstValue & SIGN_FLAG_LONG) != (SecondValue & SIGN_FLAG_LONG)) + && ((FirstValue & SIGN_FLAG_LONG) != (Result & SIGN_FLAG_LONG)); + State->Flags.Af = (FirstValue & 0x0F) < (SecondValue & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Check if this is not a CMP */ + if (!(Opcode & 0x10)) + { + /* Write back the result */ + return Soft386WriteModrmDwordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } + else + { + /* Discard the result */ + return TRUE; + } + } + else + { + USHORT FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmWordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check if this is the instruction that writes to R/M */ + if (!(Opcode & SOFT386_OPCODE_WRITE_REG)) + { + /* Swap the order */ + FirstValue ^= SecondValue; + SecondValue ^= FirstValue; + FirstValue ^= SecondValue; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue; + + /* Update the flags */ + State->Flags.Cf = FirstValue < SecondValue; + State->Flags.Of = ((FirstValue & SIGN_FLAG_WORD) != (SecondValue & SIGN_FLAG_WORD)) + && ((FirstValue & SIGN_FLAG_WORD) != (Result & SIGN_FLAG_WORD)); + State->Flags.Af = (FirstValue & 0x0F) < (SecondValue & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Check if this is not a CMP */ + if (!(Opcode & 0x10)) + { + /* Write back the result */ + return Soft386WriteModrmWordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } + else + { + /* Discard the result */ + return TRUE; + } + } + +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmpSubAl) +{ + UCHAR FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + UCHAR SecondValue, Result; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xEF) == 0x2C); + + if (State->PrefixFlags) + { + /* This opcode doesn't take any prefixes */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (!Soft386FetchByte(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue; + + /* Update the flags */ + State->Flags.Cf = FirstValue < SecondValue; + State->Flags.Of = ((FirstValue & SIGN_FLAG_BYTE) != (SecondValue & SIGN_FLAG_BYTE)) + && ((FirstValue & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); + State->Flags.Af = (FirstValue & 0x0F) < (SecondValue & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Check if this is not a CMP */ + if (!(Opcode & 0x10)) + { + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte = Result; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmpSubEax) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xEF) == 0x2D); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Size) + { + ULONG FirstValue = State->GeneralRegs[SOFT386_REG_EAX].Long; + ULONG SecondValue, Result; + + if (!Soft386FetchDword(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue; + + /* Update the flags */ + State->Flags.Cf = FirstValue < SecondValue; + State->Flags.Of = ((FirstValue & SIGN_FLAG_LONG) != (SecondValue & SIGN_FLAG_LONG)) + && ((FirstValue & SIGN_FLAG_LONG) != (Result & SIGN_FLAG_LONG)); + State->Flags.Af = (FirstValue & 0x0F) < (SecondValue & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Check if this is not a CMP */ + if (!(Opcode & 0x10)) + { + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].Long = Result; + } + } + else + { + USHORT FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowWord; + USHORT SecondValue, Result; + + if (!Soft386FetchWord(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue; + + /* Update the flags */ + State->Flags.Cf = FirstValue < SecondValue; + State->Flags.Of = ((FirstValue & SIGN_FLAG_WORD) != (SecondValue & SIGN_FLAG_WORD)) + && ((FirstValue & SIGN_FLAG_WORD) != (Result & SIGN_FLAG_WORD)); + State->Flags.Af = (FirstValue & 0x0F) < (SecondValue & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowWord = Result; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeDas) +{ + UCHAR Value = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + BOOLEAN Carry = State->Flags.Cf; + + /* Clear the carry flag */ + State->Flags.Cf = FALSE; + + /* Check if the first BCD digit is invalid or there was a borrow */ + if (((Value & 0x0F) > 9) || State->Flags.Af) + { + /* Correct it */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte -= 0x06; + if (State->GeneralRegs[SOFT386_REG_EAX].LowByte > 0xFB) + { + /* A borrow occurred */ + State->Flags.Cf = TRUE; + } + + /* Set the adjust flag */ + State->Flags.Af = TRUE; + } + + /* Check if the second BCD digit is invalid or there was a borrow */ + if ((Value > 0x99) || Carry) + { + /* Correct it */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte -= 0x60; + + /* There was a borrow */ + State->Flags.Cf = TRUE; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAaa) +{ + UCHAR Value = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + + /* + * Check if the value in AL is not a valid BCD digit, + * or there was a carry from the lowest 4 bits of AL + */ + if (((Value & 0x0F) > 9) || State->Flags.Af) + { + /* Correct it */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte += 0x06; + State->GeneralRegs[SOFT386_REG_EAX].HighByte++; + + /* Set CF and AF */ + State->Flags.Cf = State->Flags.Af = TRUE; + } + else + { + /* Clear CF and AF */ + State->Flags.Cf = State->Flags.Af = FALSE; + } + + /* Keep only the lowest 4 bits of AL */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte &= 0x0F; + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAas) +{ + UCHAR Value = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + + /* + * Check if the value in AL is not a valid BCD digit, + * or there was a borrow from the lowest 4 bits of AL + */ + if (((Value & 0x0F) > 9) || State->Flags.Af) + { + /* Correct it */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte -= 0x06; + State->GeneralRegs[SOFT386_REG_EAX].HighByte--; + + /* Set CF and AF */ + State->Flags.Cf = State->Flags.Af = TRUE; + } + else + { + /* Clear CF and AF */ + State->Flags.Cf = State->Flags.Af = FALSE; + } + + /* Keep only the lowest 4 bits of AL */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte &= 0x0F; + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePushAll) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePopAll) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeBound) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeArpl) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePushImm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeImulModrmImm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePushByteImm) +{ + UCHAR Data; + + if (!Soft386FetchByte(State, &Data)) + { + /* Exception occurred */ + return FALSE; + } + + /* Call the internal API */ + return Soft386StackPush(State, Data); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeImulModrmByteImm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovByteModrm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovModrm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovStoreSeg) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLea) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovLoadSeg) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeCwde) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x98); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else if (State->PrefixFlags != 0) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Size) + { + /* Sign extend AX to EAX */ + State->GeneralRegs[SOFT386_REG_EAX].Long = MAKELONG + ( + State->GeneralRegs[SOFT386_REG_EAX].LowWord, + (State->GeneralRegs[SOFT386_REG_EAX].LowWord & SIGN_FLAG_WORD) + ? 0xFFFF : 0x0000 + ); + } + else + { + /* Sign extend AL to AX */ + State->GeneralRegs[SOFT386_REG_EAX].HighByte = + (State->GeneralRegs[SOFT386_REG_EAX].LowByte & SIGN_FLAG_BYTE) + ? 0xFF : 0x00; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeCdq) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x99); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else if (State->PrefixFlags != 0) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Size) + { + /* Sign extend EAX to EDX:EAX */ + State->GeneralRegs[SOFT386_REG_EDX].Long = + (State->GeneralRegs[SOFT386_REG_EAX].Long & SIGN_FLAG_LONG) + ? 0xFFFFFFFF : 0x00000000; + } + else + { + /* Sign extend AX to DX:AX */ + State->GeneralRegs[SOFT386_REG_EDX].LowWord = + (State->GeneralRegs[SOFT386_REG_EAX].LowWord & SIGN_FLAG_WORD) + ? 0xFFFF : 0x0000; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeCallAbs) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeWait) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePushFlags) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePopFlags) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeSahf) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLahf) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetImm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeRet) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLes) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLds) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeEnter) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLeave) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFarImm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFar) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeInt3) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeInt) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeIntOverflow) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeIret) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAam) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAad) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeXlat) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoopnz) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoopz) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoop) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeJecxz) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeCall) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeJmp) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeJmpAbs) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Tue Sep 10 20:41:43 2013 @@ -68,7 +68,75 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeXorEax); SOFT386_OPCODE_HANDLER(Soft386OpcodeTestByteModrm); SOFT386_OPCODE_HANDLER(Soft386OpcodeTestModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeTestAl); +SOFT386_OPCODE_HANDLER(Soft386OpcodeTestEax); SOFT386_OPCODE_HANDLER(Soft386OpcodeXchgByteModrm); SOFT386_OPCODE_HANDLER(Soft386OpcodeXchgModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodePushEs); +SOFT386_OPCODE_HANDLER(Soft386OpcodePopEs); +SOFT386_OPCODE_HANDLER(Soft386OpcodePushCs); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAdcByteModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAdcModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAdcAl); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAdcEax); +SOFT386_OPCODE_HANDLER(Soft386OpcodePushSs); +SOFT386_OPCODE_HANDLER(Soft386OpcodePopSs); +SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbByteModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbAl); +SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbEax); +SOFT386_OPCODE_HANDLER(Soft386OpcodePushDs); +SOFT386_OPCODE_HANDLER(Soft386OpcodePopDs); +SOFT386_OPCODE_HANDLER(Soft386OpcodeDaa); +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmpSubByteModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmpSubModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmpSubAl); +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmpSubEax); +SOFT386_OPCODE_HANDLER(Soft386OpcodeDas); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAaa); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAas); +SOFT386_OPCODE_HANDLER(Soft386OpcodePushAll); +SOFT386_OPCODE_HANDLER(Soft386OpcodePopAll); +SOFT386_OPCODE_HANDLER(Soft386OpcodeBound); +SOFT386_OPCODE_HANDLER(Soft386OpcodeArpl); +SOFT386_OPCODE_HANDLER(Soft386OpcodePushImm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeImulModrmImm); +SOFT386_OPCODE_HANDLER(Soft386OpcodePushByteImm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeImulModrmByteImm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovByteModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovStoreSeg); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLea); +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovLoadSeg); +SOFT386_OPCODE_HANDLER(Soft386OpcodeCwde); +SOFT386_OPCODE_HANDLER(Soft386OpcodeCdq); +SOFT386_OPCODE_HANDLER(Soft386OpcodeCallAbs); +SOFT386_OPCODE_HANDLER(Soft386OpcodeWait); +SOFT386_OPCODE_HANDLER(Soft386OpcodePushFlags); +SOFT386_OPCODE_HANDLER(Soft386OpcodePopFlags); +SOFT386_OPCODE_HANDLER(Soft386OpcodeSahf); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLahf); +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetImm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeRet); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLes); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLds); +SOFT386_OPCODE_HANDLER(Soft386OpcodeEnter); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLeave); +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFarImm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFar); +SOFT386_OPCODE_HANDLER(Soft386OpcodeInt3); +SOFT386_OPCODE_HANDLER(Soft386OpcodeInt); +SOFT386_OPCODE_HANDLER(Soft386OpcodeIntOverflow); +SOFT386_OPCODE_HANDLER(Soft386OpcodeIret); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAam); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAad); +SOFT386_OPCODE_HANDLER(Soft386OpcodeXlat); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoopnz); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoopz); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoop); +SOFT386_OPCODE_HANDLER(Soft386OpcodeJecxz); +SOFT386_OPCODE_HANDLER(Soft386OpcodeCall); +SOFT386_OPCODE_HANDLER(Soft386OpcodeJmp); +SOFT386_OPCODE_HANDLER(Soft386OpcodeJmpAbs); #endif // _OPCODES_H_

1 0

[tfaber] 60010: [CMAKE] - Correctly escape error message. Spotted & tested by David Quintana
by tfaber＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: tfaber Date: Tue Sep 10 20:06:05 2013 New Revision: 60010 URL: http://svn.reactos.org/svn/reactos?rev=60010&view=rev Log: [CMAKE] - Correctly escape error message. Spotted & tested by David Quintana Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Tue Sep 10 20:06:05 2013 @@ -189,7 +189,7 @@ set(${var} 16) elseif(${dir} STREQUAL reactos/system32/wbem) set(${var} 17) - else() + else() message(FATAL_ERROR "Wrong destination: ${dir}") endif() endmacro() @@ -207,7 +207,7 @@ endif() if(NOT _CD_FOR) - message(FATAL_ERROR "You must provide a cd name (or "all" for all of them) to install the file on!") + message(FATAL_ERROR "You must provide a cd name (or \"all\" for all of them) to install the file on!") endif() #get file if we need to

1 0

[tfaber] 60009: [KERNEL32] - Improve a DPRINT in CreateProcessInternalW. Patch by Víctor Martínez Calvo CORE-7452 #resolve
by tfaber＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: tfaber Date: Tue Sep 10 17:12:21 2013 New Revision: 60009 URL: http://svn.reactos.org/svn/reactos?rev=60009&view=rev Log: [KERNEL32] - Improve a DPRINT in CreateProcessInternalW. Patch by Víctor Martínez Calvo CORE-7452 #resolve Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Tue Sep 10 17:12:21 2013 @@ -2744,7 +2744,7 @@ } } - DPRINT1("Length: %lx Buffer: %S\n", Length, NameBuffer); + DPRINT1("Length: %lu Buffer: %S\n", Length, NameBuffer); /* Check if there was a failure in SearchPathW */ if ((Length) && (Length < MAX_PATH))

1 0

[dreimer] 60008: Woops, modified the Description to be a bit more helpful.
by dreimer＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: dreimer Date: Tue Sep 10 16:59:13 2013 New Revision: 60008 URL: http://svn.reactos.org/svn/reactos?rev=60008&view=rev Log: Woops, modified the Description to be a bit more helpful. Modified: trunk/reactos/base/applications/rapps/rapps/lautus.txt Modified: trunk/reactos/base/applications/rapps/rapps/lautus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lautus.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lautus.txt [iso-8859-1] Tue Sep 10 16:59:13 2013 @@ -4,7 +4,7 @@ Name = Lautus UXTheme Version = 1.0 License = GPLv2 -Description = Theme made specially for ReactOS. +Description = Theme made specially for ReactOS. Unzip in the "ReactOS" folder, then set the themeing service to "Automatic" and start it. URLSite = http://www.reactos.org/forum/viewtopic.php?f=25&t=9293 Size = 341kB Category = 15 @@ -12,4 +12,4 @@ CDPath = none [Section.0407] -Description = Theme, der speziell fÃ¼r ReactOS entwickelt wird. +Description = Theme, der speziell fÃ¼r ReactOS entwickelt wird. Entpacken in das "ReactOS"-Verzeichnis, dann den Design Dienst auf "Automatisch" stellen und starten.

1 0

[akhaldi] 60007: [NTDLL_WINETEST] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: akhaldi Date: Tue Sep 10 16:49:44 2013 New Revision: 60007 URL: http://svn.reactos.org/svn/reactos?rev=60007&view=rev Log: [NTDLL_WINETEST] * Sync with Wine 1.7.1. Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt trunk/rostests/winetests/ntdll/directory.c trunk/rostests/winetests/ntdll/file.c trunk/rostests/winetests/ntdll/info.c trunk/rostests/winetests/ntdll/om.c trunk/rostests/winetests/ntdll/rtlstr.c Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/CMakeList… ============================================================================== --- trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] Tue Sep 10 16:49:44 2013 @@ -32,4 +32,5 @@ add_cd_file(TARGET ntdll_winetest DESTINATION reactos/bin FOR all) if(NOT MSVC) allow_warnings(ntdll_winetest) + add_target_compile_flags(ntdll_winetest "-Wno-format") endif() Modified: trunk/rostests/winetests/ntdll/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/directory… ============================================================================== --- trunk/rostests/winetests/ntdll/directory.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/directory.c [iso-8859-1] Tue Sep 10 16:49:44 2013 @@ -162,11 +162,12 @@ } static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char *testdirA, + UNICODE_STRING *mask, BOOLEAN single_entry, BOOLEAN restart_flag) { HANDLE dirh; IO_STATUS_BLOCK io; - UINT data_pos; + UINT data_pos, data_size; UINT data_len; /* length of dir data */ BYTE data[8192]; /* directory data */ FILE_BOTH_DIRECTORY_INFORMATION *dir_info; @@ -175,6 +176,8 @@ int i; reset_found_files(); + + data_size = mask ? offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[256] ) : sizeof(data); /* Read the directory and note which files are found */ status = pNtOpenFile( &dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, attr, &io, FILE_OPEN, @@ -185,9 +188,9 @@ return; } - pNtQueryDirectoryFile( dirh, NULL, NULL, NULL, &io, data, sizeof(data), - FileBothDirectoryInformation, single_entry, NULL, restart_flag ); - ok (U(io).Status == STATUS_SUCCESS, "filed to query directory; status %x\n", U(io).Status); + pNtQueryDirectoryFile( dirh, NULL, NULL, NULL, &io, data, data_size, + FileBothDirectoryInformation, single_entry, mask, restart_flag ); + ok (U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status); data_len = io.Information; ok (data_len >= sizeof(FILE_BOTH_DIRECTORY_INFORMATION), "not enough data in directory\n"); @@ -199,11 +202,11 @@ tally_test_file(dir_info); if (dir_info->NextEntryOffset == 0) { - pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, sizeof(data), - FileBothDirectoryInformation, single_entry, NULL, FALSE ); + pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, data_size, + FileBothDirectoryInformation, single_entry, mask, FALSE ); if (U(io).Status == STATUS_NO_MORE_FILES) break; - ok (U(io).Status == STATUS_SUCCESS, "filed to query directory; status %x\n", U(io).Status); + ok (U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status); data_len = io.Information; if (data_len < sizeof(FILE_BOTH_DIRECTORY_INFORMATION)) break; @@ -215,10 +218,16 @@ } ok(numfiles < max_test_dir_size, "too many loops\n"); - for (i=0; testfiles[i].name; i++) - ok(testfiles[i].nfound == 1, "Wrong number %d of %s files found (ReturnSingleEntry=%d,RestartScan=%d)\n", - testfiles[i].nfound, testfiles[i].description, single_entry, restart_flag); - + if (mask) + for (i=0; testfiles[i].name; i++) + ok(testfiles[i].nfound == (testfiles[i].nameW == mask->Buffer), + "Wrong number %d of %s files found (single_entry=%d,mask=%s)\n", + testfiles[i].nfound, testfiles[i].description, single_entry, + wine_dbgstr_wn(mask->Buffer, mask->Length/sizeof(WCHAR) )); + else + for (i=0; testfiles[i].name; i++) + ok(testfiles[i].nfound == 1, "Wrong number %d of %s files found (single_entry=%d,restart=%d)\n", + testfiles[i].nfound, testfiles[i].description, single_entry, restart_flag); pNtClose(dirh); } @@ -228,6 +237,7 @@ UNICODE_STRING ntdirname; char testdirA[MAX_PATH]; WCHAR testdirW[MAX_PATH]; + int i; /* Clean up from prior aborted run, if any, then set up test files */ ok(GetTempPathA(MAX_PATH, testdirA), "couldn't get temp dir\n"); @@ -243,10 +253,23 @@ } InitializeObjectAttributes(&attr, &ntdirname, OBJ_CASE_INSENSITIVE, 0, NULL); - test_flags_NtQueryDirectoryFile(&attr, testdirA, FALSE, TRUE); - test_flags_NtQueryDirectoryFile(&attr, testdirA, FALSE, FALSE); - test_flags_NtQueryDirectoryFile(&attr, testdirA, TRUE, TRUE); - test_flags_NtQueryDirectoryFile(&attr, testdirA, TRUE, FALSE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, NULL, FALSE, TRUE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, NULL, FALSE, FALSE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, NULL, TRUE, TRUE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, NULL, TRUE, FALSE); + + for (i = 0; testfiles[i].name; i++) + { + UNICODE_STRING mask; + + if (testfiles[i].nameW[0] == '.') continue; /* . and .. as masks are broken on Windows */ + mask.Buffer = testfiles[i].nameW; + mask.Length = mask.MaximumLength = lstrlenW(testfiles[i].nameW) * sizeof(WCHAR); + test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, FALSE, TRUE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, FALSE, FALSE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, TRUE, TRUE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, TRUE, FALSE); + } done: tear_down_attribute_test(testdirA); Modified: trunk/rostests/winetests/ntdll/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/file.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/file.c [iso-8859-1] Tue Sep 10 16:49:44 2013 @@ -72,7 +72,7 @@ static NTSTATUS (WINAPI *pNtOpenIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI *pNtQueryIoCompletion)(HANDLE, IO_COMPLETION_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI *pNtRemoveIoCompletion)(HANDLE, PULONG_PTR, PULONG_PTR, PIO_STATUS_BLOCK, PLARGE_INTEGER); -static NTSTATUS (WINAPI *pNtSetIoCompletion)(HANDLE, ULONG_PTR, ULONG_PTR, NTSTATUS, ULONG); +static NTSTATUS (WINAPI *pNtSetIoCompletion)(HANDLE, ULONG_PTR, ULONG_PTR, NTSTATUS, SIZE_T); static NTSTATUS (WINAPI *pNtSetInformationFile)(HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, FILE_INFORMATION_CLASS); static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, FILE_INFORMATION_CLASS); static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK, @@ -81,7 +81,7 @@ static inline BOOL is_signaled( HANDLE obj ) { - return WaitForSingleObject( obj, 0 ) == 0; + return WaitForSingleObject( obj, 0 ) == WAIT_OBJECT_0; } #define PIPENAME "\\\\.\\pipe\\ntdll_tests_file.c" @@ -101,10 +101,11 @@ static HANDLE create_temp_file( ULONG flags ) { - char buffer[MAX_PATH]; + char path[MAX_PATH], buffer[MAX_PATH]; HANDLE handle; - GetTempFileNameA( ".", "foo", 0, buffer ); + GetTempPathA( MAX_PATH, path ); + GetTempFileNameA( path, "foo", 0, buffer ); handle = CreateFileA(buffer, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, flags | FILE_FLAG_DELETE_ON_CLOSE, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); @@ -505,7 +506,8 @@ ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); ok( !apc_count, "apc was called\n" ); - WriteFile( write, buffer, 1, &written, NULL ); + ret = WriteFile( write, buffer, 1, &written, NULL ); + ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* iosb updated here by async i/o */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); @@ -530,7 +532,8 @@ ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); ok( !apc_count, "apc was called\n" ); - WriteFile( write, buffer, 1, &written, NULL ); + ret = WriteFile( write, buffer, 1, &written, NULL ); + ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* iosb updated here by async i/o */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); @@ -548,7 +551,8 @@ U(iosb).Status = 0xdeadbabe; iosb.Information = 0xdeadbeef; ResetEvent( event ); - WriteFile( write, buffer, 1, &written, NULL ); + ret = WriteFile( write, buffer, 1, &written, NULL ); + ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); status = pNtReadFile( read, event, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); @@ -571,7 +575,8 @@ ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); ok( !apc_count, "apc was called\n" ); - WriteFile( write, buffer, 1, &written, NULL ); + ret = WriteFile( write, buffer, 1, &written, NULL ); + ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* partial read is good enough */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( is_signaled( event ), "event is signaled\n" ); @@ -777,6 +782,8 @@ iosb.Information = 0xdeadbeef; offset.QuadPart = strlen(text) + 2; status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, 2, &offset, NULL ); +todo_wine + ok(status == STATUS_PENDING || broken(status == STATUS_END_OF_FILE) /* before Vista */, "expected STATUS_PENDING, got %#x\n", status); if (status == STATUS_PENDING) /* vista */ { WaitForSingleObject( event, 1000 ); @@ -786,16 +793,6 @@ ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); - } - else - { - ok( status == STATUS_END_OF_FILE, "wrong status %x\n", status ); - ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); - ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); - ok( !is_signaled( event ), "event is signaled\n" ); - ok( !apc_count, "apc was called\n" ); - SleepEx( 1, TRUE ); /* alertable sleep */ - ok( !apc_count, "apc was called\n" ); } CloseHandle( handle ); @@ -859,9 +856,10 @@ NTSTATUS status; IO_STATUS_BLOCK iosb; DWORD written; - char buffer[128]; - - GetTempFileNameA( ".", "foo", 0, buffer ); + char path[MAX_PATH], buffer[MAX_PATH]; + + GetTempPathA( MAX_PATH, path ); + GetTempFileNameA( path, "foo", 0, buffer ); /* It is possible to open a file with only FILE_APPEND_DATA access flags. It matches the O_WRONLY|O_APPEND open() posix behavior */ handle = CreateFileA(buffer, FILE_APPEND_DATA, 0, NULL, CREATE_ALWAYS, @@ -990,8 +988,11 @@ { NTSTATUS res; ULONG count; - - res = pNtSetIoCompletion( h, CKEY_FIRST, CVALUE_FIRST, STATUS_INVALID_DEVICE_REQUEST, 3 ); + SIZE_T size = 3; + + if (sizeof(size) > 4) size |= (ULONGLONG)0x12345678 << 32; + + res = pNtSetIoCompletion( h, CKEY_FIRST, CVALUE_FIRST, STATUS_INVALID_DEVICE_REQUEST, size ); ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %x\n", res ); count = get_pending_msgs(h); @@ -1000,7 +1001,7 @@ if (get_msg(h)) { ok( completionKey == CKEY_FIRST, "Invalid completion key: %lx\n", completionKey ); - ok( ioSb.Information == 3, "Invalid ioSb.Information: %ld\n", ioSb.Information ); + ok( ioSb.Information == size, "Invalid ioSb.Information: %lu\n", ioSb.Information ); ok( U(ioSb).Status == STATUS_INVALID_DEVICE_REQUEST, "Invalid ioSb.Status: %x\n", U(ioSb).Status); ok( completionValue == CVALUE_FIRST, "Invalid completion value: %lx\n", completionValue ); } @@ -1299,6 +1300,158 @@ CloseHandle( h ); } +static void test_file_disposition_information(void) +{ + char buffer[MAX_PATH + 16]; + DWORD dirpos; + HANDLE handle, handle2; + NTSTATUS res; + IO_STATUS_BLOCK io; + FILE_DISPOSITION_INFORMATION fdi; + BOOL fileDeleted; + + /* cannot set disposition on file not opened with delete access */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + res = pNtQueryInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + ok( res == STATUS_INVALID_INFO_CLASS || res == STATUS_NOT_IMPLEMENTED, "Unexpected NtQueryInformationFile result (expected STATUS_INVALID_INFO_CLASS, got %x)\n", res ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_ACCESS_DENIED, "unexpected FileDispositionInformation result (expected STATUS_ACCESS_DENIED, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "File shouldn't have been deleted\n" ); + DeleteFileA( buffer ); + + /* can set disposition on file opened with proper access */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + todo_wine + ok( fileDeleted, "File should have been deleted\n" ); + DeleteFileA( buffer ); + + /* cannot set disposition on readonly file */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "File shouldn't have been deleted\n" ); + SetFileAttributesA( buffer, FILE_ATTRIBUTE_NORMAL ); + DeleteFileA( buffer ); + + /* can set disposition on file and then reset it */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "File shouldn't have been deleted\n" ); + DeleteFileA( buffer ); + + /* Delete-on-close flag doesn't change file disposition until a handle is closed */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( fileDeleted, "File should have been deleted\n" ); + DeleteFileA( buffer ); + + /* Delete-on-close flag sets disposition when a handle is closed and then it could be changed back */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + ok( DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle2, 0, FALSE, DUPLICATE_SAME_ACCESS ), "DuplicateHandle failed\n" ); + CloseHandle( handle ); + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle2, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle2 ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( fileDeleted, "File should have been deleted\n" ); + DeleteFileA( buffer ); + + /* can set disposition on a directory opened with proper access */ + GetTempFileNameA( ".", "dis", 0, buffer ); + DeleteFileA( buffer ); + ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" ); + handle = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + todo_wine + ok( fileDeleted, "Directory should have been deleted\n" ); + RemoveDirectoryA( buffer ); + + /* RemoveDirectory sets directory disposition and it can be undone */ + GetTempFileNameA( ".", "dis", 0, buffer ); + DeleteFileA( buffer ); + ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" ); + handle = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); + RemoveDirectoryA( buffer ); + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); + RemoveDirectoryA( buffer ); + + /* cannot set disposition on a non-empty directory */ + GetTempFileNameA( ".", "dis", 0, buffer ); + DeleteFileA( buffer ); + ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" ); + handle = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); + dirpos = lstrlenA( buffer ); + lstrcpyA( buffer + dirpos, "\\tst" ); + handle2 = CreateFileA(buffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + CloseHandle( handle2 ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_DIRECTORY_NOT_EMPTY, "unexpected FileDispositionInformation result (expected STATUS_DIRECTORY_NOT_EMPTY, got %x)\n", res ); + DeleteFileA( buffer ); + buffer[dirpos] = '\0'; + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); + RemoveDirectoryA( buffer ); +} + static void test_iocompletion(void) { HANDLE h = INVALID_HANDLE_VALUE; @@ -1630,6 +1783,52 @@ ok(ffvi->VolumeLabelLength == lstrlenW(ffvi->VolumeLabel) * sizeof(WCHAR), "got %d\n", ffvi->VolumeLabelLength); trace("VolumeSerialNumber: %x VolumeLabelName: %s\n", ffvi->VolumeSerialNumber, wine_dbgstr_w(ffvi->VolumeLabel)); + + CloseHandle( dir ); +} + +static void test_query_attribute_information_file(void) +{ + NTSTATUS status; + HANDLE dir; + WCHAR path[MAX_PATH]; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + UNICODE_STRING nameW; + FILE_FS_ATTRIBUTE_INFORMATION *ffai; + BYTE buf[sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; + + GetWindowsDirectoryW( path, MAX_PATH ); + pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + status = pNtOpenFile( &dir, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + pRtlFreeUnicodeString( &nameW ); + + ZeroMemory( buf, sizeof(buf) ); + U(io).Status = 0xdadadada; + io.Information = 0xcacacaca; + + status = pNtQueryVolumeInformationFile( dir, &io, buf, sizeof(buf), FileFsAttributeInformation ); + + ffai = (FILE_FS_ATTRIBUTE_INFORMATION *)buf; + + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", status); + ok(U(io).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", U(io).Status); + ok(ffai->FileSystemAttribute != 0, "Missing FileSystemAttribute\n"); + ok(ffai->MaximumComponentNameLength != 0, "Missing MaximumComponentNameLength\n"); + ok(ffai->FileSystemNameLength != 0, "Missing FileSystemNameLength\n"); + + trace("FileSystemAttribute: %x MaximumComponentNameLength: %x FileSystemName: %s\n", + ffai->FileSystemAttribute, ffai->MaximumComponentNameLength, + wine_dbgstr_wn(ffai->FileSystemName, ffai->FileSystemNameLength / sizeof(WCHAR))); CloseHandle( dir ); } @@ -1662,7 +1861,6 @@ /*18*/{ FILE_SUPERSEDE, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, TRUE } }; static const WCHAR fooW[] = {'f','o','o',0}; - static const WCHAR dotW[] = {'.',0}; NTSTATUS status; HANDLE handle; WCHAR path[MAX_PATH]; @@ -1671,7 +1869,8 @@ UNICODE_STRING nameW; DWORD ret, i; - GetTempFileNameW(dotW, fooW, 0, path); + GetTempPathW(MAX_PATH, path); + GetTempFileNameW(path, fooW, 0, path); DeleteFileW(path); pRtlDosPathNameToNtPathName_U(path, &nameW, NULL, NULL); @@ -1718,6 +1917,420 @@ SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); DeleteFileW( path ); +} + +static void test_read_write(void) +{ + static const char contents[] = "1234567890abcd"; + char buf[256]; + HANDLE hfile; + OVERLAPPED ovl; + IO_STATUS_BLOCK iob; + DWORD ret, bytes, status; + LARGE_INTEGER offset; + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtReadFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtWriteFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + + hfile = create_temp_file(0); + if (!hfile) return; + + iob.Status = -1; + iob.Information = -1; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); + ok(status == STATUS_INVALID_USER_BUFFER, "expected STATUS_INVALID_USER_BUFFER, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), NULL, NULL); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); + ok(ret, "ReadFile error %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); + + SetFilePointer(hfile, 0, NULL, FILE_BEGIN); + + bytes = 0; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); + ok(ret, "ReadFile error %d\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ok(!memcmp(contents, buf, sizeof(contents)), "file contents mismatch\n"); + + SetFilePointer(hfile, sizeof(contents) - 4, NULL, FILE_BEGIN); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information); + + SetFilePointer(hfile, 0, NULL, FILE_BEGIN); + + bytes = 0; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); + ok(ret, "ReadFile error %d\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); + ok(!memcmp(buf + sizeof(contents) - 4, "DCBA", 4), "file contents mismatch\n"); + + SetFilePointer(hfile, 0, NULL, FILE_BEGIN); + + bytes = 0; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, contents, sizeof(contents), &bytes, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %u\n", bytes); + + iob.Status = -1; + iob.Information = -1; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), NULL, NULL); + ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); +todo_wine + ok(iob.Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", iob.Status); +todo_wine + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); +todo_wine + ok(iob.Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", iob.Status); +todo_wine + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + + SetFilePointer(hfile, 0, NULL, FILE_BEGIN); + + bytes = 0; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); + ok(ret, "ReadFile error %d\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ok(!memcmp(contents, buf, sizeof(contents)), "file contents mismatch\n"); + + iob.Status = -1; + iob.Information = -1; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), NULL, NULL); + ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); +todo_wine + ok(iob.Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", iob.Status); +todo_wine + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); + ok(!memcmp(contents, buf, sizeof(contents)), "file contents mismatch\n"); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = sizeof(contents) - 4; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); + ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); + ok(!memcmp(buf + sizeof(contents) - 4, "DCBA", 4), "file contents mismatch\n"); + + S(U(ovl)).Offset = sizeof(contents) - 4; + S(U(ovl)).OffsetHigh = 0; + ovl.hEvent = 0; + bytes = 0; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, "ABCD", 4, &bytes, &ovl); + ok(ret, "WriteFile error %d\n", GetLastError()); + ok(bytes == 4, "bytes %u\n", bytes); + + S(U(ovl)).Offset = 0; + S(U(ovl)).OffsetHigh = 0; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = 0; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); + ok(ret, "ReadFile error %d\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); + ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); + ok(!memcmp(buf + sizeof(contents) - 4, "ABCD", 4), "file contents mismatch\n"); + + CloseHandle(hfile); + + hfile = create_temp_file(FILE_FLAG_OVERLAPPED); + if (!hfile) return; + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, contents, sizeof(contents), &bytes, NULL); +todo_wine + ok(!ret, "WriteFile should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); +todo_wine + ok(bytes == 0, "bytes %u\n", bytes); + + iob.Status = -1; + iob.Information = -1; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), NULL, NULL); +todo_wine + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); +todo_wine + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); +todo_wine + ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); +todo_wine + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); +todo_wine + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); +todo_wine + ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); +todo_wine + ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* see below */, "expected STATUS_PENDING, got %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); + /* even fully updated XP passes this test, but it looks like some VMs + * in a testbot get never updated, so overlapped IO is broken. Instead + * of fighting with broken tests and adding a bunch of broken() statements + * it's better to skip further tests completely. + */ + if (status != STATUS_PENDING) + { +todo_wine + win_skip("broken overlapped IO implementation, update your OS\n"); + CloseHandle(hfile); + return; + } + + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); + ok(!ret, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); + + iob.Status = -1; + iob.Information = -1; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), NULL, NULL); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + + offset.QuadPart = sizeof(contents); + S(U(ovl)).Offset = offset.u.LowPart; + S(U(ovl)).OffsetHigh = offset.u.HighPart; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); + ok(!ret, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_IO_PENDING || broken(GetLastError() == ERROR_HANDLE_EOF), "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + /* even fully updated XP passes this test, but it looks like some VMs + * in a testbot get never updated, so overlapped IO is broken. Instead + * of fighting with broken tests and adding a bunch of broken() statements + * it's better to skip further tests completely. + */ + if (GetLastError() != ERROR_IO_PENDING) + { + win_skip("broken overlapped IO implementation, update your OS\n"); + CloseHandle(hfile); + return; + } + ok(bytes == 0, "bytes %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + + bytes = 0xdeadbeef; + ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); + ok(!ret, "GetOverlappedResult should report FALSE\n"); + ok(GetLastError() == ERROR_HANDLE_EOF, "expected ERROR_HANDLE_EOF, got %d\n", GetLastError()); + ok(bytes == 0, "expected 0, read %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = sizeof(contents); + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_PENDING, "expected STATUS_PENDING, got %#x\n", status); + ok(iob.Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", iob.Status); + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + + S(U(ovl)).Offset = offset.u.LowPart; + S(U(ovl)).OffsetHigh = offset.u.HighPart; + ovl.Internal = iob.Status; + ovl.InternalHigh = iob.Information; + ovl.hEvent = 0; + bytes = 0xdeadbeef; + ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); + ok(!ret, "GetOverlappedResult should report FALSE\n"); + ok(GetLastError() == ERROR_HANDLE_EOF, "expected ERROR_HANDLE_EOF, got %d\n", GetLastError()); + ok(bytes == 0, "expected 0, read %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + + SetFilePointer(hfile, 0, NULL, FILE_BEGIN); + + S(U(ovl)).Offset = 0; + S(U(ovl)).OffsetHigh = 0; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = 0; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); + ok(!ret, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); + + bytes = 0xdeadbeef; + ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); + ok(ret, "GetOverlappedResult error %d\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); + ok(!memcmp(contents, buf, sizeof(contents)), "file contents mismatch\n"); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = sizeof(contents) - 4; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL); + ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, "expected STATUS_PENDING, got %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information); + + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_PENDING, "expected STATUS_PENDING, got %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); + + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); + ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); + ok(!memcmp(buf + sizeof(contents) - 4, "DCBA", 4), "file contents mismatch\n"); + + S(U(ovl)).Offset = sizeof(contents) - 4; + S(U(ovl)).OffsetHigh = 0; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = 0; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, "ABCD", 4, &bytes, &ovl); + ok(!ret || broken(ret) /* before Vista */, "WriteFile should fail\n"); + ok(GetLastError() == ERROR_IO_PENDING || broken(GetLastError() == 0xdeadbeef) /* before Vista */, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + ok(bytes == 0 || broken(bytes == 4) /* before Vista */, "bytes %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == 4, "expected 4, got %lu\n", ovl.InternalHigh); + + bytes = 0xdeadbeef; + ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); + ok(ret, "GetOverlappedResult error %d\n", GetLastError()); + ok(bytes == 4, "bytes %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == 4, "expected 4, got %lu\n", ovl.InternalHigh); + + S(U(ovl)).Offset = 0; + S(U(ovl)).OffsetHigh = 0; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = 0; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); + ok(!ret, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); + + bytes = 0xdeadbeef; + ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); + ok(ret, "GetOverlappedResult error %d\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); + ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); + ok(!memcmp(buf + sizeof(contents) - 4, "ABCD", 4), "file contents mismatch\n"); + + CloseHandle(hfile); } START_TEST(file) @@ -1756,6 +2369,7 @@ pNtQueryDirectoryFile = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile"); pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile"); + test_read_write(); test_NtCreateFile(); create_file_test(); open_file_test(); @@ -1769,5 +2383,7 @@ test_file_both_information(); test_file_name_information(); test_file_all_name_information(); + test_file_disposition_information(); test_query_volume_information_file(); -} + test_query_attribute_information_file(); +} Modified: trunk/rostests/winetests/ntdll/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/info.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/info.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/info.c [iso-8859-1] Tue Sep 10 16:49:44 2013 @@ -505,18 +505,51 @@ { NTSTATUS status; ULONG ReturnLength; - SYSTEM_CACHE_INFORMATION sci; - - status = pNtQuerySystemInformation(SystemCacheInformation, &sci, 0, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - - status = pNtQuerySystemInformation(SystemCacheInformation, &sci, sizeof(sci), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(sci) == ReturnLength, "Inconsistent length %d\n", ReturnLength); - - status = pNtQuerySystemInformation(SystemCacheInformation, &sci, sizeof(sci) + 2, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(sci) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + BYTE buffer[128]; + SYSTEM_CACHE_INFORMATION *sci = (SYSTEM_CACHE_INFORMATION *) buffer; + ULONG expected; + INT i; + + /* the large SYSTEM_CACHE_INFORMATION on WIN64 is not documented */ + expected = sizeof(SYSTEM_CACHE_INFORMATION); + for (i = sizeof(buffer); i>= expected; i--) + { + ReturnLength = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemCacheInformation, sci, i, &ReturnLength); + ok(!status && (ReturnLength == expected), + "%d: got 0x%x and %u (expected STATUS_SUCCESS and %u)\n", i, status, ReturnLength, expected); + } + + /* buffer too small for the full result. + Up to win7, the function succeeds with a partial result. */ + status = pNtQuerySystemInformation(SystemCacheInformation, sci, i, &ReturnLength); + if (!status) + { + expected = offsetof(SYSTEM_CACHE_INFORMATION, MinimumWorkingSet); + for (; i>= expected; i--) + { + ReturnLength = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemCacheInformation, sci, i, &ReturnLength); + ok(!status && (ReturnLength == expected), + "%d: got 0x%x and %u (expected STATUS_SUCCESS and %u)\n", i, status, ReturnLength, expected); + } + } + + /* buffer too small for the result, this call will always fail */ + ReturnLength = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemCacheInformation, sci, i, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH && + ((ReturnLength == expected) || broken(!ReturnLength) || broken(ReturnLength == 0xfffffff0)), + "%d: got 0x%x and %u (expected STATUS_INFO_LENGTH_MISMATCH and %u)\n", i, status, ReturnLength, expected); + + if (0) { + /* this crashes on some vista / win7 machines */ + ReturnLength = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemCacheInformation, sci, 0, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH && + ((ReturnLength == expected) || broken(!ReturnLength) || broken(ReturnLength == 0xfffffff0)), + "0: got 0x%x and %u (expected STATUS_INFO_LENGTH_MISMATCH and %u)\n", status, ReturnLength, expected); + } } static void test_query_interrupt(void) Modified: trunk/rostests/winetests/ntdll/om.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/om.c?rev=… ============================================================================== --- trunk/rostests/winetests/ntdll/om.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/om.c [iso-8859-1] Tue Sep 10 16:49:44 2013 @@ -30,6 +30,9 @@ static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); static VOID (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); static NTSTATUS (WINAPI *pNtCreateEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, BOOLEAN, BOOLEAN); +static NTSTATUS (WINAPI *pNtOpenEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES); +static NTSTATUS (WINAPI *pNtPulseEvent) ( HANDLE, PULONG ); +static NTSTATUS (WINAPI *pNtQueryEvent) ( HANDLE, EVENT_INFORMATION_CLASS, PVOID, ULONG, PULONG ); static NTSTATUS (WINAPI *pNtCreateMutant)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, BOOLEAN ); static NTSTATUS (WINAPI *pNtOpenMutant) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES ); static NTSTATUS (WINAPI *pNtCreateSemaphore)( PHANDLE, ACCESS_MASK,const POBJECT_ATTRIBUTES,LONG,LONG ); @@ -46,8 +49,15 @@ static NTSTATUS (WINAPI *pNtCreateSymbolicLinkObject)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PUNICODE_STRING); static NTSTATUS (WINAPI *pNtQuerySymbolicLinkObject)(HANDLE,PUNICODE_STRING,PULONG); static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,ULONG,PULONG); -static NTSTATUS (WINAPI *pNtReleaseSemaphore)(HANDLE handle, ULONG count, PULONG previous); - +static NTSTATUS (WINAPI *pNtReleaseSemaphore)(HANDLE, ULONG, PULONG); +static NTSTATUS (WINAPI *pNtCreateKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, ULONG ); +static NTSTATUS (WINAPI *pNtOpenKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES * ); +static NTSTATUS (WINAPI *pNtWaitForKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); +static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); + +#define KEYEDEVENT_WAIT 0x0001 +#define KEYEDEVENT_WAKE 0x0002 +#define KEYEDEVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x0003) static void test_case_sensitive (void) { @@ -798,6 +808,230 @@ pNtClose( h ); } +static void test_event(void) +{ + HANDLE Event; + HANDLE Event2; + NTSTATUS status; + UNICODE_STRING str; + OBJECT_ATTRIBUTES attr; + EVENT_BASIC_INFORMATION info; + static const WCHAR eventName[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s','\\','t','e','s','t','E','v','e','n','t',0}; + + pRtlInitUnicodeString(&str, eventName); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, 1, 0); + ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); + + status = pNtPulseEvent(Event, NULL); + ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); + + status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == 1 && info.EventState == 0, + "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); + + status = pNtOpenEvent(&Event2, GENERIC_ALL, &attr); + ok( status == STATUS_SUCCESS, "NtOpenEvent failed %08x\n", status ); + + status = pNtClose(Event); + + status = pNtQueryEvent(Event2, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == 1 && info.EventState == 0, + "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); + + status = pNtClose(Event2); +} + +static const WCHAR keyed_nameW[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s', + '\\','W','i','n','e','T','e','s','t','E','v','e','n','t',0}; + +static DWORD WINAPI keyed_event_thread( void *arg ) +{ + HANDLE handle; + NTSTATUS status; + LARGE_INTEGER timeout; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + ULONG_PTR i; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &str; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &str, keyed_nameW ); + + status = pNtOpenKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS, &attr ); + ok( !status, "NtOpenKeyedEvent failed %x\n", status ); + + for (i = 0; i < 20; i++) + { + if (i & 1) + status = pNtWaitForKeyedEvent( handle, (void *)(i * 2), 0, NULL ); + else + status = pNtReleaseKeyedEvent( handle, (void *)(i * 2), 0, NULL ); + ok( status == STATUS_SUCCESS, "%li: failed %x\n", i, status ); + Sleep( 20 - i ); + } + + status = pNtReleaseKeyedEvent( handle, (void *)0x1234, 0, NULL ); + ok( status == STATUS_SUCCESS, "NtReleaseKeyedEvent %x\n", status ); + + timeout.QuadPart = -10000; + status = pNtWaitForKeyedEvent( handle, (void *)0x5678, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)0x9abc, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + NtClose( handle ); + return 0; +} + +static void test_keyed_events(void) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + HANDLE handle, event, thread; + NTSTATUS status; + LARGE_INTEGER timeout; + ULONG_PTR i; + + if (!pNtCreateKeyedEvent) + { + win_skip( "Keyed events not supported\n" ); + return; + } + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &str; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &str, keyed_nameW ); + + status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS | SYNCHRONIZE, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + + status = WaitForSingleObject( handle, 1000 ); + ok( status == 0, "WaitForSingleObject %x\n", status ); + + timeout.QuadPart = -100000; + status = pNtWaitForKeyedEvent( handle, (void *)255, 0, &timeout ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)255, 0, &timeout ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( handle, (void *)254, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)254, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( handle, NULL, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, NULL, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)8, 0, &timeout ); + ok( status == STATUS_INVALID_HANDLE, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)8, 0, &timeout ); + ok( status == STATUS_INVALID_HANDLE, "NtReleaseKeyedEvent %x\n", status ); + + thread = CreateThread( NULL, 0, keyed_event_thread, 0, 0, NULL ); + for (i = 0; i < 20; i++) + { + if (i & 1) + status = pNtReleaseKeyedEvent( handle, (void *)(i * 2), 0, NULL ); + else + status = pNtWaitForKeyedEvent( handle, (void *)(i * 2), 0, NULL ); + ok( status == STATUS_SUCCESS, "%li: failed %x\n", i, status ); + Sleep( i ); + } + status = pNtWaitForKeyedEvent( handle, (void *)0x1234, 0, &timeout ); + ok( status == STATUS_SUCCESS, "NtWaitForKeyedEvent %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)0x5678, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)0x9abc, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + ok( WaitForSingleObject( thread, 30000 ) == 0, "wait failed\n" ); + + NtClose( handle ); + + /* test access rights */ + + status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_WAIT, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_ACCESS_DENIED, "NtReleaseKeyedEvent %x\n", status ); + NtClose( handle ); + + status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_WAKE, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_ACCESS_DENIED, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + NtClose( handle ); + + status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = WaitForSingleObject( handle, 1000 ); + ok( status == WAIT_FAILED && GetLastError() == ERROR_ACCESS_DENIED, + "WaitForSingleObject %x err %u\n", status, GetLastError() ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + NtClose( handle ); + + /* GENERIC_READ gives wait access */ + status = pNtCreateKeyedEvent( &handle, GENERIC_READ, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_ACCESS_DENIED, "NtReleaseKeyedEvent %x\n", status ); + NtClose( handle ); + + /* GENERIC_WRITE gives wake access */ + status = pNtCreateKeyedEvent( &handle, GENERIC_WRITE, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_ACCESS_DENIED, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + /* it's not an event */ + status = pNtPulseEvent( handle, NULL ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtPulseEvent %x\n", status ); + + status = pNtCreateEvent( &event, GENERIC_ALL, &attr, FALSE, FALSE ); + ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH, + "CreateEvent %x\n", status ); + + NtClose( handle ); + + status = pNtCreateEvent( &event, GENERIC_ALL, &attr, FALSE, FALSE ); + ok( status == 0, "CreateEvent %x\n", status ); + status = pNtWaitForKeyedEvent( event, (void *)8, 0, &timeout ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( event, (void *)8, 0, &timeout ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtReleaseKeyedEvent %x\n", status ); + NtClose( event ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -815,6 +1049,9 @@ pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pNtCreateEvent = (void *)GetProcAddress(hntdll, "NtCreateEvent"); pNtCreateMutant = (void *)GetProcAddress(hntdll, "NtCreateMutant"); + pNtOpenEvent = (void *)GetProcAddress(hntdll, "NtOpenEvent"); + pNtQueryEvent = (void *)GetProcAddress(hntdll, "NtQueryEvent"); + pNtPulseEvent = (void *)GetProcAddress(hntdll, "NtPulseEvent"); pNtOpenMutant = (void *)GetProcAddress(hntdll, "NtOpenMutant"); pNtOpenFile = (void *)GetProcAddress(hntdll, "NtOpenFile"); pNtClose = (void *)GetProcAddress(hntdll, "NtClose"); @@ -830,6 +1067,10 @@ pNtCreateSection = (void *)GetProcAddress(hntdll, "NtCreateSection"); pNtQueryObject = (void *)GetProcAddress(hntdll, "NtQueryObject"); pNtReleaseSemaphore = (void *)GetProcAddress(hntdll, "NtReleaseSemaphore"); + pNtCreateKeyedEvent = (void *)GetProcAddress(hntdll, "NtCreateKeyedEvent"); + pNtOpenKeyedEvent = (void *)GetProcAddress(hntdll, "NtOpenKeyedEvent"); + pNtWaitForKeyedEvent = (void *)GetProcAddress(hntdll, "NtWaitForKeyedEvent"); + pNtReleaseKeyedEvent = (void *)GetProcAddress(hntdll, "NtReleaseKeyedEvent"); test_case_sensitive(); test_namespace_pipe(); @@ -838,4 +1079,9 @@ test_symboliclink(); test_query_object(); test_type_mismatch(); -} + test_event(); + if (winetest_interactive) + test_keyed_events(); + else + skip("Skipping test_keyed_events(). ROSTESTS-118.\n"); +} Modified: trunk/rostests/winetests/ntdll/rtlstr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtlstr.c?… ============================================================================== --- trunk/rostests/winetests/ntdll/rtlstr.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/rtlstr.c [iso-8859-1] Tue Sep 10 16:49:44 2013 @@ -29,6 +29,9 @@ #include "ntdll_test.h" #include "winnls.h" #include "guiddef.h" + +#define HASH_STRING_ALGORITHM_X65599 1 +#define HASH_STRING_ALGORITHM_INVALID 0xffffffff /* Function ptrs for ntdll calls */ static HMODULE hntdll = 0; @@ -64,6 +67,7 @@ static NTSTATUS (WINAPI *pRtlGUIDFromString)(const UNICODE_STRING*,GUID*); static NTSTATUS (WINAPI *pRtlStringFromGUID)(const GUID*, UNICODE_STRING*); static BOOLEAN (WINAPI *pRtlIsTextUnicode)(LPVOID, INT, INT *); +static NTSTATUS (WINAPI *pRtlHashUnicodeString)(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*); /*static VOID (WINAPI *pRtlFreeOemString)(PSTRING);*/ /*static VOID (WINAPI *pRtlCopyUnicodeString)(UNICODE_STRING *, const UNICODE_STRING *);*/ @@ -132,9 +136,9 @@ pRtlGUIDFromString = (void *)GetProcAddress(hntdll, "RtlGUIDFromString"); pRtlStringFromGUID = (void *)GetProcAddress(hntdll, "RtlStringFromGUID"); pRtlIsTextUnicode = (void *)GetProcAddress(hntdll, "RtlIsTextUnicode"); - } -} - + pRtlHashUnicodeString = (void*)GetProcAddress(hntdll, "RtlHashUnicodeString"); + } +} static void test_RtlInitString(void) { @@ -191,6 +195,12 @@ WCHAR *teststring2; UNICODE_STRING uni; NTSTATUS result; + + if (!pRtlInitUnicodeStringEx) + { + win_skip("RtlInitUnicodeStringEx is not available\n"); + return; + } teststring2 = HeapAlloc(GetProcessHeap(), 0, (TESTSTRING2_LEN + 1) * sizeof(WCHAR)); memset(teststring2, 'X', TESTSTRING2_LEN * sizeof(WCHAR)); @@ -406,6 +416,12 @@ NTSTATUS result; unsigned int test_num; + if (!pRtlDuplicateUnicodeString) + { + win_skip("RtlDuplicateUnicodeString is not available\n"); + return; + } + for (test_num = 0; test_num < NB_DUPL_USTR; test_num++) { source_str.Length = dupl_ustr[test_num].source_Length; source_str.MaximumLength = dupl_ustr[test_num].source_MaximumLength; @@ -1179,6 +1195,12 @@ NTSTATUS result; unsigned int idx; unsigned int test_num; + + if (!pRtlFindCharInUnicodeString) + { + win_skip("RtlFindCharInUnicodeString is not available\n"); + return; + } for (test_num = 0; test_num < NB_FIND_CH_IN_USTR; test_num++) { if (find_ch_in_ustr[test_num].main_str != NULL) { @@ -1710,6 +1732,12 @@ int flags; int i; + if (!pRtlIsTextUnicode) + { + win_skip("RtlIsTextUnicode is not available\n"); + return; + } + ok(!pRtlIsTextUnicode(ascii, sizeof(ascii), NULL), "ASCII text detected as Unicode\n"); res = pRtlIsTextUnicode(unicode, sizeof(unicode), NULL); @@ -1839,6 +1867,12 @@ UNICODE_STRING str; NTSTATUS ret; + if (!pRtlGUIDFromString) + { + win_skip("RtlGUIDFromString is not available\n"); + return; + } + str.Length = str.MaximumLength = sizeof(szGuid) - sizeof(WCHAR); str.Buffer = (LPWSTR)szGuid; @@ -1857,6 +1891,12 @@ { UNICODE_STRING str; NTSTATUS ret; + + if (!pRtlStringFromGUID) + { + win_skip("RtlStringFromGUID is not available\n"); + return; + } str.Length = str.MaximumLength = 0; str.Buffer = NULL; @@ -1865,6 +1905,70 @@ ok(ret == 0, "expected ret=0, got 0x%0x\n", ret); ok(str.Buffer && !lstrcmpiW(str.Buffer, szGuid), "Endianness broken\n"); pRtlFreeUnicodeString(&str); +} + +struct hash_unicodestring_test { + WCHAR str[50]; + BOOLEAN case_insensitive; + ULONG hash; +}; + +static const struct hash_unicodestring_test hash_test[] = { + { {'T',0}, FALSE, 0x00000054 }, + { {'T','e','s','t',0}, FALSE, 0x766bb952 }, + { {'T','e','S','t',0}, FALSE, 0x764bb172 }, + { {'t','e','s','t',0}, FALSE, 0x4745d132 }, + { {'t','e','s','t',0}, TRUE, 0x6689c132 }, + { {'T','E','S','T',0}, TRUE, 0x6689c132 }, + { {'T','E','S','T',0}, FALSE, 0x6689c132 }, + { {'a','b','c','d','e','f',0}, FALSE, 0x971318c3 }, + { { 0 } } +}; + +static void test_RtlHashUnicodeString(void) +{ + static const WCHAR strW[] = {'T','e','s','t',0,'1',0}; + const struct hash_unicodestring_test *ptr; + UNICODE_STRING str; + NTSTATUS status; + ULONG hash; + + if (!pRtlHashUnicodeString) + { + win_skip("RtlHashUnicodeString is not available\n"); + return; + } + + status = pRtlHashUnicodeString(NULL, FALSE, HASH_STRING_ALGORITHM_X65599, &hash); + ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); + + RtlInitUnicodeString(&str, strW); + status = pRtlHashUnicodeString(&str, FALSE, HASH_STRING_ALGORITHM_X65599, NULL); + ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); + + status = pRtlHashUnicodeString(&str, FALSE, HASH_STRING_ALGORITHM_INVALID, &hash); + ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); + + /* embedded null */ + str.Buffer = (PWSTR)strW; + str.Length = sizeof(strW) - sizeof(WCHAR); + str.MaximumLength = sizeof(strW); + status = pRtlHashUnicodeString(&str, FALSE, HASH_STRING_ALGORITHM_X65599, &hash); + ok(status == STATUS_SUCCESS, "got status 0x%08x\n", status); + ok(hash == 0x32803083, "got 0x%08x\n", hash); + + ptr = hash_test; + while (*ptr->str) + { + RtlInitUnicodeString(&str, ptr->str); + hash = 0; + status = pRtlHashUnicodeString(&str, ptr->case_insensitive, HASH_STRING_ALGORITHM_X65599, &hash); + ok(status == STATUS_SUCCESS, "got status 0x%08x for %s\n", status, wine_dbgstr_w(ptr->str)); + ok(hash == ptr->hash, "got wrong hash 0x%08x, expected 0x%08x, for %s, mode %d\n", hash, ptr->hash, + wine_dbgstr_w(ptr->str), ptr->case_insensitive); + + ptr++; + } } START_TEST(rtlstr) @@ -1887,22 +1991,17 @@ test_RtlAppendUnicodeStringToString(); } - if (pRtlInitUnicodeStringEx) - test_RtlInitUnicodeStringEx(); - if (pRtlDuplicateUnicodeString) - test_RtlDuplicateUnicodeString(); - if (pRtlFindCharInUnicodeString) - test_RtlFindCharInUnicodeString(); - if (pRtlGUIDFromString) - test_RtlGUIDFromString(); - if (pRtlStringFromGUID) - test_RtlStringFromGUID(); - if (pRtlIsTextUnicode) - test_RtlIsTextUnicode(); + test_RtlInitUnicodeStringEx(); + test_RtlDuplicateUnicodeString(); + test_RtlFindCharInUnicodeString(); + test_RtlGUIDFromString(); + test_RtlStringFromGUID(); + test_RtlIsTextUnicode(); if(0) { test_RtlUpcaseUnicodeChar(); test_RtlUpcaseUnicodeString(); test_RtlDowncaseUnicodeString(); } -} + test_RtlHashUnicodeString(); +}

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2013