diff --git a/modules/vstudio/vs2010_vcxproj.lua b/modules/vstudio/vs2010_vcxproj.lua
index 52143eb0..6f73f12f 100644
--- a/modules/vstudio/vs2010_vcxproj.lua
+++ b/modules/vstudio/vs2010_vcxproj.lua
@@ -2714,13 +2714,13 @@
 
 
 	function m.warningLevel(cfg)
-		local map = { Off = "TurnOffAllWarnings", Extra = "Level4" }
+		local map = { Off = "TurnOffAllWarnings", High = "Level4", Extra = "EnableAllWarnings" }
 		m.element("WarningLevel", nil, map[cfg.warnings] or "Level3")
 	end
 
 
 	function m.warningLevelFile(cfg, condition)
-		local map = { Off = "TurnOffAllWarnings", Extra = "Level4" }
+		local map = { Off = "TurnOffAllWarnings", High = "Level4", Extra = "EnableAllWarnings" }
 		if cfg.warnings then
 			m.element("WarningLevel", condition, map[cfg.warnings] or "Level3")
 		end
diff --git a/src/tools/msc.lua b/src/tools/msc.lua
index 83a14f9a..8b5b7f02 100644
--- a/src/tools/msc.lua
+++ b/src/tools/msc.lua
@@ -80,7 +80,7 @@
 			["SSE4.1"] = "/arch:SSE2",
 		},
 		warnings = {
-			Extra = "/W4",
+			Extra = "/Wall",
 			High = "/W4",
 			Off = "/W0",
 		},
diff --git a/tests/tools/test_msc.lua b/tests/tools/test_msc.lua
index 341e0afb..9e519a99 100644
--- a/tests/tools/test_msc.lua
+++ b/tests/tools/test_msc.lua
@@ -221,7 +221,7 @@
 	function suite.cflags_OnExtraWarnings()
 		warnings "Extra"
 		prepare()
-		test.contains("/W4", msc.getcflags(cfg))
+		test.contains("/Wall", msc.getcflags(cfg))
 	end
 
 	function suite.cflags_OnFatalWarnings()