Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/plugin/PluginUserSettings.cpp

Issue 5171515343503360: Issue #41 - Bring method of determining IE version up to date (Closed)
Patch Set: Created July 29, 2014, 2:45 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/plugin/PluginTabBase.cpp ('k') | src/plugin/PluginWbPassThrough.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #include "PluginStdAfx.h" 1 #include "PluginStdAfx.h"
2 #include "PluginUserSettings.h" 2 #include "PluginUserSettings.h"
3 #include <algorithm> 3 #include <algorithm>
4 #include "PluginSettings.h" 4 #include "PluginSettings.h"
5 #include "PluginClient.h" 5 #include "PluginClient.h"
6 #include "../shared/Dictionary.h" 6 #include "../shared/Dictionary.h"
7 7
8 static const CString s_GetMessage = L"GetMessage"; 8 static const CString s_GetMessage = L"GetMessage";
9 static const CString s_GetLanguageCount = L"GetLanguageCount"; 9 static const CString s_GetLanguageCount = L"GetLanguageCount";
10 static const CString s_GetLanguageByIndex = L"GetLanguageByIndex"; 10 static const CString s_GetLanguageByIndex = L"GetLanguageByIndex";
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 return DISP_E_BADINDEX; 131 return DISP_E_BADINDEX;
132 132
133 const CString& method = s_Methods[dispidMember]; 133 const CString& method = s_Methods[dispidMember];
134 134
135 if (s_GetMessage == method) 135 if (s_GetMessage == method)
136 { 136 {
137 if (2 != pDispparams->cArgs) 137 if (2 != pDispparams->cArgs)
138 return DISP_E_BADPARAMCOUNT; 138 return DISP_E_BADPARAMCOUNT;
139 139
140 if (VT_BSTR != pDispparams->rgvarg[0].vt) 140 if (VT_BSTR != pDispparams->rgvarg[0].vt)
141 return DISP_E_TYPEMISMATCH; 141 return DISP_E_TYPEMISMATCH;
Eric 2014/07/29 14:49:40 This is a fix for an unrelated defect that slipped
142 if (VT_BSTR != pDispparams->rgvarg[1].vt)
143 return DISP_E_TYPEMISMATCH;
142 144
143 if (pVarResult) 145 if (pVarResult)
144 { 146 {
145 CComBSTR key = pDispparams->rgvarg[0].bstrVal; 147 CComBSTR key = pDispparams->rgvarg[0].bstrVal;
146 CComBSTR section = pDispparams->rgvarg[1].bstrVal; 148 CComBSTR section = pDispparams->rgvarg[1].bstrVal;
147 CStringW message = sGetMessage((BSTR)section, (BSTR)key); 149 CStringW message = sGetMessage((BSTR)section, (BSTR)key);
148 150
149 pVarResult->vt = VT_BSTR; 151 pVarResult->vt = VT_BSTR;
150 pVarResult->bstrVal = SysAllocString(message); 152 pVarResult->bstrVal = SysAllocString(message);
151 } 153 }
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 CPluginClient* client = CPluginClient::GetInstance(); 354 CPluginClient* client = CPluginClient::GetInstance();
353 client->RemoveSubscription(client->GetPref(L"subscriptions_exceptionsurl", L"")); 355 client->RemoveSubscription(client->GetPref(L"subscriptions_exceptionsurl", L""));
354 } 356 }
355 } 357 }
356 else 358 else
357 return DISP_E_MEMBERNOTFOUND; 359 return DISP_E_MEMBERNOTFOUND;
358 360
359 return S_OK; 361 return S_OK;
360 } 362 }
361 363
OLDNEW
« no previous file with comments | « src/plugin/PluginTabBase.cpp ('k') | src/plugin/PluginWbPassThrough.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld