From e1eb437b2ef69b809001bae979337f2110d99eb0 Mon Sep 17 00:00:00 2001 From: qwerty2501 Date: Sat, 25 Feb 2012 18:27:00 +0900 Subject: [PATCH] =?utf8?q?=E8=A6=8F=E5=AE=9A=E3=81=AE=E3=83=96=E3=83=A9?= =?utf8?q?=E3=82=A6=E3=82=B6=E3=81=A8=E3=81=AE=E3=82=AF=E3=83=83=E3=82=AD?= =?utf8?q?=E3=83=BC=E5=85=B1=E6=9C=89=E6=A9=9F=E8=83=BD=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nlite.suo | Bin 190464 -> 190464 bytes nlite/nlite_property.cpp | 2 +- nlite/nlite_propertyWindow.cpp | 1 + shareCookie/shareCookie.c | 36 +++++++++++++++++++++++++++++++----- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/nlite.suo b/nlite.suo index 6f5dc728591a67c5f881b34a0806d85fe0839895..d5f488bddaa7bf577456fc47120840e82dbf5a1a 100644 GIT binary patch delta 5069 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 QWw>_iz1j`_Ss26q2R>cE2><{9 delta 5142 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 r?2Hq$>CkCDyJWo0q}F)Kp&R&LkPF)j diff --git a/nlite/nlite_property.cpp b/nlite/nlite_property.cpp index 092e06f..83cb135 100644 --- 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) {} diff --git a/nlite/nlite_propertyWindow.cpp b/nlite/nlite_propertyWindow.cpp index ad46f74..7348706 100644 --- 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; diff --git a/shareCookie/shareCookie.c b/shareCookie/shareCookie.c index 2a77b4d..6525cd6 100644 --- 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; //ƒŒƒWƒXƒgƒŠƒL[‚ð“Ç‚ÝŽæ‚èê—p‚ŃI[ƒvƒ“ 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)¤tUserSID,&cName); - //HKEY_CURRENT_USER\Software\Microsoft\Protected Storage System Provider\ + RegQueryValueEx(hKey,TEXT("Progid"),(LPDWORD)NULL,(LPDWORD)NULL,(LPBYTE)&browserName,&cName); + RegCloseKey(hKey); -- 2.11.0