From a5804497bd19a59384e6d6963ddce1bdbbc10efb Mon Sep 17 00:00:00 2001 From: qwerty2501 Date: Thu, 3 Nov 2011 22:37:57 +0900 Subject: [PATCH] 2011/11/03 22:37:57 --- JSONParser/JSONParser.vcxproj | 25 +++++++ expat/expat.vcxproj | 28 ++++++++ memorypool/memorypool.vcxproj | 25 +++++++ nlib/StdAfx.h | 28 ++++++++ nlib/nlib.h | 6 +- nlib/nlib.vcxproj | 36 +++++++++- nlib/nlib_common.c | 2 + nlib/nlib_define.h | 3 +- nlib/nlib_include.h | 26 +------ nlib/nlib_myList.c | 147 ++++++++------------------------------ nlib/nlib_nicoLive.c | 7 +- nlib/nlib_nicoVideoAuth.c | 1 + nlib/nlib_xmlHandler.c | 1 + nlib/stdAfx.c | 1 + nlib_driver/nlib_driver.cpp | 6 +- nlib_driver/nlib_driver.vcxproj | 30 ++++++++ nlite.sln | 30 ++++---- nlite/ReadMe.txt | 7 ++ nlite/nlite.cpp | 10 +-- nlite/nlite.vcxproj | 19 ++--- nlite/nlite_include.h | 3 + nlite/stdafx.cpp | 8 +++ shareCookie/shareCookie.vcxproj | 28 ++++++++ sqlite3/sqlite3.vcxproj | 28 ++++++++ sqliteManger/sqliteManger.vcxproj | 28 ++++++++ 25 files changed, 348 insertions(+), 185 deletions(-) create mode 100644 nlib/StdAfx.h create mode 100644 nlib/stdAfx.c create mode 100644 nlite/nlite_include.h create mode 100644 nlite/stdafx.cpp diff --git a/JSONParser/JSONParser.vcxproj b/JSONParser/JSONParser.vcxproj index 0ddcdc1..2c1e9c9 100644 --- a/JSONParser/JSONParser.vcxproj +++ b/JSONParser/JSONParser.vcxproj @@ -1,6 +1,10 @@  + + Debug-window + Win32 + Debug Win32 @@ -21,6 +25,11 @@ true Unicode + + StaticLibrary + true + Unicode + StaticLibrary false @@ -33,6 +42,9 @@ + + + @@ -51,6 +63,19 @@ true + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;JSON32;%(PreprocessorDefinitions) + + + Windows + true + + Level3 diff --git a/expat/expat.vcxproj b/expat/expat.vcxproj index 5143bc0..6b7f292 100644 --- a/expat/expat.vcxproj +++ b/expat/expat.vcxproj @@ -1,6 +1,10 @@  + + Debug-window + Win32 + Debug Win32 @@ -21,6 +25,11 @@ true Unicode + + StaticLibrary + true + Unicode + StaticLibrary false @@ -33,6 +42,9 @@ + + + @@ -40,6 +52,9 @@ $(IncludePath) + + $(IncludePath) + $(IncludePath) @@ -56,6 +71,19 @@ true + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE + + + Windows + true + + Level3 diff --git a/memorypool/memorypool.vcxproj b/memorypool/memorypool.vcxproj index 72f04cd..7c587ae 100644 --- a/memorypool/memorypool.vcxproj +++ b/memorypool/memorypool.vcxproj @@ -1,6 +1,10 @@  + + Debug-window + Win32 + Debug Win32 @@ -21,6 +25,11 @@ true Unicode + + StaticLibrary + true + Unicode + StaticLibrary false @@ -33,6 +42,9 @@ + + + @@ -51,6 +63,19 @@ true + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + + Level3 diff --git a/nlib/StdAfx.h b/nlib/StdAfx.h new file mode 100644 index 0000000..d35b379 --- /dev/null +++ b/nlib/StdAfx.h @@ -0,0 +1,28 @@ +#pragma once + +#include +#define _CRT_NON_CONFORMING_SWPRINTFS = 1 +#define WIN32_LEAN_AND_MEAN // Windows ƒwƒbƒ_[‚©‚çŽg—p‚³‚ê‚Ä‚¢‚È‚¢•”•ª‚ðœŠO‚µ‚Ü‚·B + + + +//windowsAPIŠÖ˜Aƒwƒbƒ_ +#include +#include +#include +#include +#include +#include +#include + +#include + +//crtƒwƒbƒ_ +#include +#include +#include +#include + +//ƒŠƒ“ƒN‚·‚é•K—v‚ª‚ ‚郉ƒCƒuƒ‰ƒŠ‚̃wƒbƒ_(‘¼ŽÒ—l»ì) +#include +#include \ No newline at end of file diff --git a/nlib/nlib.h b/nlib/nlib.h index 7472835..161630f 100644 --- a/nlib/nlib.h +++ b/nlib/nlib.h @@ -350,9 +350,9 @@ extern "C" { /// - ///‚Æ‚è‚ ‚¦‚¸ƒ}ƒCƒŠƒXƒg‚É“®‰æ‚ð“o˜^ - /// - NLIB_DECLSPEC NLIB_RESULT NicoMyList_addDefList(NicoVideoAuth_P pAuth,LPCWSTR video_id,LPCWSTR description); + ///ƒ}ƒCƒŠƒXƒg“o˜^ŒÄ‚яo‚µ + /// + NLIB_DECLSPEC NLIB_RESULT NicoMyList_addItem(LPCWSTR video_id); diff --git a/nlib/nlib.vcxproj b/nlib/nlib.vcxproj index e966e03..d7ad861 100644 --- a/nlib/nlib.vcxproj +++ b/nlib/nlib.vcxproj @@ -1,6 +1,10 @@  + + Debug-window + Win32 + Debug Win32 @@ -21,6 +25,11 @@ true Unicode + + StaticLibrary + true + Unicode + StaticLibrary false @@ -33,6 +42,9 @@ + + + @@ -40,13 +52,28 @@ $(SolutionDir);$(IncludePath) + + $(SolutionDir);$(IncludePath) + $(SolutionDir);$(IncludePath) - - + Use + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE + AssemblyAndSourceCode + + + Windows + true + + + + + Use Level3 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE @@ -83,6 +110,10 @@ + + Create + Create + @@ -92,6 +123,7 @@ + diff --git a/nlib/nlib_common.c b/nlib/nlib_common.c index dee39d0..7b81915 100644 --- a/nlib/nlib_common.c +++ b/nlib/nlib_common.c @@ -1,6 +1,8 @@ +#include "StdAfx.h" #include "nlib_include.h" + HINTERNET hHttpSession; //HINTERNET HINTERNET hWatchLiveNicoConnect; HINTERNET hNicoVideoConnect; diff --git a/nlib/nlib_define.h b/nlib/nlib_define.h index 2f3c7b4..c4ce4ab 100644 --- a/nlib/nlib_define.h +++ b/nlib/nlib_define.h @@ -164,7 +164,8 @@ #define NLIB_ERR_JSON_PARSE ((NLIB_RESULT)33) - +///shellŽÀsƒGƒ‰[ +#define NLIB_ERR_SHELL_FAILED ((NLIB_RESULT)34) diff --git a/nlib/nlib_include.h b/nlib/nlib_include.h index 3f7383b..1ecec26 100644 --- a/nlib/nlib_include.h +++ b/nlib/nlib_include.h @@ -1,39 +1,15 @@ #pragma once -#include + #ifdef WIN32 #define JSON32 #endif -#define _CRT_NON_CONFORMING_SWPRINTFS = 1 -#define WIN32_LEAN_AND_MEAN // Windows ƒwƒbƒ_[‚©‚çŽg—p‚³‚ê‚Ä‚¢‚È‚¢•”•ª‚ðœŠO‚µ‚Ü‚·B - -//windowsAPIŠÖ˜Aƒwƒbƒ_ -#include -#include -#include -#include -#include - - - - -#include - -#include -//crtƒwƒbƒ_ -#include -#include -#include -#include -//ƒŠƒ“ƒN‚·‚é•K—v‚ª‚ ‚郉ƒCƒuƒ‰ƒŠ‚̃wƒbƒ_(‘¼ŽÒ—l»ì) -#include -#include //ƒŠƒ“ƒN‚·‚é•K—v‚ª‚ ‚郉ƒCƒuƒ‰ƒŠ‚̃wƒbƒ_(Ž©ì) diff --git a/nlib/nlib_myList.c b/nlib/nlib_myList.c index 2ab77f8..0e55b41 100644 --- a/nlib/nlib_myList.c +++ b/nlib/nlib_myList.c @@ -1,6 +1,8 @@ +#include "StdAfx.h" #include "nlib_include.h" + typedef enum { NicoMyList_Root = 0, @@ -50,10 +52,6 @@ static NLIB_RESULT NicoMyList_getMyListInternal(NicoVideoAuth_P pAuth,LPCWSTR ob static NLIB_RESULT NicoMyList_common(NicoVideoAuth_P pAuth,LPCWSTR objectName,JSONStructEventHandler structHandler,JSONDataEventHandler dataHandler,JSONStructEndEventHandler endHandler,LPVOID item); -static NLIB_RESULT myListGetAddNicoApiToken(NicoVideoAuth_P pAuth,LPCWSTR video_id,LPWSTR wbuffer,DWORD buflen); - -static NLIB_RESULT myListGetNicoApiToken(NicoVideoAuth_P pAuth,LPCWSTR objectName,LPWSTR wbuffer,DWORD buflen); - static NicoMyListItem_P NicoMyListItem_new(); static VOID NicoMyListItem_delete(NicoMyListItem_P *pitem); @@ -146,7 +144,35 @@ NLIB_DECLSPEC NLIB_RESULT NicoMyList_getMyListGroup(NicoVideoAuth_P pAuth,NicoMy NicoMyList_delete(&listContainer.pMyList); return rslt; } +NLIB_DECLSPEC NLIB_RESULT NicoMyList_addItem(LPCWSTR video_id){ + + NLIB_RESULT rslt = NLIB_ERR_OK; + + WCHAR addApi[LENGTH_512] = {L"http://www.nicovideo.jp/mylist_add/video/"}; + if(wcslen(video_id) > ARRAY_LENGTH(addApi) /2){ + + goto buffererr; + } + wcscat(addApi,video_id); + + if(ShellExecute(NULL,L"open",addApi,NULL,NULL,SW_SHOWDEFAULT) <= (HINSTANCE)32){ + goto shellerr; + } + + + +end: + return rslt; + +shellerr: + rslt = NLIB_ERR_SHELL_FAILED; + goto end; + +buffererr: + rslt = NLIB_ERR_BUFFER_TOOLITTLE; + goto end; +} // //ƒvƒ‰ƒCƒx[ƒgŠÖ” @@ -258,120 +284,7 @@ jsonerr: } -NLIB_DECLSPEC NLIB_RESULT NicoMyList_addDefList(NicoVideoAuth_P pAuth,LPCWSTR video_id,LPCWSTR description){ - - NLIB_RESULT rslt = NLIB_ERR_OK; - - WCHAR tokenBuffer[LENGTH_256]; - - - rslt = myListGetAddNicoApiToken(pAuth,video_id,tokenBuffer,ARRAY_LENGTH(tokenBuffer)); - - - return rslt; - -} - -static NLIB_RESULT myListGetAddNicoApiToken(NicoVideoAuth_P pAuth,LPCWSTR video_id,LPWSTR wbuffer,DWORD buflen){ - - NLIB_RESULT rslt = NLIB_ERR_OK; - WCHAR getTokenObject[LENGTH_256] = {L"mylist_add/video/"}; - if(wcslen(video_id) > ARRAY_LENGTH(getTokenObject) / 2){ - goto buffererr; - - } - - wcscat(getTokenObject,video_id); - - rslt = myListGetNicoApiToken(pAuth,getTokenObject,wbuffer,buflen); -end: - return rslt; - -buffererr: - rslt = NLIB_ERR_BUFFER_TOOLITTLE; - goto end; -} - -static NLIB_RESULT myListGetNicoApiToken(NicoVideoAuth_P pAuth,LPCWSTR objectName,LPWSTR wbuffer,DWORD buflen){ - - NLIB_RESULT rslt = NLIB_ERR_OK; - WCHAR cookie[LENGTH_256] = {L"Cookie: "}; - HINTERNET hrequest = NULL; - DWORD statusCode; - DWORD statusCodeSize = sizeof(statusCode); - LPBYTE readBuffer = NULL; - DWORD readBufSize = LENGTH_65536 * 5; - DWORD readSize; - if(wcslen(objectName) > ARRAY_LENGTH(cookie) / 2){ - goto buffererr; - } - - hrequest = WinHttpOpenRequest(hNicoVideoConnect,L"GET",objectName,L"1.1",(LPCWSTR)WINHTTP_NO_REFERER,(LPCWSTR*)WINHTTP_DEFAULT_ACCEPT_TYPES,0); - if(hrequest == NULL){ - goto networkerr; - } - - wcscat(cookie,pAuth->userSession); - - - - if(WinHttpSendRequest(hrequest,cookie,-1,WINHTTP_NO_REQUEST_DATA,0,0,0) == FALSE){ - - goto networkerr; - - } - - readBuffer = (LPBYTE)malloc(readBufSize); - - if(WinHttpReceiveResponse(hrequest,NULL) == FALSE){ - - goto networkerr; - - } - - if (WinHttpQueryHeaders(hrequest,WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER,WINHTTP_HEADER_NAME_BY_INDEX,&statusCode,&statusCodeSize,WINHTTP_NO_HEADER_INDEX) == FALSE){ - goto networkerr; - } - - if (HTTP_STATUS_OK != statusCode){ - goto networkerr; - } - - if(ReadHttpBody(hrequest,(LPBYTE)readBuffer,readBufSize,&readSize) == FALSE){ - goto networkerr; - - } - - - { - LPSTR indexPtr; - - UINT_PTR end; - indexPtr = strstr(strstr((LPSTR)readBuffer,"NicoAPI.token"),"\""); - indexPtr++; - end = strstr(indexPtr,"\"") - indexPtr; - if(buflen <= (UINT_PTR)MultiByteToWideChar(CP_UTF8,0,indexPtr,end,NULL,0)){ - goto buffererr; - } - wbuffer[MultiByteToWideChar(CP_UTF8,0,indexPtr,end,wbuffer,buflen)] = L'\0'; - - - } - - -end: - free(readBuffer); - WinHttpCloseHandle(hrequest); - return rslt; - -buffererr: - rslt = NLIB_ERR_BUFFER_TOOLITTLE; - goto end; -networkerr: - rslt = NLIB_ERR_FAILED_NETWORK; - goto end; -} static NicoMyListItem_P NicoMyListItem_new(){ diff --git a/nlib/nlib_nicoLive.c b/nlib/nlib_nicoLive.c index 8e0d4e1..85fbb1b 100644 --- a/nlib/nlib_nicoLive.c +++ b/nlib/nlib_nicoLive.c @@ -1,5 +1,4 @@ - - +#include "StdAfx.h" #include "nlib_include.h" @@ -7,10 +6,6 @@ - - - - static NicoLiveHeartBeatContainer heartBeatContainer; static CRITICAL_SECTION heartBeatCs; diff --git a/nlib/nlib_nicoVideoAuth.c b/nlib/nlib_nicoVideoAuth.c index 6e6f7f7..f5abaa3 100644 --- a/nlib/nlib_nicoVideoAuth.c +++ b/nlib/nlib_nicoVideoAuth.c @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "nlib_include.h" diff --git a/nlib/nlib_xmlHandler.c b/nlib/nlib_xmlHandler.c index 2fa1a65..5d75947 100644 --- a/nlib/nlib_xmlHandler.c +++ b/nlib/nlib_xmlHandler.c @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "nlib_include.h" diff --git a/nlib/stdAfx.c b/nlib/stdAfx.c new file mode 100644 index 0000000..09f15b6 --- /dev/null +++ b/nlib/stdAfx.c @@ -0,0 +1 @@ +#include "StdAfx.h" \ No newline at end of file diff --git a/nlib_driver/nlib_driver.cpp b/nlib_driver/nlib_driver.cpp index e3c9ead..543987b 100644 --- a/nlib_driver/nlib_driver.cpp +++ b/nlib_driver/nlib_driver.cpp @@ -247,7 +247,7 @@ void nicoLive_mylist(void) { //CU_ASSERT_EQUAL(NicoMyList_getDefList(nva,myListCallBack,NULL), NLIB_ERR_OK); //CU_ASSERT_EQUAL(NicoMyList_getMyListGroup(nva,myListGroupCallBack,NULL),NLIB_ERR_OK); - CU_ASSERT_EQUAL(NicoMyList_addDefList(nva,L"1320111147",L""),NLIB_ERR_OK); + CU_ASSERT_EQUAL(NicoMyList_addItem(L"sm16046365"),NLIB_ERR_OK); check(_heapchk() == _HEAPOK,TEXT("heapƒGƒ‰[‚Å‚·")); dumpln(TEXT("heapchk:%d"),_heapchk()); @@ -256,8 +256,8 @@ void nicoLive_mylist(void) { static CU_TestInfo nlive_test[] = { - //{ "Ú‘±", nicoLive_connect }, - {"ƒ}ƒCƒŠƒXƒg",nicoLive_mylist}, + { "Ú‘±", nicoLive_connect }, + //{"ƒ}ƒCƒŠƒXƒg",nicoLive_mylist}, CU_TEST_INFO_NULL, }; diff --git a/nlib_driver/nlib_driver.vcxproj b/nlib_driver/nlib_driver.vcxproj index bac259c..dddbddf 100644 --- a/nlib_driver/nlib_driver.vcxproj +++ b/nlib_driver/nlib_driver.vcxproj @@ -1,6 +1,10 @@  + + Debug-window + Win32 + Debug Win32 @@ -21,6 +25,11 @@ true Unicode + + Application + true + Unicode + Application false @@ -33,6 +42,9 @@ + + + @@ -42,6 +54,11 @@ $(SolutionDir)lib\$(Configuration);$(LibraryPath) $(SolutionDir);$(IncludePath) + + true + $(SolutionDir)lib\$(Configuration);$(LibraryPath) + $(SolutionDir);$(IncludePath) + false $(SolutionDir)lib\$(Configuration);$(LibraryPath) @@ -60,6 +77,19 @@ true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_DEPRECATE;THREADSAFE + + + Console + true + + Level3 diff --git a/nlite.sln b/nlite.sln index 774ecb3..48e6bdc 100644 --- a/nlite.sln +++ b/nlite.sln @@ -1,16 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nlite", "nlite\nlite.vcxproj", "{658BF0ED-37AC-40B9-9FD4-BE00DB285BFC}" - ProjectSection(ProjectDependencies) = postProject - {52AD1F16-FE7F-4915-B97C-38E14BD47D9F} = {52AD1F16-FE7F-4915-B97C-38E14BD47D9F} - {B651AE6B-6D20-4612-B7C8-5788FC2ADDB1} = {B651AE6B-6D20-4612-B7C8-5788FC2ADDB1} - {7866D782-163E-45F8-A5D0-ABB124B6DAAC} = {7866D782-163E-45F8-A5D0-ABB124B6DAAC} - {ABB7389D-48D2-4A72-8020-626EAC5B115E} = {ABB7389D-48D2-4A72-8020-626EAC5B115E} - {815832A8-9B8A-4B48-8372-76B9B50689F7} = {815832A8-9B8A-4B48-8372-76B9B50689F7} - {3D8CAFF3-A27F-4FEB-909F-E8BFDEE66BE1} = {3D8CAFF3-A27F-4FEB-909F-E8BFDEE66BE1} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nlib", "nlib\nlib.vcxproj", "{7866D782-163E-45F8-A5D0-ABB124B6DAAC}" ProjectSection(ProjectDependencies) = postProject {52AD1F16-FE7F-4915-B97C-38E14BD47D9F} = {52AD1F16-FE7F-4915-B97C-38E14BD47D9F} @@ -48,48 +38,60 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSONParser", "JSONParser\JS EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "memorypool", "memorypool\memorypool.vcxproj", "{E36BC5DE-60A1-4A78-90EA-F3BFEF89F9A8}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nlite", "nlite\nlite.vcxproj", "{EB0B5264-9BB4-4EE3-B196-A0472DCB32A8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug-window|Win32 = Debug-window|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {658BF0ED-37AC-40B9-9FD4-BE00DB285BFC}.Debug|Win32.ActiveCfg = Debug|Win32 - {658BF0ED-37AC-40B9-9FD4-BE00DB285BFC}.Debug|Win32.Build.0 = Debug|Win32 - {658BF0ED-37AC-40B9-9FD4-BE00DB285BFC}.Release|Win32.ActiveCfg = Release|Win32 - {658BF0ED-37AC-40B9-9FD4-BE00DB285BFC}.Release|Win32.Build.0 = Release|Win32 {7866D782-163E-45F8-A5D0-ABB124B6DAAC}.Debug|Win32.ActiveCfg = Debug|Win32 {7866D782-163E-45F8-A5D0-ABB124B6DAAC}.Debug|Win32.Build.0 = Debug|Win32 + {7866D782-163E-45F8-A5D0-ABB124B6DAAC}.Debug-window|Win32.ActiveCfg = Debug-window|Win32 {7866D782-163E-45F8-A5D0-ABB124B6DAAC}.Release|Win32.ActiveCfg = Release|Win32 {7866D782-163E-45F8-A5D0-ABB124B6DAAC}.Release|Win32.Build.0 = Release|Win32 {3D8CAFF3-A27F-4FEB-909F-E8BFDEE66BE1}.Debug|Win32.ActiveCfg = Debug|Win32 {3D8CAFF3-A27F-4FEB-909F-E8BFDEE66BE1}.Debug|Win32.Build.0 = Debug|Win32 + {3D8CAFF3-A27F-4FEB-909F-E8BFDEE66BE1}.Debug-window|Win32.ActiveCfg = Debug-window|Win32 {3D8CAFF3-A27F-4FEB-909F-E8BFDEE66BE1}.Release|Win32.ActiveCfg = Release|Win32 {3D8CAFF3-A27F-4FEB-909F-E8BFDEE66BE1}.Release|Win32.Build.0 = Release|Win32 {52AD1F16-FE7F-4915-B97C-38E14BD47D9F}.Debug|Win32.ActiveCfg = Debug|Win32 {52AD1F16-FE7F-4915-B97C-38E14BD47D9F}.Debug|Win32.Build.0 = Debug|Win32 + {52AD1F16-FE7F-4915-B97C-38E14BD47D9F}.Debug-window|Win32.ActiveCfg = Debug-window|Win32 {52AD1F16-FE7F-4915-B97C-38E14BD47D9F}.Release|Win32.ActiveCfg = Release|Win32 {52AD1F16-FE7F-4915-B97C-38E14BD47D9F}.Release|Win32.Build.0 = Release|Win32 {D6269C27-6C23-4512-83D1-89FDA6ED6ED0}.Debug|Win32.ActiveCfg = Debug|Win32 {D6269C27-6C23-4512-83D1-89FDA6ED6ED0}.Debug|Win32.Build.0 = Debug|Win32 + {D6269C27-6C23-4512-83D1-89FDA6ED6ED0}.Debug-window|Win32.ActiveCfg = Debug-window|Win32 {D6269C27-6C23-4512-83D1-89FDA6ED6ED0}.Release|Win32.ActiveCfg = Release|Win32 {D6269C27-6C23-4512-83D1-89FDA6ED6ED0}.Release|Win32.Build.0 = Release|Win32 {ABB7389D-48D2-4A72-8020-626EAC5B115E}.Debug|Win32.ActiveCfg = Debug|Win32 {ABB7389D-48D2-4A72-8020-626EAC5B115E}.Debug|Win32.Build.0 = Debug|Win32 + {ABB7389D-48D2-4A72-8020-626EAC5B115E}.Debug-window|Win32.ActiveCfg = Debug-window|Win32 {ABB7389D-48D2-4A72-8020-626EAC5B115E}.Release|Win32.ActiveCfg = Release|Win32 {ABB7389D-48D2-4A72-8020-626EAC5B115E}.Release|Win32.Build.0 = Release|Win32 {815832A8-9B8A-4B48-8372-76B9B50689F7}.Debug|Win32.ActiveCfg = Debug|Win32 {815832A8-9B8A-4B48-8372-76B9B50689F7}.Debug|Win32.Build.0 = Debug|Win32 + {815832A8-9B8A-4B48-8372-76B9B50689F7}.Debug-window|Win32.ActiveCfg = Debug-window|Win32 {815832A8-9B8A-4B48-8372-76B9B50689F7}.Release|Win32.ActiveCfg = Release|Win32 {815832A8-9B8A-4B48-8372-76B9B50689F7}.Release|Win32.Build.0 = Release|Win32 {B651AE6B-6D20-4612-B7C8-5788FC2ADDB1}.Debug|Win32.ActiveCfg = Debug|Win32 {B651AE6B-6D20-4612-B7C8-5788FC2ADDB1}.Debug|Win32.Build.0 = Debug|Win32 + {B651AE6B-6D20-4612-B7C8-5788FC2ADDB1}.Debug-window|Win32.ActiveCfg = Debug-window|Win32 {B651AE6B-6D20-4612-B7C8-5788FC2ADDB1}.Release|Win32.ActiveCfg = Release|Win32 {B651AE6B-6D20-4612-B7C8-5788FC2ADDB1}.Release|Win32.Build.0 = Release|Win32 {E36BC5DE-60A1-4A78-90EA-F3BFEF89F9A8}.Debug|Win32.ActiveCfg = Debug|Win32 {E36BC5DE-60A1-4A78-90EA-F3BFEF89F9A8}.Debug|Win32.Build.0 = Debug|Win32 + {E36BC5DE-60A1-4A78-90EA-F3BFEF89F9A8}.Debug-window|Win32.ActiveCfg = Debug-window|Win32 {E36BC5DE-60A1-4A78-90EA-F3BFEF89F9A8}.Release|Win32.ActiveCfg = Release|Win32 {E36BC5DE-60A1-4A78-90EA-F3BFEF89F9A8}.Release|Win32.Build.0 = Release|Win32 + {EB0B5264-9BB4-4EE3-B196-A0472DCB32A8}.Debug|Win32.ActiveCfg = Debug|Win32 + {EB0B5264-9BB4-4EE3-B196-A0472DCB32A8}.Debug-window|Win32.ActiveCfg = Debug|Win32 + {EB0B5264-9BB4-4EE3-B196-A0472DCB32A8}.Debug-window|Win32.Build.0 = Debug|Win32 + {EB0B5264-9BB4-4EE3-B196-A0472DCB32A8}.Release|Win32.ActiveCfg = Release|Win32 + {EB0B5264-9BB4-4EE3-B196-A0472DCB32A8}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/nlite/ReadMe.txt b/nlite/ReadMe.txt index d32c008..cfa6915 100644 --- a/nlite/ReadMe.txt +++ b/nlite/ReadMe.txt @@ -51,6 +51,13 @@ small.ico ファイルです。 このアイコンは、メイン リソース ファイル nlite.rc にインクルードされます。 +///////////////////////////////////////////////////////////////////////////// +その他の標準ファイル : + +StdAfx.h、StdAfx.cpp + これらのファイルは、nlite.pch + という名前のプリコンパイル済みヘッダー (PCH) ファイルと、StdAfx.obj + という名前のプリコンパイル済みの型ファイルを構築するために使用されます。 ///////////////////////////////////////////////////////////////////////////// その他のメモ : diff --git a/nlite/nlite.cpp b/nlite/nlite.cpp index 518a568..645400b 100644 --- a/nlite/nlite.cpp +++ b/nlite/nlite.cpp @@ -2,7 +2,7 @@ // #include "stdafx.h" -#include "nlite.h" +#include "nlite_include.h" #define MAX_LOADSTRING 100 @@ -12,7 +12,7 @@ TCHAR szTitle[MAX_LOADSTRING]; // TCHAR szWindowClass[MAX_LOADSTRING]; // ƒƒCƒ“ ƒEƒBƒ“ƒhƒE ƒNƒ‰ƒX–¼ // ‚±‚̃R[ƒh ƒ‚ƒWƒ…[ƒ‹‚ÉŠÜ‚Ü‚ê‚éŠÖ”‚̐錾‚ð“]‘—‚µ‚Ü‚·: -ATOM MyRegisterClass(HINSTANCE hInstance); +ATOM nliteRegisterClass(HINSTANCE hInstance); BOOL InitInstance(HINSTANCE, int); LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); INT_PTR CALLBACK About(HWND, UINT, WPARAM, LPARAM); @@ -32,7 +32,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, // ƒOƒ[ƒoƒ‹•¶Žš—ñ‚ð‰Šú‰»‚µ‚Ä‚¢‚Ü‚·B LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); LoadString(hInstance, IDC_NLITE, szWindowClass, MAX_LOADSTRING); - MyRegisterClass(hInstance); + nliteRegisterClass(hInstance); // ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚̏‰Šú‰»‚ðŽÀs‚µ‚Ü‚·: if (!InitInstance (hInstance, nCmdShow)) @@ -58,7 +58,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, // -// ŠÖ”: MyRegisterClass() +// ŠÖ”: nliteRegisterClass() // // –Ú“I: ƒEƒBƒ“ƒhƒE ƒNƒ‰ƒX‚ð“o˜^‚µ‚Ü‚·B // @@ -70,7 +70,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, // ³‚µ‚¢Œ`Ž®‚̏¬‚³‚¢ƒAƒCƒRƒ“‚ðŽæ“¾‚Å‚«‚é‚悤‚É‚·‚é‚ɂ́A // ‚±‚̊֐”‚ðŒÄ‚яo‚µ‚Ä‚­‚¾‚³‚¢B // -ATOM MyRegisterClass(HINSTANCE hInstance) +ATOM nliteRegisterClass(HINSTANCE hInstance) { WNDCLASSEX wcex; diff --git a/nlite/nlite.vcxproj b/nlite/nlite.vcxproj index 7696194..0ef351c 100644 --- a/nlite/nlite.vcxproj +++ b/nlite/nlite.vcxproj @@ -11,7 +11,7 @@ - {658BF0ED-37AC-40B9-9FD4-BE00DB285BFC} + {EB0B5264-9BB4-4EE3-B196-A0472DCB32A8} Win32Proj nlite @@ -39,19 +39,16 @@ true - $(SolutionDir);$(IncludePath) false - $(SolutionDir);$(IncludePath) - NotUsing + Use Level3 Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);_CRT_SECURE_NO_DEPRECATE;THREADSAFE - CompileAsCpp + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) Windows @@ -61,11 +58,11 @@ Level3 - NotUsing + Use MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);_CRT_SECURE_NO_DEPRECATE;THREADSAFE + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) Windows @@ -80,12 +77,16 @@ - + + + Create + Create + diff --git a/nlite/nlite_include.h b/nlite/nlite_include.h new file mode 100644 index 0000000..d00d47e --- /dev/null +++ b/nlite/nlite_include.h @@ -0,0 +1,3 @@ +#pragma once + +#include "resource.h" diff --git a/nlite/stdafx.cpp b/nlite/stdafx.cpp new file mode 100644 index 0000000..a79bab0 --- /dev/null +++ b/nlite/stdafx.cpp @@ -0,0 +1,8 @@ +// stdafx.cpp : •W€ƒCƒ“ƒNƒ‹[ƒh nlite.pch ‚Ì‚Ý‚ð +// ŠÜ‚Þƒ\[ƒX ƒtƒ@ƒCƒ‹‚́AƒvƒŠƒRƒ“ƒpƒCƒ‹Ï‚݃wƒbƒ_[‚É‚È‚è‚Ü‚·B +// stdafx.obj ‚ɂ̓vƒŠƒRƒ“ƒpƒCƒ‹Ï‚ÝŒ^î•ñ‚ªŠÜ‚Ü‚ê‚Ü‚·B + +#include "stdafx.h" + +// TODO: ‚±‚̃tƒ@ƒCƒ‹‚Å‚Í‚È‚­ASTDAFX.H ‚Å•K—v‚È +// ’ljÁƒwƒbƒ_[‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢B diff --git a/shareCookie/shareCookie.vcxproj b/shareCookie/shareCookie.vcxproj index a61c568..9bc8769 100644 --- a/shareCookie/shareCookie.vcxproj +++ b/shareCookie/shareCookie.vcxproj @@ -1,6 +1,10 @@  + + Debug-window + Win32 + Debug Win32 @@ -21,6 +25,11 @@ true Unicode + + StaticLibrary + true + Unicode + StaticLibrary false @@ -33,6 +42,9 @@ + + + @@ -40,6 +52,9 @@ $(SolutionDir)include\qwerty\cookie;$(SolutionDir);$(IncludePath) + + $(SolutionDir)include\qwerty\cookie;$(SolutionDir);$(IncludePath) + $(SolutionDir)include\qwerty\cookie;$(SolutionDir);$(IncludePath) @@ -56,6 +71,19 @@ true + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + + + Windows + true + + Level3 diff --git a/sqlite3/sqlite3.vcxproj b/sqlite3/sqlite3.vcxproj index b99d647..80f2e1c 100644 --- a/sqlite3/sqlite3.vcxproj +++ b/sqlite3/sqlite3.vcxproj @@ -1,6 +1,10 @@  + + Debug-window + Win32 + Debug Win32 @@ -21,6 +25,11 @@ true Unicode + + StaticLibrary + true + Unicode + StaticLibrary false @@ -33,6 +42,9 @@ + + + @@ -40,6 +52,9 @@ $(IncludePath) + + $(IncludePath) + $(IncludePath) @@ -56,6 +71,19 @@ true + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);SQLITE_LIB_EXPORT;_CRT_SECURE_NO_DEPRECATE;THREADSAFE + + + Windows + true + + Level3 diff --git a/sqliteManger/sqliteManger.vcxproj b/sqliteManger/sqliteManger.vcxproj index 9573849..bf2c80a 100644 --- a/sqliteManger/sqliteManger.vcxproj +++ b/sqliteManger/sqliteManger.vcxproj @@ -1,6 +1,10 @@  + + Debug-window + Win32 + Debug Win32 @@ -22,6 +26,11 @@ true Unicode + + StaticLibrary + true + Unicode + StaticLibrary false @@ -34,6 +43,9 @@ + + + @@ -41,6 +53,9 @@ $(SolutionDir);$(IncludePath) + + $(SolutionDir);$(IncludePath) + $(SolutionDir);$(IncludePath) @@ -57,6 +72,19 @@ true + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + + Level3 -- 2.11.0