• R/O
  • HTTP
  • SSH
  • HTTPS

gikonavi: Commit


Commit MetaInfo

Revision3171900c3893f0587a0ae3e6e0bd8dda2ad702cb (tree)
Time2011-10-30 11:48:08
Authorcvs2git <cvs2git>
Commitercvs2git

Log Message

This commit was manufactured by cvs2svn to create tag 'v1_63_0_818'.

Change Summary

Incremental Difference

--- a/Editor.pas
+++ b/Editor.pas
@@ -928,6 +928,14 @@ begin
928928 raise Exception.Create('');
929929 end;
930930 except
931+ on E: EIdSocketError do begin
932+ State := gdsError;
933+ ResponseText := '<html><body>'
934+ + '<div>接続が失敗しました<br>'
935+ + '回線の状態を調べてください<br></div>'
936+ + '<br><br><div>' + E.Message + '</div>'
937+ + '</body></html>';
938+ end;
931939 on E: EIdConnectException do begin
932940 State := gdsError;
933941 ResponseText := '<html><body>'
@@ -962,7 +970,9 @@ begin
962970 finally
963971 Source.Free;
964972 TextStream.Free;
965- Indy.CookieManager.CookieCollection.Clear;
973+ if ( Indy.CookieManager <> nil ) then begin
974+ Indy.CookieManager.CookieCollection.Clear;
975+ end;
966976 //sysMenu := GetSystemMenu( Handle, true );
967977 EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
968978 DrawMenuBar(Handle);
--- a/Giko.pas
+++ b/Giko.pas
@@ -616,6 +616,7 @@ type
616616 FUpdateExePath: string; ///ギコナビ更新インストーラパス
617617 FUpdateExeArgs: string; ///ギコナビ更新インストーラ引数
618618 FKokoPopupThreadItem: TThreadItem;
619+ FCwSave: Word; // 8087CW値保存
619620 procedure DownloadEnd(Sender: TObject; Item: TDownloadItem);
620621 procedure DownloadMsg(Sender: TObject; Item: TDownloadItem; Msg: string; Icon: TGikoMessageIcon);
621622 procedure WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer; const AWorkTitle: string);
@@ -747,7 +748,7 @@ type
747748 property WorkCount: Integer read FWorkCount write FWorkCount;
748749 property UpdateExePath: string read FUpdateExePath write FUpdateExePath;
749750 property UpdateExeArgs: string read FUpdateExeArgs write FUpdateExeArgs;
750-
751+
751752 procedure SetContent(inThread: TBrowserRecord);
752753 function GetActiveContent(popup :Boolean = false): TThreadItem;
753754 function GetActiveList: TObject;
@@ -929,6 +930,12 @@ begin
929930 Writeln('============================================================');
930931 {$ENDIF}
931932 //try
933+ // ゼロ割例外の現在の設定を保存する
934+ FCwSave := Get8087CW;
935+ if ( AnsiPos('9.0', GikoSys.GetIEVersion()) = 1 ) then begin
936+ // IE 9の場合だけ、無効ビットを立てる
937+ Set8087CW(FCwSave or $0004);
938+ end;
932939 Sort.SetSortDate(Now());
933940
934941 FTreeType := gttNone;
@@ -1833,6 +1840,8 @@ begin
18331840 // アップデート実行
18341841 GikoSys.CreateProcess(FUpdateExePath, FUpdateExeArgs);
18351842 end;
1843+ // ゼロ割例外を元に戻す
1844+ Set8087CW(FCwSave);
18361845 end;
18371846
18381847 // 各所にあるキャビネット・ BBS メニューをセット/更新
@@ -2064,7 +2073,7 @@ begin
20642073
20652074 if FResPopupBrowser <> nil then begin
20662075 if not(Sender is TResPopupBrowser) then begin
2067- if (FResPopupBrowser.Visible) then begin
2076+ if ((doc <> nil) and (FResPopupBrowser.Visible)) then begin
20682077 if ResPopupClearTimer.Interval > 0 then begin
20692078 ResPopupClearTimer.Enabled := True;
20702079 ResPopupClearTimer.Tag := 0;
@@ -5284,8 +5293,7 @@ begin
52845293 SenderNode.Selected := False;
52855294 FavoriteDragDrop( SenderNode, Source );
52865295
5287- SetLinkBar;
5288-
5296+ PostMessage( Handle, USER_SETLINKBAR, 0, 0 );
52895297 end;
52905298
52915299 procedure TGikoForm.LinkToolButtonOnMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -276,7 +276,7 @@ const
276276 ZERO_DATE: Integer = 25569;
277277 BETA_VERSION_NAME_E = 'beta';
278278 BETA_VERSION_NAME_J = 'バタ';
279- BETA_VERSION = 62;
279+ BETA_VERSION = 63;
280280 BETA_VERSION_BUILD = ''; //!< debug版など
281281 APP_NAME = 'gikoNavi';
282282 BE_PHP_URL = 'http://be.2ch.net/test/p.php?i=';
--- a/Trip.pas
+++ b/Trip.pas
@@ -494,18 +494,18 @@ begin
494494 Result := '???';
495495 end else begin
496496 convpw := '';
497- // 生キー方式
498- if pw[ 0 ] = '#' then begin
499- get_pw_salt(pw, convpw, salt);
500- end;
501497 if (pw[ 0 ] = '#') and (Length(pw) >= 20) then begin
502498 // 将来の拡張用
503499 Result := '???';
504- end else if Length(convpw) = 0 then begin
505- // 生キー方式エラー
506- Result := '???';
507- end else if Length(convpw) = 8 then begin
508- Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 );
500+ end else if pw[ 0 ] = '#' then begin
501+ // 生キー方式
502+ get_pw_salt(pw, convpw, salt);
503+ if Length(convpw) = 0 then begin
504+ // 生キー方式エラー
505+ Result := '???';
506+ end else if Length(convpw) = 8 then begin
507+ Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 );
508+ end
509509 end else begin
510510 // 新方式
511511 StringHashSHA1(digest, pw);
Binary files a/gikoNavi.res and b/gikoNavi.res differ
--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -1,4 +1,4 @@
1-■ギコナビ Version1.00 バタ62 Readme.txt
1+■ギコナビ Version1.00 バタ63 Readme.txt
22
33
44 ------------------------------
@@ -121,6 +121,9 @@ LICENSE
121121 ------------------------------
122122 履歴
123123 ------------------------------
124+20XX/XX/XX
125+ Version バタ63
126+
124127 2011/03/06
125128 Version バタ62
126129 レスエディタでのトリップのプレビューの不具合修正
Show on old repository browser