Commit: 5d3a04304fdb0b05e4133ceb095e76cdab5d0c62 - nlite (git)

Commit MetaInfo

• Revision: 5d3a04304fdb0b05e4133ceb095e76cdab5d0c62 (tree)
• Time: 2012-03-14 19:48:20
• Author: qwerty2501 <qwerty2501@user...>
• Commiter: qwerty2501

Log Message

規定のブラウザ決定処理変更

Change Summary

• modified: nlite.suo
• modified: shareCookie/shareCookie.c

Incremental Difference

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

--- a/shareCookie/shareCookie.c
+++ b/shareCookie/shareCookie.c
@@ -112,10 +112,21 @@ static INLINE COOKIE_RESULT GetCookieSafari(LPCSTR targetString,LPCSTR targetEnd
 
 
 ///
+///レジストリから規定のブラウザタイプを取得
+///
+static INLINE BROWSERTYPE getDefaultBrowserReg(HKEY hTopKey,LPCWSTR path,LPCWSTR sectionName);
+
+///
 ///クッキーコピー用のパスを取得
 ///
 static INLINE BOOL CookieFileCopy(LPCWSTR sourceFileName,LPWSTR pathBuf,int bufSize);
 
+
+///
+///ブラウザ名からブラウザタイプを取得
+///
+static INLINE BROWSERTYPE browserNameToBrowserType(LPCWSTR browserName);
+
 const LPCWSTR  FIREFOX_GET_COOKIE_SQL = L"SELECT a.name, a.value FROM moz_cookies a WHERE a.name = ?1 AND a.baseDomain = ?2 ";						//ファイアフォックスクッキー取得用SQL
 
 
@@ -1158,80 +1169,97 @@ fileopenerr:
 
 BROWSERTYPE getDefaultBrowserType(){
 
-	BROWSERTYPE rslt = getDefaultBrowserTypeInvidialUser();
+	BROWSERTYPE rslt = getDefaultBrowserReg(HKEY_CURRENT_USER,L"Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\http\\UserChoice",L"Progid");
 
 	if(rslt == BT_NOSETTING){
 
-		rslt = getDefaultBrowserTypeLocalMachine();
+		rslt =  getDefaultBrowserReg(HKEY_CLASSES_ROOT,L"http\\shell\\open\\command",L"");
 	}
 
 	return rslt;
 	
 }
 
-
-static BROWSERTYPE getDefaultBrowserTypeInvidialUser(){
+static INLINE BROWSERTYPE getDefaultBrowserReg(HKEY hTopKey,LPCWSTR path,LPCWSTR sectionName){
 
 	BROWSERTYPE rslt = BT_NOSETTING;
 	WCHAR browserName[_MAX_PATH];
 	DWORD cName  = sizeof(browserName);
 	HKEY hKey;
 	//レジストリキーを読み取り専用でオープン
-	if(RegOpenKeyEx(HKEY_CURRENT_USER,L"Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\http\\UserChoice",0,KEY_READ,&hKey) != ERROR_SUCCESS){
+	if(RegOpenKeyEx(hTopKey,path,0,KEY_READ,&hKey) != ERROR_SUCCESS){
 		return BT_NOSETTING;
 	}
 
-	RegQueryValueEx(hKey,TEXT("Progid"),(LPDWORD)NULL,(LPDWORD)NULL,(LPBYTE)&browserName,&cName);
+	RegQueryValueEx(hKey,sectionName,(LPDWORD)NULL,(LPDWORD)NULL,(LPBYTE)&browserName,&cName);
 
-	if(_tcscmp(browserName,TEXT("ChromeHTML")) == 0){
+	
 
-		rslt = BT_GOOGLE_CHROME;
+	rslt = browserNameToBrowserType(browserName);
 
-	} else if(_tcscmp(browserName,TEXT("IE.HTTP")) == 0 ){
 
-		rslt = BT_INTERNET_EXPLORER;
 
-	} else if(_tcscmp(browserName,TEXT("FirefoxURL"))==0){
+	RegCloseKey(hKey);
+	return rslt;
 
-		rslt = BT_FIRE_FOX;
+}
 
-	} else if(_tcscmp(browserName,TEXT("SafariURL")) == 0){
 
-		rslt = BT_SAFARI;
-	} else if(_tcscmp(browserName,TEXT("Opera.Protocol"))==0){
+static INLINE BROWSERTYPE browserNameToBrowserType(LPCWSTR browserName){
 
-		rslt = BT_OPERA;
+	WCHAR browserNameBuf[_MAX_PATH];
+	wcscpy(browserNameBuf,browserName);
 
-	} else if(_tcscmp(browserName,TEXT("Sleipnir2.HTTP"))==0){
+	CharUpperBuff(browserNameBuf,wcslen(browserNameBuf));
+	
+	if(
+		_tcsstr(browserNameBuf,L"CHROME") !=NULL ||
+		_tcsstr(browserNameBuf,L"GOOGLECHROME") != NULL
+		){
 
-		rslt = BT_IE_COMPONENT;
+		return BT_GOOGLE_CHROME;
 
-	} else {
+	} else if(
+		_tcsstr(browserNameBuf,L"IE") !=NULL ||
+		_tcsstr(browserNameBuf,L"INTERNETEXPLORER") !=NULL
+		){
 
-		rslt = BT_IE_COMPONENT;
+		return BT_INTERNET_EXPLORER;
 
-	}
-	
+	} else if(
+		_tcsstr(browserNameBuf,L"FIREFOX") !=NULL
+		){
 
-	
+		return BT_FIRE_FOX;
 
+	} else if(
+		_tcsstr(browserNameBuf,L"SAFARI") !=NULL
+		){
 
+		return BT_SAFARI;
+	} else if(
+		_tcsstr(browserNameBuf,L"OPERA") !=NULL
+		){
 
-	RegCloseKey(hKey);
-	return rslt;
+		return BT_OPERA;
 
-}
+	} else if(
+		_tcsstr(browserNameBuf,L"SLEIPNIR") !=NULL
+		){
 
+		return BT_IE_COMPONENT;
 
-static BROWSERTYPE getDefaultBrowserTypeLocalMachine(){
+	} else {
 
+		return BT_IE_COMPONENT;
 
-	BROWSERTYPE rslt = BT_NOSETTING;
+	}
 	
+	
+}
+
 
-	return rslt;
 
-}