• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxobjective-ccocoa誰得c#qtrubygamebathyscaphephpgui翻訳windowspythoncomegattwittertestframeworkbtronarduinovb.net計画中(planning stage)directxpreviewerゲームエンジンdom

ギコナビ


Commit MetaInfo

Revision6bd287fdbb18ac10d67b0aef0d1e2d353f904ac8 (tree)
Time2011-11-20 19:24:27
Authorcvs2git <cvs2git>
Commitercvs2git

Log Message

This commit was manufactured by cvs2svn to create branch 'Bb63'.

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>Ú‘±‚ªŽ¸”s‚µ‚Ü‚µ‚½<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; ///ƒMƒRƒiƒrXVƒCƒ“ƒXƒg[ƒ‰ƒpƒX
617617 FUpdateExeArgs: string; ///ƒMƒRƒiƒrXVƒCƒ“ƒXƒg[ƒ‰ˆø”
618618 FKokoPopupThreadItem: TThreadItem;
619+ FCwSave: Word; // 8087CW’l•Û‘¶
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+ // ƒ[ƒŠ„—áŠO‚ÌŒ»Ý‚̐ݒè‚ð•Û‘¶‚·‚é
934+ FCwSave := Get8087CW;
935+ if ( AnsiPos('9.0', GikoSys.GetIEVersion()) = 1 ) then begin
936+ // IE 9‚̏ꍇ‚¾‚¯A–³Œøƒrƒbƒg‚𗧂Ăé
937+ Set8087CW(FCwSave or $0004);
938+ end;
932939 Sort.SetSortDate(Now());
933940
934941 FTreeType := gttNone;
@@ -1833,6 +1840,8 @@ begin
18331840 // ƒAƒbƒvƒf[ƒgŽÀs
18341841 GikoSys.CreateProcess(FUpdateExePath, FUpdateExeArgs);
18351842 end;
1843+ // ƒ[ƒŠ„—áŠO‚ðŒ³‚É–ß‚·
1844+ Set8087CW(FCwSave);
18361845 end;
18371846
18381847 // ŠeŠ‚É‚ ‚éƒLƒƒƒrƒlƒbƒgE BBS ƒƒjƒ…[‚ðƒZƒbƒg^XV
@@ -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/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -4606,7 +4606,7 @@ begin
46064606 end;
46074607 GikoForm.UpdateExePath := '';
46084608 GikoForm.UpdateExeArgs := '';
4609- form := TUpdateCheckForm.Create(Self);
4609+ form := TUpdateCheckForm.Create(GikoForm);
46104610 try
46114611 form.ShowModal;
46124612 shutdown := form.Allowshutdown;
--- 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- // ¶ƒL[•ûŽ®
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 // «—ˆ‚ÌŠg’£—p
503499 Result := '???';
504- end else if Length(convpw) = 0 then begin
505- // ¶ƒL[•ûŽ®ƒGƒ‰[
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+ // ¶ƒL[•ûŽ®
502+ get_pw_salt(pw, convpw, salt);
503+ if Length(convpw) = 0 then begin
504+ // ¶ƒL[•ûŽ®ƒGƒ‰[
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 // V•ûŽ®
511511 StringHashSHA1(digest, pw);
--- a/UpdateCheck.dfm
+++ b/UpdateCheck.dfm
@@ -11,7 +11,7 @@ object UpdateCheckForm: TUpdateCheckForm
1111 Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
1212 Font.Style = []
1313 OldCreateOrder = False
14- Position = poDesktopCenter
14+ Position = poOwnerFormCenter
1515 OnCreate = FormCreate
1616 PixelsPerInch = 96
1717 TextHeight = 12
Binary files a/gikoNavi.res and b/gikoNavi.res differ
--- a/readme/gikoSetup.iss
+++ b/readme/gikoSetup.iss
@@ -9,12 +9,12 @@ DefaultDirName={pf}\gikonavi
99 VersionInfoDescription=ƒMƒRƒiƒrƒZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€
1010 DefaultGroupName=ƒMƒRƒiƒr
1111 ; Ž©•ª‚̊‹«‚ɍ‡‚킹‚Ä‚­‚¾‚³‚¢
12-SourceDir=G:\Release62
12+SourceDir=G:\Release63
1313 OutputDir=G:\InnoSetup\Output
1414 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
1515 ; ƒMƒRƒiƒr‚̃o[ƒWƒ‡ƒ“‚É‚ ‚킹‚Ä‚­‚¾‚³‚¢
16-VersionInfoVersion=1.62.1.813
17-OutputBaseFilename=gikoNavi_b62_setup
16+VersionInfoVersion=1.63.1.819
17+OutputBaseFilename=gikoNavi_b63_setup
1818
1919
2020
--- a/readme/gikoUSetup.iss
+++ b/readme/gikoUSetup.iss
@@ -18,8 +18,8 @@ SourceDir=G:\Release
1818 OutputDir=G:\InnoSetup\Output
1919 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
2020 ; ƒMƒRƒiƒr‚̃o[ƒWƒ‡ƒ“‚É‚ ‚킹‚Ä‚­‚¾‚³‚¢
21-VersionInfoVersion=1.62.1.813
22-OutputBaseFilename=gikoNavi_b62_usetup
21+VersionInfoVersion=1.63.1.819
22+OutputBaseFilename=gikoNavi_b63_819_usetup
2323 CreateUninstallRegKey=no
2424
2525 [Tasks]
--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -1,4 +1,4 @@
1-¡ƒMƒRƒiƒr Version1.00 ÊÞÀ62 Readme.txt
1+¡ƒMƒRƒiƒr Version1.00 ÊÞÀ63 Readme.txt
22
33
44 ------------------------------
@@ -107,6 +107,8 @@ Windows 2000 Professional Edition(SP3) IE5
107107 Windows 2000 Professional Edition(SP3) IE6
108108 Windows Server 2003 Enterprise Edition IE6
109109 Windows Vista IE7
110+Windows Vista IE8
111+Windows 7 IE9
110112
111113 ------------------------------
112114 ’˜ìŒ A‰ü•Ï&Ä”z•z(ˆÈ‰ºu“ñŽŸ”z•zv)‚ɂ‚¢‚Ä
@@ -121,6 +123,12 @@ LICENSE
121123 ------------------------------
122124 —š—ð
123125 ------------------------------
126+2011/11/27
127+ Version ÊÞÀ63
128+ IE9ŠÂ‹«‚Å‚Ì•s‹ï‡‚̏C³
129+ ƒgƒŠƒbƒv12Œ…‚̃vƒŒƒrƒ…[‚ªo—ˆ‚È‚¢•s‹ï‡‚̏C³
130+ ƒIƒtƒ‰ƒCƒ“‚ÌŽž‚ɁA‘—M‚·‚é‚Æ—áŠO‚ª”­¶‚·‚é•s‹ï‡‚̏C³
131+
124132 2011/03/06
125133 Version ÊÞÀ62
126134 ƒŒƒXƒGƒfƒBƒ^‚ł̃gƒŠƒbƒv‚̃vƒŒƒrƒ…[‚Ì•s‹ï‡C³