From b9f7c1566aec8bbb523ac4664cc1f962d8ab5c75 Mon Sep 17 00:00:00 2001 From: Daniel Reimer Date: Sun, 26 Apr 2015 12:28:01 +0000 Subject: [PATCH] [ROSAPPS] Add all sysutils to build which did build at rbuild times. Fix several warnings in rosddt. Update notevil with moar names to be up to date and really not evil by ignoring some guys. ^^ svn path=/trunk/; revision=67434 --- rosapps/applications/notevil/notevil.rc | 203 +++++++++++------- rosapps/applications/sysutils/CMakeLists.txt | 19 +- .../sysutils/logevent/CMakeLists.txt | 6 + .../applications/sysutils/lsdd/CMakeLists.txt | 6 + .../applications/sysutils/man/CMakeLists.txt | 5 + .../sysutils/pedump/CMakeLists.txt | 6 + .../sysutils/regexpl/CMakeLists.txt | 36 ++++ .../sysutils/rosddt/CMakeLists.txt | 5 + rosapps/applications/sysutils/rosddt/http.c | 5 +- rosapps/applications/sysutils/rosddt/rosddt.c | 20 +- .../sysutils/screenshot/CMakeLists.txt | 5 + .../sysutils/systeminfo/CMakeLists.txt | 5 + .../applications/sysutils/tcat/CMakeLists.txt | 5 + 13 files changed, 233 insertions(+), 93 deletions(-) create mode 100644 rosapps/applications/sysutils/logevent/CMakeLists.txt create mode 100644 rosapps/applications/sysutils/lsdd/CMakeLists.txt create mode 100644 rosapps/applications/sysutils/man/CMakeLists.txt create mode 100644 rosapps/applications/sysutils/pedump/CMakeLists.txt create mode 100644 rosapps/applications/sysutils/regexpl/CMakeLists.txt create mode 100644 rosapps/applications/sysutils/rosddt/CMakeLists.txt create mode 100644 rosapps/applications/sysutils/screenshot/CMakeLists.txt create mode 100644 rosapps/applications/sysutils/systeminfo/CMakeLists.txt create mode 100644 rosapps/applications/sysutils/tcat/CMakeLists.txt diff --git a/rosapps/applications/notevil/notevil.rc b/rosapps/applications/notevil/notevil.rc index 54ee7bbdc6c..935eb55f0cc 100644 --- a/rosapps/applications/notevil/notevil.rc +++ b/rosapps/applications/notevil/notevil.rc @@ -16,98 +16,157 @@ * * 2006-03-05, frik85: add new coders (in no particular order) * + * 2015-04-26, dreimer: add new and old missing coders based on our + * Wiki site. Order made alphabetical. + * */ STRINGTABLE MOVEABLE BEGIN - 1, "Boudewijn Dekker (Ariadne)" - 2, "Robert Bergkvist (FragDance Galore)" - 3, "Arindam Das" - 4, "Jason Eager" - 5, "Jason Filby" - 6, "Rex Jolliff" - 7, "Eric Kohl" - 8, "Hans Kremer" - 9, "Frederik Leemans" - 10, "Jean Michault" - 11, "Jim Noeth" - 12, "Brian Palmer" - 13, "Matt Pyne" - 14, "Jason Weiler" - 15, "David Welch" + 1, "Aleksandar Andrejevic" + 2, "Aleksey Bragin" + 3, "Alex Ionescu" + 4, "Amine Khaldi" + 5, "Andrew Green" + 6, "Andrew Greenwood" + 7, "Andrew Hill" + 8, "Andrew Munger" + 9, "Andrey Korotaev" + 10, "Arch Blackmann" + 11, "Arindam Das" + 12, "Art Yerkes" + 13, "Benedikt Freisen" + 14, "Boudewijn Dekker" + 15, "Brandon Turner" END STRINGTABLE MOVEABLE BEGIN - 16, "Emanuele Aliberti" - 17, "Phillip Susi" - 18, "Paolo Pantaleo" - 19, "Hernan Ochoa" - 20, "Casper S. Hornstrup" - 21, "Steven Edwards" - 22, "KJK::Hyperion" - 23, "Robert Dickenson" - 24, "Eugene Ingerman" - 25, "Guido de Jong" - 26, "Jurgen van Gael" - 27, "Marty Dill" - 28, "Ge van Geldorp" - 29, "Richard Campbell" - 30, "Gunnar Andre' Dalsnes" + 16, "Brian Palmer" + 17, "Cameron M. Gutman" + 18, "Carl Nettelblad" + 19, "Casper S. Hornstrup" + 20, "Christoph von Wittich" + 21, "Claudiu Mihail" + 22, "Colin Finck" + 23, "Daniel Reimer" + 24, "Danny Götte" + 25, "David Quintana" + 26, "David Welch" + 27, "Dmitry Chapyshev" + 28, "Dmitry Gorbachev" + 29, "Dominique Cote" + 30, "Edijs Kolesnikovics" END STRINGTABLE MOVEABLE BEGIN - 31, "Aleksey Bragin" - 32, "Royce Mitchell III" - 33, "Mark Tempel" - 34, "Art Yerkes" - 35, "Martin Fuchs" - 36, "Vizzini" - 37, "Filip Navara" - 38, "Andrew Greenwood" - 39, "Thomas Weidenmueller" - 40, "Jonathan Wilson" - 41, "Alex Ionescu" - 42, "James Tabor" - 43, "Magnus Olsen" - 44, "Herve Poussineau" - 45, "Christoph von Wittich" + 31, "Emanuele Aliberti" + 32, "Eric Kohl" + 33, "Eugene Ingerman" + 34, "Filip Navara" + 35, "Franz Lehner" + 36, "Frederik Leemans" + 37, "Gabriel Ilardi" + 38, "Ged Murphy" + 39, "Gé van Geldorp" + 40, "Gero Kuehn" + 41, "Giannis Adamopoulos" + 42, "Gregor Anich" + 43, "Gregor Gullwi" + 44, "Gregor Schneider" + 45, "Guido de Jong" END STRINGTABLE MOVEABLE BEGIN - 46, "Brandon Turner" - 47, "Ged Murphy" - 48, "Klemens R. Friedl" - 49, "Maarten Bosma" - 50, "Saveliy Tretiakov" - 51, "Amine Khaldi" - 52, "Andrew Munger" - 53, "Cameron M. Gutman" - 54, "Daniel Reimer" - 55, "Dmitry Chapyshev" - 56, "Gregor Brunmar" - 57, "Gregor Schneider" - 58, "Iwan Fatahi" - 59, "Jeffrey Morlan" - 60, "Johannes Anderwald" + 46, "Gunnar Andre' Dalsnes" + 47, "Hans Kremer" + 48, "Hartmut Birr" + 49, "Hermès Bélusca-Maïto" + 50, "Hernan Ochoa" + 51, "Hervé Poussineau" + 52, "Iwan Fatahi" + 53, "James Tabor" + 54, "Jan Roeloffzen" + 55, "Jason Eager" + 56, "Jason Filby" + 57, "Jason Weiler" + 58, "Jean Michault" + 59, "Jean-Michel Gay" + 60, "Jeffrey Morlan" END STRINGTABLE MOVEABLE BEGIN - 61, "Mark Weaver" - 62, "Matthias Kupfer" - 63, "Mike Nordell" - 64, "Nathan Woods" - 65, "Pablo Borobia" - 66, "Peter Ward" - 67, "Pierre Schweitzer" - 68, "Rafal Harabien" - 69, "Samuel Serapion" - 70, "Stefan Ginsberg" - 71, "Timo Kreuzer" - 72, "Victor Kirhenshtein" + 61, "Jens Collin" + 62, "Jérôme Gardou" + 63, "Jim Noeth" + 64, "Johannes Anderwald" + 65, "Jonathan Wilson" + 66, "Jose Catena" + 67, "Jurgen van Gael" + 68, "Kai Tietz" + 69, "Kamil Hornicek" + 70, "KJK::Hyperion" + 71, "Klemens R. Friedl" + 72, "Lucas Suggs" + 73, "Maarten Bosma" + 74, "Magnus Olsen" + 75, "Marc Piulachs" +END + +STRINGTABLE MOVEABLE +BEGIN + 76, "Mark Tempel" + 77, "Mark Weaver" + 78, "Martin Fuchs" + 79, "Marty Dill" + 80, "Matthias Kupfer" + 81, "Matt Pyne" + 82, "Michael Martin" + 83, "Michael Steil" + 84, "Michael Wirth" + 85, "Michele Cicciott" + 86, "Mike Nordell" + 87, "Mindflyer" + 88, "Nathan Woods" + 89, "Nedko Arnaudov" + 90, "Neeraj Yadav" +END + +STRINGTABLE MOVEABLE +BEGIN + 91, "Olaf Siejka" + 92, "Pablo Borobia" + 93, "Paolo Pantaleo" + 94, "Peter Ward" + 95, "Phillip Susi" + 96, "Pierre Schweitzer" + 97, "Rafal Harabien" + 98, "Rex Jolliff" + 99, "Richard Campbell" + 100, "Robert Bergkvist (FragDance Galore)" + 101, "Robert Dickenson" + 102, "Robert Kopferl" + 103, "Roel Messiant" + 104, "Royce Mitchell III" + 105, "Samuel Serapión" +END + +STRINGTABLE MOVEABLE +BEGIN + 106, "Saveliy Tretiakov" + 107, "Sebastian Gasiorek" + 108, "Stefan Ginsberg" + 109, "Steven Edwards" + 110, "Sylvain Petreolle" + 111, "Thomas Bluemel" + 112, "Thomas Faber" + 113, "Timo Kreuzer" + 114, "Victor Kirhenshtein" + 115, "Vizzini" + 116, "Ziliang Guo" END /* EOF */ diff --git a/rosapps/applications/sysutils/CMakeLists.txt b/rosapps/applications/sysutils/CMakeLists.txt index b3b800dc8fd..4b3b2eb0801 100644 --- a/rosapps/applications/sysutils/CMakeLists.txt +++ b/rosapps/applications/sysutils/CMakeLists.txt @@ -3,15 +3,14 @@ add_subdirectory(chklib) add_subdirectory(ctm) add_subdirectory(gettype) add_subdirectory(kill) -#add_subdirectory(logevent) -#add_subdirectory(lsdd) -#add_subdirectory(man) -#add_subdirectory(mkdosfs) -#add_subdirectory(pedump) -#add_subdirectory(regexpl) -#add_subdirectory(rosddt) -#add_subdirectory(screenshot) -#add_subdirectory(systeminfo) -#add_subdirectory(tcat) +add_subdirectory(logevent) +add_subdirectory(lsdd) +add_subdirectory(man) +add_subdirectory(pedump) +add_subdirectory(regexpl) +add_subdirectory(rosddt) +add_subdirectory(screenshot) +add_subdirectory(systeminfo) +add_subdirectory(tcat) add_subdirectory(tlist) add_subdirectory(utils) diff --git a/rosapps/applications/sysutils/logevent/CMakeLists.txt b/rosapps/applications/sysutils/logevent/CMakeLists.txt new file mode 100644 index 00000000000..2dfeca5204f --- /dev/null +++ b/rosapps/applications/sysutils/logevent/CMakeLists.txt @@ -0,0 +1,6 @@ + +add_executable(logevent logevent.c logevent.rc) +set_module_type(logevent win32cui) +add_target_compile_flags(logevent "-Wno-unused-but-set-variable") +add_importlibs(logevent advapi32 msvcrt kernel32) +add_cd_file(TARGET logevent DESTINATION reactos/system32 FOR all) diff --git a/rosapps/applications/sysutils/lsdd/CMakeLists.txt b/rosapps/applications/sysutils/lsdd/CMakeLists.txt new file mode 100644 index 00000000000..94d0afe1e76 --- /dev/null +++ b/rosapps/applications/sysutils/lsdd/CMakeLists.txt @@ -0,0 +1,6 @@ + +add_executable(lsdd lsdd.c lsdd.rc) +set_module_type(lsdd win32cui) +target_link_libraries(lsdd win32err) +add_importlibs(lsdd user32 msvcrt kernel32) +add_cd_file(TARGET lsdd DESTINATION reactos/system32 FOR all) diff --git a/rosapps/applications/sysutils/man/CMakeLists.txt b/rosapps/applications/sysutils/man/CMakeLists.txt new file mode 100644 index 00000000000..8c2a16a15f1 --- /dev/null +++ b/rosapps/applications/sysutils/man/CMakeLists.txt @@ -0,0 +1,5 @@ + +add_executable(man man.c) +set_module_type(man win32cui) +add_importlibs(man user32 msvcrt kernel32 ntdll) +add_cd_file(TARGET man DESTINATION reactos/system32 FOR all) diff --git a/rosapps/applications/sysutils/pedump/CMakeLists.txt b/rosapps/applications/sysutils/pedump/CMakeLists.txt new file mode 100644 index 00000000000..1acb8b46372 --- /dev/null +++ b/rosapps/applications/sysutils/pedump/CMakeLists.txt @@ -0,0 +1,6 @@ + +add_executable(pedump pedump.c pedump.rc) +set_module_type(pedump win32cui) +add_target_compile_flags(pedump "-Wno-unused-but-set-variable") +add_importlibs(pedump msvcrt kernel32 ntdll) +add_cd_file(TARGET pedump DESTINATION reactos/system32 FOR all) diff --git a/rosapps/applications/sysutils/regexpl/CMakeLists.txt b/rosapps/applications/sysutils/regexpl/CMakeLists.txt new file mode 100644 index 00000000000..7df8b72a573 --- /dev/null +++ b/rosapps/applications/sysutils/regexpl/CMakeLists.txt @@ -0,0 +1,36 @@ + +set_cpp(WITH_RUNTIME WITH_STL WITH_EXCEPTIONS) + +list(APPEND SOURCE + ArgumentParser.cpp + Console.cpp + RegistryExplorer.cpp + RegistryKey.cpp + RegistryTree.cpp + SecurityDescriptor.cpp + ShellCommand.cpp + ShellCommandChangeKey.cpp + ShellCommandConnect.cpp + ShellCommandDACL.cpp + ShellCommandDeleteKey.cpp + ShellCommandDeleteValue.cpp + ShellCommandDir.cpp + ShellCommandExit.cpp + ShellCommandHelp.cpp + ShellCommandNewKey.cpp + ShellCommandOwner.cpp + ShellCommandSACL.cpp + ShellCommandSetValue.cpp + ShellCommandValue.cpp + ShellCommandVersion.cpp + ShellCommandsLinkedList.cpp + TextHistory.cpp + Completion.cpp + Pattern.cpp + Settings.cpp + Prompt.cpp) + +add_executable(regexpl ${SOURCE} regexpl.rc) +set_module_type(regexpl win32cui) +add_importlibs(regexpl user32 advapi32 msvcrt kernel32) +add_cd_file(TARGET regexpl DESTINATION reactos/system32 FOR all) diff --git a/rosapps/applications/sysutils/rosddt/CMakeLists.txt b/rosapps/applications/sysutils/rosddt/CMakeLists.txt new file mode 100644 index 00000000000..fea75010707 --- /dev/null +++ b/rosapps/applications/sysutils/rosddt/CMakeLists.txt @@ -0,0 +1,5 @@ + +add_executable(rosddt http.c rosddt.c rosddt.rc) +set_module_type(rosddt win32cui UNICODE) +add_importlibs(rosddt setupapi wininet user32 msvcrt kernel32) +add_cd_file(TARGET rosddt DESTINATION reactos/system32 FOR all) diff --git a/rosapps/applications/sysutils/rosddt/http.c b/rosapps/applications/sysutils/rosddt/http.c index 49095ee694c..c0e6fd8a1d4 100644 --- a/rosapps/applications/sysutils/rosddt/http.c +++ b/rosapps/applications/sysutils/rosddt/http.c @@ -76,7 +76,8 @@ void *http_post(wchar_t *url, void *data, int size, u_long *d_size) char *replay = NULL; wchar_t host[MAX_PATH]; wchar_t path[MAX_PATH]; - unsigned char *p, *d = data; + char *p = NULL; + char *d = data; do { @@ -86,7 +87,7 @@ void *http_post(wchar_t *url, void *data, int size, u_long *d_size) strcpy(q_data, "data="); p = q_data + 5; while (size--) { - p += sprintf(p, "%%%0.2x", (u_long)*d++); + p += sprintf(p, "%%%.2x", (u_int)*d++); } url_cm.dwStructSize = sizeof(url_cm); diff --git a/rosapps/applications/sysutils/rosddt/rosddt.c b/rosapps/applications/sysutils/rosddt/rosddt.c index bc1adbd9498..7e06fc9834b 100644 --- a/rosapps/applications/sysutils/rosddt/rosddt.c +++ b/rosapps/applications/sysutils/rosddt/rosddt.c @@ -30,7 +30,8 @@ static int hw_check_ini(wchar_t *name) static int hw_check_base(wchar_t *hw_id, wchar_t *hw_name) { - wchar_t buff[MAX_PATH], *p; + wchar_t buff[MAX_PATH]; + wchar_t *p = NULL; int status; if ( (status = hw_check_ini(hw_id)) != ST_NEUTRAL ) { @@ -48,7 +49,7 @@ static int hw_check_base(wchar_t *hw_id, wchar_t *hw_name) return status; } - if (p = wcsstr(hw_id, L"&REV_")) { + if (p == wcsstr(hw_id, L"&REV_")) { wcscat(buff, p); status = hw_check_ini(buff); } } else if ( (wcsncmp(hw_id, L"USB\\", 4) == 0) && (p = wcsstr(hw_id, L"&VID")) ) @@ -59,7 +60,7 @@ static int hw_check_base(wchar_t *hw_id, wchar_t *hw_name) return status; } - if (p = wcsstr(buff, L"&REV")) { + if (p == wcsstr(buff, L"&REV")) { *p = 0; status = hw_check_ini(buff); } } @@ -143,9 +144,9 @@ static int hw_check_device(HDEVINFO h_info, SP_DEVINFO_DATA *d_inf) static void do_update_base() { wchar_t up_url[MAX_PATH]; - void *data; + void *data = NULL; u_long size; - FILE *f; + FILE *f = NULL; if (GetPrivateProfileString(L"URL", L"udpate", NULL, up_url, MAX_PATH, gl_ini_file) == 0) { wprintf(L"Update URL not found in rosddt.ini\n"); return; @@ -153,9 +154,9 @@ static void do_update_base() wprintf(L"Downloading new rosddt.ini...\n"); - if (data = http_get(up_url, &size)) + if (data == http_get(up_url, &size)) { - if (f = _wfopen(gl_ini_file, L"wb")) { + if (f == _wfopen(gl_ini_file, L"wb")) { fwrite(data, 1, size, f); fclose(f); wprintf(L"Update completed\n"); @@ -172,7 +173,8 @@ static void do_send_report(wchar_t *report) { wchar_t up_url[MAX_PATH]; int utf_sz; - char *utf, *p; + char *utf; + char *p = NULL; if (GetPrivateProfileString(L"URL", L"report", NULL, up_url, MAX_PATH, gl_ini_file) == 0) { wprintf(L"Report URL not found in rosddt.ini\n"); return; @@ -184,7 +186,7 @@ static void do_send_report(wchar_t *report) wprintf(L"Sending report...\n"); - if (p = http_post(up_url, utf, utf_sz-1, NULL)) { + if (p == http_post(up_url, utf, utf_sz-1, NULL)) { wprintf(L"%S\n", p); free(p); } else { wprintf(L"Report can not be sended, connection error\n"); diff --git a/rosapps/applications/sysutils/screenshot/CMakeLists.txt b/rosapps/applications/sysutils/screenshot/CMakeLists.txt new file mode 100644 index 00000000000..50ef56af539 --- /dev/null +++ b/rosapps/applications/sysutils/screenshot/CMakeLists.txt @@ -0,0 +1,5 @@ + +add_executable(screenshot screenshot.c screenshot.rc) +set_module_type(screenshot win32gui UNICODE) +add_importlibs(screenshot user32 gdi32 comdlg32 msvcrt kernel32) +add_cd_file(TARGET screenshot DESTINATION reactos/system32 FOR all) diff --git a/rosapps/applications/sysutils/systeminfo/CMakeLists.txt b/rosapps/applications/sysutils/systeminfo/CMakeLists.txt new file mode 100644 index 00000000000..bc9a28efdcf --- /dev/null +++ b/rosapps/applications/sysutils/systeminfo/CMakeLists.txt @@ -0,0 +1,5 @@ + +add_executable(systeminfo systeminfo.c systeminfo.rc rsrc.rc) +set_module_type(systeminfo win32cui) +add_importlibs(systeminfo user32 advapi32 netapi32 shlwapi iphlpapi ws2_32 msvcrt kernel32 ntdll) +add_cd_file(TARGET systeminfo DESTINATION reactos/system32 FOR all) diff --git a/rosapps/applications/sysutils/tcat/CMakeLists.txt b/rosapps/applications/sysutils/tcat/CMakeLists.txt new file mode 100644 index 00000000000..573baf695dc --- /dev/null +++ b/rosapps/applications/sysutils/tcat/CMakeLists.txt @@ -0,0 +1,5 @@ + +add_executable(tcat cat.c) +set_module_type(tcat win32cui) +add_importlibs(tcat user32 msvcrt kernel32 ntdll) +add_cd_file(TARGET tcat DESTINATION reactos/system32 FOR all)