Commit: d556e315ce8bedd22d9663f13b0c06c0253716e4 - nlite (git)

Commit MetaInfo

• Revision: d556e315ce8bedd22d9663f13b0c06c0253716e4 (tree)
• Time: 2012-02-22 23:27:26
• Author: qwerty2501 <riot313@gmai...>
• Commiter: qwerty2501

Log Message

Safari対応

Change Summary

• modified: include/qwerty/windebuger.h
• modified: nlite.suo
• modified: nlite/Resource.h
• modified: nlite/nlite.rc
• modified: nlite/nlite_mainframe.cpp
• modified: nlite/nlite_nlib.cpp
• modified: nlite/nlite_propertyWindow.cpp
• modified: shareCookie/shareCookie.c
• modified: shareCookie/shareCookie.h
• modified: speaker/open_jtalk_core.cpp
• modified: speaker/speaker.vcxproj
• modified: speaker/speaker_include.h
• modified: speaker/stdafx.h

Incremental Difference

--- a/include/qwerty/windebuger.h
+++ b/include/qwerty/windebuger.h
@@ -671,7 +671,7 @@ static VOID DebugOutW(LPCWSTR fileName,LPCWSTR functionName,UINT lineNo, UINT mo
 }
 
 
-static VOID DebugOutMB(UINT codePage,LPSTR fileName,LPSTR functionName,UINT lineNo,UINT mode,UINT infoFlag,LPSTR pszFormat, ...){
+static VOID DebugOutMB(UINT codePage,LPSTR fileName,LPSTR functionName,UINT lineNo,UINT mode,UINT infoFlag,LPCSTR pszFormat, ...){
 
 
 	LPSTR szFormat = mode & LINEFEAD__DEBUGER__ ?  "%s%s%s%s\r\n" : "%s%s%s%s";

Binary files a/nlite.suo and b/nlite.suo differ

--- a/nlite/Resource.h
+++ b/nlite/Resource.h
@@ -35,3 +35,5 @@
 #define IDR_COMMAND6                            40005
 #define IDC_RADIO_CHROME                        40006
 #define IDC_RADIO_IECM                          40009
+#define IDC_RADIO_SAFARI                        40012
+#define IDC_RADIO_OPERA                         40013

--- a/nlite/nlite.rc
+++ b/nlite/nlite.rc
@@ -63,18 +63,20 @@ IDC_NLITE MENU
 // Dialog resources
 //
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-IDD_DIALOG_BROWSERTYPE DIALOG 0, 0, 123, 110
+IDD_DIALOG_BROWSERTYPE DIALOG 0, 0, 193, 159
 STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_POPUP | WS_SYSMENU
 CAPTION "クッキーの設定"
 FONT 8, "Ms Shell Dlg"
 {
-    AUTORADIOBUTTON "IE", IDC_RADIO_IE, 30, 29, 22, 8
-    AUTORADIOBUTTON "FireFox", IDC_RADIO_FIREFOX, 30, 45, 39, 8
-    AUTORADIOBUTTON "GoogleChrome", IDC_RADIO_CHROME, 30, 61, 62, 8
-    AUTORADIOBUTTON "IEコンポーネント", IDC_RADIO_IECM, 30, 76, 61, 8
-    PUSHBUTTON      "OK", IDC_BUTTON_COOKIE_OK, 21, 91, 38, 14
-    PUSHBUTTON      "キャンセル", IDCANCEL, 63, 91, 33, 14
+    AUTORADIOBUTTON "IE", IDC_RADIO_IE, 61, 29, 22, 8
+    AUTORADIOBUTTON "FireFox", IDC_RADIO_FIREFOX, 61, 45, 39, 8
+    AUTORADIOBUTTON "GoogleChrome", IDC_RADIO_CHROME, 61, 61, 62, 8
+    AUTORADIOBUTTON "IEコンポーネント", IDC_RADIO_IECM, 60, 77, 61, 8
+    PUSHBUTTON      "OK", IDC_BUTTON_COOKIE_OK, 40, 136, 38, 14
+    PUSHBUTTON      "キャンセル", IDCANCEL, 105, 137, 33, 14
     LTEXT           "普段使用しているブラウザを指定してください", IDC_STATIC, 21, 6, 82, 22, SS_LEFT
+    AUTORADIOBUTTON "Safari", IDC_RADIO_SAFARI, 60, 94, 33, 8
+    AUTORADIOBUTTON "Opera", IDC_RADIO_OPERA, 60, 111, 35, 8
 }
 
 

--- a/nlite/nlite_mainframe.cpp
+++ b/nlite/nlite_mainframe.cpp
@@ -307,9 +307,13 @@ VOID CNliteMainFrame::OnCookie(UINT uNotifyCode,int nID,HWND hWndCtl){
 		nliteProperty.CookieSetting();
 	}
 			
+	try {
+		nicoVideoAuth.SetBrowserType(nliteProperty.gp.browserType);
+	} catch(NLIBException &e){
 
-	nicoVideoAuth.SetBrowserType(nliteProperty.gp.browserType);
+		MessageBox(e.what(),TEXT("クッキー取得失敗"),MB_OK | MB_ICONERROR);
 
+	}
 	
 
 }

--- a/nlite/nlite_nlib.cpp
+++ b/nlite/nlite_nlib.cpp
@@ -32,7 +32,7 @@ VOID CNicoVideoAuth::SetBrowserType(BROWSERTYPE bt){
 		throw NLIBException(TEXT("ニコニコ動画認証情報取得に失敗しました"),rslt,__LINE__,TEXT(__FILE__),TEXT(__FUNCTION__));
 	}
 	
-	InternetSetOption(0, INTERNET_OPTION_END_BROWSER_SESSION, NULL, 0); 
+	return;
 }
 
 

--- a/nlite/nlite_propertyWindow.cpp
+++ b/nlite/nlite_propertyWindow.cpp
@@ -36,6 +36,18 @@ BOOL CCookieSettingWindow::OnInitDialog(CWindow wndFocus, LPARAM lInitParam){
 
 		break;
 
+	case BT_SAFARI:
+
+		radio = GetDlgItem(IDC_RADIO_SAFARI);
+		break;
+
+
+	case BT_OPERA:
+
+		radio = GetDlgItem(IDC_RADIO_OPERA);
+
+		break;
+
 	default:
 		goto skip;
 	}
@@ -51,32 +63,41 @@ VOID CCookieSettingWindow::OnOK(UINT uNotifyCode, int nID, CWindow wndCtl){
 	CButton firefoxRadio = GetDlgItem(IDC_RADIO_FIREFOX);
 	CButton chromeRadio = GetDlgItem(IDC_RADIO_CHROME);
 	CButton iecmRadio = GetDlgItem(IDC_RADIO_IECM);
+	CButton safariRadio = GetDlgItem(IDC_RADIO_SAFARI);
+	CButton operaRadio = GetDlgItem(IDC_RADIO_OPERA);
 
 	if(ieRadio.GetCheck() == BST_CHECKED){
 
 		this->browserType = BT_INTERNET_EXPLORER;
+		
+	}else if(firefoxRadio.GetCheck() == BST_CHECKED){
 
-	}
+		this->browserType = BT_FIRE_FOX;
 
-	if(firefoxRadio.GetCheck() == BST_CHECKED){
+	}else if(chromeRadio.GetCheck() == BST_CHECKED){
 
-		this->browserType = BT_FIRE_FOX;
+		this->browserType = BT_GOOGLE_CHROME;
 
-	}
+	}else if(iecmRadio.GetCheck() == BST_CHECKED){
 
-	if(chromeRadio.GetCheck() == BST_CHECKED){
+		this->browserType = BT_IE_COMPONENT;
 
-		this->browserType = BT_GOOGLE_CHROME;
+	}else if(safariRadio.GetCheck() == BST_CHECKED){
 
-	}
+		this->browserType = BT_SAFARI;
 
-	if(iecmRadio.GetCheck() == BST_CHECKED){
+	} else if(operaRadio.GetCheck() == BST_CHECKED){
 
-		this->browserType = BT_IE_COMPONENT;
+		this->browserType = BT_OPERA;
+	
+	}else {
+
+		this->browserType = BT_NOSETTING;
 
 	}
 
 
+
 	EndDialog(nID);
 }
 

--- a/shareCookie/shareCookie.c
+++ b/shareCookie/shareCookie.c
@@ -24,8 +24,11 @@ static sqlite3_stmt *googleChromeCookieStmt;		//
 static CRITICAL_SECTION googleChromeCs;				//グーグルクロームのクッキー取得用クリティカルセクション
 
 
+static WCHAR safariCookiePath[_MAX_PATH];			//サファリのクッキーパス
 
 
+typedef COOKIE_RESULT (*SelfParseCookieCallBack)(LPCSTR targetString,LPCSTR targetEndPointer,LPWSTR cookie,SIZE_T bufSize,LPCWSTR key,LPCWSTR domein);
+
 ///
 ///クロームとファイアフォックスの共通処理
 ///
@@ -34,6 +37,11 @@ static INLINE VOID cookieStepExec(sqlite3_stmt *stmt,LPWSTR cooki,SIZE_T bufSize
 
 
 ///
+///自力で解析す場合の共通処理
+///
+static INLINE COOKIE_RESULT SelfParseCookie(LPCWSTR cookieFilePath,LPWSTR cookie,SIZE_T bufSize,LPCWSTR key,LPCWSTR domein,SelfParseCookieCallBack callBack);
+
+///
 ///インターネットエクスプローラーのクッキーを取得
 ///
 static INLINE COOKIE_RESULT GetCookieInternetExplorer(LPWSTR cookie,SIZE_T bufSize, LPCWSTR key,LPCWSTR domein,BOOL isIE);
@@ -51,12 +59,12 @@ static INLINE COOKIE_RESULT GetCookieGoogleChrome(LPWSTR cookie,SIZE_T bufSize,
 ///
 ///オペラのクッキーを取得
 ///
-static INLINE COOKIE_RESULT GetCookieOpera(LPWSTR cookie,SIZE_T bufSize, LPCWSTR key,LPCWSTR domein);
+static INLINE COOKIE_RESULT GetCookieOpera(LPCSTR targetString,LPCSTR targetEndPointer,LPWSTR cookie,SIZE_T bufSize, LPCWSTR key,LPCWSTR domein);
 
 ///
 ///サファリのクッキーを取得
 ///
-static INLINE COOKIE_RESULT GetCookieSafari(LPWSTR cookie,SIZE_T bufSize, LPCWSTR key,LPCWSTR domein);
+static INLINE COOKIE_RESULT GetCookieSafari(LPCSTR targetString,LPCSTR targetEndPointer,LPWSTR cookie,SIZE_T bufSize, LPCWSTR key,LPCWSTR domein);
 
 #define FIREFOX_GET_COOKIE_SQL	"SELECT a.name, a.value FROM moz_cookies a WHERE a.name = ?1 AND a.baseDomain = ?2 "						//ファイアフォックスクッキー取得用SQL
 
@@ -76,7 +84,7 @@ VOID InitializeShareCookie(LPCWSTR appDataPath,LPCWSTR localAppDataPath){
 
 	
 		LPWSTR index;
-
+		
 
 		wcscpy(fireFoxProfilesPath,appDataPath);
 		wcscat(fireFoxProfilesPath,L"Mozilla\\Firefox\\profiles.ini");
@@ -155,6 +163,12 @@ VOID InitializeShareCookie(LPCWSTR appDataPath,LPCWSTR localAppDataPath){
 
 	}
 
+
+	//サファリの設定
+	
+	wcscpy(safariCookiePath,appDataPath);
+	wcscat(safariCookiePath,L"Apple Computer\\Safari\\Cookies\\Cookies.binarycookies");
+
 	return;
 }
 
@@ -201,14 +215,13 @@ COOKIE_RESULT GetCookie(BROWSERTYPE browserType,LPWSTR cookie,SIZE_T bufSize, LP
 		//オペラの場合
 	case BT_OPERA:
 
-
-		return  GetCookieOpera(cookie,bufSize,key,domein);
+		return SelfParseCookie(NULL,cookie,bufSize,key,domein,GetCookieOpera);
+		
 
 		//サファリの場合
 	case BT_SAFARI:
-
-		return  GetCookieSafari(cookie,bufSize,key,domein);
-
+		return SelfParseCookie(safariCookiePath,cookie,bufSize,key,domein,GetCookieSafari);
+		
 
 		//IEコンポーネントの場合
 	case BT_IE_COMPONENT:
@@ -633,7 +646,9 @@ end:
 ///
 ///オペラのクッキーを取得
 ///
-static INLINE COOKIE_RESULT GetCookieOpera(LPWSTR cookies,SIZE_T bufSize, LPCWSTR key,LPCWSTR domein){
+static INLINE COOKIE_RESULT GetCookieOpera(LPCSTR targetString,LPCSTR targetEndPointer,LPWSTR cookies,SIZE_T bufSize, LPCWSTR key,LPCWSTR domein){
+
+	
 
 	return COOKIE_ERR_DETAIL_NOTFOUND;
 }
@@ -641,10 +656,70 @@ static INLINE COOKIE_RESULT GetCookieOpera(LPWSTR cookies,SIZE_T bufSize, LPCWST
 ///
 ///サファリのクッキーを取得
 ///
-static INLINE COOKIE_RESULT GetCookieSafari(LPWSTR cookies,SIZE_T bufSize, LPCWSTR key,LPCWSTR domein){
+static INLINE COOKIE_RESULT GetCookieSafari(LPCSTR targetString,LPCSTR targetEndPointer,LPWSTR cookies,SIZE_T bufSize, LPCWSTR key,LPCWSTR domein){
+	COOKIE_RESULT result = COOKIE_ERR_UNKNOWN;
+	CHAR mb_key[_MAX_PATH] = "A";
+	CHAR mb_domein[_MAX_PATH] = ".";
+	LPCSTR cookiePointer;
+	LPCSTR domeinPointer;
+	SIZE_T mb_keyLen;
+
+	if(ARRAY_LENGTH(mb_key) < GetLenToMB(CP_THREAD_ACP,key) - 1){
+		
+		goto keybuffbigerr;
 
+	} else if(ARRAY_LENGTH(mb_domein) - 1 < GetLenToMB(CP_THREAD_ACP,domein) ){
 
-	return COOKIE_ERR_DETAIL_NOTFOUND;
+		goto domeinbuffbigerr;
+
+	}
+
+	WideToMB(CP_THREAD_ACP,key,mb_key + 1,ARRAY_LENGTH(mb_key) - 1);
+	WideToMB(CP_THREAD_ACP,domein,mb_domein + 1,ARRAY_LENGTH(mb_domein) - 1);
+	mb_keyLen = strlen(mb_key);
+	
+	for(;targetString < targetEndPointer;targetString += strlen(targetString) + 1){
+
+		if(strstr(targetString,mb_key) != NULL){
+
+			cookiePointer = targetString + strlen(targetString) + 1;
+			domeinPointer = cookiePointer + strlen(cookiePointer) + 1;
+
+			if(strcmp(mb_domein,domeinPointer) == 0){
+
+				if(((INT_PTR)bufSize) < GetLenToWide(CP_THREAD_ACP,cookiePointer) + wcslen(key) + 1){
+
+					goto cookiebuffbigerr;
+				}
+				wcscpy(cookies,key);
+				cookies += wcslen(cookies);
+				cookies[0] = L'=';
+				cookies++;
+
+				MBToWide(CP_THREAD_ACP,cookiePointer,cookies,bufSize);
+				result = COOKIE_ERR_OK;
+			}
+		}
+
+	}
+
+end:
+
+
+	return result;
+
+
+keybuffbigerr:
+	result = COOKIE_ERR_DETAIL_URL_TOOBIG;
+	goto end;
+
+domeinbuffbigerr:
+	result = COOKIE_ERR_DETAIL_DOMEIN_TOOBIG;
+	goto end;
+
+cookiebuffbigerr:
+	result = COOKIEERR_DETAIL_RESULT_TOOBIG;
+	goto end;
 }
 
 ///
@@ -741,4 +816,41 @@ static INLINE VOID cookieStepExec(sqlite3_stmt *stmt,LPWSTR cookie,SIZE_T bufSiz
 	return;
 
 
+}
+
+
+static COOKIE_RESULT SelfParseCookie(LPCWSTR cookieFilePath,LPWSTR cookie,SIZE_T bufSize,LPCWSTR key,LPCWSTR domein,SelfParseCookieCallBack callBack){
+
+	COOKIE_RESULT result = COOKIE_ERR_UNKNOWN;
+
+	HANDLE hCookieFile = CreateFile(cookieFilePath,GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,0,NULL);
+	if(hCookieFile == INVALID_HANDLE_VALUE ){
+
+		goto fileopenerr;
+	}
+	{
+		DWORD readSize;
+		DWORD highSize;
+		DWORD lowSize = GetFileSize(hCookieFile,&highSize);
+		SIZE_T bufferSize = MAKELONG(lowSize,highSize);
+		LPSTR buffer = (LPSTR)malloc(bufferSize);
+		
+		ReadFile(hCookieFile,buffer,bufferSize,&readSize,NULL);
+		
+	
+
+		
+		result = callBack(buffer,buffer + (bufferSize / sizeof(CHAR)),cookie,bufSize,key,domein);
+		free(buffer);
+	}
+
+end:
+	
+	CloseHandle(hCookieFile);
+	
+	return result;
+
+fileopenerr:
+	result = COOKIE_ERR_OPEN_FAILED;
+	goto end;
 }
\ No newline at end of file

--- a/shareCookie/shareCookie.h
+++ b/shareCookie/shareCookie.h
@@ -84,8 +84,11 @@ extern COOKIE_RESULT GetCookie(BROWSERTYPE browserType,LPWSTR cookie,SIZE_T bufS
 ///未定義のブラウザタイプが設定された
 #define COOKIE_ERR_UNDEFINED_BROWSERTYPE					((COOKIE_RESULT) 11)
 
+///クッキーファイルを開くことが出来なかった
+#define COOKIE_ERR_OPEN_FAILED								((COOKIE_RESULT) 12)
 
-
+///ドメイン文字列の長さが長すぎる
+#define COOKIE_ERR_DETAIL_DOMEIN_TOOBIG						((COOKIE_RESULT) 13)
 
 
 

--- a/speaker/open_jtalk_core.cpp
+++ b/speaker/open_jtalk_core.cpp
@@ -108,6 +108,7 @@ void COpenJtalkCore::Load( const TChar_P in_voiceDataDir,const TChar_P in_dictin
 		
 void COpenJtalkCore::Synthesis( const TChar_P txt, FILE * wavfp, FILE * logfp){
 	CStringA txtA(txt);
+	idumpln_mb(CP_THREAD_ACP,"synthesis:%s",(LPCSTR)txtA);
 	::OpenJTalk_synthesis(&this->openJtalk_internal,(Char_P)(const char*)txtA,wavfp,logfp);
 }
 

--- a/speaker/speaker.vcxproj
+++ b/speaker/speaker.vcxproj
@@ -38,10 +38,10 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(solutiondir)open_jtalk_lib;$(IncludePath)</IncludePath>
+    <IncludePath>$(solutiondir)open_jtalk_lib;$(solutiondir)include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(solutiondir)open_jtalk_lib;$(IncludePath)</IncludePath>
+    <IncludePath>$(solutiondir)open_jtalk_lib;$(solutiondir)include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

--- a/speaker/speaker_include.h
+++ b/speaker/speaker_include.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <open_jtalk_lib.h>
-
+#include <qwerty\windebuger.h>
 
 #include "speaker_define.h"
 #include "speaker.h"

--- a/speaker/stdafx.h
+++ b/speaker/stdafx.h
@@ -6,7 +6,9 @@
 #pragma once
 
 #include "targetver.h"
-
+#define _CRT_SECURE_NO_WARNINGS 1			//vc++のおせっかいな警告を消す
+#define  _CRT_NON_CONFORMING_SWPRINTFS 1	//vc++のおせっかいな警告を消す
+#define WINDEBUGER_NOPRINTING				//デバッグ出力をコンソールに表示したくない場合定義する
 #define WIN32_LEAN_AND_MEAN             // Windows ヘッダーから使用されていない部分を除外します。