From 49d35d0b9a49f212d83e82dc6d4ce2561cb0381d Mon Sep 17 00:00:00 2001 From: konekoneko Date: Thu, 9 Feb 2012 18:52:11 +0900 Subject: [PATCH] =?utf8?q?=E3=83=93=E3=83=AB=E3=83=89=E6=99=82=E3=81=AB?= =?utf8?q?=E8=AD=A6=E5=91=8A=E3=81=8C=E5=87=BA=E3=81=AA=E3=81=84=E3=82=88?= =?utf8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- ShellExtension/ContextMenu.h | 3 +++ ShellExtension/DllMain.cpp | 2 +- ShellExtension/DllMain.h | 5 +++++ ShellExtension/Exports.def | 2 +- 5 files changed, 12 insertions(+), 3 deletions(-) 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 +#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 #include #include #include #include +#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 -- 2.11.0