From df1846e55636562e3b256793bd86c5af8436aa9a Mon Sep 17 00:00:00 2001 From: qwerty2501 Date: Sat, 4 Feb 2012 16:40:49 +0900 Subject: [PATCH] =?utf8?q?lvNo=E3=83=AA=E3=83=B3=E3=82=AF=E6=A9=9F?= =?utf8?q?=E8=83=BD=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nlite.suo | Bin 151040 -> 154624 bytes nlite/nlite.cpp | 19 ------------------ nlite/nlite.h | 5 +++++ nlite/nlite.vcxproj | 1 + nlite/nlite.vcxproj.filters | 3 +++ nlite/nlite_commentview.cpp | 16 +++++---------- nlite/nlite_common.cpp | 46 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 60 insertions(+), 30 deletions(-) create mode 100644 nlite/nlite_common.cpp diff --git a/nlite.suo b/nlite.suo index cc9e503984932fce19bf43983253d55d1decf369..37a45d3bcac32b63071993e110511ecc1b73cb98 100644 GIT binary patch delta 5487 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 T^N&9+^{4D8#ffu7XVAX@sJ?ew diff --git a/nlite/nlite.cpp b/nlite/nlite.cpp index b593a2d..847d433 100644 --- a/nlite/nlite.cpp +++ b/nlite/nlite.cpp @@ -8,13 +8,7 @@ CAppModule _Module; -namespace nlite{ -Property nliteProperty; - -const CApplicationInfo * appInfo = NULL; - -} static TCHAR localAppDataPath[_MAX_PATH]; static WSAData wsaData; //winsockdata @@ -186,16 +180,3 @@ static BOOL InitializeNlite(){ return; } - VOID nlite::UnexpectedErrorMessageShow(LPCTSTR headMessage,LPCTSTR summary,UINT line,LPCTSTR fileName,LPCTSTR function){ - tstring errMessage; - errMessage = headMessage; - errMessage += TEXT("‘z’肳‚ê‚Ä‚¢‚È‚¢ƒGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½BƒAƒvƒŠƒP[ƒVƒ‡ƒ“”z’uƒtƒHƒ‹ƒ_‚ɍ쐬‚³‚ꂽƒƒOƒtƒ@ƒCƒ‹‚ð“n‚µ‚Ä‚à‚炦‚é‚ÆŠJ”­ŽÒ‚ª”ñí‚ÉŠì‚Ñ‚Ü‚·"); - errMessage += TEXT("\r\nƒGƒ‰[ƒƒbƒZ[ƒW:"); - errMessage += summary; - DebugOutW(fileName,function,line,DUMPING__DEBUGER__ | LINEFEAD__DEBUGER__ ,ERRORMODE__DEBUGER__,TEXT("%s"),summary); - ::MessageBox(NULL,errMessage.c_str(),TEXT("‘z’肳‚ê‚Ä‚¢‚È‚¢ƒGƒ‰["),MB_ICONERROR | MB_OK); - - - - return; - } \ No newline at end of file diff --git a/nlite/nlite.h b/nlite/nlite.h index fd44598..c5f706f 100644 --- a/nlite/nlite.h +++ b/nlite/nlite.h @@ -8,12 +8,17 @@ namespace nlite{ class CApplicationInfo; class CListenerList; struct Property; + struct GeneralProperty; //ƒOƒ[ƒoƒ‹ extern const CApplicationInfo * appInfo; extern CListenerList listenerList; + + //ƒOƒ[ƒoƒ‹ŠÖ” extern VOID UnexpectedErrorMessageShow(LPCTSTR headMessage,LPCTSTR summary,UINT line,LPCTSTR fileName,LPCTSTR function); + extern HINSTANCE OpenURL(HWND hwnd,const GeneralProperty &gp,LPCTSTR url ,INT nShowCommand); + //ƒAƒvƒŠƒP[ƒVƒ‡ƒ“ƒvƒƒpƒeƒB extern Property nliteProperty; const static UINT_PTR COMMENTVIEW_HEADERITEMSIZE = 5; diff --git a/nlite/nlite.vcxproj b/nlite/nlite.vcxproj index 9cc5f51..95fb94e 100644 --- a/nlite/nlite.vcxproj +++ b/nlite/nlite.vcxproj @@ -131,6 +131,7 @@ + diff --git a/nlite/nlite.vcxproj.filters b/nlite/nlite.vcxproj.filters index 0333885..0639688 100644 --- a/nlite/nlite.vcxproj.filters +++ b/nlite/nlite.vcxproj.filters @@ -113,6 +113,9 @@ ソース ファイル + + ソース ファイル + diff --git a/nlite/nlite_commentview.cpp b/nlite/nlite_commentview.cpp index 5cb9ce0..1f6778c 100644 --- a/nlite/nlite_commentview.cpp +++ b/nlite/nlite_commentview.cpp @@ -4,6 +4,7 @@ using namespace std::tr1; namespace nlite{ + static const LPCTSTR LIVEURL_PART = TEXT("http://live.nicovideo.jp/watch/"); static const UINT_PTR SELL_SPACE_LENGTH = 1; // @@ -1524,15 +1525,7 @@ end: chatReadEdit.GetSelText(selTextBuf); if(regex_match((LPCTSTR)selTextBuf,nliteregex::URL) == TRUE){ - if(self.generalProperty.browserPath.Length() == 0){ - - ShellExecute(*this, NULL, selTextBuf, NULL, NULL, SW_SHOWNORMAL); - - } else{ - - - } - + OpenURL(*this,self.generalProperty,selTextBuf,SW_SHOWNORMAL); } else if(regex_match((LPCTSTR)selTextBuf,nliteregex::VIDEOID) == TRUE){ @@ -1540,8 +1533,9 @@ end: dumpln(TEXT("videoId")); } else if( regex_match((LPCTSTR)selTextBuf,nliteregex::LIVEID) == TRUE){ - - dumpln(TEXT("liveId")); + + selTextBuf.Insert(0,LIVEURL_PART); + OpenURL(*this,self.generalProperty,selTextBuf,SW_SHOWNORMAL); } diff --git a/nlite/nlite_common.cpp b/nlite/nlite_common.cpp new file mode 100644 index 0000000..4beee1b --- /dev/null +++ b/nlite/nlite_common.cpp @@ -0,0 +1,46 @@ +#include "stdafx.h" +#include "nlite_include.h" + + + +namespace nlite{ + +Property nliteProperty; + + + VOID nlite::UnexpectedErrorMessageShow(LPCTSTR headMessage,LPCTSTR summary,UINT line,LPCTSTR fileName,LPCTSTR function){ + tstring errMessage; + errMessage = headMessage; + errMessage += TEXT("‘z’肳‚ê‚Ä‚¢‚È‚¢ƒGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½BƒAƒvƒŠƒP[ƒVƒ‡ƒ“”z’uƒtƒHƒ‹ƒ_‚ɍ쐬‚³‚ꂽƒƒOƒtƒ@ƒCƒ‹‚ð“n‚µ‚Ä‚à‚炦‚é‚ÆŠJ”­ŽÒ‚ª”ñí‚ÉŠì‚Ñ‚Ü‚·"); + errMessage += TEXT("\r\nƒGƒ‰[ƒƒbƒZ[ƒW:"); + errMessage += summary; + DebugOutW(fileName,function,line,DUMPING__DEBUGER__ | LINEFEAD__DEBUGER__ ,ERRORMODE__DEBUGER__,TEXT("%s"),summary); + ::MessageBox(NULL,errMessage.c_str(),TEXT("‘z’肳‚ê‚Ä‚¢‚È‚¢ƒGƒ‰["),MB_ICONERROR | MB_OK); + + + + return; + } + + HINSTANCE OpenURL(HWND hwnd,const GeneralProperty &gp,LPCTSTR url ,INT nShowCommand){ + + HINSTANCE rslt; + + if(gp.browserPath.Length() == 0){ + + rslt = ShellExecute(hwnd, NULL, url, NULL, NULL, nShowCommand); + + } else{ + + rslt = ShellExecute(hwnd, NULL, gp.browserPath, url, NULL, nShowCommand); + + } + + return rslt; + + } + + +const CApplicationInfo * appInfo = NULL; + +} \ No newline at end of file -- 2.11.0