22101

手でパッチ打ち込みしたんで、ひょっとしたら書式がおかしいかもしれません(笑 by Heracules。

shuusei22101:Delphi 6環境でコンパイルするための変更

diff --dos -urN original/handler.pas handler.pas
--- original/handler.pas    Mon Oct 10 14:52:26 2002
+++ handler.pas Mon Oct 21 15:10:12 2002
@@ -529,9 +529,9 @@
      begin
        tmp_pos:=1204;
        dec(local_files,usr.data^.shared);
-       dec(local_bytes,Int64(usr.shared_size));
+       dec(local_bytes,usr.shared_size);
        dec(total_files,usr.data^.shared);
-       dec(total_bytes,Int64(usr.shared_size));
+       dec(total_bytes,usr.shared_size);
        tmp_pos:=1205;
        usr.shared_size:=0;
        usr.shared_mp3:=0;
@@ -2403,8 +2403,8 @@
  begin
   if local.shared<>nil then
   begin
-   dec(total_bytes,Int64(local.shared_size));
-   dec(local_bytes,Int64(local.shared_size));
+   dec(total_bytes,local.shared_size);
+   dec(local_bytes,local.shared_size);
    dec(total_files,local.shared.count);
    dec(local_files,local.shared.count);
    local.shared.Clear;
diff --dos -urN original/mainform.pas mainform.pas
--- original/mainform.pas    Mon Oct 10 18:01:34 2002
+++ mainform.pas   Mon Oct 21 15:17:34 2002
@@ -27,7 +27,7 @@
   inifiles, ShellApi, RXShell, ImgList, OfficeToolBar, Menus, winsock,
   OfficeButtons, OfficeControls, OfficeEdit, clipbrd, channelform, chatform,
   stypes, basecombo, ComboBox, whoisform, slavastrings, mmsystem,
-  Buttons, class_cmdlist, class_cmdexlist, class_doublecmdlist, Pages;
+  Buttons, class_cmdlist, class_cmdexlist, class_doublecmdlist, DFWPages;
 
 type
   TSlavaNapWindow = class(TForm)
diff --dos -urN original/Rxshell.pas Rxshell.pas
--- original/Rxshell.pas	Sat Jan 12 13:28:16 2002
+++ Rxshell.pas	Mon Oct 21 15:24:06 2002
@@ -371,7 +371,7 @@
 constructor TRxTrayIcon.Create(AOwner: Tcomponent);
 begin
   inherited Create(AOwner);
-  FHandle := AllocateHWnd(WndProc);
+  FHandle := Classes.AllocateHWnd(WndProc);
   FIcon := TIcon.Create;
   FIcon.OnChange := IconChanged;
   FIconList := TIconList.Create;
@@ -390,7 +390,7 @@
   FIcon.OnChange := nil;
   SetAnimated(False);
   Deactivate;
-  DeallocateHWnd(FHandle);
+  Classes.DeallocateHWnd(FHandle);
   FIcon.Free;
   FIcon := nil;
   FIconList.Free;
diff --dos -urN original/settings.pas settings.pas
--- original/settings.pas	Mon Oct 10 18:49:40 2002
+++ settings.pas	Mon Oct 21 15:29:12
@@ -22,7 +22,7 @@
 uses
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
   ExtCtrls, OfficePanel, ComCtrls, StdCtrls, inifiles, registry,
-  SpectrumCombo, ShellApi, Buttons, Spin, basecombo, Pages;
+  SpectrumCombo, ShellApi, Buttons, Spin, basecombo, DFWPages;
 
 type
   TSlavaNapSettings = class(TForm)
diff --dos -urN original/setupform.pas setupform.pas
--- original\setupform.pas	Sun Jul 07 23:14:14 2002
+++ setupform.pas	Mon Oct 21 15:44:56 2002
@@ -21,7 +21,7 @@
 
 uses
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  ComCtrls, StdCtrls, inifiles, constants, vars, stypes, Pages;
+  ComCtrls, StdCtrls, inifiles, constants, vars, stypes, DFWPages;
 
 type
   TSlavaNapSetup = class(TForm)
diff --dos -urN original/slavamasks.pas slavamasks.pas
--- original/slavamasks.pas	Sat Apr 06 18:43:30 2002
+++ slavamasks.pas	Mon Oct 21 15:48:06 2002
@@ -38,7 +38,7 @@
 
 implementation
 
-uses SysUtils, webconst, vars;
+uses SysUtils, RtlConsts, vars;
 
 const
   MaxCards = 30;
diff --dos -urN original/SlavaSplitter.pas SlavaSplitter.pas
--- original/SlavaSplitter.pas	Tue Jun 05 13:09:52 2001
+++ SlavaSplitter.pas	Mon Oct 21 15:42:06 2002
@@ -83,7 +83,7 @@
     procedure SetBmUp(Value: TBitmap);
     procedure SetBmUpOver(Value: TBitmap);
   protected
-    function CanResize(var NewSize: Integer): Boolean; {reintroduce; }virtual;
+    function CanResize(var NewSize: Integer): Boolean; reintroduce; {virtual;}
     function DoCanResize(var NewSize: Integer): Boolean; virtual;
     procedure MouseDown(Button: TMouseButton; Shift: TShiftState;
       X, Y: Integer); override;
@@ -91,7 +91,7 @@
     procedure MouseUp(Button: TMouseButton; Shift: TShiftState;
       X, Y: Integer); override;
     procedure Paint; override;
-    procedure RequestAlign; {$IFDEF VER120}override;{$ENDIF}
+    procedure RequestAlign; {$IFDEF VER140}override;{$ENDIF}
     procedure StopSizing; dynamic;
 
     function MouseInHandle: Boolean;
@@ -236,7 +236,6 @@
   I: Integer;
   R: TRect;
 begin
-  Result := nil;
   P := Point(Left, Top);
   case aDirection of
     diLeft   : Dec(p.x);
@@ -292,7 +291,6 @@
 var
   R: TRect;
   bm: TBitmap;
-  i,j,k,l:Integer;
 begin
   R := ClientRect;
   with Canvas
@@ -826,8 +824,6 @@
 end;
 
 function TSlavaSplitter.isValidBitmap(bmp:TBitmap):Boolean;
-var
- i:Integer;
 begin
  isValidBitmap:=false;
  if bmp=nil then exit;
diff --dos -urN original/ZLIB.pas ZLIB.pas
--- original/ZLIB.pas	Fri Feb 01 22:01:10 2002
+++ ZLIB.pas	Mon Oct 21 15:44:12 2002
@@ -263,7 +263,6 @@
 
 procedure zcfree(opaque, block: Pointer);
 begin
-  Finalize(block^);
   FreeMem(block);
 end;
 
@@ -362,7 +361,6 @@
     ReallocMem(outBuffer,zstream.total_out);
     outSize := zstream.total_out;
   except
-   Finalize(outBuffer^);
     FreeMem(outBuffer);
     raise;
   end;
@@ -407,7 +405,6 @@
     ReallocMem(outBuffer,zstream.total_out);
     outSize := zstream.total_out;
   except
-    Finalize(outBuffer^);
     FreeMem(outBuffer);
     raise;
   end;
@@ -423,7 +420,6 @@
   SetLength(result,size);
   Move(buffer^,result[1],size);
 
-  Finalize(buffer^);
   FreeMem(buffer);
 end;
 
@@ -437,7 +433,6 @@
   SetLength(result,size);
   Move(buffer^,result[1],size);
 
-  Finalize(buffer^);
   FreeMem(buffer);
 end;