OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision359488c010e4962474499898d2605998040ce2a8 (tree)
Time2012-03-14 20:36:33
Authorqwerty2501 <qwerty2501@user...>
Commiterqwerty2501

Log Message

コードページをsjisからutf8に変更

Change Summary

Incremental Difference

Binary files a/nlite.suo and b/nlite.suo differ
--- a/nlite/stdafx.h
+++ b/nlite/stdafx.h
@@ -16,7 +16,7 @@
1616 #define _WTL_NO_CSTRING
1717
1818 #ifndef NDEBUG
19-//#define NLITE_UNIT_TEST //単体テストモード
19+#define NLITE_UNIT_TEST //単体テストモード
2020 //#define USE_STUB //スタブを使用する場合はコメントアウトを解除する
2121 #endif
2222 // Windows ヘッダー ファイル:
--- a/open_jtalk_lib/open_jtalk_lib.vcxproj
+++ b/open_jtalk_lib/open_jtalk_lib.vcxproj
@@ -63,7 +63,7 @@
6363 <ClCompile>
6464 <PrecompiledHeader>
6565 </PrecompiledHeader>
66- <WarningLevel>TurnOffAllWarnings</WarningLevel>
66+ <WarningLevel>Level3</WarningLevel>
6767 <Optimization>Disabled</Optimization>
6868 <PreprocessorDefinitions>WIN32;OPENJTALK_STATIC_MACRO;VERSION="1.00";CHARSET_SHIFT_JIS;PACKAGE="open_jtalk";DIC_VERSION=102;HAVE_GETENV;HAVE_WINDOWS_H;MECAB_USE_MUTEX_LOCK;MECAB_USE_THREAD;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6969 </ClCompile>
@@ -74,7 +74,7 @@
7474 </ItemDefinitionGroup>
7575 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7676 <ClCompile>
77- <WarningLevel>TurnOffAllWarnings</WarningLevel>
77+ <WarningLevel>Level3</WarningLevel>
7878 <PrecompiledHeader>
7979 </PrecompiledHeader>
8080 <Optimization>MaxSpeed</Optimization>
@@ -91,7 +91,7 @@
9191 </ItemDefinitionGroup>
9292 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Preview|Win32'">
9393 <ClCompile>
94- <WarningLevel>TurnOffAllWarnings</WarningLevel>
94+ <WarningLevel>Level3</WarningLevel>
9595 <PrecompiledHeader>
9696 </PrecompiledHeader>
9797 <Optimization>MaxSpeed</Optimization>
--- a/shareCookie/shareCookie.c
+++ b/shareCookie/shareCookie.c
@@ -558,19 +558,19 @@ static COOKIE_RESULT selfParseIECallBack(LPCSTR targetString,LPCSTR targetEndPoi
558558 LPCSTR astorStartPointer = NULL;
559559 LPCSTR domeinStartPointer = NULL;
560560
561- if(ARRAY_LENGTH(mb_key) < GetLenToMB(CP_THREAD_ACP,key)){
561+ if(ARRAY_LENGTH(mb_key) < GetLenToMB(CP_UTF8,key)){
562562
563563 goto keybuffbigerr;
564564
565- } else if(ARRAY_LENGTH(mb_domein) < GetLenToMB(CP_THREAD_ACP,domein) ){
565+ } else if(ARRAY_LENGTH(mb_domein) < GetLenToMB(CP_UTF8,domein) ){
566566
567567 goto domeinbuffbigerr;
568568
569569 }
570570
571571
572- WideToMB(CP_THREAD_ACP,key,mb_key,ARRAY_LENGTH(mb_key));
573- WideToMB(CP_THREAD_ACP,domein,mb_domein,ARRAY_LENGTH(mb_domein));
572+ WideToMB(CP_UTF8,key,mb_key,ARRAY_LENGTH(mb_key));
573+ WideToMB(CP_UTF8,domein,mb_domein,ARRAY_LENGTH(mb_domein));
574574
575575 keyStartPointer = strstr(targetString,mb_key);
576576
@@ -589,7 +589,7 @@ static COOKIE_RESULT selfParseIECallBack(LPCSTR targetString,LPCSTR targetEndPoi
589589 cookieBufSize = cookieEndPointer - cookieStartPointer;
590590 strncpy(cookie_mbBuff,cookieStartPointer,cookieBufSize);
591591 cookie_mbBuff[cookieBufSize]='\0';
592- if(((INT_PTR)bufSize) < GetLenToWide(CP_THREAD_ACP,cookie_mbBuff) + wcslen(key) + 1){
592+ if(((INT_PTR)bufSize) < GetLenToWide(CP_UTF8,cookie_mbBuff) + wcslen(key) + 1){
593593
594594 goto cookiebuffbigerr;
595595 }
@@ -598,7 +598,7 @@ static COOKIE_RESULT selfParseIECallBack(LPCSTR targetString,LPCSTR targetEndPoi
598598 cookie[0] = L'=';
599599 cookie++;
600600
601- MBToWide(CP_THREAD_ACP,cookie_mbBuff,cookie,bufSize);
601+ MBToWide(CP_UTF8,cookie_mbBuff,cookie,bufSize);
602602 result = COOKIE_ERR_OK;
603603
604604 end:
@@ -762,7 +762,7 @@ static INLINE COOKIE_RESULT GetCookieGoogleChromeSQLite(sqlite3_stmt *stmt,LPWST
762762
763763
764764
765- COOKIE_RESULT result = COOKIE_ERR_OK; //結果コード
765+ COOKIE_RESULT result = COOKIE_ERR_UNKNOWN; //結果コード
766766 LPCWSTR pName = (LPCWSTR)NULL; //名前の値を確保する一時的なポインタ
767767 LPCWSTR pValue = (LPCWSTR)NULL; //valueの値を確保する一時的なポインタ
768768 WCHAR host_key2Buf[LENGTH_DOMEIN] = {L"."}; //ドメインその２領域
@@ -893,19 +893,19 @@ static INLINE COOKIE_RESULT GetCookieOpera(LPCSTR targetString,LPCSTR targetEndP
893893 LPCSTR cookiePointer;
894894 LPCSTR keyPointer;
895895
896- if(ARRAY_LENGTH(mb_key) < GetLenToMB(CP_THREAD_ACP,key)){
896+ if(ARRAY_LENGTH(mb_key) < GetLenToMB(CP_UTF8,key)){
897897
898898 goto keybuffbigerr;
899899
900- } else if(ARRAY_LENGTH(mb_domein) < GetLenToMB(CP_THREAD_ACP,domein) ){
900+ } else if(ARRAY_LENGTH(mb_domein) < GetLenToMB(CP_UTF8,domein) ){
901901
902902 goto domeinbuffbigerr;
903903
904904 }
905905
906906
907- WideToMB(CP_THREAD_ACP,key,mb_key,ARRAY_LENGTH(mb_key));
908- WideToMB(CP_THREAD_ACP,domein,mb_domein,ARRAY_LENGTH(mb_domein));
907+ WideToMB(CP_UTF8,key,mb_key,ARRAY_LENGTH(mb_key));
908+ WideToMB(CP_UTF8,domein,mb_domein,ARRAY_LENGTH(mb_domein));
909909 strstr(mb_domein,".jp")[0] = '\0';
910910
911911 for(;targetString < targetEndPointer;targetString += strlen(targetString) + 1){
@@ -925,7 +925,7 @@ static INLINE COOKIE_RESULT GetCookieOpera(LPCSTR targetString,LPCSTR targetEndP
925925 length = strlen(cookiePointer) -2;
926926 strncpy(cookie_mbBuff,cookiePointer+1,length);
927927 cookie_mbBuff[length] = '\0';
928- if(((INT_PTR)bufSize) < GetLenToWide(CP_THREAD_ACP,cookie_mbBuff) + wcslen(key) + 1){
928+ if(((INT_PTR)bufSize) < GetLenToWide(CP_UTF8,cookie_mbBuff) + wcslen(key) + 1){
929929
930930 goto cookiebuffbigerr;
931931 }
@@ -934,7 +934,7 @@ static INLINE COOKIE_RESULT GetCookieOpera(LPCSTR targetString,LPCSTR targetEndP
934934 cookies[0] = L'=';
935935 cookies++;
936936
937- MBToWide(CP_THREAD_ACP,cookie_mbBuff,cookies,bufSize);
937+ MBToWide(CP_UTF8,cookie_mbBuff,cookies,bufSize);
938938 result = COOKIE_ERR_OK;
939939 goto end;
940940 }
@@ -974,18 +974,18 @@ static INLINE COOKIE_RESULT GetCookieSafari(LPCSTR targetString,LPCSTR targetEnd
974974 LPCSTR domeinPointer;
975975 SIZE_T mb_keyLen;
976976
977- if(ARRAY_LENGTH(mb_key)-1 < GetLenToMB(CP_THREAD_ACP,key)){
977+ if(ARRAY_LENGTH(mb_key)-1 < GetLenToMB(CP_UTF8,key)){
978978
979979 goto keybuffbigerr;
980980
981- } else if(ARRAY_LENGTH(mb_domein) - 1 < GetLenToMB(CP_THREAD_ACP,domein) ){
981+ } else if(ARRAY_LENGTH(mb_domein) - 1 < GetLenToMB(CP_UTF8,domein) ){
982982
983983 goto domeinbuffbigerr;
984984
985985 }
986986
987- WideToMB(CP_THREAD_ACP,key,mb_key + 1,ARRAY_LENGTH(mb_key) - 1);
988- WideToMB(CP_THREAD_ACP,domein,mb_domein + 1,ARRAY_LENGTH(mb_domein) - 1);
987+ WideToMB(CP_UTF8,key,mb_key + 1,ARRAY_LENGTH(mb_key) - 1);
988+ WideToMB(CP_UTF8,domein,mb_domein + 1,ARRAY_LENGTH(mb_domein) - 1);
989989 mb_keyLen = strlen(mb_key);
990990
991991 for(;targetString < targetEndPointer;targetString += strlen(targetString) + 1){
@@ -997,7 +997,7 @@ static INLINE COOKIE_RESULT GetCookieSafari(LPCSTR targetString,LPCSTR targetEnd
997997
998998 if(strcmp(mb_domein,domeinPointer) == 0){
999999
1000- if(((INT_PTR)bufSize) < GetLenToWide(CP_THREAD_ACP,cookiePointer) + wcslen(key) + 1){
1000+ if(((INT_PTR)bufSize) < GetLenToWide(CP_UTF8,cookiePointer) + wcslen(key) + 1){
10011001
10021002 goto cookiebuffbigerr;
10031003 }
@@ -1006,7 +1006,7 @@ static INLINE COOKIE_RESULT GetCookieSafari(LPCSTR targetString,LPCSTR targetEnd
10061006 cookies[0] = L'=';
10071007 cookies++;
10081008
1009- MBToWide(CP_THREAD_ACP,cookiePointer,cookies,bufSize);
1009+ MBToWide(CP_UTF8,cookiePointer,cookies,bufSize);
10101010 result = COOKIE_ERR_OK;
10111011 break;
10121012 }
@@ -1299,5 +1299,15 @@ VOID ShareCookieUnitTest(){
12991299 check(GetCookieInternetExplorerSelfParse(ieCookieSecPath,cookieBuf,cookieBufSize,key,domein) == COOKIE_ERR_OK,TEXT("ieセキュリティモードクッキー取得に失敗しました"));
13001300 dumpln(TEXT("iesec:%s"),cookieBuf);
13011301
1302+
1303+ dumpln(TEXT("test"));
1304+
1305+ check(SelfParseCookie(fireFoxCookiePath,cookieBuf,cookieBufSize,key,domein,GetCookieFireFoxSelf) == COOKIE_ERR_OK,TEXT("ファイアフォックス自力解析に失敗しました"));
1306+ dumpln(TEXT("firefox:%s"),cookieBuf);
1307+
1308+
1309+ check(SelfParseCookie(googleChromeCookiePath,cookieBuf,cookieBufSize,key,domein,GetCookieGoogleChromeSelf) == COOKIE_ERR_OK,TEXT("クローム自力解析に失敗しました"));
1310+ dumpln(TEXT("chrome:%s"),cookieBuf);
1311+
13021312 return;
13031313 }
\ No newline at end of file