[ros-diffs] [dreimer] 67439: [ROSAPPS] put -Wno-unused-but-set-variable between a if(NOT MSVC) to really make MSVC happy this time / Get rid of -Wno-implicit-function-declaration (include juggling + add defini...

Author: dreimer
Date: Sun Apr 26 17:08:34 2015
New Revision: 67439

URL: http://svn.reactos.org/svn/reactos?rev=67439&view=rev
Log:
[ROSAPPS] put -Wno-unused-but-set-variable between a if(NOT MSVC) to really make MSVC
happy this time / Get rid of -Wno-implicit-function-declaration (include juggling + add
definitions) and -Wno-format-extra-args (shorten sprinf) in ncftp. / Fix rosperf build and
add it to cmake build now.

Modified:
    trunk/rosapps/applications/devutils/symdump/CMakeLists.txt
    trunk/rosapps/applications/net/ncftp/CMakeLists.txt
    trunk/rosapps/applications/net/ncftp/libncftp/syshdrs.h
    trunk/rosapps/applications/net/ncftp/ncftp/cmds.c
    trunk/rosapps/applications/net/ncftp/ncftp/syshdrs.h
    trunk/rosapps/applications/net/ncftp/sio/syshdrs.h
    trunk/rosapps/applications/sysutils/logevent/CMakeLists.txt
    trunk/rosapps/applications/sysutils/pedump/CMakeLists.txt
    trunk/rosapps/applications/sysutils/utils/CMakeLists.txt
    trunk/rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt
    trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.c
    trunk/rosapps/templates/dialog/CMakeLists.txt

Modified: trunk/rosapps/applications/devutils/symdump/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/symd…
==============================================================================
--- trunk/rosapps/applications/devutils/symdump/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/symdump/CMakeLists.txt	[iso-8859-1] Sun Apr 26
17:08:34 2015
@@ -4,5 +4,7 @@
 set_module_type(symdump win32cui)
 target_link_libraries(symdump wine)
 add_importlibs(symdump dbghelp shlwapi msvcrt kernel32)
-add_compile_flags("-Wno-unused-but-set-variable")
+if(NOT MSVC)
+    add_target_compile_flags(symdump "-Wno-unused-but-set-variable")
+endif()
 add_cd_file(TARGET symdump DESTINATION reactos/system32 FOR all)

Modified: trunk/rosapps/applications/net/ncftp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/CMa…
==============================================================================
--- trunk/rosapps/applications/net/ncftp/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rosapps/applications/net/ncftp/CMakeLists.txt	[iso-8859-1] Sun Apr 26 17:08:34
2015
@@ -70,6 +70,10 @@
 
 add_executable(ncftp ${SOURCE} ncftp.rc)
 set_module_type(ncftp win32cui)
-add_target_compile_flags(ncftp "-Wno-unused-but-set-variable
-Wno-implicit-function-declaration -Wno-format-extra-args")
+if(NOT MSVC)
+    add_target_compile_flags(ncftp "-DHAVE_UTIME_H -DHAVE_UNISTD_H
-Wno-unused-but-set-variable")
+else()
+    add_target_compile_flags(ncftp "-DHAVE_UTIME_H -DHAVE_UNISTD_H")
+endif()
 add_importlibs(ncftp advapi32 user32 ws2_32 msvcrt kernel32)
 add_cd_file(TARGET ncftp DESTINATION reactos/system32 FOR all)

Modified: trunk/rosapps/applications/net/ncftp/libncftp/syshdrs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/lib…
==============================================================================
--- trunk/rosapps/applications/net/ncftp/libncftp/syshdrs.h	[iso-8859-1] (original)
+++ trunk/rosapps/applications/net/ncftp/libncftp/syshdrs.h	[iso-8859-1] Sun Apr 26
17:08:34 2015
@@ -50,8 +50,6 @@
 #		define lstat _stat
 #		define fstat _fstat
 #		define dup _dup
-#		define utime _utime
-#		define utimbuf _utimbuf
 #	endif
 #	ifndef unlink
 #		define unlink remove

Modified: trunk/rosapps/applications/net/ncftp/ncftp/cmds.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/ncf…
==============================================================================
--- trunk/rosapps/applications/net/ncftp/ncftp/cmds.c	[iso-8859-1] (original)
+++ trunk/rosapps/applications/net/ncftp/ncftp/cmds.c	[iso-8859-1] Sun Apr 26 17:08:34
2015
@@ -1211,7 +1211,7 @@
 		SysPerror("CreateMailslot");
 		(void) fprintf(stderr, "Could not create communication channel with %s.\n",
"ncftpbookmarks.exe");
 		(void) fprintf(stderr, "%s", "This means if you select a bookmark to
connect to that NcFTP\n");
-		(void) fprintf(stderr, "%s", "will not get the message from %s.\n",
"ncftpbookmarks.exe");
+		(void) fprintf(stderr, "%s", "will not get the message from
%s.\n");
 	}
 
 	winExecResult = WinExec(prog, SW_SHOWNORMAL);

Modified: trunk/rosapps/applications/net/ncftp/ncftp/syshdrs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/ncf…
==============================================================================
--- trunk/rosapps/applications/net/ncftp/ncftp/syshdrs.h	[iso-8859-1] (original)
+++ trunk/rosapps/applications/net/ncftp/ncftp/syshdrs.h	[iso-8859-1] Sun Apr 26 17:08:34
2015
@@ -44,6 +44,8 @@
 #	include <fcntl.h>
 #	include <signal.h>
 #	include <assert.h>
+#	include <utime.h>
+#	include <direct.h>
 #	undef strcasecmp
 #	define strcasecmp stricmp
 #	undef strncasecmp

Modified: trunk/rosapps/applications/net/ncftp/sio/syshdrs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/sio…
==============================================================================
--- trunk/rosapps/applications/net/ncftp/sio/syshdrs.h	[iso-8859-1] (original)
+++ trunk/rosapps/applications/net/ncftp/sio/syshdrs.h	[iso-8859-1] Sun Apr 26 17:08:34
2015
@@ -13,6 +13,7 @@
 	/* Include "wincfg.h" in place of "config.h" */
 #	include "wincfg.h"
 #	include <winsock2.h>	/* includes <windows.h> */
+#	include <io.h>
 #	define _POSIX_ 1
 #	ifdef HAVE_UNISTD_H
 #		include <unistd.h>
@@ -28,7 +29,6 @@
 #	include <ctype.h>
 #	include <stdarg.h>
 #	include <time.h>
-#	include <io.h>
 #	include <sys/types.h>
 #	include <sys/stat.h>
 #	include <fcntl.h>

Modified: trunk/rosapps/applications/sysutils/logevent/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/loge…
==============================================================================
--- trunk/rosapps/applications/sysutils/logevent/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/logevent/CMakeLists.txt	[iso-8859-1] Sun Apr 26
17:08:34 2015
@@ -1,6 +1,8 @@
 
 add_executable(logevent logevent.c logevent.rc)
 set_module_type(logevent win32cui)
-add_target_compile_flags(logevent "-Wno-unused-but-set-variable")
+if(NOT MSVC)
+    add_target_compile_flags(logevent "-Wno-unused-but-set-variable")
+endif()
 add_importlibs(logevent advapi32 msvcrt kernel32)
 add_cd_file(TARGET logevent DESTINATION reactos/system32 FOR all)

Modified: trunk/rosapps/applications/sysutils/pedump/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/pedu…
==============================================================================
--- trunk/rosapps/applications/sysutils/pedump/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/pedump/CMakeLists.txt	[iso-8859-1] Sun Apr 26
17:08:34 2015
@@ -1,6 +1,8 @@
 
 add_executable(pedump pedump.c pedump.rc)
 set_module_type(pedump win32cui)
-add_target_compile_flags(pedump "-Wno-unused-but-set-variable")
+if(NOT MSVC)
+    add_target_compile_flags(pedump "-Wno-unused-but-set-variable")
+endif()
 add_importlibs(pedump msvcrt kernel32 ntdll)
 add_cd_file(TARGET pedump DESTINATION reactos/system32 FOR all)

Modified: trunk/rosapps/applications/sysutils/utils/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util…
==============================================================================
--- trunk/rosapps/applications/sysutils/utils/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/utils/CMakeLists.txt	[iso-8859-1] Sun Apr 26
17:08:34 2015
@@ -6,6 +6,6 @@
 add_subdirectory(objdir)
 add_subdirectory(partinfo)
 add_subdirectory(ps)
-#add_subdirectory(rosperf)
+add_subdirectory(rosperf)
 add_subdirectory(stats)
 add_subdirectory(tickcount)

Modified: trunk/rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util…
==============================================================================
--- trunk/rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt	[iso-8859-1]
(original)
+++ trunk/rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt	[iso-8859-1] Sun Apr
26 17:08:34 2015
@@ -11,6 +11,8 @@
 
 add_executable(rosperf ${SOURCE} rosperf.rc)
 set_module_type(rosperf win32cui UNICODE)
-add_target_compile_flags(rosperf "-Wno-unused-but-set-variable")
+if(NOT MSVC)
+    add_target_compile_flags(rosperf "-Wno-unused-but-set-variable")
+endif()
 add_importlibs(rosperf version msimg32 gdi32 shell32 advapi32 user32 ntdll msvcrt
kernel32)
 add_cd_file(TARGET rosperf DESTINATION reactos/system32 FOR all)

Modified: trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util…
==============================================================================
--- trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.c	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.c	[iso-8859-1] Sun Apr 26
17:08:34 2015
@@ -858,9 +858,9 @@
 }
 
 int WINAPI
-WinMain(HINSTANCE hInstance,
+wWinMain(HINSTANCE hInstance,
 	HINSTANCE hPrevInstance,
-	LPSTR lpszCmdLine,
+	LPWSTR lpszCmdLine,
 	int nCmdShow)
 {
   PTEST Tests;

Modified: trunk/rosapps/templates/dialog/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/dialog/CMakeList…
==============================================================================
--- trunk/rosapps/templates/dialog/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rosapps/templates/dialog/CMakeLists.txt	[iso-8859-1] Sun Apr 26 17:08:34 2015
@@ -9,6 +9,8 @@
 
 add_executable(template_dialog ${SOURCE} dialog.rc)
 set_module_type(template_dialog win32cui)
-add_target_compile_flags(template_dialog "-Wno-unused-but-set-variable")
+if(NOT MSVC)
+    add_target_compile_flags(template_dialog "-Wno-unused-but-set-variable")
+endif()
 add_importlibs(template_dialog user32 gdi32 comctl32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET template_dialog DESTINATION reactos/system32 FOR all)