From: Hermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Date: Sat, 14 Sep 2013 14:51:56 +0000 (+0000)
Subject: [NET][SERVMAN]: Fix warning C4090.
X-Git-Tag: ReactOS-0.3.16~1420
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=b56d260d39866278fd4e71d57db34b35f74853ed

[NET][SERVMAN]: Fix warning C4090.
[CMAKE]: Temporarily reconsider C4090 as a warning, otherwise we would have to fix ~= 33 problems in Wine dlls.

svn path=/trunk/; revision=60102
---

diff --git a/reactos/base/applications/mscutils/servman/start.c b/reactos/base/applications/mscutils/servman/start.c
index 504483f7154..1af77144bbd 100644
--- a/reactos/base/applications/mscutils/servman/start.c
+++ b/reactos/base/applications/mscutils/servman/start.c
@@ -183,7 +183,7 @@ DoStartService(PMAIN_WND_INFO Info,
     }
 
     if (lpArgsVector)
-        LocalFree(lpArgsVector);
+        LocalFree((LPVOID)lpArgsVector);
 
     return bRet;
 }
diff --git a/reactos/base/applications/network/net/CMakeLists.txt b/reactos/base/applications/network/net/CMakeLists.txt
index 728cb077d02..4386350ec7a 100644
--- a/reactos/base/applications/network/net/CMakeLists.txt
+++ b/reactos/base/applications/network/net/CMakeLists.txt
@@ -3,7 +3,7 @@ add_definitions(-D__USE_W32_SOCKETS)
 
 list(APPEND SOURCE
     main.c
-    cmdstart.c
+    cmdStart.c
     cmdStop.c
     cmdHelpMsg.c
     cmdPause.c
diff --git a/reactos/base/applications/network/net/cmdstart.c b/reactos/base/applications/network/net/cmdStart.c
similarity index 98%
rename from reactos/base/applications/network/net/cmdstart.c
rename to reactos/base/applications/network/net/cmdStart.c
index adec439cee6..c2da1ce7161 100644
--- a/reactos/base/applications/network/net/cmdstart.c
+++ b/reactos/base/applications/network/net/cmdStart.c
@@ -142,7 +142,7 @@ StartOneService(INT argc, WCHAR **argv)
 
 done:
     if (lpArgVectors != NULL)
-        HeapFree(GetProcessHeap(), 0, lpArgVectors);
+        HeapFree(GetProcessHeap(), 0, (LPVOID)lpArgVectors);
 
     if (hService != NULL)
         CloseServiceHandle(hService);
diff --git a/reactos/cmake/msvc.cmake b/reactos/cmake/msvc.cmake
index 53fe6008d00..5bd26c0408b 100644
--- a/reactos/cmake/msvc.cmake
+++ b/reactos/cmake/msvc.cmake
@@ -37,7 +37,8 @@ add_compile_flags("/wd4290")
 #          for C++ programs, the compiler error C2440 is issued)
 # - C4098: void function returning a value
 # - C4700: uninitialized variable usage
-add_compile_flags("/we4047 /we4090 /we4098 /we4700")
+##add_compile_flags("/we4047 /we4090 /we4098 /we4700")
+add_compile_flags("/we4047 /we4098 /we4700")
 
 # Debugging
 #if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")