diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-08-24 09:56:27 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-08-24 09:56:27 +0000 |
| commit | 372ddd7462b69cbe508d0b37e07988c4278e2db8 (patch) | |
| tree | aa0039ca2b4b433b80cc82c74c27427fbacbf570 | |
| parent | db938d6a5905c407a2405094399e5e5bf85aea0e (diff) | |
- translation issues
- minor code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@5813 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/ShellExt/src/options.cpp | 4 | ||||
| -rw-r--r-- | plugins/ShellExt/src/shlcom.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/ShellExt/src/options.cpp b/plugins/ShellExt/src/options.cpp index ccc2d3eb6a..8d288f1dc6 100644 --- a/plugins/ShellExt/src/options.cpp +++ b/plugins/ShellExt/src/options.cpp @@ -35,8 +35,8 @@ static INT_PTR CALLBACK OptDialogProc(HWND hwndDlg, UINT wMsg, WPARAM wParam, LP TranslateDialogDefault(hwndDlg);
comReg = IsCOMRegistered();
mir_sntprintf(szBuf, SIZEOF(szBuf), _T("%s (%s)"),
- COM_OKSTR[ (comReg & COMREG_OK) != 0 ],
- COM_APPROVEDSTR[ (comReg & COMREG_APPROVED) != 0 ]);
+ TranslateTS(COM_OKSTR[ (comReg & COMREG_OK) != 0 ]),
+ TranslateTS(COM_APPROVEDSTR[ (comReg & COMREG_APPROVED) != 0 ]));
SetWindowText(GetDlgItem(hwndDlg, IDC_STATUS), szBuf);
// auto size the static windows to fit their text
// they're rendering in a font not selected into the DC.
diff --git a/plugins/ShellExt/src/shlcom.cpp b/plugins/ShellExt/src/shlcom.cpp index b2de97009b..e64ba8832c 100644 --- a/plugins/ShellExt/src/shlcom.cpp +++ b/plugins/ShellExt/src/shlcom.cpp @@ -584,7 +584,6 @@ TShlComRec::TShlComRec() HRESULT TShlComRec::QueryInterface(REFIID riid, void **ppvObject)
{
- *ppvObject = NULL;
// IShellExtInit is given when the TShlRec is created
if (riid == IID_IContextMenu || riid == IID_IContextMenu2 || riid == IID_IContextMenu3) {
*ppvObject = (IContextMenu3*)this;
@@ -600,6 +599,7 @@ HRESULT TShlComRec::QueryInterface(REFIID riid, void **ppvObject) return S_OK;
}
+ *ppvObject = NULL;
return CLASS_E_CLASSNOTAVAILABLE;
}
@@ -1031,7 +1031,7 @@ HRESULT TClassFactoryRec::CreateInstance(IUnknown *pUnkOuter, REFIID riid, void }
if (riid == IID_IShellExtInit) {
TShlComRec *p = new TShlComRec();
- *ppvObject = (IContextMenu3*)p;
+ *ppvObject = (IShellExtInit*)p;
return S_OK;
}
|