Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 70962: [ADVAPI32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 06 Mar '16

06 Mar '16

Author: akhaldi Date: Sun Mar 6 16:43:16 2016 New Revision: 70962 URL: http://svn.reactos.org/svn/reactos?rev=70962&view=rev Log: [ADVAPI32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/advapi32/crypt.c trunk/rostests/winetests/advapi32/eventlog.c trunk/rostests/winetests/advapi32/registry.c trunk/rostests/winetests/advapi32/security.c Modified: trunk/rostests/winetests/advapi32/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/crypt.… ============================================================================== --- trunk/rostests/winetests/advapi32/crypt.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/crypt.c [iso-8859-1] Sun Mar 6 16:43:16 2016 @@ -961,7 +961,13 @@ { restoreGuid = TRUE; r = RegDeleteValueA(key, "MachineGuid"); - ok(!r, "RegDeleteValueA failed: %d\n", r); + ok(!r || broken(r == ERROR_ACCESS_DENIED) /*win8*/, "RegDeleteValueA failed: %d\n", r); + if (r == ERROR_ACCESS_DENIED) + { + skip("broken virtualization on HKLM\\Software\\Microsoft\\Cryptography\n"); + RegCloseKey(key); + return; + } } else ok(r == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", Modified: trunk/rostests/winetests/advapi32/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/eventl… ============================================================================== --- trunk/rostests/winetests/advapi32/eventlog.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/eventlog.c [iso-8859-1] Sun Mar 6 16:43:16 2016 @@ -487,7 +487,7 @@ ok(!ret, "Expected failure\n"); ok(read == 0, "Expected no bytes read\n"); ok(needed > sizeof(EVENTLOGRECORD), "Expected the needed buffersize to be bigger than sizeof(EVENTLOGRECORD)\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); /* Read the first record */ toread = needed; Modified: trunk/rostests/winetests/advapi32/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/regist… ============================================================================== --- trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] Sun Mar 6 16:43:16 2016 @@ -44,7 +44,8 @@ static const DWORD ptr_size = 8 * sizeof(void*); static DWORD (WINAPI *pRegGetValueA)(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD); -static DWORD (WINAPI *pRegDeleteTreeA)(HKEY,LPCSTR); +static LONG (WINAPI *pRegCopyTreeA)(HKEY,const char *,HKEY); +static LONG (WINAPI *pRegDeleteTreeA)(HKEY,const char *); static DWORD (WINAPI *pRegDeleteKeyExA)(HKEY,LPCSTR,REGSAM,DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); @@ -138,6 +139,7 @@ /* This function was introduced with Windows 2003 SP1 */ ADVAPI32_GET_PROC(RegGetValueA); + ADVAPI32_GET_PROC(RegCopyTreeA); ADVAPI32_GET_PROC(RegDeleteTreeA); ADVAPI32_GET_PROC(RegDeleteKeyExA); ADVAPI32_GET_PROC(RegDeleteKeyValueA); @@ -1343,6 +1345,13 @@ RegDeleteKeyA(hkey1, ""); RegCloseKey(hkey1); + /* System\CurrentControlSet\Control\Video should be non-volatile */ + ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Video\\Wine", + 0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL); + ok(ret == ERROR_SUCCESS, "RegCreateKeyExA failed with error %d\n", ret); + RegDeleteKeyA(hkey1, ""); + RegCloseKey(hkey1); + /* WOW64 flags - open an existing key */ hkey1 = NULL; ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &hkey1, NULL); @@ -2082,10 +2091,106 @@ RegCloseKey(subkey); } +static void test_reg_copy_tree(void) +{ + HKEY src, dst, subkey; + CHAR buffer[MAX_PATH]; + DWORD dwsize, type; + LONG size, ret; + + if (!pRegCopyTreeA) + { + win_skip("Skipping RegCopyTreeA tests, function not present\n"); + return; + } + + ret = RegCreateKeyA(hkey_main, "src", &src); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCreateKeyA(hkey_main, "dst", &dst); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + /* Copy nonexistent subkey */ + ret = pRegCopyTreeA(src, "nonexistent_subkey", dst); + ok(ret == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", ret); + + /* Create test keys and values */ + ret = RegSetValueA(src, NULL, REG_SZ, "data", 4); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegSetValueExA(src, "value", 0, REG_SZ, (const BYTE *)"data2", 5); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegCreateKeyA(src, "subkey2", &subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegSetValueA(subkey, NULL, REG_SZ, "data3", 5); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegSetValueExA(subkey, "value", 0, REG_SZ, (const BYTE *)"data4", 5); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCloseKey(subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegCreateKeyA(src, "subkey3", &subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCloseKey(subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + /* Copy subkey */ + ret = pRegCopyTreeA(src, "subkey2", dst); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + size = MAX_PATH; + ret = RegQueryValueA(dst, NULL, buffer, &size); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(!strcmp(buffer, "data3"), "Expected 'data3', got '%s'\n", buffer); + + dwsize = MAX_PATH; + ret = RegQueryValueExA(dst, "value", NULL, &type, (BYTE *)buffer, &dwsize); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(type == REG_SZ, "Expected REG_SZ, got %u\n", type); + ok(!strcmp(buffer, "data4"), "Expected 'data4', got '%s'\n", buffer); + + /* Copy full tree */ + ret = pRegCopyTreeA(src, NULL, dst); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + size = MAX_PATH; + ret = RegQueryValueA(dst, NULL, buffer, &size); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(!strcmp(buffer, "data"), "Expected 'data', got '%s'\n", buffer); + + dwsize = MAX_PATH; + ret = RegQueryValueExA(dst, "value", NULL, &type, (BYTE *)buffer, &dwsize); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(type == REG_SZ, "Expected REG_SZ, got %u\n", type); + ok(!strcmp(buffer, "data2"), "Expected 'data2', got '%s'\n", buffer); + + ret = RegOpenKeyA(dst, "subkey2", &subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + size = MAX_PATH; + ret = RegQueryValueA(subkey, NULL, buffer, &size); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(!strcmp(buffer, "data3"), "Expected 'data3', got '%s'\n", buffer); + dwsize = MAX_PATH; + ret = RegQueryValueExA(subkey, "value", NULL, &type, (BYTE *)buffer, &dwsize); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(type == REG_SZ, "Expected REG_SZ, got %u\n", type); + ok(!strcmp(buffer, "data4"), "Expected 'data4', got '%s'\n", buffer); + ret = RegCloseKey(subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegOpenKeyA(dst, "subkey3", &subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCloseKey(subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + delete_key(src); + delete_key(dst); +} + static void test_reg_delete_tree(void) { CHAR buffer[MAX_PATH]; HKEY subkey, subkey2; + DWORD dwsize, type; LONG size, ret; if(!pRegDeleteTreeA) { @@ -2131,7 +2236,9 @@ ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); ret = RegCloseKey(subkey2); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); - ret = RegSetValueA(subkey, "value", REG_SZ, "data2", 5); + ret = RegSetValueA(subkey, NULL, REG_SZ, "data", 4); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegSetValueExA(subkey, "value", 0, REG_SZ, (const BYTE *)"data2", 5); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); ret = pRegDeleteTreeA(subkey, NULL); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); @@ -2146,8 +2253,8 @@ ok(ret == ERROR_SUCCESS, "Default value of subkey is not present\n"); ok(!buffer[0], "Expected length 0 got length %u(%s)\n", lstrlenA(buffer), buffer); - size = MAX_PATH; - ok(RegQueryValueA(subkey, "value", buffer, &size), + dwsize = MAX_PATH; + ok(RegQueryValueExA(subkey, "value", NULL, &type, (BYTE *)buffer, &dwsize), "Value is still present\n"); ret = pRegDeleteTreeA(hkey_main, "not-here"); @@ -3279,6 +3386,18 @@ RegDeleteKeyA(subkey, ""); RegCloseKey(subkey); +} + +static void test_RegOpenCurrentUser(void) +{ + HKEY key; + LONG ret; + + key = HKEY_CURRENT_USER; + ret = RegOpenCurrentUser(KEY_READ, &key); + ok(!ret, "got %d, error %d\n", ret, GetLastError()); + ok(key != HKEY_CURRENT_USER, "got %p\n", key); + RegCloseKey(key); } START_TEST(registry) @@ -3305,16 +3424,16 @@ test_classesroot(); test_classesroot_enum(); test_classesroot_mask(); - test_reg_save_key(); test_reg_load_key(); test_reg_unload_key(); - + test_reg_copy_tree(); test_reg_delete_tree(); test_rw_order(); test_deleted_key(); test_delete_value(); test_delete_key_value(); + test_RegOpenCurrentUser(); /* cleanup */ delete_key( hkey_main ); Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… ============================================================================== --- trunk/rostests/winetests/advapi32/security.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/security.c [iso-8859-1] Sun Mar 6 16:43:16 2016 @@ -38,6 +38,11 @@ #include <winsvc.h> #include "wine/test.h" + +/* FIXME: Inspect */ +#define GetCurrentProcessToken() ((HANDLE)~(ULONG_PTR)3) +#define GetCurrentThreadToken() ((HANDLE)~(ULONG_PTR)4) +#define GetCurrentThreadEffectiveToken() ((HANDLE)~(ULONG_PTR)5) #ifndef PROCESS_QUERY_LIMITED_INFORMATION #define PROCESS_QUERY_LIMITED_INFORMATION 0x1000 @@ -135,6 +140,7 @@ static BOOL (WINAPI *pGetWindowsAccountDomainSid)(PSID,PSID,DWORD*); static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); static NTSTATUS (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); +static PSID_IDENTIFIER_AUTHORITY (WINAPI *pGetSidIdentifierAuthority)(PSID); static HMODULE hmod; static int myARGC; @@ -147,6 +153,35 @@ }; #define STRSID_OK 0 #define STRSID_OPT 1 + +#define SID_SLOTS 4 +static char debugsid_str[SID_SLOTS][256]; +static int debugsid_index = 0; +static const char* debugstr_sid(PSID sid) +{ + LPSTR sidstr; + DWORD le = GetLastError(); + char* res = debugsid_str[debugsid_index]; + debugsid_index = (debugsid_index + 1) % SID_SLOTS; + if (!pConvertSidToStringSidA) + strcpy(res, "missing ConvertSidToStringSidA"); + else if (!pConvertSidToStringSidA(sid, &sidstr)) + sprintf(res, "ConvertSidToStringSidA failed le=%u", GetLastError()); + else if (strlen(sidstr) > sizeof(*debugsid_str) - 1) + { + memcpy(res, sidstr, sizeof(*debugsid_str) - 4); + strcpy(res + sizeof(*debugsid_str) - 4, "..."); + LocalFree(sidstr); + } + else + { + strcpy(res, sidstr); + LocalFree(sidstr); + } + /* Restore the last error in case ConvertSidToStringSidA() modified it */ + SetLastError(le); + return res; +} struct sidRef { @@ -199,6 +234,7 @@ pGetAclInformation = (void *)GetProcAddress(hmod, "GetAclInformation"); pGetAce = (void *)GetProcAddress(hmod, "GetAce"); pGetWindowsAccountDomainSid = (void *)GetProcAddress(hmod, "GetWindowsAccountDomainSid"); + pGetSidIdentifierAuthority = (void *)GetProcAddress(hmod, "GetSidIdentifierAuthority"); myARGC = winetest_get_mainargs( &myARGV ); } @@ -241,7 +277,8 @@ res = GetSecurityDescriptorOwner(queriedSD, &owner, &owner_defaulted); ok_(__FILE__, line)(res, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); - ok_(__FILE__, line)(EqualSid(owner, expected), "Owner SIDs are not equal\n"); + ok_(__FILE__, line)(EqualSid(owner, expected), "Owner SIDs are not equal %s != %s\n", + debugstr_sid(owner), debugstr_sid(expected)); ok_(__FILE__, line)(!owner_defaulted, "Defaulted is true\n"); HeapFree(GetProcessHeap(), 0, queriedSD); @@ -259,7 +296,8 @@ res = GetSecurityDescriptorGroup(queriedSD, &group, &group_defaulted); ok_(__FILE__, line)(res, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); - ok_(__FILE__, line)(EqualSid(group, expected), "Group SIDs are not equal\n"); + ok_(__FILE__, line)(EqualSid(group, expected), "Group SIDs are not equal %s != %s\n", + debugstr_sid(group), debugstr_sid(expected)); ok_(__FILE__, line)(!group_defaulted, "Defaulted is true\n"); HeapFree(GetProcessHeap(), 0, queriedSD); @@ -1381,6 +1419,158 @@ GetLastError()); trace("AccessCheck with MAXIMUM_ALLOWED got Access 0x%08x\n", Access); + /* Null PrivSet with null PrivSetLen pointer */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + NULL, NULL, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have " + "failed with ERROR_NOACCESS, instead of %d\n", err); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Null PrivSet with zero PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = 0; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + 0, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Null PrivSet with insufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = 1; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + 0, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have " + "failed with ERROR_NOACCESS, instead of %d\n", err); + ok(PrivSetLen == 1, "PrivSetLen returns %d\n", PrivSetLen); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Null PrivSet with insufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET) - 1; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + 0, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have " + "failed with ERROR_NOACCESS, instead of %d\n", err); + ok(PrivSetLen == sizeof(PRIVILEGE_SET) - 1, "PrivSetLen returns %d\n", PrivSetLen); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Null PrivSet with minimal sufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET); + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + 0, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have " + "failed with ERROR_NOACCESS, instead of %d\n", err); + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Valid PrivSet with zero PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = 0; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Valid PrivSet with insufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = 1; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); +todo_wine + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); +todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Valid PrivSet with insufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET) - 1; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); +todo_wine + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); +todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); +todo_wine + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Valid PrivSet with minimal sufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET); + memset(PrivSet, 0xcc, PrivSetLen); + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(ret, "AccessCheck failed with error %d\n", GetLastError()); +todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); + ok(AccessStatus && (Access == KEY_READ), + "AccessCheck failed to grant access with error %d\n", GetLastError()); + ok(PrivSet->PrivilegeCount == 0, "PrivilegeCount returns %d, expects 0\n", + PrivSet->PrivilegeCount); + + /* Valid PrivSet with sufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET) + 1; + memset(PrivSet, 0xcc, PrivSetLen); + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(ret, "AccessCheck failed with error %d\n", GetLastError()); +todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET) + 1, "PrivSetLen returns %d\n", PrivSetLen); + ok(AccessStatus && (Access == KEY_READ), + "AccessCheck failed to grant access with error %d\n", GetLastError()); + ok(PrivSet->PrivilegeCount == 0, "PrivilegeCount returns %d, expects 0\n", + PrivSet->PrivilegeCount); + + PrivSetLen = FIELD_OFFSET(PRIVILEGE_SET, Privilege[16]); + + /* Null PrivSet with valid PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + 0, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have " + "failed with ERROR_NOACCESS, instead of %d\n", err); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + /* Access denied by SD */ SetLastError(0xdeadbeef); Access = AccessStatus = 0x1abe11ed; @@ -1392,7 +1582,7 @@ "with ERROR_ACCESS_DENIED, instead of %d\n", err); ok(!Access, "Should have failed to grant any access, got 0x%08x\n", Access); - SetLastError(0); + SetLastError(0xdeadbeef); PrivSet->PrivilegeCount = 16; ret = AccessCheck(SecurityDescriptor, Token, ACCESS_SYSTEM_SECURITY, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); @@ -1405,16 +1595,66 @@ ret = pRtlAdjustPrivilege(SE_SECURITY_PRIVILEGE, TRUE, TRUE, &Enabled); if (!ret) { - SetLastError(0); - PrivSet->PrivilegeCount = 16; + /* Valid PrivSet with zero PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = 0; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Valid PrivSet with insufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET) - 1; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + todo_wine + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); + todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); + todo_wine + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Valid PrivSet with minimal sufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET); + memset(PrivSet, 0xcc, PrivSetLen); ret = AccessCheck(SecurityDescriptor, Token, ACCESS_SYSTEM_SECURITY, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); - ok(ret && AccessStatus && GetLastError() == 0, + ok(ret && AccessStatus && GetLastError() == 0xdeadbeef, "AccessCheck should have succeeded, error %d\n", GetLastError()); ok(Access == ACCESS_SYSTEM_SECURITY, "Access should be equal to ACCESS_SYSTEM_SECURITY instead of 0x%08x\n", Access); + ok(PrivSet->PrivilegeCount == 1, "PrivilegeCount returns %d, expects 1\n", + PrivSet->PrivilegeCount); + + /* Valid PrivSet with large PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = FIELD_OFFSET(PRIVILEGE_SET, Privilege[16]); + memset(PrivSet, 0xcc, PrivSetLen); + ret = AccessCheck(SecurityDescriptor, Token, ACCESS_SYSTEM_SECURITY, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + ok(ret && AccessStatus && GetLastError() == 0xdeadbeef, + "AccessCheck should have succeeded, error %d\n", + GetLastError()); + ok(Access == ACCESS_SYSTEM_SECURITY, + "Access should be equal to ACCESS_SYSTEM_SECURITY instead of 0x%08x\n", + Access); + ok(PrivSet->PrivilegeCount == 1, "PrivilegeCount returns %d, expects 1\n", + PrivSet->PrivilegeCount); } else trace("Couldn't get SE_SECURITY_PRIVILEGE (0x%08x), skipping ACCESS_SYSTEM_SECURITY test\n", @@ -2187,7 +2427,8 @@ ok(ret, "Failed to lookup account name %s\n",name); ok(sid_size != 0, "sid_size was zero\n"); - ok(EqualSid(psid,wk_sid),"(%s) Sids fail to match well known sid!\n",name); + ok(EqualSid(psid,wk_sid),"%s Sid %s fails to match well known sid %s!\n", + name, debugstr_sid(psid), debugstr_sid(wk_sid)); ok(!lstrcmpA(account, wk_account), "Expected %s , got %s\n", account, wk_account); ok(!lstrcmpA(domain, wk_domain), "Expected %s, got %s\n", wk_domain, domain); @@ -3186,15 +3427,10 @@ bret = pGetAclInformation(dacl, &acl_size, sizeof(acl_size), AclSizeInformation); ok_(__FILE__, line)(bret, "GetAclInformation failed\n"); - if (todo_count) - todo_wine + todo_wine_if (todo_count) ok_(__FILE__, line)(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2)\n", acl_size.AceCount); - else - ok_(__FILE__, line)(acl_size.AceCount == 2, - "GetAclInformation returned unexpected entry count (%d != 2)\n", - acl_size.AceCount); if (acl_size.AceCount > 0) { @@ -3202,21 +3438,13 @@ ok_(__FILE__, line)(bret, "Failed to get Current User ACE\n"); bret = EqualSid(&ace->SidStart, user_sid); - if (todo_sid) - todo_wine - ok_(__FILE__, line)(bret, "Current User ACE != Current User SID\n"); - else - ok_(__FILE__, line)(bret, "Current User ACE != Current User SID\n"); - - if (todo_flags) - todo_wine + todo_wine_if (todo_sid) + ok_(__FILE__, line)(bret, "Current User ACE (%s) != Current User SID (%s)\n", debugstr_sid(&ace->SidStart), debugstr_sid(user_sid)); + + todo_wine_if (todo_flags) ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, "Current User ACE has unexpected flags (0x%x != 0x%x)\n", ((ACE_HEADER *)ace)->AceFlags, flags); - else - ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, - "Current User ACE has unexpected flags (0x%x != 0x%x)\n", - ((ACE_HEADER *)ace)->AceFlags, flags); ok_(__FILE__, line)(ace->Mask == mask, "Current User ACE has unexpected mask (0x%x != 0x%x)\n", @@ -3228,18 +3456,10 @@ ok_(__FILE__, line)(bret, "Failed to get Administators Group ACE\n"); bret = EqualSid(&ace->SidStart, admin_sid); - if (todo_sid) - todo_wine - ok_(__FILE__, line)(bret, "Administators Group ACE != Administators Group SID\n"); - else - ok_(__FILE__, line)(bret, "Administators Group ACE != Administators Group SID\n"); - - if (todo_flags) - todo_wine - ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, - "Administators Group ACE has unexpected flags (0x%x != 0x%x)\n", - ((ACE_HEADER *)ace)->AceFlags, flags); - else + todo_wine_if (todo_sid) + ok_(__FILE__, line)(bret, "Administators Group ACE (%s) != Administators Group SID (%s)\n", debugstr_sid(&ace->SidStart), debugstr_sid(admin_sid)); + + todo_wine_if (todo_flags) ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, "Administators Group ACE has unexpected flags (0x%x != 0x%x)\n", ((ACE_HEADER *)ace)->AceFlags, flags); @@ -3451,7 +3671,6 @@ ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); ok(bret, "GetAclInformation failed\n"); - todo_wine ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", acl_size.AceCount); LocalFree(pSD); @@ -3510,6 +3729,7 @@ ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); ok(bret, "GetAclInformation failed\n"); + todo_wine ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", acl_size.AceCount); LocalFree(pSD); @@ -3785,7 +4005,8 @@ bret = pGetAce(pDacl, 0, (VOID **)&ace); ok(bret, "Failed to get Current User ACE.\n"); bret = EqualSid(&ace->SidStart, user_sid); - ok(bret, "Current User ACE != Current User SID.\n"); + ok(bret, "Current User ACE (%s) != Current User SID (%s).\n", + debugstr_sid(&ace->SidStart), debugstr_sid(user_sid)); ok(((ACE_HEADER *)ace)->AceFlags == 0, "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); ok(ace->Mask == 0x1f01ff, @@ -3796,7 +4017,8 @@ bret = pGetAce(pDacl, 1, (VOID **)&ace); ok(bret, "Failed to get Administators Group ACE.\n"); bret = EqualSid(&ace->SidStart, admin_sid); - ok(bret || broken(!bret) /* win2k */, "Administators Group ACE != Administators Group SID.\n"); + ok(bret || broken(!bret) /* win2k */, "Administators Group ACE (%s) != Administators Group SID (%s).\n", + debugstr_sid(&ace->SidStart), debugstr_sid(admin_sid)); ok(((ACE_HEADER *)ace)->AceFlags == 0, "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); ok(ace->Mask == 0x1f01ff || broken(ace->Mask == GENERIC_ALL) /* win2k */, @@ -3930,14 +4152,15 @@ bret = GetSecurityDescriptorOwner(pSD, &owner, &owner_defaulted); ok(bret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); ok(owner != NULL, "owner should not be NULL\n"); - ok(EqualSid(owner, admin_sid), "MACHINE\\Software owner SID != Administrators SID.\n"); + ok(EqualSid(owner, admin_sid), "MACHINE\\Software owner SID (%s) != Administrators SID (%s).\n", debugstr_sid(owner), debugstr_sid(admin_sid)); bret = GetSecurityDescriptorGroup(pSD, &group, &group_defaulted); ok(bret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); ok(group != NULL, "group should not be NULL\n"); ok(EqualSid(group, admin_sid) || broken(EqualSid(group, system_sid)) /* before Win7 */ || broken(((SID*)group)->SubAuthority[0] == SECURITY_NT_NON_UNIQUE) /* Vista */, - "MACHINE\\Software group SID != Local System SID.\n"); + "MACHINE\\Software group SID (%s) != Local System SID (%s or %s)\n", + debugstr_sid(group), debugstr_sid(admin_sid), debugstr_sid(system_sid)); LocalFree(pSD); /* Test querying the DACL of a built-in registry key */ @@ -4579,7 +4802,7 @@ bret = pGetAce(pDacl, 0, (VOID **)&ace); ok(bret, "Failed to get Current User ACE.\n"); bret = EqualSid(&ace->SidStart, user_sid); - ok(bret, "Current User ACE != Current User SID.\n"); + ok(bret, "Current User ACE (%s) != Current User SID (%s).\n", debugstr_sid(&ace->SidStart), debugstr_sid(user_sid)); ok(((ACE_HEADER *)ace)->AceFlags == 0, "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", @@ -4590,7 +4813,7 @@ bret = pGetAce(pDacl, 1, (VOID **)&ace); ok(bret, "Failed to get Administators Group ACE.\n"); bret = EqualSid(&ace->SidStart, admin_sid); - ok(bret, "Administators Group ACE != Administators Group SID.\n"); + ok(bret, "Administators Group ACE (%s) != Administators Group SID (%s).\n", debugstr_sid(&ace->SidStart), debugstr_sid(admin_sid)); ok(((ACE_HEADER *)ace)->AceFlags == 0, "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); ok(ace->Mask == 0x1f01ff, @@ -4817,7 +5040,8 @@ SetLastError(0xdeadbeef); ret = EqualSid(sid1, sid2); - ok(ret, "Same sids should have been equal\n"); + ok(ret, "Same sids should have been equal %s != %s\n", + debugstr_sid(sid1), debugstr_sid(sid2)); ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef), /* NT4 */ "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", @@ -5472,11 +5696,8 @@ ok(ret, "DuplicateHandle error %d\n", GetLastError()); access = get_obj_access(dup); - if (map[i].todo) -todo_wine - ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); - else - ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + todo_wine_if (map[i].todo) + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); CloseHandle(dup); } @@ -5961,7 +6182,6 @@ HANDLE token; DWORD size; DWORD res; - char *sidname = NULL; static SID medium_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, {SECURITY_MANDATORY_HIGH_RID}}; static SID high_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, @@ -5993,14 +6213,10 @@ ok(tml->Label.Attributes == (SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED), "got 0x%x (expected 0x%x)\n", tml->Label.Attributes, (SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED)); - SetLastError(0xdeadbeef); - res = pConvertSidToStringSidA(tml->Label.Sid, &sidname); - ok(res, "got %u and %u\n", res, GetLastError()); - ok(EqualSid(tml->Label.Sid, &medium_level) || EqualSid(tml->Label.Sid, &high_level), - "got %s (expected 'S-1-16-8192' or 'S-1-16-12288')\n", sidname); - - LocalFree(sidname); + "got %s (expected %s or %s)\n", debugstr_sid(tml->Label.Sid), + debugstr_sid(&medium_level), debugstr_sid(&high_level)); + CloseHandle(token); } @@ -6315,9 +6531,89 @@ InitializeSid(domain_sid2, &domain_ident, 4); for (i = 0; i < 4; i++) *GetSidSubAuthority(domain_sid2, i) = *GetSidSubAuthority(user_sid, i); - ok(EqualSid(domain_sid, domain_sid2), "unexpected domain sid\n"); + ok(EqualSid(domain_sid, domain_sid2), "unexpected domain sid %s != %s\n", + debugstr_sid(domain_sid), debugstr_sid(domain_sid2)); HeapFree(GetProcessHeap(), 0, user); +} + +static void test_GetSidIdentifierAuthority(void) +{ + char buffer[SECURITY_MAX_SID_SIZE]; + PSID authority_sid = (PSID *)buffer; + PSID_IDENTIFIER_AUTHORITY id; + BOOL ret; + + if (!pGetSidIdentifierAuthority) + { + win_skip("GetSidIdentifierAuthority not available\n"); + return; + } + + memset(buffer, 0xcc, sizeof(buffer)); + ret = IsValidSid(authority_sid); + ok(!ret, "expected FALSE, got %u\n", ret); + + SetLastError(0xdeadbeef); + id = GetSidIdentifierAuthority(authority_sid); + ok(id != NULL, "got NULL pointer as identifier authority\n"); + ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + id = GetSidIdentifierAuthority(NULL); + ok(id != NULL, "got NULL pointer as identifier authority\n"); + ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); +} + +static void test_pseudo_tokens(void) +{ + TOKEN_STATISTICS statistics1, statistics2; + HANDLE token; + DWORD retlen; + BOOL ret; + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + ok(ret, "OpenProcessToken failed with error %u\n", GetLastError()); + memset(&statistics1, 0x11, sizeof(statistics1)); + ret = GetTokenInformation(token, TokenStatistics, &statistics1, sizeof(statistics1), &retlen); + ok(ret, "GetTokenInformation failed with %u\n", GetLastError()); + CloseHandle(token); + + /* test GetCurrentProcessToken() */ + SetLastError(0xdeadbeef); + memset(&statistics2, 0x22, sizeof(statistics2)); + ret = GetTokenInformation(GetCurrentProcessToken(), TokenStatistics, + &statistics2, sizeof(statistics2), &retlen); + ok(ret || broken(GetLastError() == ERROR_INVALID_HANDLE), + "GetTokenInformation failed with %u\n", GetLastError()); + if (ret) + ok(!memcmp(&statistics1, &statistics2, sizeof(statistics1)), "Token statistics do not match\n"); + else + win_skip("CurrentProcessToken not supported, skipping test\n"); + + /* test GetCurrentThreadEffectiveToken() */ + SetLastError(0xdeadbeef); + memset(&statistics2, 0x22, sizeof(statistics2)); + ret = GetTokenInformation(GetCurrentThreadEffectiveToken(), TokenStatistics, + &statistics2, sizeof(statistics2), &retlen); + ok(ret || broken(GetLastError() == ERROR_INVALID_HANDLE), + "GetTokenInformation failed with %u\n", GetLastError()); + if (ret) + ok(!memcmp(&statistics1, &statistics2, sizeof(statistics1)), "Token statistics do not match\n"); + else + win_skip("CurrentThreadEffectiveToken not supported, skipping test\n"); + + SetLastError(0xdeadbeef); + ret = OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE, &token); + ok(!ret, "OpenThreadToken should have failed\n"); + ok(GetLastError() == ERROR_NO_TOKEN, "Expected ERROR_NO_TOKEN, got %u\n", GetLastError()); + + /* test GetCurrentThreadToken() */ + SetLastError(0xdeadbeef); + ret = GetTokenInformation(GetCurrentThreadToken(), TokenStatistics, + &statistics2, sizeof(statistics2), &retlen); + todo_wine ok(GetLastError() == ERROR_NO_TOKEN || broken(GetLastError() == ERROR_INVALID_HANDLE), + "Expected ERROR_NO_TOKEN, got %u\n", GetLastError()); } START_TEST(security) @@ -6364,4 +6660,6 @@ test_AdjustTokenPrivileges(); test_AddAce(); test_system_security_access(); -} + test_GetSidIdentifierAuthority(); + test_pseudo_tokens(); +}

1 0

[akhaldi] 70961: [OLEPRO32] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 06 Mar '16

06 Mar '16

Author: akhaldi Date: Sun Mar 6 16:11:19 2016 New Revision: 70961 URL: http://svn.reactos.org/svn/reactos?rev=70961&view=rev Log: [OLEPRO32] Sync with Wine Staging 1.9.4. CORE-10912 Added: trunk/reactos/dll/win32/olepro32/olepro.idl (with props) trunk/reactos/dll/win32/olepro32/olepro_t.rgs (with props) Modified: trunk/reactos/dll/win32/olepro32/CMakeLists.txt trunk/reactos/dll/win32/olepro32/version.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/olepro32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/olepro32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/olepro32/CMakeLists.txt [iso-8859-1] Sun Mar 6 16:11:19 2016 @@ -2,10 +2,17 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(olepro32.dll olepro32.spec) +add_typelib(olepro.idl) list(APPEND SOURCE olepro32stubs.c ${CMAKE_CURRENT_BINARY_DIR}/olepro32.def) + +list(APPEND olepro32_rc_deps + ${CMAKE_CURRENT_SOURCE_DIR}/olepro_t.rgs + ${CMAKE_CURRENT_BINARY_DIR}/olepro.tlb) + +set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS "${olepro32_rc_deps}") add_library(olepro32 SHARED ${SOURCE} version.rc) set_module_type(olepro32 win32dll) Added: trunk/reactos/dll/win32/olepro32/olepro.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/olepro.… ============================================================================== --- trunk/reactos/dll/win32/olepro32/olepro.idl (added) +++ trunk/reactos/dll/win32/olepro32/olepro.idl [iso-8859-1] Sun Mar 6 16:11:19 2016 @@ -0,0 +1,270 @@ +/* + * Copyright (C) 2003 Robert Shearman + * 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#pragma makedep regtypelib + +import "oaidl.idl"; + +#include <olectl.h> + +[ + uuid(bef6e001-a874-101a-8bba-00aa00300cab), + version(2.0), + helpstring("Standard OLE Types") +] +library StdType +{ + importlib("stdole2.tlb"); + + typedef [uuid(66504301-BE0F-101A-8BBB-00AA00300CAB), public] + unsigned long OLE_COLOR; + + typedef [uuid(66504302-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XPOS_PIXELS; + + typedef [uuid(66504303-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YPOS_PIXELS; + + typedef [uuid(66504304-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XSIZE_PIXELS; + + typedef [uuid(66504305-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YSIZE_PIXELS; + + typedef [uuid(66504306-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XPOS_HIMETRIC; + + typedef [uuid(66504307-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YPOS_HIMETRIC; + + typedef [uuid(66504308-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XSIZE_HIMETRIC; + + typedef [uuid(66504309-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YSIZE_HIMETRIC; + + typedef [uuid(BF030640-9069-101B-AE2D-08002B2EC713), public] + float OLE_XPOS_CONTAINER; + + typedef [uuid(BF030641-9069-101B-AE2D-08002B2EC713), public] + float OLE_YPOS_CONTAINER; + + typedef [uuid(BF030642-9069-101B-AE2D-08002B2EC713), public] + float OLE_XSIZE_CONTAINER; + + typedef [uuid(BF030643-9069-101B-AE2D-08002B2EC713), public] + float OLE_YSIZE_CONTAINER; + + typedef [uuid(66504313-BE0F-101A-8BBB-00AA00300CAB), public] + int OLE_HANDLE; + + typedef [uuid(6650430B-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL OLE_OPTEXCLUSIVE; + + typedef [uuid(BF030644-9069-101B-AE2D-08002B2EC713), public] + VARIANT_BOOL OLE_CANCELBOOL; + + typedef [uuid(BF030645-9069-101B-AE2D-08002B2EC713), public] + VARIANT_BOOL OLE_ENABLEDEFAULTBOOL; + + [ + uuid(6650430A-BE0F-101A-8BBB-00AA00300CAB) + ] + enum OLE_TRISTATE { + Unchecked = 0, + Checked = 1, + Gray = 2 + }; + + typedef [uuid(6650430D-BE0F-101A-8BBB-00AA00300CAB), public] + BSTR FONTNAME; + + typedef [uuid(6650430E-BE0F-101A-8BBB-00AA00300CAB), public] + CURRENCY FONTSIZE; + + typedef [uuid(6650430F-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTBOLD; + + typedef [uuid(66504310-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTITALIC; + + typedef [uuid(66504311-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTUNDERSCORE; + + typedef [uuid(66504312-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTSTRIKETHROUGH; + + + [ + odl, + uuid(BEF6E002-A874-101A-8BBA-00AA00300CAB), + helpstring("Font Object"), + hidden + ] + interface IFont : IUnknown { + [propget] HRESULT Name([out, retval] BSTR *pname); + [propput] HRESULT Name([in] BSTR pname); + + [propget] HRESULT Size([out, retval] CURRENCY *psize); + [propput] HRESULT Size([in] CURRENCY psize); + + [propget] HRESULT Bold([out, retval] VARIANT_BOOL *pbold); + [propput] HRESULT Bold([in] VARIANT_BOOL pbold); + + [propget] HRESULT Italic([out, retval] VARIANT_BOOL *pitalic); + [propput] HRESULT Italic([in] VARIANT_BOOL pitalic); + + [propget] HRESULT Underline([out, retval] VARIANT_BOOL *punderline); + [propput] HRESULT Underline([in] VARIANT_BOOL punderline); + + [propget] HRESULT Strikethrough([out, retval] VARIANT_BOOL *pstrikethrough); + [propput] HRESULT Strikethrough([in] VARIANT_BOOL pstrikethrough); + + [propget] HRESULT Weight([out, retval] short *pweight); + [propput] HRESULT Weight([in] short pweight); + + [propget] HRESULT Charset([out, retval] short *pcharset); + [propput] HRESULT Charset([in] short pcharset); + + [propget] HRESULT hFont([out, retval] OLE_HANDLE *phfont); + + HRESULT Clone([out] IFont **ppfont); + + HRESULT IsEqual([in] IFont *pfontOther); + + HRESULT SetRatio([in] long cyLogical, [in] long cyHimetric); + + HRESULT AddRefHfont([in] OLE_HANDLE hFont); + + HRESULT ReleaseHfont([in] OLE_HANDLE hFont); + }; + + + [ + odl, + uuid(BEF6E003-A874-101A-8BBA-00AA00300CAB) + ] + dispinterface Font { + properties: + [id(DISPID_FONT_NAME)] BSTR Name; + [id(DISPID_FONT_SIZE)] CURRENCY Size; + [id(DISPID_FONT_BOLD)] VARIANT_BOOL Bold; + [id(DISPID_FONT_ITALIC)] VARIANT_BOOL Italic; + [id(DISPID_FONT_UNDER)] VARIANT_BOOL Underline; + [id(DISPID_FONT_STRIKE)] VARIANT_BOOL Strikethrough; + [id(DISPID_FONT_WEIGHT)] short Weight; + [id(DISPID_FONT_CHARSET)] short Charset; + methods: + } + + typedef [public] Font IFontDisp; + + [ + uuid(0BE35203-8F91-11CE-9DE3-00AA004BB851) + ] + coclass StdFont { + [default] dispinterface Font; + interface IFont; + }; + + [ + odl, + uuid(7BF80980-BF32-101A-8BBB-00AA00300CAB), + helpstring("Picture Object"), + hidden + ] + interface IPicture : IUnknown { + [propget] HRESULT Handle([out, retval] OLE_HANDLE *phandle); + + [propget] HRESULT hPal([out, retval] OLE_HANDLE *phpal); + + [propget] HRESULT Type([out, retval] short *ptype); + + [propget] HRESULT Width([out, retval] OLE_XSIZE_HIMETRIC *pwidth); + + [propget] HRESULT Height([out, retval] OLE_YSIZE_HIMETRIC *pheight); + + HRESULT Render([in] int hdc, + [in] long x, + [in] long y, + [in] long cx, + [in] long cy, + [in] OLE_XPOS_HIMETRIC xSrc, + [in] OLE_YPOS_HIMETRIC ySrc, + [in] OLE_XSIZE_HIMETRIC cxSrc, + [in] OLE_YSIZE_HIMETRIC cySrc, + [in] void *prcWBounds); + + [propput] HRESULT hPal([in] OLE_HANDLE phpal); + + [propget] HRESULT CurDC([out, retval] int *phdcOut); + + HRESULT SelectPicture([in] int hdcIn, + [out] int *phdcOut, + [out] OLE_HANDLE *phbmpOut); + + [propget] HRESULT KeepOriginalFormat([out, retval] VARIANT_BOOL *pfkeep); + [propput] HRESULT KeepOriginalFormat([in] VARIANT_BOOL pfkeep); + + HRESULT PictureChanged(); + + HRESULT SaveAsFile([in] void *pstm, + [in] VARIANT_BOOL fSaveMemCopy, + [out] long *pcbSize); + + [propget] HRESULT Attributes([out, retval] long *pdwAttr); + + HRESULT SetHdc([in] OLE_HANDLE hdc); + }; + + [ + uuid(7BF80981-BF32-101A-8BBB-00AA00300CAB) + ] + dispinterface Picture { + properties: + [id(DISPID_PICT_HANDLE), readonly] OLE_HANDLE Handle; + [id(DISPID_PICT_HPAL)] OLE_HANDLE hPal; + [id(DISPID_PICT_TYPE), readonly] short Type; + [id(DISPID_PICT_WIDTH), readonly] OLE_XSIZE_HIMETRIC Width; + [id(DISPID_PICT_HEIGHT), readonly] OLE_YSIZE_HIMETRIC Height; + methods: + [id(DISPID_PICT_RENDER)] + void Render(int hdc, + long x, + long y, + long cx, + long cy, + OLE_XPOS_HIMETRIC xSrc, + OLE_YPOS_HIMETRIC ySrc, + OLE_XSIZE_HIMETRIC cxSrc, + OLE_YSIZE_HIMETRIC cySrc, + void *prcWBounds); + }; + + typedef [public] Picture IPictureDisp; + + [ + uuid(0BE35204-8F91-11CE-9DE3-00AA004BB851) + ] + coclass StdPicture { + [default] dispinterface Picture; + interface IPicture; + }; +}; Propchange: trunk/reactos/dll/win32/olepro32/olepro.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/olepro32/olepro_t.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/olepro_… ============================================================================== --- trunk/reactos/dll/win32/olepro32/olepro_t.rgs (added) +++ trunk/reactos/dll/win32/olepro32/olepro_t.rgs [iso-8859-1] Sun Mar 6 16:11:19 2016 @@ -0,0 +1,32 @@ +HKCR +{ + NoRemove Typelib + { + NoRemove '{BEF6E001-A874-101A-8BBA-00AA00300CAB}' + { + '2.0' = s 'Standard OLE Types' + { + '0' { win32 = s '%MODULE%' } + FLAGS = s '0' + } + } + } + NoRemove Interface + { + '{BEF6E003-A874-101A-8BBA-00AA00300CAB}' = s 'Font' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{BEF6E001-A874-101A-8BBA-00AA00300CAB}' { val Version = s '2.0' } + } + '{7BF80981-BF32-101A-8BBB-00AA00300CAB}' = s 'Picture' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{BEF6E001-A874-101A-8BBA-00AA00300CAB}' { val Version = s '2.0' } + } + } + NoRemove CLSID + { + } +} Propchange: trunk/reactos/dll/win32/olepro32/olepro_t.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/olepro32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/version… ============================================================================== --- trunk/reactos/dll/win32/olepro32/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/olepro32/version.rc [iso-8859-1] Sun Mar 6 16:11:19 2016 @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +1 TYPELIB olepro.tlb +1 WINE_REGISTRY olepro_t.rgs + #define WINE_FILEDESCRIPTION_STR "Wine olepro32.dll" #define WINE_FILENAME_STR "olepro32.dll" #define WINE_FILEVERSION 5,0,4522,0 Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 6 16:11:19 2016 @@ -147,7 +147,7 @@ reactos/dll/win32/oleaut32 # Synced to WineStaging-1.9.4 reactos/dll/win32/olecli32 # Synced to WineStaging-1.7.55 reactos/dll/win32/oledlg # Synced to WineStaging-1.9.4 -reactos/dll/win32/olepro32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/olepro32 # Synced to WineStaging-1.9.4 reactos/dll/win32/olesvr32 # Synced to WineStaging-1.7.55 reactos/dll/win32/olethk32 # Synced to WineStaging-1.7.55 reactos/dll/win32/pdh # Synced to WineStaging-1.9.4

1 0

[akhaldi] 70960: [PSDK] Update winerror.h. CORE-10912
by akhaldi＠svn.reactos.org 06 Mar '16

06 Mar '16

Author: akhaldi Date: Sun Mar 6 16:06:07 2016 New Revision: 70960 URL: http://svn.reactos.org/svn/reactos?rev=70960&view=rev Log: [PSDK] Update winerror.h. CORE-10912 Modified: trunk/reactos/include/psdk/winerror.h Modified: trunk/reactos/include/psdk/winerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winerror.h?re… ============================================================================== --- trunk/reactos/include/psdk/winerror.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winerror.h [iso-8859-1] Sun Mar 6 16:06:07 2016 @@ -235,6 +235,7 @@ #define ERROR_MAX_THRDS_REACHED 164 #define ERROR_LOCK_FAILED 167 #define ERROR_BUSY 170 +#define ERROR_DEVICE_SUPPORT_IN_PROGRESS 171 #define ERROR_CANCEL_VIOLATION 173 #define ERROR_ATOMIC_LOCKS_NOT_SUPPORTED 174 #define ERROR_INVALID_SEGMENT_NUMBER 180 @@ -304,8 +305,43 @@ #define ERROR_INVALID_OPLOCK_PROTOCOL 301 #define ERROR_DISK_TOO_FRAGMENTED 302 #define ERROR_DELETE_PENDING 303 +#define ERROR_INCOMPATIBLE_WITH_GLOBAL_SHORT_NAME_REGISTRY_SETTING 304 +#define ERROR_SHORT_NAMES_NOT_ENABLED_ON_VOLUME 305 +#define ERROR_SECURITY_STREAM_IS_INCONSISTENT 306 +#define ERROR_INVALID_LOCK_RANGE 307 +#define ERROR_IMAGE_SUBSYSTEM_NOT_PRESENT 308 +#define ERROR_NOTIFICATION_GUID_ALREADY_DEFINED 309 +#define ERROR_INVALID_EXCEPTION_HANDLER 310 +#define ERROR_DUPLICATE_PRIVILEGES 311 +#define ERROR_NO_RANGES_PROCESSED 312 +#define ERROR_NOT_ALLOWED_ON_SYSTEM_FILE 313 +#define ERROR_DISK_RESOURCES_EXHAUSTED 314 +#define ERROR_INVALID_TOKEN 315 +#define ERROR_DEVICE_FEATURE_NOT_SUPPORTED 316 #define ERROR_MR_MID_NOT_FOUND 317 #define ERROR_SCOPE_NOT_FOUND 318 +#define ERROR_UNDEFINED_SCOPE 319 +#define ERROR_INVALID_CAP 320 +#define ERROR_DEVICE_UNREACHABLE 321 +#define ERROR_DEVICE_NO_RESOURCES 322 +#define ERROR_DATA_CHECKSUM_ERROR 323 +#define ERROR_INTERMIXED_KERNEL_EA_OPERATION 324 +#define ERROR_FILE_LEVEL_TRIM_NOT_SUPPORTED 326 +#define ERROR_OFFSET_ALIGNMENT_VIOLATION 327 +#define ERROR_INVALID_FIELD_IN_PARAMETER_LIST 328 +#define ERROR_OPERATION_IN_PROGRESS 329 +#define ERROR_BAD_DEVICE_PATH 330 +#define ERROR_TOO_MANY_DESCRIPTORS 331 +#define ERROR_SCRUB_DATA_DISABLED 332 +#define ERROR_NOT_REDUNDANT_STORAGE 333 +#define ERROR_RESIDENT_FILE_NOT_SUPPORTED 334 +#define ERROR_COMPRESSED_FILE_NOT_SUPPORTED 335 +#define ERROR_DIRECTORY_NOT_SUPPORTED 336 +#define ERROR_NOT_READ_FROM_COPY 337 +#define ERROR_FT_WRITE_FAILURE 338 +#define ERROR_FT_DI_SCAN_REQUIRED 339 +#define ERROR_INVALID_KERNEL_INFO_VERSION 340 +#define ERROR_INVALID_PEP_INFO_VERSION 341 #define ERROR_FAIL_NOACTION_REBOOT 350 #define ERROR_FAIL_SHUTDOWN 351 #define ERROR_FAIL_RESTART 352 @@ -470,6 +506,71 @@ #define ERROR_MP_PROCESSOR_MISMATCH 725 #define ERROR_HIBERNATED 726 #define ERROR_RESUME_HIBERNATION 727 +#define ERROR_FIRMWARE_UPDATED 728 +#define ERROR_DRIVERS_LEAKING_LOCKED_PAGES 729 +#define ERROR_WAKE_SYSTEM 730 +#define ERROR_WAIT_1 731 +#define ERROR_WAIT_2 732 +#define ERROR_WAIT_3 733 +#define ERROR_WAIT_63 734 +#define ERROR_ABANDONED_WAIT_0 735 +#define ERROR_ABANDONED_WAIT_63 736 +#define ERROR_USER_APC 737 +#define ERROR_KERNEL_APC 738 +#define ERROR_ALERTED 739 +#define ERROR_ELEVATION_REQUIRED 740 +#define ERROR_REPARSE 741 +#define ERROR_OPLOCK_BREAK_IN_PROGRESS 742 +#define ERROR_VOLUME_MOUNTED 743 +#define ERROR_RXACT_COMMITTED 744 +#define ERROR_NOTIFY_CLEANUP 745 +#define ERROR_PRIMARY_TRANSPORT_CONNECT_FAILED 746 +#define ERROR_PAGE_FAULT_TRANSITION 747 +#define ERROR_PAGE_FAULT_DEMAND_ZERO 748 +#define ERROR_PAGE_FAULT_COPY_ON_WRITE 749 +#define ERROR_PAGE_FAULT_GUARD_PAGE 750 +#define ERROR_PAGE_FAULT_PAGING_FILE 751 +#define ERROR_CACHE_PAGE_LOCKED 752 +#define ERROR_CRASH_DUMP 753 +#define ERROR_BUFFER_ALL_ZEROS 754 +#define ERROR_REPARSE_OBJECT 755 +#define ERROR_RESOURCE_REQUIREMENTS_CHANGED 756 +#define ERROR_TRANSLATION_COMPLETE 757 +#define ERROR_NOTHING_TO_TERMINATE 758 +#define ERROR_PROCESS_NOT_IN_JOB 759 +#define ERROR_PROCESS_IN_JOB 760 +#define ERROR_VOLSNAP_HIBERNATE_READY 761 +#define ERROR_FSFILTER_OP_COMPLETED_SUCCESSFULLY 762 +#define ERROR_INTERRUPT_VECTOR_ALREADY_CONNECTED 763 +#define ERROR_INTERRUPT_STILL_CONNECTED 764 +#define ERROR_WAIT_FOR_OPLOCK 765 +#define ERROR_DBG_EXCEPTION_HANDLED 766 +#define ERROR_DBG_CONTINUE 767 +#define ERROR_CALLBACK_POP_STACK 768 +#define ERROR_COMPRESSION_DISABLED 769 +#define ERROR_CANTFETCHBACKWARDS 770 +#define ERROR_CANTSCROLLBACKWARDS 771 +#define ERROR_ROWSNOTRELEASED 772 +#define ERROR_BAD_ACCESSOR_FLAGS 773 +#define ERROR_ERRORS_ENCOUNTERED 774 +#define ERROR_NOT_CAPABLE 775 +#define ERROR_REQUEST_OUT_OF_SEQUENCE 776 +#define ERROR_VERSION_PARSE_ERROR 777 +#define ERROR_BADSTARTPOSITION 778 +#define ERROR_MEMORY_HARDWARE 779 +#define ERROR_DISK_REPAIR_DISABLED 780 +#define ERROR_INSUFFICIENT_RESOURCE_FOR_SPECIFIED_SHARED_SECTION_SIZE 781 +#define ERROR_SYSTEM_POWERSTATE_TRANSITION 782 +#define ERROR_SYSTEM_POWERSTATE_COMPLEX_TRANSITION 783 +#define ERROR_MCA_EXCEPTION 784 +#define ERROR_ACCESS_AUDIT_BY_POLICY 785 +#define ERROR_ACCESS_DISABLED_NO_SAFER_UI_BY_POLICY 786 +#define ERROR_ABANDON_HIBERFILE 787 +#define ERROR_LOST_WRITEBEHIND_DATA_NETWORK_DISCONNECTED 788 +#define ERROR_LOST_WRITEBEHIND_DATA_NETWORK_SERVER_ERROR 789 +#define ERROR_LOST_WRITEBEHIND_DATA_LOCAL_DISK_ERROR 790 +#define ERROR_NO_ACE_CONDITION 804 +#define ERROR_INVALID_ACE_CONDITION 805 #define ERROR_EA_ACCESS_DENIED 994 #define ERROR_OPERATION_ABORTED 995 #define ERROR_IO_INCOMPLETE 996 @@ -840,6 +941,14 @@ #define ERROR_TIMEOUT 1460 #define ERROR_INVALID_MONITOR_HANDLE 1461 #define ERROR_INCORRECT_SIZE 1462 +#define ERROR_SYMLINK_CLASS_DISABLED 1463 +#define ERROR_SYMLINK_NOT_SUPPORTED 1464 +#define ERROR_XML_PARSE_ERROR 1465 +#define ERROR_XMLDSIG_ERROR 1466 +#define ERROR_RESTART_APPLICATION 1467 +#define ERROR_WRONG_COMPARTMENT 1468 +#define ERROR_AUTHIP_FAILURE 1469 +#define ERROR_NO_NVRAM_RESOURCES 1470 #define ERROR_EVENTLOG_FILE_CORRUPT 1500 #define ERROR_EVENTLOG_CANT_START 1501 #define ERROR_LOG_FILE_FULL 1502 @@ -1108,6 +1217,7 @@ #define ERROR_PRINTER_NOT_FOUND 3012 #define ERROR_PRINTER_DRIVER_WARNED 3013 #define ERROR_PRINTER_DRIVER_BLOCKED 3014 +#define ERROR_REQUEST_PAUSED 3050 #define ERROR_WINS_INTERNAL 4000 #define ERROR_CAN_NOT_DEL_LOCAL_WINS 4001 #define ERROR_STATIC_INIT 4002 @@ -1753,6 +1863,7 @@ #define DNS_ERROR_NO_PACKET 9503 #define DNS_ERROR_RCODE 9504 #define DNS_ERROR_UNSECURE_PACKET 9505 +#define DNS_REQUEST_PENDING 9506 #define DNS_ERROR_INVALID_TYPE 9551 #define DNS_ERROR_INVALID_IP_ADDRESS 9552 #define DNS_ERROR_INVALID_PROPERTY 9553 @@ -2149,11 +2260,90 @@ #define ERROR_RESOURCE_ENUM_USER_STOP 15106 #define ERROR_MUI_INTLSETTINGS_UILANG_NOT_INSTALLED 15107 #define ERROR_MUI_INTLSETTINGS_INVALID_LOCALE_NAME 15108 +#define ERROR_MRM_RUNTIME_NO_DEFAULT_OR_NEUTRAL_RESOURCE 15110 +#define ERROR_MRM_INVALID_PRICONFIG 15111 +#define ERROR_MRM_INVALID_FILE_TYPE 15112 +#define ERROR_MRM_UNKNOWN_QUALIFIER 15113 +#define ERROR_MRM_INVALID_QUALIFIER_VALUE 15114 +#define ERROR_MRM_NO_CANDIDATE 15115 +#define ERROR_MRM_NO_MATCH_OR_DEFAULT_CANDIDATE 15116 +#define ERROR_MRM_RESOURCE_TYPE_MISMATCH 15117 +#define ERROR_MRM_DUPLICATE_MAP_NAME 15118 +#define ERROR_MRM_DUPLICATE_ENTRY 15119 +#define ERROR_MRM_INVALID_RESOURCE_IDENTIFIER 15120 +#define ERROR_MRM_FILEPATH_TOO_LONG 15121 +#define ERROR_MRM_UNSUPPORTED_DIRECTORY_TYPE 15122 +#define ERROR_MRM_INVALID_PRI_FILE 15126 +#define ERROR_MRM_NAMED_RESOURCE_NOT_FOUND 15127 +#define ERROR_MRM_MAP_NOT_FOUND 15135 +#define ERROR_MRM_UNSUPPORTED_PROFILE_TYPE 15136 +#define ERROR_MRM_INVALID_QUALIFIER_OPERATOR 15137 +#define ERROR_MRM_INDETERMINATE_QUALIFIER_VALUE 15138 +#define ERROR_MRM_AUTOMERGE_ENABLED 15139 +#define ERROR_MRM_TOO_MANY_RESOURCES 15140 +#define ERROR_MCA_INVALID_CAPABILITIES_STRING 15200 +#define ERROR_MCA_INVALID_VCP_VERSION 15201 +#define ERROR_MCA_MONITOR_VIOLATES_MCCS_SPECIFICATION 15202 +#define ERROR_MCA_MCCS_VERSION_MISMATCH 15203 +#define ERROR_MCA_UNSUPPORTED_MCCS_VERSION 15204 +#define ERROR_MCA_INTERNAL_ERROR 15205 +#define ERROR_MCA_INVALID_TECHNOLOGY_TYPE_RETURNED 15206 +#define ERROR_MCA_UNSUPPORTED_COLOR_TEMPERATURE 15207 +#define ERROR_AMBIGUOUS_SYSTEM_DEVICE 15250 +#define ERROR_SYSTEM_DEVICE_NOT_FOUND 15299 +#define ERROR_HASH_NOT_SUPPORTED 15300 +#define ERROR_HASH_NOT_PRESENT 15301 +#define ERROR_SECONDARY_IC_PROVIDER_NOT_REGISTERED 15321 +#define ERROR_GPIO_CLIENT_INFORMATION_INVALID 15322 +#define ERROR_GPIO_VERSION_NOT_SUPPORTED 15323 +#define ERROR_GPIO_INVALID_REGISTRATION_PACKET 15324 +#define ERROR_GPIO_OPERATION_DENIED 15325 +#define ERROR_GPIO_INCOMPATIBLE_CONNECT_MODE 15326 +#define ERROR_GPIO_INTERRUPT_ALREADY_UNMASKED 15327 +#define ERROR_CANNOT_SWITCH_RUNLEVEL 15400 +#define ERROR_INVALID_RUNLEVEL_SETTING 15401 +#define ERROR_RUNLEVEL_SWITCH_TIMEOUT 15402 +#define ERROR_RUNLEVEL_SWITCH_AGENT_TIMEOUT 15403 +#define ERROR_RUNLEVEL_SWITCH_IN_PROGRESS 15404 +#define ERROR_SERVICES_FAILED_AUTOSTART 15405 +#define ERROR_COM_TASK_STOP_PENDING 15501 +#define ERROR_INSTALL_OPEN_PACKAGE_FAILED 15600 +#define ERROR_INSTALL_PACKAGE_NOT_FOUND 15601 +#define ERROR_INSTALL_INVALID_PACKAGE 15602 +#define ERROR_INSTALL_RESOLVE_DEPENDENCY_FAILED 15603 +#define ERROR_INSTALL_OUT_OF_DISK_SPACE 15604 +#define ERROR_INSTALL_NETWORK_FAILURE 15605 +#define ERROR_INSTALL_REGISTRATION_FAILURE 15606 +#define ERROR_INSTALL_DEREGISTRATION_FAILURE 15607 +#define ERROR_INSTALL_CANCEL 15608 +#define ERROR_INSTALL_FAILED 15609 +#define ERROR_REMOVE_FAILED 15610 +#define ERROR_PACKAGE_ALREADY_EXISTS 15611 +#define ERROR_NEEDS_REMEDIATION 15612 +#define ERROR_INSTALL_PREREQUISITE_FAILED 15613 +#define ERROR_PACKAGE_REPOSITORY_CORRUPTED 15614 +#define ERROR_INSTALL_POLICY_FAILURE 15615 +#define ERROR_PACKAGE_UPDATING 15616 +#define ERROR_DEPLOYMENT_BLOCKED_BY_POLICY 15617 +#define ERROR_PACKAGES_IN_USE 15618 +#define ERROR_RECOVERY_FILE_CORRUPT 15619 +#define ERROR_INVALID_STAGED_SIGNATURE 15620 +#define ERROR_DELETING_EXISTING_APPLICATIONDATA_STORE_FAILED 15621 +#define ERROR_INSTALL_PACKAGE_DOWNGRADE 15622 +#define ERROR_SYSTEM_NEEDS_REMEDIATION 15623 +#define ERROR_APPX_INTEGRITY_FAILURE_CLR_NGEN 15624 +#define ERROR_RESILIENCY_FILE_CORRUPT 15625 +#define ERROR_INSTALL_FIREWALL_SERVICE_NOT_RUNNING 15626 +#define APPMODEL_ERROR_NO_PACKAGE 15700 +#define APPMODEL_ERROR_PACKAGE_RUNTIME_CORRUPT 15701 +#define APPMODEL_ERROR_PACKAGE_IDENTITY_CORRUPT 15702 +#define APPMODEL_ERROR_NO_APPLICATION 15703 /* HRESULT values for OLE, SHELL and other Interface stuff */ /* the codes 4000-40ff are reserved for OLE */ #define E_NOT_SUFFICIENT_BUFFER HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) +#define E_NOT_VALID_STATE HRESULT_FROM_WIN32(ERROR_INVALID_STATE) #ifdef RC_INVOKED #define _HRESULT_TYPEDEF_(x) (x) @@ -2167,6 +2357,7 @@ #define S_FALSE _HRESULT_TYPEDEF_(1L) #define E_PENDING _HRESULT_TYPEDEF_(0x8000000AL) +#define E_BOUNDS _HRESULT_TYPEDEF_(0x8000000BL) #define E_NOTIMPL _HRESULT_TYPEDEF_(0x80004001L)

1 0

[hbelusca] 70959: [PROGMAN]: Fix build. Tango-like icon by Ismael Ferreras Morasuelas (swyter).
by hbelusca＠svn.reactos.org 06 Mar '16

06 Mar '16

Author: hbelusca Date: Sun Mar 6 15:01:08 2016 New Revision: 70959 URL: http://svn.reactos.org/svn/reactos?rev=70959&view=rev Log: [PROGMAN]: Fix build. Tango-like icon by Ismael Ferreras Morasuelas (swyter). Added: trunk/reactos/base/shell/progman/res/progman.ico (with props) Added: trunk/reactos/base/shell/progman/res/progman.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/res/pro… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/shell/progman/res/progman.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[tfaber] 70958: [PROGMAN] - Hermès, go fix build or whatever
by tfaber＠svn.reactos.org 06 Mar '16

06 Mar '16

Author: tfaber Date: Sun Mar 6 11:42:25 2016 New Revision: 70958 URL: http://svn.reactos.org/svn/reactos?rev=70958&view=rev Log: [PROGMAN] - Hermès, go fix build or whatever Removed: trunk/reactos/base/shell/progman/res/progman.ico Removed: trunk/reactos/base/shell/progman/res/progman.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/res/pro… ============================================================================== Binary file - no diff available.

1 0

[hbelusca] 70957: [PSDK]: Fix a define.
by hbelusca＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: hbelusca Date: Sat Mar 5 22:46:54 2016 New Revision: 70957 URL: http://svn.reactos.org/svn/reactos?rev=70957&view=rev Log: [PSDK]: Fix a define. Modified: trunk/reactos/include/psdk/bcrypt.h Modified: trunk/reactos/include/psdk/bcrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bcrypt.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] Sat Mar 5 22:46:54 2016 @@ -49,7 +49,7 @@ #define BCRYPT_HASH_BLOCK_LENGTH L"HashBlockLength" #define BCRYPT_HASH_LENGTH L"HashDigestLength" #define BCRYPT_HASH_OID_LIST L"HashOIDList" -#define BCRYPT_KEY_LENGTH L"KeyLengths" +#define BCRYPT_KEY_LENGTH L"KeyLength" #define BCRYPT_KEY_LENGTHS L"KeyLengths" #define BCRYPT_KEY_OBJECT_LENGTH L"KeyObjectLength" #define BCRYPT_KEY_STRENGTH L"KeyStrength"

1 0

[akhaldi] 70956: [PSDK] Satisfy MSVC 2010. Dedicated to Hermès.
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Sat Mar 5 22:40:18 2016 New Revision: 70956 URL: http://svn.reactos.org/svn/reactos?rev=70956&view=rev Log: [PSDK] Satisfy MSVC 2010. Dedicated to Hermès. Modified: trunk/reactos/include/psdk/bcrypt.h Modified: trunk/reactos/include/psdk/bcrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bcrypt.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] Sat Mar 5 22:40:18 2016 @@ -40,33 +40,31 @@ typedef NTSTATUS *PNTSTATUS; #endif -#define BCRYPT_ALGORITHM_NAME (const WCHAR []){'A','l','g','o','r','i','t','h','m','N','a','m','e',0} -#define BCRYPT_AUTH_TAG_LENGTH (const WCHAR []){'A','u','t','h','T','a','g','L','e','n','g','t','h',0} -#define BCRYPT_BLOCK_LENGTH (const WCHAR []){'B','l','o','c','k','L','e','n','g','t','h',0} -#define BCRYPT_BLOCK_SIZE_LIST (const WCHAR []){'B','l','o','c','k','S','i','z','e','L','i','s','t',0} -#define BCRYPT_CHAINING_MODE (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e',0} -#define BCRYPT_EFFECTIVE_KEY_LENGTH (const WCHAR []){'E','f','f','e','c','t','i','v','e','K','e','y','L','e','n','g','t','h',0} -#define BCRYPT_HASH_BLOCK_LENGTH (const WCHAR []){'H','a','s','h','B','l','o','c','k','L','e','n','g','t','h',0} -#define BCRYPT_HASH_LENGTH (const WCHAR []){'H','a','s','h','D','i','g','e','s','t','L','e','n','g','t','h',0} -#define BCRYPT_HASH_OID_LIST (const WCHAR []){'H','a','s','h','O','I','D','L','i','s','t',0} -#define BCRYPT_KEY_LENGTH (const WCHAR []){'K','e','y','L','e','n','g','t','h',0} -#define BCRYPT_KEY_LENGTHS (const WCHAR []){'K','e','y','L','e','n','g','t','h','s',0} -#define BCRYPT_KEY_OBJECT_LENGTH (const WCHAR []){'K','e','y','O','b','j','e','c','t','L','e','n','g','t','h',0} -#define BCRYPT_KEY_STRENGTH (const WCHAR []){'K','e','y','S','t','r','e','n','g','t','h',0} -#define BCRYPT_OBJECT_LENGTH (const WCHAR []){'O','b','j','e','c','t','L','e','n','g','t','h',0} -#define BCRYPT_PADDING_SCHEMES (const WCHAR []){'P','a','d','d','i','n','g','S','c','h','e','m','e','s',0} -#define BCRYPT_PROVIDER_HANDLE (const WCHAR []){'P','r','o','v','i','d','e','r','H','a','n','d','l','e',0} -#define BCRYPT_SIGNATURE_LENGTH (const WCHAR []){'S','i','g','n','a','t','u','r','e','L','e','n','g','t','h',0} +#define BCRYPT_ALGORITHM_NAME L"AlgorithmName" +#define BCRYPT_AUTH_TAG_LENGTH L"AuthTagLength" +#define BCRYPT_BLOCK_LENGTH L"BlockLength" +#define BCRYPT_BLOCK_SIZE_LIST L"BlockSizeList" +#define BCRYPT_CHAINING_MODE L"ChainingMode" +#define BCRYPT_EFFECTIVE_KEY_LENGTH L"EffectiveKeyLength" +#define BCRYPT_HASH_BLOCK_LENGTH L"HashBlockLength" +#define BCRYPT_HASH_LENGTH L"HashDigestLength" +#define BCRYPT_HASH_OID_LIST L"HashOIDList" +#define BCRYPT_KEY_LENGTH L"KeyLengths" +#define BCRYPT_KEY_LENGTHS L"KeyLengths" +#define BCRYPT_KEY_OBJECT_LENGTH L"KeyObjectLength" +#define BCRYPT_KEY_STRENGTH L"KeyStrength" +#define BCRYPT_OBJECT_LENGTH L"ObjectLength" +#define BCRYPT_PADDING_SCHEMES L"PaddingSchemes" +#define BCRYPT_PROVIDER_HANDLE L"ProviderHandle" +#define BCRYPT_SIGNATURE_LENGTH L"SignatureLength" -#define MS_PRIMITIVE_PROVIDER (const WCHAR [])\ - {'M','i','c','r','o','s','o','f','t',' ','P','r','i','m','i','t','i','v','e',' ','P','r','o','v','i','d','e','r',0} -#define MS_PLATFORM_CRYPTO_PROVIDER (const WCHAR [])\ - {'M','i','c','r','o','s','o','f','t',' ','P','l','a','t','f','o','r','m',' ','C','r','y','p','t','o',' ','P','r','o','v','i','d','e','r',0} +#define MS_PRIMITIVE_PROVIDER L"Microsoft Primitive Provider" +#define MS_PLATFORM_CRYPTO_PROVIDER L"Microsoft Platform Crypto Provider" -#define BCRYPT_SHA1_ALGORITHM (const WCHAR []){'S','H','A','1',0} -#define BCRYPT_SHA256_ALGORITHM (const WCHAR []){'S','H','A','2','5','6',0} -#define BCRYPT_SHA384_ALGORITHM (const WCHAR []){'S','H','A','3','8','4',0} -#define BCRYPT_SHA512_ALGORITHM (const WCHAR []){'S','H','A','5','1','2',0} +#define BCRYPT_SHA1_ALGORITHM L"SHA1" +#define BCRYPT_SHA256_ALGORITHM L"SHA256" +#define BCRYPT_SHA384_ALGORITHM L"SHA384" +#define BCRYPT_SHA512_ALGORITHM L"SHA512" typedef struct _BCRYPT_ALGORITHM_IDENTIFIER {

1 0

[pschweitzer] 70955: [FS_REC] Implement support for recognizing the Btrfs volumes. Patch by Peter Hater. CORE-10892 #comment The fs_rec part has been committed, thanks!
by pschweitzer＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: pschweitzer Date: Sat Mar 5 13:01:11 2016 New Revision: 70955 URL: http://svn.reactos.org/svn/reactos?rev=70955&view=rev Log: [FS_REC] Implement support for recognizing the Btrfs volumes. Patch by Peter Hater. CORE-10892 #comment The fs_rec part has been committed, thanks! Added: trunk/reactos/drivers/filesystems/fs_rec/btrfs.c (with props) trunk/reactos/drivers/filesystems/fs_rec/btrfs.h (with props) Modified: trunk/reactos/drivers/filesystems/fs_rec/CMakeLists.txt trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h Modified: trunk/reactos/drivers/filesystems/fs_rec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/CMakeLists.txt [iso-8859-1] Sat Mar 5 13:01:11 2016 @@ -1,6 +1,6 @@ - list(APPEND SOURCE blockdev.c + btrfs.c cdfs.c ext2.c fat.c Added: trunk/reactos/drivers/filesystems/fs_rec/btrfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/btrfs.c (added) +++ trunk/reactos/drivers/filesystems/fs_rec/btrfs.c [iso-8859-1] Sat Mar 5 13:01:11 2016 @@ -0,0 +1,109 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS File System Recognizer + * FILE: drivers/filesystems/fs_rec/btrfs.c + * PURPOSE: Btrfs Recognizer + * PROGRAMMER: Peter Hater + * Pierre Schweitzer (pierre(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include "fs_rec.h" +#include "btrfs.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ****************************************************************/ + +BOOLEAN +NTAPI +FsRecIsBtrfsVolume(IN PBTRFS_SUPER_BLOCK SuperBlock) +{ + /* Just check for magic */ + return (SuperBlock->magic == BTRFS_MAGIC); +} + +NTSTATUS +NTAPI +FsRecBtrfsFsControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + NTSTATUS Status; + PDEVICE_OBJECT MountDevice; + PBTRFS_SUPER_BLOCK Spb = NULL; + ULONG SectorSize; + LARGE_INTEGER Offset; + BOOLEAN DeviceError = FALSE; + PAGED_CODE(); + + /* Get the I/O Stack and check the function type */ + Stack = IoGetCurrentIrpStackLocation(Irp); + switch (Stack->MinorFunction) + { + case IRP_MN_MOUNT_VOLUME: + + /* Assume failure */ + Status = STATUS_UNRECOGNIZED_VOLUME; + + /* Get the device object and request the sector size */ + MountDevice = Stack->Parameters.MountVolume.DeviceObject; + if (FsRecGetDeviceSectorSize(MountDevice, &SectorSize)) + { + /* Try to read the superblock */ + Offset.QuadPart = BTRFS_SB_OFFSET; + if (FsRecReadBlock(MountDevice, + &Offset, + BTRFS_SB_SIZE, + SectorSize, + (PVOID)&Spb, + &DeviceError)) + { + /* Check if it's an actual BTRFS volume */ + if (FsRecIsBtrfsVolume(Spb)) + { + /* It is! */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } + + /* Free the boot sector if we have one */ + ExFreePool(Spb); + } + else + { + /* We have some sort of failure in the storage stack */ + DeviceError = TRUE; + } + + /* Check if we have an error on the stack */ + if (DeviceError) + { + /* Was this because of a floppy? */ + if (MountDevice->Characteristics & FILE_FLOPPY_DISKETTE) + { + /* Let the FS try anyway */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } + + break; + + case IRP_MN_LOAD_FILE_SYSTEM: + + /* Load the file system */ + Status = FsRecLoadFileSystem(DeviceObject, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\btrfs"); + break; + + default: + + /* Invalid request */ + Status = STATUS_INVALID_DEVICE_REQUEST; + } + + /* Return Status */ + return Status; +} Propchange: trunk/reactos/drivers/filesystems/fs_rec/btrfs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/fs_rec/btrfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/btrfs.h (added) +++ trunk/reactos/drivers/filesystems/fs_rec/btrfs.h [iso-8859-1] Sat Mar 5 13:01:11 2016 @@ -0,0 +1,31 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS File System Recognizer + * FILE: drivers/filesystems/fs_rec/btrfs.h + * PURPOSE: BTRFS Header File + * PROGRAMMER: Peter Hater + * Pierre Schweitzer (pierre(a)reactos.org) + */ + +#include <pshpack1.h> +typedef struct { + UINT8 uuid[16]; +} BTRFS_UUID; + +typedef struct _BTRFS_SUPER_BLOCK { + UINT8 checksum[32]; + BTRFS_UUID uuid; + UINT64 sb_phys_addr; + UINT64 flags; + UINT64 magic; + // Partial +} BTRFS_SUPER_BLOCK, *PBTRFS_SUPER_BLOCK; +#include <poppack.h> + +C_ASSERT(FIELD_OFFSET(BTRFS_SUPER_BLOCK, uuid) == 0x20); +C_ASSERT(FIELD_OFFSET(BTRFS_SUPER_BLOCK, sb_phys_addr) == 0x30); +C_ASSERT(FIELD_OFFSET(BTRFS_SUPER_BLOCK, magic) == 0x40); + +#define BTRFS_MAGIC 0x4d5f53665248425f +#define BTRFS_SB_OFFSET 0x10000 +#define BTRFS_SB_SIZE 0x1000 Propchange: trunk/reactos/drivers/filesystems/fs_rec/btrfs.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c [iso-8859-1] Sat Mar 5 13:01:11 2016 @@ -162,6 +162,12 @@ /* Send EXT2 command */ Status = FsRecExt2FsControl(DeviceObject, Irp); + break; + + case FS_TYPE_BTRFS: + + /* Send BTRFS command */ + Status = FsRecBtrfsFsControl(DeviceObject, Irp); break; default: @@ -382,6 +388,16 @@ FILE_DEVICE_DISK_FILE_SYSTEM); if (NT_SUCCESS(Status)) DeviceCount++; + /* Register BTRFS */ + Status = FsRecRegisterFs(DriverObject, + NULL, + NULL, + L"\\Btrfs", + L"\\FileSystem\\BtrfsRecognizer", + FS_TYPE_BTRFS, + FILE_DEVICE_DISK_FILE_SYSTEM); + if (NT_SUCCESS(Status)) DeviceCount++; + /* Return appropriate Status */ return (DeviceCount > 0) ? STATUS_SUCCESS : STATUS_IMAGE_ALREADY_LOADED; } Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] Sat Mar 5 13:01:11 2016 @@ -174,6 +174,7 @@ FS_TYPE_CDFS, FS_TYPE_UDFS, FS_TYPE_EXT2, + FS_TYPE_BTRFS, } FILE_SYSTEM_TYPE, *PFILE_SYSTEM_TYPE; /* FS Recognizer State */ @@ -224,6 +225,13 @@ NTSTATUS NTAPI FsRecExt2FsControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp +); + +NTSTATUS +NTAPI +FsRecBtrfsFsControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp );

1 0

[akhaldi] 70954: [XMLLITE_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Sat Mar 5 11:09:57 2016 New Revision: 70954 URL: http://svn.reactos.org/svn/reactos?rev=70954&view=rev Log: [XMLLITE_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/xmllite/reader.c Modified: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.… ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Sat Mar 5 11:09:57 2016 @@ -101,15 +101,9 @@ broken_state = broken((line_broken == -1 ? line : line_broken) == l && (pos_broken == -1 ? pos : pos_broken) == p); - if (todo) - todo_wine + todo_wine_if (todo) ok_(__FILE__, _line_)((l == line && pos == p) || broken_state, "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); - else - { - ok_(__FILE__, _line_)((l == line && pos == p) || broken_state, - "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); - } } #define ok_pos(reader, l, p, l_brk, p_brk, todo) ok_pos_(reader, l, p, l_brk, p_brk, todo, __LINE__) @@ -152,12 +146,8 @@ while (expected[i++]) size++; - if (todo) { - todo_wine - ok_(__FILE__, line)(iids->count == size, "Sequence size mismatch (%d), got (%d)\n", size, iids->count); - } - else - ok_(__FILE__, line)(iids->count == size, "Sequence size mismatch (%d), got (%d)\n", size, iids->count); + todo_wine_if (todo) + ok_(__FILE__, line)(iids->count == size, "Sequence size mismatch (%d), got (%d)\n", size, iids->count); if (iids->count != size) return; @@ -252,13 +242,7 @@ else broken_state = broken(exp_broken == state); - if (todo) - { - todo_wine - ok_(__FILE__, line)(state == expected || broken_state, "Expected (%s), got (%s)\n", - state_to_str(expected), state_to_str(state)); - } - else + todo_wine_if (todo) ok_(__FILE__, line)(state == expected || broken_state, "Expected (%s), got (%s)\n", state_to_str(expected), state_to_str(state)); } @@ -1520,14 +1504,7 @@ ok(hr == S_OK, "got 0x%08x\n", hr); str_exp = a2w(test->value); - if (test->todo) - { - todo_wine { - ok(len == strlen(test->value), "got %u\n", len); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - } - } - else + todo_wine_if (test->todo) { ok(len == strlen(test->value), "got %u\n", len); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); @@ -1620,14 +1597,7 @@ ok(hr == S_OK, "got 0x%08x\n", hr); str_exp = a2w(test->value); - if (test->todo) - { - todo_wine { - ok(len == strlen(test->value), "got %u\n", len); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - } - } - else + todo_wine_if (test->todo) { ok(len == strlen(test->value), "got %u\n", len); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str));

1 0

[akhaldi] 70953: [WMIUTILS_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Sat Mar 5 11:09:08 2016 New Revision: 70953 URL: http://svn.reactos.org/svn/reactos?rev=70953&view=rev Log: [WMIUTILS_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/wmiutils/path.c Modified: trunk/rostests/winetests/wmiutils/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wmiutils/path.c… ============================================================================== --- trunk/rostests/winetests/wmiutils/path.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wmiutils/path.c [iso-8859-1] Sat Mar 5 11:09:08 2016 @@ -140,8 +140,8 @@ for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) { hr = IWbemPath_SetText( path, test[i].mode, test[i].path ); - if (test[i].todo) todo_wine ok( hr == test[i].ret, "%u got %08x\n", i, hr ); - else ok( hr == test[i].ret, "%u got %08x\n", i, hr ); + todo_wine_if (test[i].todo) + ok( hr == test[i].ret, "%u got %08x\n", i, hr ); if (test[i].ret == S_OK) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs