Ros-diffs November 2017

ros-diffs@reactos.org

22 participants
186 discussions

[reactos] 01/02: [ROSTESTS] Start adding ReactOS-owned tests for cmd.exe, based on Wine's. CORE-7998

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8dd89c7cfcfb6abc51d87… commit 8dd89c7cfcfb6abc51d873a4aeafa91510513f1c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Nov 17 00:56:01 2017 +0100 [ROSTESTS] Start adding ReactOS-owned tests for cmd.exe, based on Wine's. CORE-7998 Based on Wine's cmd_winetest code, this first bunch of tests check how the "for" command should process the newlines inside its parenthesed set. Adapted by Doug Lyons. --- modules/rostests/CMakeLists.txt | 2 +- modules/rostests/win32/CMakeLists.txt | 1 + modules/rostests/win32/cmd/CMakeLists.txt | 11 + modules/rostests/win32/cmd/README.txt | 1 + modules/rostests/win32/cmd/batch.c | 481 +++++++++++++++++++++++ modules/rostests/win32/cmd/rsrc.rc | 24 ++ modules/rostests/win32/cmd/test_builtins.cmd | 30 ++ modules/rostests/win32/cmd/test_builtins.cmd.exp | 27 ++ modules/rostests/win32/cmd/testlist.c | 12 + 9 files changed, 588 insertions(+), 1 deletion(-) diff --git a/modules/rostests/CMakeLists.txt b/modules/rostests/CMakeLists.txt index 1f8062b9ff..1635a64c82 100644 --- a/modules/rostests/CMakeLists.txt +++ b/modules/rostests/CMakeLists.txt @@ -13,7 +13,7 @@ add_subdirectory(kmtests) #add_subdirectory(regtests) add_subdirectory(rosautotest) add_subdirectory(tests) -#add_subdirectory(win32) +add_subdirectory(win32) add_subdirectory(winetests) diff --git a/modules/rostests/win32/CMakeLists.txt b/modules/rostests/win32/CMakeLists.txt index 73e15e25a0..7fc9c96f73 100644 --- a/modules/rostests/win32/CMakeLists.txt +++ b/modules/rostests/win32/CMakeLists.txt @@ -1,3 +1,4 @@ add_subdirectory(advapi32) +add_subdirectory(cmd) add_subdirectory(kernel32) add_subdirectory(user32) diff --git a/modules/rostests/win32/cmd/CMakeLists.txt b/modules/rostests/win32/cmd/CMakeLists.txt new file mode 100644 index 0000000000..d0f9ab1517 --- /dev/null +++ b/modules/rostests/win32/cmd/CMakeLists.txt @@ -0,0 +1,11 @@ +add_definitions(-D__ROS_LONG64__) + +list(APPEND SOURCE + batch.c + testlist.c + rsrc.rc) + +add_executable(cmd_rostest ${SOURCE}) +set_module_type(cmd_rostest win32cui) +add_importlibs(cmd_rostest msvcrt kernel32) +add_rostests_file(TARGET cmd_rostest) diff --git a/modules/rostests/win32/cmd/README.txt b/modules/rostests/win32/cmd/README.txt new file mode 100644 index 0000000000..5ab52b3f4d --- /dev/null +++ b/modules/rostests/win32/cmd/README.txt @@ -0,0 +1 @@ +Cloned from Wine's cmd_winetest code. \ No newline at end of file diff --git a/modules/rostests/win32/cmd/batch.c b/modules/rostests/win32/cmd/batch.c new file mode 100644 index 0000000000..e1db7c9ec9 --- /dev/null +++ b/modules/rostests/win32/cmd/batch.c @@ -0,0 +1,481 @@ +/* + * Copyright 2009 Dan Kegel + * Copyright 2010 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +//#include <windows.h> +#include <stdio.h> + +#include <wine/test.h> +#include <winnls.h> + +static char workdir[MAX_PATH]; +static DWORD workdir_len; +static char drive[2]; +static const DWORD drive_len = sizeof(drive)/sizeof(drive[0]); +static char path[MAX_PATH]; +static DWORD path_len; +static char shortpath[MAX_PATH]; +static DWORD shortpath_len; + +/* Convert to DOS line endings, and substitute escaped whitespace chars with real ones */ +static const char* convert_input_data(const char *data, DWORD size, DWORD *new_size) +{ + static const char escaped_space[] = {'@','s','p','a','c','e','@'}; + static const char escaped_tab[] = {'@','t','a','b','@'}; + DWORD i, eol_count = 0; + char *ptr, *new_data; + + for (i = 0; i < size; i++) + if (data[i] == '\n') eol_count++; + + ptr = new_data = HeapAlloc(GetProcessHeap(), 0, size + eol_count + 1); + + for (i = 0; i < size; i++) { + switch (data[i]) { + case '\n': + if (data[i-1] != '\r') + *ptr++ = '\r'; + *ptr++ = '\n'; + break; + case '@': + if (data + i + sizeof(escaped_space) - 1 < data + size + && !memcmp(data + i, escaped_space, sizeof(escaped_space))) { + *ptr++ = ' '; + i += sizeof(escaped_space) - 1; + } else if (data + i + sizeof(escaped_tab) - 1 < data + size + && !memcmp(data + i, escaped_tab, sizeof(escaped_tab))) { + *ptr++ = '\t'; + i += sizeof(escaped_tab) - 1; + } else { + *ptr++ = data[i]; + } + break; + default: + *ptr++ = data[i]; + } + } + *ptr = '\0'; + + *new_size = strlen(new_data); + return new_data; +} + +static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) +{ + SECURITY_ATTRIBUTES sa = {sizeof(sa), 0, TRUE}; + char command[] = "test.cmd"; + STARTUPINFOA si = {sizeof(si)}; + PROCESS_INFORMATION pi; + HANDLE file,fileerr; + DWORD size; + BOOL bres; + + file = CreateFileA("test.cmd", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + if(file == INVALID_HANDLE_VALUE) + return FALSE; + + bres = WriteFile(file, cmd_data, cmd_size, &size, NULL); + CloseHandle(file); + ok(bres, "Could not write to file: %u\n", GetLastError()); + if(!bres) + return FALSE; + + file = CreateFileA("test.out", GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, &sa, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + if(file == INVALID_HANDLE_VALUE) + return FALSE; + + fileerr = CreateFileA("test.err", GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, &sa, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(fileerr != INVALID_HANDLE_VALUE, "CreateFile stderr failed\n"); + if(fileerr == INVALID_HANDLE_VALUE) + return FALSE; + + si.dwFlags = STARTF_USESTDHANDLES; + si.hStdOutput = file; + si.hStdError = fileerr; + bres = CreateProcessA(NULL, command, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); + ok(bres, "CreateProcess failed: %u\n", GetLastError()); + if(!bres) { + DeleteFileA("test.out"); + return FALSE; + } + + WaitForSingleObject(pi.hProcess, INFINITE); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + CloseHandle(file); + CloseHandle(fileerr); + DeleteFileA("test.cmd"); + return TRUE; +} + +static DWORD map_file(const char *file_name, const char **ret) +{ + HANDLE file, map; + DWORD size; + + file = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %08x\n", GetLastError()); + if(file == INVALID_HANDLE_VALUE) + return 0; + + size = GetFileSize(file, NULL); + + map = CreateFileMappingA(file, NULL, PAGE_READONLY, 0, 0, NULL); + CloseHandle(file); + ok(map != NULL, "CreateFileMappingA(%s) failed: %u\n", file_name, GetLastError()); + if(!map) + return 0; + + *ret = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0); + ok(*ret != NULL, "MapViewOfFile failed: %u\n", GetLastError()); + CloseHandle(map); + if(!*ret) + return 0; + + return size; +} + +static const char *compare_line(const char *out_line, const char *out_end, const char *exp_line, + const char *exp_end) +{ + const char *out_ptr = out_line, *exp_ptr = exp_line; + const char *err = NULL; + + static const char pwd_cmd[] = {'@','p','w','d','@'}; + static const char drive_cmd[] = {'@','d','r','i','v','e','@'}; + static const char path_cmd[] = {'@','p','a','t','h','@'}; + static const char shortpath_cmd[] = {'@','s','h','o','r','t','p','a','t','h','@'}; + static const char space_cmd[] = {'@','s','p','a','c','e','@'}; + static const char tab_cmd[] = {'@','t','a','b','@'}; + static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'}; + + while(exp_ptr < exp_end) { + if(*exp_ptr == '@') { + if(exp_ptr+sizeof(pwd_cmd) <= exp_end + && !memcmp(exp_ptr, pwd_cmd, sizeof(pwd_cmd))) { + exp_ptr += sizeof(pwd_cmd); + if(out_end-out_ptr < workdir_len + || (CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, out_ptr, workdir_len, + workdir, workdir_len) != CSTR_EQUAL)) { + err = out_ptr; + }else { + out_ptr += workdir_len; + continue; + } + } else if(exp_ptr+sizeof(drive_cmd) <= exp_end + && !memcmp(exp_ptr, drive_cmd, sizeof(drive_cmd))) { + exp_ptr += sizeof(drive_cmd); + if(out_end-out_ptr < drive_len + || (CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, + out_ptr, drive_len, drive, drive_len) != CSTR_EQUAL)) { + err = out_ptr; + }else { + out_ptr += drive_len; + continue; + } + } else if(exp_ptr+sizeof(path_cmd) <= exp_end + && !memcmp(exp_ptr, path_cmd, sizeof(path_cmd))) { + exp_ptr += sizeof(path_cmd); + if(out_end-out_ptr < path_len + || (CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, + out_ptr, path_len, path, path_len) != CSTR_EQUAL)) { + err = out_ptr; + }else { + out_ptr += path_len; + continue; + } + } else if(exp_ptr+sizeof(shortpath_cmd) <= exp_end + && !memcmp(exp_ptr, shortpath_cmd, sizeof(shortpath_cmd))) { + exp_ptr += sizeof(shortpath_cmd); + if(out_end-out_ptr < shortpath_len + || (CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, + out_ptr, shortpath_len, shortpath, shortpath_len) != CSTR_EQUAL)) { + err = out_ptr; + }else { + out_ptr += shortpath_len; + continue; + } + }else if(exp_ptr+sizeof(space_cmd) <= exp_end + && !memcmp(exp_ptr, space_cmd, sizeof(space_cmd))) { + exp_ptr += sizeof(space_cmd); + if(out_ptr < out_end && *out_ptr == ' ') { + out_ptr++; + continue; + } else { + err = out_end; + } + }else if(exp_ptr+sizeof(tab_cmd) <= exp_end + && !memcmp(exp_ptr, tab_cmd, sizeof(tab_cmd))) { + exp_ptr += sizeof(tab_cmd); + if(out_ptr < out_end && *out_ptr == '\t') { + out_ptr++; + continue; + } else { + err = out_end; + } + }else if(exp_ptr+sizeof(or_broken_cmd) <= exp_end + && !memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) { + if(out_ptr == out_end) + return NULL; + else + err = out_ptr; + }else if(out_ptr == out_end || *out_ptr != *exp_ptr) + err = out_ptr; + }else if(out_ptr == out_end || *out_ptr != *exp_ptr) { + err = out_ptr; + } + + if(err) { + if(!broken(1)) + return err; + + while(exp_ptr+sizeof(or_broken_cmd) <= exp_end && memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) + exp_ptr++; + if(!exp_ptr) + return err; + + exp_ptr += sizeof(or_broken_cmd); + out_ptr = out_line; + err = NULL; + continue; + } + + exp_ptr++; + out_ptr++; + } + + if(exp_ptr != exp_end) + return out_ptr; + else if(out_ptr != out_end) + return exp_end; + + return NULL; +} + +static void test_output(const char *out_data, DWORD out_size, const char *exp_data, DWORD exp_size) +{ + const char *out_ptr = out_data, *exp_ptr = exp_data, *out_nl, *exp_nl, *err = NULL; + DWORD line = 0; + static const char todo_wine_cmd[] = {'@','t','o','d','o','_','w','i','n','e','@'}; + static const char resync_cmd[] = {'-','-','-'}; + BOOL is_todo_wine, is_out_resync = FALSE, is_exp_resync = FALSE; + + while(out_ptr < out_data+out_size && exp_ptr < exp_data+exp_size) { + line++; + + for(exp_nl = exp_ptr; exp_nl < exp_data+exp_size && *exp_nl != '\r' && *exp_nl != '\n'; exp_nl++); + for(out_nl = out_ptr; out_nl < out_data+out_size && *out_nl != '\r' && *out_nl != '\n'; out_nl++); + + is_todo_wine = (exp_ptr+sizeof(todo_wine_cmd) <= exp_nl && + !memcmp(exp_ptr, todo_wine_cmd, sizeof(todo_wine_cmd))); + if (is_todo_wine) + exp_ptr += sizeof(todo_wine_cmd); + + todo_wine_if(is_todo_wine) + { + is_exp_resync=(exp_ptr+sizeof(resync_cmd) <= exp_nl && + !memcmp(exp_ptr, resync_cmd, sizeof(resync_cmd))); + is_out_resync=(out_ptr+sizeof(resync_cmd) <= out_nl && + !memcmp(out_ptr, resync_cmd, sizeof(resync_cmd))); + + err = compare_line(out_ptr, out_nl, exp_ptr, exp_nl); + if(err == out_nl) + ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", + line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + else if(err == exp_nl) + ok(0, "excess characters on line %d (got '%.*s', wanted '%.*s')\n", + line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + else if (!err && is_todo_wine && is_out_resync && is_exp_resync) + /* Consider that the todo_wine was to deal with extra lines, + * not for the resync line itself + */ + err = NULL; + else + ok(!err, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", + (err ? *err : 0), (err ? (int)(err-out_ptr) : -1), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + } + + if (is_exp_resync && err && is_todo_wine) + { + exp_ptr -= sizeof(todo_wine_cmd); + /* If we rewind to the beginning of the line, don't increment line number */ + line--; + } + else if (!is_exp_resync || !err || + (is_exp_resync && is_out_resync && err)) + { + exp_ptr = exp_nl+1; + if(exp_nl+1 < exp_data+exp_size && exp_nl[0] == '\r' && exp_nl[1] == '\n') + exp_ptr++; + } + + if (!is_out_resync || !err) + { + out_ptr = out_nl+1; + if(out_nl+1 < out_data+out_size && out_nl[0] == '\r' && out_nl[1] == '\n') + out_ptr++; + } + } + + ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %d, missing %s\n", line, exp_ptr); + ok(out_ptr >= out_data+out_size, "too long output, got additional %s\n", out_ptr); +} + +static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data, DWORD exp_size) +{ + const char *out_data, *actual_cmd_data; + DWORD out_size, actual_cmd_size; + + actual_cmd_data = convert_input_data(cmd_data, cmd_size, &actual_cmd_size); + if(!actual_cmd_size || !actual_cmd_data) + goto cleanup; + + if(!run_cmd(actual_cmd_data, actual_cmd_size)) + goto cleanup; + + out_size = map_file("test.out", &out_data); + if(out_size) { + test_output(out_data, out_size, exp_data, exp_size); + UnmapViewOfFile(out_data); + } + DeleteFileA("test.out"); + DeleteFileA("test.err"); + +cleanup: + HeapFree(GetProcessHeap(), 0, (LPVOID)actual_cmd_data); +} + +static void run_from_file(const char *file_name) +{ + char out_name[MAX_PATH]; + const char *test_data, *out_data; + DWORD test_size, out_size; + + test_size = map_file(file_name, &test_data); + if(!test_size) { + ok(0, "Could not map file %s: %u\n", file_name, GetLastError()); + return; + } + + sprintf(out_name, "%s.exp", file_name); + out_size = map_file(out_name, &out_data); + if(!out_size) { + ok(0, "Could not map file %s: %u\n", out_name, GetLastError()); + UnmapViewOfFile(test_data); + return; + } + + run_test(test_data, test_size, out_data, out_size); + + UnmapViewOfFile(test_data); + UnmapViewOfFile(out_data); +} + +static DWORD load_resource(const char *name, const char *type, const char **ret) +{ + const char *res; + HRSRC src; + DWORD size; + + src = FindResourceA(NULL, name, type); + ok(src != NULL, "Could not find resource %s: %u\n", name, GetLastError()); + if(!src) + return 0; + + res = LoadResource(NULL, src); + size = SizeofResource(NULL, src); + while(size && !res[size-1]) + size--; + + *ret = res; + return size; +} + +static BOOL WINAPI test_enum_proc(HMODULE module, LPCSTR type, LPSTR name, LONG_PTR param) +{ + const char *cmd_data, *out_data; + DWORD cmd_size, out_size; + char res_name[100]; + + trace("running %s test...\n", name); + + cmd_size = load_resource(name, type, &cmd_data); + if(!cmd_size) + return TRUE; + + sprintf(res_name, "%s.exp", name); + out_size = load_resource(res_name, "TESTOUT", &out_data); + if(!out_size) + return TRUE; + + run_test(cmd_data, cmd_size, out_data, out_size); + return TRUE; +} + +static int cmd_available(void) +{ + STARTUPINFOA si; + PROCESS_INFORMATION pi; + char cmd[] = "cmd /c exit 0"; + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + if (CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + return TRUE; + } + return FALSE; +} + +START_TEST(reactos) +{ + int argc; + char **argv; + + if (!cmd_available()) { + win_skip("cmd not installed, skipping cmd tests\n"); + return; + } + + workdir_len = GetCurrentDirectoryA(sizeof(workdir), workdir); + drive[0] = workdir[0]; + drive[1] = workdir[1]; /* Should be ':' */ + memcpy(path, workdir + drive_len, (workdir_len - drive_len) * sizeof(drive[0])); + + /* Only add trailing backslash to 'path' for non-root directory */ + if (workdir_len - drive_len > 1) { + path[workdir_len - drive_len] = '\\'; + path_len = workdir_len - drive_len + 1; + } else { + path_len = 1; /* \ */ + } + shortpath_len = GetShortPathNameA(path, shortpath, + sizeof(shortpath)/sizeof(shortpath[0])); + + argc = winetest_get_mainargs(&argv); + if(argc > 2) + run_from_file(argv[2]); + else + EnumResourceNamesA(NULL, "TESTCMD", test_enum_proc, 0); +} diff --git a/modules/rostests/win32/cmd/rsrc.rc b/modules/rostests/win32/cmd/rsrc.rc new file mode 100644 index 0000000000..7fd54341df --- /dev/null +++ b/modules/rostests/win32/cmd/rsrc.rc @@ -0,0 +1,24 @@ +/* + * Copyright 2010 Jacek Caban for CodeWeavers + * Copyright 2017 by Doug Lyons + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: test_builtins.cmd */ +test_builtins.cmd TESTCMD "test_builtins.cmd" + +/* @makedep: test_builtins.cmd.exp */ +test_builtins.cmd.exp TESTOUT "test_builtins.cmd.exp" diff --git a/modules/rostests/win32/cmd/test_builtins.cmd b/modules/rostests/win32/cmd/test_builtins.cmd new file mode 100644 index 0000000000..cc387c08e5 --- /dev/null +++ b/modules/rostests/win32/cmd/test_builtins.cmd @@ -0,0 +1,30 @@ +@echo off +echo ------------ Testing for1 ------------ +echo --- plain FOR with multiple lines +for %%i in (A +B +C) do echo %%i +echo ------------ Testing for2 ------------ +echo --- plain FOR with lines and spaces +for %%i in (D + E + F) do echo %%i +echo ------------ Testing for3 ------------ +echo --- plain FOR with multiple lines and commas +for %%i in (G, +H, +I +) do echo %%i +echo ------------ Testing for4 ------------ +echo --- plain FOR with multiple lines and %%I +for %%i in (J + K + L) do echo %%I +echo ------------ Testing for5 ------------ +echo --- plain FOR with multiple lines and %%j +for %%i in (M, +N, +O +) do echo %%j +echo ------------ End of Testing ------------ +echo --- Testing ends here diff --git a/modules/rostests/win32/cmd/test_builtins.cmd.exp b/modules/rostests/win32/cmd/test_builtins.cmd.exp new file mode 100644 index 0000000000..c13f7018fa --- /dev/null +++ b/modules/rostests/win32/cmd/test_builtins.cmd.exp @@ -0,0 +1,27 @@ +------------ Testing for1 ------------ +--- plain FOR with multiple lines +A +B +C +------------ Testing for2 ------------ +--- plain FOR with lines and spaces +D +E +F +------------ Testing for3 ------------ +--- plain FOR with multiple lines and commas +G +H +I +------------ Testing for4 ------------ +--- plain FOR with multiple lines and %I +%I +%I +%I +------------ Testing for5 ------------ +--- plain FOR with multiple lines and %j +%j +%j +%j +------------ End of Testing ------------ +--- Testing ends here diff --git a/modules/rostests/win32/cmd/testlist.c b/modules/rostests/win32/cmd/testlist.c new file mode 100644 index 0000000000..bf8b9f138e --- /dev/null +++ b/modules/rostests/win32/cmd/testlist.c @@ -0,0 +1,12 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define STANDALONE +#include "wine/test.h" + +extern void func_reactos(void); + +const struct test winetest_testlist[] = +{ + { "reactos", func_reactos }, + { 0, 0 } +};

7 years, 1 month

[reactos] 01/01: [COMCTL32] Button: Don't use a class brush. CORE-13445

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34c563fa2a29c71705322… commit 34c563fa2a29c71705322abba6768a00361e91bb Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Fri Nov 17 01:25:57 2017 +0200 [COMCTL32] Button: Don't use a class brush. CORE-13445 --- dll/win32/comctl32/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/comctl32/button.c b/dll/win32/comctl32/button.c index 4289b31e21..eb627145f3 100644 --- a/dll/win32/comctl32/button.c +++ b/dll/win32/comctl32/button.c @@ -1892,7 +1892,7 @@ void BUTTON_Register() wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(PBUTTON_DATA); wndClass.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); - wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wndClass.hbrBackground = 0; wndClass.lpszClassName = WC_BUTTONW; RegisterClassW(&wndClass);

7 years, 1 month

[reactos] 01/01: [CMD] Fix '?' command output by adding a missing new-line. CORE-14016 Patch by Doug Lyons.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cfcca53856b369f10b10b… commit cfcca53856b369f10b10b1e70f226952811ffa15 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 16 21:27:27 2017 +0100 [CMD] Fix '?' command output by adding a missing new-line. CORE-14016 Patch by Doug Lyons. --- base/shell/cmd/cmdtable.c | 1 + 1 file changed, 1 insertion(+) diff --git a/base/shell/cmd/cmdtable.c b/base/shell/cmd/cmdtable.c index 83e7daee0d..8221f06e32 100644 --- a/base/shell/cmd/cmdtable.c +++ b/base/shell/cmd/cmdtable.c @@ -253,6 +253,7 @@ VOID PrintCommandList(VOID) if (++y == 8) { ConOutPuts(cmdptr->name); + ConOutChar(_T('\n')); y = 0; } else

7 years, 1 month

[reactos] 01/01: [SETUPAPI] driver.c: it is _WIN32_WINNT, not WIN32_WINNT. CORE-12580

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=067bb2fcef754f1d20a6e… commit 067bb2fcef754f1d20a6ea4ea0199584e3db008e Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Nov 15 02:49:51 2017 +0100 [SETUPAPI] driver.c: it is _WIN32_WINNT, not WIN32_WINNT. CORE-12580 --- dll/win32/setupapi/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/setupapi/driver.c b/dll/win32/setupapi/driver.c index 88affa3c02..356a95c08d 100644 --- a/dll/win32/setupapi/driver.c +++ b/dll/win32/setupapi/driver.c @@ -565,7 +565,7 @@ done: return Result; } -#if WIN32_WINNT < 0x0600 +#if _WIN32_WINNT < 0x0600 /* WARNING: * This code has been copied from advapi32/reg/reg.c, * so this dll can be tested as is on Windows XP

7 years, 1 month

[reactos] 01/01: [RAPPS-DB] CORE-14012 update to ROSBE 2.1.5

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6505026ea86c3d481812e… commit 6505026ea86c3d481812ea51a771aded151864ea Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Nov 14 23:25:56 2017 +0100 [RAPPS-DB] CORE-14012 update to ROSBE 2.1.5 --- media/rapps/rosbe.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/media/rapps/rosbe.txt b/media/rapps/rosbe.txt index edc99e2cb7..5625ba7a06 100644 --- a/media/rapps/rosbe.txt +++ b/media/rapps/rosbe.txt @@ -1,13 +1,13 @@ [Section] Name = ReactOS Build Environment -Version = 2.1.4 +Version = 2.1.5 License = GPL Description = Allows you to build the ReactOS Source. For more instructions see ReactOS wiki. -Size = 37.8 MiB +Size = 37.9 MiB Category = 7 URLSite = http://reactos.org/wiki/Build_Environment -URLDownload = http://download.sourceforge.net/reactos/RosBE-2.1.4.exe -SHA1 = aa32af1d1d5ecffa1ebcdda97d3bafccaa17d803 +URLDownload = http://download.sourceforge.net/reactos/RosBE-2.1.5.exe +SHA1 = 6477ff6e4d68df39df831f53c044337f9f60e93e CDPath = none [Section.0405] @@ -15,14 +15,14 @@ Description = Dovoluje zkompilovat zdrojový kód systému ReactOS. Pro další [Section.0407] Description = Erlaubt es Ihnen den ReactOS Source Code zu kompilieren. Im ReactOS-Wiki finden Sie dazu nähere Anweisungen. -Size = 37,8 MiB +Size = 37,9 MiB [Section.0a] Description = Te permite compilar el código de ReactOS. Para más información consulta la Wiki de ReactOS. [Section.040c] Description = Vous permet de compiler le code source de ReactOS. Pour plus d'instructions, reportez-vous au wiki ReactOS. -Size = 37,8 Mio +Size = 37,9 Mio [Section.0410] Description = Permette di compilare i sorgenti di ReactOS. Per maggiori informazioni consultare il Wiki di ReactOS. @@ -35,16 +35,16 @@ Description = Pozwala zbudować obraz płyty ReactOS ze źródeł. Więcej infor [Section.0418] Description = Permite compilarea surselor ReactOS. Pentru instrucțiuni, consultați wiki ReactOS. -Size = 37,8 Mio +Size = 37,9 Mio [Section.0419] Description = Позволит Вам собрать ReactOS из исходных кодов. Подробности смотрите в ReactOS wiki. -Size = 37,8 МиБ +Size = 37,9 МиБ [Section.041f] Name = ReactOS Yapma Ortamı Description = ReactOS Kaynak Kodları'nı derlemenize olanak sağlar. Daha çok açıklama için ReactOS Wiki'ye bakınız. -Size = 37,8 MiB +Size = 37,9 MiB [Section.0422] Description = Дозволяє зібрати ReactOS з вихідних кодів. За детальною інформацією дивіться в ReactOS Вікі.

7 years, 1 month

[reactos] 01/01: [EXPLORER] Remove version number from the start menu banner image, as requested.

by David Quintana

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e10108c08865c790dffdf… commit e10108c08865c790dffdf94cd893bd9ce861b467 Author: David Quintana <gigaherz(a)gmail.com> AuthorDate: Tue Nov 14 18:15:34 2017 +0100 [EXPLORER] Remove version number from the start menu banner image, as requested. Also, since we won't be editing the svg as often, move it to the media/graphics folder. --- base/shell/explorer/res/bmp/158.bmp | Bin 14968 -> 14968 bytes .../src => media/graphics}/start_menu_banner.svg | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/shell/explorer/res/bmp/158.bmp b/base/shell/explorer/res/bmp/158.bmp index 7b37574fc6..0df75329e7 100644 Binary files a/base/shell/explorer/res/bmp/158.bmp and b/base/shell/explorer/res/bmp/158.bmp differ diff --git a/base/shell/explorer/res/src/start_menu_banner.svg b/media/graphics/start_menu_banner.svg similarity index 99% rename from base/shell/explorer/res/src/start_menu_banner.svg rename to media/graphics/start_menu_banner.svg index 436115a933..212338eccf 100644 --- a/base/shell/explorer/res/src/start_menu_banner.svg +++ b/media/graphics/start_menu_banner.svg @@ -117,7 +117,7 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="2.4967109" - inkscape:cx="-99.099451" + inkscape:cx="-163.98482" inkscape:cy="142.13217" inkscape:document-units="px" inkscape:current-layer="svg2" @@ -125,8 +125,8 @@ units="pt" inkscape:window-width="1397" inkscape:window-height="974" - inkscape:window-x="437" - inkscape:window-y="214" + inkscape:window-x="346" + inkscape:window-y="335" inkscape:window-maximized="0" /> <metadata id="metadata7"> @@ -171,7 +171,7 @@ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20.00007629px;line-height:100%;font-family:'AvantGarde Bk BT';-inkscape-font-specification:'AvantGarde Bk BT, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4213">ReactOS</tspan><tspan style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.50006676px;line-height:100%;font-family:'AvantGarde Bk BT';-inkscape-font-specification:'AvantGarde Bk BT, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start" - id="tspan4209"> 0.4.8-dev</tspan></tspan></text> + id="tspan4209" /></tspan></text> <g style="fill:#ffffff;fill-opacity:1" id="layer1-2"

7 years, 1 month

[reactos] 01/01: [RAPPS] Add support for no-length downloads indication

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66e3c1f73a9aabf775489… commit 66e3c1f73a9aabf775489e99f834f842976a721b Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Nov 13 00:18:57 2017 +0300 [RAPPS] Add support for no-length downloads indication --- base/applications/rapps/include/dialogs.h | 1 + base/applications/rapps/loaddlg.cpp | 77 ++++++++++++++++++++++++++----- 2 files changed, 66 insertions(+), 12 deletions(-) diff --git a/base/applications/rapps/include/dialogs.h b/base/applications/rapps/include/dialogs.h index ea607e0385..69e0764086 100644 --- a/base/applications/rapps/include/dialogs.h +++ b/base/applications/rapps/include/dialogs.h @@ -15,6 +15,7 @@ class CDownloadManager static CDowloadingAppsListView DownloadsListView; static VOID Download(const DownloadInfo& DLInfo, BOOL bIsModal = FALSE); + static VOID SetProgressMarquee(HWND Item, BOOL Enable); public: static INT_PTR CALLBACK DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam); diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 0d3d554fae..155241bc82 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -146,25 +146,44 @@ public: LONG r; Item = GetDlgItem(m_hDialog, IDC_DOWNLOAD_PROGRESS); - if (Item && ulProgressMax) + if (Item) { WCHAR szProgress[100]; - WCHAR szProgressMax[100]; - UINT uiPercentage = ((ULONGLONG) ulProgress * 100) / ulProgressMax; - - /* send the current progress to the progress bar */ - SendMessageW(Item, PBM_SETPOS, uiPercentage, 0); /* format the bits and bytes into pretty and accessible units... */ StrFormatByteSizeW(ulProgress, szProgress, _countof(szProgress)); - StrFormatByteSizeW(ulProgressMax, szProgressMax, _countof(szProgressMax)); - /* ...and post all of it to our subclassed progress bar text subroutine */ + /* use our subclassed progress bar text subroutine */ ATL::CStringW m_ProgressText; - m_ProgressText.Format(L"%u%% \x2014 %ls / %ls", - uiPercentage, - szProgress, - szProgressMax); + + if (ulProgressMax) + { + /* total size is known */ + WCHAR szProgressMax[100]; + UINT uiPercentage = ((ULONGLONG) ulProgress * 100) / ulProgressMax; + + /* send the current progress to the progress bar */ + SendMessageW(Item, PBM_SETPOS, uiPercentage, 0); + + /* format total download size */ + StrFormatByteSizeW(ulProgressMax, szProgressMax, _countof(szProgressMax)); + + /* generate the text on progress bar */ + m_ProgressText.Format(L"%u%% \x2014 %ls / %ls", + uiPercentage, + szProgress, + szProgressMax); + } + else + { + /* send the current progress to the progress bar */ + SendMessageW(Item, PBM_SETPOS, 0, 0); + + /* total size is not known, display only current size */ + m_ProgressText.Format(L"%ls...", + szProgress); + } + /* and finally display it */ SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) m_ProgressText.GetString()); } @@ -547,6 +566,21 @@ LRESULT CALLBACK CDownloadManager::DownloadProgressProc(HWND hWnd, } } +VOID CDownloadManager::SetProgressMarquee(HWND Item, BOOL Enable) +{ + if (!Item) + return; + + DWORD style = GetWindowLongPtr(Item, GWL_STYLE); + if (!style) + return; + + if (!SetWindowLongPtr(Item, GWL_STYLE, (Enable ? style | PBS_MARQUEE : style & ~PBS_MARQUEE))) + return; + + SendMessageW(Item, PBM_SETMARQUEE, Enable, 0); +} + DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) { CComPtr<IBindStatusCallback> dl; @@ -590,6 +624,8 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) Item = GetDlgItem(hDlg, IDC_DOWNLOAD_PROGRESS); if (Item) { + SetProgressMarquee(Item, FALSE); + SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) L""); SendMessageW(Item, PBM_SETPOS, 0, 0); } @@ -714,12 +750,20 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) if (!InternetCrackUrlW(InfoArray[iAppId].szUrl, urlLength + 1, ICU_DECODE | ICU_ESCAPE, &urlComponents)) goto end; + dwContentLen = 0; + if (urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS) HttpQueryInfoW(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwStatus, 0); if (urlComponents.nScheme == INTERNET_SCHEME_FTP) dwContentLen = FtpGetFileSize(hFile, &dwStatus); + if (!dwContentLen) + { + // content-length is not known, enable marquee mode + SetProgressMarquee(Item, TRUE); + } + #ifdef USE_CERT_PINNING // are we using HTTPS to download the RAPPS update package? check if the certificate is original if ((urlComponents.nScheme == INTERNET_SCHEME_HTTPS) && @@ -764,6 +808,15 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) if (bCancelled) goto end; + if (!dwContentLen) + { + // set progress bar to 100% + SetProgressMarquee(Item, FALSE); + + dwContentLen = dwCurrentBytesRead; + dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0, InfoArray[iAppId].szUrl.GetString()); + } + /* if this thing isn't a RAPPS update and it has a SHA-1 checksum verify its integrity by using the native advapi32.A_SHA1 functions */ if (!bCab && InfoArray[iAppId].szSHA1[0] != 0)

7 years, 1 month

[reactos] 01/01: [NTOS] Addendum to da81345: Fix checks when a hive is opened in shared mode.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b2bbd1125a935fb50e97… commit 0b2bbd1125a935fb50e979812d3a34cfde500882 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Nov 13 00:27:41 2017 +0100 [NTOS] Addendum to da81345: Fix checks when a hive is opened in shared mode. --- ntoskrnl/config/cminit.c | 14 ++++++++------ ntoskrnl/config/cmsysini.c | 7 +++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/config/cminit.c b/ntoskrnl/config/cminit.c index 46ab61e4b3..bf055fd914 100644 --- a/ntoskrnl/config/cminit.c +++ b/ntoskrnl/config/cminit.c @@ -38,15 +38,17 @@ CmpInitializeHive(OUT PCMHIVE *CmHive, /* * The following are invalid: - * An external hive that is also internal. - * A log hive that's not a primary hive too. - * A volatile hive that's linked to permanent storage. - * An in-memory initialization without hive data. - * A log hive that's not linked to a correct file type. + * - An external hive that is also internal. + * - A log hive that is not a primary hive too. + * - A volatile hive that is linked to permanent storage, + * unless this hive is a shared system hive. + * - An in-memory initialization without hive data. + * - A log hive that is not linked to a correct file type. */ if (((External) && ((Primary) || (Log))) || ((Log) && !(Primary)) || - ((HiveFlags & HIVE_VOLATILE) && ((Primary) || (External) || (Log))) || + (!(CmpShareSystemHives) && (HiveFlags & HIVE_VOLATILE) && + ((Primary) || (External) || (Log))) || ((OperationType == HINIT_MEMORY) && (!HiveData)) || ((Log) && (FileType != HFILE_TYPE_LOG))) { diff --git a/ntoskrnl/config/cmsysini.c b/ntoskrnl/config/cmsysini.c index 112543fac7..a433485eb2 100644 --- a/ntoskrnl/config/cmsysini.c +++ b/ntoskrnl/config/cmsysini.c @@ -1297,9 +1297,12 @@ CmpLoadHiveThread(IN PVOID StartContext) &CmpMachineHiveList[i].Allocate, 0); if (!(NT_SUCCESS(Status)) || - (!(CmHive->FileHandles[HFILE_TYPE_LOG]) && !(CmpMiniNTBoot))) // HACK + (!(CmpShareSystemHives) && !(CmHive->FileHandles[HFILE_TYPE_LOG]))) { - /* We failed or couldn't get a log file, raise a hard error */ + /* + * We failed, or could not get a log file (unless + * the hive is shared), raise a hard error. + */ ErrorParameters = &FileName; NtRaiseHardError(STATUS_CANNOT_LOAD_REGISTRY_FILE, 1,

7 years, 1 month

[reactos] 01/01: [SETUPAPI] Improve the range list implementation. - SEH-protect the range list validation and move it into a separate function. - Use a mutex to synchronize access to the range list. - Implement CM_First_Range and parts of CM_Add_Range.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ad5c7fd84bdcce26db5f… commit 3ad5c7fd84bdcce26db5f46a2afd4c7a972c7700 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Nov 12 23:27:09 2017 +0100 [SETUPAPI] Improve the range list implementation. - SEH-protect the range list validation and move it into a separate function. - Use a mutex to synchronize access to the range list. - Implement CM_First_Range and parts of CM_Add_Range. --- dll/win32/setupapi/cfgmgr.c | 162 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 150 insertions(+), 12 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index 898b755ec3..14f05963e2 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -69,17 +69,18 @@ typedef struct _NOTIFY_DATA #define NOTIFY_MAGIC 0x44556677 -typedef struct _INTERNAL_RANGE_ELEMENT +typedef struct _INTERNAL_RANGE { - struct _INTERNAL_RANGE_ELEMENT *Next; - ULONG ulDummy; -} INTERNAL_RANGE_ELEMENT, *PINTERNAL_RANGE_ELEMENT; + LIST_ENTRY ListEntry; + DWORDLONG ullStart; + DWORDLONG ullEnd; +} INTERNAL_RANGE, *PINTERNAL_RANGE; typedef struct _INTERNAL_RANGE_LIST { ULONG ulMagic; - PINTERNAL_RANGE_ELEMENT Current; - PINTERNAL_RANGE_ELEMENT First; + HANDLE hMutex; + LIST_ENTRY ListHead; } INTERNAL_RANGE_LIST, *PINTERNAL_RANGE_LIST; #define RANGE_LIST_MAGIC 0x33445566 @@ -338,6 +339,30 @@ done: } +BOOL +IsValidRangeList( + _In_ PINTERNAL_RANGE_LIST pRangeList) +{ + BOOL bValid = TRUE; + + if (pRangeList == NULL) + return FALSE; + + _SEH2_TRY + { + if (pRangeList->ulMagic != RANGE_LIST_MAGIC) + bValid = FALSE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bValid = FALSE; + } + _SEH2_END; + + return bValid; +} + + /*********************************************************************** * CMP_GetBlockedDriverInfo [SETUPAPI.@] */ @@ -950,9 +975,53 @@ CM_Add_Range( _In_ RANGE_LIST rlh, _In_ ULONG ulFlags) { + PINTERNAL_RANGE_LIST pRangeList; + PINTERNAL_RANGE pRange; + CONFIGRET ret = CR_SUCCESS; + FIXME("CM_Add_Range(%I64u %I64u %p %lx)\n", ullStartValue, ullEndValue, rlh, ulFlags); - return CR_CALL_NOT_IMPLEMENTED; + + pRangeList = (PINTERNAL_RANGE_LIST)rlh; + + if (!IsValidRangeList(pRangeList)) + return CR_INVALID_RANGE_LIST; + + if (ulFlags & ~CM_ADD_RANGE_BITS) + return CR_INVALID_FLAG; + + if (ullEndValue < ullStartValue) + return CR_INVALID_RANGE; + + /* Lock the range list */ + WaitForSingleObject(pRangeList->hMutex, INFINITE); + + /* Allocate the new range */ + pRange = HeapAlloc(GetProcessHeap(), 0, sizeof(INTERNAL_RANGE)); + if (pRange == NULL) + { + ret = CR_OUT_OF_MEMORY; + goto done; + } + + pRange->ullStart = ullStartValue; + pRange->ullEnd = ullEndValue; + + /* Insert the range */ + if (IsListEmpty(&pRangeList->ListHead)) + { + InsertTailList(&pRangeList->ListHead, &pRange->ListEntry); + } + else + { + + } + +done: + /* Unlock the range list */ + ReleaseMutex(pRangeList->hMutex); + + return ret; } @@ -1266,13 +1335,23 @@ CM_Create_Range_List( if (prlh == NULL) return CR_INVALID_POINTER; + /* Allocate the range list */ pRangeList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(INTERNAL_RANGE_LIST)); if (pRangeList == NULL) return CR_OUT_OF_MEMORY; + /* Set the magic value */ pRangeList->ulMagic = RANGE_LIST_MAGIC; - // TODO: More initialization + /* Initialize the mutex for synchonized access */ + pRangeList->hMutex = CreateMutex(NULL, FALSE, NULL); + if (pRangeList->hMutex == NULL) + { + HeapFree(GetProcessHeap(), 0, pRangeList); + return CR_FAILURE; + } + + InitializeListHead(&pRangeList->ListHead); *prlh = (RANGE_LIST)pRangeList; @@ -1814,9 +1893,49 @@ CM_First_Range( _Out_ PRANGE_ELEMENT preElement, _In_ ULONG ulFlags) { + PINTERNAL_RANGE_LIST pRangeList; + PINTERNAL_RANGE pRange; + PLIST_ENTRY ListEntry; + CONFIGRET ret = CR_SUCCESS; + FIXME("CM_First_Range(%p %p %p %p %lx)\n", rlh, pullStart, pullEnd, preElement, ulFlags); - return CR_CALL_NOT_IMPLEMENTED; + + pRangeList = (PINTERNAL_RANGE_LIST)rlh; + + if (!IsValidRangeList(pRangeList)) + return CR_INVALID_RANGE_LIST; + + if (pullStart == NULL || pullEnd == NULL || preElement == NULL) + return CR_INVALID_POINTER; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + /* Lock the range list */ + WaitForSingleObject(pRangeList->hMutex, INFINITE); + + /* Fail, if the list is empty */ + if (IsListEmpty(&pRangeList->ListHead)) + { + ret = CR_FAILURE; + goto done; + } + + /* Get the first range */ + ListEntry = pRangeList->ListHead.Flink; + pRange = CONTAINING_RECORD(ListEntry, INTERNAL_RANGE, ListEntry); + + /* Return the range data */ + *pullStart = pRange->ullStart; + *pullEnd = pRange->ullEnd; + *preElement = (RANGE_ELEMENT)pRange; + +done: + /* Unlock the range list */ + ReleaseMutex(pRangeList->hMutex); + + return ret; } @@ -1920,19 +2039,38 @@ CM_Free_Range_List( _In_ ULONG ulFlags) { PINTERNAL_RANGE_LIST pRangeList; + PINTERNAL_RANGE pRange; + PLIST_ENTRY ListEntry; - FIXME("CM_Free_Range_List(%p %lx)\n", RangeList, ulFlags); + FIXME("CM_Free_Range_List(%p %lx)\n", + RangeList, ulFlags); pRangeList = (PINTERNAL_RANGE_LIST)RangeList; - if (pRangeList == NULL || pRangeList->ulMagic != RANGE_LIST_MAGIC) + if (!IsValidRangeList(pRangeList)) return CR_INVALID_RANGE_LIST; if (ulFlags != 0) return CR_INVALID_FLAG; - // TODO: Free the list of ranges + /* Lock the range list */ + WaitForSingleObject(pRangeList->hMutex, INFINITE); + + /* Free the list of ranges */ + while (!IsListEmpty(&pRangeList->ListHead)) + { + ListEntry = RemoveHeadList(&pRangeList->ListHead); + pRange = CONTAINING_RECORD(ListEntry, INTERNAL_RANGE, ListEntry); + HeapFree(GetProcessHeap(), 0, pRange); + } + + /* Unlock the range list */ + ReleaseMutex(pRangeList->hMutex); + + /* Close the mutex */ + CloseHandle(pRangeList->hMutex); + /* Free the range list */ HeapFree(GetProcessHeap(), 0, pRangeList); return CR_SUCCESS;

7 years, 1 month

[reactos] 05/05: [CDFS_NEW] Now NtWriteFile is fixed, revert 5f25582, ie remove FastIO hack from the driver CORE-14003

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=faee3753ea79c7e332c7a… commit faee3753ea79c7e332c7a1b5eb74ca2c6614e23d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Nov 12 22:36:47 2017 +0100 [CDFS_NEW] Now NtWriteFile is fixed, revert 5f25582, ie remove FastIO hack from the driver CORE-14003 --- drivers/filesystems/cdfs_new/cdinit.c | 36 ----------------------------------- 1 file changed, 36 deletions(-) diff --git a/drivers/filesystems/cdfs_new/cdinit.c b/drivers/filesystems/cdfs_new/cdinit.c index 1f086fe61d..b6bec14c45 100755 --- a/drivers/filesystems/cdfs_new/cdinit.c +++ b/drivers/filesystems/cdfs_new/cdinit.c @@ -58,29 +58,6 @@ CdShutdown ( #pragma alloc_text(INIT, CdInitializeGlobalData) #endif -#ifdef __REACTOS__ - -// -// Stub for CcWrite, this is a hack -// -BOOLEAN -NTAPI -CdFastIoWrite ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Wait, - IN ULONG LockKey, - IN PVOID Buffer, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject) -{ - ASSERT(FALSE); - return FALSE; -} - -#endif - // // Local support routine @@ -365,19 +342,6 @@ Return Value: CdFastIoDispatch.SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); CdFastIoDispatch.FastIoCheckIfPossible = CdFastIoCheckIfPossible; // CheckForFastIo CdFastIoDispatch.FastIoRead = FsRtlCopyRead; // Read -#ifdef __REACTOS__ - - // - // Add a stub for CdFastIoWrite. This is a hack required because - // our current implementation of NtWriteFile won't validate - // access granted to files opened. And some applications may attempt - // to write to a file. In case it is cached, the kernel will null-dereference - // the fastIO routine, trying to call it. - // FIXME: remove once NtWriteFile got fixed! - // - - CdFastIoDispatch.FastIoWrite = CdFastIoWrite; // Write -#endif CdFastIoDispatch.FastIoQueryBasicInfo = CdFastQueryBasicInfo; // QueryBasicInfo CdFastIoDispatch.FastIoQueryStandardInfo = CdFastQueryStdInfo; // QueryStandardInfo CdFastIoDispatch.FastIoLock = CdFastLock; // Lock

7 years, 1 month

← Newer
1
...
7
8
9
10
11
12
13
...
19
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 November 2017