From 96d1f229b50eb1632a985f0f0f9f7c2bf9b29a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Mon, 6 Mar 2023 14:58:00 +0100 Subject: [PATCH] * Dotted filenames for package cdrom --- packages/cdrom/namespaced/System.CdRom.Cddb.pp | 3 +++ packages/cdrom/namespaced/System.CdRom.DiscId.pp | 3 +++ packages/cdrom/namespaced/System.CdRom.Linux.pp | 3 +++ packages/cdrom/namespaced/System.CdRom.Major.pp | 3 +++ packages/cdrom/namespaced/System.CdRom.ScsiDefs.pp | 3 +++ .../cdrom/namespaced/System.CdRom.Windows.Aspi32.pp | 3 +++ .../cdrom/namespaced/System.CdRom.Windows.IoCtl.pp | 3 +++ packages/cdrom/namespaced/System.CdRom.Windows.pp | 3 +++ packages/cdrom/namespaced/System.CdRom.pp | 3 +++ packages/cdrom/namespaces.lst | 11 +++++++++++ packages/cdrom/src/cdrom.pp | 2 ++ packages/cdrom/src/cdromioctl.pp | 6 ++++++ packages/cdrom/src/cdromlin.inc | 7 +++++++ packages/cdrom/src/cdromw32.inc | 5 ++++- packages/cdrom/src/discid.pp | 6 ++++++ packages/cdrom/src/fpcddb.pp | 7 +++++++ packages/cdrom/src/lincd.pp | 12 ++++++++++++ packages/cdrom/src/major.pp | 2 ++ packages/cdrom/src/scsidefs.pp | 2 ++ packages/cdrom/src/wincd.pp | 10 ++++++++++ packages/cdrom/src/wnaspi32.pp | 10 ++++++++++ 21 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 packages/cdrom/namespaced/System.CdRom.Cddb.pp create mode 100644 packages/cdrom/namespaced/System.CdRom.DiscId.pp create mode 100644 packages/cdrom/namespaced/System.CdRom.Linux.pp create mode 100644 packages/cdrom/namespaced/System.CdRom.Major.pp create mode 100644 packages/cdrom/namespaced/System.CdRom.ScsiDefs.pp create mode 100644 packages/cdrom/namespaced/System.CdRom.Windows.Aspi32.pp create mode 100644 packages/cdrom/namespaced/System.CdRom.Windows.IoCtl.pp create mode 100644 packages/cdrom/namespaced/System.CdRom.Windows.pp create mode 100644 packages/cdrom/namespaced/System.CdRom.pp create mode 100644 packages/cdrom/namespaces.lst diff --git a/packages/cdrom/namespaced/System.CdRom.Cddb.pp b/packages/cdrom/namespaced/System.CdRom.Cddb.pp new file mode 100644 index 0000000000..b8342e1d09 --- /dev/null +++ b/packages/cdrom/namespaced/System.CdRom.Cddb.pp @@ -0,0 +1,3 @@ +unit System.CdRom.Cddb; +{$DEFINE FPC_DOTTEDUNITS} +{$i fpcddb.pp} diff --git a/packages/cdrom/namespaced/System.CdRom.DiscId.pp b/packages/cdrom/namespaced/System.CdRom.DiscId.pp new file mode 100644 index 0000000000..9bc49e9f9e --- /dev/null +++ b/packages/cdrom/namespaced/System.CdRom.DiscId.pp @@ -0,0 +1,3 @@ +unit System.CdRom.DiscId; +{$DEFINE FPC_DOTTEDUNITS} +{$i discid.pp} diff --git a/packages/cdrom/namespaced/System.CdRom.Linux.pp b/packages/cdrom/namespaced/System.CdRom.Linux.pp new file mode 100644 index 0000000000..11df0a3f86 --- /dev/null +++ b/packages/cdrom/namespaced/System.CdRom.Linux.pp @@ -0,0 +1,3 @@ +unit System.CdRom.Linux; +{$DEFINE FPC_DOTTEDUNITS} +{$i lincd.pp} diff --git a/packages/cdrom/namespaced/System.CdRom.Major.pp b/packages/cdrom/namespaced/System.CdRom.Major.pp new file mode 100644 index 0000000000..95928a0d3a --- /dev/null +++ b/packages/cdrom/namespaced/System.CdRom.Major.pp @@ -0,0 +1,3 @@ +unit System.CdRom.Major; +{$DEFINE FPC_DOTTEDUNITS} +{$i major.pp} diff --git a/packages/cdrom/namespaced/System.CdRom.ScsiDefs.pp b/packages/cdrom/namespaced/System.CdRom.ScsiDefs.pp new file mode 100644 index 0000000000..31fd6843d1 --- /dev/null +++ b/packages/cdrom/namespaced/System.CdRom.ScsiDefs.pp @@ -0,0 +1,3 @@ +unit System.CdRom.ScsiDefs; +{$DEFINE FPC_DOTTEDUNITS} +{$i scsidefs.pp} diff --git a/packages/cdrom/namespaced/System.CdRom.Windows.Aspi32.pp b/packages/cdrom/namespaced/System.CdRom.Windows.Aspi32.pp new file mode 100644 index 0000000000..b1f838b99e --- /dev/null +++ b/packages/cdrom/namespaced/System.CdRom.Windows.Aspi32.pp @@ -0,0 +1,3 @@ +unit System.CdRom.Windows.Aspi32; +{$DEFINE FPC_DOTTEDUNITS} +{$i wnaspi32.pp} diff --git a/packages/cdrom/namespaced/System.CdRom.Windows.IoCtl.pp b/packages/cdrom/namespaced/System.CdRom.Windows.IoCtl.pp new file mode 100644 index 0000000000..d6e48b11a2 --- /dev/null +++ b/packages/cdrom/namespaced/System.CdRom.Windows.IoCtl.pp @@ -0,0 +1,3 @@ +unit System.CdRom.Windows.IoCtl; +{$DEFINE FPC_DOTTEDUNITS} +{$i cdromioctl.pp} diff --git a/packages/cdrom/namespaced/System.CdRom.Windows.pp b/packages/cdrom/namespaced/System.CdRom.Windows.pp new file mode 100644 index 0000000000..04a41c5787 --- /dev/null +++ b/packages/cdrom/namespaced/System.CdRom.Windows.pp @@ -0,0 +1,3 @@ +unit System.CdRom.Windows; +{$DEFINE FPC_DOTTEDUNITS} +{$i wincd.pp} diff --git a/packages/cdrom/namespaced/System.CdRom.pp b/packages/cdrom/namespaced/System.CdRom.pp new file mode 100644 index 0000000000..5aa5b75f65 --- /dev/null +++ b/packages/cdrom/namespaced/System.CdRom.pp @@ -0,0 +1,3 @@ +unit System.CdRom; +{$DEFINE FPC_DOTTEDUNITS} +{$i cdrom.pp} diff --git a/packages/cdrom/namespaces.lst b/packages/cdrom/namespaces.lst new file mode 100644 index 0000000000..41aa2ad799 --- /dev/null +++ b/packages/cdrom/namespaces.lst @@ -0,0 +1,11 @@ +src/fpcddb.pp=namespaced/System.CdRom.Cddb.pp +{s*:src/}=namespaced/ +{i+:src/} +src/wincd.pp=namespaced/System.CdRom.Windows.pp +src/cdrom.pp=namespaced/System.CdRom.pp +src/scsidefs.pp=namespaced/System.CdRom.ScsiDefs.pp +src/major.pp=namespaced/System.CdRom.Major.pp +src/lincd.pp=namespaced/System.CdRom.Linux.pp +src/cdromioctl.pp=namespaced/System.CdRom.Windows.IoCtl.pp +src/wnaspi32.pp=namespaced/System.CdRom.Windows.Aspi32.pp +src/discid.pp=namespaced/System.CdRom.DiscId.pp diff --git a/packages/cdrom/src/cdrom.pp b/packages/cdrom/src/cdrom.pp index 3c6e362932..fff4570b4c 100644 --- a/packages/cdrom/src/cdrom.pp +++ b/packages/cdrom/src/cdrom.pp @@ -11,7 +11,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. **********************************************************************} +{$IFNDEF FPC_DOTTEDUNITS} unit cdrom; +{$ENDIF} {$mode objfpc} {$h+} diff --git a/packages/cdrom/src/cdromioctl.pp b/packages/cdrom/src/cdromioctl.pp index 70fa8da351..9fdd7b5e74 100644 --- a/packages/cdrom/src/cdromioctl.pp +++ b/packages/cdrom/src/cdromioctl.pp @@ -1,8 +1,14 @@ +{$IFNDEF FPC_DOTTEDUNITS} unit cdromioctl; +{$ENDIF FPC_DOTTEDUNITS} {$mode objfpc} interface +{$IFDEF FPC_DOTTEDUNITS} +uses WinApi.Windows; +{$ELSE FPC_DOTTEDUNITS} uses windows; +{$ENDIF FPC_DOTTEDUNITS} { Automatically converted by H2Pas 0.99.15 from cdromioctl.h diff --git a/packages/cdrom/src/cdromlin.inc b/packages/cdrom/src/cdromlin.inc index 323a8a4e88..18219da351 100644 --- a/packages/cdrom/src/cdromlin.inc +++ b/packages/cdrom/src/cdromlin.inc @@ -1,7 +1,14 @@ +{$IFDEF FPC_DOTTEDUNITS} +uses + UnixApi.Base, + UnixApi.Unix, + System.CdRom.Linux; +{$ELSE} uses baseunix, unix, lincd; +{$ENDIF} Function ReadCDTOC(Device : AnsiString; Var CDTOC : Array of TTocEntry) : Integer; diff --git a/packages/cdrom/src/cdromw32.inc b/packages/cdrom/src/cdromw32.inc index f378d9db4a..86e2083a51 100644 --- a/packages/cdrom/src/cdromw32.inc +++ b/packages/cdrom/src/cdromw32.inc @@ -1,5 +1,8 @@ +{$IFDEF FPC_DOTTEDUNITS} +uses System.CdRom.Windows; +{$ELSE} uses wincd; - +{$ENDIF} Function ReadCDTOC(Device : AnsiString; Var CDTOC : Array of TTocEntry) : Integer; diff --git a/packages/cdrom/src/discid.pp b/packages/cdrom/src/discid.pp index 30103e5e44..f2387a858c 100644 --- a/packages/cdrom/src/discid.pp +++ b/packages/cdrom/src/discid.pp @@ -12,13 +12,19 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. **********************************************************************} +{$IFNDEF FPC_DOTTEDUNITS} unit discid; +{$ENDIF FPC_DOTTEDUNITS} {$mode objfpc} interface +{$IFDEF FPC_DOTTEDUNITS} +uses System.CdRom,System.SysUtils; +{$ELSE FPC_DOTTEDUNITS} uses cdrom,sysutils; +{$ENDIF FPC_DOTTEDUNITS} Function CDDBDiscID(Const CDTOC : Array of TTocEntry; Count : Integer) : integer ; Function GetCDDBQueryString(Const Tracks : Array of TTocEntry; Count : Integer) : AnsiString; diff --git a/packages/cdrom/src/fpcddb.pp b/packages/cdrom/src/fpcddb.pp index 83417f9ab9..0b67e6893f 100644 --- a/packages/cdrom/src/fpcddb.pp +++ b/packages/cdrom/src/fpcddb.pp @@ -24,14 +24,21 @@ } +{$IFNDEF FPC_DOTTEDUNITS} unit fpcddb; +{$ENDIF FPC_DOTTEDUNITS} {$mode objfpc}{$H+} interface +{$IFDEF FPC_DOTTEDUNITS} +uses + System.Classes, System.SysUtils; +{$ELSE FPC_DOTTEDUNITS} uses Classes, SysUtils; +{$ENDIF FPC_DOTTEDUNITS} Type TCDDisk = Class; diff --git a/packages/cdrom/src/lincd.pp b/packages/cdrom/src/lincd.pp index 72a0c247a6..339e16170f 100644 --- a/packages/cdrom/src/lincd.pp +++ b/packages/cdrom/src/lincd.pp @@ -11,15 +11,23 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. **********************************************************************} +{$IFNDEF FPC_DOTTEDUNITS} unit lincd; +{$ENDIF FPC_DOTTEDUNITS} {$mode objfpc} interface +{$IFDEF FPC_DOTTEDUNITS} +uses + UnixApi.Base, + UnixApi.Unix; +{$ELSE FPC_DOTTEDUNITS} uses baseunix, unix; +{$ENDIF FPC_DOTTEDUNITS} { --------------------------------------------------------------------- cdrom.h header translation. @@ -721,7 +729,11 @@ Function DetectCd : AnsiString; implementation +{$IFDEF FPC_DOTTEDUNITS} +uses System.CDROM.Major,System.SysUtils; +{$ELSE FPC_DOTTEDUNITS} uses major,sysutils; +{$ENDIF FPC_DOTTEDUNITS} { --------------------------------------------------------------------- Functions from cdrom.h translation. diff --git a/packages/cdrom/src/major.pp b/packages/cdrom/src/major.pp index 4830d95722..fa38126d36 100644 --- a/packages/cdrom/src/major.pp +++ b/packages/cdrom/src/major.pp @@ -1,4 +1,6 @@ +{$IFNDEF FPC_DOTTEDUNITS} unit major; +{$ENDIF FPC_DOTTEDUNITS} interface { diff --git a/packages/cdrom/src/scsidefs.pp b/packages/cdrom/src/scsidefs.pp index 80d10ea04c..8736545cdc 100644 --- a/packages/cdrom/src/scsidefs.pp +++ b/packages/cdrom/src/scsidefs.pp @@ -1,4 +1,6 @@ +{$IFNDEF FPC_DOTTEDUNITS} unit scsidefs; +{$ENDIF FPC_DOTTEDUNITS} interface diff --git a/packages/cdrom/src/wincd.pp b/packages/cdrom/src/wincd.pp index 6ef73a3226..b4a93c6d9a 100644 --- a/packages/cdrom/src/wincd.pp +++ b/packages/cdrom/src/wincd.pp @@ -1,13 +1,19 @@ { } +{$IFNDEF FPC_DOTTEDUNITS} unit WinCD; +{$ENDIF FPC_DOTTEDUNITS} {$mode objfpc} {$h+} interface +{$IFDEF FPC_DOTTEDUNITS} +uses WinApi.Windows,System.SysUtils; +{$ELSE FPC_DOTTEDUNITS} uses Windows,SysUtils; +{$ENDIF FPC_DOTTEDUNITS} Type TCDAccessMethod = (camNone,camASPI,camSPTI,camIOCTL); @@ -39,7 +45,11 @@ Function GetNumDrives : Integer; implementation +{$IFDEF FPC_DOTTEDUNITS} +uses System.CdRom.Windows.IoCtl, System.CdRom.Windows.Aspi32, System.CdRom.ScsiDefs; +{$ELSE FPC_DOTTEDUNITS} uses cdromioctl,wnaspi32,scsidefs; +{$ENDIF FPC_DOTTEDUNITS} Var CurrentAccessMethod : TCDAccessMethod; diff --git a/packages/cdrom/src/wnaspi32.pp b/packages/cdrom/src/wnaspi32.pp index f00d578d24..8558c8d707 100644 --- a/packages/cdrom/src/wnaspi32.pp +++ b/packages/cdrom/src/wnaspi32.pp @@ -1,10 +1,16 @@ +{$IFNDEF FPC_DOTTEDUNITS} unit wnaspi32; +{$ENDIF FPC_DOTTEDUNITS} {$mode objfpc} interface +{$IFDEF FPC_DOTTEDUNITS} +uses WinApi.Windows; +{$ELSE FPC_DOTTEDUNITS} uses Windows; +{$ENDIF FPC_DOTTEDUNITS} type LPSRB = Pointer; @@ -218,7 +224,11 @@ procedure UnloadASPI; implementation +{$IFDEF FPC_DOTTEDUNITS} +uses System.DynLibs; +{$ELSE FPC_DOTTEDUNITS} uses dynlibs; +{$ENDIF FPC_DOTTEDUNITS} const HWNASPI : TLibHandle = 0;