Ros-diffs October 2013

ros-diffs@reactos.org

14 participants
325 discussions

[akhaldi] 60531: [ADVAPI32_WINETEST] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 5 10:38:32 2013 New Revision: 60531 URL: http://svn.reactos.org/svn/reactos?rev=60531&view=rev Log: [ADVAPI32_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/advapi32/CMakeLists.txt trunk/rostests/winetests/advapi32/crypt.c trunk/rostests/winetests/advapi32/eventlog.c trunk/rostests/winetests/advapi32/lsa.c trunk/rostests/winetests/advapi32/registry.c trunk/rostests/winetests/advapi32/security.c trunk/rostests/winetests/advapi32/service.c trunk/rostests/winetests/advapi32/testlist.c Modified: trunk/rostests/winetests/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/CMakeL… ============================================================================== --- trunk/rostests/winetests/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/CMakeLists.txt [iso-8859-1] Sat Oct 5 10:38:32 2013 @@ -1,7 +1,3 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) list(APPEND SOURCE cred.c @@ -18,9 +14,6 @@ testlist.c) add_executable(advapi32_winetest ${SOURCE}) - -target_link_libraries(advapi32_winetest uuid) - set_module_type(advapi32_winetest win32cui) -add_importlibs(advapi32_winetest advapi32 ole32 msvcrt kernel32 ntdll) +add_importlibs(advapi32_winetest advapi32 ole32 msvcrt kernel32) add_cd_file(TARGET advapi32_winetest DESTINATION reactos/bin FOR all) 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] Sat Oct 5 10:38:32 2013 @@ -146,6 +146,13 @@ pCryptReleaseContext(hProv, 0); pCryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } + + /* Remove container "wine_test_bad_keyset" */ + if (pCryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) + { + pCryptReleaseContext(hProv, 0); + pCryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + } } static void test_acquire_context(void) @@ -561,7 +568,16 @@ if (!(provider = LocalAlloc(LMEM_ZEROINIT, providerLen))) return; - providerLen = 0xdeadbeef; + providerLen = -1; + result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, provider, &providerLen); + ok(result, "expected TRUE, got %d\n", result); + ok(type==dwType, "expected %d, got %d\n", dwType, type); + if (pszProvName) + ok(!strcmp(pszProvName, provider), "expected %s, got %s\n", pszProvName, provider); + ok(cbName==providerLen, "expected %d, got %d\n", cbName, providerLen); + + providerLen = -1000; + provider[0] = 0; result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, provider, &providerLen); ok(result, "expected TRUE, got %d\n", result); ok(type==dwType, "expected %d, got %d\n", dwType, type); 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] Sat Oct 5 10:38:32 2013 @@ -637,7 +637,6 @@ /* First create our eventlog */ lret = RegOpenKeyA(HKEY_LOCAL_MACHINE, eventlogsvc, &key); - /* FIXME: Wine stops here */ if (lret != ERROR_SUCCESS) { skip("Could not open the EventLog service registry key\n"); @@ -832,11 +831,13 @@ SetLastError(0xdeadbeef); ret = GetNumberOfEventLogRecords(handle, &count); ok(ret, "Expected GetNumberOfEventLogRecords success : %d\n", GetLastError()); + todo_wine ok(count == (i + 1), "Expected %d records, got %d\n", i + 1, count); oldest = 0xdeadbeef; ret = GetOldestEventLogRecord(handle, &oldest); ok(ret, "Expected GetOldestEventLogRecord success : %d\n", GetLastError()); + todo_wine ok(oldest == 1 || (oldest > 1 && oldest != 0xdeadbeef), /* Vista SP1+, W2K8 and Win7 */ "Expected oldest to be 1 or higher, got %d\n", oldest); @@ -855,6 +856,7 @@ count = 0xdeadbeef; ret = GetNumberOfEventLogRecords(handle, &count); ok(ret, "Expected success\n"); + todo_wine ok(count == i, "Expected %d records, got %d\n", i, count); CloseEventLog(handle); @@ -1083,6 +1085,7 @@ lstrcatA(eventlogfile, ".evtx"); } + todo_wine ok(GetFileAttributesA(eventlogfile) != INVALID_FILE_ATTRIBUTES, "Expected an eventlog file\n"); @@ -1109,14 +1112,12 @@ RegDeleteValueA(key, "Sources"); RegCloseKey(key); lret = RegDeleteKeyA(HKEY_LOCAL_MACHINE, winesvc); - todo_wine ok(lret == ERROR_SUCCESS, "Could not delete the registry tree : %d\n", lret); /* A handle to the eventlog is locked by services.exe. We can only * delete the eventlog file after reboot. */ bret = MoveFileExA(eventlogfile, NULL, MOVEFILE_DELAY_UNTIL_REBOOT); - todo_wine ok(bret, "Expected MoveFileEx to succeed: %d\n", GetLastError()); } Modified: trunk/rostests/winetests/advapi32/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/lsa.c?… ============================================================================== --- trunk/rostests/winetests/advapi32/lsa.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/lsa.c [iso-8859-1] Sat Oct 5 10:38:32 2013 @@ -23,6 +23,8 @@ #include "ntstatus.h" #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -43,6 +45,7 @@ static NTSTATUS (WINAPI *pLsaQueryInformationPolicy)(LSA_HANDLE,POLICY_INFORMATION_CLASS,PVOID*); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID,LPSTR*); static NTSTATUS (WINAPI *pLsaLookupNames2)(LSA_HANDLE,ULONG,ULONG,PLSA_UNICODE_STRING,PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID2*); +static NTSTATUS (WINAPI *pLsaLookupSids)(LSA_HANDLE,ULONG,PSID*,LSA_REFERENCED_DOMAIN_LIST**,LSA_TRANSLATED_NAME**); static BOOL init(void) { @@ -55,6 +58,7 @@ pLsaQueryInformationPolicy = (void*)GetProcAddress(hadvapi32, "LsaQueryInformationPolicy"); pConvertSidToStringSidA = (void*)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); pLsaLookupNames2 = (void*)GetProcAddress(hadvapi32, "LsaLookupNames2"); + pLsaLookupSids = (void*)GetProcAddress(hadvapi32, "LsaLookupSids"); if (pLsaClose && pLsaEnumerateAccountRights && pLsaFreeMemory && pLsaOpenPolicy && pLsaQueryInformationPolicy && pConvertSidToStringSidA) return TRUE; @@ -253,7 +257,8 @@ return; } - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) || + (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)) { skip("Non-English locale (skipping LsaLookupNames2 tests)\n"); return; @@ -351,6 +356,57 @@ ok(status == STATUS_SUCCESS, "LsaClose() failed, returned 0x%08x\n", status); } +static void test_LsaLookupSids(void) +{ + LSA_REFERENCED_DOMAIN_LIST *list; + LSA_OBJECT_ATTRIBUTES attrs; + LSA_TRANSLATED_NAME *names; + LSA_HANDLE policy; + TOKEN_USER *user; + NTSTATUS status; + HANDLE token; + DWORD size; + BOOL ret; + + memset(&attrs, 0, sizeof(attrs)); + attrs.Length = sizeof(attrs); + + status = pLsaOpenPolicy(NULL, &attrs, POLICY_LOOKUP_NAMES, &policy); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + + ret = OpenProcessToken(GetCurrentProcess(), MAXIMUM_ALLOWED, &token); + ok(ret, "got %d\n", ret); + + ret = GetTokenInformation(token, TokenUser, NULL, 0, &size); + ok(!ret, "gotr %d\n", ret); + + user = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetTokenInformation(token, TokenUser, user, size, &size); + ok(ret, "got %d\n", ret); + + status = pLsaLookupSids(policy, 1, &user->User.Sid, &list, &names); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + + ok(list->Entries > 0, "got %d\n", list->Entries); + if (list->Entries) + { + ok((char*)list->Domains - (char*)list > 0, "%p, %p\n", list, list->Domains); + ok((char*)list->Domains[0].Sid - (char*)list->Domains > 0, "%p, %p\n", list->Domains, list->Domains[0].Sid); + ok(list->Domains[0].Name.MaximumLength > list->Domains[0].Name.Length, "got %d, %d\n", list->Domains[0].Name.MaximumLength, + list->Domains[0].Name.Length); + } + + pLsaFreeMemory(names); + pLsaFreeMemory(list); + + HeapFree(GetProcessHeap(), 0, user); + + CloseHandle(token); + + status = pLsaClose(policy); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); +} + START_TEST(lsa) { if (!init()) { @@ -360,4 +416,5 @@ test_lsa(); test_LsaLookupNames2(); -} + test_LsaLookupSids(); +} 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] Sat Oct 5 10:38:32 2013 @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN + #include <assert.h> #include <stdarg.h> #include <stdio.h> @@ -31,11 +34,14 @@ #include "winerror.h" #include "aclapi.h" +#define IS_HKCR(hk) ((UINT_PTR)hk > 0 && ((UINT_PTR)hk & 3) == 2) + static HKEY hkey_main; static DWORD GLE; static const char * sTestpath1 = "%LONGSYSTEMVAR%\\subdir1"; static const char * sTestpath2 = "%FOO%\\subdir1"; +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); @@ -143,6 +149,7 @@ char name[MAX_PATH]; DWORD ret; + if ((ret = RegOpenKeyExA( hkey, "", 0, KEY_ENUMERATE_SUB_KEYS, &hkey ))) return ret; while (!(ret = RegEnumKeyA(hkey, 0, name, sizeof(name)))) { HKEY tmp; @@ -155,6 +162,7 @@ } if (ret != ERROR_NO_MORE_ITEMS) return ret; RegDeleteKeyA( hkey, "" ); + RegCloseKey(hkey); return 0; } @@ -823,7 +831,8 @@ /* Query REG_EXPAND_SZ using RRF_RT_REG_EXPAND_SZ (not allowed without RRF_NOEXPAND) */ ret = pRegGetValueA(hkey_main, NULL, "TP1_EXP_SZ", RRF_RT_REG_EXPAND_SZ, NULL, NULL, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "ret=%d\n", ret); + /* before win8: ERROR_INVALID_PARAMETER, win8: ERROR_UNSUPPORTED_TYPE */ + ok(ret == ERROR_INVALID_PARAMETER || ret == ERROR_UNSUPPORTED_TYPE, "ret=%d\n", ret); /* Query REG_EXPAND_SZ using RRF_RT_ANY */ buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf); @@ -945,6 +954,39 @@ ok((ret == ERROR_SUCCESS && hkResult != NULL) || broken(ret == ERROR_ACCESS_DENIED /* NT4, win2k */), "RegOpenKeyEx with KEY_WOW64_64KEY failed (err=%u)\n", ret); RegCloseKey(hkResult); + + /* check special HKEYs on 64bit + * only the lower 4 bytes of the supplied key are used + */ + if (ptr_size == 64) + { + /* HKEY_CURRENT_USER */ + ret = RegOpenKeyA(UlongToHandle(HandleToUlong(HKEY_CURRENT_USER)), "Software", &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != NULL, "expected hkResult != NULL\n"); + RegCloseKey(hkResult); + + ret = RegOpenKeyA((HKEY)(HandleToUlong(HKEY_CURRENT_USER) | (ULONG64)1 << 32), "Software", &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != NULL, "expected hkResult != NULL\n"); + RegCloseKey(hkResult); + + ret = RegOpenKeyA((HKEY)(HandleToUlong(HKEY_CURRENT_USER) | (ULONG64)0xdeadbeef << 32), "Software", &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != NULL, "expected hkResult != NULL\n"); + RegCloseKey(hkResult); + + ret = RegOpenKeyA((HKEY)(HandleToUlong(HKEY_CURRENT_USER) | (ULONG64)0xffffffff << 32), "Software", &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != NULL, "expected hkResult != NULL\n"); + RegCloseKey(hkResult); + + /* HKEY_LOCAL_MACHINE */ + ret = RegOpenKeyA((HKEY)(HandleToUlong(HKEY_LOCAL_MACHINE) | (ULONG64)0xdeadbeef << 32), "Software", &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != NULL, "expected hkResult != NULL\n"); + RegCloseKey(hkResult); + } /* Try using WOW64 flags when opening a key with a DACL set to verify that * the registry access check is performed correctly. Redirection isn't @@ -1797,8 +1839,6 @@ pRtlFreeUnicodeString( &target_str ); } -static const DWORD ptr_size = 8 * sizeof(void*); - static DWORD get_key_value( HKEY root, const char *name, DWORD flags ) { HKEY key; @@ -2085,6 +2125,7 @@ skip("not enough privileges to add a user class\n"); return; } + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); /* try to open that key in hkcr */ res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, @@ -2092,6 +2133,7 @@ todo_wine ok(res == ERROR_SUCCESS || broken(res == ERROR_FILE_NOT_FOUND /* WinNT */), "test key not found in hkcr: %d\n", res); + todo_wine ok(IS_HKCR(hkcr), "hkcr mask not set in %p\n", hkcr); if (res) { skip("HKCR key merging not supported\n"); @@ -2123,16 +2165,16 @@ ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); /* try to find the value in user's classes */ - res = RegQueryValueExA(hkcr, "val0", NULL, &type, (LPBYTE)buffer, &size); + res = RegQueryValueExA(hkey, "val0", NULL, &type, (LPBYTE)buffer, &size); ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); /* modify the value in user's classes */ - res = RegSetValueExA(hkcr, "val0", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); + res = RegSetValueExA(hkey, "val0", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); /* check if the value is also modified in hkcr */ - res = RegQueryValueExA(hkey, "val0", NULL, &type, (LPBYTE)buffer, &size); + res = RegQueryValueExA(hkcr, "val0", NULL, &type, (LPBYTE)buffer, &size); ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); ok(!strcmp( buffer, "user" ), "value set to '%s'\n", buffer ); @@ -2155,12 +2197,14 @@ skip("not enough privileges to add a system class\n"); return; } + ok(!IS_HKCR(hklm), "hkcr mask set in %p\n", hklm); /* try to open that key in hkcr */ res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, KEY_QUERY_VALUE|KEY_SET_VALUE, &hkcr ); ok(res == ERROR_SUCCESS, "test key not found in hkcr: %d\n", res); + ok(IS_HKCR(hkcr), "hkcr mask not set in %p\n", hkcr); if (res) { delete_key( hklm ); @@ -2181,19 +2225,21 @@ res = RegSetValueExA(hkcr, "val2", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); - /* check that the value is not modified in hklm classes */ + /* check that the value is modified in hklm classes */ res = RegQueryValueExA(hklm, "val2", NULL, &type, (LPBYTE)buffer, &size); ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); - ok(!strcmp( buffer, "hklm" ), "value set to '%s'\n", buffer ); + ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); if (RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkey, NULL )) return; + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); /* try to open that key in hkcr */ res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, KEY_QUERY_VALUE|KEY_SET_VALUE, &hkcr ); ok(res == ERROR_SUCCESS, "test key not found in hkcr: %d\n", res); + ok(IS_HKCR(hkcr), "hkcr mask not set in %p\n", hkcr); /* set a value in user's classes */ res = RegSetValueExA(hkey, "val2", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); @@ -2231,9 +2277,11 @@ /* create a subkey in hklm */ if (RegCreateKeyExA( hklm, "subkey1", 0, NULL, 0, KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hklmsub1, NULL )) return; + ok(!IS_HKCR(hklmsub1), "hkcr mask set in %p\n", hklmsub1); /* try to open that subkey in hkcr */ res = RegOpenKeyExA( hkcr, "subkey1", 0, KEY_QUERY_VALUE|KEY_SET_VALUE, &hkcrsub1 ); ok(res == ERROR_SUCCESS, "test key not found in hkcr: %d\n", res); + ok(IS_HKCR(hkcrsub1), "hkcr mask not set in %p\n", hkcrsub1); /* set a value in hklm classes */ res = RegSetValueExA(hklmsub1, "subval1", 0, REG_SZ, (const BYTE *)"hklm", sizeof("hklm")); @@ -2256,6 +2304,7 @@ /* create a subkey in user's classes */ if (RegCreateKeyExA( hkey, "subkey1", 0, NULL, 0, KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkeysub1, NULL )) return; + ok(!IS_HKCR(hkeysub1), "hkcr mask set in %p\n", hkeysub1); /* set a value in user's classes */ res = RegSetValueExA(hkeysub1, "subval1", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); @@ -2293,6 +2342,7 @@ /* new subkey in hkcr */ if (RegCreateKeyExA( hkcr, "subkey2", 0, NULL, 0, KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkcrsub2, NULL )) return; + ok(IS_HKCR(hkcrsub2), "hkcr mask not set in %p\n", hkcrsub2); res = RegSetValueExA(hkcrsub2, "subval1", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); @@ -2302,11 +2352,36 @@ hklmsub2 = 0; res = RegOpenKeyExA( hklm, "subkey2", 0, KEY_QUERY_VALUE|KEY_SET_VALUE, &hklmsub2 ); ok(res == ERROR_SUCCESS, "test key not found in hklm: %d\n", res); + ok(!IS_HKCR(hklmsub2), "hkcr mask set in %p\n", hklmsub2); /* check that the value is present in hklm */ res = RegQueryValueExA(hklmsub2, "subval1", NULL, &type, (LPBYTE)buffer, &size); ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); + + /* cleanup */ + RegCloseKey( hkeysub1 ); + RegCloseKey( hklmsub1 ); + + /* delete subkey1 from hkcr (should point at user's classes) */ + res = RegDeleteKey(hkcr, "subkey1"); + ok(res == ERROR_SUCCESS, "RegDeleteKey failed: %d\n", res); + + /* confirm key was removed in hkey but not hklm */ + res = RegOpenKeyExA(hkey, "subkey1", 0, KEY_READ, &hkeysub1); + ok(res == ERROR_FILE_NOT_FOUND, "test key found in user's classes: %d\n", res); + res = RegOpenKeyExA(hklm, "subkey1", 0, KEY_READ, &hklmsub1); + ok(res == ERROR_SUCCESS, "test key not found in hklm: %d\n", res); + ok(!IS_HKCR(hklmsub1), "hkcr mask set in %p\n", hklmsub1); + + /* delete subkey1 from hkcr again (which should now point at hklm) */ + res = RegDeleteKey(hkcr, "subkey1"); + ok(res == ERROR_SUCCESS, "RegDeleteKey failed: %d\n", res); + + /* confirm hkey was removed in hklm */ + RegCloseKey( hklmsub1 ); + res = RegOpenKeyExA(hklm, "subkey1", 0, KEY_READ, &hklmsub1); + ok(res == ERROR_FILE_NOT_FOUND, "test key found in hklm: %d\n", res); /* final cleanup */ delete_key( hkey ); @@ -2327,6 +2402,214 @@ RegCloseKey( hkcrsub2 ); } +static void test_classesroot_enum(void) +{ + HKEY hkcu=0, hklm=0, hkcr=0, hkcusub[2]={0}, hklmsub[2]={0}; + DWORD size; + static CHAR buffer[2]; + LONG res; + + /* prepare initial testing env in HKCU */ + if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", &hkcu )) + { + delete_key( hkcu ); + RegCloseKey( hkcu ); + } + res = RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, + KEY_SET_VALUE|KEY_ENUMERATE_SUB_KEYS, NULL, &hkcu, NULL ); + + if (res != ERROR_SUCCESS) + { + skip("failed to add a user class\n"); + return; + } + + res = RegOpenKeyA( HKEY_CLASSES_ROOT, "WineTestCls", &hkcr ); + todo_wine ok(res == ERROR_SUCCESS || + broken(res == ERROR_FILE_NOT_FOUND /* WinNT */), + "test key not found in hkcr: %d\n", res); + if (res) + { + skip("HKCR key merging not supported\n"); + delete_key( hkcu ); + RegCloseKey( hkcu ); + return; + } + + res = RegSetValueExA( hkcu, "X", 0, REG_SZ, (const BYTE *) "AA", 3 ); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + res = RegSetValueExA( hkcu, "Y", 0, REG_SZ, (const BYTE *) "B", 2 ); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + res = RegCreateKeyA( hkcu, "A", &hkcusub[0] ); + ok(res == ERROR_SUCCESS, "RegCreateKeyA failed: %d\n", res); + res = RegCreateKeyA( hkcu, "B", &hkcusub[1] ); + ok(res == ERROR_SUCCESS, "RegCreateKeyA failed: %d\n", res); + + /* test on values in HKCU */ + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 0, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "X" ), "expected 'X', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 1, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "Y" ), "expected 'Y', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 2, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + + res = RegEnumKeyA( hkcr, 0, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "A" ), "expected 'A', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 1, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "B" ), "expected 'B', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 2, buffer, size ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + + /* prepare test env in HKLM */ + if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", &hklm )) + { + delete_key( hklm ); + RegCloseKey( hklm ); + } + + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", 0, NULL, 0, + KEY_SET_VALUE|KEY_ENUMERATE_SUB_KEYS, NULL, &hklm, NULL ); + + if (res == ERROR_ACCESS_DENIED) + { + RegCloseKey( hkcusub[0] ); + RegCloseKey( hkcusub[1] ); + delete_key( hkcu ); + RegCloseKey( hkcu ); + RegCloseKey( hkcr ); + skip("not enough privileges to add a system class\n"); + return; + } + + res = RegSetValueExA( hklm, "X", 0, REG_SZ, (const BYTE *) "AB", 3 ); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + res = RegSetValueExA( hklm, "Z", 0, REG_SZ, (const BYTE *) "C", 2 ); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + res = RegCreateKeyA( hklm, "A", &hklmsub[0] ); + ok(res == ERROR_SUCCESS, "RegCreateKeyA failed: %d\n", res); + res = RegCreateKeyA( hklm, "C", &hklmsub[1] ); + ok(res == ERROR_SUCCESS, "RegCreateKeyA failed: %d\n", res); + + /* test on values/keys in both HKCU and HKLM */ + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 0, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "X" ), "expected 'X', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 1, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "Y" ), "expected 'Y', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 2, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "Z" ), "expected 'Z', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 3, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + + res = RegEnumKeyA( hkcr, 0, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "A" ), "expected 'A', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 1, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "B" ), "expected 'B', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 2, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "C" ), "expected 'C', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 3, buffer, size ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + + /* delete values/keys from HKCU to test only on HKLM */ + RegCloseKey( hkcusub[0] ); + RegCloseKey( hkcusub[1] ); + delete_key( hkcu ); + RegCloseKey( hkcu ); + + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 0, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_KEY_DELETED || + res == ERROR_NO_SYSTEM_RESOURCES, /* Windows XP */ + "expected ERROR_KEY_DELETED, got %d\n", res); + size = sizeof(buffer); + res = RegEnumKeyA( hkcr, 0, buffer, size ); + ok(res == ERROR_KEY_DELETED || + res == ERROR_NO_SYSTEM_RESOURCES, /* Windows XP */ + "expected ERROR_KEY_DELETED, got %d\n", res); + + /* reopen HKCR handle */ + RegCloseKey( hkcr ); + res = RegOpenKeyA( HKEY_CLASSES_ROOT, "WineTestCls", &hkcr ); + ok(res == ERROR_SUCCESS, "test key not found in hkcr: %d\n", res); + if (res) goto cleanup; + + /* test on values/keys in HKLM */ + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 0, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "X" ), "expected 'X', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 1, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "Z" ), "expected 'Z', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 2, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + + res = RegEnumKeyA( hkcr, 0, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "A" ), "expected 'A', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 1, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "C" ), "expected 'C', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 2, buffer, size ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + +cleanup: + RegCloseKey( hklmsub[0] ); + RegCloseKey( hklmsub[1] ); + delete_key( hklm ); + RegCloseKey( hklm ); + RegCloseKey( hkcr ); +} + +static void test_classesroot_mask(void) +{ + HKEY hkey; + LSTATUS res; + + res = RegOpenKeyA( HKEY_CLASSES_ROOT, "CLSID", &hkey ); + ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res); + todo_wine ok(IS_HKCR(hkey), "hkcr mask not set in %p\n", hkey); + RegCloseKey( hkey ); + + res = RegOpenKeyA( HKEY_CURRENT_USER, "Software", &hkey ); + ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res); + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); + RegCloseKey( hkey ); + + res = RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software", &hkey ); + ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res); + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); + RegCloseKey( hkey ); + + res = RegOpenKeyA( HKEY_USERS, ".Default", &hkey ); + ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res); + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); + RegCloseKey( hkey ); + + res = RegOpenKeyA( HKEY_CURRENT_CONFIG, "Software", &hkey ); + ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res); + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); + RegCloseKey( hkey ); +} + static void test_deleted_key(void) { HKEY hkey, hkey2; @@ -2420,6 +2703,8 @@ test_symlinks(); test_redirection(); test_classesroot(); + test_classesroot_enum(); + test_classesroot_mask(); /* SaveKey/LoadKey require the SE_BACKUP_NAME privilege to be set */ if (set_privileges(SE_BACKUP_NAME, TRUE) && 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] Sat Oct 5 10:38:32 2013 @@ -24,6 +24,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -3007,10 +3008,15 @@ static void test_GetNamedSecurityInfoA(void) { - char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100], *user; + char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; + char system_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES]; + char users_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES]; + PSID admin_sid = (PSID) admin_ptr, users_sid = (PSID) users_ptr; + PSID system_sid = (PSID) system_ptr, user_sid; DWORD sid_size = sizeof(admin_ptr), user_size; char invalid_path[] = "/an invalid file path"; - PSID admin_sid = (PSID) admin_ptr, user_sid; + int users_ace_id = -1, admins_ace_id = -1, i; + char software_key[] = "MACHINE\\Software"; char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; SECURITY_DESCRIPTOR_CONTROL control; ACL_SIZE_INFORMATION acl_size; @@ -3022,9 +3028,12 @@ DWORD error, revision; BOOL owner_defaulted; BOOL group_defaulted; + BOOL dacl_defaulted; HANDLE token, hTemp; PSID owner, group; + BOOL dacl_present; PACL pDacl; + BYTE flags; if (!pSetNamedSecurityInfoA || !pGetNamedSecurityInfoA || !pCreateWellKnownSid) { @@ -3115,13 +3124,12 @@ /* Create security descriptor information and test that it comes back the same */ pSD = &sd; - pDacl = (PACL)&dacl; + pDacl = HeapAlloc(GetProcessHeap(), 0, 100); InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); pCreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &sid_size); - bret = InitializeAcl(pDacl, sizeof(dacl), ACL_REVISION); + bret = InitializeAcl(pDacl, 100, ACL_REVISION); ok(bret, "Failed to initialize ACL.\n"); bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); - HeapFree(GetProcessHeap(), 0, user); ok(bret, "Failed to add Current User to ACL.\n"); bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, admin_sid); ok(bret, "Failed to add Administrator Group to ACL.\n"); @@ -3133,9 +3141,11 @@ SetLastError(0xdeadbeef); error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL, NULL, pDacl, NULL); + HeapFree(GetProcessHeap(), 0, pDacl); if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("SetNamedSecurityInfoA is not implemented\n"); + HeapFree(GetProcessHeap(), 0, user); CloseHandle(hTemp); return; } @@ -3146,6 +3156,8 @@ if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("GetNamedSecurityInfoA is not implemented\n"); + HeapFree(GetProcessHeap(), 0, user); + CloseHandle(hTemp); return; } ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); @@ -3176,7 +3188,80 @@ "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); } LocalFree(pSD); + HeapFree(GetProcessHeap(), 0, user); CloseHandle(hTemp); + + /* Test querying the ownership of a built-in registry key */ + sid_size = sizeof(system_ptr); + pCreateWellKnownSid(WinLocalSystemSid, NULL, system_sid, &sid_size); + error = pGetNamedSecurityInfoA(software_key, SE_REGISTRY_KEY, + OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, &pSD); + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + + 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"); + + 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"); + LocalFree(pSD); + + /* Test querying the DACL of a built-in registry key */ + sid_size = sizeof(users_ptr); + pCreateWellKnownSid(WinBuiltinUsersSid, NULL, users_sid, &sid_size); + error = pGetNamedSecurityInfoA(software_key, SE_REGISTRY_KEY, DACL_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, &pSD); + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + + bret = GetSecurityDescriptorDacl(pSD, &dacl_present, &pDacl, &dacl_defaulted); + ok(bret, "GetSecurityDescriptorDacl failed with error %d\n", GetLastError()); + ok(dacl_present, "DACL should be present\n"); + ok(pDacl && IsValidAcl(pDacl), "GetSecurityDescriptorDacl returned invalid DACL.\n"); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + ok(acl_size.AceCount != 0, "GetAclInformation returned no ACLs\n"); + for (i=0; i<acl_size.AceCount; i++) + { + bret = pGetAce(pDacl, i, (VOID **)&ace); + ok(bret, "Failed to get ACE %d.\n", i); + bret = EqualSid(&ace->SidStart, users_sid); + if (bret) users_ace_id = i; + bret = EqualSid(&ace->SidStart, admin_sid); + if (bret) admins_ace_id = i; + } + ok(users_ace_id != -1 || broken(users_ace_id == -1) /* win2k */, + "Bultin Users ACE not found.\n"); + if (users_ace_id != -1) + { + bret = pGetAce(pDacl, users_ace_id, (VOID **)&ace); + ok(bret, "Failed to get Builtin Users ACE.\n"); + flags = ((ACE_HEADER *)ace)->AceFlags; + ok(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE) + || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE|INHERITED_ACE)) /* w2k8 */, + "Builtin Users ACE has unexpected flags (0x%x != 0x%x)\n", flags, + INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE); + ok(ace->Mask == GENERIC_READ, "Builtin Users ACE has unexpected mask (0x%x != 0x%x)\n", + ace->Mask, GENERIC_READ); + } + ok(admins_ace_id != -1, "Bultin Admins ACE not found.\n"); + if (admins_ace_id != -1) + { + bret = pGetAce(pDacl, admins_ace_id, (VOID **)&ace); + ok(bret, "Failed to get Builtin Admins ACE.\n"); + flags = ((ACE_HEADER *)ace)->AceFlags; + ok(flags == 0x0 + || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE|INHERITED_ACE)) /* w2k8 */, + "Builtin Admins ACE has unexpected flags (0x%x != 0x0)\n", flags); + ok(ace->Mask == KEY_ALL_ACCESS || broken(ace->Mask == GENERIC_ALL) /* w2k8 */, + "Builtin Admins ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, KEY_ALL_ACCESS); + } + LocalFree(pSD); } static void test_ConvertStringSecurityDescriptor(void) @@ -4077,6 +4162,8 @@ HANDLE process_token, token, r_token; PTOKEN_GROUPS token_groups, groups2; SID_AND_ATTRIBUTES sattr; + SECURITY_IMPERSONATION_LEVEL level; + TOKEN_TYPE type; BOOL is_member; DWORD size; BOOL ret; @@ -4127,7 +4214,7 @@ sattr.Attributes = 0; r_token = NULL; ret = pCreateRestrictedToken(token, 0, 1, &sattr, 0, NULL, 0, NULL, &r_token); - todo_wine ok(ret, "got error %d\n", GetLastError()); + ok(ret, "got error %d\n", GetLastError()); if (ret) { @@ -4135,7 +4222,7 @@ is_member = TRUE; ret = pCheckTokenMembership(r_token, token_groups->Groups[i].Sid, &is_member); ok(ret, "got error %d\n", GetLastError()); - ok(!is_member, "not a member\n"); + todo_wine ok(!is_member, "not a member\n"); ret = GetTokenInformation(r_token, TokenGroups, NULL, 0, &size); ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d with error %d\n", @@ -4150,12 +4237,22 @@ break; } - ok(groups2->Groups[j].Attributes & SE_GROUP_USE_FOR_DENY_ONLY, + todo_wine ok(groups2->Groups[j].Attributes & SE_GROUP_USE_FOR_DENY_ONLY, "got wrong attributes\n"); - ok((groups2->Groups[j].Attributes & SE_GROUP_ENABLED) == 0, + todo_wine ok((groups2->Groups[j].Attributes & SE_GROUP_ENABLED) == 0, "got wrong attributes\n"); HeapFree(GetProcessHeap(), 0, groups2); + + size = sizeof(type); + ret = GetTokenInformation(r_token, TokenType, &type, size, &size); + ok(ret, "got error %d\n", GetLastError()); + ok(type == TokenImpersonation, "got type %u\n", type); + + size = sizeof(level); + ret = GetTokenInformation(r_token, TokenImpersonationLevel, &level, size, &size); + ok(ret, "got error %d\n", GetLastError()); + ok(level == SecurityImpersonation, "got level %u\n", type); } HeapFree(GetProcessHeap(), 0, token_groups); @@ -4495,6 +4592,64 @@ LocalFree(sidname); CloseHandle(token); +} + +static void test_default_dacl_owner_sid(void) +{ + HANDLE handle; + BOOL ret, defaulted, present, found; + DWORD size, index; + SECURITY_DESCRIPTOR *sd; + SECURITY_ATTRIBUTES sa; + PSID owner; + ACL *dacl; + ACCESS_ALLOWED_ACE *ace; + + sd = HeapAlloc( GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH ); + ret = InitializeSecurityDescriptor( sd, SECURITY_DESCRIPTOR_REVISION ); + ok( ret, "error %u\n", GetLastError() ); + + sa.nLength = sizeof(SECURITY_ATTRIBUTES); + sa.lpSecurityDescriptor = sd; + sa.bInheritHandle = FALSE; + handle = CreateEvent( &sa, TRUE, TRUE, "test_event" ); + ok( handle != NULL, "error %u\n", GetLastError() ); + + size = 0; + ret = GetKernelObjectSecurity( handle, OWNER_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, NULL, 0, &size ); + ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "error %u\n", GetLastError() ); + + sd = HeapAlloc( GetProcessHeap(), 0, size ); + ret = GetKernelObjectSecurity( handle, OWNER_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, sd, size, &size ); + ok( ret, "error %u\n", GetLastError() ); + + owner = (void *)0xdeadbeef; + defaulted = TRUE; + ret = GetSecurityDescriptorOwner( sd, &owner, &defaulted ); + ok( ret, "error %u\n", GetLastError() ); + ok( owner != (void *)0xdeadbeef, "owner not set\n" ); + todo_wine ok( !defaulted, "owner defaulted\n" ); + + dacl = (void *)0xdeadbeef; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorDacl( sd, &present, &dacl, &defaulted ); + ok( ret, "error %u\n", GetLastError() ); + ok( present, "dacl not present\n" ); + ok( dacl != (void *)0xdeadbeef, "dacl not set\n" ); + todo_wine ok( !defaulted, "dacl defaulted\n" ); + + index = 0; + found = FALSE; + while (pGetAce( dacl, index++, (void **)&ace )) + { + if (EqualSid( &ace->SidStart, owner )) found = TRUE; + } + ok( found, "owner sid not found in dacl\n" ); + + HeapFree( GetProcessHeap(), 0, sa.lpSecurityDescriptor ); + HeapFree( GetProcessHeap(), 0, sd ); + CloseHandle( handle ); } START_TEST(security) @@ -4535,4 +4690,5 @@ test_GetUserNameW(); test_CreateRestrictedToken(); test_TokenIntegrityLevel(); -} + test_default_dacl_owner_sid(); +} Modified: trunk/rostests/winetests/advapi32/service.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/servic… ============================================================================== --- trunk/rostests/winetests/advapi32/service.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/service.c [iso-8859-1] Sat Oct 5 10:38:32 2013 @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN + #include <stdarg.h> #include <stdio.h> @@ -48,6 +51,8 @@ static BOOL (WINAPI *pQueryServiceConfig2W)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); static BOOL (WINAPI *pQueryServiceStatusEx)(SC_HANDLE, SC_STATUS_TYPE, LPBYTE, DWORD, LPDWORD); +static BOOL (WINAPI *pQueryServiceObjectSecurity)(SC_HANDLE, SECURITY_INFORMATION, + PSECURITY_DESCRIPTOR, DWORD, LPDWORD); static void init_function_pointers(void) { @@ -60,6 +65,7 @@ pQueryServiceConfig2A= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2A"); pQueryServiceConfig2W= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2W"); pQueryServiceStatusEx= (void*)GetProcAddress(hadvapi32, "QueryServiceStatusEx"); + pQueryServiceObjectSecurity = (void*)GetProcAddress(hadvapi32, "QueryServiceObjectSecurity"); } static void test_open_scm(void) @@ -1756,7 +1762,7 @@ static void test_sequence(void) { SC_HANDLE scm_handle, svc_handle; - BOOL ret; + BOOL ret, is_nt4; QUERY_SERVICE_CONFIGA *config; DWORD given, needed; static const CHAR servicename [] = "Winetest"; @@ -1780,6 +1786,9 @@ ok(scm_handle != NULL, "Could not get a handle to the manager: %d\n", GetLastError()); if (!scm_handle) return; + svc_handle = OpenServiceA(scm_handle, NULL, GENERIC_READ); + is_nt4=(svc_handle == NULL && GetLastError() == ERROR_INVALID_PARAMETER); + CloseServiceHandle(svc_handle); /* Create a dummy service */ SetLastError(0xdeadbeef); @@ -1817,12 +1826,54 @@ PSID sidOwner, sidGroup; PACL dacl, sacl; PSECURITY_DESCRIPTOR pSD; - HRESULT retval = pGetSecurityInfo(svc_handle,SE_SERVICE,DACL_SECURITY_INFORMATION,&sidOwner,&sidGroup,&dacl,&sacl,&pSD); - todo_wine ok(ERROR_SUCCESS == retval, "Expected GetSecurityInfo to succeed: result %d\n",retval); + DWORD error, n1, n2; + HRESULT retval; + BOOL bret; + + /* Test using GetSecurityInfo to obtain security information */ + retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, &sidOwner, + &sidGroup, &dacl, &sacl, &pSD); + LocalFree(pSD); + ok(retval == ERROR_SUCCESS, "Expected GetSecurityInfo to succeed: result %d\n", retval); + retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, NULL, + NULL, NULL, NULL, &pSD); + LocalFree(pSD); + ok(retval == ERROR_SUCCESS, "Expected GetSecurityInfo to succeed: result %d\n", retval); + if (!is_nt4) + { + retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, NULL, + NULL, &dacl, NULL, NULL); + ok(retval == ERROR_SUCCESS, "Expected GetSecurityInfo to succeed: result %d\n", retval); + SetLastError(0xdeadbeef); + retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, NULL, + NULL, NULL, NULL, NULL); + error = GetLastError(); + ok(retval == ERROR_INVALID_PARAMETER, "Expected GetSecurityInfo to fail: result %d\n", retval); + ok(error == 0xdeadbeef, "Unexpected last error %d\n", error); + } + else + win_skip("A NULL security descriptor in GetSecurityInfo results in an exception on NT4.\n"); + + /* Test using QueryServiceObjectSecurity to obtain security information */ + SetLastError(0xdeadbeef); + bret = pQueryServiceObjectSecurity(svc_handle, DACL_SECURITY_INFORMATION, NULL, 0, &n1); + error = GetLastError(); + ok(!bret, "Expected QueryServiceObjectSecurity to fail: result %d\n", bret); + ok(error == ERROR_INSUFFICIENT_BUFFER || + broken(error == ERROR_INVALID_ADDRESS) || broken(error == ERROR_INVALID_PARAMETER), + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", error); + if (error != ERROR_INSUFFICIENT_BUFFER) n1 = 1024; + pSD = LocalAlloc(0, n1); + bret = pQueryServiceObjectSecurity(svc_handle, DACL_SECURITY_INFORMATION, pSD, n1, &n2); + ok(bret, "Expected QueryServiceObjectSecurity to succeed: result %d\n", bret); + LocalFree(pSD); } } - if (!svc_handle) return; + if (!svc_handle) { + CloseServiceHandle(scm_handle); + return; + } /* TODO: * Before we do a QueryServiceConfig we should check the registry. This will make sure Modified: trunk/rostests/winetests/advapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/testli… ============================================================================== --- trunk/rostests/winetests/advapi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/testlist.c [iso-8859-1] Sat Oct 5 10:38:32 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_cred(void); extern void func_crypt(void);

11 years, 2 months

[akhaldi] 60530: [USER32_WINETEST] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 5 10:20:53 2013 New Revision: 60530 URL: http://svn.reactos.org/svn/reactos?rev=60530&view=rev Log: [USER32_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/user32/CMakeLists.txt trunk/rostests/winetests/user32/class.c trunk/rostests/winetests/user32/clipboard.c trunk/rostests/winetests/user32/dce.c trunk/rostests/winetests/user32/dde.c trunk/rostests/winetests/user32/menu.c trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/testlist.c trunk/rostests/winetests/user32/win.c Modified: trunk/rostests/winetests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/CMakeLis… ============================================================================== --- trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] Sat Oct 5 10:20:53 2013 @@ -1,6 +1,3 @@ - -add_definitions( - -D__ROS_LONG64__) list(APPEND SOURCE broadcast.c @@ -29,13 +26,9 @@ wsprintf.c testlist.c) -add_executable(user32_winetest - ${SOURCE} - resource.rc) - -target_link_libraries(user32_winetest wine) +add_executable(user32_winetest ${SOURCE} resource.rc) set_module_type(user32_winetest win32cui) -add_importlibs(user32_winetest user32 gdi32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(user32_winetest user32 gdi32 advapi32 msvcrt kernel32) add_cd_file(TARGET user32_winetest DESTINATION reactos/bin FOR all) if(NOT MSVC) Modified: trunk/rostests/winetests/user32/class.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/class.c?… ============================================================================== --- trunk/rostests/winetests/user32/class.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/class.c [iso-8859-1] Sat Oct 5 10:20:53 2013 @@ -977,6 +977,58 @@ ok(wcx.lpfnWndProc != NULL, "got null proc\n"); } +static void test_icons(void) +{ + WNDCLASSEXW wcex, ret_wcex; + WCHAR cls_name[] = {'I','c','o','n','T','e','s','t','C','l','a','s','s',0}; + HWND hwnd; + HINSTANCE hinst = GetModuleHandleW(0); + HICON hsmicon, hsmallnew; + ICONINFO icinf; + + memset(&wcex, 0, sizeof wcex); + wcex.cbSize = sizeof wcex; + wcex.lpfnWndProc = ClassTest_WndProc; + wcex.hIcon = LoadIconW(0, (LPCWSTR)IDI_APPLICATION); + wcex.hInstance = hinst; + wcex.lpszClassName = cls_name; + ok(RegisterClassExW(&wcex), "RegisterClassExW returned 0\n"); + hwnd = CreateWindowExW(0, cls_name, NULL, WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, NULL, NULL, hinst, 0); + ok(hwnd != NULL, "Window was not created\n"); + + ok(GetClassInfoExW(hinst, cls_name, &ret_wcex), "Class info was not retrieved\n"); + ok(wcex.hIcon == ret_wcex.hIcon, "Icons don't match\n"); + ok(ret_wcex.hIconSm != NULL, "hIconSm should be non-zero handle\n"); + + hsmicon = (HICON)GetClassLongPtrW(hwnd, GCLP_HICONSM); + ok(hsmicon != NULL, "GetClassLong should return non-zero handle\n"); + + hsmallnew = CopyImage(wcex.hIcon, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), 0); + ok(!SetClassLongPtrW(hwnd, GCLP_HICONSM, (LONG_PTR)hsmallnew), + "Previous hIconSm should be zero\n"); + ok(hsmallnew == (HICON)GetClassLongPtrW(hwnd, GCLP_HICONSM), + "Should return explicitly assigned small icon\n"); + ok(!GetIconInfo(hsmicon, &icinf), "Previous small icon should be destroyed\n"); + + SetClassLongPtrW(hwnd, GCLP_HICONSM, 0); + hsmicon = (HICON)GetClassLongPtrW(hwnd, GCLP_HICONSM); + ok( hsmicon != NULL, "GetClassLong should return non-zero handle\n"); + + SetClassLongPtrW(hwnd, GCLP_HICON, 0); + ok(!GetClassLongPtrW(hwnd, GCLP_HICONSM), "GetClassLong should return zero handle\n"); + + SetClassLongPtrW(hwnd, GCLP_HICON, (LONG_PTR)LoadIconW(NULL, (LPCWSTR)IDI_QUESTION)); + hsmicon = (HICON)GetClassLongPtrW(hwnd, GCLP_HICONSM); + ok(hsmicon != NULL, "GetClassLong should return non-zero handle\n"); + UnregisterClassW(cls_name, hinst); + ok(GetIconInfo(hsmicon, &icinf), "Icon should NOT be destroyed\n"); + + DestroyIcon(hsmallnew); + DestroyWindow(hwnd); +} + START_TEST(class) { HANDLE hInstance = GetModuleHandleA( NULL ); @@ -995,6 +1047,7 @@ CreateDialogParamTest(hInstance); test_styles(); test_builtinproc(); + test_icons(); /* this test unregisters the Button class so it should be executed at the end */ test_instances(); Modified: trunk/rostests/winetests/user32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/clipboar… ============================================================================== --- trunk/rostests/winetests/user32/clipboard.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/clipboard.c [iso-8859-1] Sat Oct 5 10:20:53 2013 @@ -269,6 +269,83 @@ ok(r, "gle %d\n", GetLastError()); } +static CRITICAL_SECTION clipboard_cs; +static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + switch(msg) { + case WM_DRAWCLIPBOARD: + EnterCriticalSection(&clipboard_cs); + LeaveCriticalSection(&clipboard_cs); + break; + case WM_USER: + PostQuitMessage(0); + break; + } + + return DefWindowProc(hwnd, msg, wp, lp); +} + +static DWORD WINAPI clipboard_thread(void *param) +{ + HWND win = param; + BOOL r; + + EnterCriticalSection(&clipboard_cs); + SetLastError(0xdeadbeef); + SetClipboardViewer(win); + ok(GetLastError() == 0xdeadbeef, "GetLastError = %d\n", GetLastError()); + LeaveCriticalSection(&clipboard_cs); + + r = OpenClipboard(win); + ok(r, "OpenClipboard failed: %d\n", GetLastError()); + + r = EmptyClipboard(); + ok(r, "EmptyClipboard failed: %d\n", GetLastError()); + + EnterCriticalSection(&clipboard_cs); + r = CloseClipboard(); + ok(r, "CloseClipboard failed: %d\n", GetLastError()); + LeaveCriticalSection(&clipboard_cs); + + r = PostMessage(win, WM_USER, 0, 0); + ok(r, "PostMessage failed: %d\n", GetLastError()); + return 0; +} + +static void test_messages(void) +{ + WNDCLASS cls; + HWND win; + MSG msg; + HANDLE thread; + DWORD tid; + + InitializeCriticalSection(&clipboard_cs); + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = clipboard_wnd_proc; + cls.hInstance = GetModuleHandle(0); + cls.lpszClassName = "clipboard_test"; + RegisterClass(&cls); + + win = CreateWindow("clipboard_test", NULL, 0, 0, 0, 0, 0, NULL, 0, NULL, 0); + ok(win != NULL, "CreateWindow failed: %d\n", GetLastError()); + + thread = CreateThread(NULL, 0, clipboard_thread, (void*)win, 0, &tid); + ok(thread != NULL, "CreateThread failed: %d\n", GetLastError()); + + while(GetMessage(&msg, NULL, 0, 0)) { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + ok(WaitForSingleObject(thread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + UnregisterClass("clipboard_test", GetModuleHandle(0)); + DeleteCriticalSection(&clipboard_cs); +} + START_TEST(clipboard) { SetLastError(0xdeadbeef); @@ -278,4 +355,5 @@ test_RegisterClipboardFormatA(); test_ClipboardOwner(); test_synthesized(); -} + test_messages(); +} Modified: trunk/rostests/winetests/user32/dce.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dce.c?re… ============================================================================== --- trunk/rostests/winetests/user32/dce.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/dce.c [iso-8859-1] Sat Oct 5 10:20:53 2013 @@ -78,7 +78,7 @@ old_hdc = hdcs[0]; SetROP2( old_hdc, R2_WHITE ); } - while (i >= 0) ReleaseDC( hwnd_cache, hdcs[--i] ); + while (i > 0) ReleaseDC( hwnd_cache, hdcs[--i] ); for (i = 0; i < 20; i++) { @@ -91,7 +91,7 @@ else ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); } - while (i >= 0) ReleaseDC( hwnd_cache, hdcs[--i] ); + while (i > 0) ReleaseDC( hwnd_cache, hdcs[--i] ); for (i = 0; i < 20; i++) { @@ -107,7 +107,7 @@ else ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); } - while (i >= 0) ReleaseDC( hwnd_cache, hdcs[--i] ); + while (i > 0) ReleaseDC( hwnd_cache, hdcs[--i] ); /* test own DC */ Modified: trunk/rostests/winetests/user32/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dde.c?re… ============================================================================== --- trunk/rostests/winetests/user32/dde.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/dde.c [iso-8859-1] Sat Oct 5 10:20:53 2013 @@ -143,7 +143,7 @@ else lstrcpyA(str, "requested data\r\n"); - size = sizeof(DDEDATA) + lstrlenA(str) + 1; + size = FIELD_OFFSET(DDEDATA, Value[lstrlenA(str) + 1]); hglobal = GlobalAlloc(GMEM_MOVEABLE, size); ok(hglobal != NULL, "Expected non-NULL hglobal\n"); @@ -314,8 +314,7 @@ { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ - "Expected 19, got %d\n", size); + ok(size == 17, "Expected 17, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -336,8 +335,7 @@ { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ - "Expected 19, got %d\n", size); + ok(size == 17, "Expected 17, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -357,8 +355,7 @@ { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ - "Expected 19, got %d\n", size); + ok(size == 17, "Expected 17, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -483,8 +480,7 @@ { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "command executed\r\n"), "Expected 'command executed\\r\\n', got %s\n", str); - ok(size == 21 || broken(size == 28), /* sizes are rounded up on win9x */ - "Expected 21, got %d\n", size); + ok(size == 19, "Expected 19, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Sat Oct 5 10:20:53 2013 @@ -3266,7 +3266,8 @@ { DWORD ret; HWND hwnd, hwndchild; - HMENU menu; + HMENU menu, menubar; + MSG msg; if( !pEndMenu) { /* win95 */ win_skip( "EndMenu is not available\n"); return; @@ -3287,7 +3288,8 @@ ret = AppendMenuA( menu, MF_STRING, 1, "winetest"); ok( ret, "Functie failed lasterror is %u\n", GetLastError()); /* seems to be needed only on wine :( */ - {MSG msg; while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg);} + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessage(&msg); /* test the effect of sending a WM_CANCELMODE message in the WM_INITMENULOOP * handler of the menu owner */ /* test results is extracted from variable g_got_enteridle. Possible values: @@ -3314,7 +3316,27 @@ g_hwndtosend = hwnd; TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwndchild, NULL); ok( g_got_enteridle == 2, "received %d WM_ENTERIDLE messages, should be 2\n", g_got_enteridle); + + /* test canceling tracking in a window's menu bar */ + menubar = CreateMenu(); + ok( menubar != NULL, "CreateMenu failed with error %d\n", GetLastError()); + ret = AppendMenuA( menubar, MF_POPUP|MF_STRING, (UINT_PTR)menu, "winetest"); + ok( ret, "AppendMenuA failed lasterror is %u\n", GetLastError()); + ret = SetMenu( hwnd, menubar ); + ok( ret, "SetMenu failed lasterror is %u\n", GetLastError()); + /* initiate tracking */ + g_hwndtosend = hwnd; + ret = SendMessage( hwnd, WM_SYSCOMMAND, SC_KEYMENU, 0 ); + ok( ret == 0, "Sending WM_SYSCOMMAND/SC_KEYMENU failed lasterror is %u\n", GetLastError()); + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessage(&msg); + todo_wine { + ok(g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle); + } + ok(g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less than 2\n", g_got_enteridle); + /* cleanup */ + DestroyMenu( menubar ); DestroyMenu( menu); DestroyWindow( hwndchild); DestroyWindow( hwnd); Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Sat Oct 5 10:20:53 2013 @@ -1722,6 +1722,8 @@ static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static BOOL (WINAPI *pUpdateLayeredWindow)(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD); +static UINT_PTR (WINAPI *pSetSystemTimer)(HWND, UINT_PTR, UINT, TIMERPROC); +static UINT_PTR (WINAPI *pKillSystemTimer)(HWND, UINT_PTR); /* kernel32 functions */ static BOOL (WINAPI *pGetCPInfoExA)(UINT, DWORD, LPCPINFOEXA); @@ -1746,6 +1748,8 @@ GET_PROC(user32, GetMonitorInfoA) GET_PROC(user32, MonitorFromPoint) GET_PROC(user32, UpdateLayeredWindow) + GET_PROC(user32, SetSystemTimer) + GET_PROC(user32, KillSystemTimer) GET_PROC(kernel32, GetCPInfoExA) @@ -8156,7 +8160,15 @@ { } -#define TIMER_ID 0x19 +#define TIMER_ID 0x19 +#define TIMER_COUNT_EXPECTED 64 +#define TIMER_COUNT_TOLERANCE 9 + +static int count = 0; +static void CALLBACK callback_count(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +{ + count++; +} static DWORD WINAPI timer_thread_proc(LPVOID x) { @@ -8176,7 +8188,9 @@ static void test_timers(void) { struct timer_info info; + DWORD start; DWORD id; + MSG msg; info.hWnd = CreateWindow ("TestWindowClass", NULL, WS_OVERLAPPEDWINDOW , @@ -8198,23 +8212,53 @@ ok( KillTimer(info.hWnd, TIMER_ID), "KillTimer failed\n"); + /* Check the minimum allowed timeout for a timer. MSDN indicates that it should be 10.0 ms, + * but testing indicates that the minimum timeout is actually about 15.6 ms. Since there is + * some measurement error between test runs we're allowing for Â±8 counts (~2 ms). + */ + count = 0; + id = SetTimer(info.hWnd, TIMER_ID, 0, callback_count); + ok(id != 0, "did not get id from SetTimer.\n"); + ok(id==TIMER_ID, "SetTimer timer ID different\n"); + start = GetTickCount(); + while (GetTickCount()-start < 1001 && GetMessage(&msg, info.hWnd, 0, 0)) + DispatchMessage(&msg); + ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE + || broken(abs(count-43) < TIMER_COUNT_TOLERANCE) /* w2k3 */, + "did not get expected count for minimum timeout (%d != ~%d).\n", + count, TIMER_COUNT_EXPECTED); + ok(KillTimer(info.hWnd, id), "KillTimer failed\n"); + /* Perform the same check on SetSystemTimer (only available on w2k3 and older) */ + if (pSetSystemTimer) + { + int syscount = 0; + + count = 0; + id = pSetSystemTimer(info.hWnd, TIMER_ID, 0, callback_count); + ok(id != 0, "did not get id from SetSystemTimer.\n"); + ok(id==TIMER_ID, "SetTimer timer ID different\n"); + start = GetTickCount(); + while (GetTickCount()-start < 1001 && GetMessage(&msg, info.hWnd, 0, 0)) + { + if (msg.message == WM_SYSTIMER) + syscount++; + DispatchMessage(&msg); + } + ok(abs(syscount-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE, + "did not get expected count for minimum timeout (%d != ~%d).\n", + syscount, TIMER_COUNT_EXPECTED); + todo_wine ok(count == 0, "did not get expected count for callback timeout (%d != 0).\n", + count); + ok(pKillSystemTimer(info.hWnd, id), "KillSystemTimer failed\n"); + } + ok(DestroyWindow(info.hWnd), "failed to destroy window\n"); } -static int count = 0; -static VOID CALLBACK callback_count( - HWND hwnd, - UINT uMsg, - UINT_PTR idEvent, - DWORD dwTime -) -{ - count++; -} - static void test_timers_no_wnd(void) { UINT_PTR id, id2; + DWORD start; MSG msg; count = 0; @@ -8232,6 +8276,22 @@ Sleep(250); while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok(count == 1, "killing replaced timer did not work (%i).\n", count); + + /* Check the minimum allowed timeout for a timer. MSDN indicates that it should be 10.0 ms, + * but testing indicates that the minimum timeout is actually about 15.6 ms. Since there is + * some measurement error between test runs we're allowing for Â±8 counts (~2 ms). + */ + count = 0; + id = SetTimer(NULL, 0, 0, callback_count); + ok(id != 0, "did not get id from SetTimer.\n"); + start = GetTickCount(); + while (GetTickCount()-start < 1001 && GetMessage(&msg, NULL, 0, 0)) + DispatchMessage(&msg); + ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE, + "did not get expected count for minimum timeout (%d != ~%d).\n", + count, TIMER_COUNT_EXPECTED); + KillTimer(NULL, id); + /* Note: SetSystemTimer doesn't support a NULL window, see test_timers */ } /* Various win events with arbitrary parameters */ @@ -9089,6 +9149,26 @@ DeleteObject( hrgn ); GetClientRect( hwnd, &rect ); ValidateRect( hwnd, &rect ); /* this will stop WM_PAINTs */ + ok( !count, "Got multiple WM_PAINTs\n" ); + if (++count > 10) break; + } + } + + flush_sequence(); + RedrawWindow( hwnd, &rect, 0, RDW_INVALIDATE|RDW_ERASE|RDW_FRAME ); + count = 0; + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + { + if (msg.message != WM_PAINT) DispatchMessage( &msg ); + else + { + HDC hdc; + + flush_sequence(); + hdc = BeginPaint( hwnd, NULL ); + ok( !hdc, "got valid hdc %p from BeginPaint\n", hdc ); + ok( !EndPaint( hwnd, NULL ), "EndPaint succeeded\n" ); + ok_sequence( WmDispatchPaint, "WmDispatchPaint", FALSE ); ok( !count, "Got multiple WM_PAINTs\n" ); if (++count > 10) break; } @@ -11818,6 +11898,93 @@ DestroyWindow(hwnd); DestroyWindow(hwnd2); +} + +static void test_unicode_wm_char(void) +{ + HWND hwnd; + MSG msg; + struct message seq[2]; + HKL hkl_orig, hkl_greek; + DWORD cp; + LCID thread_locale; + + hkl_orig = GetKeyboardLayout( 0 ); + GetLocaleInfoW( LOWORD( hkl_orig ), LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, (WCHAR*)&cp, sizeof(cp) / sizeof(WCHAR) ); + if (cp != 1252) + { + skip( "Default codepage %d\n", cp ); + return; + } + + hkl_greek = LoadKeyboardLayout( "00000408", 0 ); + if (!hkl_greek || hkl_greek == hkl_orig /* win2k */) + { + skip( "Unable to load Greek keyboard layout\n" ); + return; + } + + hwnd = CreateWindowExW( 0, testWindowClassW, NULL, WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL ); + flush_sequence(); + + PostMessageW( hwnd, WM_CHAR, 0x3b1, 0 ); + + ok( GetMessageW( &msg, hwnd, 0, 0 ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == 0x3b1, "bad wparam %lx\n", msg.wParam ); + ok( msg.lParam == 0, "bad lparam %lx\n", msg.lParam ); + + DispatchMessageW( &msg ); + + memset( seq, 0, sizeof(seq) ); + seq[0].message = WM_CHAR; + seq[0].flags = sent|wparam; + seq[0].wParam = 0x3b1; + + ok_sequence( seq, "unicode WM_CHAR", FALSE ); + + flush_sequence(); + + /* greek alpha -> 'a' in cp1252 */ + PostMessageW( hwnd, WM_CHAR, 0x3b1, 0 ); + + ok( GetMessageA( &msg, hwnd, 0, 0 ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == 0x61, "bad wparam %lx\n", msg.wParam ); + ok( msg.lParam == 0, "bad lparam %lx\n", msg.lParam ); + + DispatchMessageA( &msg ); + + seq[0].wParam = 0x61; + ok_sequence( seq, "unicode WM_CHAR", FALSE ); + + thread_locale = GetThreadLocale(); + ActivateKeyboardLayout( hkl_greek, 0 ); + ok( GetThreadLocale() == thread_locale, "locale changed from %08x to %08x\n", + thread_locale, GetThreadLocale() ); + + flush_sequence(); + + /* greek alpha -> 0xe1 in cp1253 */ + PostMessageW( hwnd, WM_CHAR, 0x3b1, 0 ); + + ok( GetMessageA( &msg, hwnd, 0, 0 ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == 0xe1, "bad wparam %lx\n", msg.wParam ); + ok( msg.lParam == 0, "bad lparam %lx\n", msg.lParam ); + + DispatchMessageA( &msg ); + + seq[0].wParam = 0x3b1; + ok_sequence( seq, "unicode WM_CHAR", FALSE ); + + DestroyWindow( hwnd ); + ActivateKeyboardLayout( hkl_orig, 0 ); + UnloadKeyboardLayout( hkl_greek ); } #define ID_LISTBOX 0x000f @@ -14044,6 +14211,7 @@ test_EndDialog(); test_nullCallback(); test_dbcs_wm_char(); + test_unicode_wm_char(); test_menu_messages(); test_paintingloop(); test_defwinproc(); Modified: trunk/rostests/winetests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/testlist… ============================================================================== --- trunk/rostests/winetests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/testlist.c [iso-8859-1] Sat Oct 5 10:20:53 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_broadcast(void); extern void func_class(void); Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Sat Oct 5 10:20:53 2013 @@ -1507,6 +1507,71 @@ DestroyWindow(mdi_child); } +static void test_MDI_child_stack(HWND mdi_client) +{ + HWND child_1, child_2, child_3, child_4; + HWND stack[4]; + MDICREATESTRUCTA cs; + + cs.szClass = "MDI_child_Class_1"; + cs.szTitle = "MDI child"; + cs.hOwner = GetModuleHandleA(0); + cs.x = CW_USEDEFAULT; + cs.y = CW_USEDEFAULT; + cs.cx = CW_USEDEFAULT; + cs.cy = CW_USEDEFAULT; + cs.style = 0; + cs.lParam = (LPARAM)mdi_lParam_test_message; + + child_1 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); + ok(child_1 != 0, "expected child_1 to be non NULL\n"); + child_2 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); + ok(child_2 != 0, "expected child_2 to be non NULL\n"); + child_3 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); + ok(child_3 != 0, "expected child_3 to be non NULL\n"); + child_4 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); + ok(child_4 != 0, "expected child_4 to be non NULL\n"); + + stack[0] = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + stack[1] = GetWindow(stack[0], GW_HWNDNEXT); + stack[2] = GetWindow(stack[1], GW_HWNDNEXT); + stack[3] = GetWindow(stack[2], GW_HWNDNEXT); + trace("Initial MDI child stack: %p->%p->%p->%p\n", stack[0], stack[1], stack[2], stack[3]); + ok(stack[0] == child_4 && stack[1] == child_3 && + stack[2] == child_2 && stack[3] == child_1, + "Unexpected initial order, should be: %p->%p->%p->%p\n", + child_4, child_3, child_2, child_1); + + trace("Activate child next to %p\n", child_3); + SendMessage(mdi_client, WM_MDINEXT, (WPARAM)child_3, 0); + + stack[0] = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + stack[1] = GetWindow(stack[0], GW_HWNDNEXT); + stack[2] = GetWindow(stack[1], GW_HWNDNEXT); + stack[3] = GetWindow(stack[2], GW_HWNDNEXT); + ok(stack[0] == child_2 && stack[1] == child_4 && + stack[2] == child_1 && stack[3] == child_3, + "Broken MDI child stack:\nexpected: %p->%p->%p->%p, but got: %p->%p->%p->%p\n", + child_2, child_4, child_1, child_3, stack[0], stack[1], stack[2], stack[3]); + + trace("Activate child previous to %p\n", child_1); + SendMessage(mdi_client, WM_MDINEXT, (WPARAM)child_1, 1); + + stack[0] = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + stack[1] = GetWindow(stack[0], GW_HWNDNEXT); + stack[2] = GetWindow(stack[1], GW_HWNDNEXT); + stack[3] = GetWindow(stack[2], GW_HWNDNEXT); + ok(stack[0] == child_4 && stack[1] == child_2 && + stack[2] == child_1 && stack[3] == child_3, + "Broken MDI child stack:\nexpected: %p->%p->%p->%p, but got: %p->%p->%p->%p\n", + child_4, child_2, child_1, child_3, stack[0], stack[1], stack[2], stack[3]); + + DestroyWindow(child_1); + DestroyWindow(child_2); + DestroyWindow(child_3); + DestroyWindow(child_4); +} + /********************************************************************** * MDI_ChildGetMinMaxInfo (copied from windows/mdi.c) * @@ -1787,6 +1852,17 @@ &client_cs); assert(mdi_client); test_MDI_create(hwnd, mdi_client, client_cs.idFirstChild); + DestroyWindow(mdi_client); + + /* Test child window stack management */ + mdi_client = CreateWindowExA(0, "mdiclient", + NULL, + WS_CHILD, + 0, 0, rc.right, rc.bottom, + hwnd, 0, GetModuleHandle(0), + &client_cs); + assert(mdi_client); + test_MDI_child_stack(mdi_client); DestroyWindow(mdi_client); break; } @@ -2637,7 +2713,7 @@ SetActiveWindow(0); check_wnd_state(0, 0, 0, 0); - trace("testing SetActiveWindow %p\n", hwnd); + /*trace("testing SetActiveWindow %p\n", hwnd);*/ ShowWindow(hwnd, SW_SHOW); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -2657,11 +2733,11 @@ SetWindowPos(hwnd,0,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|SWP_SHOWWINDOW); check_wnd_state(hwnd, hwnd, hwnd, 0); - trace("testing ShowWindow SW_HIDE window %p\n", hwnd); + ShowWindow(hwnd, SW_HIDE); check_wnd_state(0, 0, 0, 0); - trace("testing SetActiveWindow on an invisible window %p\n", hwnd); + /*trace("testing SetActiveWindow on an invisible window %p\n", hwnd);*/ SetActiveWindow(hwnd); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -7326,6 +7402,73 @@ DestroyWindow(wnd0); } +static void test_update_region(void) +{ + HWND hwnd, parent, child; + HRGN rgn1, rgn2; + const RECT rc = {15, 15, 40, 40}; + const POINT wnd_orig = {30, 20}; + const POINT child_orig = {10, 5}; + + parent = CreateWindowExA(0, "MainWindowClass", NULL, + WS_VISIBLE | WS_CLIPCHILDREN, + 0, 0, 300, 150, NULL, NULL, GetModuleHandleA(0), 0); + hwnd = CreateWindowExA(0, "MainWindowClass", NULL, + WS_VISIBLE | WS_CLIPCHILDREN | WS_CHILD, + 0, 0, 200, 100, parent, NULL, GetModuleHandleA(0), 0); + child = CreateWindowExA(0, "MainWindowClass", NULL, + WS_VISIBLE | WS_CHILD, + child_orig.x, child_orig.y, 100, 50, + hwnd, NULL, GetModuleHandleA(0), 0); + assert(parent && hwnd && child); + + ValidateRgn(parent, NULL); + ValidateRgn(hwnd, NULL); + InvalidateRect(hwnd, &rc, FALSE); + ValidateRgn(child, NULL); + + rgn1 = CreateRectRgn(0, 0, 0, 0); + ok(GetUpdateRgn(parent, rgn1, FALSE) == NULLREGION, + "has invalid area after ValidateRgn(NULL)\n"); + GetUpdateRgn(hwnd, rgn1, FALSE); + rgn2 = CreateRectRgnIndirect(&rc); + ok(EqualRgn(rgn1, rgn2), "assigned and retrieved update regions are different\n"); + ok(GetUpdateRgn(child, rgn2, FALSE) == NULLREGION, + "has invalid area after ValidateRgn(NULL)\n"); + + SetWindowPos(hwnd, 0, wnd_orig.x, wnd_orig.y, 0, 0, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE); + + /* parent now has non-simple update region, it consist of + * two rects, that was exposed after hwnd moving ... */ + SetRectRgn(rgn1, 0, 0, 200, wnd_orig.y); + SetRectRgn(rgn2, 0, 0, wnd_orig.x, 100); + CombineRgn(rgn1, rgn1, rgn2, RGN_OR); + /* ... and mapped hwnd's invalid area, that hwnd has before moving */ + SetRectRgn(rgn2, rc.left + wnd_orig.x, rc.top + wnd_orig.y, + rc.right + wnd_orig.x, rc.bottom + wnd_orig.y); + CombineRgn(rgn1, rgn1, rgn2, RGN_OR); + GetUpdateRgn(parent, rgn2, FALSE); +todo_wine + ok(EqualRgn(rgn1, rgn2), "wrong update region\n"); + + /* hwnd has the same invalid region as before moving */ + SetRectRgn(rgn1, rc.left, rc.top, rc.right, rc.bottom); + GetUpdateRgn(hwnd, rgn2, FALSE); + ok(EqualRgn(rgn1, rgn2), "wrong update region\n"); + + /* hwnd's invalid area maps to child during moving */ + SetRectRgn(rgn1, rc.left - child_orig.x , rc.top - child_orig.y, + rc.right - child_orig.x, rc.bottom - child_orig.y); + GetUpdateRgn(child, rgn2, FALSE); +todo_wine + ok(EqualRgn(rgn1, rgn2), "wrong update region\n"); + + DeleteObject(rgn1); + DeleteObject(rgn2); + DestroyWindow(parent); +} + START_TEST(win) { HMODULE user32 = GetModuleHandleA( "user32.dll" ); @@ -7438,6 +7581,7 @@ test_handles( hwndMain ); test_winregion(); test_map_points(); + test_update_region(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook);

11 years, 2 months

[akhaldi] 60529: [SETUPAPI_WINETEST] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 5 09:51:37 2013 New Revision: 60529 URL: http://svn.reactos.org/svn/reactos?rev=60529&view=rev Log: [SETUPAPI_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/setupapi/CMakeLists.txt trunk/rostests/winetests/setupapi/devinst.c trunk/rostests/winetests/setupapi/install.c trunk/rostests/winetests/setupapi/parser.c trunk/rostests/winetests/setupapi/testlist.c Modified: trunk/rostests/winetests/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/CMakeL… ============================================================================== --- trunk/rostests/winetests/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/CMakeLists.txt [iso-8859-1] Sat Oct 5 09:51:37 2013 @@ -1,6 +1,3 @@ - -add_definitions( - -D__ROS_LONG64__) list(APPEND SOURCE devclass.c @@ -15,9 +12,8 @@ testlist.c) add_executable(setupapi_winetest ${SOURCE}) -target_link_libraries(setupapi_winetest wine) set_module_type(setupapi_winetest win32cui) -add_importlibs(setupapi_winetest advapi32 setupapi user32 msvcrt kernel32 ntdll) +add_importlibs(setupapi_winetest advapi32 setupapi user32 msvcrt kernel32) add_cd_file(TARGET setupapi_winetest DESTINATION reactos/bin FOR all) if(NOT MSVC) Modified: trunk/rostests/winetests/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/devins… ============================================================================== --- trunk/rostests/winetests/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/devinst.c [iso-8859-1] Sat Oct 5 09:51:37 2013 @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #include <stdio.h> + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -31,8 +31,9 @@ #include "wine/test.h" +static BOOL is_wow64; + /* function pointers */ -static HMODULE hSetupAPI; static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoList)(GUID*,HWND); static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); static BOOL (WINAPI *pSetupDiCreateDeviceInterfaceA)(HDEVINFO, PSP_DEVINFO_DATA, const GUID *, PCSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); @@ -40,6 +41,7 @@ static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); static BOOL (WINAPI *pSetupDiEnumDeviceInfo)(HDEVINFO, DWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiEnumDeviceInterfaces)(HDEVINFO, PSP_DEVINFO_DATA, const GUID *, DWORD, PSP_DEVICE_INTERFACE_DATA); +static BOOL (WINAPI *pSetupDiGetINFClassA)(PCSTR, LPGUID, PSTR, DWORD, PDWORD); static BOOL (WINAPI *pSetupDiInstallClassA)(HWND, PCSTR, DWORD, HSPFILEQ); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); static HKEY (WINAPI *pSetupDiOpenDevRegKey)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, REGSAM); @@ -56,13 +58,15 @@ static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD); static BOOL (WINAPI *pSetupDiGetDeviceRegistryPropertyA)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD); static BOOL (WINAPI *pSetupDiGetDeviceRegistryPropertyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD); +static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); /* This is a unique guid for testing purposes */ static GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; static void init_function_pointers(void) { - hSetupAPI = GetModuleHandleA("setupapi.dll"); + HMODULE hSetupAPI = GetModuleHandleA("setupapi.dll"); + HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); pSetupDiCreateDeviceInfoA = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoA"); pSetupDiCreateDeviceInfoW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoW"); @@ -83,10 +87,12 @@ pSetupDiRegisterDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiRegisterDeviceInfo"); pSetupDiGetClassDevsA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetClassDevsA"); pSetupDiGetClassDevsW = (void *)GetProcAddress(hSetupAPI, "SetupDiGetClassDevsW"); + pSetupDiGetINFClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetINFClassA"); pSetupDiSetDeviceRegistryPropertyA = (void *)GetProcAddress(hSetupAPI, "SetupDiSetDeviceRegistryPropertyA"); pSetupDiSetDeviceRegistryPropertyW = (void *)GetProcAddress(hSetupAPI, "SetupDiSetDeviceRegistryPropertyW"); pSetupDiGetDeviceRegistryPropertyA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceRegistryPropertyA"); pSetupDiGetDeviceRegistryPropertyW = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceRegistryPropertyW"); + pIsWow64Process = (void *)GetProcAddress(hKernel32, "IsWow64Process"); } static void change_reg_permissions(const WCHAR *regkey) @@ -126,7 +132,7 @@ { HDEVINFO set; SP_DEVINFO_DATA devInfo = { sizeof(devInfo), { 0 } }; - BOOL ret; + BOOL ret, retval; SetLastError(0xdeadbeef); set = pSetupDiGetClassDevsA(&guid, NULL, 0, 0); @@ -134,19 +140,23 @@ GetLastError()); SetLastError(0xdeadbeef); - ok(pSetupDiEnumDeviceInfo(set, 0, &devInfo), - "SetupDiEnumDeviceInfo failed: %08x\n", GetLastError()); - - SetLastError(0xdeadbeef); - ret = pSetupDiCallClassInstaller(DIF_REMOVE, set, &devInfo); - todo_wine - ok(ret, "SetupDiCallClassInstaller(DIF_REMOVE...) failed: %08x\n", GetLastError()); - - SetLastError(0xdeadbeef); - ok(pSetupDiDestroyDeviceInfoList(set), - "SetupDiDestroyDeviceInfoList failed: %08x\n", GetLastError()); - - return ret; + ret = pSetupDiEnumDeviceInfo(set, 0, &devInfo); + ok(ret, "SetupDiEnumDeviceInfo failed: %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = pSetupDiCallClassInstaller(DIF_REMOVE, set, &devInfo); + if(is_wow64) + todo_wine ok(!retval && GetLastError() == ERROR_IN_WOW64, + "SetupDiCallClassInstaller(DIF_REMOVE...) succeeded: %08x\n", GetLastError()); + else + todo_wine ok(retval, + "SetupDiCallClassInstaller(DIF_REMOVE...) failed: %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetupDiDestroyDeviceInfoList(set); + ok(ret, "SetupDiDestroyDeviceInfoList failed: %08x\n", GetLastError()); + + return retval; } /* RegDeleteTreeW from dlls/advapi32/registry.c */ @@ -251,6 +261,7 @@ DWORD error; static CHAR notnull[] = "NotNull"; static const WCHAR machine[] = { 'd','u','m','m','y',0 }; + static const WCHAR empty[] = { 0 }; SetLastError(0xdeadbeef); /* create empty DeviceInfoList, but set Reserved to a value, which is not NULL */ @@ -275,6 +286,14 @@ /* create empty DeviceInfoList */ devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); + ok(devlist && devlist != INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %d (expected != %p)\n", devlist, error, INVALID_HANDLE_VALUE); + + /* destroy DeviceInfoList */ + ret = pSetupDiDestroyDeviceInfoList(devlist); + ok(ret, "SetupDiDestroyDeviceInfoList failed : %d\n", error); + + /* create empty DeviceInfoList with empty machine name */ + devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, empty, NULL); ok(devlist && devlist != INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %d (expected != %p)\n", devlist, error, INVALID_HANDLE_VALUE); /* destroy DeviceInfoList */ @@ -955,7 +974,6 @@ key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, DIREG_DRV, 0); /* The software key isn't created by default */ - todo_wine ok(key == INVALID_HANDLE_VALUE && GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Expected ERROR_KEY_DOES_NOT_EXIST, got %08x\n", GetLastError()); @@ -1005,8 +1023,8 @@ /* Cleanup */ ret = remove_device(); - todo_wine - ok(ret, "Expected the device to be removed: %08x\n", GetLastError()); + if(!is_wow64) + todo_wine ok(ret, "Expected the device to be removed: %08x\n", GetLastError()); /* FIXME: Only do the RegDeleteKey, once Wine is fixed */ if (!ret) @@ -1089,8 +1107,10 @@ { static const char path[] = "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; + static const char path_wow64[] = + "\\\\?\\root#legacy_bogus#0001#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; static const char path_w2k[] = - "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\"; + "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\"; PSP_DEVICE_INTERFACE_DETAIL_DATA_A detail = NULL; detail = HeapAlloc(GetProcessHeap(), 0, dwSize); @@ -1104,10 +1124,13 @@ /* FIXME: This one only worked because old data wasn't removed properly. As soon * as all the tests are cleaned up correctly this has to be (or should be) fixed */ - todo_wine - ok(!lstrcmpiA(path, detail->DevicePath) || - !lstrcmpiA(path_w2k, detail->DevicePath), "Unexpected path %s\n", - detail->DevicePath); + if(is_wow64) + ok(!lstrcmpiA(path_wow64, detail->DevicePath), + "Unexpected path %s\n", detail->DevicePath); + else + todo_wine ok(!lstrcmpiA(path, detail->DevicePath) || + !lstrcmpiA(path_w2k, detail->DevicePath), + "Unexpected path %s\n", detail->DevicePath); HeapFree(GetProcessHeap(), 0, detail); } } @@ -1116,8 +1139,8 @@ /* Cleanup */ ret = remove_device(); - todo_wine - ok(ret, "Expected the device to be removed: %08x\n", GetLastError()); + if(!is_wow64) + todo_wine ok(ret, "Expected the device to be removed: %08x\n", GetLastError()); /* FIXME: Only do the RegDeleteKey, once Wine is fixed */ if (!ret) @@ -1226,8 +1249,8 @@ pSetupDiDestroyDeviceInfoList(set); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, bogus, &key); - todo_wine - ok(res == ERROR_FILE_NOT_FOUND, "Expected key to not exist\n"); + if(!is_wow64) + todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Expected key to not exist\n"); /* FIXME: Remove when Wine is fixed */ if (res == ERROR_SUCCESS) { @@ -1332,8 +1355,8 @@ pSetupDiDestroyDeviceInfoList(set); res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key); - todo_wine - ok(res == ERROR_FILE_NOT_FOUND, "Expected key to not exist\n"); + if(!is_wow64) + todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Expected key to not exist\n"); /* FIXME: Remove when Wine is fixed */ if (res == ERROR_SUCCESS) { @@ -1343,23 +1366,182 @@ } } +static void testSetupDiGetINFClassA(void) +{ + static const char inffile[] = "winetest.inf"; + static const char content[] = "[Version]\r\n\r\n"; + + char cn[MAX_PATH]; + char filename[MAX_PATH]; + DWORD count; + BOOL retval; + GUID guid; + HANDLE h; + + if(!pSetupDiGetINFClassA) + { + win_skip("SetupDiGetINFClassA not present\n"); + return; + } + + count = GetTempPathA(MAX_PATH, filename); + if(!count) + { + win_skip("GetTempPathA failed\n"); + return; + } + + strcat(filename, inffile); + DeleteFileA(filename); + + /* not existing file */ + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + if (ERROR_CALL_NOT_IMPLEMENTED == GetLastError()) + { + skip("SetupDiGetINFClassA is not implemented\n"); + return; + } + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + /* missing file wins against other invalid parameter */ + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, NULL, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, NULL, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, NULL); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + /* test file content */ + h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if(h == INVALID_HANDLE_VALUE) + { + win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); + return; + } + CloseHandle( h); + + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + + h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if(h == INVALID_HANDLE_VALUE) + { + win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); + return; + } + WriteFile( h, content, sizeof(content), &count, NULL); + CloseHandle( h); + + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + + WritePrivateProfileStringA("Version", "Signature", "\"$CHICAGO$\"", filename); + + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + + WritePrivateProfileStringA("Version", "Class", "WINE", filename); + + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); + + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, 5, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); + + count = 0xdeadbeef; + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 4, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "expected error ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); + + /* invalid parameter */ + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(NULL, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, NULL, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, NULL, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || + ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " + "got %u\n", GetLastError()); + + DeleteFileA(filename); + + WritePrivateProfileStringA("Version", "Signature", "\"$CHICAGO$\"", filename); + WritePrivateProfileStringA("Version", "ClassGUID", "WINE", filename); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(RPC_S_INVALID_STRING_UUID == GetLastError() || + ERROR_INVALID_PARAMETER == GetLastError(), + "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " + "got %u\n", GetLastError()); + + /* network adapter guid */ + WritePrivateProfileStringA("Version", "ClassGUID", + "{4d36e972-e325-11ce-bfc1-08002be10318}", filename); + + /* this test succeeds only if the guid is known to the system */ + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + todo_wine + ok(count == 4, "expected count==4, got %u(%s)\n", count, cn); + + DeleteFileA(filename); +} + START_TEST(devinst) { - HDEVINFO set; - - init_function_pointers(); - - /* Win9x/WinMe does things totally different so we skip all the tests - * - * We don't want to exclude NT4 so hence this check. - */ - SetLastError(0xdeadbeef); - set = pSetupDiGetClassDevsW(NULL, NULL, 0, 0); - if (set == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("Win9x/WinMe has totally different behavior\n"); - return; - } + init_function_pointers(); + + if (pIsWow64Process) + pIsWow64Process(GetCurrentProcess(), &is_wow64); if (pSetupDiCreateDeviceInfoListExW) test_SetupDiCreateDeviceInfoListEx(); @@ -1381,4 +1563,13 @@ testRegisterAndGetDetail(); testDeviceRegistryPropertyA(); testDeviceRegistryPropertyW(); -} + + if (!winetest_interactive) + { + win_skip("testSetupDiGetINFClassA(), ROSTESTS-124.\n"); + } + else + { + testSetupDiGetINFClassA(); + } +} Modified: trunk/rostests/winetests/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/instal… ============================================================================== --- trunk/rostests/winetests/setupapi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/install.c [iso-8859-1] Sat Oct 5 09:51:37 2013 @@ -321,6 +321,20 @@ CloseServiceHandle(svc_handle); CloseServiceHandle(scm_handle); + + strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n"); + strcat(inf, "[XSP.InstallPerVer]\n"); + strcat(inf, "AddReg=AspEventlogMsg.Reg,Perf.Reg,AspVersions.Reg,FreeADO.Reg,IndexServer.Reg\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionA(infhandle, "XSP.InstallPerVer", 0); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFile(inffile); /* TODO: Test the Flags */ } Modified: trunk/rostests/winetests/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/parser… ============================================================================== --- trunk/rostests/winetests/setupapi/parser.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/parser.c [iso-8859-1] Sat Oct 5 09:51:37 2013 @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #include "windef.h" @@ -424,7 +423,12 @@ if (hinf == INVALID_HANDLE_VALUE) continue; ret = SetupFindFirstLineA( hinf, "Test", 0, &context ); - assert( ret ); + ok(ret, "SetupFindFirstLineA failed: le=%u\n", GetLastError()); + if (!ret) + { + SetupCloseInfFile( hinf ); + continue; + } check_key( &context, key_names[i].key ); Modified: trunk/rostests/winetests/setupapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/testli… ============================================================================== --- trunk/rostests/winetests/setupapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/testlist.c [iso-8859-1] Sat Oct 5 09:51:37 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_devclass(void); extern void func_devinst(void);

11 years, 2 months

[akhaldi] 60528: [PSDK] * Add missing ERROR_IN_WOW64 define.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 5 09:50:21 2013 New Revision: 60528 URL: http://svn.reactos.org/svn/reactos?rev=60528&view=rev Log: [PSDK] * Add missing ERROR_IN_WOW64 define. Modified: trunk/reactos/include/psdk/setupapi.h Modified: trunk/reactos/include/psdk/setupapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/setupapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/setupapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/setupapi.h [iso-8859-1] Sat Oct 5 09:50:21 2013 @@ -334,6 +334,7 @@ #define ERROR_DEVINSTALL_QUEUE_NONNATIVE (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x230) #define ERROR_NOT_DISABLEABLE (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x231) #define ERROR_CANT_REMOVE_DEVINST (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x232) +#define ERROR_IN_WOW64 (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x235) #define ERROR_INTERFACE_DEVICE_ACTIVE ERROR_DEVICE_INTERFACE_ACTIVE #define ERROR_INTERFACE_DEVICE_REMOVED ERROR_DEVICE_INTERFACE_REMOVED #define ERROR_NO_DEFAULT_INTERFACE_DEVICE ERROR_NO_DEFAULT_DEVICE_INTERFACE

11 years, 2 months

[ekohl] 60527: [SAMSRV] SampQueryUserAll: Rewrite the handling of the WhichFields variable in order to simplify the support of trusted user information.

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Oct 4 22:23:25 2013 New Revision: 60527 URL: http://svn.reactos.org/svn/reactos?rev=60527&view=rev Log: [SAMSRV] SampQueryUserAll: Rewrite the handling of the WhichFields variable in order to simplify the support of trusted user information. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Fri Oct 4 22:23:25 2013 @@ -6443,9 +6443,42 @@ if (!NT_SUCCESS(Status)) goto done; - if (UserObject->Access & USER_READ_GENERAL) - { - /* Get the Name string */ + /* Set the fields to be returned */ + if (UserObject->Trusted) + { + InfoBuffer->All.WhichFields = USER_ALL_READ_GENERAL_MASK | + USER_ALL_READ_LOGON_MASK | + USER_ALL_READ_ACCOUNT_MASK | + USER_ALL_READ_PREFERENCES_MASK | + USER_ALL_READ_TRUSTED_MASK; + } + else + { + InfoBuffer->All.WhichFields = 0; + + if (UserObject->Access & USER_READ_GENERAL) + InfoBuffer->All.WhichFields |= USER_ALL_READ_GENERAL_MASK; + + if (UserObject->Access & USER_READ_LOGON) + InfoBuffer->All.WhichFields |= USER_ALL_READ_LOGON_MASK; + + if (UserObject->Access & USER_READ_ACCOUNT) + InfoBuffer->All.WhichFields |= USER_ALL_READ_ACCOUNT_MASK; + + if (UserObject->Access & USER_READ_PREFERENCES) + InfoBuffer->All.WhichFields |= USER_ALL_READ_PREFERENCES_MASK; + } + + /* Fail, if no fields are to be returned */ + if (InfoBuffer->All.WhichFields == 0) + { + Status = STATUS_ACCESS_DENIED; + goto done; + } + + /* Get the UserName attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_USERNAME) + { Status = SampGetObjectAttributeString(UserObject, L"Name", &InfoBuffer->All.UserName); @@ -6454,8 +6487,11 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - /* Get the FullName string */ + } + + /* Get the FullName attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_FULLNAME) + { Status = SampGetObjectAttributeString(UserObject, L"FullName", &InfoBuffer->All.FullName); @@ -6464,14 +6500,23 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - /* Get the user ID*/ + } + + /* Get the UserId attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_USERID) + { InfoBuffer->All.UserId = FixedData.UserId; - - /* Get the primary group ID */ + } + + /* Get the PrimaryGroupId attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_PRIMARYGROUPID) + { InfoBuffer->All.PrimaryGroupId = FixedData.PrimaryGroupId; - - /* Get the AdminComment string */ + } + + /* Get the AdminComment attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_ADMINCOMMENT) + { Status = SampGetObjectAttributeString(UserObject, L"AdminComment", &InfoBuffer->All.AdminComment); @@ -6480,8 +6525,11 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - /* Get the UserComment string */ + } + + /* Get the UserComment attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_USERCOMMENT) + { Status = SampGetObjectAttributeString(UserObject, L"UserComment", &InfoBuffer->All.UserComment); @@ -6490,19 +6538,11 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - InfoBuffer->All.WhichFields |= USER_ALL_READ_GENERAL_MASK; -// USER_ALL_USERNAME | -// USER_ALL_FULLNAME | -// USER_ALL_USERID | -// USER_ALL_PRIMARYGROUPID | -// USER_ALL_ADMINCOMMENT | -// USER_ALL_USERCOMMENT; - } - - if (UserObject->Access & USER_READ_LOGON) - { - /* Get the HomeDirectory string */ + } + + /* Get the HomeDirectory attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_HOMEDIRECTORY) + { Status = SampGetObjectAttributeString(UserObject, L"HomeDirectory", &InfoBuffer->All.HomeDirectory); @@ -6511,8 +6551,11 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - /* Get the HomeDirectoryDrive string */ + } + + /* Get the HomeDirectoryDrive attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_HOMEDIRECTORYDRIVE) + { Status = SampGetObjectAttributeString(UserObject, L"HomeDirectoryDrive", &InfoBuffer->Home.HomeDirectoryDrive); @@ -6521,8 +6564,11 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - /* Get the ScriptPath string */ + } + + /* Get the ScriptPath attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_SCRIPTPATH) + { Status = SampGetObjectAttributeString(UserObject, L"ScriptPath", &InfoBuffer->All.ScriptPath); @@ -6531,8 +6577,11 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - /* Get the ProfilePath string */ + } + + /* Get the ProfilePath attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_PROFILEPATH) + { Status = SampGetObjectAttributeString(UserObject, L"ProfilePath", &InfoBuffer->All.ProfilePath); @@ -6541,8 +6590,11 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - /* Get the WorkStations string */ + } + + /* Get the WorkStations attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_WORKSTATIONS) + { Status = SampGetObjectAttributeString(UserObject, L"WorkStations", &InfoBuffer->All.WorkStations); @@ -6551,8 +6603,25 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - /* Get the LogonHours attribute */ + } + + /* Get the LastLogon attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_LASTLOGON) + { + InfoBuffer->All.LastLogon.LowPart = FixedData.LastLogon.LowPart; + InfoBuffer->All.LastLogon.HighPart = FixedData.LastLogon.HighPart; + } + + /* Get the LastLogoff attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_LASTLOGOFF) + { + InfoBuffer->All.LastLogoff.LowPart = FixedData.LastLogoff.LowPart; + InfoBuffer->All.LastLogoff.HighPart = FixedData.LastLogoff.HighPart; + } + + /* Get the LogonHours attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_LOGONHOURS) + { Status = SampGetLogonHoursAttrbute(UserObject, &InfoBuffer->All.LogonHours); if (!NT_SUCCESS(Status)) @@ -6560,55 +6629,61 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - InfoBuffer->All.LastLogon.LowPart = FixedData.LastLogon.LowPart; - InfoBuffer->All.LastLogon.HighPart = FixedData.LastLogon.HighPart; - - InfoBuffer->All.LastLogoff.LowPart = FixedData.LastLogoff.LowPart; - InfoBuffer->All.LastLogoff.HighPart = FixedData.LastLogoff.HighPart; - + } + + /* Get the BadPasswordCount attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_BADPASSWORDCOUNT) + { InfoBuffer->All.BadPasswordCount = FixedData.BadPasswordCount; - + } + + /* Get the LogonCount attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_LOGONCOUNT) + { InfoBuffer->All.LogonCount = FixedData.LogonCount; - + } + + /* Get the PasswordCanChange attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_PASSWORDCANCHANGE) + { PasswordCanChange = SampAddRelativeTimeToTime(FixedData.PasswordLastSet, DomainFixedData.MinPasswordAge); InfoBuffer->All.PasswordCanChange.LowPart = PasswordCanChange.LowPart; InfoBuffer->All.PasswordCanChange.HighPart = PasswordCanChange.HighPart; - + } + + /* Get the PasswordMustChange attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_PASSWORDMUSTCHANGE) + { PasswordMustChange = SampAddRelativeTimeToTime(FixedData.PasswordLastSet, DomainFixedData.MaxPasswordAge); InfoBuffer->All.PasswordMustChange.LowPart = PasswordMustChange.LowPart; InfoBuffer->All.PasswordMustChange.HighPart = PasswordMustChange.HighPart; - - InfoBuffer->All. WhichFields |= USER_ALL_READ_LOGON_MASK; -/* - USER_ALL_HOMEDIRECTORY | - USER_ALL_HOMEDIRECTORYDRIVE | - USER_ALL_SCRIPTPATH | - USER_ALL_PROFILEPATH | - USER_ALL_WORKSTATIONS | - USER_ALL_LASTLOGON | - USER_ALL_LASTLOGOFF | - USER_ALL_LOGONHOURS | - USER_ALL_BADPASSWORDCOUNT | - USER_ALL_LOGONCOUNT; - USER_ALL_PASSWORDCANCHANGE | - USER_ALL_PASSWORDMUSTCHANGE; -*/ - } - - if (UserObject->Access & USER_READ_ACCOUNT) + } + + /* Get the PasswordLastSet attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_PASSWORDLASTSET) { InfoBuffer->All.PasswordLastSet.LowPart = FixedData.PasswordLastSet.LowPart; InfoBuffer->All.PasswordLastSet.HighPart = FixedData.PasswordLastSet.HighPart; - + } + + /* Get the AccountExpires attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_ACCOUNTEXPIRES) + { InfoBuffer->All.AccountExpires.LowPart = FixedData.AccountExpires.LowPart; InfoBuffer->All.AccountExpires.HighPart = FixedData.AccountExpires.HighPart; - + } + + /* Get the UserAccountControl attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_USERACCOUNTCONTROL) + { InfoBuffer->All.UserAccountControl = FixedData.UserAccountControl; - - /* Get the Parameters string */ + } + + /* Get the Parameters attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_PARAMETERS) + { Status = SampGetObjectAttributeString(UserObject, L"Parameters", &InfoBuffer->All.Parameters); @@ -6617,23 +6692,43 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - InfoBuffer->All. WhichFields |= USER_ALL_READ_ACCOUNT_MASK; -// USER_ALL_PASSWORDLASTSET | -// USER_ALL_ACCOUNTEXPIRES | -// USER_ALL_USERACCOUNTCONTROL | -// USER_ALL_PARAMETERS; - } - - if (UserObject->Access & USER_READ_PREFERENCES) + } + + /* Get the CountryCode attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_COUNTRYCODE) { InfoBuffer->All.CountryCode = FixedData.CountryCode; - + } + + /* Get the CodePage attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_CODEPAGE) + { InfoBuffer->All.CodePage = FixedData.CodePage; - - InfoBuffer->All. WhichFields |= USER_ALL_READ_PREFERENCES_MASK; -// USER_ALL_COUNTRYCODE | -// USER_ALL_CODEPAGE; + } + + if (InfoBuffer->All.WhichFields & USER_ALL_NTPASSWORDPRESENT) + { + /* FIXME */ + } + + if (InfoBuffer->All.WhichFields & USER_ALL_LMPASSWORDPRESENT) + { + /* FIXME */ + } + + if (InfoBuffer->All.WhichFields & USER_ALL_PRIVATEDATA) + { + /* FIXME */ + } + + if (InfoBuffer->All.WhichFields & USER_ALL_PASSWORDEXPIRED) + { + /* FIXME */ + } + + if (InfoBuffer->All.WhichFields & USER_ALL_SECURITYDESCRIPTOR) + { + /* FIXME */ } *Buffer = InfoBuffer;

11 years, 2 months

[aandrejevic] 60526: [NTVDM] Properly handle the case when the console framebuffer could not be created.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Oct 4 21:16:58 2013 New Revision: 60526 URL: http://svn.reactos.org/svn/reactos?rev=60526&view=rev Log: [NTVDM] Properly handle the case when the console framebuffer could not be created. Modified: branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Fri Oct 4 21:16:58 2013 @@ -488,12 +488,22 @@ if (!(VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA)) { /* Enter new text mode */ - if (!VgaEnterTextMode(&Resolution)) return; + if (!VgaEnterTextMode(&Resolution)) + { + DisplayMessage(L"An unexpected VGA error occurred while switching into text mode."); + VdmRunning = FALSE; + return; + } } else { /* Enter 8-bit graphics mode */ - if (!VgaEnterGraphicsMode(&Resolution)) return; + if (!VgaEnterGraphicsMode(&Resolution)) + { + DisplayMessage(L"An unexpected VGA error occurred while switching into graphics mode."); + VdmRunning = FALSE; + return; + } } /* Trigger a full update of the screen */ @@ -515,6 +525,12 @@ DWORD Address = (VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG] << 8) + VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG]; DWORD ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; + + /* + * If console framebuffer is NULL, that means something went wrong + * earlier and this is the final display refresh. + */ + if (ConsoleFramebuffer == NULL) return; /* Check if this is text mode or graphics mode */ if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA)

11 years, 2 months

[aandrejevic] 60525: [SOFT386] Fix bugs in STOS and LODS (only one register is incremented). Implement CMPS and SCAS.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Oct 4 19:51:11 2013 New Revision: 60525 URL: http://svn.reactos.org/svn/reactos?rev=60525&view=rev Log: [SOFT386] Fix bugs in STOS and LODS (only one register is incremented). Implement CMPS and SCAS. Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Fri Oct 4 19:51:11 2013 @@ -5700,8 +5700,113 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeCmps) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED + ULONG FirstValue = 0, SecondValue = 0, Result; + ULONG DataSize, DataMask, SignFlag; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFE) == 0xA6); + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if ((State->PrefixFlags & SOFT386_PREFIX_REP) + || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) + { + // TODO: The REP/REPZ/REPNZ prefixes need to be implemented! + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Calculate the size */ + if (Opcode == 0xA6) DataSize = sizeof(UCHAR); + else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); + + /* Calculate the mask and sign flag */ + DataMask = (1 << (DataSize * 8)) - 1; + SignFlag = 1 << ((DataSize * 8) - 1); + + /* Read from the first source operand */ + if (!Soft386ReadMemory(State, + SOFT386_REG_DS, + AddressSize ? State->GeneralRegs[SOFT386_REG_ESI].Long + : State->GeneralRegs[SOFT386_REG_ESI].LowWord, + FALSE, + &FirstValue, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Read from the second source operand */ + if (!Soft386ReadMemory(State, + SOFT386_REG_ES, + AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long + : State->GeneralRegs[SOFT386_REG_EDI].LowWord, + FALSE, + &SecondValue, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + FirstValue &= DataMask; + SecondValue &= DataMask; + Result = (FirstValue - SecondValue) & DataMask; + + /* Update the flags */ + State->Flags.Cf = FirstValue < SecondValue; + State->Flags.Of = ((FirstValue & SignFlag) != (SecondValue & SignFlag)) + && ((FirstValue & SignFlag) != (Result & SignFlag)); + State->Flags.Af = (FirstValue & 0x0F) < (SecondValue & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SignFlag) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Increment/decrement ESI and EDI */ + if (OperandSize) + { + if (State->Flags.Df) + { + State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; + State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + } + else + { + State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; + State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; + } + } + else + { + if (State->Flags.Df) + { + State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; + State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; + } + else + { + State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; + State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; + } + } + + /* Return success */ + return TRUE; } SOFT386_OPCODE_HANDLER(Soft386OpcodeStos) @@ -5750,32 +5855,16 @@ return FALSE; } - /* Increment/decrement ESI and EDI */ + /* Increment/decrement EDI */ if (OperandSize) { - if (State->Flags.Df) - { - State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; - State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; - } - else - { - State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; - State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; - } + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; } else { - if (State->Flags.Df) - { - State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; - State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; - } - else - { - State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; - State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; - } + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; } /* Return success */ @@ -5829,32 +5918,16 @@ return FALSE; } - /* Increment/decrement ESI and EDI */ + /* Increment/decrement ESI */ if (OperandSize) { - if (State->Flags.Df) - { - State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; - State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; - } - else - { - State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; - State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; - } + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; + else State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; } else { - if (State->Flags.Df) - { - State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; - State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; - } - else - { - State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; - State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; - } + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; + else State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; } /* Return success */ @@ -5863,6 +5936,84 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeScas) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED -} + ULONG FirstValue = State->GeneralRegs[SOFT386_REG_EAX].Long; + ULONG SecondValue = 0; + ULONG Result; + ULONG DataSize, DataMask, SignFlag; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFE) == 0xAE); + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if ((State->PrefixFlags & SOFT386_PREFIX_REP) + || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) + { + // TODO: The REP/REPZ/REPNZ prefixes need to be implemented! + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Calculate the size */ + if (Opcode == 0xA6) DataSize = sizeof(UCHAR); + else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); + + /* Calculate the mask and sign flag */ + DataMask = (1 << (DataSize * 8)) - 1; + SignFlag = 1 << ((DataSize * 8) - 1); + + /* Read from the source operand */ + if (!Soft386ReadMemory(State, + SOFT386_REG_ES, + AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long + : State->GeneralRegs[SOFT386_REG_EDI].LowWord, + FALSE, + &SecondValue, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + FirstValue &= DataMask; + SecondValue &= DataMask; + Result = (FirstValue - SecondValue) & DataMask; + + /* Update the flags */ + State->Flags.Cf = FirstValue < SecondValue; + State->Flags.Of = ((FirstValue & SignFlag) != (SecondValue & SignFlag)) + && ((FirstValue & SignFlag) != (Result & SignFlag)); + State->Flags.Af = (FirstValue & 0x0F) < (SecondValue & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SignFlag) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Increment/decrement EDI */ + if (OperandSize) + { + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; + } + else + { + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; + } + + /* Return success */ + return TRUE; +}

11 years, 2 months

[tkreuzer] 60524: [INTSAFE.H] - Mark UINT_MAX and UINT32_MAX as unsigned

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Oct 4 14:08:27 2013 New Revision: 60524 URL: http://svn.reactos.org/svn/reactos?rev=60524&view=rev Log: [INTSAFE.H] - Mark UINT_MAX and UINT32_MAX as unsigned Modified: trunk/reactos/include/psdk/intsafe.h Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Fri Oct 4 14:08:27 2013 @@ -167,8 +167,8 @@ #define WORD_MAX 0xffff #define INT_MAX 2147483647 #define INT32_MAX 2147483647 -#define UINT_MAX 0xffffffff -#define UINT32_MAX 0xffffffff +#define UINT_MAX 0xffffffffU +#define UINT32_MAX 0xffffffffU #define LONG_MAX 2147483647L #define ULONG_MAX 0xffffffffUL #define DWORD_MAX 0xffffffffUL

11 years, 2 months

[tkreuzer] 60523: [INTSAFE.H] - Use SAL2 instead of SAL1

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Oct 4 13:39:58 2013 New Revision: 60523 URL: http://svn.reactos.org/svn/reactos?rev=60523&view=rev Log: [INTSAFE.H] - Use SAL2 instead of SAL1 Modified: trunk/reactos/include/psdk/intsafe.h Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Fri Oct 4 13:39:58 2013 @@ -719,7 +719,7 @@ #endif #define DEFINE_SAFE_MULT_U16(_Name, _Type, _Convert) \ -__checkReturn \ +_Must_inspect_result_ \ __forceinline \ INTSAFE_RESULT \ INTSAFE_NAME(_Name)( \

11 years, 2 months

[tkreuzer] 60522: [INTSAFE.H] - Rename internal macros and add comments to make it more obvious what the macro does - Add UShortMult

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Oct 4 13:37:25 2013 New Revision: 60522 URL: http://svn.reactos.org/svn/reactos?rev=60522&view=rev Log: [INTSAFE.H] - Rename internal macros and add comments to make it more obvious what the macro does - Add UShortMult Modified: trunk/reactos/include/psdk/intsafe.h Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Fri Oct 4 13:37:25 2013 @@ -119,6 +119,7 @@ C_ASSERT(sizeof(UINT) == 4); C_ASSERT(sizeof(LONG) == 4); C_ASSERT(sizeof(ULONG) == 4); +C_ASSERT(sizeof(DWORD) == 4); C_ASSERT(sizeof(UINT_PTR) == sizeof(ULONG_PTR)); /* Undefine these to avoid conflicts with limits.h */ @@ -270,6 +271,7 @@ #endif +/* Convert unsigned to signed or unsigned */ #define DEFINE_SAFE_CONVERT_UTOX(_Name, _TypeFrom, _TypeTo) \ _Must_inspect_result_ \ __forceinline \ @@ -332,7 +334,8 @@ DEFINE_SAFE_CONVERT_UTOX(ULongLongToULongPtr, ULONGLONG, ULONG_PTR) -#define DEFINE_SAFE_CONVERT_ITOU(_Name, _TypeFrom, _TypeTo) \ +/* Convert signed to unsigned */ +#define DEFINE_SAFE_CONVERT_STOU(_Name, _TypeFrom, _TypeTo) \ _Must_inspect_result_ \ __forceinline \ INTSAFE_RESULT \ @@ -352,60 +355,61 @@ } \ } -DEFINE_SAFE_CONVERT_ITOU(Int8ToUChar, INT8, UCHAR) -DEFINE_SAFE_CONVERT_ITOU(Int8ToUInt8, INT8, UINT8) -DEFINE_SAFE_CONVERT_ITOU(Int8ToUShort, INT8, USHORT) -DEFINE_SAFE_CONVERT_ITOU(Int8ToUInt, INT8, UINT) -DEFINE_SAFE_CONVERT_ITOU(Int8ToULong, INT8, ULONG) -DEFINE_SAFE_CONVERT_ITOU(Int8ToUIntPtr, INT8, UINT_PTR) -DEFINE_SAFE_CONVERT_ITOU(Int8ToULongPtr, INT8, ULONG_PTR) -DEFINE_SAFE_CONVERT_ITOU(Int8ToULongLong, INT8, ULONGLONG) -DEFINE_SAFE_CONVERT_ITOU(ShortToUChar, SHORT, UCHAR) -DEFINE_SAFE_CONVERT_ITOU(ShortToUInt8, SHORT, UINT8) -DEFINE_SAFE_CONVERT_ITOU(ShortToUShort, SHORT, USHORT) -DEFINE_SAFE_CONVERT_ITOU(ShortToUInt, SHORT, UINT) -DEFINE_SAFE_CONVERT_ITOU(ShortToULong, SHORT, ULONG) -DEFINE_SAFE_CONVERT_ITOU(ShortToUIntPtr, SHORT, UINT_PTR) -DEFINE_SAFE_CONVERT_ITOU(ShortToULongPtr, SHORT, ULONG_PTR) -DEFINE_SAFE_CONVERT_ITOU(ShortToDWordPtr, SHORT, DWORD_PTR) -DEFINE_SAFE_CONVERT_ITOU(ShortToULongLong, SHORT, ULONGLONG) -DEFINE_SAFE_CONVERT_ITOU(IntToUChar, INT, UCHAR) -DEFINE_SAFE_CONVERT_ITOU(IntToUInt8, INT, UINT8) -DEFINE_SAFE_CONVERT_ITOU(IntToUShort, INT, USHORT) -DEFINE_SAFE_CONVERT_ITOU(IntToUInt, INT, UINT) -DEFINE_SAFE_CONVERT_ITOU(IntToULong, INT, ULONG) -DEFINE_SAFE_CONVERT_ITOU(IntToULongLong, INT, ULONGLONG) -DEFINE_SAFE_CONVERT_ITOU(LongToUChar, LONG, UCHAR) -DEFINE_SAFE_CONVERT_ITOU(LongToUInt8, LONG, UINT8) -DEFINE_SAFE_CONVERT_ITOU(LongToUShort, LONG, USHORT) -DEFINE_SAFE_CONVERT_ITOU(LongToUInt, LONG, UINT) -DEFINE_SAFE_CONVERT_ITOU(LongToULong, LONG, ULONG) -DEFINE_SAFE_CONVERT_ITOU(LongToUIntPtr, LONG, UINT_PTR) -DEFINE_SAFE_CONVERT_ITOU(LongToULongPtr, LONG, ULONG_PTR) -DEFINE_SAFE_CONVERT_ITOU(LongToULongLong, LONG, ULONGLONG) -DEFINE_SAFE_CONVERT_ITOU(IntPtrToUChar, INT_PTR, UCHAR) -DEFINE_SAFE_CONVERT_ITOU(IntPtrToUInt8, INT_PTR, UINT8) -DEFINE_SAFE_CONVERT_ITOU(IntPtrToUShort, INT_PTR, USHORT) -DEFINE_SAFE_CONVERT_ITOU(IntPtrToUInt, INT_PTR, UINT) -DEFINE_SAFE_CONVERT_ITOU(IntPtrToULong, INT_PTR, ULONG) -DEFINE_SAFE_CONVERT_ITOU(IntPtrToUIntPtr, INT_PTR, UINT_PTR) -DEFINE_SAFE_CONVERT_ITOU(IntPtrToULongPtr, INT_PTR, ULONG_PTR) -DEFINE_SAFE_CONVERT_ITOU(IntPtrToULongLong, INT_PTR, ULONGLONG) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToUChar, LONG_PTR, UCHAR) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToUInt8, LONG_PTR, UINT8) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToUShort, LONG_PTR, USHORT) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToUInt, LONG_PTR, UINT) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToULong, LONG_PTR, ULONG) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToUIntPtr, LONG_PTR, UINT_PTR) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToULongPtr, LONG_PTR, ULONG_PTR) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToULongLong, LONG_PTR, ULONGLONG) +DEFINE_SAFE_CONVERT_STOU(Int8ToUChar, INT8, UCHAR) +DEFINE_SAFE_CONVERT_STOU(Int8ToUInt8, INT8, UINT8) +DEFINE_SAFE_CONVERT_STOU(Int8ToUShort, INT8, USHORT) +DEFINE_SAFE_CONVERT_STOU(Int8ToUInt, INT8, UINT) +DEFINE_SAFE_CONVERT_STOU(Int8ToULong, INT8, ULONG) +DEFINE_SAFE_CONVERT_STOU(Int8ToUIntPtr, INT8, UINT_PTR) +DEFINE_SAFE_CONVERT_STOU(Int8ToULongPtr, INT8, ULONG_PTR) +DEFINE_SAFE_CONVERT_STOU(Int8ToULongLong, INT8, ULONGLONG) +DEFINE_SAFE_CONVERT_STOU(ShortToUChar, SHORT, UCHAR) +DEFINE_SAFE_CONVERT_STOU(ShortToUInt8, SHORT, UINT8) +DEFINE_SAFE_CONVERT_STOU(ShortToUShort, SHORT, USHORT) +DEFINE_SAFE_CONVERT_STOU(ShortToUInt, SHORT, UINT) +DEFINE_SAFE_CONVERT_STOU(ShortToULong, SHORT, ULONG) +DEFINE_SAFE_CONVERT_STOU(ShortToUIntPtr, SHORT, UINT_PTR) +DEFINE_SAFE_CONVERT_STOU(ShortToULongPtr, SHORT, ULONG_PTR) +DEFINE_SAFE_CONVERT_STOU(ShortToDWordPtr, SHORT, DWORD_PTR) +DEFINE_SAFE_CONVERT_STOU(ShortToULongLong, SHORT, ULONGLONG) +DEFINE_SAFE_CONVERT_STOU(IntToUChar, INT, UCHAR) +DEFINE_SAFE_CONVERT_STOU(IntToUInt8, INT, UINT8) +DEFINE_SAFE_CONVERT_STOU(IntToUShort, INT, USHORT) +DEFINE_SAFE_CONVERT_STOU(IntToUInt, INT, UINT) +DEFINE_SAFE_CONVERT_STOU(IntToULong, INT, ULONG) +DEFINE_SAFE_CONVERT_STOU(IntToULongLong, INT, ULONGLONG) +DEFINE_SAFE_CONVERT_STOU(LongToUChar, LONG, UCHAR) +DEFINE_SAFE_CONVERT_STOU(LongToUInt8, LONG, UINT8) +DEFINE_SAFE_CONVERT_STOU(LongToUShort, LONG, USHORT) +DEFINE_SAFE_CONVERT_STOU(LongToUInt, LONG, UINT) +DEFINE_SAFE_CONVERT_STOU(LongToULong, LONG, ULONG) +DEFINE_SAFE_CONVERT_STOU(LongToUIntPtr, LONG, UINT_PTR) +DEFINE_SAFE_CONVERT_STOU(LongToULongPtr, LONG, ULONG_PTR) +DEFINE_SAFE_CONVERT_STOU(LongToULongLong, LONG, ULONGLONG) +DEFINE_SAFE_CONVERT_STOU(IntPtrToUChar, INT_PTR, UCHAR) +DEFINE_SAFE_CONVERT_STOU(IntPtrToUInt8, INT_PTR, UINT8) +DEFINE_SAFE_CONVERT_STOU(IntPtrToUShort, INT_PTR, USHORT) +DEFINE_SAFE_CONVERT_STOU(IntPtrToUInt, INT_PTR, UINT) +DEFINE_SAFE_CONVERT_STOU(IntPtrToULong, INT_PTR, ULONG) +DEFINE_SAFE_CONVERT_STOU(IntPtrToUIntPtr, INT_PTR, UINT_PTR) +DEFINE_SAFE_CONVERT_STOU(IntPtrToULongPtr, INT_PTR, ULONG_PTR) +DEFINE_SAFE_CONVERT_STOU(IntPtrToULongLong, INT_PTR, ULONGLONG) +DEFINE_SAFE_CONVERT_STOU(LongPtrToUChar, LONG_PTR, UCHAR) +DEFINE_SAFE_CONVERT_STOU(LongPtrToUInt8, LONG_PTR, UINT8) +DEFINE_SAFE_CONVERT_STOU(LongPtrToUShort, LONG_PTR, USHORT) +DEFINE_SAFE_CONVERT_STOU(LongPtrToUInt, LONG_PTR, UINT) +DEFINE_SAFE_CONVERT_STOU(LongPtrToULong, LONG_PTR, ULONG) +DEFINE_SAFE_CONVERT_STOU(LongPtrToUIntPtr, LONG_PTR, UINT_PTR) +DEFINE_SAFE_CONVERT_STOU(LongPtrToULongPtr, LONG_PTR, ULONG_PTR) +DEFINE_SAFE_CONVERT_STOU(LongPtrToULongLong, LONG_PTR, ULONGLONG) #ifdef _CHAR_UNSIGNED -DEFINE_SAFE_CONVERT_ITOU(ShortToChar, SHORT, UCHAR) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToChar, LONG_PTR, UCHAR) -#endif - - -#define DEFINE_SAFE_CONVERT_ITOI(_Name, _TypeFrom, _TypeTo) \ +DEFINE_SAFE_CONVERT_STOU(ShortToChar, SHORT, UCHAR) +DEFINE_SAFE_CONVERT_STOU(LongPtrToChar, LONG_PTR, UCHAR) +#endif + + +/* Convert signed to signed */ +#define DEFINE_SAFE_CONVERT_STOS(_Name, _TypeFrom, _TypeTo) \ _Must_inspect_result_ \ __forceinline \ INTSAFE_RESULT \ @@ -425,28 +429,28 @@ } \ } -DEFINE_SAFE_CONVERT_ITOI(ShortToInt8, SHORT, INT8) -DEFINE_SAFE_CONVERT_ITOI(IntToInt8, INT, INT8) -DEFINE_SAFE_CONVERT_ITOI(IntToShort, INT, SHORT) -DEFINE_SAFE_CONVERT_ITOI(LongToInt8, LONG, INT8) -DEFINE_SAFE_CONVERT_ITOI(LongToShort, LONG, SHORT) -DEFINE_SAFE_CONVERT_ITOI(LongToInt, LONG, INT) -DEFINE_SAFE_CONVERT_ITOI(IntPtrToInt8, INT_PTR, INT8) -DEFINE_SAFE_CONVERT_ITOI(IntPtrToShort, INT_PTR, SHORT) -DEFINE_SAFE_CONVERT_ITOI(IntPtrToInt, INT_PTR, INT) -DEFINE_SAFE_CONVERT_ITOI(IntPtrToLong, INT_PTR, LONG) -DEFINE_SAFE_CONVERT_ITOI(IntPtrToLongPtr, INT_PTR, LONG_PTR) -DEFINE_SAFE_CONVERT_ITOI(LongPtrToInt8, LONG_PTR, INT8) -DEFINE_SAFE_CONVERT_ITOI(LongPtrToShort, LONG_PTR, SHORT) -DEFINE_SAFE_CONVERT_ITOI(LongPtrToInt, LONG_PTR, INT) -DEFINE_SAFE_CONVERT_ITOI(LongPtrToLong, LONG_PTR, LONG) -DEFINE_SAFE_CONVERT_ITOI(LongPtrToIntPtr, LONG_PTR, INT_PTR) -DEFINE_SAFE_CONVERT_ITOI(LongLongToLong, LONGLONG, LONG) -DEFINE_SAFE_CONVERT_ITOI(LongLongToIntPtr, LONGLONG, INT_PTR) -DEFINE_SAFE_CONVERT_ITOI(LongLongToLongPtr, LONGLONG, LONG_PTR) +DEFINE_SAFE_CONVERT_STOS(ShortToInt8, SHORT, INT8) +DEFINE_SAFE_CONVERT_STOS(IntToInt8, INT, INT8) +DEFINE_SAFE_CONVERT_STOS(IntToShort, INT, SHORT) +DEFINE_SAFE_CONVERT_STOS(LongToInt8, LONG, INT8) +DEFINE_SAFE_CONVERT_STOS(LongToShort, LONG, SHORT) +DEFINE_SAFE_CONVERT_STOS(LongToInt, LONG, INT) +DEFINE_SAFE_CONVERT_STOS(IntPtrToInt8, INT_PTR, INT8) +DEFINE_SAFE_CONVERT_STOS(IntPtrToShort, INT_PTR, SHORT) +DEFINE_SAFE_CONVERT_STOS(IntPtrToInt, INT_PTR, INT) +DEFINE_SAFE_CONVERT_STOS(IntPtrToLong, INT_PTR, LONG) +DEFINE_SAFE_CONVERT_STOS(IntPtrToLongPtr, INT_PTR, LONG_PTR) +DEFINE_SAFE_CONVERT_STOS(LongPtrToInt8, LONG_PTR, INT8) +DEFINE_SAFE_CONVERT_STOS(LongPtrToShort, LONG_PTR, SHORT) +DEFINE_SAFE_CONVERT_STOS(LongPtrToInt, LONG_PTR, INT) +DEFINE_SAFE_CONVERT_STOS(LongPtrToLong, LONG_PTR, LONG) +DEFINE_SAFE_CONVERT_STOS(LongPtrToIntPtr, LONG_PTR, INT_PTR) +DEFINE_SAFE_CONVERT_STOS(LongLongToLong, LONGLONG, LONG) +DEFINE_SAFE_CONVERT_STOS(LongLongToIntPtr, LONGLONG, INT_PTR) +DEFINE_SAFE_CONVERT_STOS(LongLongToLongPtr, LONGLONG, LONG_PTR) #ifndef _CHAR_UNSIGNED -DEFINE_SAFE_CONVERT_ITOI(ShortToChar, SHORT, CHAR) -DEFINE_SAFE_CONVERT_ITOI(LongPtrToChar, LONG_PTR, CHAR) +DEFINE_SAFE_CONVERT_STOS(ShortToChar, SHORT, CHAR) +DEFINE_SAFE_CONVERT_STOS(LongPtrToChar, LONG_PTR, CHAR) #endif @@ -466,6 +470,7 @@ #define RtlInt8ToSIZET RtlInt8ToULongPtr #define RtlIntToSizeT RtlIntToUIntPtr #define RtlIntToSIZET RtlIntToULongPtr +#define RtlULongToSSIZET RtlULongToLongPtr #define RtlULongToByte RtlULongToUInt8 #define RtlULongLongToInt64 RtlULongLongToLongLong #define RtlULongLongToLong64 RtlULongLongToLongLong @@ -502,6 +507,7 @@ #define Int8ToSIZET Int8ToULongPtr #define IntToSizeT IntToUIntPtr #define IntToSIZET IntToULongPtr +#define ULongToSSIZET ULongToLongPtr #define ULongToByte ULongToUInt8 #define ULongLongToInt64 ULongLongToLongLong #define ULongLongToLong64 ULongLongToLongLong @@ -657,7 +663,7 @@ + M1Hi * M2Hi * 0x100000000 * 0x100000000 We get an overflow when - a) M1Hi * M2Hi != 0, so when M1Hi or M2Hi are not 0 + a) M1Hi * M2Hi != 0, so when M1Hi and M2Hi are both not 0 b) The product of the nonzero high part and the other low part is larger than 32 bits. c) The addition of the product from b) shifted left by 32 and @@ -711,6 +717,21 @@ DEFINE_SAFE_MULT_U32(SizeTMult, size_t, ULongLongToSizeT) DEFINE_SAFE_MULT_U32(SIZETMult, SIZE_T, ULongLongToSIZET) #endif + +#define DEFINE_SAFE_MULT_U16(_Name, _Type, _Convert) \ +__checkReturn \ +__forceinline \ +INTSAFE_RESULT \ +INTSAFE_NAME(_Name)( \ + _In_ _Type Multiplicand, \ + _In_ _Type Multiplier, \ + _Out_ _Deref_out_range_(==, Multiplicand * Multiplier) _Type* pOutput) \ +{ \ + ULONG Result = ((ULONG)Multiplicand) * ((ULONG)Multiplier); \ + return INTSAFE_NAME(_Convert)(Result, pOutput); \ +} + +DEFINE_SAFE_MULT_U16(UShortMult, USHORT, ULongToUShort) #ifdef _NTINTSAFE_H_INCLUDED_ @@ -731,6 +752,8 @@ #define RtlULong64Sub RtlULongLongSub #define RtlDWord64Sub RtlULongLongSub #define RtlUInt64Sub RtlULongLongSub +#define RtlUInt16Mult RtlUShortMult +#define RtlWordMult RtlUShortMult #ifdef _WIN64 #define RtlIntPtrSub RtlLongLongSub #define RtlLongPtrSub RtlLongLongSub @@ -757,6 +780,8 @@ #define ULong64Sub ULongLongSub #define DWord64Sub ULongLongSub #define UInt64Sub ULongLongSub +#define UInt16Mult UShortMult +#define WordMult UShortMult #ifdef _WIN64 #define IntPtrSub LongLongSub #define LongPtrSub LongLongSub

11 years, 2 months

← Newer
1
...
26
27
28
29
30
31
32
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2013