gikonavi
Fork

提交

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

--- a/Editor.pas

+++ b/Editor.pas

		@@ -928,6 +928,14 @@ begin
928	928	raise Exception.Create('');
929	929	end;
930	930	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;
931	939	on E: EIdConnectException do begin
932	940	State := gdsError;
933	941	ResponseText := '<html><body>'

		@@ -962,7 +970,9 @@ begin
962	970	finally
963	971	Source.Free;
964	972	TextStream.Free;
965		- Indy.CookieManager.CookieCollection.Clear;
	973	+ if ( Indy.CookieManager <> nil ) then begin
	974	+ Indy.CookieManager.CookieCollection.Clear;
	975	+ end;
966	976	//sysMenu := GetSystemMenu( Handle, true );
967	977	EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
968	978	DrawMenuBar(Handle);

--- a/Giko.pas

+++ b/Giko.pas

		@@ -616,6 +616,7 @@ type
616	616	FUpdateExePath: string; ///MRirXVCXg[pX
617	617	FUpdateExeArgs: string; ///MRirXVCXg[ø
618	618	FKokoPopupThreadItem: TThreadItem;
	619	+ FCwSave: Word; // 8087CWlÛ¶
619	620	procedure DownloadEnd(Sender: TObject; Item: TDownloadItem);
620	621	procedure DownloadMsg(Sender: TObject; Item: TDownloadItem; Msg: string; Icon: TGikoMessageIcon);
621	622	procedure WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer; const AWorkTitle: string);

		@@ -747,7 +748,7 @@ type
747	748	property WorkCount: Integer read FWorkCount write FWorkCount;
748	749	property UpdateExePath: string read FUpdateExePath write FUpdateExePath;
749	750	property UpdateExeArgs: string read FUpdateExeArgs write FUpdateExeArgs;
750		-
	751	+
751	752	procedure SetContent(inThread: TBrowserRecord);
752	753	function GetActiveContent(popup :Boolean = false): TThreadItem;
753	754	function GetActiveList: TObject;

		@@ -929,6 +930,12 @@ begin
929	930	Writeln('============================================================');
930	931	{$ENDIF}
931	932	//try
	933	+ // [áOÌ»ÝÌÝèðÛ¶·é
	934	+ FCwSave := Get8087CW;
	935	+ if ( AnsiPos('9.0', GikoSys.GetIEVersion()) = 1 ) then begin
	936	+ // IE 9Ìê¾¯A³ørbgð§Äé
	937	+ Set8087CW(FCwSave or $0004);
	938	+ end;
932	939	Sort.SetSortDate(Now());
933	940
934	941	FTreeType := gttNone;

		@@ -1833,6 +1840,8 @@ begin
1833	1840	// Abvf[gÀs
1834	1841	GikoSys.CreateProcess(FUpdateExePath, FUpdateExeArgs);
1835	1842	end;
	1843	+ // [áOð³Éß·
	1844	+ Set8087CW(FCwSave);
1836	1845	end;
1837	1846
1838	1847	// eÉ éLrlbgE BBS j[ðZbg^XV

		@@ -2064,7 +2073,7 @@ begin
2064	2073
2065	2074	if FResPopupBrowser <> nil then begin
2066	2075	if not(Sender is TResPopupBrowser) then begin
2067		- if (FResPopupBrowser.Visible) then begin
	2076	+ if ((doc <> nil) and (FResPopupBrowser.Visible)) then begin
2068	2077	if ResPopupClearTimer.Interval > 0 then begin
2069	2078	ResPopupClearTimer.Enabled := True;
2070	2079	ResPopupClearTimer.Tag := 0;

		@@ -5284,8 +5293,7 @@ begin
5284	5293	SenderNode.Selected := False;
5285	5294	FavoriteDragDrop( SenderNode, Source );
5286	5295
5287		- SetLinkBar;
5288		-
	5296	+ PostMessage( Handle, USER_SETLINKBAR, 0, 0 );
5289	5297	end;
5290	5298
5291	5299	procedure TGikoForm.LinkToolButtonOnMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);

--- a/GikoSystem.pas

+++ b/GikoSystem.pas

		@@ -276,7 +276,7 @@ const
276	276	ZERO_DATE: Integer = 25569;
277	277	BETA_VERSION_NAME_E = 'beta';
278	278	BETA_VERSION_NAME_J = 'ÊÞÀ';
279		- BETA_VERSION = 62;
	279	+ BETA_VERSION = 63;
280	280	BETA_VERSION_BUILD = ''; //!< debugÅÈÇ
281	281	APP_NAME = 'gikoNavi';
282	282	BE_PHP_URL = 'http://be.2ch.net/test/p.php?i=';

--- a/Trip.pas

+++ b/Trip.pas

		@@ -494,18 +494,18 @@ begin
494	494	Result := '???';
495	495	end else begin
496	496	convpw := '';
497		- // ¶L[û®
498		- if pw[ 0 ] = '#' then begin
499		- get_pw_salt(pw, convpw, salt);
500		- end;
501	497	if (pw[ 0 ] = '#') and (Length(pw) >= 20) then begin
502	498	// «Ìg£p
503	499	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
509	509	end else begin
510	510	// Vû®
511	511	StringHashSHA1(digest, pw);

Binary files a/gikoNavi.res and b/gikoNavi.res differ

--- a/readme/readme.txt

+++ b/readme/readme.txt