OSDN Git Service

This commit was manufactured by cvs2svn to create tag 'v1_63_0_818'. v1_63_0_818
authorcvs2git <cvs2git>
Sun, 30 Oct 2011 02:48:08 +0000 (02:48 +0000)
committercvs2git <cvs2git>
Sun, 30 Oct 2011 02:48:08 +0000 (02:48 +0000)
Editor.pas
Giko.pas
GikoSystem.pas
Trip.pas
gikoNavi.res
readme/readme.txt

index 4258d8d..79c54a4 100644 (file)
@@ -928,6 +928,14 @@ begin
                                raise Exception.Create('');
                        end;
                except
+            on E: EIdSocketError do begin
+                               State := gdsError;
+                               ResponseText := '<html><body>'
+                                                                                       + '<div>\90Ú\91±\82ª\8e¸\94s\82µ\82Ü\82µ\82½<br>'
+                                                                                       + '\89ñ\90ü\82Ì\8fó\91Ô\82ð\92²\82×\82Ä\82­\82¾\82³\82¢<br></div>'
+                                                                                       + '<br><br><div>' + E.Message + '</div>'
+                                                                                       + '</body></html>';
+            end;
                        on E: EIdConnectException do begin
                                State := gdsError;
                                ResponseText := '<html><body>'
@@ -962,7 +970,9 @@ begin
        finally
                Source.Free;
                TextStream.Free;
-        Indy.CookieManager.CookieCollection.Clear;
+        if ( Indy.CookieManager <> nil ) then begin
+            Indy.CookieManager.CookieCollection.Clear;
+        end;
                //sysMenu := GetSystemMenu( Handle, true );
                EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
                DrawMenuBar(Handle);
index c57e798..86fda73 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -616,6 +616,7 @@ type
         FUpdateExePath: string;    ///\83M\83R\83i\83r\8dX\90V\83C\83\93\83X\83g\81[\83\89\83p\83X
         FUpdateExeArgs: string;    ///\83M\83R\83i\83r\8dX\90V\83C\83\93\83X\83g\81[\83\89\88ø\90\94
         FKokoPopupThreadItem: TThreadItem;
+        FCwSave: Word;  // 8087CW\92l\95Û\91
                procedure DownloadEnd(Sender: TObject; Item: TDownloadItem);
                procedure DownloadMsg(Sender: TObject; Item: TDownloadItem; Msg: string; Icon: TGikoMessageIcon);
                procedure WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer; const AWorkTitle: string);
@@ -747,7 +748,7 @@ type
                property WorkCount: Integer read FWorkCount write FWorkCount;
         property UpdateExePath: string read FUpdateExePath write FUpdateExePath;
         property UpdateExeArgs: string read FUpdateExeArgs write FUpdateExeArgs;
-        
+
                procedure SetContent(inThread: TBrowserRecord);
                function GetActiveContent(popup :Boolean = false): TThreadItem;
                function GetActiveList: TObject;
@@ -929,6 +930,12 @@ begin
        Writeln('============================================================');
 {$ENDIF}
 //try
+    // \83[\83\8d\8a\84\97á\8aO\82Ì\8c»\8dÝ\82Ì\90Ý\92è\82ð\95Û\91\82·\82é
+    FCwSave := Get8087CW;
+    if ( AnsiPos('9.0', GikoSys.GetIEVersion()) = 1 ) then begin
+        // IE 9\82Ì\8fê\8d\87\82¾\82¯\81A\96³\8cø\83r\83b\83g\82ð\97§\82Ä\82é
+        Set8087CW(FCwSave or $0004);
+    end;
        Sort.SetSortDate(Now());
 
        FTreeType := gttNone;
@@ -1833,6 +1840,8 @@ begin
         // \83A\83b\83v\83f\81[\83g\8eÀ\8ds
         GikoSys.CreateProcess(FUpdateExePath, FUpdateExeArgs);
     end;
+    // \83[\83\8d\8a\84\97á\8aO\82ð\8c³\82É\96ß\82·
+    Set8087CW(FCwSave);
 end;
 
 // \8ae\8f\8a\82É\82 \82é\83L\83\83\83r\83l\83b\83g\81E BBS \83\81\83j\83\85\81[\82ð\83Z\83b\83g\81^\8dX\90V
@@ -2064,7 +2073,7 @@ begin
 
     if FResPopupBrowser <> nil then begin
         if not(Sender is TResPopupBrowser) then begin
-            if (FResPopupBrowser.Visible) then begin
+            if ((doc <> nil) and (FResPopupBrowser.Visible)) then begin
                 if ResPopupClearTimer.Interval > 0 then begin
                     ResPopupClearTimer.Enabled := True;
                     ResPopupClearTimer.Tag := 0;
@@ -5284,8 +5293,7 @@ begin
        SenderNode.Selected := False;
        FavoriteDragDrop( SenderNode, Source );
 
-       SetLinkBar;
-
+       PostMessage( Handle, USER_SETLINKBAR, 0, 0 );
 end;
 
 procedure TGikoForm.LinkToolButtonOnMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
index 2c1e4d7..b3eef27 100644 (file)
@@ -276,7 +276,7 @@ const
        ZERO_DATE: Integer      = 25569;
        BETA_VERSION_NAME_E = 'beta';
        BETA_VERSION_NAME_J = 'ÊÞÀ';
-       BETA_VERSION                            = 62;
+       BETA_VERSION                            = 63;
        BETA_VERSION_BUILD      = '';                           //!< debug\94Å\82È\82Ç
        APP_NAME                                                = 'gikoNavi';
        BE_PHP_URL = 'http://be.2ch.net/test/p.php?i=';
index 1d6d242..262268f 100644 (file)
--- a/Trip.pas
+++ b/Trip.pas
@@ -494,18 +494,18 @@ begin
             Result := '???';
         end else begin
             convpw := '';
-            // \90\83L\81[\95û\8e®
-            if pw[ 0 ] = '#' then begin
-                get_pw_salt(pw, convpw, salt);
-            end;
             if (pw[ 0 ] = '#') and (Length(pw) >= 20) then begin
                 // \8f«\97\88\82Ì\8ag\92£\97p
                 Result := '???';
-            end else if Length(convpw) = 0 then begin
-                // \90\83L\81[\95û\8e®\83G\83\89\81[
-                Result := '???';
-            end else if Length(convpw) = 8 then begin
-                Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 );
+            end else if pw[ 0 ] = '#' then begin
+                // \90\83L\81[\95û\8e®
+                get_pw_salt(pw, convpw, salt);
+                if Length(convpw) = 0 then begin
+                    // \90\83L\81[\95û\8e®\83G\83\89\81[
+                    Result := '???';
+                end else if Length(convpw) = 8 then begin
+                    Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 );
+                end
             end else begin
                 // \90V\95û\8e®
                 StringHashSHA1(digest, pw);
index 4a6fc8a..57ee091 100644 (file)
Binary files a/gikoNavi.res and b/gikoNavi.res differ
index cb18a6e..2c31b0c 100644 (file)
@@ -1,4 +1,4 @@
-\81¡\83M\83R\83i\83r Version1.00 ÊÞÀ62 Readme.txt
+\81¡\83M\83R\83i\83r Version1.00 ÊÞÀ63 Readme.txt
 
 
 ------------------------------
@@ -121,6 +121,9 @@ LICENSE
 ------------------------------
 \97\9a\97ð
 ------------------------------
+20XX/XX/XX
+  Version ÊÞÀ63
+
 2011/03/06
   Version ÊÞÀ62
   \83\8c\83X\83G\83f\83B\83^\82Å\82Ì\83g\83\8a\83b\83v\82Ì\83v\83\8c\83r\83\85\81[\82Ì\95s\8bï\8d\87\8fC\90³