Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 72612: [MSVCRT_WINETEST] Sync with Wine Staging 1.9.18.
by akhaldi＠svn.reactos.org 07 Sep '16

07 Sep '16

Author: akhaldi Date: Wed Sep 7 22:34:15 2016 New Revision: 72612 URL: http://svn.reactos.org/svn/reactos?rev=72612&view=rev Log: [MSVCRT_WINETEST] Sync with Wine Staging 1.9.18. Modified: trunk/rostests/winetests/msvcrt/time.c Modified: trunk/rostests/winetests/msvcrt/time.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/time.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/time.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/time.c [iso-8859-1] Wed Sep 7 22:34:15 2016 @@ -746,6 +746,16 @@ ok(retA == 17, "expected 17, got %ld\n", retA); ok(!strcmp(bufA, "02/30/70 00:00:00"), "got %s\n", bufA); } + + if(!setlocale(LC_ALL, "Japanese_Japan.932")) { + win_skip("Japanese_Japan.932 locale not available\n"); + return; + } + + /* test with multibyte character */ + retA = strftime(bufA, 256, "\x82%c", gmt_tm); + ok(retA == 3, "expected 3, got %ld\n", retA); + ok(!strcmp(bufA, "\x82%c"), "got %s\n", bufA); } static void test_asctime(void)

1 0

[akhaldi] 72611: [KERNEL32_WINETEST] Sync with Wine Staging 1.9.18.
by akhaldi＠svn.reactos.org 07 Sep '16

07 Sep '16

Author: akhaldi Date: Wed Sep 7 22:32:56 2016 New Revision: 72611 URL: http://svn.reactos.org/svn/reactos?rev=72611&view=rev Log: [KERNEL32_WINETEST] Sync with Wine Staging 1.9.18. Modified: trunk/rostests/winetests/kernel32/console.c trunk/rostests/winetests/kernel32/fiber.c trunk/rostests/winetests/kernel32/file.c trunk/rostests/winetests/kernel32/loader.c trunk/rostests/winetests/kernel32/locale.c trunk/rostests/winetests/kernel32/path.c trunk/rostests/winetests/kernel32/thread.c trunk/rostests/winetests/kernel32/virtual.c Modified: trunk/rostests/winetests/kernel32/console.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/consol… ============================================================================== --- trunk/rostests/winetests/kernel32/console.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/console.c [iso-8859-1] Wed Sep 7 22:32:56 2016 @@ -906,6 +906,58 @@ /* restore codepage */ SetConsoleOutputCP(oldcp); +} + +static void CALLBACK signaled_function(void *p, BOOLEAN timeout) +{ + HANDLE event = p; + SetEvent(event); + ok(!timeout, "wait shouldn't have timed out\n"); +} + +static void testWaitForConsoleInput(HANDLE input_handle) +{ + HANDLE wait_handle; + HANDLE complete_event; + INPUT_RECORD record; + DWORD events_written; + DWORD wait_ret; + BOOL ret; + + complete_event = CreateEventW(NULL, FALSE, FALSE, NULL); + + /* Test success case */ + ret = RegisterWaitForSingleObject(&wait_handle, input_handle, signaled_function, complete_event, INFINITE, WT_EXECUTEONLYONCE); + ok(ret == TRUE, "Expected RegisterWaitForSingleObject to return TRUE, got %d\n", ret); + /* give worker thread a chance to start up */ + Sleep(100); + record.EventType = KEY_EVENT; + record.Event.KeyEvent.bKeyDown = 1; + record.Event.KeyEvent.wRepeatCount = 1; + record.Event.KeyEvent.wVirtualKeyCode = VK_RETURN; + record.Event.KeyEvent.wVirtualScanCode = VK_RETURN; + record.Event.KeyEvent.uChar.UnicodeChar = '\r'; + record.Event.KeyEvent.dwControlKeyState = 0; + ret = WriteConsoleInputW(input_handle, &record, 1, &events_written); + ok(ret == TRUE, "Expected WriteConsoleInputW to return TRUE, got %d\n", ret); + wait_ret = WaitForSingleObject(complete_event, INFINITE); + ok(wait_ret == WAIT_OBJECT_0, "Expected the handle to be signaled\n"); + ret = UnregisterWait(wait_handle); + /* If the callback is still running, this fails with ERROR_IO_PENDING, but + that's ok and expected. */ + ok(ret != 0 || GetLastError() == ERROR_IO_PENDING, + "UnregisterWait failed with error %d\n", GetLastError()); + + /* Test timeout case */ + FlushConsoleInputBuffer(input_handle); + ret = RegisterWaitForSingleObject(&wait_handle, input_handle, signaled_function, complete_event, INFINITE, WT_EXECUTEONLYONCE); + wait_ret = WaitForSingleObject(complete_event, 100); + ok(wait_ret == WAIT_TIMEOUT, "Expected the wait to time out\n"); + ret = UnregisterWait(wait_handle); + ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); + + /* Clean up */ + ok(CloseHandle(complete_event), "Failed to close event handle, last error %d\n", GetLastError()); } static void test_GetSetConsoleInputExeName(void) @@ -2938,6 +2990,55 @@ todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); } +static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) +{ + HANDLE hmod; + BOOL (WINAPI *pGetConsoleScreenBufferInfoEx)(HANDLE, CONSOLE_SCREEN_BUFFER_INFOEX *); + CONSOLE_SCREEN_BUFFER_INFOEX csbix; + BOOL ret; + HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); + + hmod = GetModuleHandleA("kernel32.dll"); + pGetConsoleScreenBufferInfoEx = (void *)GetProcAddress(hmod, "GetConsoleScreenBufferInfoEx"); + if (!pGetConsoleScreenBufferInfoEx) + { + win_skip("GetConsoleScreenBufferInfoEx is not available\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(NULL, &csbix); + ok(!ret, "got %d, expected zero\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(std_input, &csbix); + ok(!ret, "got %d, expected zero\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(std_output, &csbix); + ok(!ret, "got %d, expected zero\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + csbix.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(NULL, &csbix); + ok(!ret, "got %d, expected zero\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(std_input, &csbix); + ok(!ret, "got %d, expected zero\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(std_output, &csbix); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); +} + START_TEST(console) { static const char font_name[] = "Lucida Console"; @@ -3044,6 +3145,8 @@ testScroll(hConOut, sbi.dwSize); /* will test sb creation / modification / codepage handling */ testScreenBuffer(hConOut); + /* Test waiting for a console handle */ + testWaitForConsoleInput(hConIn); /* clear duplicated console font table */ CloseHandle(hConIn); @@ -3086,4 +3189,5 @@ test_GetLargestConsoleWindowSize(hConOut); test_GetConsoleFontInfo(hConOut); test_SetConsoleFont(hConOut); -} + test_GetConsoleScreenBufferInfoEx(hConOut); +} Modified: trunk/rostests/winetests/kernel32/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/fiber.… ============================================================================== --- trunk/rostests/winetests/kernel32/fiber.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/fiber.c [iso-8859-1] Wed Sep 7 22:32:56 2016 @@ -155,28 +155,20 @@ ok(fiberCount == 1, "Wrong fiber count: %d\n", fiberCount); pDeleteFiber(fibers[1]); - if (!pCreateFiberEx) - { - win_skip( "CreateFiberEx not present\n" ); - return; - } - - fibers[1] = pCreateFiberEx(0,0,0,FiberMainProc,&testparam); - ok(fibers[1] != NULL, "CreateFiberEx failed with error %u\n", GetLastError()); - - pSwitchToFiber(fibers[1]); - ok(fiberCount == 2, "Wrong fiber count: %d\n", fiberCount); - pDeleteFiber(fibers[1]); - - if (!pIsThreadAFiber) - { - win_skip( "IsThreadAFiber not present\n" ); - return; - } - - ok(pIsThreadAFiber(), "IsThreadAFiber reported FALSE\n"); + if (pCreateFiberEx) + { + fibers[1] = pCreateFiberEx(0,0,0,FiberMainProc,&testparam); + ok(fibers[1] != NULL, "CreateFiberEx failed with error %u\n", GetLastError()); + + pSwitchToFiber(fibers[1]); + ok(fiberCount == 2, "Wrong fiber count: %d\n", fiberCount); + pDeleteFiber(fibers[1]); + } + else win_skip( "CreateFiberEx not present\n" ); + + if (pIsThreadAFiber) ok(pIsThreadAFiber(), "IsThreadAFiber reported FALSE\n"); test_ConvertFiberToThread(); - ok(!pIsThreadAFiber(), "IsThreadAFiber reported TRUE\n"); + if (pIsThreadAFiber) ok(!pIsThreadAFiber(), "IsThreadAFiber reported TRUE\n"); } static void test_FiberLocalStorage(void) Modified: trunk/rostests/winetests/kernel32/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/file.c… ============================================================================== --- trunk/rostests/winetests/kernel32/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/file.c [iso-8859-1] Wed Sep 7 22:32:56 2016 @@ -4449,17 +4449,10 @@ else { /* FIXME: Remove once Wine is fixed */ - if ((td[j].access & (GENERIC_READ | GENERIC_WRITE)) || - (!(td[i].access & (GENERIC_WRITE | FILE_WRITE_DATA)) && (td[j].access & FILE_WRITE_DATA)) || - (!(td[i].access & (GENERIC_READ | FILE_READ_DATA)) && (td[j].access & FILE_READ_DATA)) || - (!(td[i].access & (GENERIC_WRITE)) && (td[j].access & FILE_APPEND_DATA))) - { -todo_wine - ok(!ret, "DuplicateHandle(%#x => %#x) should fail\n", td[i].access, td[j].access); -todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); - } - else + todo_wine_if((td[j].access & (GENERIC_READ | GENERIC_WRITE) || + (!(td[i].access & (GENERIC_WRITE | FILE_WRITE_DATA)) && (td[j].access & FILE_WRITE_DATA)) || + (!(td[i].access & (GENERIC_READ | FILE_READ_DATA)) && (td[j].access & FILE_READ_DATA)) || + (!(td[i].access & (GENERIC_WRITE)) && (td[j].access & FILE_APPEND_DATA)))) { ok(!ret, "DuplicateHandle(%#x => %#x) should fail\n", td[i].access, td[j].access); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); Modified: trunk/rostests/winetests/kernel32/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/loader… ============================================================================== --- trunk/rostests/winetests/kernel32/loader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/loader.c [iso-8859-1] Wed Sep 7 22:32:56 2016 @@ -70,6 +70,10 @@ PDELAYLOAD_FAILURE_DLL_CALLBACK, PVOID, PIMAGE_THUNK_DATA ThunkAddress,ULONG); static PVOID (WINAPI *pRtlImageDirectoryEntryToData)(HMODULE,BOOL,WORD,ULONG *); +static DWORD (WINAPI *pFlsAlloc)(PFLS_CALLBACK_FUNCTION); +static BOOL (WINAPI *pFlsSetValue)(DWORD, PVOID); +static PVOID (WINAPI *pFlsGetValue)(DWORD); +static BOOL (WINAPI *pFlsFree)(DWORD); static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { @@ -143,9 +147,9 @@ static IMAGE_SECTION_HEADER section = { ".rodata", /* Name */ - { 0x10 }, /* Misc */ + { 0 }, /* Misc */ 0, /* VirtualAddress */ - 0x0a, /* SizeOfRawData */ + 0, /* SizeOfRawData */ 0, /* PointerToRawData */ 0, /* PointerToRelocations */ 0, /* PointerToLinenumbers */ @@ -196,6 +200,8 @@ assert(nt_header->FileHeader.NumberOfSections <= 1); if (nt_header->FileHeader.NumberOfSections) { + section.SizeOfRawData = 10; + if (nt_header->OptionalHeader.SectionAlignment >= page_size) { section.PointerToRawData = dos_size; @@ -262,9 +268,13 @@ ok( image.CommittedStackSize == nt_header->OptionalHeader.SizeOfStackCommit || broken(truncated), "%u: CommittedStackSize wrong %lx / %lx\n", id, image.CommittedStackSize, (SIZE_T)nt_header->OptionalHeader.SizeOfStackCommit ); - ok( image.SubSystemType == nt_header->OptionalHeader.Subsystem || broken(truncated), - "%u: SubSystemType wrong %08x / %08x\n", id, - image.SubSystemType, nt_header->OptionalHeader.Subsystem ); + if (truncated) + ok( !image.SubSystemType || broken(truncated), + "%u: SubSystemType wrong %08x / 00000000\n", id, image.SubSystemType ); + else + ok( image.SubSystemType == nt_header->OptionalHeader.Subsystem, + "%u: SubSystemType wrong %08x / %08x\n", id, + image.SubSystemType, nt_header->OptionalHeader.Subsystem ); ok( image.SubsystemVersionLow == nt_header->OptionalHeader.MinorSubsystemVersion, "%u: SubsystemVersionLow wrong %04x / %04x\n", id, image.SubsystemVersionLow, nt_header->OptionalHeader.MinorSubsystemVersion ); @@ -1470,6 +1480,7 @@ static DWORD attached_thread_count; HANDLE stop_event, event, mutex, semaphore, loader_lock_event, peb_lock_event, heap_lock_event, ack_event; static int test_dll_phase, inside_loader_lock, inside_peb_lock, inside_heap_lock; +static LONG fls_callback_count; static DWORD WINAPI mutex_thread_proc(void *param) { @@ -1552,9 +1563,18 @@ return 195; } +static VOID WINAPI fls_callback(PVOID lpFlsData) +{ + ok(lpFlsData == (void*) 0x31415, "lpFlsData is %p, expected %p\n", lpFlsData, (void*) 0x31415); + InterlockedIncrement(&fls_callback_count); +} + static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) { static LONG noop_thread_started; + static DWORD fls_index = FLS_OUT_OF_INDEXES; + static int fls_count = 0; + static int thread_detach_count = 0; DWORD ret; ok(!inside_loader_lock, "inside_loader_lock should not be set\n"); @@ -1567,6 +1587,23 @@ ret = pRtlDllShutdownInProgress(); ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); + + /* Set up the FLS slot, if FLS is available */ + if (pFlsGetValue) + { + void* value; + BOOL bret; + ret = pFlsAlloc(&fls_callback); + ok(ret != FLS_OUT_OF_INDEXES, "FlsAlloc returned %d\n", ret); + fls_index = ret; + SetLastError(0xdeadbeef); + value = pFlsGetValue(fls_index); + ok(!value, "FlsGetValue returned %p, expected NULL\n", value); + ok(GetLastError() == ERROR_SUCCESS, "FlsGetValue failed with error %u\n", GetLastError()); + bret = pFlsSetValue(fls_index, (void*) 0x31415); + ok(bret, "FlsSetValue failed\n"); + fls_count++; + } break; case DLL_PROCESS_DETACH: @@ -1619,6 +1656,43 @@ /* FIXME: remove once Wine is fixed */ todo_wine_if (!(expected_code == STILL_ACTIVE || expected_code == 196)) ok(!ret || broken(ret) /* before Vista */, "RtlDllShutdownInProgress returned %d\n", ret); + } + + /* In the case that the process is terminating, FLS slots should still be accessible, but + * the callback should be already run for this thread and the contents already NULL. + * Note that this is broken for Win2k3, which runs the callbacks *after* the DLL entry + * point has already run. + */ + if (param && pFlsGetValue) + { + void* value; + SetLastError(0xdeadbeef); + value = pFlsGetValue(fls_index); + todo_wine + { + ok(broken(value == (void*) 0x31415) || /* Win2k3 */ + value == NULL, "FlsGetValue returned %p, expected NULL\n", value); + } + ok(GetLastError() == ERROR_SUCCESS, "FlsGetValue failed with error %u\n", GetLastError()); + todo_wine + { + ok(broken(fls_callback_count == thread_detach_count) || /* Win2k3 */ + fls_callback_count == thread_detach_count + 1, + "wrong FLS callback count %d, expected %d\n", fls_callback_count, thread_detach_count + 1); + } + } + if (pFlsFree) + { + BOOL ret; + /* Call FlsFree now and run the remaining callbacks from uncleanly terminated threads */ + ret = pFlsFree(fls_index); + ok(ret, "FlsFree failed with error %u\n", GetLastError()); + fls_index = FLS_OUT_OF_INDEXES; + todo_wine + { + ok(fls_callback_count == fls_count, + "wrong FLS callback count %d, expected %d\n", fls_callback_count, fls_count); + } } ok(attached_thread_count >= 2, "attached thread count should be >= 2\n"); @@ -1791,9 +1865,26 @@ 0, TRUE, DUPLICATE_SAME_ACCESS); attached_thread_count++; } + + /* Make sure the FLS slot is empty, if FLS is available */ + if (pFlsGetValue) + { + void* value; + BOOL ret; + SetLastError(0xdeadbeef); + value = pFlsGetValue(fls_index); + ok(!value, "FlsGetValue returned %p, expected NULL\n", value); + todo_wine + ok(GetLastError() == ERROR_SUCCESS, "FlsGetValue failed with error %u\n", GetLastError()); + ret = pFlsSetValue(fls_index, (void*) 0x31415); + ok(ret, "FlsSetValue failed\n"); + fls_count++; + } + break; case DLL_THREAD_DETACH: trace("dll: %p, DLL_THREAD_DETACH, %p\n", hinst, param); + thread_detach_count++; ret = pRtlDllShutdownInProgress(); /* win7 doesn't allow creating a thread during process shutdown but @@ -1805,6 +1896,23 @@ else ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); + /* FLS data should already be destroyed, if FLS is available. + * Note that this is broken for Win2k3, which runs the callbacks *after* the DLL entry + * point has already run. + */ + if (pFlsGetValue && fls_index != FLS_OUT_OF_INDEXES) + { + void* value; + SetLastError(0xdeadbeef); + value = pFlsGetValue(fls_index); + todo_wine + { + ok(broken(value == (void*) 0x31415) || /* Win2k3 */ + !value, "FlsGetValue returned %p, expected NULL\n", value); + } + ok(GetLastError() == ERROR_SUCCESS, "FlsGetValue failed with error %u\n", GetLastError()); + } + break; default: trace("dll: %p, %d, %p\n", hinst, reason, param); @@ -2126,7 +2234,6 @@ } section_data = { 0xb8, dll_entry_point, { 0xff,0xe0 } }; #endif #include "poppack.h" - static const char filler[0x1000]; DWORD dummy, file_align; HANDLE file, thread, process, hmap, hmap_dup; char temp_path[MAX_PATH], dll_name[MAX_PATH], cmdline[MAX_PATH * 2]; @@ -2603,7 +2710,7 @@ ok(!!pd->ThunkAddress, "no ThunkAddress supplied\n"); if (pd->ThunkAddress) - ok(pd->ThunkAddress->u1.Ordinal == 0, "expected 0, got %x\n", (UINT)pd->ThunkAddress->u1.Ordinal); + ok(pd->ThunkAddress->u1.Ordinal, "no ThunkAddress value supplied\n"); ok(!!pd->TargetDllName, "no TargetDllName supplied\n"); if (pd->TargetDllName) @@ -2628,7 +2735,6 @@ { static const char test_dll[] = "secur32.dll"; static const char test_func[] = "SealMessage"; - static const char filler[0x1000]; char temp_path[MAX_PATH]; char dll_name[MAX_PATH]; IMAGE_DELAYLOAD_DESCRIPTOR idd, *delaydir; @@ -2722,7 +2828,8 @@ /* sections */ section.PointerToRawData = nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress; section.VirtualAddress = nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress; - section.Misc.VirtualSize = nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].Size; + section.Misc.VirtualSize = 2 * sizeof(idd); + section.SizeOfRawData = section.Misc.VirtualSize; section.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ; SetLastError(0xdeadbeef); ret = WriteFile(hfile, &section, sizeof(section), &dummy, NULL); @@ -2734,18 +2841,14 @@ section.Misc.VirtualSize = sizeof(test_dll) + sizeof(hint) + sizeof(test_func) + sizeof(HMODULE) + 2 * (i + 1) * sizeof(IMAGE_THUNK_DATA); ok(section.Misc.VirtualSize <= 0x1000, "Too much tests, add a new section!\n"); + section.SizeOfRawData = section.Misc.VirtualSize; section.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE; SetLastError(0xdeadbeef); ret = WriteFile(hfile, &section, sizeof(section), &dummy, NULL); ok(ret, "WriteFile error %d\n", GetLastError()); /* fill up to delay data */ - file_size = GetFileSize(hfile, NULL); - SetLastError(0xdeadbeef); - ret = WriteFile(hfile, filler, - nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress - file_size, - &dummy, NULL); - ok(ret, "WriteFile error %d\n", GetLastError()); + SetFilePointer( hfile, nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress, NULL, SEEK_SET ); /* delay data */ idd.Attributes.AllAttributes = 1; @@ -2766,10 +2869,7 @@ ok(ret, "WriteFile error %d\n", GetLastError()); /* fill up to extended delay data */ - file_size = GetFileSize(hfile, NULL); - SetLastError(0xdeadbeef); - ret = WriteFile(hfile, filler, idd.DllNameRVA - file_size, &dummy, NULL); - ok(ret, "WriteFile error %d\n", GetLastError()); + SetFilePointer( hfile, idd.DllNameRVA, NULL, SEEK_SET ); /* extended delay data */ SetLastError(0xdeadbeef); @@ -2784,9 +2884,20 @@ ret = WriteFile(hfile, test_func, sizeof(test_func), &dummy, NULL); ok(ret, "WriteFile error %d\n", GetLastError()); - file_size = GetFileSize(hfile, NULL); - SetLastError(0xdeadbeef); - ret = WriteFile(hfile, filler, idd.ImportNameTableRVA - file_size, &dummy, NULL); + SetFilePointer( hfile, idd.ImportAddressTableRVA, NULL, SEEK_SET ); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + /* 0x1a00 is an empty space between delay data and extended delay data, real thunks are not necessary */ + itd32.u1.Function = nt_header.OptionalHeader.ImageBase + 0x1a00 + i * 0x20; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &itd32, sizeof(itd32), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + } + + itd32.u1.Function = 0; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &itd32, sizeof(itd32), &dummy, NULL); ok(ret, "WriteFile error %d\n", GetLastError()); for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) @@ -2806,10 +2917,8 @@ ok(ret, "WriteFile error %d\n", GetLastError()); /* fill up to eof */ - file_size = GetFileSize(hfile, NULL); - SetLastError(0xdeadbeef); - ret = WriteFile(hfile, filler, section.VirtualAddress + section.Misc.VirtualSize - file_size, &dummy, NULL); - ok(ret, "WriteFile error %d\n", GetLastError()); + SetFilePointer( hfile, section.VirtualAddress + section.Misc.VirtualSize, NULL, SEEK_SET ); + SetEndOfFile( hfile ); CloseHandle(hfile); SetLastError(0xdeadbeef); @@ -2902,10 +3011,11 @@ { int argc; char **argv; - HANDLE ntdll, mapping; + HANDLE ntdll, mapping, kernel32; SYSTEM_INFO si; ntdll = GetModuleHandleA("ntdll.dll"); + kernel32 = GetModuleHandleA("kernel32.dll"); pNtCreateSection = (void *)GetProcAddress(ntdll, "NtCreateSection"); pNtQuerySection = (void *)GetProcAddress(ntdll, "NtQuerySection"); pNtMapViewOfSection = (void *)GetProcAddress(ntdll, "NtMapViewOfSection"); @@ -2922,7 +3032,11 @@ pRtlAcquirePebLock = (void *)GetProcAddress(ntdll, "RtlAcquirePebLock"); pRtlReleasePebLock = (void *)GetProcAddress(ntdll, "RtlReleasePebLock"); pRtlImageDirectoryEntryToData = (void *)GetProcAddress(ntdll, "RtlImageDirectoryEntryToData"); - pResolveDelayLoadedAPI = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "ResolveDelayLoadedAPI"); + pFlsAlloc = (void *)GetProcAddress(kernel32, "FlsAlloc"); + pFlsSetValue = (void *)GetProcAddress(kernel32, "FlsSetValue"); + pFlsGetValue = (void *)GetProcAddress(kernel32, "FlsGetValue"); + pFlsFree = (void *)GetProcAddress(kernel32, "FlsFree"); + pResolveDelayLoadedAPI = (void *)GetProcAddress(kernel32, "ResolveDelayLoadedAPI"); GetSystemInfo( &si ); page_size = si.dwPageSize; Modified: trunk/rostests/winetests/kernel32/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/locale… ============================================================================== --- trunk/rostests/winetests/kernel32/locale.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/locale.c [iso-8859-1] Wed Sep 7 22:32:56 2016 @@ -102,6 +102,7 @@ static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static BOOL (WINAPI *pGetThreadPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static WCHAR (WINAPI *pRtlUpcaseUnicodeChar)(WCHAR); +static INT (WINAPI *pGetNumberFormatEx)(LPCWSTR, DWORD, LPCWSTR, const NUMBERFMTW *, LPWSTR, int); static void InitFunctionPointers(void) { @@ -132,6 +133,7 @@ X(EnumSystemGeoID); X(GetSystemPreferredUILanguages); X(GetThreadPreferredUILanguages); + X(GetNumberFormatEx); mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); @@ -1590,6 +1592,188 @@ ret = GetNumberFormatA(lcid, NUO, input, NULL, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_LENA; EXPECT_EQA; + } +} + +static void test_GetNumberFormatEx(void) +{ + int ret; + NUMBERFMTW format; + static WCHAR dotW[] = {'.',0}; + static WCHAR commaW[] = {',',0}; + static const WCHAR enW[] = {'e','n','-','U','S',0}; + static const WCHAR frW[] = {'f','r','-','F','R',0}; + static const WCHAR bogusW[] = {'b','o','g','u','s',0}; + WCHAR buffer[BUFFER_SIZE], input[BUFFER_SIZE], Expected[BUFFER_SIZE]; + + if (!pGetNumberFormatEx) + { + win_skip("GetNumberFormatEx is not available.\n"); + return; + } + + STRINGSW("23",""); /* NULL output, length > 0 --> Error */ + ret = pGetNumberFormatEx(enW, 0, input, NULL, NULL, COUNTOF(buffer)); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + STRINGSW("23,53",""); /* Invalid character --> Error */ + ret = pGetNumberFormatEx(enW, 0, input, NULL, buffer, COUNTOF(buffer)); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + STRINGSW("--",""); /* Double '-' --> Error */ + ret = pGetNumberFormatEx(enW, 0, input, NULL, buffer, COUNTOF(buffer)); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + STRINGSW("0-",""); /* Trailing '-' --> Error */ + ret = pGetNumberFormatEx(enW, 0, input, NULL, buffer, COUNTOF(buffer)); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + STRINGSW("0..",""); /* Double '.' --> Error */ + ret = pGetNumberFormatEx(enW, 0, input, NULL, buffer, COUNTOF(buffer)); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + STRINGSW(" 0.1",""); /* Leading space --> Error */ + ret = pGetNumberFormatEx(enW, 0, input, NULL, buffer, COUNTOF(buffer)); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + STRINGSW("1234","1"); /* Length too small --> Write up to length chars */ + ret = pGetNumberFormatEx(enW, NUO, input, NULL, buffer, 2); + ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + STRINGSW("23",""); /* Bogus locale --> Error */ + ret = pGetNumberFormatEx(bogusW, NUO, input, NULL, buffer, COUNTOF(buffer)); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + memset(&format, 0, sizeof(format)); + + STRINGSW("2353",""); /* Format and flags given --> Error */ + ret = pGetNumberFormatEx(enW, NUO, input, &format, buffer, COUNTOF(buffer)); + ok( !ret, "Expected ret == 0, got %d\n", ret); + ok( GetLastError() == ERROR_INVALID_FLAGS || GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); + + STRINGSW("2353",""); /* Invalid format --> Error */ + ret = pGetNumberFormatEx(enW, 0, input, &format, buffer, COUNTOF(buffer)); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + STRINGSW("2353","2,353.00"); /* Valid number */ + ret = pGetNumberFormatEx(enW, NUO, input, NULL, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; + + STRINGSW("-2353","-2,353.00"); /* Valid negative number */ + ret = pGetNumberFormatEx(enW, NUO, input, NULL, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; + + STRINGSW("-353","-353.00"); /* test for off by one error in grouping */ + ret = pGetNumberFormatEx(enW, NUO, input, NULL, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; + + STRINGSW("2353.1","2,353.10"); /* Valid real number */ + ret = pGetNumberFormatEx(enW, NUO, input, NULL, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; + + STRINGSW("2353.111","2,353.11"); /* Too many DP --> Truncated */ + ret = pGetNumberFormatEx(enW, NUO, input, NULL, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; + + STRINGSW("2353.119","2,353.12"); /* Too many DP --> Rounded */ + ret = pGetNumberFormatEx(enW, NUO, input, NULL, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; + + format.NumDigits = 0; /* No decimal separator */ + format.LeadingZero = 0; + format.Grouping = 0; /* No grouping char */ + format.NegativeOrder = 0; + format.lpDecimalSep = dotW; + format.lpThousandSep = commaW; + + STRINGSW("2353","2353"); /* No decimal or grouping chars expected */ + ret = pGetNumberFormatEx(enW, 0, input, &format, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; + + format.NumDigits = 1; /* 1 DP --> Expect decimal separator */ + STRINGSW("2353","2353.0"); + ret = pGetNumberFormatEx(enW, 0, input, &format, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; + + format.Grouping = 2; /* Group by 100's */ + STRINGSW("2353","23,53.0"); + ret = pGetNumberFormatEx(enW, 0, input, &format, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; + + STRINGSW("235","235.0"); /* Grouping of a positive number */ + format.Grouping = 3; + ret = pGetNumberFormatEx(enW, 0, input, &format, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; + + STRINGSW("-235","-235.0"); /* Grouping of a negative number */ + format.NegativeOrder = NEG_LEFT; + ret = pGetNumberFormatEx(enW, 0, input, &format, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; + + format.LeadingZero = 1; /* Always provide leading zero */ + STRINGSW(".5","0.5"); + ret = pGetNumberFormatEx(enW, 0, input, &format, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; + + format.NegativeOrder = NEG_PARENS; + STRINGSW("-1","(1.0)"); + ret = pGetNumberFormatEx(enW, 0, input, &format, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; + + format.NegativeOrder = NEG_LEFT; + STRINGSW("-1","-1.0"); + ret = pGetNumberFormatEx(enW, 0, input, &format, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; + + format.NegativeOrder = NEG_LEFT_SPACE; + STRINGSW("-1","- 1.0"); + ret = pGetNumberFormatEx(enW, 0, input, &format, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; + + format.NegativeOrder = NEG_RIGHT; + STRINGSW("-1","1.0-"); + ret = pGetNumberFormatEx(enW, 0, input, &format, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; + + format.NegativeOrder = NEG_RIGHT_SPACE; + STRINGSW("-1","1.0 -"); + ret = pGetNumberFormatEx(enW, 0, input, &format, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; + + if (pIsValidLocaleName(frW)) + { + STRINGSW("-12345","-12 345,00"); /* Try French formatting */ + Expected[3] = 160; /* Non breaking space */ + ret = pGetNumberFormatEx(frW, NUO, input, NULL, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENW; EXPECT_EQW; } } @@ -4102,7 +4286,7 @@ static void test_GetLocaleInfoEx(void) { static const WCHAR enW[] = {'e','n',0}; - WCHAR bufferW[80]; + WCHAR bufferW[80], buffer2[80]; INT ret; if (!pGetLocaleInfoEx) @@ -4173,6 +4357,12 @@ ok(!lstrcmpW(bufferW, ptr->name), "%s: got wrong LOCALE_SNAME %s\n", wine_dbgstr_w(ptr->name), wine_dbgstr_w(bufferW)); ptr++; } + + ret = pGetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_SNAME, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + ok(ret && ret == lstrlenW(bufferW)+1, "got ret value %d\n", ret); + ret = GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_SNAME, buffer2, sizeof(buffer2)/sizeof(WCHAR)); + ok(ret && ret == lstrlenW(buffer2)+1, "got ret value %d\n", ret); + ok(!lstrcmpW(bufferW, buffer2), "LOCALE_SNAMEs don't match %s %s\n", wine_dbgstr_w(bufferW), wine_dbgstr_w(buffer2)); } } @@ -4853,6 +5043,7 @@ test_GetDateFormatW(); test_GetCurrencyFormatA(); /* Also tests the W version */ test_GetNumberFormatA(); /* Also tests the W version */ + test_GetNumberFormatEx(); test_CompareStringA(); test_CompareStringW(); test_CompareStringEx(); Modified: trunk/rostests/winetests/kernel32/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/path.c… ============================================================================== --- trunk/rostests/winetests/kernel32/path.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/path.c [iso-8859-1] Wed Sep 7 22:32:56 2016 @@ -187,15 +187,8 @@ len=pGetLongPathNameA(fullpath,tmpstr,MAX_PATH); if(passfail==NULL) { ok(len, "%s: GetLongPathNameA failed\n",errstr); - if(HAS_TRAIL_SLASH_A(fullpath)) { - ok(lstrcmpiA(fullpathlong,tmpstr)==0, - "%s: GetLongPathNameA returned '%s' instead of '%s'\n", - errstr,tmpstr,fullpathlong); - } else { - ok(lstrcmpiA(fullpathlong,tmpstr)==0, - "%s: GetLongPathNameA returned '%s' instead of '%s'\n", - errstr,tmpstr,fullpathlong); - } + ok(!lstrcmpiA(fullpathlong, tmpstr), "%s: GetLongPathNameA returned '%s' instead of '%s'\n", + errstr, tmpstr, fullpathlong); } else { passfail->longlen=len; passfail->longerror=GetLastError(); @@ -952,6 +945,28 @@ test_ShortPathCase(curdir,SHORTDIR,LONGFILE); test_ShortPathCase(curdir,LONGDIR,SHORTFILE); test_ShortPathCase(curdir,LONGDIR,LONGFILE); + + /* test double delimiters */ + sprintf(tmpstr,"%s\\\\%s", SHORTDIR,SHORTFILE); + ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + sprintf(tmpstr,".\\\\%s\\\\%s", SHORTDIR,SHORTFILE); + ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + + if (pGetLongPathNameA) { + sprintf(tmpstr,"%s\\\\%s",LONGDIR,LONGFILE); + ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + + sprintf(tmpstr,".\\\\%s\\\\%s",LONGDIR,LONGFILE); + ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + } } static void test_GetTempPathA(char* tmp_dir) @@ -2216,6 +2231,16 @@ ok(ret, "GetShortPathName error %d\n", GetLastError()); ok(!strcmp(buf, ".\\..\\foo\\file"), "expected .\\..\\foo\\file, got %s\n", buf); + /* test double delimiters */ + strcpy(buf, "deadbeef"); + ret = pGetLongPathNameA("..\\\\foo\\file", buf, MAX_PATH); + ok(ret, "GetLongPathName error %d\n", GetLastError()); + ok(!strcmp(buf, "..\\\\foo\\file"), "expected ..\\\\foo\\file, got %s\n", buf); + strcpy(buf, "deadbeef"); + ret = GetShortPathNameA("..\\\\foo\\file", buf, MAX_PATH); + ok(ret, "GetShortPathName error %d\n", GetLastError()); + ok(!strcmp(buf, "..\\\\foo\\file"), "expected ..\\\\foo\\file, got %s\n", buf); + SetCurrentDirectoryA(".."); DeleteFileA("foo\\file"); RemoveDirectoryA("foo"); Modified: trunk/rostests/winetests/kernel32/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/thread… ============================================================================== --- trunk/rostests/winetests/kernel32/thread.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/thread.c [iso-8859-1] Wed Sep 7 22:32:56 2016 @@ -1318,33 +1318,64 @@ ret = pUnregisterWait(wait_handle); ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); -} - -static DWORD TLS_main; -static DWORD TLS_index0, TLS_index1; - -static DWORD WINAPI TLS_InheritanceProc(LPVOID p) -{ - /* We should NOT inherit the TLS values from our parent or from the + + SetLastError(0xdeadbeef); + ret = pUnregisterWait(NULL); + ok(!ret, "Expected UnregisterWait to fail\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); +} + +static DWORD LS_main; +static DWORD LS_index0, LS_index1; +static DWORD LS_OutOfIndexesValue; + +/* Function pointers to the FLS/TLS functions to test in LS_ThreadProc() */ +static DWORD (WINAPI *LS_AllocFunc)(void); +static PVOID (WINAPI *LS_GetValueFunc)(DWORD); +static BOOL (WINAPI *LS_SetValueFunc)(DWORD, PVOID); +static BOOL (WINAPI *LS_FreeFunc)(DWORD); + +/* Names of the functions tested in LS_ThreadProc(), for error messages */ +static const char* LS_AllocFuncName = ""; +static const char* LS_GetValueFuncName = ""; +static const char* LS_SetValueFuncName = ""; +static const char* LS_FreeFuncName = ""; + +/* FLS entry points, dynamically loaded in platforms that support them */ +static DWORD (WINAPI *pFlsAlloc)(PFLS_CALLBACK_FUNCTION); +static BOOL (WINAPI *pFlsFree)(DWORD); +static PVOID (WINAPI *pFlsGetValue)(DWORD); +static BOOL (WINAPI *pFlsSetValue)(DWORD,PVOID); + +/* A thunk function to make FlsAlloc compatible with the signature of TlsAlloc */ +static DWORD WINAPI FLS_AllocFuncThunk(void) +{ + return pFlsAlloc(NULL); +} + +static DWORD WINAPI LS_InheritanceProc(LPVOID p) +{ + /* We should NOT inherit the FLS/TLS values from our parent or from the main thread. */ LPVOID val; - val = TlsGetValue(TLS_main); - ok(val == NULL, "TLS inheritance failed\n"); - - val = TlsGetValue(TLS_index0); - ok(val == NULL, "TLS inheritance failed\n"); - - val = TlsGetValue(TLS_index1); - ok(val == NULL, "TLS inheritance failed\n"); + val = LS_GetValueFunc(LS_main); + ok(val == NULL, "%s inheritance failed\n", LS_GetValueFuncName); + + val = LS_GetValueFunc(LS_index0); + ok(val == NULL, "%s inheritance failed\n", LS_GetValueFuncName); + + val = LS_GetValueFunc(LS_index1); + ok(val == NULL, "%s inheritance failed\n", LS_GetValueFuncName); return 0; } -/* Basic TLS usage test. Make sure we can create slots and the values we - store in them are separate among threads. Also test TLS value - inheritance with TLS_InheritanceProc. */ -static DWORD WINAPI TLS_ThreadProc(LPVOID p) +/* Basic FLS/TLS usage test. Make sure we can create slots and the values we + store in them are separate among threads. Also test FLS/TLS value + inheritance with LS_InheritanceProc. */ +static DWORD WINAPI LS_ThreadProc(LPVOID p) { LONG_PTR id = (LONG_PTR) p; LPVOID val; @@ -1352,80 +1383,80 @@ if (sync_threads_and_run_one(0, id)) { - TLS_index0 = TlsAlloc(); - ok(TLS_index0 != TLS_OUT_OF_INDEXES, "TlsAlloc failed\n"); + LS_index0 = LS_AllocFunc(); + ok(LS_index0 != LS_OutOfIndexesValue, "%s failed\n", LS_AllocFuncName); } resync_after_run(); if (sync_threads_and_run_one(1, id)) { - TLS_index1 = TlsAlloc(); - ok(TLS_index1 != TLS_OUT_OF_INDEXES, "TlsAlloc failed\n"); + LS_index1 = LS_AllocFunc(); + ok(LS_index1 != LS_OutOfIndexesValue, "%s failed\n", LS_AllocFuncName); /* Slot indices should be different even if created in different threads. */ - ok(TLS_index0 != TLS_index1, "TlsAlloc failed\n"); + ok(LS_index0 != LS_index1, "%s failed\n", LS_AllocFuncName); /* Both slots should be initialized to NULL */ - val = TlsGetValue(TLS_index0); - ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); - ok(val == NULL, "TLS slot not initialized correctly\n"); - - val = TlsGetValue(TLS_index1); - ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); - ok(val == NULL, "TLS slot not initialized correctly\n"); + val = LS_GetValueFunc(LS_index0); + ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); + ok(val == NULL, "Slot not initialized correctly\n"); + + val = LS_GetValueFunc(LS_index1); + ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); + ok(val == NULL, "Slot not initialized correctly\n"); } resync_after_run(); if (sync_threads_and_run_one(0, id)) { - val = TlsGetValue(TLS_index0); - ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); - ok(val == NULL, "TLS slot not initialized correctly\n"); - - val = TlsGetValue(TLS_index1); - ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); - ok(val == NULL, "TLS slot not initialized correctly\n"); - - ret = TlsSetValue(TLS_index0, (LPVOID) 1); - ok(ret, "TlsSetValue failed\n"); - - ret = TlsSetValue(TLS_index1, (LPVOID) 2); - ok(ret, "TlsSetValue failed\n"); - - val = TlsGetValue(TLS_index0); - ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); - ok(val == (LPVOID) 1, "TLS slot not initialized correctly\n"); - - val = TlsGetValue(TLS_index1); - ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); - ok(val == (LPVOID) 2, "TLS slot not initialized correctly\n"); + val = LS_GetValueFunc(LS_index0); + ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); + ok(val == NULL, "Slot not initialized correctly\n"); + + val = LS_GetValueFunc(LS_index1); + ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); + ok(val == NULL, "Slot not initialized correctly\n"); + + ret = LS_SetValueFunc(LS_index0, (LPVOID) 1); + ok(ret, "%s failed\n", LS_SetValueFuncName); + + ret = LS_SetValueFunc(LS_index1, (LPVOID) 2); + ok(ret, "%s failed\n", LS_SetValueFuncName); + + val = LS_GetValueFunc(LS_index0); + ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); + ok(val == (LPVOID) 1, "Slot not initialized correctly\n"); + + val = LS_GetValueFunc(LS_index1); + ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); + ok(val == (LPVOID) 2, "Slot not initialized correctly\n"); } resync_after_run(); if (sync_threads_and_run_one(1, id)) { - val = TlsGetValue(TLS_index0); - ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); - ok(val == NULL, "TLS slot not initialized correctly\n"); - - val = TlsGetValue(TLS_index1); - ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); - ok(val == NULL, "TLS slot not initialized correctly\n"); - - ret = TlsSetValue(TLS_index0, (LPVOID) 3); - ok(ret, "TlsSetValue failed\n"); - - ret = TlsSetValue(TLS_index1, (LPVOID) 4); - ok(ret, "TlsSetValue failed\n"); - - val = TlsGetValue(TLS_index0); - ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); - ok(val == (LPVOID) 3, "TLS slot not initialized correctly\n"); - - val = TlsGetValue(TLS_index1); - ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); - ok(val == (LPVOID) 4, "TLS slot not initialized correctly\n"); + val = LS_GetValueFunc(LS_index0); + ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); + ok(val == NULL, "Slot not initialized correctly\n"); + + val = LS_GetValueFunc(LS_index1); + ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); + ok(val == NULL, "Slot not initialized correctly\n"); + + ret = LS_SetValueFunc(LS_index0, (LPVOID) 3); + ok(ret, "%s failed\n", LS_SetValueFuncName); + + ret = LS_SetValueFunc(LS_index1, (LPVOID) 4); + ok(ret, "%s failed\n", LS_SetValueFuncName); + + val = LS_GetValueFunc(LS_index0); + ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); + ok(val == (LPVOID) 3, "Slot not initialized correctly\n"); + + val = LS_GetValueFunc(LS_index1); + ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); + ok(val == (LPVOID) 4, "Slot not initialized correctly\n"); } resync_after_run(); @@ -1434,36 +1465,36 @@ HANDLE thread; DWORD waitret, tid; - val = TlsGetValue(TLS_index0); - ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); - ok(val == (LPVOID) 1, "TLS slot not initialized correctly\n"); - - val = TlsGetValue(TLS_index1); - ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); - ok(val == (LPVOID) 2, "TLS slot not initialized correctly\n"); - - thread = CreateThread(NULL, 0, TLS_InheritanceProc, 0, 0, &tid); + val = LS_GetValueFunc(LS_index0); + ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); + ok(val == (LPVOID) 1, "Slot not initialized correctly\n"); + + val = LS_GetValueFunc(LS_index1); + ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); + ok(val == (LPVOID) 2, "Slot not initialized correctly\n"); + + thread = CreateThread(NULL, 0, LS_InheritanceProc, 0, 0, &tid); ok(thread != NULL, "CreateThread failed\n"); waitret = WaitForSingleObject(thread, 60000); ok(waitret == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(thread); - ret = TlsFree(TLS_index0); - ok(ret, "TlsFree failed\n"); + ret = LS_FreeFunc(LS_index0); + ok(ret, "%s failed\n", LS_FreeFuncName); } resync_after_run(); if (sync_threads_and_run_one(1, id)) { - ret = TlsFree(TLS_index1); - ok(ret, "TlsFree failed\n"); + ret = LS_FreeFunc(LS_index1); + ok(ret, "%s failed\n", LS_FreeFuncName); } resync_after_run(); return 0; } -static void test_TLS(void) +static void run_LS_tests(void) { HANDLE threads[2]; LONG_PTR i; @@ -1472,17 +1503,17 @@ init_thread_sync_helpers(); - /* Allocate a TLS slot in the main thread to test for inheritance. */ - TLS_main = TlsAlloc(); - ok(TLS_main != TLS_OUT_OF_INDEXES, "TlsAlloc failed\n"); - suc = TlsSetValue(TLS_main, (LPVOID) 4114); - ok(suc, "TlsSetValue failed\n"); + /* Allocate a slot in the main thread to test for inheritance. */ + LS_main = LS_AllocFunc(); + ok(LS_main != LS_OutOfIndexesValue, "%s failed\n", LS_AllocFuncName); + suc = LS_SetValueFunc(LS_main, (LPVOID) 4114); + ok(suc, "%s failed\n", LS_SetValueFuncName); for (i = 0; i < 2; ++i) { DWORD tid; - threads[i] = CreateThread(NULL, 0, TLS_ThreadProc, (LPVOID) i, 0, &tid); + threads[i] = CreateThread(NULL, 0, LS_ThreadProc, (LPVOID) i, 0, &tid); ok(threads[i] != NULL, "CreateThread failed\n"); } @@ -1492,9 +1523,49 @@ for (i = 0; i < 2; ++i) CloseHandle(threads[i]); - suc = TlsFree(TLS_main); - ok(suc, "TlsFree failed\n"); + suc = LS_FreeFunc(LS_main); + ok(suc, "%s failed\n", LS_FreeFuncName); cleanup_thread_sync_helpers(); +} + +static void test_TLS(void) +{ + LS_OutOfIndexesValue = TLS_OUT_OF_INDEXES; + + LS_AllocFunc = &TlsAlloc; + LS_GetValueFunc = &TlsGetValue; + LS_SetValueFunc = &TlsSetValue; + LS_FreeFunc = &TlsFree; + + LS_AllocFuncName = "TlsAlloc"; + LS_GetValueFuncName = "TlsGetValue"; + LS_SetValueFuncName = "TlsSetValue"; + LS_FreeFuncName = "TlsFree"; + + run_LS_tests(); +} + +static void test_FLS(void) +{ + if (!pFlsAlloc || !pFlsFree || !pFlsGetValue || !pFlsSetValue) + { + win_skip("Fiber Local Storage not supported\n"); + return; + } + + LS_OutOfIndexesValue = FLS_OUT_OF_INDEXES; + + LS_AllocFunc = &FLS_AllocFuncThunk; + LS_GetValueFunc = pFlsGetValue; + LS_SetValueFunc = pFlsSetValue; + LS_FreeFunc = pFlsFree; + + LS_AllocFuncName = "FlsAlloc"; + LS_GetValueFuncName = "FlsGetValue"; + LS_SetValueFuncName = "FlsSetValue"; + LS_FreeFuncName = "FlsFree"; + + run_LS_tests(); } static void test_ThreadErrorMode(void) @@ -2018,6 +2089,11 @@ X(GetThreadGroupAffinity); X(SetThreadGroupAffinity); + + X(FlsAlloc); + X(FlsFree); + X(FlsSetValue); + X(FlsGetValue); #undef X #define X(f) p##f = (void*)GetProcAddress(ntdll, #f) @@ -2085,6 +2161,7 @@ test_QueueUserWorkItem(); test_RegisterWaitForSingleObject(); test_TLS(); + test_FLS(); test_ThreadErrorMode(); #if (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))) || (defined(_MSC_VER) && defined(__i386__)) test_thread_fpu_cw(); Modified: trunk/rostests/winetests/kernel32/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtua… ============================================================================== --- trunk/rostests/winetests/kernel32/virtual.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/virtual.c [iso-8859-1] Wed Sep 7 22:32:56 2016 @@ -2799,10 +2799,7 @@ ret = send_message_excpt( hWnd, WM_USER, 0, 0 ); ok( ret == 43, "call returned wrong result, expected 43, got %d\n", ret ); ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); - if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION)) - ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); - else - ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); /* Now a bit more complicated, the page containing the code is protected with * PAGE_GUARD memory protection. */ @@ -4109,14 +4106,7 @@ } if (!strcmp(argv[2], "sharedmemro")) { - if(!winetest_interactive) - { - skip("CORE-8541: Skipping test_shared_memory_ro(TRUE, strtol(argv[3], NULL, 16))\n"); - } - else - { - test_shared_memory_ro(TRUE, strtol(argv[3], NULL, 16)); - } + test_shared_memory_ro(TRUE, strtol(argv[3], NULL, 16)); return; } while (1)

1 0

[akhaldi] 72610: [GDI32_WINETEST] Sync with Wine Staging 1.9.18.
by akhaldi＠svn.reactos.org 07 Sep '16

07 Sep '16

Author: akhaldi Date: Wed Sep 7 22:12:51 2016 New Revision: 72610 URL: http://svn.reactos.org/svn/reactos?rev=72610&view=rev Log: [GDI32_WINETEST] Sync with Wine Staging 1.9.18. Modified: trunk/rostests/winetests/gdi32/dib.c Modified: trunk/rostests/winetests/gdi32/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/dib.c?rev… ============================================================================== --- trunk/rostests/winetests/gdi32/dib.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/dib.c [iso-8859-1] Wed Sep 7 22:12:51 2016 @@ -132,7 +132,7 @@ "a1fe9aa885584a0f713d7c6f76c89830fbf28563", "d7085333becdec7759a5229e5fe9ba1e11db0c22", "aaf62842bb98d8a2945c4f643baf50afaeea9307", - "287b2f2f2fb5a1d7ee4a29b43342103d78a7a8ab", + "d7e34fa02db7ad52327f80389bd1ba1b72b6c692", "d7dd4700f49808541bba99244b7eb5840e0a2439", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "568f87f0194ca19b69a5b2bcdef795d89c5721ce", @@ -205,7 +205,7 @@ "a1fe9aa885584a0f713d7c6f76c89830fbf28563", "d7085333becdec7759a5229e5fe9ba1e11db0c22", "aaf62842bb98d8a2945c4f643baf50afaeea9307", - "287b2f2f2fb5a1d7ee4a29b43342103d78a7a8ab", + "d7e34fa02db7ad52327f80389bd1ba1b72b6c692", "d7dd4700f49808541bba99244b7eb5840e0a2439", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "568f87f0194ca19b69a5b2bcdef795d89c5721ce", @@ -278,7 +278,7 @@ "88fd743d00bd37d2ed722092146795b044d08a6e", "c0537ec24147e74939219213d864ee113cad9967", "118bf4c5bddc206ba737f7aa8b239940cd1aadc2", - "7cb51f6c5f1dae926601986c934533df5f8baa9f", + "eac5d164b83edf2cf85bac242686f9f617ec1fa4", "86c84cc8306975edecc6d4a89a8aff29f59b55a7", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "25675c30adfe24d6cae60793b156dfdaa36ac3ba", @@ -351,7 +351,7 @@ "0790585dfaef94f912b1ee81477d4ac448708708", "589fb8a85d924ad19ed78409ae89475ba479c30a", "43d67bc61ef54014b022891e5c024fc24b1fe797", - "e8783644428b637adbe80bcd084a33428cb69983", + "5a713a91fd471fd331bd13b0868c994aa2ffe2b2", "fc0c32afb719295f28bcfef22803bef94f798e20", "36f6db4fbe2a1630a7597d3a446f2902755c96ef", "d3f08946300e1700865042aed121870e292d1095", @@ -424,7 +424,7 @@ "47499ad13b719de18c59c2bc9b38ed578db50b95", "643e82ac67ab2b0c034a3fcfa498b072a5f2be5c", "cd01f2c0a63b2229d4467d2f874d58edca32b3d4", - "94b54f1da5212b3f3a1195eda5ea927e160bc89d", + "8ad5cd520cd628b76d2e5a3f318ae1bbb6b4c994", "49341c297a887186bd47d7465d827ab3147f05e3", "325279e76367200d3fd7194d81c09fd139988ece", "c3def160a1e847605ff0fc7edd30397fa90635a0", @@ -497,7 +497,7 @@ "80086808fca03e757d812e31d1ae576bf90dac9d", "9560096f1b85ae6d939d736165c44df00a47c424", "1015e0217ea13eaa62c7666b8b81aafd75f8f610", - "93e1aec608e037af3bfb7bd32dde446abe4eea11", + "5578c80048520732557abf3a3a3fa22c85015d7d", "b25ba91487ec945410deb2b51bc1156890c032a8", "d347ca5c6c4b6a61389247c3b6f61564033e8c25", "ee315634ed92da3a32c2675ecd1b369471c60936", @@ -573,7 +573,7 @@ "059db9f0426b371e464ef3d30f1a4f4aa599e101", "a52d6ceee5c2a04b4e059c0d49337a997cc17e40", "aa4a0a4b7f2697aaf270c89874631974bd9d7183", - "585061e403d9cac1603a38af420efe87338f381a", + "a7506e2c001d271593297c9eda9b984d4d894774", "8f447a3820c83662086dfa836da2205b0130fd5f", "3772003c7fb420003512d0c437b3659d96d89ce4", "dab47c9dc149e570045d699598b14a613bf319b3", @@ -646,7 +646,7 @@ "8c40d6d8e0c696c31f04c896e492a2a38703d870", "e13c821c236ea0b67cca64c9da7be15e88fc712f", "9af4907a8144458a73dbb7471784f8c3d9aeffcf", - "e4731b63d41f6b51e30752ea52d85c4a2938731b", + "104e85bad287a62dfe25f0e78280179f18bac765", "f0acb3cfcda62e95bee5f7bc8830ffeb3dd7e5a7", "07b10c3f191d0a93e5e5694aae37dcad407e10f5", "f7900e60347029876ba55e8f0c4c02e89deb36b6", @@ -724,7 +724,7 @@ "46f772c2832b3aad584674db666bd63e48b4f338", "a9f9ca0049235db51ab7359a5fc3d21be42d2aac", "f3dc739da41fb299637c8660e8c46917ddcf87a8", - "eae47bf865d932f22a6e59b6fe8d041f220e1fbc", + "abd2fff80f74b311072ecdb91ce9ceba268fa6e9", "9ae38bb94c7b4c0c6dfebbee23d1de4db9b77488", "678979a45126a76eb629992cd64734862f53a555", "2f7ba8803604c032cb1a1228bc021f0f1c03e245", @@ -806,7 +806,7 @@ "640a49455acabca6954a7fbb6af4e872af342d11", "589e7911e09332ee090371deae17b0120ff990b5", "a1a941fa270cda48c648553ed4b427e16e96f8e0", - "f30a8d9f73ca043c5bfc18d9595e299fc0a39eec", + "115c90df05b1ff754dbdfe2a712ef126034d952d", "fb63bbb2f944fb63ed2d7399f07b168740c1034b", "3685c9ae95118a83db3569832c29753276fa1264", "09640bad951c33e7d70a1fced83b1869f65b3fc5", @@ -883,7 +883,7 @@ "9e996fc74eeef53f0a6c31aabb2edce6e103f189", "6b8abd1785304d6531c1e4cc65c1ffcdcb2196a5", "7d1bfff706b0713e53209407889f83a0da26a81d", - "31e667c2dbb81dcf81d01cb88f794e88ddb90ff2", + "5a1d8f9ea978b820edbc5c9e1c6f1cac022620ad", "31e667c2dbb81dcf81d01cb88f794e88ddb90ff2", "465d9cd0a77ab4fcf035aa67544b2a26269e0b09", "600d6b2713d5e4c0d90c02660245ed26c7ae3033", @@ -955,7 +955,7 @@ "7811c536a6527112b438a6413f3927f2c79086a7", "525ef3615040225752a2fe646ab99ee64e360630", "46760975993f9881b7bbe94123173e6a683d3f25", - "df5feb905a31c288008cf5e82d73ac818a160d82", + "c644f460937107214a88d5eb9e846d27abd8c874", "df5feb905a31c288008cf5e82d73ac818a160d82", "d8af3868c66c7d6dac35ec8ee0317b38a6910bb1", "ec8e2aebfb4a1c28ebcd0e053b9e4d8638b50951", @@ -1027,7 +1027,7 @@ "2f3fb1bd8f416198d70e06f6d519571cd5eb4ef4", "cc96ccaf6b99f60a49b03017515f83cba22b4c40", "5eeb56afea8040a8fb18c11f29931b836474126d", - "a3405c085fc2f2184bcd0d1edcdcc66927e33659", + "30c256a783c4874261667bb31307eb282ab9470e", "f8681c09f1abfc38d31e47622cb8798cd896a00e", "b5ee51cfc73acb59a2f6124509ea236f8fc7f9f7", "d374d4d92c940ae42a9b42c14d744341b68a8c14", @@ -1117,7 +1117,7 @@ "ee22f43ea867228c6ff937d39e1826e285a107e8", "832c3c3afd056e5d1cdfb2f466f27225c4adcc6c", "a2a928de9007d765da496abec8c21b23601f8c45", - "28ded40e72d4327b9413571476b167fb28a1f420", + "41a417c1f25f2619301afa44bfcde85198985792", "23366004515f3bc46796ea505d748f8d0f97fbe1", "88763f8e8fcf4f78fa864325791a9dd35a0bd279", "013cee26bac8f815eadad4bfc012d9b5d01c3b7f", @@ -1191,7 +1191,7 @@ { 100, 100, 356, 356 }, { 100, 100, 356, 356 }, { 100, 100, 356, 356 }, - { 100, 100, 356, 356 }, + { 10, 10, 356, 356 }, { 100, 100, 356, 356 }, { 10, 10, 416, 26 }, { 10, 8, 60, 104 }, @@ -2402,6 +2402,12 @@ src_bits[(y * 256 + x) / 8] = 7 * x + 3 * y; BitBlt( hdc, 100, 100, 256, 256, src_dc, 0, 0, SRCCOPY ); + /* Some interesting src co-ords */ + BitBlt( hdc, 10, 10, 3, 10, src_dc, 0, 0, SRCCOPY ); + BitBlt( hdc, 20, 10, 3, 10, src_dc, 2, 0, SRCCOPY ); + BitBlt( hdc, 30, 10, 3, 10, src_dc, 5, 0, SRCCOPY ); + BitBlt( hdc, 40, 10, 3, 10, src_dc, 6, 0, SRCCOPY ); + BitBlt( hdc, 50, 10, 20, 10, src_dc, 6, 0, SRCCOPY ); compare_hash(hdc, bmi, bits, "BitBlt src 1-bpp SRCCOPY" ); blend.SourceConstantAlpha = 0x90;

1 0

[dchapyshev] 72609: [NTOS] - Add missed _SEH2_YIELD's
by dchapyshev＠svn.reactos.org 07 Sep '16

07 Sep '16

Author: dchapyshev Date: Wed Sep 7 18:52:09 2016 New Revision: 72609 URL: http://svn.reactos.org/svn/reactos?rev=72609&view=rev Log: [NTOS] - Add missed _SEH2_YIELD's Modified: trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/ex/locale.c trunk/reactos/ntoskrnl/lpc/port.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ps/quota.c trunk/reactos/ntoskrnl/se/audit.c trunk/reactos/ntoskrnl/se/sid.c trunk/reactos/ntoskrnl/se/token.c trunk/reactos/ntoskrnl/wmi/wmidrv.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -1545,16 +1545,16 @@ { *ResultLength = FIELD_OFFSET(KEY_NAME_INFORMATION, Name) + NeededLength; if (Length < RTL_SIZEOF_THROUGH_FIELD(KEY_NAME_INFORMATION, NameLength)) - return STATUS_BUFFER_TOO_SMALL; + _SEH2_YIELD(return STATUS_BUFFER_TOO_SMALL); if (Length < *ResultLength) { KeyNameInfo->NameLength = NeededLength; - return STATUS_BUFFER_OVERFLOW; + _SEH2_YIELD(return STATUS_BUFFER_OVERFLOW); } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -1597,7 +1597,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -1058,7 +1058,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; Modified: trunk/reactos/ntoskrnl/ex/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/locale.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -432,7 +432,7 @@ _SEH2_EXCEPT(ExSystemExceptionFilter()) { /* Return exception code */ - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; Modified: trunk/reactos/ntoskrnl/lpc/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/port.c?rev=72… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -152,7 +152,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { DPRINT1("Got exception!\n"); - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; } Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -785,7 +785,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { DPRINT1("Got exception!\n"); - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; } Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -4321,7 +4321,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; } Modified: trunk/reactos/ntoskrnl/ps/quota.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=72… ============================================================================== --- trunk/reactos/ntoskrnl/ps/quota.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/quota.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -335,7 +335,7 @@ (CapturedQuotaLimits.Flags & QUOTA_LIMITS_HARDWS_MAX_DISABLE))) { DPRINT1("Invalid quota flags: 0x%lx\n", CapturedQuotaLimits.Flags); - return STATUS_INVALID_PARAMETER; + _SEH2_YIELD(return STATUS_INVALID_PARAMETER); } /* Verify that the caller didn't pass reserved values */ @@ -351,19 +351,19 @@ CapturedQuotaLimits.Reserved3, CapturedQuotaLimits.Reserved4, CapturedQuotaLimits.CpuRateLimit.RateData); - return STATUS_INVALID_PARAMETER; + _SEH2_YIELD(return STATUS_INVALID_PARAMETER); } } else { DPRINT1("Invalid quota size: 0x%lx\n", QuotaLimitsLength); - return STATUS_INFO_LENGTH_MISMATCH; + _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { DPRINT1("Exception while copying data\n"); - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; Modified: trunk/reactos/ntoskrnl/se/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/audit.c?rev=72… ============================================================================== --- trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -306,7 +306,7 @@ { ExFreePoolWithTag(*CapturedObjectTypeList, TAG_SEPA); *CapturedObjectTypeList = NULL; - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -501,7 +501,7 @@ { Status = _SEH2_GetExceptionCode(); DPRINT1("Exception while probing parameters: 0x%lx\n", Status); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -1137,7 +1137,7 @@ { Status = _SEH2_GetExceptionCode(); DPRINT1("Exception while probing parameters: 0x%lx\n", Status); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -1351,7 +1351,7 @@ { Status = _SEH2_GetExceptionCode(); DPRINT1("Got exception 0x%lx\n", Status); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; Modified: trunk/reactos/ntoskrnl/se/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sid.c?rev=7260… ============================================================================== --- trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -414,7 +414,7 @@ if (((Sid->Revision & 0xF) != SID_REVISION) || (Sid->SubAuthorityCount > SID_MAX_SUB_AUTHORITIES)) { - return STATUS_INVALID_SID; + _SEH2_YIELD(return STATUS_INVALID_SID); } /* Calculate the SID length and probe the full SID */ @@ -427,7 +427,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; } Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=72… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -1832,7 +1832,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -1872,7 +1872,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -1912,7 +1912,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -1979,7 +1979,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -2006,7 +2006,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -2090,7 +2090,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -2125,7 +2125,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -2593,7 +2593,7 @@ { /* Do cleanup and return the exception code */ Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -2621,7 +2621,7 @@ { /* Do cleanup and return the exception code */ Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -2751,7 +2751,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Return the exception code */ - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; } Modified: trunk/reactos/ntoskrnl/wmi/wmidrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmidrv.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -144,7 +144,7 @@ /* Check if the object name has the expected length */ if (CapturedObjectName->Length != 45 * sizeof(WCHAR)) { - return STATUS_INVALID_PARAMETER; + _SEH2_YIELD(return STATUS_INVALID_PARAMETER); } /* Probe and copy the object name buffer */ @@ -162,7 +162,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { DPRINT1("Got exception!\n"); - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END;

1 0

[dchapyshev] 72608: [NTOS:EX] - Use ExAcquirePushLockShared instead ExAcquirePushLockExclusive (and move it outside enumeration) - Don't leave a enumeration at ReqSize > Size. It is used for calcul...
by dchapyshev＠svn.reactos.org 07 Sep '16

07 Sep '16

Author: dchapyshev Date: Wed Sep 7 17:34:17 2016 New Revision: 72608 URL: http://svn.reactos.org/svn/reactos?rev=72608&view=rev Log: [NTOS:EX] - Use ExAcquirePushLockShared instead ExAcquirePushLockExclusive (and move it outside enumeration) - Don't leave a enumeration at ReqSize > Size. It is used for calculation of the size - ObjectHeader->Type field currupted and I do not know who spoils it. Commented. - Remove unneeded SEH Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Wed Sep 7 17:34:17 2016 @@ -222,7 +222,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExFreePoolWithTag(Mdl, TAG_MDL); - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -1171,14 +1171,19 @@ QSI_DEF(SystemHandleInformation) { PSYSTEM_HANDLE_INFORMATION HandleInformation; + PLIST_ENTRY NextTableEntry; + PHANDLE_TABLE HandleTable; + PHANDLE_TABLE_ENTRY HandleTableEntry; + EXHANDLE Handle; ULONG Index = 0; NTSTATUS Status; PMDL Mdl; + PAGED_CODE(); DPRINT("NtQuerySystemInformation - SystemHandleInformation\n"); /* Set initial required buffer size */ - *ReqSize = sizeof(SYSTEM_HANDLE_INFORMATION); + *ReqSize = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION, Handles); /* Check user's buffer size */ if (Size < *ReqSize) @@ -1199,116 +1204,94 @@ return Status; } - _SEH2_TRY - { - PLIST_ENTRY NextTableEntry; - - /* Reset of count of handles */ - HandleInformation->NumberOfHandles = 0; - - /* Enumerate all system handles */ - for (NextTableEntry = HandleTableListHead.Flink; - NextTableEntry != &HandleTableListHead; - NextTableEntry = NextTableEntry->Flink) - { - PHANDLE_TABLE HandleTable; - - /* Enter a critical region */ - KeEnterCriticalRegion(); - - /* Acquire the handle table lock */ - ExAcquirePushLockExclusive(&HandleTableListLock); - - /* Get current handle table */ - HandleTable = CONTAINING_RECORD(NextTableEntry, HANDLE_TABLE, HandleTableList); - - _SEH2_TRY + /* Reset of count of handles */ + HandleInformation->NumberOfHandles = 0; + + /* Enter a critical region */ + KeEnterCriticalRegion(); + + /* Acquire the handle table lock */ + ExAcquirePushLockShared(&HandleTableListLock); + + /* Enumerate all system handles */ + for (NextTableEntry = HandleTableListHead.Flink; + NextTableEntry != &HandleTableListHead; + NextTableEntry = NextTableEntry->Flink) + { + /* Get current handle table */ + HandleTable = CONTAINING_RECORD(NextTableEntry, HANDLE_TABLE, HandleTableList); + + /* Set the initial value and loop the entries */ + Handle.Value = 0; + while ((HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, Handle))) + { + /* Validate the entry */ + if ((HandleTableEntry->Object) && + (HandleTableEntry->NextFreeTableEntry != -2)) { - PHANDLE_TABLE_ENTRY HandleTableEntry; - EXHANDLE Handle; - - /* Set the initial value and loop the entries */ - Handle.Value = 0; - while ((HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, Handle))) + /* Increase of count of handles */ + ++HandleInformation->NumberOfHandles; + + /* Lock the entry */ + if (ExpLockHandleTableEntry(HandleTable, HandleTableEntry)) { - /* Validate the entry */ - if ((HandleTableEntry->Object) && - (HandleTableEntry->NextFreeTableEntry != -2)) + /* Increase required buffer size */ + *ReqSize += sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO); + + /* Check user's buffer size */ + if (*ReqSize > Size) { - /* Increase of count of handles */ - ++HandleInformation->NumberOfHandles; - - /* Increase required buffer size */ - *ReqSize += sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO); - - /* Check user's buffer size */ - if (*ReqSize > Size) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - /* Lock the entry */ - if (ExpLockHandleTableEntry(HandleTable, HandleTableEntry)) - { - _SEH2_TRY - { - POBJECT_HEADER ObjectHeader = ObpGetHandleObject(HandleTableEntry); - - /* Filling handle information */ - HandleInformation->Handles[Index].UniqueProcessId = - (USHORT)(ULONG_PTR) HandleTable->UniqueProcessId; - - HandleInformation->Handles[Index].CreatorBackTraceIndex = 0; - - HandleInformation->Handles[Index].ObjectTypeIndex = - (UCHAR) ObjectHeader->Type->Index; - - HandleInformation->Handles[Index].HandleAttributes = - HandleTableEntry->ObAttributes & OBJ_HANDLE_ATTRIBUTES; - - HandleInformation->Handles[Index].HandleValue = - (USHORT)(ULONG_PTR) Handle.GenericHandleOverlay; - - HandleInformation->Handles[Index].Object = &ObjectHeader->Body; - - HandleInformation->Handles[Index].GrantedAccess = - HandleTableEntry->GrantedAccess; - - ++Index; - } - _SEH2_FINALLY - { - /* Unlock it */ - ExUnlockHandleTableEntry(HandleTable, HandleTableEntry); - } - _SEH2_END; - } + Status = STATUS_INFO_LENGTH_MISMATCH; } - - /* Go to the next entry */ - Handle.Value += sizeof(HANDLE); + else + { + POBJECT_HEADER ObjectHeader = ObpGetHandleObject(HandleTableEntry); + + /* Filling handle information */ + HandleInformation->Handles[Index].UniqueProcessId = + (USHORT)(ULONG_PTR) HandleTable->UniqueProcessId; + + HandleInformation->Handles[Index].CreatorBackTraceIndex = 0; + +#if 0 /* FIXME!!! Type field currupted */ + HandleInformation->Handles[Index].ObjectTypeIndex = + (UCHAR) ObjectHeader->Type->Index; +#else + HandleInformation->Handles[Index].ObjectTypeIndex = 0; +#endif + + HandleInformation->Handles[Index].HandleAttributes = + HandleTableEntry->ObAttributes & OBJ_HANDLE_ATTRIBUTES; + + HandleInformation->Handles[Index].HandleValue = + (USHORT)(ULONG_PTR) Handle.GenericHandleOverlay; + + HandleInformation->Handles[Index].Object = &ObjectHeader->Body; + + HandleInformation->Handles[Index].GrantedAccess = + HandleTableEntry->GrantedAccess; + + ++Index; + } + + /* Unlock it */ + ExUnlockHandleTableEntry(HandleTable, HandleTableEntry); } } - _SEH2_FINALLY - { - /* Release the lock */ - ExReleasePushLockExclusive(&HandleTableListLock); - - /* Leave the critical region */ - KeLeaveCriticalRegion(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) break; - } - } - _SEH2_FINALLY - { - /* Release the locked user buffer */ - ExUnlockUserBuffer(Mdl); - } - _SEH2_END; + + /* Go to the next entry */ + Handle.Value += sizeof(HANDLE); + } + } + + /* Release the lock */ + ExReleasePushLockShared(&HandleTableListLock); + + /* Leave the critical region */ + KeLeaveCriticalRegion(); + + /* Release the locked user buffer */ + ExUnlockUserBuffer(Mdl); return Status; }

1 0

[aandrejevic] 72607: [VGADDI] Explain how VGA write mode 2 works. No code changes! CORE-8164
by aandrejevic＠svn.reactos.org 07 Sep '16

07 Sep '16

Author: aandrejevic Date: Wed Sep 7 14:38:58 2016 New Revision: 72607 URL: http://svn.reactos.org/svn/reactos?rev=72607&view=rev Log: [VGADDI] Explain how VGA write mode 2 works. No code changes! CORE-8164 Modified: trunk/reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.c Modified: trunk/reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.c [iso-8859-1] Wed Sep 7 14:38:58 2016 @@ -681,6 +681,19 @@ i += 8, off++; while (i < w) { + /* + * In write mode 2, the incoming data is 4-bit and represents the + * value of entire bytes on each of the 4 memory planes. First, VGA + * performs a logical operation on these bytes and the value of the + * latch register, but in this case there is none. Then, only the + * bits that are set in the bit mask are used from the resulting + * bytes, and the other bits are taken from the latch register. + * + * The latch register always contains the value previously read from + * VGA memory, and therefore, we must first read from vp[off] to + * load the latch register, and then write bp[i] to vp[off], which + * will be converted to 4 bytes of VGA memory as described. + */ dummy = vp[off]; dummy = bp[i]; vp[off] = dummy;

1 0

[akhaldi] 72606: [CRT] Sync _cputs() with Wine Staging 1.9.16. CORE-11866 CORE-8546
by akhaldi＠svn.reactos.org 07 Sep '16

07 Sep '16

Author: akhaldi Date: Wed Sep 7 09:31:52 2016 New Revision: 72606 URL: http://svn.reactos.org/svn/reactos?rev=72606&view=rev Log: [CRT] Sync _cputs() with Wine Staging 1.9.16. CORE-11866 CORE-8546 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/lib/crt/conio/cputs.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Sep 7 09:31:52 2016 @@ -287,6 +287,7 @@ reactos/dll/win32/kernel32/winnls/string/sortkey.c # Synced to WineStaging-1.9.16 msvcrt - + reactos/sdk/lib/crt/conio/cputs.c # Synced to WineStaging-1.9.16 reactos/sdk/lib/crt/except/cpp.c # Synced at 20080528 reactos/sdk/lib/crt/except/cppexcept.c # Synced at 20071111 reactos/sdk/lib/crt/process/_cwait.c # Synced to WineStaging-1.7.37 Modified: trunk/reactos/sdk/lib/crt/conio/cputs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/conio/cputs.c?… ============================================================================== --- trunk/reactos/sdk/lib/crt/conio/cputs.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/conio/cputs.c [iso-8859-1] Wed Sep 7 09:31:52 2016 @@ -1,26 +1,29 @@ -/* - * COPYRIGHT: LGPL - See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/sdk/crt/conio/cputs.c - * PURPOSE: Writes a character to stdout - * PROGRAMER: Aleksey Bragin - */ +/* Imported from msvcrt/console.c */ #include <precomp.h> -/* - * @implemented +/********************************************************************* + * _cputs (MSVCRT.@) */ -int _cputs(const char *_str) +int CDECL _cputs(const char* str) { DWORD count; - int retval = EOF; - HANDLE console_out = GetStdHandle(STD_OUTPUT_HANDLE); + int len, retval = -1; +#ifdef __REACTOS__ /* r54651 */ + HANDLE MSVCRT_console_out = GetStdHandle(STD_OUTPUT_HANDLE); +#endif - //LOCK_CONSOLE; - if (WriteConsoleA(console_out, _str, strlen(_str), &count, NULL) - && count == 1) + if (!MSVCRT_CHECK_PMT(str != NULL)) return -1; + len = strlen(str); + +#ifndef __REACTOS__ /* r54651 */ + LOCK_CONSOLE; +#endif + if (WriteConsoleA(MSVCRT_console_out, str, len, &count, NULL) + && count == len) retval = 0; - //UNLOCK_CONSOLE; +#ifndef __REACTOS__ /* r54651 */ + UNLOCK_CONSOLE; +#endif return retval; }

1 0

[jimtabor] 72605: [Win32k] - Fix a crash while running modified stress test with explorer. See CORE-11913.
by jimtabor＠svn.reactos.org 07 Sep '16

07 Sep '16

Author: jimtabor Date: Wed Sep 7 06:33:44 2016 New Revision: 72605 URL: http://svn.reactos.org/svn/reactos?rev=72605&view=rev Log: [Win32k] - Fix a crash while running modified stress test with explorer. See CORE-11913. Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Wed Sep 7 06:33:44 2016 @@ -4137,9 +4137,12 @@ if (mt.TopMenu->fFlags & MNF_POPUP) { PWND pwndTM = ValidateHwndNoErr(mt.TopMenu->hWnd); - IntNotifyWinEvent(EVENT_SYSTEM_MENUPOPUPEND, pwndTM, OBJID_CLIENT, CHILDID_SELF, 0); - - co_UserDestroyWindow(pwndTM); + if (pwndTM) + { + IntNotifyWinEvent(EVENT_SYSTEM_MENUPOPUPEND, pwndTM, OBJID_CLIENT, CHILDID_SELF, 0); + + co_UserDestroyWindow(pwndTM); + } mt.TopMenu->hWnd = NULL; if (!(wFlags & TPM_NONOTIFY))

1 0

[jimtabor] 72604: [NtGdi] - Remove Path for MoveTo and Polyline. It is not needed. - Fix build.
by jimtabor＠svn.reactos.org 07 Sep '16

07 Sep '16

Author: jimtabor Date: Wed Sep 7 03:24:12 2016 New Revision: 72604 URL: http://svn.reactos.org/svn/reactos?rev=72604&view=rev Log: [NtGdi] - Remove Path for MoveTo and Polyline. It is not needed. - Fix build. Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] Wed Sep 7 03:24:12 2016 @@ -1702,7 +1702,7 @@ POINT pt; IntGetCurrentPositionEx(dc, &pt); IntDPtoLP(dc, &pt, 1); - IntGdiMoveToEx(dc, pt.x, pt.y, NULL, FALSE); + IntGdiMoveToEx(dc, pt.x, pt.y, NULL); } DPRINT("Leave %s, ret=%d\n", __FUNCTION__, ret); return ret;

1 0

[jimtabor] 72603: [NtGdi] - Remove Path for MoveTo. It is not needed.
by jimtabor＠svn.reactos.org 07 Sep '16

07 Sep '16

Author: jimtabor Date: Wed Sep 7 03:20:18 2016 New Revision: 72603 URL: http://svn.reactos.org/svn/reactos?rev=72603&view=rev Log: [NtGdi] - Remove Path for MoveTo. It is not needed. Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c trunk/reactos/win32ss/gdi/ntgdi/intgdi.h trunk/reactos/win32ss/gdi/ntgdi/line.c trunk/reactos/win32ss/gdi/ntgdi/path.h Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/arc.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] Wed Sep 7 03:20:18 2016 @@ -238,9 +238,9 @@ if (arctype == GdiTypeArcTo) { if (dc->dclevel.flPath & DCPATH_CLOCKWISE) - IntGdiMoveToEx(dc, XStartArc, YStartArc, NULL, TRUE); + IntGdiMoveToEx(dc, XStartArc, YStartArc, NULL); else - IntGdiMoveToEx(dc, XEndArc, YEndArc, NULL, TRUE); + IntGdiMoveToEx(dc, XEndArc, YEndArc, NULL); } return Ret; } @@ -285,7 +285,7 @@ if (result) { - IntGdiMoveToEx(pDC, x2, y2, NULL, TRUE); + IntGdiMoveToEx(pDC, x2, y2, NULL); } return result; } Modified: trunk/reactos/win32ss/gdi/ntgdi/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/intgdi.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] Wed Sep 7 03:20:18 2016 @@ -25,8 +25,7 @@ IntGdiMoveToEx(DC *dc, int X, int Y, - LPPOINT Point, - BOOL BypassPath); + LPPOINT Point); BOOL FASTCALL IntGdiPolyBezier(DC *dc, Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Wed Sep 7 03:20:18 2016 @@ -19,10 +19,8 @@ IntGdiMoveToEx(DC *dc, int X, int Y, - LPPOINT Point, - BOOL BypassPath) -{ - BOOL PathIsOpen; + LPPOINT Point) +{ PDC_ATTR pdcattr = dc->pdcattr; if ( Point ) { @@ -43,13 +41,6 @@ pdcattr->ptfxCurrent = pdcattr->ptlCurrent; CoordLPtoDP(dc, &pdcattr->ptfxCurrent); // Update fx pdcattr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE); - - if (BypassPath) return TRUE; - - PathIsOpen = PATH_IsPathOpen(dc->dclevel); - - if ( PathIsOpen ) - return PATH_MoveTo ( dc ); return TRUE; } @@ -67,7 +58,7 @@ EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } - Ret = IntGdiMoveToEx(dc, x, y, pptOut, TRUE); + Ret = IntGdiMoveToEx(dc, x, y, pptOut); DC_UnlockDc(dc); return Ret; } @@ -108,16 +99,6 @@ if (PATH_IsPathOpen(dc->dclevel)) { Ret = PATH_LineTo(dc, XEnd, YEnd); - if (Ret) - { - // FIXME: PATH_LineTo should maybe do this? No - pdcattr->ptlCurrent.x = XEnd; - pdcattr->ptlCurrent.y = YEnd; - pdcattr->ptfxCurrent = pdcattr->ptlCurrent; - CoordLPtoDP(dc, &pdcattr->ptfxCurrent); // Update fx - pdcattr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE); - } - return Ret; } else { @@ -257,9 +238,6 @@ return FALSE; } - if (PATH_IsPathOpen(dc->dclevel)) - return PATH_Polyline(dc, pt, Count); - DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); psurf = dc->dclevel.pSurface; @@ -355,8 +333,9 @@ pc = PolyPoints; if (PATH_IsPathOpen(dc->dclevel)) + { return PATH_PolyPolyline( dc, pt, PolyPoints, Count ); - + } for (i = 0; i < Count; i++) { ret = IntGdiPolyline ( dc, pts, *pc ); @@ -544,7 +523,7 @@ } if (num_pts >= 2) IntGdiPolyline( dc, line_pts, num_pts ); - IntGdiMoveToEx( dc, line_pts[num_pts - 1].x, line_pts[num_pts - 1].y, NULL, TRUE ); + IntGdiMoveToEx( dc, line_pts[num_pts - 1].x, line_pts[num_pts - 1].y, NULL ); result = TRUE; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -592,7 +571,7 @@ pdc = DC_LockDc(hdc); if (!pdc) return FALSE; - Ret = IntGdiMoveToEx(pdc, x, y, &Point, TRUE); + Ret = IntGdiMoveToEx(pdc, x, y, &Point); if (Ret && pptOut) { Modified: trunk/reactos/win32ss/gdi/ntgdi/path.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.h [iso-8859-1] Wed Sep 7 03:20:18 2016 @@ -54,7 +54,6 @@ BOOL FASTCALL PATH_Ellipse (PDC dc, INT x1, INT y1, INT x2, INT y2); VOID FASTCALL PATH_EmptyPath (PPATH pPath); BOOL FASTCALL PATH_LineTo (PDC dc, INT x, INT y); -BOOL FASTCALL PATH_MoveTo (PDC dc); BOOL FASTCALL PATH_PolyBezier (PDC dc, const POINT *pts, DWORD cbPoints); BOOL FASTCALL PATH_PolyBezierTo (PDC dc, const POINT *pts, DWORD cbPoints); BOOL FASTCALL PATH_PolyDraw(PDC dc, const POINT *pts, const BYTE *types, DWORD cbPoints);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs