Browse Source

FIX: Parameter type in WCX.

cobines 15 years ago
parent
commit
941bd3dcdf
4 changed files with 12 additions and 9 deletions
  1. 2 2
      plugins/wcx/zip/src/ZipFunc.pas
  2. 4 1
      sdk/wcxplugin.pas
  3. 4 4
      src/uwcxmodule.pas
  4. 2 2
      src/uwcxprototypes.pas

+ 2 - 2
plugins/wcx/zip/src/ZipFunc.pas

@@ -69,7 +69,7 @@ function PackFilesW(PackedFile: PWideChar;  SubPath: PWideChar;  SrcPath: PWideC
 function DeleteFiles(PackedFile, DeleteList : PChar) : Integer;stdcall;
 function DeleteFiles(PackedFile, DeleteList : PChar) : Integer;stdcall;
 function DeleteFilesW(PackedFile, DeleteList : PWideChar) : Integer;stdcall;
 function DeleteFilesW(PackedFile, DeleteList : PWideChar) : Integer;stdcall;
 function GetPackerCaps : Integer;stdcall;
 function GetPackerCaps : Integer;stdcall;
-procedure ConfigurePacker (Parent: THandle;  DllInstance: THandle);stdcall;
+procedure ConfigurePacker (Parent: HWND;  DllInstance: THandle);stdcall;
 function CanYouHandleThisFile(FileName: PAnsiChar): Boolean; stdcall;
 function CanYouHandleThisFile(FileName: PAnsiChar): Boolean; stdcall;
 function CanYouHandleThisFileW(FileName: PWideChar): Boolean; stdcall;
 function CanYouHandleThisFileW(FileName: PWideChar): Boolean; stdcall;
 {Dialog API function}
 {Dialog API function}
@@ -786,7 +786,7 @@ begin
   //     or PK_CAPS_MEMPACK
   //     or PK_CAPS_MEMPACK
 end;
 end;
 
 
-procedure ConfigurePacker(Parent: THandle; DllInstance: THandle);stdcall;
+procedure ConfigurePacker(Parent: HWND; DllInstance: THandle);stdcall;
 begin
 begin
   CreateZipConfDlg;
   CreateZipConfDlg;
 end;
 end;

+ 4 - 1
sdk/wcxplugin.pas

@@ -79,6 +79,9 @@ const       {Error codes returned to calling application}
 type
 type
   { Unsigned integer with pointer size }
   { Unsigned integer with pointer size }
   TArcHandle = {$IFDEF CPU64}QWord{$ELSE}LongWord{$ENDIF};
   TArcHandle = {$IFDEF CPU64}QWord{$ELSE}LongWord{$ENDIF};
+  {$IFNDEF LCL}
+  HWND = type PtrUInt; // Defined as in LCL
+  {$ENDIF}
 
 
 const
 const
   wcxInvalidHandle = TArcHandle(-1);
   wcxInvalidHandle = TArcHandle(-1);
@@ -198,4 +201,4 @@ implementation
 
 
 end.
 end.
 
 
-
+

+ 4 - 4
src/uwcxmodule.pas

@@ -28,8 +28,8 @@ unit uWCXmodule;
 interface
 interface
 
 
 uses
 uses
-  uWCXprototypes, WcxPlugin, dynlibs, Classes, Dialogs, DialogAPI, uClassesEx,
-  uTypes, uXmlConfig;
+  LCLType, Classes, Dialogs, dynlibs,
+  uWCXprototypes, WcxPlugin, DialogAPI, uClassesEx, uTypes, uXmlConfig;
 
 
 Type
 Type
   TWCXOperation = (OP_EXTRACT, OP_PACK, OP_DELETE);
   TWCXOperation = (OP_EXTRACT, OP_PACK, OP_DELETE);
@@ -124,7 +124,7 @@ Type
     function LoadModule(const sName:String):Boolean; {Load WCX plugin}
     function LoadModule(const sName:String):Boolean; {Load WCX plugin}
     procedure UnloadModule;                          {UnLoad WCX plugin}
     procedure UnloadModule;                          {UnLoad WCX plugin}
 
 
-    procedure VFSConfigure(Parent: THandle);
+    procedure VFSConfigure(Parent: HWND);
     function GetPluginCapabilities: Integer;
     function GetPluginCapabilities: Integer;
 
 
     function IsLoaded: Boolean;
     function IsLoaded: Boolean;
@@ -467,7 +467,7 @@ begin
   end;
   end;
 end;
 end;
 
 
-procedure TWCXModule.VFSConfigure(Parent: THandle);
+procedure TWCXModule.VFSConfigure(Parent: HWND);
 begin
 begin
   if Assigned(ConfigurePacker) then
   if Assigned(ConfigurePacker) then
     ConfigurePacker(Parent, FModuleHandle);
     ConfigurePacker(Parent, FModuleHandle);

+ 2 - 2
src/uwcxprototypes.pas

@@ -16,7 +16,7 @@ type
   TPackFiles = function (PackedFile: pchar;  SubPath: pchar;  SrcPath: pchar;  AddList: pchar;  Flags: integer): integer;stdcall;
   TPackFiles = function (PackedFile: pchar;  SubPath: pchar;  SrcPath: pchar;  AddList: pchar;  Flags: integer): integer;stdcall;
   TDeleteFiles = function (PackedFile: pchar;  DeleteList: pchar): integer;stdcall;
   TDeleteFiles = function (PackedFile: pchar;  DeleteList: pchar): integer;stdcall;
   TGetPackerCaps = function () : integer;stdcall;
   TGetPackerCaps = function () : integer;stdcall;
-  TConfigurePacker = procedure (Parent: THandle;  DllInstance: THandle);stdcall;
+  TConfigurePacker = procedure (Parent: HWND;  DllInstance: THandle);stdcall;
   TSetChangeVolProc = procedure (hArcData: TArcHandle;  ChangeVolProc: tChangeVolProc);stdcall;
   TSetChangeVolProc = procedure (hArcData: TArcHandle;  ChangeVolProc: tChangeVolProc);stdcall;
   TSetProcessDataProc = procedure (hArcData: TArcHandle;  ProcessDataProc: TProcessDataProc);stdcall;
   TSetProcessDataProc = procedure (hArcData: TArcHandle;  ProcessDataProc: TProcessDataProc);stdcall;
   TStartMemPack = function (Options: integer;  FileName: pchar): integer;stdcall;
   TStartMemPack = function (Options: integer;  FileName: pchar): integer;stdcall;
@@ -41,4 +41,4 @@ type
 implementation
 implementation
 
 
 end.
 end.
-
+