From a38da6a144a49c120a7cc495a0c6a366196c09bc Mon Sep 17 00:00:00 2001 From: qwerty2501 Date: Mon, 30 Jan 2012 00:13:27 +0900 Subject: [PATCH] 2012/01/30 0:13:27 --- nlite.suo | Bin 145408 -> 145408 bytes nlite/nlite.cpp | 2 +- nlite/nlite_mainframe.cpp | 107 +++++++++++++++++++++++++--------------------- 3 files changed, 59 insertions(+), 50 deletions(-) diff --git a/nlite.suo b/nlite.suo index 0fd8f2801261824db57b5c0c82915e17a6923e27..cbb7dd30174cf9fdbfbb0112c9f768ac5b04ef23 100644 GIT binary patch delta 3937 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 V@yFl7idQ_#o&%|Ym(%4+_!lr{N!9=W delta 3782 zcmb_feNJCvhln0Dz ze&C1m`1IYgbYJkDallWV*Y9qYFe|!-j+8?N1sY%(PKefHZ*({8#uL%CWC#Td6@)@0 zHq|Ug_qb$q#Omnk(;!pZX~@TIaVETQu?CycdGr+M(Hf`4k2@1lwid!JEVKTiBYuGa zw(@2h@RBnMO)spawRUL~<~g-!OW6u}JZUUitCP{1qNeOd$j03c6RO8H;HlIOo>EAG zB#`kyY9yU9LLC-sQ z_TP9wa&(Q8$-4*A$de1BLY`7Rf|Dnoww8aiY)z*5#`KqZ_q5x(&$Q-e z55C;>{NLuZH#Xfr`ndDu&QzDI!6Rx%XVLT;8JmY?VdgMB&Y5UoH`k)OasqVGw{{qd z?uC`qkqhg|GXzGVyim^pUXQK?iFE!$sKnO!=HSefjzvd?srABT1t=@^CUUBw9If-U z;Ks6%Bk1!+&eQ92APOJfqy;Z~R;^D~74VWGzUHa$kZvYkea46^FsFJeJk0Ck@az^R$|*A3N8v}I4Batm?0q&0yQ;Q{^sMz=mg(3b zFmZ|kR2B|pl(!$OoWJn&GHk1L!ZQT1@Px=|6m(PBekesb+Kk>cBC9(QHory{;ZTEL z*O~Ertp{@1lW~j>9hL;Fp(<56Ti(i;De)!R(Oa)$Tg%ZiT*h5nqM(uD@}ab`9L&5~ z2m0}C&hQ#vY^34|ub#`R7xy792CvlXHKTc?MeIj`E*PZ=TzKm(j_}3R%=F3Z7!3#Pp%Z=#FIC&%-jh0pT{>4ZR`+5w#YUhwA@MeMuc2ZLz zsCl5C2ZHRZ^wt6nIX_iJea=QR;Qg4^hy-bui2KJ*V+g5s>SL0iD(d;Z1D6HW%~KUFiBJ z`+u#8q27KJeuthL@nj2^c6Ot6QmX*An$X!b@b_y}ZwqXf%CvEvexmO{~L zjho#qrx#AcYSIHQ=@JlUSVhr-O<>`?zs!52ck5w>B#6eTkc`7?(*Q55kblxHHWWfMLbI>unoe< zYU8Skg~ApqsHrfP$(vcymuN(}LuQOk=jjZ(k@X}m0V5Ag<^hp@E-kONB>^NnKgmLQ zzh=;+1m}wI{4s$Y)YGAIn2hdpH!(otnSuIvFMNrrkpF_#P2p9=oVMYVe-om~c^>3BpJroeIrPR>4#o~IOyyxT&8N1;~flimpy5d|~dDgZ4!D|*Q^k}F^~ zr{9Bt_pPjne#yoyQca`M88E_cTLGtJN<0p7ePOY`q6CVyczD7Lk{=7=w}^Txz|390 zee*_&VR~h)Qa1AU-IX9|si+2Q%uh-cUD^mTAE?|f+Q=#Ds;UshXM~MZ+5ltd^z=w2_A$3wm@m# zGg-Tojhx@T6%w`7y8|4GaG`*JflylEQeA#m00Mw{ zZ&~T+K8RHG24(JJ80_V6?_pJ;=2T3Mke zSJvAUcY*t%chjnVcg@gBQ@Vi2bqb=S1uC4Po5u+W!9Pcj=w}p}wzJZ~eP2dF75(8f zY*rkn+)udJY#&1_G>M8WCD(SQjF^wP&RNrLr>PNAjc-M~KmH7SuAy&-Nsm#JL(&f_ zC@x-?<(Qr_1ruEsoLXh0`ty)xN@D~2KUsY@)NWxftn(q13P(s;bbE|6lpacw2KjHF zgCjbP>QkO5gfd;f1ak+$MSdJ2hWcK{{6&|cP96H0O}tXQNh@QeO26hiu!qpWs}P{{ z?_iLB;`iW`m?t?hRkU!pWEa0xD~I}T{Qy!F^+ZTPVz5U@=6(J*j?97&SdUl=1D451E-^r0a^wB)|eJwOwaB_Fw_L74xYc*zP7 zgK_EzT9hP(5xaWS|DH{9Xj(=|YAPEcjis*~(op}DWNDk0D$}G)@}^0tKl|dBQMoZq P;&&-^ioYmLs)2t46uld? diff --git a/nlite/nlite.cpp b/nlite/nlite.cpp index 9fe2b97..69e4790 100644 --- a/nlite/nlite.cpp +++ b/nlite/nlite.cpp @@ -191,7 +191,7 @@ static BOOL InitializeNlite(){ 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"),errMessage); + 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); diff --git a/nlite/nlite_mainframe.cpp b/nlite/nlite_mainframe.cpp index 17b7c61..add5ab7 100644 --- a/nlite/nlite_mainframe.cpp +++ b/nlite/nlite_mainframe.cpp @@ -270,6 +270,8 @@ VOID CNliteMainFrame::ConnectingThread(LPVOID userData){ self.lvNoCombo.GetEditCtrl().SetReadOnly(TRUE); self.subLiveNoComboBox.untilConnectingFlag = TRUE; self.EnableWindow(FALSE); + + _endthread(); return; } @@ -278,62 +280,69 @@ BOOL CNliteMainFrame::ConnectNicoLive(LPCTSTR liveNo){ _beginthread(CNliteMainFrame::ConnectingThread,0,this); - nicoLiveStream.DisConnect(); - commentView.OnConnect(); BOOL rslt = FALSE; + try { + nicoLiveStream.DisConnect(); + commentView.OnConnect(); + - NLIB_RESULT code = nicoLiveStream.Connect(nicoVideoAuth,liveNo,LiveCallBack,&userData); + NLIB_RESULT code = nicoLiveStream.Connect(nicoVideoAuth,liveNo,LiveCallBack,&userData); - //ƒGƒ‰[ƒR[ƒhˆ— - switch(code){ + //ƒGƒ‰[ƒR[ƒhˆ— + switch(code){ - //³íI—¹ - case NLIB_ERR_OK: + //³íI—¹ + case NLIB_ERR_OK: - rslt = TRUE; - break; - - //‘z’肳‚ꂽƒGƒ‰[ƒR[ƒh - case NLIB_ERR_COOKIE_FAILED: - case NLIB_LIVENO_FAILED_UNDEFEINE: - case NLIB_GETPLAYERSTATUS_FAILED_CONNECT: - case NLIB_ERR_GETPLAYERSTATUS_INVALID_LV: - case NLIB_ERR_GETPLAYERSTATUS_INVALID_THREAD: - case NLIB_ERR_GETPLAYERSTATUS_CLOSED: - case NLIB_ERR_GETPLAYERSTATUS_UNKNOWN_ERROR: - case NLIB_ERR_GETPLAYERSTATUS_SERVER_ERROR: - case NLIB_ERR_GETPLAYERSTATUS_DELETED: - case NLIB_ERR_GETPLAYERSTATUS_FULL: - case NLIB_ERR_GETPLAYERSTATUS_PERMISSION_DENIED: - case NLIB_ERR_GETPLAYERSTATUS_ACCESS_LOCKED: - case NLIB_ERR_GETPLAYERSTATUS_REQUIRE_COMMUNITY_MEMBER: - case NLIB_ERR_GETPLAYERSTATUS_COMINGSOON: - case NLIB_ERR_GETPLAYERSTATUS_NOTFOUND: - case NLIB_ERR_GETPLAYERSTATUS_NOTLOGIN: - case NLIB_ERR_GETPLAYERSTATUS_UNKNOWN: - case NLIB_ERR_GETPLAYERSTATUS_MAINTENANCE: - case NLIB_ERR_GETPLAYERSTATUS_NOT_PERMITTED: - case NLIB_ERR_GETPLAYERSTATUS_REQUIRE_ACCEPT_PRINT_TIMESHIFT_TICKET: - case NLIB_ERR_GETPLAYERSTATUS_TSARCHIVE: - case NLIB_ERR_GETPLAYERSTATUS_USERTIMESHIFT: - case NLIB_ERR_GETPLAYERSTATUS_UNDEFINED: - case NLIB_ERR_GETPLAYERSTATUS_NOAUTH: - case NLIB_ERR_GETPLAYERSTATUS_CHANT_PARSE: - - this->subLiveNoComboBox.AgreeInputLvNo(); - ::MessageBox(NULL,NLIB_GetErrorMessage(code),TEXT("•ú‘—Ú‘±ƒGƒ‰["),MB_ICONERROR | MB_OK); - rslt = FALSE; - break; - - - //‘z’肳‚ê‚Ä‚¢‚È‚¢ƒGƒ‰[ƒR[ƒh - default: + rslt = TRUE; + break; + + //‘z’肳‚ꂽƒGƒ‰[ƒR[ƒh + case NLIB_ERR_COOKIE_FAILED: + case NLIB_LIVENO_FAILED_UNDEFEINE: + case NLIB_GETPLAYERSTATUS_FAILED_CONNECT: + case NLIB_ERR_GETPLAYERSTATUS_INVALID_LV: + case NLIB_ERR_GETPLAYERSTATUS_INVALID_THREAD: + case NLIB_ERR_GETPLAYERSTATUS_CLOSED: + case NLIB_ERR_GETPLAYERSTATUS_UNKNOWN_ERROR: + case NLIB_ERR_GETPLAYERSTATUS_SERVER_ERROR: + case NLIB_ERR_GETPLAYERSTATUS_DELETED: + case NLIB_ERR_GETPLAYERSTATUS_FULL: + case NLIB_ERR_GETPLAYERSTATUS_PERMISSION_DENIED: + case NLIB_ERR_GETPLAYERSTATUS_ACCESS_LOCKED: + case NLIB_ERR_GETPLAYERSTATUS_REQUIRE_COMMUNITY_MEMBER: + case NLIB_ERR_GETPLAYERSTATUS_COMINGSOON: + case NLIB_ERR_GETPLAYERSTATUS_NOTFOUND: + case NLIB_ERR_GETPLAYERSTATUS_NOTLOGIN: + case NLIB_ERR_GETPLAYERSTATUS_UNKNOWN: + case NLIB_ERR_GETPLAYERSTATUS_MAINTENANCE: + case NLIB_ERR_GETPLAYERSTATUS_NOT_PERMITTED: + case NLIB_ERR_GETPLAYERSTATUS_REQUIRE_ACCEPT_PRINT_TIMESHIFT_TICKET: + case NLIB_ERR_GETPLAYERSTATUS_TSARCHIVE: + case NLIB_ERR_GETPLAYERSTATUS_USERTIMESHIFT: + case NLIB_ERR_GETPLAYERSTATUS_UNDEFINED: + case NLIB_ERR_GETPLAYERSTATUS_NOAUTH: + case NLIB_ERR_GETPLAYERSTATUS_CHANT_PARSE: + + this->subLiveNoComboBox.AgreeInputLvNo(); + ::MessageBox(NULL,NLIB_GetErrorMessage(code),TEXT("•ú‘—Ú‘±ƒGƒ‰["),MB_ICONERROR | MB_OK); + rslt = FALSE; + break; + + + //‘z’肳‚ê‚Ä‚¢‚È‚¢ƒGƒ‰[ƒR[ƒh + default: - this->subLiveNoComboBox.AgreeInputLvNo(); - UnexpectedErrorMessageShow( TEXT("•ú‘—Ú‘±’†‚É"),NLIB_GetErrorMessage(code),__LINE__,TEXT(__FILE__),TEXT(__FUNCTION__)); - rslt = FALSE; + this->subLiveNoComboBox.AgreeInputLvNo(); + UnexpectedErrorMessageShow( TEXT("•ú‘—Ú‘±’†‚É"),NLIB_GetErrorMessage(code),__LINE__,TEXT(__FILE__),TEXT(__FUNCTION__)); + rslt = FALSE; - break; + break; + + } + } catch(nlib::Exception &e){ + + UnexpectedErrorMessageShow( TEXT("•ú‘—Ú‘±’†‚É"),e.what(),e.getLineNo(),e.getFileName(),e.getFunctionName()); } -- 2.11.0