From d8662801e73a292d225db69f1b49ae897f721e28 Mon Sep 17 00:00:00 2001 From: Kimura Youichi Date: Sun, 13 Jul 2014 09:26:02 +0900 Subject: [PATCH] =?utf8?q?=E4=BD=BF=E7=94=A8=E3=81=95=E3=82=8C=E3=81=A6?= =?utf8?q?=E3=81=84=E3=81=AA=E3=81=84=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=AB?= =?utf8?q?=E5=A4=89=E6=95=B0=E3=82=92=E5=89=8A=E9=99=A4=20(CA1804)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit http://msdn.microsoft.com/ja-jp/library/ms182278.aspx --- OpenTween/AppendSettingDialog.cs | 4 ---- OpenTween/Connection/HttpVarious.cs | 2 +- OpenTween/FilterDialog.cs | 4 +--- OpenTween/Growl.cs | 2 -- OpenTween/NativeMethods.cs | 20 ++++++++++++-------- OpenTween/StatusDictionary.cs | 1 - OpenTween/Thumbnail/Services/Nicovideo.cs | 2 +- OpenTween/Tween.cs | 1 - OpenTween/Twitter.cs | 8 ++++---- OpenTween/WebBrowserController.cs | 11 +++++------ 10 files changed, 24 insertions(+), 31 deletions(-) diff --git a/OpenTween/AppendSettingDialog.cs b/OpenTween/AppendSettingDialog.cs index ed142adb..ea8874da 100644 --- a/OpenTween/AppendSettingDialog.cs +++ b/OpenTween/AppendSettingDialog.cs @@ -551,10 +551,6 @@ namespace OpenTween private void Setting_Load(object sender, EventArgs e) { tw = ((TweenMain)this.Owner).TwitterInstance; - string uname = tw.Username; - string pw = tw.Password; - string tk = tw.AccessToken; - string tks = tw.AccessTokenSecret; //this.AuthStateLabel.Enabled = true; //this.AuthUserLabel.Enabled = true; this.BasedPanel.AuthClearButton.Enabled = true; diff --git a/OpenTween/Connection/HttpVarious.cs b/OpenTween/Connection/HttpVarious.cs index 08094f70..c59f8c4f 100644 --- a/OpenTween/Connection/HttpVarious.cs +++ b/OpenTween/Connection/HttpVarious.cs @@ -48,7 +48,7 @@ namespace OpenTween req.AllowAutoRedirect = false; string data; Dictionary head = new Dictionary(); - HttpStatusCode ret = GetResponse(req, out data, head); + GetResponse(req, out data, head); string location; return head.TryGetValue("Location", out location) diff --git a/OpenTween/FilterDialog.cs b/OpenTween/FilterDialog.cs index 4a629815..01d60b31 100644 --- a/OpenTween/FilterDialog.cs +++ b/OpenTween/FilterDialog.cs @@ -661,7 +661,7 @@ namespace OpenTween { try { - Regex rgx = new Regex(text); + new Regex(text); } catch (Exception ex) { @@ -1052,7 +1052,6 @@ namespace OpenTween if (ListTabs.SelectedIndex > -1 && ListFilters.SelectedItem != null && ListFilters.SelectedIndex > 0) { string tabname = ListTabs.SelectedItem.ToString(); - PostFilterRule selected = _sts.Tabs[tabname].Filters[ListFilters.SelectedIndex]; PostFilterRule target = _sts.Tabs[tabname].Filters[ListFilters.SelectedIndex - 1]; int idx = ListFilters.SelectedIndex; ListFilters.Items.RemoveAt(idx - 1); @@ -1067,7 +1066,6 @@ namespace OpenTween if (ListTabs.SelectedIndex > -1 && ListFilters.SelectedItem != null && ListFilters.SelectedIndex < ListFilters.Items.Count - 1) { string tabname = ListTabs.SelectedItem.ToString(); - PostFilterRule selected = _sts.Tabs[tabname].Filters[ListFilters.SelectedIndex]; PostFilterRule target = _sts.Tabs[tabname].Filters[ListFilters.SelectedIndex + 1]; int idx = ListFilters.SelectedIndex; ListFilters.Items.RemoveAt(idx + 1); diff --git a/OpenTween/Growl.cs b/OpenTween/Growl.cs index 2be75695..eb73ff5f 100644 --- a/OpenTween/Growl.cs +++ b/OpenTween/Growl.cs @@ -199,7 +199,6 @@ namespace OpenTween "Growl.CoreLibrary.BinaryData").GetConstructor( BindingFlags.Public | BindingFlags.Instance, null, new Type[] { typeof(byte[]) }, null); - TypeConverter tc = new TypeConverter(); object bdata = cibd.Invoke( new object[] { IconToByteArray(Path.Combine(Application.StartupPath, "Icons\\MIcon.ico")) }); @@ -219,7 +218,6 @@ namespace OpenTween "Growl.CoreLibrary.BinaryData").GetConstructor( BindingFlags.Public | BindingFlags.Instance, null, new Type[] { typeof(byte[]) }, null); - TypeConverter tc = new TypeConverter(); object bdata = cibd.Invoke( new object[] { IconToByteArray(Properties.Resources.MIcon) }); diff --git a/OpenTween/NativeMethods.cs b/OpenTween/NativeMethods.cs index 669c248f..6371df98 100644 --- a/OpenTween/NativeMethods.cs +++ b/OpenTween/NativeMethods.cs @@ -324,10 +324,8 @@ namespace OpenTween { // Converting structure to IntPtr Marshal.StructureToPtr(ipi, pIpi, true); - var ret = InternetSetOption(IntPtr.Zero, - INTERNET_OPTION_PROXY, - pIpi, - Marshal.SizeOf(ipi)); + if (!InternetSetOption(IntPtr.Zero, INTERNET_OPTION_PROXY, pIpi, Marshal.SizeOf(ipi))) + throw new Win32Exception(); } finally { @@ -347,8 +345,11 @@ namespace OpenTween if (!string.IsNullOrEmpty(username) || !string.IsNullOrEmpty(password)) { - var ret = InternetSetOption(IntPtr.Zero, INTERNET_OPTION_PROXY_USERNAME, IntPtr.Zero, 0); - ret = InternetSetOption(IntPtr.Zero, INTERNET_OPTION_PROXY_PASSWORD, IntPtr.Zero, 0); + if (!InternetSetOption(IntPtr.Zero, INTERNET_OPTION_PROXY_USERNAME, IntPtr.Zero, 0)) + throw new Win32Exception(); + + if (!InternetSetOption(IntPtr.Zero, INTERNET_OPTION_PROXY_PASSWORD, IntPtr.Zero, 0)) + throw new Win32Exception(); } else { @@ -356,8 +357,11 @@ namespace OpenTween var pPass = Marshal.StringToBSTR(password); try { - var ret = InternetSetOption(IntPtr.Zero, INTERNET_OPTION_PROXY_USERNAME, pUser, username.Length + 1); - ret = InternetSetOption(IntPtr.Zero, INTERNET_OPTION_PROXY_PASSWORD, pPass, password.Length + 1); + if (!InternetSetOption(IntPtr.Zero, INTERNET_OPTION_PROXY_USERNAME, pUser, username.Length + 1)) + throw new Win32Exception(); + + if (!InternetSetOption(IntPtr.Zero, INTERNET_OPTION_PROXY_PASSWORD, pPass, password.Length + 1)) + throw new Win32Exception(); } finally { diff --git a/OpenTween/StatusDictionary.cs b/OpenTween/StatusDictionary.cs index ec5f434f..e24f11a2 100644 --- a/OpenTween/StatusDictionary.cs +++ b/OpenTween/StatusDictionary.cs @@ -1076,7 +1076,6 @@ namespace OpenTween //notifyPosts = new List(); var homeTab = GetTabByType(MyCommon.TabUsageType.Home); var replyTab = GetTabByType(MyCommon.TabUsageType.Mentions); - var dmTab = GetTabByType(MyCommon.TabUsageType.DirectMessage); var favTab = GetTabByType(MyCommon.TabUsageType.Favorites); foreach (var id in _addedIds) { diff --git a/OpenTween/Thumbnail/Services/Nicovideo.cs b/OpenTween/Thumbnail/Services/Nicovideo.cs index 47588807..679996a9 100644 --- a/OpenTween/Thumbnail/Services/Nicovideo.cs +++ b/OpenTween/Thumbnail/Services/Nicovideo.cs @@ -55,7 +55,7 @@ namespace OpenTween.Thumbnail.Services var src = ""; var imgurl = ""; string errmsg; - if ((new HttpVarious()).GetData(apiUrl, null, out src, 0, out errmsg, Networking.GetUserAgentString())) + if (http.GetData(apiUrl, null, out src, 0, out errmsg, Networking.GetUserAgentString())) { var sb = new StringBuilder(); var xdoc = new XmlDocument(); diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs index 56b20f2b..1a1f0b3e 100644 --- a/OpenTween/Tween.cs +++ b/OpenTween/Tween.cs @@ -11569,7 +11569,6 @@ namespace OpenTween TabClass tb = _statuses.Tabs[tbName]; ComboBox cmb = (ComboBox)pnl.Controls["comboSearch"]; ComboBox cmbLang = (ComboBox)pnl.Controls["comboLang"]; - ComboBox cmbusline = (ComboBox)pnl.Controls["comboUserline"]; cmb.Text = cmb.Text.Trim(); // 検索式演算子 OR についてのみ大文字しか認識しないので強制的に大文字とする bool Quote = false; diff --git a/OpenTween/Twitter.cs b/OpenTween/Twitter.cs index e7550aa8..7fa3814a 100644 --- a/OpenTween/Twitter.cs +++ b/OpenTween/Twitter.cs @@ -209,12 +209,12 @@ namespace OpenTween public string StartAuthentication(ref string pinPageUrl) { //OAuth PIN Flow - bool res; - this.ResetApiStatus(); try { - res = twCon.AuthGetRequestToken(ref pinPageUrl); + var res = twCon.AuthGetRequestToken(ref pinPageUrl); + if (!res) + return "Err:Failed to access auth server."; } catch(Exception) { @@ -2787,7 +2787,7 @@ namespace OpenTween try { - var u = TwitterUser.ParseJson(content); + TwitterUser.ParseJson(content); value = true; return ""; } diff --git a/OpenTween/WebBrowserController.cs b/OpenTween/WebBrowserController.cs index 6b2d523a..5295bb8e 100644 --- a/OpenTween/WebBrowserController.cs +++ b/OpenTween/WebBrowserController.cs @@ -291,7 +291,6 @@ namespace OpenTween { // ActiveXコントロール取得 _WebBrowser.DocumentText = "about:blank"; //ActiveXを初期化する - int hresult = 0; do { @@ -306,9 +305,9 @@ namespace OpenTween try { - hresult = ocxServiceProvider.QueryService( - ref WebBrowserAPI.SID_SProfferService, - ref WebBrowserAPI.IID_IProfferService, out profferServicePtr); + ocxServiceProvider.QueryService( + ref WebBrowserAPI.SID_SProfferService, + ref WebBrowserAPI.IID_IProfferService, out profferServicePtr); } catch (SEHException ex) { @@ -329,8 +328,8 @@ namespace OpenTween try { int cookie = 0; - hresult = profferService.ProfferService( - ref WebBrowserAPI.IID_IInternetSecurityManager, this, out cookie); + profferService.ProfferService( + ref WebBrowserAPI.IID_IInternetSecurityManager, this, out cookie); } catch (SEHException ex) { -- 2.11.0