From: konekoneko <jbh03215@gmail.com>
Date: Thu, 9 Feb 2012 09:52:11 +0000 (+0900)
Subject: ビルド時に警告が出ないようにした
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=49d35d0b9a49f212d83e82dc6d4ce2561cb0381d;p=completeeraser%2FCompleteEraser.git

ビルド時に警告が出ないようにした
---

diff --git a/.gitignore b/.gitignore
index f176faf..f65aaea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
 /ShellExtension/Release
 /ShellExtension/Debug
 /ShellExtension/Debug
-/CompleteEraser.suo
\ No newline at end of file
+/CompleteEraser.suo
+/ipch
\ No newline at end of file
diff --git a/ShellExtension/ContextMenu.h b/ShellExtension/ContextMenu.h
index b0f1590..fafbc5e 100644
--- a/ShellExtension/ContextMenu.h
+++ b/ShellExtension/ContextMenu.h
@@ -1,6 +1,9 @@
 #pragma once
 #include "DllMain.h"
+#pragma warning(push)
+#pragma warning(disable: 4995)
 #include <string>
+#pragma warning(pop)
 
 #define ID_ITEM 500
 
diff --git a/ShellExtension/DllMain.cpp b/ShellExtension/DllMain.cpp
index 99cdf5f..4efc7a6 100644
--- a/ShellExtension/DllMain.cpp
+++ b/ShellExtension/DllMain.cpp
@@ -50,7 +50,7 @@ void GetModulePath(WCHAR szOutput[],int length)
 	}
 	
 	//ƒtƒ‹ƒpƒX–¼‚𕪊„‚·‚é
-	_wsplitpath(szPath, szDrive, szDir, szFileName, szExt); 
+	_wsplitpath_s(szPath, szDrive,sizeof(szDrive), szDir,sizeof(szDir), szFileName,sizeof(szFileName), szExt,sizeof(szExt)); 
 
 	StringCbPrintf(szOutput,length,L"%s%s",szDrive,szDir);
 }
diff --git a/ShellExtension/DllMain.h b/ShellExtension/DllMain.h
index d27871f..88eb597 100644
--- a/ShellExtension/DllMain.h
+++ b/ShellExtension/DllMain.h
@@ -1,8 +1,13 @@
+#pragma once
+
+#pragma warning(push)
+#pragma warning(disable: 4995)
 #include <Windows.h>
 #include <shlwapi.h>
 #include <shlobj.h>
 #include <strsafe.h>
 #include <string>
+#pragma warning(pop)
 
 extern void LockModule(BOOL bLock);
 extern void MyLoadString(std::wstring& str,UINT id);
diff --git a/ShellExtension/Exports.def b/ShellExtension/Exports.def
index ba55d5a..26a7296 100644
--- a/ShellExtension/Exports.def
+++ b/ShellExtension/Exports.def
@@ -1,5 +1,5 @@
 
-LIBRARY	"ContextMenu"
+LIBRARY	"ShellExtension"
 
 EXPORTS
 	DllCanUnloadNow PRIVATE