Ros-diffs June 2012

ros-diffs@reactos.org

11 participants
120 discussions

[akhaldi] 56691: [KERNEL32_WINETEST] * Sync loader tests to Wine 1.5.4. Thanks to Arty for fixing the related issues. See issue #7071 for more details.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 4 10:45:54 2012 New Revision: 56691 URL: http://svn.reactos.org/svn/reactos?rev=56691&view=rev Log: [KERNEL32_WINETEST] * Sync loader tests to Wine 1.5.4. Thanks to Arty for fixing the related issues. See issue #7071 for more details. Modified: trunk/rostests/winetests/kernel32/loader.c Modified: trunk/rostests/winetests/kernel32/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/loader… ============================================================================== --- trunk/rostests/winetests/kernel32/loader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/loader.c [iso-8859-1] Mon Jun 4 10:45:54 2012 @@ -21,11 +21,17 @@ #include <stdarg.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/test.h" #define ALIGN_SIZE(size, alignment) (((size) + (alignment - 1)) & ~((alignment - 1))) + +static NTSTATUS (WINAPI *pNtMapViewOfSection)(HANDLE, HANDLE, PVOID *, ULONG, SIZE_T, const LARGE_INTEGER *, SIZE_T *, ULONG, ULONG, ULONG); +static NTSTATUS (WINAPI *pNtUnmapViewOfSection)(HANDLE, PVOID); static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { @@ -57,7 +63,7 @@ #elif defined __sparc__ IMAGE_FILE_MACHINE_SPARC, /* Machine */ #elif defined __arm__ - IMAGE_FILE_MACHINE_ARM, /* Machine */ + IMAGE_FILE_MACHINE_ARMV7, /* Machine */ #else # error You must specify the machine type #endif @@ -553,42 +559,307 @@ } } +static void test_image_mapping(const char *dll_name, DWORD scn_page_access, BOOL is_dll) +{ + HANDLE hfile, hmap; + NTSTATUS status; + LARGE_INTEGER offset; + SIZE_T size; + void *addr1, *addr2; + MEMORY_BASIC_INFORMATION info; + SYSTEM_INFO si; + + if (!pNtMapViewOfSection) return; + + GetSystemInfo(&si); + + SetLastError(0xdeadbeef); + hfile = CreateFile(dll_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + hmap = CreateFileMapping(hfile, NULL, PAGE_READONLY | SEC_IMAGE, 0, 0, 0); + ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError()); + + offset.u.LowPart = 0; + offset.u.HighPart = 0; + + addr1 = NULL; + size = 0; + status = pNtMapViewOfSection(hmap, GetCurrentProcess(), &addr1, 0, 0, &offset, + &size, 1 /* ViewShare */, 0, PAGE_READONLY); + ok(status == STATUS_SUCCESS, "NtMapViewOfSection error %x\n", status); + ok(addr1 != 0, "mapped address should be valid\n"); + + SetLastError(0xdeadbeef); + size = VirtualQuery((char *)addr1 + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == (char *)addr1 + section.VirtualAddress, "got %p != expected %p\n", info.BaseAddress, (char *)addr1 + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "got %#lx != expected %#x\n", info.RegionSize, si.dwPageSize); + ok(info.Protect == scn_page_access, "got %#x != expected %#x\n", info.Protect, scn_page_access); + ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%#x != PAGE_EXECUTE_WRITECOPY\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == SEC_IMAGE, "%#x != SEC_IMAGE\n", info.Type); + + addr2 = NULL; + size = 0; + status = pNtMapViewOfSection(hmap, GetCurrentProcess(), &addr2, 0, 0, &offset, + &size, 1 /* ViewShare */, 0, PAGE_READONLY); + /* FIXME: remove once Wine is fixed */ + if (status != STATUS_IMAGE_NOT_AT_BASE) + { + todo_wine { + ok(status == STATUS_IMAGE_NOT_AT_BASE, "expected STATUS_IMAGE_NOT_AT_BASE, got %x\n", status); + ok(addr2 != 0, "mapped address should be valid\n"); + } + goto wine_is_broken; + } + ok(status == STATUS_IMAGE_NOT_AT_BASE, "expected STATUS_IMAGE_NOT_AT_BASE, got %x\n", status); + ok(addr2 != 0, "mapped address should be valid\n"); + ok(addr2 != addr1, "mapped addresses should be different\n"); + + SetLastError(0xdeadbeef); + size = VirtualQuery((char *)addr2 + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == (char *)addr2 + section.VirtualAddress, "got %p != expected %p\n", info.BaseAddress, (char *)addr2 + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "got %#lx != expected %#x\n", info.RegionSize, si.dwPageSize); + ok(info.Protect == scn_page_access, "got %#x != expected %#x\n", info.Protect, scn_page_access); + ok(info.AllocationBase == addr2, "%p != %p\n", info.AllocationBase, addr2); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%#x != PAGE_EXECUTE_WRITECOPY\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == SEC_IMAGE, "%#x != SEC_IMAGE\n", info.Type); + + status = pNtUnmapViewOfSection(GetCurrentProcess(), addr2); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection error %x\n", status); + + addr2 = MapViewOfFile(hmap, 0, 0, 0, 0); + ok(addr2 != 0, "mapped address should be valid\n"); + ok(addr2 != addr1, "mapped addresses should be different\n"); + + SetLastError(0xdeadbeef); + size = VirtualQuery((char *)addr2 + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == (char *)addr2 + section.VirtualAddress, "got %p != expected %p\n", info.BaseAddress, (char *)addr2 + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "got %#lx != expected %#x\n", info.RegionSize, si.dwPageSize); + ok(info.Protect == scn_page_access, "got %#x != expected %#x\n", info.Protect, scn_page_access); + ok(info.AllocationBase == addr2, "%p != %p\n", info.AllocationBase, addr2); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%#x != PAGE_EXECUTE_WRITECOPY\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == SEC_IMAGE, "%#x != SEC_IMAGE\n", info.Type); + + UnmapViewOfFile(addr2); + + SetLastError(0xdeadbeef); + addr2 = LoadLibrary(dll_name); + if (is_dll) + { + ok(!addr2, "LoadLibrary should fail, is_dll %d\n", is_dll); + ok(GetLastError() == ERROR_INVALID_ADDRESS, "expected ERROR_INVALID_ADDRESS, got %d\n", GetLastError()); + } + else + { + BOOL ret; + ok(addr2 != 0, "LoadLibrary error %d, is_dll %d\n", GetLastError(), is_dll); + ok(addr2 != addr1, "mapped addresses should be different\n"); + + SetLastError(0xdeadbeef); + ret = FreeLibrary(addr2); + ok(ret, "FreeLibrary error %d\n", GetLastError()); + } + +wine_is_broken: + status = pNtUnmapViewOfSection(GetCurrentProcess(), addr1); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection error %x\n", status); + + CloseHandle(hmap); + CloseHandle(hfile); +} + +static BOOL is_mem_writable(DWORD prot) +{ + switch (prot & 0xff) + { + case PAGE_READWRITE: + case PAGE_WRITECOPY: + case PAGE_EXECUTE_READWRITE: + case PAGE_EXECUTE_WRITECOPY: + return TRUE; + + default: + return FALSE; + } +} + +static void test_VirtualProtect(void *base, void *section) +{ + static const struct test_data + { + DWORD prot_set, prot_get; + } td[] = + { + { 0, 0 }, /* 0x00 */ + { PAGE_NOACCESS, PAGE_NOACCESS }, /* 0x01 */ + { PAGE_READONLY, PAGE_READONLY }, /* 0x02 */ + { PAGE_READONLY | PAGE_NOACCESS, 0 }, /* 0x03 */ + { PAGE_READWRITE, PAGE_WRITECOPY }, /* 0x04 */ + { PAGE_READWRITE | PAGE_NOACCESS, 0 }, /* 0x05 */ + { PAGE_READWRITE | PAGE_READONLY, 0 }, /* 0x06 */ + { PAGE_READWRITE | PAGE_READONLY | PAGE_NOACCESS, 0 }, /* 0x07 */ + { PAGE_WRITECOPY, PAGE_WRITECOPY }, /* 0x08 */ + { PAGE_WRITECOPY | PAGE_NOACCESS, 0 }, /* 0x09 */ + { PAGE_WRITECOPY | PAGE_READONLY, 0 }, /* 0x0a */ + { PAGE_WRITECOPY | PAGE_NOACCESS | PAGE_READONLY, 0 }, /* 0x0b */ + { PAGE_WRITECOPY | PAGE_READWRITE, 0 }, /* 0x0c */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_NOACCESS, 0 }, /* 0x0d */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_READONLY, 0 }, /* 0x0e */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_READONLY | PAGE_NOACCESS, 0 }, /* 0x0f */ + + { PAGE_EXECUTE, PAGE_EXECUTE }, /* 0x10 */ + { PAGE_EXECUTE_READ, PAGE_EXECUTE_READ }, /* 0x20 */ + { PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 }, /* 0x30 */ + { PAGE_EXECUTE_READWRITE, PAGE_EXECUTE_WRITECOPY }, /* 0x40 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE, 0 }, /* 0x50 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, 0 }, /* 0x60 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 }, /* 0x70 */ + { PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_WRITECOPY }, /* 0x80 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE, 0 }, /* 0x90 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READ, 0 }, /* 0xa0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 }, /* 0xb0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE, 0 }, /* 0xc0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE, 0 }, /* 0xd0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, 0 }, /* 0xe0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 } /* 0xf0 */ + }; + DWORD ret, orig_prot, old_prot, rw_prot, exec_prot, i, j; + MEMORY_BASIC_INFORMATION info; + SYSTEM_INFO si; + + GetSystemInfo(&si); + trace("system page size %#x\n", si.dwPageSize); + + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(ret, "VirtualProtect error %d\n", GetLastError()); + + orig_prot = old_prot; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + SetLastError(0xdeadbeef); + ret = VirtualQuery(section, &info, sizeof(info)); + ok(ret, "VirtualQuery failed %d\n", GetLastError()); + ok(info.BaseAddress == section, "%d: got %p != expected %p\n", i, info.BaseAddress, section); + ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + ok(info.Protect == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, info.Protect); + ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); + ok(info.Type == SEC_IMAGE, "%d: %#x != SEC_IMAGE\n", i, info.Type); + + old_prot = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, td[i].prot_set, &old_prot); + if (td[i].prot_get) + { + ok(ret, "%d: VirtualProtect error %d, requested prot %#x\n", i, GetLastError(), td[i].prot_set); + ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); + + SetLastError(0xdeadbeef); + ret = VirtualQuery(section, &info, sizeof(info)); + ok(ret, "VirtualQuery failed %d\n", GetLastError()); + ok(info.BaseAddress == section, "%d: got %p != expected %p\n", i, info.BaseAddress, section); + ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + ok(info.Protect == td[i].prot_get, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot_get); + ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); + ok(info.Type == SEC_IMAGE, "%d: %#x != SEC_IMAGE\n", i, info.Type); + } + else + { + ok(!ret, "%d: VirtualProtect should fail\n", i); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); + } + + old_prot = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); + if (td[i].prot_get) + ok(old_prot == td[i].prot_get, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_get); + else + ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); + } + + exec_prot = 0; + + for (i = 0; i <= 4; i++) + { + rw_prot = 0; + + for (j = 0; j <= 4; j++) + { + DWORD prot = exec_prot | rw_prot; + + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, prot, &old_prot); + if ((rw_prot && exec_prot) || (!rw_prot && !exec_prot)) + { + ok(!ret, "VirtualProtect(%02x) should fail\n", prot); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + else + ok(ret, "VirtualProtect(%02x) error %d\n", prot, GetLastError()); + + rw_prot = 1 << j; + } + + exec_prot = 1 << (i + 4); + } + + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, orig_prot, &old_prot); + ok(ret, "VirtualProtect error %d\n", GetLastError()); +} + static void test_section_access(void) { static const struct test_data { - DWORD scn_file_access, scn_page_access; + DWORD scn_file_access, scn_page_access, scn_page_access_after_write; } td[] = { - { 0, PAGE_NOACCESS }, - { IMAGE_SCN_MEM_READ, PAGE_READONLY }, - { IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, - { IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE }, - { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { 0, PAGE_NOACCESS, 0 }, + { IMAGE_SCN_MEM_READ, PAGE_READONLY, 0 }, + { IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, + { IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE, 0 }, + { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, - { IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - - { IMAGE_SCN_CNT_INITIALIZED_DATA, PAGE_NOACCESS }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - - { IMAGE_SCN_CNT_UNINITIALIZED_DATA, PAGE_NOACCESS }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY } + { IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE }, + { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE }, + + { IMAGE_SCN_CNT_INITIALIZED_DATA, PAGE_NOACCESS, 0 }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY, 0 }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE, 0 }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ, 0 }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE }, + + { IMAGE_SCN_CNT_UNINITIALIZED_DATA, PAGE_NOACCESS, 0 }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY, 0 }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE, 0 }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ, 0 }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE } }; static const char filler[0x1000]; static const char section_data[0x10] = "section data"; + char buf[256]; int i; DWORD dummy, file_align; HANDLE hfile; @@ -598,7 +869,9 @@ char dll_name[MAX_PATH]; SIZE_T size; MEMORY_BASIC_INFORMATION info; - BOOL ret; + STARTUPINFO sti; + PROCESS_INFORMATION pi; + DWORD ret; GetSystemInfo(&si); trace("system page size %#x\n", si.dwPageSize); @@ -626,6 +899,7 @@ nt_header.FileHeader.NumberOfSections = 1; nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); + nt_header.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_DLL | IMAGE_FILE_RELOCS_STRIPPED; nt_header.OptionalHeader.SectionAlignment = si.dwPageSize; nt_header.OptionalHeader.FileAlignment = 0x200; @@ -662,18 +936,14 @@ SetLastError(0xdeadbeef); hlib = LoadLibrary(dll_name); - ok(ret, "LoadLibrary error %d\n", GetLastError()); - + ok(hlib != 0, "LoadLibrary error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); size = VirtualQuery((char *)hlib + section.VirtualAddress, &info, sizeof(info)); ok(size == sizeof(info), "%d: VirtualQuery error %d\n", i, GetLastError()); ok(info.BaseAddress == (char *)hlib + section.VirtualAddress, "%d: got %p != expected %p\n", i, info.BaseAddress, (char *)hlib + section.VirtualAddress); ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); - /* FIXME: remove the condition below once Wine is fixed */ - if ((td[i].scn_file_access & IMAGE_SCN_MEM_WRITE) && - (td[i].scn_file_access & IMAGE_SCN_CNT_UNINITIALIZED_DATA)) - todo_wine ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); - else ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); ok(info.AllocationBase == hlib, "%d: %p != %p\n", i, info.AllocationBase, hlib); ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); @@ -682,18 +952,96 @@ if (info.Protect != PAGE_NOACCESS) ok(!memcmp((const char *)info.BaseAddress, section_data, section.SizeOfRawData), "wrong section data\n"); + test_VirtualProtect(hlib, (char *)hlib + section.VirtualAddress); + + /* Windows changes the WRITECOPY to WRITE protection on an image section write (for a changed page only) */ + if (is_mem_writable(info.Protect)) + { + char *p = info.BaseAddress; + *p = 0xfe; + SetLastError(0xdeadbeef); + size = VirtualQuery((char *)hlib + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), "%d: VirtualQuery error %d\n", i, GetLastError()); + /* FIXME: remove the condition below once Wine is fixed */ + if (info.Protect == PAGE_WRITECOPY || info.Protect == PAGE_EXECUTE_WRITECOPY) + todo_wine ok(info.Protect == td[i].scn_page_access_after_write, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access_after_write); + else + ok(info.Protect == td[i].scn_page_access_after_write, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access_after_write); + } + SetLastError(0xdeadbeef); ret = FreeLibrary(hlib); ok(ret, "FreeLibrary error %d\n", GetLastError()); + test_image_mapping(dll_name, td[i].scn_page_access, TRUE); + + /* reset IMAGE_FILE_DLL otherwise CreateProcess fails */ + nt_header.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_RELOCS_STRIPPED; + SetLastError(0xdeadbeef); + hfile = CreateFile(dll_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + /* LoadLibrary called on an already memory-mapped file in + * test_image_mapping() above leads to a file handle leak + * under nt4, and inability to overwrite and delete the file + * due to sharing violation error. Ignore it and skip the test, + * but leave a not deletable temporary file. + */ + ok(hfile != INVALID_HANDLE_VALUE || broken(hfile == INVALID_HANDLE_VALUE) /* nt4 */, + "CreateFile error %d\n", GetLastError()); + if (hfile == INVALID_HANDLE_VALUE) goto nt4_is_broken; + SetFilePointer(hfile, sizeof(dos_header), NULL, FILE_BEGIN); + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &nt_header, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + CloseHandle(hfile); + + memset(&sti, 0, sizeof(sti)); + sti.cb = sizeof(sti); + SetLastError(0xdeadbeef); + ret = CreateProcess(dll_name, NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &sti, &pi); + ok(ret, "CreateProcess() error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + size = VirtualQueryEx(pi.hProcess, (char *)hlib + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), + "%d: VirtualQuery error %d\n", i, GetLastError()); + ok(info.BaseAddress == (char *)hlib + section.VirtualAddress, "%d: got %p != expected %p\n", i, info.BaseAddress, (char *)hlib + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); + ok(info.AllocationBase == hlib, "%d: %p != %p\n", i, info.AllocationBase, hlib); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); + ok(info.Type == SEC_IMAGE, "%d: %#x != SEC_IMAGE\n", i, info.Type); + if (info.Protect != PAGE_NOACCESS) + { + SetLastError(0xdeadbeef); + ret = ReadProcessMemory(pi.hProcess, info.BaseAddress, buf, section.SizeOfRawData, NULL); + ok(ret, "ReadProcessMemory() error %d\n", GetLastError()); + ok(!memcmp(buf, section_data, section.SizeOfRawData), "wrong section data\n"); + } + + SetLastError(0xdeadbeef); + ret = TerminateProcess(pi.hProcess, 0); + ok(ret, "TerminateProcess() error %d\n", GetLastError()); + ret = WaitForSingleObject(pi.hProcess, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed: %x\n", ret); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + test_image_mapping(dll_name, td[i].scn_page_access, FALSE); + +nt4_is_broken: SetLastError(0xdeadbeef); ret = DeleteFile(dll_name); - ok(ret, "DeleteFile error %d\n", GetLastError()); + ok(ret || broken(!ret) /* nt4 */, "DeleteFile error %d\n", GetLastError()); } } START_TEST(loader) { + pNtMapViewOfSection = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtMapViewOfSection"); + pNtUnmapViewOfSection = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtUnmapViewOfSection"); + test_Loader(); test_ImportDescriptors(); test_section_access();

12 years, 6 months

[ekohl] 56690: [SAMLIB]: Implement SamAddMemberToAlias, SamCreateAliasInDomain, SamEnumerateDomainsInSamServer, SamOpenAlias, SamQueryInformationDomain and SamQueryInformationUser. [SAMSRV]: Implem...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jun 3 20:54:06 2012 New Revision: 56690 URL: http://svn.reactos.org/svn/reactos?rev=56690&view=rev Log: [SAMLIB]: Implement SamAddMemberToAlias, SamCreateAliasInDomain, SamEnumerateDomainsInSamServer, SamOpenAlias, SamQueryInformationDomain and SamQueryInformationUser. [SAMSRV]: Implement SamrEnumerateDomainsInSamServer (buggy, probably a bug in WIDL), SamrQueryInformationDomain.DomainNameInformation, SamrCreateAliasInDomain, SamrOpenAlias and SamrAddMemberToAlias. [SAMSRV]: Add more registry helper routines. [SAMSRV]: Create builtin aliases upon setup. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/registry.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/setup.c trunk/reactos/include/ddk/ntsam.h trunk/reactos/include/reactos/idl/sam.idl Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Sun Jun 3 20:54:06 2012 @@ -105,6 +105,31 @@ NTSTATUS NTAPI +SamAddMemberToAlias(IN SAM_HANDLE AliasHandle, + IN PSID MemberId) +{ + NTSTATUS Status; + + TRACE("SamAddMemberToAlias(%p %p)\n", + AliasHandle, MemberId); + + RpcTryExcept + { + Status = SamrAddMemberToAlias((SAMPR_HANDLE)AliasHandle, + (PRPC_SID)MemberId); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamCloseHandle(IN SAM_HANDLE SamHandle) { NTSTATUS Status; @@ -142,6 +167,37 @@ Status = SamrConnect((PSAMPR_SERVER_NAME)ServerName, (SAMPR_HANDLE *)ServerHandle, DesiredAccess); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI +SamCreateAliasInDomain(IN SAM_HANDLE DomainHandle, + IN PUNICODE_STRING AccountName, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_HANDLE AliasHandle, + OUT PULONG RelativeId) +{ + NTSTATUS Status; + + TRACE("SamCreateAliasInDomain(%p,%p,0x%08x,%p,%p)\n", + DomainHandle, AccountName, DesiredAccess, AliasHandle, RelativeId); + + RpcTryExcept + { + Status = SamrCreateAliasInDomain((SAMPR_HANDLE)DomainHandle, + (PRPC_UNICODE_STRING)AccountName, + DesiredAccess, + (SAMPR_HANDLE *)AliasHandle, + RelativeId); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { @@ -186,9 +242,59 @@ NTSTATUS NTAPI +SamEnumerateDomainsInSamServer(IN SAM_HANDLE ServerHandle, + IN OUT PSAM_ENUMERATE_HANDLE EnumerationContext, + OUT PVOID *Buffer, + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned) +{ + PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; + NTSTATUS Status; + + TRACE("SamEnumerateDomainsInSamServer(%p,%p,%p,%lu,%p)\n", + ServerHandle, EnumerationContext, Buffer, PreferedMaximumLength, + CountReturned); + + if ((EnumerationContext == NULL) || + (Buffer == NULL) || + (CountReturned == NULL)) + return STATUS_INVALID_PARAMETER; + + *Buffer = NULL; + + RpcTryExcept + { + Status = SamrEnumerateDomainsInSamServer((SAMPR_HANDLE)ServerHandle, + EnumerationContext, + (PSAMPR_ENUMERATION_BUFFER *)&EnumBuffer, + PreferedMaximumLength, + CountReturned); + + if (EnumBuffer != NULL) + { + if (EnumBuffer->Buffer != NULL) + { + *Buffer = EnumBuffer->Buffer; + } + + midl_user_free(EnumBuffer); + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamFreeMemory(IN PVOID Buffer) { - if (Buffer!= NULL) + if (Buffer != NULL) midl_user_free(Buffer); return STATUS_SUCCESS; @@ -211,6 +317,35 @@ Status = SamrLookupDomainInSamServer((SAMPR_HANDLE)ServerHandle, (PRPC_UNICODE_STRING)Name, (PRPC_SID *)DomainId); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI +SamOpenAlias(IN SAM_HANDLE DomainHandle, + IN ACCESS_MASK DesiredAccess, + IN ULONG AliasId, + OUT PSAM_HANDLE AliasHandle) +{ + NTSTATUS Status; + + TRACE("SamOpenAlias(%p 0x%08x %lx %p)\n", + DomainHandle, DesiredAccess, AliasId, AliasHandle); + + RpcTryExcept + { + Status = SamrOpenAlias((SAMPR_HANDLE)DomainHandle, + DesiredAccess, + AliasId, + (SAMPR_HANDLE *)AliasHandle); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { @@ -282,12 +417,55 @@ NTSTATUS NTAPI +SamQueryInformationDomain(IN SAM_HANDLE DomainHandle, + IN DOMAIN_INFORMATION_CLASS DomainInformationClass, + OUT PVOID *Buffer) +{ + NTSTATUS Status; + + TRACE("SamQueryInformationDomain(%p %lu %p)\n", + DomainHandle, DomainInformationClass, Buffer); + + RpcTryExcept + { + Status = SamrQueryInformationDomain((SAMPR_HANDLE)DomainHandle, + DomainInformationClass, + (PSAMPR_DOMAIN_INFO_BUFFER *)Buffer); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamQueryInformationUser(IN SAM_HANDLE UserHandle, IN USER_INFORMATION_CLASS UserInformationClass, OUT PVOID *Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + TRACE("SamQueryInformationUser(%p %lu %p)\n", + UserHandle, UserInformationClass, Buffer); + + RpcTryExcept + { + Status = SamrQueryInformationUser((SAMPR_HANDLE)UserHandle, + UserInformationClass, + (PSAMPR_USER_INFO_BUFFER *)Buffer); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; } @@ -349,6 +527,7 @@ NTAPI SamShutdownSamServer(IN SAM_HANDLE ServerHandle) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Sun Jun 3 20:54:06 2012 @@ -1,4 +1,4 @@ -@ stub SamAddMemberToAlias +@ stdcall SamAddMemberToAlias(ptr ptr) @ stub SamAddMemberToGroup @ stub SamAddMultipleMembersToAlias @ stub SamChangePasswordUser2 @@ -7,7 +7,7 @@ @ stdcall SamCloseHandle(ptr) @ stdcall SamConnect(ptr ptr long ptr) @ stub SamConnectWithCreds -@ stub SamCreateAliasInDomain +@ stdcall SamCreateAliasInDomain(ptr ptr long ptr ptr) @ stub SamCreateGroupInDomain @ stub SamCreateUser2InDomain @ stdcall SamCreateUserInDomain(ptr ptr long ptr ptr) @@ -15,7 +15,7 @@ @ stub SamDeleteGroup @ stub SamDeleteUser @ stub SamEnumerateAliasesInDomain -@ stub SamEnumerateDomainsInSamServer +@ stdcall SamEnumerateDomainsInSamServer(ptr ptr ptr long ptr) @ stub SamEnumerateGroupsInDomain @ stub SamEnumerateUsersInDomain @ stdcall SamFreeMemory(ptr) @@ -28,13 +28,13 @@ @ stdcall SamLookupDomainInSamServer(ptr ptr ptr) @ stub SamLookupIdsInDomain @ stub SamLookupNamesInDomain -@ stub SamOpenAlias +@ stdcall SamOpenAlias(ptr long long ptr) @ stdcall SamOpenDomain(ptr long ptr ptr) @ stub SamOpenGroup @ stdcall SamOpenUser(ptr long long ptr) @ stub SamQueryDisplayInformation @ stub SamQueryInformationAlias -@ stub SamQueryInformationDomain +@ stdcall SamQueryInformationDomain(ptr long ptr) @ stub SamQueryInformationGroup @ stdcall SamQueryInformationUser(ptr long ptr) @ stub SamQuerySecurityObject Modified: trunk/reactos/dll/win32/samsrv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/registry.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/registry.c [iso-8859-1] Sun Jun 3 20:54:06 2012 @@ -16,7 +16,42 @@ /* FUNCTIONS ***************************************************************/ NTSTATUS -NTAPI +SampRegCloseKey(IN HANDLE KeyHandle) +{ + return NtClose(KeyHandle); +} + + +NTSTATUS +SampRegCreateKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName, + IN ACCESS_MASK DesiredAccess, + OUT HANDLE KeyHandle) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name; + ULONG Disposition; + + RtlInitUnicodeString(&Name, KeyName); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + ParentKeyHandle, + NULL); + + /* Create the key */ + return ZwCreateKey(KeyHandle, + DesiredAccess, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); +} + + +NTSTATUS SampRegEnumerateSubKey(IN HANDLE KeyHandle, IN ULONG Index, IN ULONG Length, @@ -74,7 +109,6 @@ NTSTATUS -NTAPI SampRegOpenKey(IN HANDLE ParentKeyHandle, IN LPCWSTR KeyName, IN ACCESS_MASK DesiredAccess, @@ -171,5 +205,8 @@ /* Free the memory and return status */ RtlFreeHeap(RtlGetProcessHeap(), 0, ValueInfo); + if ((Data == NULL) && (Status == STATUS_BUFFER_OVERFLOW)) + Status = STATUS_SUCCESS; + return Status; } Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Jun 3 20:54:06 2012 @@ -269,11 +269,201 @@ SamrEnumerateDomainsInSamServer(IN SAMPR_HANDLE ServerHandle, IN OUT unsigned long *EnumerationContext, OUT PSAMPR_ENUMERATION_BUFFER *Buffer, - IN unsigned long PreferedMaximumLength, - OUT unsigned long *CountReturned) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned) +{ + PSAM_DB_OBJECT ServerObject; + WCHAR DomainKeyName[64]; + HANDLE DomainsKeyHandle; + HANDLE DomainKeyHandle; + ULONG EnumIndex; + ULONG EnumCount; + ULONG RequiredLength; + ULONG DataLength; + ULONG i; + PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; + NTSTATUS Status; + + TRACE("SamrEnumerateDomainsInSamServer(%p %p %p %lu %p)\n", + ServerHandle, EnumerationContext, Buffer, PreferedMaximumLength, + CountReturned); + + /* Validate the server handle */ + Status = SampValidateDbObject(ServerHandle, + SamDbServerObject, + SAM_SERVER_ENUMERATE_DOMAINS, + &ServerObject); + if (!NT_SUCCESS(Status)) + return Status; + + Status = SampRegOpenKey(ServerObject->KeyHandle, + L"Domains", + KEY_READ, + &DomainsKeyHandle); + if (!NT_SUCCESS(Status)) + return Status; + + EnumIndex = *EnumerationContext; + EnumCount = 0; + RequiredLength = 0; + + while (TRUE) + { + Status = SampRegEnumerateSubKey(DomainsKeyHandle, + EnumIndex, + 64 * sizeof(WCHAR), + DomainKeyName); + if (!NT_SUCCESS(Status)) + break; + + TRACE("EnumIndex: %lu\n", EnumIndex); + TRACE("Domain key name: %S\n", DomainKeyName); + + Status = SampRegOpenKey(DomainsKeyHandle, + DomainKeyName, + KEY_READ, + &DomainKeyHandle); + TRACE("SampRegOpenKey returned %08lX\n", Status); + if (NT_SUCCESS(Status)) + { + DataLength = 0; + Status = SampRegQueryValue(DomainKeyHandle, + L"Name", + NULL, + NULL, + &DataLength); + TRACE("SampRegQueryValue returned %08lX\n", Status); + if (NT_SUCCESS(Status)) + { + TRACE("Data length: %lu\n", DataLength); + + if ((RequiredLength + DataLength + sizeof(UNICODE_STRING)) > PreferedMaximumLength) + break; + + RequiredLength += (DataLength + sizeof(UNICODE_STRING)); + EnumCount++; + } + + NtClose(DomainKeyHandle); + } + + EnumIndex++; + } + + TRACE("EnumCount: %lu\n", EnumCount); + TRACE("RequiredLength: %lu\n", RequiredLength); + + EnumBuffer = midl_user_allocate(sizeof(SAMPR_ENUMERATION_BUFFER)); + if (EnumBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + EnumBuffer->EntriesRead = EnumCount; + EnumBuffer->Buffer = midl_user_allocate(EnumCount * sizeof(SAMPR_RID_ENUMERATION)); + if (EnumBuffer->Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + EnumIndex = *EnumerationContext; + for (i = 0; i < EnumCount; i++, EnumIndex++) + { + Status = SampRegEnumerateSubKey(DomainsKeyHandle, + EnumIndex, + 64 * sizeof(WCHAR), + DomainKeyName); + if (!NT_SUCCESS(Status)) + break; + + TRACE("EnumIndex: %lu\n", EnumIndex); + TRACE("Domain key name: %S\n", DomainKeyName); + + Status = SampRegOpenKey(DomainsKeyHandle, + DomainKeyName, + KEY_READ, + &DomainKeyHandle); + TRACE("SampRegOpenKey returned %08lX\n", Status); + if (NT_SUCCESS(Status)) + { + DataLength = 0; + Status = SampRegQueryValue(DomainKeyHandle, + L"Name", + NULL, + NULL, + &DataLength); + TRACE("SampRegQueryValue returned %08lX\n", Status); + if (NT_SUCCESS(Status)) + { + EnumBuffer->Buffer[i].RelativeId = 0; + EnumBuffer->Buffer[i].Name.Length = (USHORT)DataLength - sizeof(WCHAR); + EnumBuffer->Buffer[i].Name.MaximumLength = (USHORT)DataLength; + EnumBuffer->Buffer[i].Name.Buffer = midl_user_allocate(DataLength); + if (EnumBuffer->Buffer[i].Name.Buffer == NULL) + { + NtClose(DomainKeyHandle); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampRegQueryValue(DomainKeyHandle, + L"Name", + NULL, + EnumBuffer->Buffer[i].Name.Buffer, + &DataLength); + TRACE("SampRegQueryValue returned %08lX\n", Status); + if (NT_SUCCESS(Status)) + { + TRACE("Domain name: %S\n", EnumBuffer->Buffer[i].Name.Buffer); + } + } + + NtClose(DomainKeyHandle); + + if (!NT_SUCCESS(Status)) + goto done; + } + } + + if (NT_SUCCESS(Status)) + { + *EnumerationContext += EnumCount; + *Buffer = EnumBuffer; + *CountReturned = EnumCount; + } + +done: + if (!NT_SUCCESS(Status)) + { + *EnumerationContext = 0; + *Buffer = NULL; + *CountReturned = 0; + + if (EnumBuffer != NULL) + { + if (EnumBuffer->Buffer != NULL) + { + if (EnumBuffer->EntriesRead != 0) + { + for (i = 0; i < EnumBuffer->EntriesRead; i++) + { + if (EnumBuffer->Buffer[i].Name.Buffer != NULL) + midl_user_free(EnumBuffer->Buffer[i].Name.Buffer); + } + } + + midl_user_free(EnumBuffer->Buffer); + } + + midl_user_free(EnumBuffer); + } + } + + NtClose(DomainsKeyHandle); + + return Status; } /* Function 7 */ @@ -348,6 +538,64 @@ return Status; } + +static NTSTATUS +SampQueryDomainName(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER *Buffer) +{ + PSAMPR_DOMAIN_INFO_BUFFER InfoBuffer = NULL; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_DOMAIN_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttribute(DomainObject, + L"Name", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->Name.DomainName.Length = Length - sizeof(WCHAR); + InfoBuffer->Name.DomainName.MaximumLength = Length; + InfoBuffer->Name.DomainName.Buffer = midl_user_allocate(Length); + if (InfoBuffer->Name.DomainName.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(DomainObject, + L"Name", + NULL, + (PVOID)InfoBuffer->Name.DomainName.Buffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + if (InfoBuffer->Name.DomainName.Buffer != NULL) + midl_user_free(InfoBuffer->Name.DomainName.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + /* Function 8 */ NTSTATUS NTAPI @@ -355,8 +603,32 @@ IN DOMAIN_INFORMATION_CLASS DomainInformationClass, OUT PSAMPR_DOMAIN_INFO_BUFFER *Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT DomainObject; + NTSTATUS Status; + + TRACE("SamrQueryInformationDomain(%p %lu %p)\n", + DomainHandle, DomainInformationClass, Buffer); + + /* Validate the server handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_READ_OTHER_PARAMETERS, + &DomainObject); + if (!NT_SUCCESS(Status)) + return Status; + + switch (DomainInformationClass) + { + case DomainNameInformation: + Status = SampQueryDomainName(DomainObject, + Buffer); + break; + + default: + Status = STATUS_NOT_IMPLEMENTED; + } + + return Status; } static NTSTATUS @@ -399,7 +671,7 @@ { case DomainNameInformation: Status = SampSetDomainName(DomainObject, - (PSAMPR_DOMAIN_NAME_INFORMATION)DomainInformation); + &DomainInformation->Name); break; default: @@ -579,8 +851,116 @@ OUT SAMPR_HANDLE *AliasHandle, OUT unsigned long *RelativeId) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT DomainObject; + PSAM_DB_OBJECT AliasObject; + ULONG ulSize; + ULONG ulRid; + WCHAR szRid[9]; + BOOL bAliasExists = FALSE; + NTSTATUS Status; + + TRACE("SamrCreateAliasInDomain(%p %p %lx %p %p)\n", + DomainHandle, AccountName, DesiredAccess, AliasHandle, RelativeId); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_CREATE_ALIAS, + &DomainObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Get the NextRID attribute */ + ulSize = sizeof(ULONG); + Status = SampGetObjectAttribute(DomainObject, + L"NextRID", + NULL, + (LPVOID)&ulRid, + &ulSize); + if (!NT_SUCCESS(Status)) + ulRid = DOMAIN_USER_RID_MAX + 1; + + TRACE("RID: %lx\n", ulRid); + + /* Convert the RID into a string (hex) */ + swprintf(szRid, L"%08lX", ulRid); + + /* Check whether the user name is already in use */ + Status = SampCheckDbObjectNameAlias(DomainObject, + L"Aliases", + AccountName->Buffer, + &bAliasExists); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + if (bAliasExists) + { + TRACE("The alias account %S already exists!\n", AccountName->Buffer); + return STATUS_ALIAS_EXISTS; + } + + /* Create the user object */ + Status = SampCreateDbObject(DomainObject, + L"Aliases", + szRid, + SamDbAliasObject, + DesiredAccess, + &AliasObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Add the name alias for the user object */ + Status = SampSetDbObjectNameAlias(DomainObject, + L"Aliases", + AccountName->Buffer, + ulRid); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the name attribute */ + Status = SampSetObjectAttribute(AliasObject, + L"Name", + REG_SZ, + (LPVOID)AccountName->Buffer, + AccountName->MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* FIXME: Set default alias attributes */ + + if (NT_SUCCESS(Status)) + { + *AliasHandle = (SAMPR_HANDLE)AliasObject; + *RelativeId = ulRid; + } + + /* Increment the NextRID attribute */ + ulRid++; + ulSize = sizeof(ULONG); + SampSetObjectAttribute(DomainObject, + L"NextRID", + REG_DWORD, + (LPVOID)&ulRid, + ulSize); + + TRACE("returns with status 0x%08lx\n", Status); + + return Status; } /* Function 15 */ @@ -723,11 +1103,47 @@ NTAPI SamrOpenAlias(IN SAMPR_HANDLE DomainHandle, IN ACCESS_MASK DesiredAccess, - IN unsigned long AliasId, + IN ULONG AliasId, OUT SAMPR_HANDLE *AliasHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT DomainObject; + PSAM_DB_OBJECT AliasObject; + WCHAR szRid[9]; + NTSTATUS Status; + + TRACE("SamrOpenAlias(%p %lx %lx %p)\n", + DomainHandle, DesiredAccess, AliasId, AliasHandle); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_LOOKUP, + &DomainObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Convert the RID into a string (hex) */ + swprintf(szRid, L"%08lX", AliasId); + + /* Create the alias object */ + Status = SampOpenDbObject(DomainObject, + L"Aliases", + szRid, + SamDbAliasObject, + DesiredAccess, + &AliasObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + *AliasHandle = (SAMPR_HANDLE)AliasObject; + + return STATUS_SUCCESS; } /* Function 28 */ @@ -767,8 +1183,52 @@ SamrAddMemberToAlias(IN SAMPR_HANDLE AliasHandle, IN PRPC_SID MemberId) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT AliasObject; + LPWSTR MemberIdString = NULL; + HANDLE MembersKeyHandle = NULL; + NTSTATUS Status; + + TRACE("SamrAddMemberToAlias(%p %p)\n", + AliasHandle, MemberId); + + /* Validate the domain handle */ + Status = SampValidateDbObject(AliasHandle, + SamDbAliasObject, + ALIAS_ADD_MEMBER, + &AliasObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + ConvertSidToStringSidW(MemberId, &MemberIdString); + TRACE("Member SID: %S\n", MemberIdString); + + Status = SampRegCreateKey(AliasObject->KeyHandle, + L"Members", + KEY_WRITE, + &MembersKeyHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegCreateKey failed with status 0x%08lx\n", Status); + goto done; + } + + Status = SampRegSetValue(MembersKeyHandle, + MemberIdString, + REG_BINARY, + NULL, + 0); + +done: + if (MembersKeyHandle != NULL) + SampRegCloseKey(MembersKeyHandle); + + if (MemberIdString != NULL) + LocalFree(MemberIdString); + + return Status; } /* Function 32 */ Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sun Jun 3 20:54:06 2012 @@ -17,6 +17,7 @@ #include <ndk/umtypes.h> #include <ddk/ntsam.h> #include <ntsecapi.h> +#include <sddl.h> #include <samsrv/samsrv.h> @@ -105,14 +106,21 @@ /* registry.h */ NTSTATUS -NTAPI +SampRegCloseKey(IN HANDLE KeyHandle); + +NTSTATUS +SampRegCreateKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName, + IN ACCESS_MASK DesiredAccess, + OUT HANDLE KeyHandle); + +NTSTATUS SampRegEnumerateSubKey(IN HANDLE KeyHandle, IN ULONG Index, IN ULONG Length, OUT LPWSTR Buffer); NTSTATUS -NTAPI SampRegOpenKey(IN HANDLE ParentKeyHandle, IN LPCWSTR KeyName, IN ACCESS_MASK DesiredAccess, Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Sun Jun 3 20:54:06 2012 @@ -59,35 +59,87 @@ static BOOL +SampCreateAliasAccount(HKEY hDomainKey, + LPCWSTR lpAccountName, + ULONG ulRelativeId) +{ + DWORD dwDisposition; + WCHAR szAccountKeyName[32]; + HKEY hAccountKey = NULL; + HKEY hNamesKey = NULL; + + swprintf(szAccountKeyName, L"Aliases\\%08lX", ulRelativeId); + + if (!RegCreateKeyExW(hDomainKey, + szAccountKeyName, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hAccountKey, + &dwDisposition)) + { + RegSetValueEx(hAccountKey, + L"Name", + 0, + REG_SZ, + (LPVOID)lpAccountName, + (wcslen(lpAccountName) + 1) * sizeof(WCHAR)); + + RegCloseKey(hAccountKey); + } + + if (!RegOpenKeyExW(hDomainKey, + L"Aliases\\Names", + 0, + KEY_ALL_ACCESS, + &hNamesKey)) + { + RegSetValueEx(hNamesKey, + lpAccountName, + 0, + REG_DWORD, + (LPVOID)&ulRelativeId, + sizeof(ULONG)); + + RegCloseKey(hNamesKey); + } + + return TRUE; +} + + +static BOOL SampCreateUserAccount(HKEY hDomainKey, LPCWSTR lpAccountName, ULONG ulRelativeId) { DWORD dwDisposition; - WCHAR szUserKeyName[32]; - HKEY hUserKey = NULL; + WCHAR szAccountKeyName[32]; + HKEY hAccountKey = NULL; HKEY hNamesKey = NULL; - swprintf(szUserKeyName, L"Users\\%08lX", ulRelativeId); + swprintf(szAccountKeyName, L"Users\\%08lX", ulRelativeId); if (!RegCreateKeyExW(hDomainKey, - szUserKeyName, + szAccountKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, - &hUserKey, + &hAccountKey, &dwDisposition)) { - RegSetValueEx(hUserKey, + RegSetValueEx(hAccountKey, L"Name", 0, REG_SZ, (LPVOID)lpAccountName, (wcslen(lpAccountName) + 1) * sizeof(WCHAR)); - RegCloseKey(hUserKey); + RegCloseKey(hAccountKey); } if (!RegOpenKeyExW(hDomainKey, @@ -119,7 +171,7 @@ { DWORD dwDisposition; HKEY hDomainKey = NULL; - HKEY hAliasKey = NULL; + HKEY hAliasesKey = NULL; HKEY hGroupsKey = NULL; HKEY hUsersKey = NULL; HKEY hNamesKey = NULL; @@ -157,16 +209,16 @@ /* Create the Alias container */ if (!RegCreateKeyExW(hDomainKey, - L"Alias", + L"Aliases", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, - &hAliasKey, + &hAliasesKey, &dwDisposition)) { - if (!RegCreateKeyExW(hAliasKey, + if (!RegCreateKeyExW(hAliasesKey, L"Names", 0, NULL, @@ -177,7 +229,7 @@ &dwDisposition)) RegCloseKey(hNamesKey); - RegCloseKey(hAliasKey); + RegCloseKey(hAliasesKey); } /* Create the Groups container */ @@ -344,6 +396,21 @@ pBuiltinSid, &hDomainKey)) { + SampCreateAliasAccount(hDomainKey, + L"Administrators", + DOMAIN_ALIAS_RID_ADMINS); + + SampCreateAliasAccount(hDomainKey, + L"Users", + DOMAIN_ALIAS_RID_USERS); + + SampCreateAliasAccount(hDomainKey, + L"Guests", + DOMAIN_ALIAS_RID_GUESTS); + + SampCreateAliasAccount(hDomainKey, + L"Power Users", + DOMAIN_ALIAS_RID_POWER_USERS); RegCloseKey(hDomainKey); } Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=56… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Sun Jun 3 20:54:06 2012 @@ -5,6 +5,12 @@ #ifdef __cplusplus extern "C" { #endif + +#define ALIAS_ADD_MEMBER 1 +#define ALIAS_REMOVE_MEMBER 2 +#define ALIAS_LIST_MEMBERS 4 +#define ALIAS_READ_INFORMATION 8 +#define ALIAS_WRITE_ACCOUNT 16 #define DOMAIN_READ_PASSWORD_PARAMETERS 1 #define DOMAIN_WRITE_PASSWORD_PARAMS 2 @@ -38,6 +44,19 @@ #define USER_WRITE_GROUP_INFORMATION 1024 typedef PVOID SAM_HANDLE, *PSAM_HANDLE; +typedef ULONG SAM_ENUMERATE_HANDLE, *PSAM_ENUMERATE_HANDLE; + +typedef struct _SAM_RID_ENUMERATION +{ + ULONG RelativeId; + UNICODE_STRING Name; +} SAM_RID_ENUMERATION, *PSAM_RID_ENUMERATION; + +typedef struct _SAM_SID_ENUMERATION +{ + PSID Sid; + UNICODE_STRING Name; +} SAM_SID_ENUMERATION, *PSAM_SID_ENUMERATION; typedef enum _DOMAIN_INFORMATION_CLASS { @@ -103,6 +122,11 @@ NTSTATUS NTAPI +SamAddMemberToAlias(IN SAM_HANDLE AliasHandle, + IN PSID MemberId); + +NTSTATUS +NTAPI SamCloseHandle(IN SAM_HANDLE SamHandle); NTSTATUS @@ -111,6 +135,14 @@ OUT PSAM_HANDLE ServerHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes); + +NTSTATUS +NTAPI +SamCreateAliasInDomain(IN SAM_HANDLE DomainHandle, + IN PUNICODE_STRING AccountName, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_HANDLE AliasHandle, + OUT PULONG RelativeId); NTSTATUS NTAPI @@ -122,6 +154,14 @@ NTSTATUS NTAPI +SamEnumerateDomainsInSamServer(IN SAM_HANDLE ServerHandle, + IN OUT PSAM_ENUMERATE_HANDLE EnumerationContext, + OUT PVOID *Buffer, + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned); + +NTSTATUS +NTAPI SamFreeMemory(IN PVOID Buffer); NTSTATUS @@ -129,6 +169,13 @@ SamLookupDomainInSamServer(IN SAM_HANDLE ServerHandle, IN PUNICODE_STRING Name, OUT PSID *DomainId); + +NTSTATUS +NTAPI +SamOpenAlias(IN SAM_HANDLE DomainHandle, + IN ACCESS_MASK DesiredAccess, + IN ULONG AliasId, + OUT PSAM_HANDLE AliasHandle); NTSTATUS NTAPI @@ -146,6 +193,12 @@ NTSTATUS NTAPI +SamQueryInformationDomain(IN SAM_HANDLE DomainHandle, + IN DOMAIN_INFORMATION_CLASS DomainInformationClass, + OUT PVOID *Buffer); + +NTSTATUS +NTAPI SamQueryInformationUser(IN SAM_HANDLE UserHandle, IN USER_INFORMATION_CLASS UserInformationClass, OUT PVOID *Buffer); Modified: trunk/reactos/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/sam.id… ============================================================================== --- trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] Sun Jun 3 20:54:06 2012 @@ -1036,7 +1036,7 @@ SamrOpenAlias( [in] SAMPR_HANDLE DomainHandle, [in] ACCESS_MASK DesiredAccess, - [in] unsigned long AliasId, + [in] ULONG AliasId, [out] SAMPR_HANDLE *AliasHandle); /* Function 28 */ @@ -1088,7 +1088,7 @@ SamrOpenUser( [in] SAMPR_HANDLE DomainHandle, [in] ACCESS_MASK DesiredAccess, - [in] unsigned long UserId, + [in] ULONG UserId, [out] SAMPR_HANDLE *UserHandle); /* Function 35 */

12 years, 6 months

[jimtabor] 56689: - Fix a FIXME and fix the last test in wine Win test_ShowWindow.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jun 2 03:56:23 2012 New Revision: 56689 URL: http://svn.reactos.org/svn/reactos?rev=56689&view=rev Log: - Fix a FIXME and fix the last test in wine Win test_ShowWindow. Modified: trunk/reactos/win32ss/user/user32/windows/window.c Modified: trunk/reactos/win32ss/user/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] Sat Jun 2 03:56:23 2012 @@ -1501,7 +1501,9 @@ PWND Wnd = ValidateHwndNoErr(hWnd); if (Wnd != NULL) { - /* FIXME: If window is being destroyed return FALSE! */ + if (Wnd->state & WNDS_DESTROYED || + Wnd->state2 & WNDS2_INDESTROY) + return FALSE; return TRUE; }

12 years, 6 months

[jimtabor] 56688: [Win32SS] - Minor fixups to SetParent. - Add utilities to check thread queue states and verify window object is still alive.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jun 2 03:34:04 2012 New Revision: 56688 URL: http://svn.reactos.org/svn/reactos?rev=56688&view=rev Log: [Win32SS] - Minor fixups to SetParent. - Add utilities to check thread queue states and verify window object is still alive. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/misc.c trunk/reactos/win32ss/user/ntuser/object.c trunk/reactos/win32ss/user/ntuser/object.h trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/window.h Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Jun 2 03:34:04 2012 @@ -794,6 +794,7 @@ #define SRVINFO_APIHOOK 0x0010 #define SRVINFO_METRICS 0x0020 +#define SRVINFO_KBDPREF 0x0080 #define NUM_SYSCOLORS 31 @@ -2182,7 +2183,8 @@ THREADSTATE_TASKMANWINDOW, THREADSTATE_GETMESSAGETIME, THREADSTATE_GETINPUTSTATE, - THREADSTATE_UPTIMELASTREAD + THREADSTATE_UPTIMELASTREAD, + THREADSTATE_FOREGROUNDTHREAD }; DWORD_PTR @@ -2522,6 +2524,7 @@ #define QUERY_WINDOW_FOCUS 0x03 #define QUERY_WINDOW_ISHUNG 0x04 #define QUERY_WINDOW_REAL_ID 0x05 +#define QUERY_WINDOW_FOREGROUND 0x06 DWORD NTAPI NtUserQueryWindow( Modified: trunk/reactos/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] Sat Jun 2 03:34:04 2012 @@ -221,6 +221,10 @@ case THREADSTATE_GETINPUTSTATE: ret = LOWORD(IntGetQueueStatus(QS_POSTMESSAGE|QS_TIMER|QS_PAINT|QS_SENDMESSAGE|QS_INPUT)) & (QS_KEY | QS_MOUSEBUTTON); break; + + case THREADSTATE_FOREGROUNDTHREAD: + ret = (gpqForeground == GetW32ThreadInfo()->MessageQueue); + break; } TRACE("Leave NtUserGetThreadState, ret=%i\n", ret); Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Sat Jun 2 03:34:04 2012 @@ -424,6 +424,20 @@ BOOL FASTCALL +UserObjectInDestroy(HANDLE h) +{ + PUSER_HANDLE_ENTRY entry; + + if (!(entry = handle_to_entry( gHandleTable, h ))) + { + SetLastNtError( STATUS_INVALID_HANDLE ); + return FALSE; + } + return (entry->flags & HANDLEENTRY_INDESTROY); +} + +BOOL +FASTCALL UserDeleteObject(HANDLE h, USER_OBJECT_TYPE type ) { PVOID body = UserGetObject(gHandleTable, h, type); Modified: trunk/reactos/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] Sat Jun 2 03:34:04 2012 @@ -37,6 +37,7 @@ BOOL FASTCALL UserDeleteObject(HANDLE h, USER_OBJECT_TYPE type ); PVOID UserGetObject(PUSER_HANDLE_TABLE ht, HANDLE handle, USER_OBJECT_TYPE type ); BOOL FASTCALL UserCreateHandleTable(VOID); +BOOL FASTCALL UserObjectInDestroy(HANDLE); static __inline VOID UserRefObjectCo(PVOID obj, PUSER_REFERENCE_ENTRY UserReferenceEntry) Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sat Jun 2 03:34:04 2012 @@ -57,6 +57,33 @@ Window->head.cLockObj++; return Window; +} + +PWND FASTCALL VerifyWnd(PWND pWnd) +{ + HWND hWnd; + UINT State, State2; + + if (!pWnd) return NULL; + + _SEH2_TRY + { + hWnd = UserHMGetHandle(pWnd); + State = pWnd->state; + State2 = pWnd->state2; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return NULL); + } + _SEH2_END + + if ( UserObjectInDestroy(hWnd) || + State & WNDS_DESTROYED || + State2 & WNDS2_INDESTROY ) + return NULL; + + return pWnd; } /* Temp HACK */ @@ -144,7 +171,7 @@ { if (Wnd->style & WS_POPUP) { - return Wnd->spwndOwner; + return Wnd->spwndOwner; } else if (Wnd->style & WS_CHILD) { @@ -1039,6 +1066,7 @@ PWND WndOldParent, pWndExam; BOOL WasVisible; POINT pt; + int swFlags = SWP_NOSIZE|SWP_NOZORDER; ASSERT(Wnd); ASSERT(WndNewParent); @@ -1080,10 +1108,14 @@ if (Wnd->head.pti->ppi != PsGetCurrentProcessWin32Process()) return NULL; - pt.x = Wnd->rcWindow.left; + WndOldParent = Wnd->spwndParent; + + if ( WndOldParent && + WndOldParent->ExStyle & WS_EX_LAYOUTRTL) + pt.x = Wnd->rcWindow.right; + else + pt.x = Wnd->rcWindow.left; pt.y = Wnd->rcWindow.top; - - WndOldParent = Wnd->spwndParent; if (WndOldParent) UserReferenceObject(WndOldParent); /* Caller must deref */ @@ -1095,10 +1127,23 @@ /* Set the new parent */ Wnd->spwndParent = WndNewParent; + if ( Wnd->style & WS_CHILD && + Wnd->spwndOwner && + Wnd->spwndOwner->ExStyle & WS_EX_TOPMOST ) + { + ERR("SetParent Top Most from Pop up!\n"); + Wnd->ExStyle |= WS_EX_TOPMOST; + } + /* Link the window with its new siblings */ - IntLinkHwnd(Wnd, HWND_TOP); - - } + IntLinkHwnd( Wnd, + ((0 == (Wnd->ExStyle & WS_EX_TOPMOST) && + WndNewParent == UserGetDesktopWindow() ) ? HWND_TOP : HWND_TOPMOST ) ); + + } + + if (WndOldParent == UserGetMessageWindow() || WndNewParent == UserGetMessageWindow()) + swFlags |= SWP_NOACTIVATE; IntNotifyWinEvent(EVENT_OBJECT_PARENTCHANGE, Wnd ,OBJID_WINDOW, CHILDID_SELF, WEF_SETBYWNDPTI); /* @@ -1108,7 +1153,7 @@ */ co_WinPosSetWindowPos( Wnd, (0 == (Wnd->ExStyle & WS_EX_TOPMOST) ? HWND_TOP : HWND_TOPMOST), - pt.x, pt.y, 0, 0, SWP_NOSIZE ); + pt.x, pt.y, 0, 0, swFlags); if (WasVisible) co_WinPosShowWindow(Wnd, SW_SHOWNORMAL); @@ -1156,9 +1201,9 @@ UserRefObjectCo(Wnd, &Ref); UserRefObjectCo(WndParent, &ParentRef); - + //ERR("Enter co_IntSetParent\n"); WndOldParent = co_IntSetParent(Wnd, WndParent); - + //ERR("Leave co_IntSetParent\n"); UserDerefObjectCo(WndParent); UserDerefObjectCo(Wnd); @@ -1526,7 +1571,7 @@ * Dialog boxes and message boxes do not inherit layout, so you must * set the layout explicitly. */ - if ( Class->fnid != FNID_DIALOG) + if ( Class->fnid != FNID_DIALOG ) { PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); if (ppi->dwLayout & LAYOUT_RTL) @@ -2077,16 +2122,11 @@ if (style & (WS_MINIMIZE | WS_MAXIMIZE)) { RECTL NewPos; - UINT16 SwFlag; - - SwFlag = (style & WS_MINIMIZE) ? SW_MINIMIZE : SW_MAXIMIZE; - - co_WinPosMinMaximize(Window, SwFlag, &NewPos); - - SwFlag = ((Window->style & WS_CHILD) || UserGetActiveWindow()) ? - SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED : - SWP_NOZORDER | SWP_FRAMECHANGED; - + UINT SwFlag = (style & WS_MINIMIZE) ? SW_MINIMIZE : SW_MAXIMIZE; + + SwFlag = co_WinPosMinMaximize(Window, SwFlag, &NewPos); + SwFlag |= SWP_NOZORDER|SWP_FRAMECHANGED; /* Frame always gets changed */ + if (!(style & WS_VISIBLE) || (style & WS_CHILD) || UserGetActiveWindow()) SwFlag |= SWP_NOACTIVATE; co_WinPosSetWindowPos(Window, 0, NewPos.left, NewPos.top, NewPos.right, NewPos.bottom, SwFlag); } @@ -2339,6 +2379,7 @@ ASSERT_REFS_CO(Window); // FIXME: Temp HACK? hWnd = Window->head.h; + ti = PsGetCurrentThreadWin32Thread(); TRACE("co_UserDestroyWindow \n"); @@ -2370,9 +2411,9 @@ * be destroying. */ if (!co_WinPosShowWindow(Window, SW_HIDE)) - { - if (UserGetActiveWindow() == Window->head.h) - { + { // Rule #1. + if (ti->MessageQueue->spwndActive == Window && ti->MessageQueue == IntGetFocusMessageQueue()) + { ERR("DestroyWindow AOW\n"); co_WinPosActivateOtherWindow(Window); } } @@ -2381,14 +2422,14 @@ Window->head.pti->MessageQueue->spwndActive = NULL; if (Window->head.pti->MessageQueue->spwndFocus == Window) Window->head.pti->MessageQueue->spwndFocus = NULL; + if (Window->head.pti->MessageQueue->spwndActivePrev == Window) + Window->head.pti->MessageQueue->spwndActivePrev = NULL; if (Window->head.pti->MessageQueue->CaptureWindow == Window->head.h) Window->head.pti->MessageQueue->CaptureWindow = NULL; /* * Check if this window is the Shell's Desktop Window. If so set hShellWindow to NULL */ - - ti = PsGetCurrentThreadWin32Thread(); if ((ti != NULL) & (ti->pDeskInfo != NULL)) { @@ -3092,7 +3133,7 @@ * -- Filip, 01/nov/2003 */ #if 0 - co_WinPosSetWindowPos(hwndListView, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE); + co_WinPosSetWindowPos(WndListView, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE); #endif if (WndListView->ExStyle & WS_EX_TOPMOST) @@ -3518,6 +3559,10 @@ Result = (DWORD)pWnd->head.pti->pEThread->Cid.UniqueProcess; break; + case QUERY_WINDOW_FOREGROUND: + Result = (pWnd->head.pti->MessageQueue == gpqForeground); + break; + default: Result = (DWORD)NULL; break; Modified: trunk/reactos/win32ss/user/ntuser/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] Sat Jun 2 03:34:04 2012 @@ -51,5 +51,6 @@ BOOL FASTCALL IntEnableWindow(HWND,BOOL); DWORD FASTCALL GetNCHitEx(PWND,POINT); ULONG FASTCALL IntSetStyle(PWND,ULONG,ULONG); +PWND FASTCALL VerifyWnd(PWND); /* EOF */

12 years, 6 months

[ekohl] 56687: [SAMLIB][SAMSRV][SYSSETUP] - Implement SamSetInformationDomain.DomainNameInformation and SamrSetInformationDomain.DomainNameInformation. - Set the account domain name for SAM too. - ...

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Jun 1 22:41:43 2012 New Revision: 56687 URL: http://svn.reactos.org/svn/reactos?rev=56687&view=rev Log: [SAMLIB][SAMSRV][SYSSETUP] - Implement SamSetInformationDomain.DomainNameInformation and SamrSetInformationDomain.DomainNameInformation. - Set the account domain name for SAM too. - Remove the old samlib.h file. Removed: trunk/reactos/include/reactos/libs/samlib/ Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/syssetup/precomp.h trunk/reactos/dll/win32/syssetup/security.c trunk/reactos/include/ddk/ntsam.h trunk/reactos/include/reactos/idl/sam.idl Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Fri Jun 1 22:41:43 2012 @@ -293,6 +293,33 @@ NTSTATUS NTAPI +SamSetInformationDomain(IN SAM_HANDLE DomainHandle, + IN DOMAIN_INFORMATION_CLASS DomainInformationClass, + IN PVOID DomainInformation) +{ + NTSTATUS Status; + + TRACE("SamSetInformationDomain(%p %lu %p)\n", + DomainHandle, DomainInformationClass, DomainInformation); + + RpcTryExcept + { + Status = SamrSetInformationDomain((SAMPR_HANDLE)DomainHandle, + DomainInformationClass, + DomainInformation); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamSetInformationUser(IN SAM_HANDLE UserHandle, IN USER_INFORMATION_CLASS UserInformationClass, IN PVOID Buffer) Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Fri Jun 1 22:41:43 2012 @@ -44,7 +44,7 @@ @ stub SamRemoveMultipleMembersFromAlias @ stub SamRidToSid @ stub SamSetInformationAlias -@ stub SamSetInformationDomain +@ stdcall SamSetInformationDomain(ptr long ptr) @ stub SamSetInformationGroup @ stdcall SamSetInformationUser(ptr long ptr) @ stub SamSetMemberAttributesOfGroup Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Fri Jun 1 22:41:43 2012 @@ -359,6 +359,21 @@ return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS +SampSetDomainName(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_NAME_INFORMATION DomainNameInfo) +{ + NTSTATUS Status; + + Status = SampSetObjectAttribute(DomainObject, + L"Name", + REG_SZ, + DomainNameInfo->DomainName.Buffer, + DomainNameInfo->DomainName.Length + sizeof(WCHAR)); + + return Status; +} + /* Function 9 */ NTSTATUS NTAPI @@ -366,8 +381,32 @@ IN DOMAIN_INFORMATION_CLASS DomainInformationClass, IN PSAMPR_DOMAIN_INFO_BUFFER DomainInformation) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT DomainObject; + NTSTATUS Status; + + TRACE("SamrSetInformationDomain(%p %lu %p)\n", + DomainHandle, DomainInformationClass, DomainInformation); + + /* Validate the server handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_WRITE_OTHER_PARAMETERS, + &DomainObject); + if (!NT_SUCCESS(Status)) + return Status; + + switch (DomainInformationClass) + { + case DomainNameInformation: + Status = SampSetDomainName(DomainObject, + (PSAMPR_DOMAIN_NAME_INFORMATION)DomainInformation); + break; + + default: + Status = STATUS_NOT_IMPLEMENTED; + } + + return Status; } /* Function 10 */ Modified: trunk/reactos/dll/win32/syssetup/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/precomp… ============================================================================== --- trunk/reactos/dll/win32/syssetup/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/precomp.h [iso-8859-1] Fri Jun 1 22:41:43 2012 @@ -13,7 +13,6 @@ #include <io.h> #include <tchar.h> #include <stdlib.h> -#include <samlib/samlib.h> #include <syssetup/syssetup.h> #include <userenv.h> #include <shlobj.h> @@ -24,6 +23,7 @@ #include <time.h> #include <ntlsa.h> #include <ntsecapi.h> +#include <ntsam.h> #include <sddl.h> #include "globals.h" Modified: trunk/reactos/dll/win32/syssetup/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/securit… ============================================================================== --- trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] Fri Jun 1 22:41:43 2012 @@ -24,6 +24,11 @@ POLICY_ACCOUNT_DOMAIN_INFO Info; LSA_OBJECT_ATTRIBUTES ObjectAttributes; LSA_HANDLE PolicyHandle; + + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + DOMAIN_NAME_INFORMATION DomainNameInfo; + NTSTATUS Status; DPRINT1("SYSSETUP: SetAccountDomain\n"); @@ -84,6 +89,40 @@ LsaFreeMemory(OrigInfo); LsaClose(PolicyHandle); + + DomainNameInfo.DomainName.Length = wcslen(DomainName) * sizeof(WCHAR); + DomainNameInfo.DomainName.MaximumLength = (wcslen(DomainName) + 1) * sizeof(WCHAR); + DomainNameInfo.DomainName.Buffer = (LPWSTR)DomainName; + + Status = SamConnect(NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (NT_SUCCESS(Status)) + { + Status = SamOpenDomain(ServerHandle, + DOMAIN_WRITE_OTHER_PARAMETERS, + Info.DomainSid, + &DomainHandle); + if (NT_SUCCESS(Status)) + { + Status = SamSetInformationDomain(DomainHandle, + DomainNameInformation, + (PVOID)&DomainNameInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamSetInformationDomain failed (Status: 0x%08lx)\n", Status); + } + + SamCloseHandle(DomainHandle); + } + else + { + DPRINT1("SamOpenDomain failed (Status: 0x%08lx)\n", Status); + } + + SamCloseHandle(ServerHandle); + } return Status; } Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=56… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Fri Jun 1 22:41:43 2012 @@ -38,6 +38,28 @@ #define USER_WRITE_GROUP_INFORMATION 1024 typedef PVOID SAM_HANDLE, *PSAM_HANDLE; + +typedef enum _DOMAIN_INFORMATION_CLASS +{ + DomainPasswordInformation = 1, + DomainGeneralInformation, + DomainLogoffInformation, + DomainOemInformation, + DomainNameInformation, + DomainReplicationInformation, + DomainServerRoleInformation, + DomainModifiedInformation, + DomainStateInformation, + DomainUasInformation, + DomainGeneralInformation2, + DomainLockoutInformation, + DomainModifiedInformation2 +} DOMAIN_INFORMATION_CLASS; + +typedef struct _DOMAIN_NAME_INFORMATION +{ + UNICODE_STRING DomainName; +} DOMAIN_NAME_INFORMATION, *PDOMAIN_NAME_INFORMATION; typedef enum _USER_INFORMATION_CLASS { @@ -130,6 +152,12 @@ NTSTATUS NTAPI +SamSetInformationDomain(IN SAM_HANDLE DomainHandle, + IN DOMAIN_INFORMATION_CLASS DomainInformationClass, + IN PVOID DomainInformation); + +NTSTATUS +NTAPI SamSetInformationUser(IN SAM_HANDLE UserHandle, IN USER_INFORMATION_CLASS UserInformationClass, IN PVOID Buffer); Modified: trunk/reactos/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/sam.id… ============================================================================== --- trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] Fri Jun 1 22:41:43 2012 @@ -233,6 +233,7 @@ unsigned short LockoutThreshold; } SAMPR_DOMAIN_LOCKOUT_INFORMATION, *PSAMPR_DOMAIN_LOCKOUT_INFORMATION; +cpp_quote("#ifndef _NTSAM_") typedef enum _DOMAIN_INFORMATION_CLASS { DomainPasswordInformation = 1, @@ -248,6 +249,7 @@ DomainLockoutInformation = 12, DomainModifiedInformation2 = 13 } DOMAIN_INFORMATION_CLASS; +cpp_quote("#endif") typedef [switch_type(DOMAIN_INFORMATION_CLASS)] union _SAMPR_DOMAIN_INFO_BUFFER {

12 years, 6 months

[akhaldi] 56686: [USBCCGP] * Fix a thinko.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 1 18:59:22 2012 New Revision: 56686 URL: http://svn.reactos.org/svn/reactos?rev=56686&view=rev Log: [USBCCGP] * Fix a thinko. Modified: trunk/reactos/drivers/usb/usbccgp/function.c Modified: trunk/reactos/drivers/usb/usbccgp/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/functi… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] Fri Jun 1 18:59:22 2012 @@ -331,7 +331,7 @@ // allocate array for interface count FunctionDescriptor->InterfaceDescriptorList = AllocateItem(NonPagedPool, sizeof(PUSB_INTERFACE_DESCRIPTOR) * Descriptor->bInterfaceCount); - if (FunctionDescriptor->InterfaceDescriptorList) + if (!FunctionDescriptor->InterfaceDescriptorList) { // // no memory

12 years, 6 months

[ekohl] 56685: [SAMLIB] - Implement SamFreeMemory and SamLookupDomainInSamServer. - Remove unused file debug.h. [SAMSRV] - Implement SamrLookupDomainInSamServer. - Add registry helper functions. - ...

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Jun 1 18:03:25 2012 New Revision: 56685 URL: http://svn.reactos.org/svn/reactos?rev=56685&view=rev Log: [SAMLIB] - Implement SamFreeMemory and SamLookupDomainInSamServer. - Remove unused file debug.h. [SAMSRV] - Implement SamrLookupDomainInSamServer. - Add registry helper functions. - Store the domain name in a new Name attribute which is used by Sam(r)LookupDomainInSamServer. Added: trunk/reactos/dll/win32/samsrv/registry.c (with props) Removed: trunk/reactos/dll/win32/samlib/debug.h Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/CMakeLists.txt trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/setup.c trunk/reactos/include/ddk/ntsam.h Removed: trunk/reactos/dll/win32/samlib/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/debug.h?r… ============================================================================== --- trunk/reactos/dll/win32/samlib/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/debug.h (removed) @@ -1,16 +1,0 @@ -#ifdef NDEBUG -#define DPRINT(...) -#define CHECKPOINT -#else -#define DPRINT(...) do { DebugPrint("(SAMLIB:%s:%d) ",__FILE__,__LINE__); DebugPrint(__VA_ARGS__); } while(0) -#define CHECKPOINT do { DebugPrint("(SAMLIB:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0) -#endif - -#define DPRINT1(...) do { DebugPrint("(SAMLIB:%s:%d) ",__FILE__,__LINE__); DebugPrint(__VA_ARGS__); } while(0) -#define CHECKPOINT1 do { DebugPrint("(SAMLIB:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0) - - -void -DebugPrint(char* fmt,...); - -/* EOF */ Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Fri Jun 1 18:03:25 2012 @@ -186,6 +186,44 @@ NTSTATUS NTAPI +SamFreeMemory(IN PVOID Buffer) +{ + if (Buffer!= NULL) + midl_user_free(Buffer); + + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +SamLookupDomainInSamServer(IN SAM_HANDLE ServerHandle, + IN PUNICODE_STRING Name, + OUT PSID *DomainId) +{ + NTSTATUS Status; + + TRACE("SamLookupDomainInSamServer(%p,%p,%p)\n", + ServerHandle, Name, DomainId); + + RpcTryExcept + { + Status = SamrLookupDomainInSamServer((SAMPR_HANDLE)ServerHandle, + (PRPC_UNICODE_STRING)Name, + (PRPC_SID *)DomainId); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamOpenDomain(IN SAM_HANDLE ServerHandle, IN ACCESS_MASK DesiredAccess, IN PSID DomainId, Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Fri Jun 1 18:03:25 2012 @@ -18,14 +18,14 @@ @ stub SamEnumerateDomainsInSamServer @ stub SamEnumerateGroupsInDomain @ stub SamEnumerateUsersInDomain -@ stub SamFreeMemory +@ stdcall SamFreeMemory(ptr) @ stub SamGetAliasMembership @ stub SamGetCompatibilityMode @ stub SamGetDisplayEnumerationIndex @ stub SamGetGroupsForUser @ stub SamGetMembersInAlias @ stub SamGetMembersInGroup -@ stub SamLookupDomainInSamServer +@ stdcall SamLookupDomainInSamServer(ptr ptr ptr) @ stub SamLookupIdsInDomain @ stub SamLookupNamesInDomain @ stub SamOpenAlias Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Fri Jun 1 18:03:25 2012 @@ -9,6 +9,7 @@ list(APPEND SOURCE database.c + registry.c samrpc.c samsrv.c setup.c Added: trunk/reactos/dll/win32/samsrv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/registry.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/registry.c (added) +++ trunk/reactos/dll/win32/samsrv/registry.c [iso-8859-1] Fri Jun 1 18:03:25 2012 @@ -1,0 +1,175 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Security Account Manager (SAM) Server + * FILE: reactos/dll/win32/samsrv/registry.c + * PURPOSE: Registry helper functions + * + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "samsrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(samsrv); + +/* FUNCTIONS ***************************************************************/ + +NTSTATUS +NTAPI +SampRegEnumerateSubKey(IN HANDLE KeyHandle, + IN ULONG Index, + IN ULONG Length, + OUT LPWSTR Buffer) +{ + PKEY_BASIC_INFORMATION KeyInfo = NULL; + ULONG BufferLength = 0; + ULONG ReturnedLength; + NTSTATUS Status; + + /* Check if we have a name */ + if (Length) + { + /* Allocate a buffer for it */ + BufferLength = sizeof(KEY_BASIC_INFORMATION) + Length * sizeof(WCHAR); + + KeyInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); + if (KeyInfo == NULL) + return STATUS_NO_MEMORY; + } + + /* Enumerate the key */ + Status = ZwEnumerateKey(KeyHandle, + Index, + KeyBasicInformation, + KeyInfo, + BufferLength, + &ReturnedLength); + if (NT_SUCCESS(Status)) + { + /* Check if the name fits */ + if (KeyInfo->NameLength < (Length * sizeof(WCHAR))) + { + /* Copy it */ + RtlMoveMemory(Buffer, + KeyInfo->Name, + KeyInfo->NameLength); + + /* Terminate the string */ + Buffer[KeyInfo->NameLength / sizeof(WCHAR)] = 0; + } + else + { + /* Otherwise, we ran out of buffer space */ + Status = STATUS_BUFFER_OVERFLOW; + } + } + + /* Free the buffer and return status */ + if (KeyInfo) + RtlFreeHeap(RtlGetProcessHeap(), 0, KeyInfo); + + return Status; +} + + +NTSTATUS +NTAPI +SampRegOpenKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName, + IN ACCESS_MASK DesiredAccess, + OUT HANDLE KeyHandle) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name; + + RtlInitUnicodeString(&Name, KeyName); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + ParentKeyHandle, + NULL); + + return NtOpenKey(KeyHandle, + DesiredAccess, + &ObjectAttributes); +} + + +NTSTATUS +SampRegSetValue(HANDLE KeyHandle, + LPWSTR ValueName, + ULONG Type, + LPVOID Data, + ULONG DataLength) +{ + UNICODE_STRING Name; + + RtlInitUnicodeString(&Name, + ValueName); + + return ZwSetValueKey(KeyHandle, + &Name, + 0, + Type, + Data, + DataLength); +} + + +NTSTATUS +SampRegQueryValue(HANDLE KeyHandle, + LPWSTR ValueName, + PULONG Type OPTIONAL, + LPVOID Data OPTIONAL, + PULONG DataLength OPTIONAL) +{ + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; + UNICODE_STRING Name; + ULONG BufferLength = 0; + NTSTATUS Status; + + RtlInitUnicodeString(&Name, + ValueName); + + if (DataLength != NULL) + BufferLength = *DataLength; + + BufferLength += FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); + + /* Allocate memory for the value */ + ValueInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); + if (ValueInfo == NULL) + return STATUS_NO_MEMORY; + + /* Query the value */ + Status = ZwQueryValueKey(KeyHandle, + &Name, + KeyValuePartialInformation, + ValueInfo, + BufferLength, + &BufferLength); + if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW)) + { + if (Type != NULL) + *Type = ValueInfo->Type; + + if (DataLength != NULL) + *DataLength = ValueInfo->DataLength; + } + + /* Check if the caller wanted data back, and we got it */ + if ((NT_SUCCESS(Status)) && (Data != NULL)) + { + /* Copy it */ + RtlMoveMemory(Data, + ValueInfo->Data, + ValueInfo->DataLength); + } + + /* Free the memory and return status */ + RtlFreeHeap(RtlGetProcessHeap(), 0, ValueInfo); + + return Status; +} Propchange: trunk/reactos/dll/win32/samsrv/registry.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/samsrv/registry.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Fri Jun 1 18:03:25 2012 @@ -161,8 +161,106 @@ IN PRPC_UNICODE_STRING Name, OUT PRPC_SID *DomainId) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT ServerObject; + HANDLE DomainsKeyHandle = NULL; + HANDLE DomainKeyHandle = NULL; + WCHAR DomainKeyName[64]; + ULONG Index; + WCHAR DomainNameString[MAX_COMPUTERNAME_LENGTH + 1]; + UNICODE_STRING DomainName; + ULONG Length; + BOOL Found = FALSE; + NTSTATUS Status; + + TRACE("SamrLookupDomainInSamServer(%p %p %p)\n", + ServerHandle, Name, DomainId); + + /* Validate the server handle */ + Status = SampValidateDbObject(ServerHandle, + SamDbServerObject, + SAM_SERVER_LOOKUP_DOMAIN, + &ServerObject); + if (!NT_SUCCESS(Status)) + return Status; + + *DomainId = NULL; + + Status = SampRegOpenKey(ServerObject->KeyHandle, + L"Domains", + KEY_READ, + &DomainsKeyHandle); + if (!NT_SUCCESS(Status)) + return Status; + + Index = 0; + while (Found == FALSE) + { + Status = SampRegEnumerateSubKey(DomainsKeyHandle, + Index, + 64, + DomainKeyName); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_NO_SUCH_DOMAIN; + break; + } + + TRACE("Domain key name: %S\n", DomainKeyName); + + Status = SampRegOpenKey(DomainsKeyHandle, + DomainKeyName, + KEY_READ, + &DomainKeyHandle); + if (NT_SUCCESS(Status)) + { + Length = (MAX_COMPUTERNAME_LENGTH + 1) * sizeof(WCHAR); + Status = SampRegQueryValue(DomainKeyHandle, + L"Name", + NULL, + (PVOID)&DomainNameString, + &Length); + if (NT_SUCCESS(Status)) + { + TRACE("Domain name: %S\n", DomainNameString); + + RtlInitUnicodeString(&DomainName, + DomainNameString); + if (RtlEqualUnicodeString(&DomainName, (PUNICODE_STRING)Name, TRUE)) + { + TRACE("Found it!\n"); + Found = TRUE; + + Status = SampRegQueryValue(DomainKeyHandle, + L"SID", + NULL, + NULL, + &Length); + if (NT_SUCCESS(Status)) + { + *DomainId = midl_user_allocate(Length); + + SampRegQueryValue(DomainKeyHandle, + L"SID", + NULL, + (PVOID)*DomainId, + &Length); + + Status = STATUS_SUCCESS; + break; + } + } + } + + NtClose(DomainKeyHandle); + } + + Index++; + } + + NtClose(DomainsKeyHandle); + + return Status; } /* Function 6 */ Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Fri Jun 1 18:03:25 2012 @@ -103,6 +103,35 @@ LPVOID AttributeData, PULONG AttributeSize); +/* registry.h */ +NTSTATUS +NTAPI +SampRegEnumerateSubKey(IN HANDLE KeyHandle, + IN ULONG Index, + IN ULONG Length, + OUT LPWSTR Buffer); + +NTSTATUS +NTAPI +SampRegOpenKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName, + IN ACCESS_MASK DesiredAccess, + OUT HANDLE KeyHandle); + +NTSTATUS +SampRegQueryValue(IN HANDLE KeyHandle, + IN LPWSTR ValueName, + OUT PULONG Type OPTIONAL, + OUT LPVOID Data OPTIONAL, + IN OUT PULONG DataLength OPTIONAL); + +NTSTATUS +SampRegSetValue(IN HANDLE KeyHandle, + IN LPWSTR ValueName, + IN ULONG Type, + IN LPVOID Data, + IN ULONG DataLength); + /* samspc.c */ VOID SampStartRpcServer(VOID); Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Fri Jun 1 18:03:25 2012 @@ -112,6 +112,7 @@ static BOOL SampCreateDomain(IN HKEY hDomainsKey, + IN LPCWSTR lpKeyName, IN LPCWSTR lpDomainName, IN PSID lpDomainSid, OUT PHKEY lpDomainKey) @@ -127,7 +128,7 @@ *lpDomainKey = NULL; if (RegCreateKeyExW(hDomainsKey, - lpDomainName, + lpKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, @@ -139,6 +140,13 @@ if (lpDomainSid != NULL) { + RegSetValueEx(hDomainKey, + L"Name", + 0, + REG_SZ, + (LPVOID)lpDomainName, + (wcslen(lpDomainName) + 1) * sizeof(WCHAR)); + RegSetValueEx(hDomainKey, L"SID", 0, @@ -332,6 +340,7 @@ /* Create the Builtin domain */ if (SampCreateDomain(hDomainsKey, L"Builtin", + L"Builtin", pBuiltinSid, &hDomainKey)) { @@ -342,7 +351,8 @@ /* Create the Account domain */ if (SampCreateDomain(hDomainsKey, L"Account", - AccountDomainInfo->DomainSid, //NULL, + L"", + AccountDomainInfo->DomainSid, &hDomainKey)) { SampCreateUserAccount(hDomainKey, Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=56… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Fri Jun 1 18:03:25 2012 @@ -100,6 +100,16 @@ NTSTATUS NTAPI +SamFreeMemory(IN PVOID Buffer); + +NTSTATUS +NTAPI +SamLookupDomainInSamServer(IN SAM_HANDLE ServerHandle, + IN PUNICODE_STRING Name, + OUT PSID *DomainId); + +NTSTATUS +NTAPI SamOpenDomain(IN SAM_HANDLE ServerHandle, IN ACCESS_MASK DesiredAccess, IN PSID DomainId,

12 years, 6 months

[tkreuzer] 56684: [WIN32K] Fix a comment

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jun 1 16:15:46 2012 New Revision: 56684 URL: http://svn.reactos.org/svn/reactos?rev=56684&view=rev Log: [WIN32K] Fix a comment Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Fri Jun 1 16:15:46 2012 @@ -1070,7 +1070,7 @@ return -1; } - /* Translate the color to the target format and get the RGB value */ + /* Translate the color to the target format */ iSolidColor = TranslateCOLORREF(pdc, crColor); /* Use the DC's text brush, which is always a solid brush */

12 years, 6 months

[tkreuzer] 56683: [PSDK] - Add __post_invalid to specstrings.h - Add missing InterlockedCompareExchangePointerAcquire and InterlockedCompareExchangePointerRelease for x86 to winbase.h - Add missing...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jun 1 16:10:14 2012 New Revision: 56683 URL: http://svn.reactos.org/svn/reactos?rev=56683&view=rev Log: [PSDK] - Add __post_invalid to specstrings.h - Add missing InterlockedCompareExchangePointerAcquire and InterlockedCompareExchangePointerRelease for x86 to winbase.h - Add missing MemoryBarrier definition Modified: trunk/reactos/include/psdk/specstrings.h trunk/reactos/include/psdk/winbase.h trunk/reactos/include/xdk/amd64/ke.h Modified: trunk/reactos/include/psdk/specstrings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/specstrings.h… ============================================================================== --- trunk/reactos/include/psdk/specstrings.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/specstrings.h [iso-8859-1] Fri Jun 1 16:10:14 2012 @@ -28,6 +28,7 @@ #define __field_bcount(size) __notnull __byte_writableTo(size) #define __field_ecount(size) __notnull __elem_writableTo(size) +#define __post_invalid _Post_ __notvalid #define __deref_in #define __deref_in_ecount(size) Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Fri Jun 1 16:10:14 2012 @@ -2392,6 +2392,8 @@ PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY); #endif +#define InterlockedCompareExchangePointerAcquire InterlockedCompareExchangePointer +#define InterlockedCompareExchangePointerRelease InterlockedCompareExchangePointer #endif // !(defined (_M_AMD64) || defined (_M_IA64)) Modified: trunk/reactos/include/xdk/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/amd64/ke.h?rev… ============================================================================== --- trunk/reactos/include/xdk/amd64/ke.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/amd64/ke.h [iso-8859-1] Fri Jun 1 16:10:14 2012 @@ -45,6 +45,7 @@ #define KeGetDcacheFillSize() 1L #define YieldProcessor _mm_pause +#define MemoryBarrier __faststorefence #define FastFence __faststorefence #define LoadFence _mm_lfence #define MemoryFence _mm_mfence

12 years, 6 months

[arty] 56682: [NTOSKRNL] - Allow placement of a wait entry in virgin address space prior to mapping a page. - Add a wait entry in the address space when paging in section view. - Correct a problem ...

by arty＠svn.reactos.org

Author: arty Date: Fri Jun 1 09:01:41 2012 New Revision: 56682 URL: http://svn.reactos.org/svn/reactos?rev=56682&view=rev Log: [NTOSKRNL] - Allow placement of a wait entry in virgin address space prior to mapping a page. - Add a wait entry in the address space when paging in section view. - Correct a problem that previously prevented us from evicting or querying pages that had been protected into PAGE_NOACCESS protection by adding a query for disabled mappings and handling disabled mappings in a few places (this may be controversial). Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/new… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] Fri Jun 1 09:01:41 2012 @@ -4,7 +4,6 @@ /* TYPES *********************************************************************/ -#define MM_WAIT_ENTRY 0x7ffffc00 #define PFN_FROM_SSE(E) ((PFN_NUMBER)((E) >> PAGE_SHIFT)) #define IS_SWAP_FROM_SSE(E) ((E) & 0x00000001) #define MM_IS_WAIT_PTE(E) \ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Fri Jun 1 09:01:41 2012 @@ -179,6 +179,10 @@ (PAGE_WRITECOPY | \ PAGE_EXECUTE_WRITECOPY) +// +// Wait entry for marking pages that are being serviced +// +#define MM_WAIT_ENTRY 0x7ffffc00 #define InterlockedCompareExchangePte(PointerPte, Exchange, Comperand) \ InterlockedCompareExchange((PLONG)(PointerPte), Exchange, Comperand) @@ -1263,6 +1267,13 @@ PVOID Address ); +BOOLEAN +NTAPI +MmIsDisabledPage( + struct _EPROCESS* Process, + PVOID Address +); + VOID NTAPI MmInitGlobalKernelPageDirectory(VOID); Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Fri Jun 1 09:01:41 2012 @@ -467,7 +467,9 @@ */ Pte = InterlockedExchangePte(Pt, 0); - WasValid = (Pte & PA_PRESENT); + /* We count a mapping as valid if it's a present page, or it's a nonzero pfn with + * the swap bit unset, indicating a valid page protected to PAGE_NOACCESS. */ + WasValid = (Pte & PA_PRESENT) || ((Pte >> PAGE_SHIFT) && !(Pte & 0x800)); if (WasValid) { /* Flush the TLB since we transitioned this PTE @@ -702,6 +704,14 @@ BOOLEAN NTAPI +MmIsDisabledPage(PEPROCESS Process, PVOID Address) +{ + ULONG_PTR Entry = MmGetPageEntryForProcess(Process, Address); + return !(Entry & PA_PRESENT) && !(Entry & 0x800) && (Entry >> PAGE_SHIFT); +} + +BOOLEAN +NTAPI MmIsPageSwapEntry(PEPROCESS Process, PVOID Address) { ULONG Entry; @@ -738,12 +748,17 @@ if (Pt == NULL) { /* Nobody should page out an address that hasn't even been mapped */ - KeBugCheck(MEMORY_MANAGEMENT); + /* But we might place a wait entry first, requiring the page table */ + if (SwapEntry != MM_WAIT_ENTRY) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + Pt = MmGetPageTableForProcess(Process, Address, TRUE); } Pte = InterlockedExchangePte(Pt, SwapEntry << 1); if (Pte != 0) { - KeBugCheck(MEMORY_MANAGEMENT); + KeBugCheckEx(MEMORY_MANAGEMENT, SwapEntry, (ULONG_PTR)Process, (ULONG_PTR)Address, 0); } if (Address < MmSystemRangeStart) @@ -975,7 +990,8 @@ } Pte = InterlockedExchangePte(Pt, PAGE_MASK(*Pt) | Attributes | (*Pt & (PA_ACCESSED|PA_DIRTY))); - if (!(Pte & PA_PRESENT)) + // We should be able to bring a page back from PAGE_NOACCESS + if ((Pte & 0x800) || !(Pte >> PAGE_SHIFT)) { DPRINT1("Invalid Pte %lx\n", Pte); KeBugCheck(MEMORY_MANAGEMENT); Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Fri Jun 1 09:01:41 2012 @@ -1223,6 +1223,11 @@ return(STATUS_SUCCESS); } + if (MmIsDisabledPage(Process, Address)) + { + return(STATUS_ACCESS_VIOLATION); + } + /* * Check for the virtual memory area being deleted. */ @@ -1438,6 +1443,8 @@ if (Entry == 0) { + SWAPENTRY FakeSwapEntry; + /* * If the entry is zero (and it can't change because we have * locked the segment) then we need to load the page. @@ -1448,6 +1455,7 @@ */ MmSetPageEntrySectionSegment(Segment, &Offset, MAKE_SWAP_SSE(MM_WAIT_ENTRY)); MmUnlockSectionSegment(Segment); + MmCreatePageFileMapping(Process, PAddress, MM_WAIT_ENTRY); MmUnlockAddressSpace(AddressSpace); if ((Segment->Flags & MM_PAGEFILE_SEGMENT) || @@ -1496,6 +1504,9 @@ MmSetPageEntrySectionSegment(Segment, &Offset, Entry); MmUnlockSectionSegment(Segment); + MmDeletePageFileMapping(Process, PAddress, &FakeSwapEntry); + DPRINT("CreateVirtualMapping Page %x Process %p PAddress %p Attributes %x\n", + Page, Process, PAddress, Attributes); Status = MmCreateVirtualMapping(Process, PAddress, Attributes, @@ -1506,6 +1517,7 @@ DPRINT1("Unable to create virtual mapping\n"); KeBugCheck(MEMORY_MANAGEMENT); } + ASSERT(MmIsPagePresent(Process, PAddress)); MmInsertRmap(Page, Process, Address); MiSetPageEvent(Process, Address); @@ -2441,7 +2453,7 @@ } } - if (MmIsPagePresent(Process, Address)) + if (MmIsPagePresent(Process, Address) || MmIsDisabledPage(Process, Address)) { MmSetPageProtect(Process, Address, Protect);

12 years, 6 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2012