diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index 5c1c6df7a..232f37cf4 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -600,7 +600,7 @@ set(pcsx2GuiSources
 	gui/ConsoleLogger.cpp
 	gui/CpuUsageProvider.cpp
 	gui/Dialogs/AboutBoxDialog.cpp
-    gui/Dialogs/GSDumpDialog.cpp
+	gui/Dialogs/GSDumpDialog.cpp
 	gui/Dialogs/AssertionDialog.cpp
 	gui/Dialogs/BaseConfigurationDialog.cpp
 	gui/Dialogs/ConfirmationDialogs.cpp
diff --git a/pcsx2/gui/Dialogs/GSDumpDialog.cpp b/pcsx2/gui/Dialogs/GSDumpDialog.cpp
index 83f1021df..700d36dfe 100644
--- a/pcsx2/gui/Dialogs/GSDumpDialog.cpp
+++ b/pcsx2/gui/Dialogs/GSDumpDialog.cpp
@@ -221,6 +221,8 @@ void Dialogs::GSDumpDialog::ProcessDumpEvent(GSData event, char* regs)
 					GSgifTransfer3((u32*)event.data, event.length / 16);
 					break;
 				}
+				default:
+					break;
 			}
 			break;
 		}
@@ -346,7 +348,7 @@ void Dialogs::GSDumpDialog::GenPacketInfo(GSData& dump)
 					{
 						for (int j = 0; j < nloop; j++)
 						{
-							for (int i = 0; i < nreg; i++)
+							for (u32 i = 0; i < nreg; i++)
 							{
 								u128 reg_data;
 								reg_data.lo =  *(u64*)(dump.data + p);
@@ -361,7 +363,7 @@ void Dialogs::GSDumpDialog::GenPacketInfo(GSData& dump)
 					{
 						for (int j = 0; j < nloop; j++)
 						{
-							for (int i = 0; i < nreg; i++)
+							for (u32 i = 0; i < nreg; i++)
 							{
 								u128 reg_data;
 								reg_data.lo =  *(u64*)(dump.data + p);
@@ -387,7 +389,7 @@ void Dialogs::GSDumpDialog::GenPacketInfo(GSData& dump)
 			case VSync:
 			{
 				wxString s;
-				s.Printf("Field = %d", (u8)dump.data);
+				s.Printf("Field = %d", *(u8*)(dump.data));
 				m_gif_packet->AppendItem(rootId, s);
 				break;
 			}
@@ -579,6 +581,8 @@ void Dialogs::GSDumpDialog::ParseTreeReg(wxTreeItemId& id, GIFReg reg, u128 data
 			m_gif_packet->Delete(rootId);
 			break;
 		}
+		default:
+			break;
 	}
 }
 
@@ -651,7 +655,6 @@ void Dialogs::GSDumpDialog::GSThread::ExecuteTaskInThread()
 		return;
 	}
 
-	char freeze_data[sizeof(int) * 2];
 	u32 crc = 0, ss = 0;
 	// XXX: check the numbers are correct
 	int renderer_override = m_root_window->m_renderer_overrides->GetSelection();
@@ -665,8 +668,7 @@ void Dialogs::GSDumpDialog::GSThread::ExecuteTaskInThread()
 	dump_file.Read(state_data, ss);
 	dump_file.Read(&regs, 8192);
 
-	int ssi = ss;
-	freezeData fd = {ss, (s8*)state_data};
+	freezeData fd = {(int)ss, (s8*)state_data};
 	m_root_window->m_dump_packets.clear();
 
 	while (dump_file.Tell() < dump_file.Length())
@@ -691,7 +693,7 @@ void Dialogs::GSDumpDialog::GSThread::ExecuteTaskInThread()
 			{
 				u8 vsync = 0;
 				dump_file.Read(&vsync, 1);
-				GSData data = {id, (char*)vsync, 1, Dummy};
+				GSData data = {id, (char*)&vsync, 1, Dummy};
 				m_root_window->m_dump_packets.push_back(data);
 				break;
 			}
@@ -735,7 +737,7 @@ void Dialogs::GSDumpDialog::GSThread::ExecuteTaskInThread()
 	GetCorePlugins().DoFreeze(PluginId_GS, 0, &fd, true);
 
 	size_t i = 0;
-	int RunTo = 0;
+	size_t RunTo = 0;
 	size_t debug_idx = 0;
 
 	while (m_running)
diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
index 7186b3ad1..e9d65998b 100644
--- a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
+++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
@@ -1307,6 +1307,8 @@
       <Filter>System\Ps2\PAD</Filter>
     </ClCompile>
     <ClCompile Include="..\..\gui\Dialogs\IPCDialog.cpp">
+      <Filter>AppHost\Dialogs</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\gui\Dialogs\GSDumpDialog.cpp">
       <Filter>AppHost\Dialogs</Filter>
     </ClCompile>
@@ -2239,13 +2241,9 @@
       <Filter>AppHost\Resources</Filter>
     </Manifest>
   </ItemGroup>
-<<<<<<< HEAD
-</Project>
-=======
   <ItemGroup>
     <Image Include="..\..\gui\Resources\NoIcon.png">
       <Filter>AppHost\Resources</Filter>
     </Image>
   </ItemGroup>
 </Project>
->>>>>>> 9c167ad79... GSDump: initial windows port