Commit: e1eb437b2ef69b809001bae979337f2110d99eb0 - nlite (git)

Commit MetaInfo

• Revision: e1eb437b2ef69b809001bae979337f2110d99eb0 (tree)
• Time: 2012-02-25 18:27:00
• Author: qwerty2501 <riot313@gmai...>
• Commiter: qwerty2501

Log Message

規定のブラウザとのクッキー共有機能実装

Change Summary

• modified: nlite.suo
• modified: nlite/nlite_property.cpp
• modified: nlite/nlite_propertyWindow.cpp
• modified: shareCookie/shareCookie.c

Incremental Difference

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

--- a/nlite/nlite_property.cpp
+++ b/nlite/nlite_property.cpp
@@ -95,7 +95,7 @@ namespace nlite{
 		numberNameFlag(FALSE),
 		autoColorRegisterFlag(FALSE),
 		activeCountTimeFlag(TRUE),
-		browserType(BT_INTERNET_EXPLORER),
+		browserType(BT_DEFAULT),
 		ncvUserSettingReadedFlag(FALSE)
 	{}
 

--- a/nlite/nlite_propertyWindow.cpp
+++ b/nlite/nlite_propertyWindow.cpp
@@ -51,6 +51,7 @@ BOOL CCookieSettingWindow::OnInitDialog(CWindow wndFocus, LPARAM lInitParam){
 	case BT_DEFAULT:
 
 		radio = GetDlgItem(IDC_DEFAULT_BT_RADIO);
+		break;
 
 	default:
 		goto skip;

--- a/shareCookie/shareCookie.c
+++ b/shareCookie/shareCookie.c
@@ -947,9 +947,8 @@ fileopenerr:
 BROWSERTYPE getDefaultBrowserType(){
 
 	BROWSERTYPE rslt = BT_NOSETTING;
-	WCHAR currentUserSID[_MAX_PATH];
-	DWORD cName  = ARRAY_LENGTH(currentUserSID);
-	FILETIME fileTime;
+	WCHAR browserName[_MAX_PATH];
+	DWORD cName  = sizeof(browserName);
 	HKEY hKey;
 	//レジストリキーを読み取り専用でオープン
 	if(RegOpenKeyEx(HKEY_CURRENT_USER,L"Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\https\\UserChoice",0,KEY_READ,&hKey) != ERROR_SUCCESS){
@@ -957,11 +956,38 @@ BROWSERTYPE getDefaultBrowserType(){
 	}
 
 
+	if(_tcscmp(browserName,TEXT("ChromeHTML")) == 0){
 
+		rslt = BT_GOOGLE_CHROME;
+
+	} else if(_tcscmp(browserName,TEXT("IE.HTTP")) == 0 ){
+
+		rslt = BT_INTERNET_EXPLORER;
+
+	} else if(_tcscmp(browserName,TEXT("FirefoxURL"))==0){
+
+		rslt = BT_FIRE_FOX;
+
+	} else if(_tcscmp(browserName,TEXT("SafariURL")) == 0){
+
+		rslt = BT_SAFARI;
+	} else if(_tcscmp(browserName,TEXT("Opera.Protocol"))==0){
+
+		rslt = BT_OPERA;
+
+	} else if(_tcscmp(browserName,TEXT("Sleipnir2.HTTP"))==0){
+
+		rslt = BT_IE_COMPONENT;
+
+	} else {
+
+		rslt = BT_IE_COMPONENT;
+
+	}
 	
 
-	RegQueryValueEx(hKey,TEXT("Progid"),(LPDWORD)NULL,(LPDWORD)NULL,(LPBYTE)&currentUserSID,&cName);
-	//HKEY_CURRENT_USER\Software\Microsoft\Protected Storage System Provider\
+	RegQueryValueEx(hKey,TEXT("Progid"),(LPDWORD)NULL,(LPDWORD)NULL,(LPBYTE)&browserName,&cName);
+
 
 
 	RegCloseKey(hKey);