* Dotted filenames for package fcl-registry

This commit is contained in:
Michaël Van Canneyt 2023-03-06 14:57:57 +01:00
parent 6593231fe4
commit 1095433a37
8 changed files with 54 additions and 21 deletions

View File

@ -0,0 +1,3 @@
unit System.Registry;
{$DEFINE FPC_DOTTEDUNITS}
{$i registry.pp}

View File

@ -0,0 +1,3 @@
unit System.Xmlreg;
{$DEFINE FPC_DOTTEDUNITS}
{$i xmlreg.pp}

View File

@ -0,0 +1,4 @@
src/registry.pp=namespaced/System.Registry.pp
{s*:src/}=namespaced/
{i+:src/}
src/xmlreg.pp=namespaced/System.Xmlreg.pp

View File

@ -23,27 +23,27 @@ Type
{ Direct mapping to constants in Windows unit }
Const
HKEY_CLASSES_ROOT = Windows.HKEY_CLASSES_ROOT;
HKEY_CURRENT_USER = Windows.HKEY_CURRENT_USER;
HKEY_LOCAL_MACHINE = Windows.HKEY_LOCAL_MACHINE;
HKEY_USERS = Windows.HKEY_USERS;
HKEY_PERFORMANCE_DATA = Windows.HKEY_PERFORMANCE_DATA;
HKEY_CURRENT_CONFIG = Windows.HKEY_CURRENT_CONFIG;
HKEY_DYN_DATA = Windows.HKEY_DYN_DATA;
HKEY_CLASSES_ROOT = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.HKEY_CLASSES_ROOT;
HKEY_CURRENT_USER = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.HKEY_CURRENT_USER;
HKEY_LOCAL_MACHINE = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.HKEY_LOCAL_MACHINE;
HKEY_USERS = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.HKEY_USERS;
HKEY_PERFORMANCE_DATA = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.HKEY_PERFORMANCE_DATA;
HKEY_CURRENT_CONFIG = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.HKEY_CURRENT_CONFIG;
HKEY_DYN_DATA = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.HKEY_DYN_DATA;
KEY_ALL_ACCESS = Windows.KEY_ALL_ACCESS;
KEY_CREATE_LINK = Windows.KEY_CREATE_LINK;
KEY_CREATE_SUB_KEY = Windows.KEY_CREATE_SUB_KEY;
KEY_ENUMERATE_SUB_KEYS = Windows.KEY_ENUMERATE_SUB_KEYS;
KEY_EXECUTE = Windows.KEY_EXECUTE;
KEY_NOTIFY = Windows.KEY_NOTIFY;
KEY_QUERY_VALUE = Windows.KEY_QUERY_VALUE;
KEY_READ = Windows.KEY_READ;
KEY_SET_VALUE = Windows.KEY_SET_VALUE;
KEY_WRITE = Windows.KEY_WRITE;
KEY_ALL_ACCESS = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.KEY_ALL_ACCESS;
KEY_CREATE_LINK = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.KEY_CREATE_LINK;
KEY_CREATE_SUB_KEY = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.KEY_CREATE_SUB_KEY;
KEY_ENUMERATE_SUB_KEYS = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.KEY_ENUMERATE_SUB_KEYS;
KEY_EXECUTE = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.KEY_EXECUTE;
KEY_NOTIFY = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.KEY_NOTIFY;
KEY_QUERY_VALUE = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.KEY_QUERY_VALUE;
KEY_READ = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.KEY_READ;
KEY_SET_VALUE = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.KEY_SET_VALUE;
KEY_WRITE = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.KEY_WRITE;
{$ifndef WinCE}
KEY_WOW64_64KEY = Windows.KEY_WOW64_64KEY;
KEY_WOW64_32KEY = Windows.KEY_WOW64_32KEY;
KEY_WOW64_64KEY = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.KEY_WOW64_64KEY;
KEY_WOW64_32KEY = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.KEY_WOW64_32KEY;
{$endif WinCE}
{$else}

View File

@ -14,7 +14,9 @@
**********************************************************************}
{$IFNDEF FPC_DOTTEDUNITS}
Unit Registry;
{$ENDIF FPC_DOTTEDUNITS}
{$mode objfpc}
{$H+}
@ -25,6 +27,15 @@ interface
{$define XMLREG}
{$endif}
{$IFDEF FPC_DOTTEDUNITS}
Uses
{$ifndef Xmlreg}
WinApi.Windows,
{$endif Xmlreg}
System.Classes,
System.SysUtils,
System.IniFiles;
{$ELSE FPC_DOTTEDUNITS}
Uses
{$ifndef XMLREG}
Windows,
@ -32,6 +43,7 @@ Uses
Classes,
SysUtils,
inifiles;
{$ENDIF FPC_DOTTEDUNITS}
{$I regdef.inc}

View File

@ -189,9 +189,9 @@ end;
function TRegistry.GetKeyInfo(out Value: TRegKeyInfo): Boolean;
var
winFileTime: Windows.FILETIME;
winFileTime: {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.FILETIME;
sysTime: TSystemTime;
LocalFileTime: Windows.FILETIME;
LocalFileTime: {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.FILETIME;
begin
FillChar(Value, SizeOf(Value), 0);
With Value do

View File

@ -18,12 +18,19 @@
{$mode objfpc}
{$h+}
{$IFNDEF FPC_DOTTEDUNITS}
unit xmlreg;
{$ENDIF FPC_DOTTEDUNITS}
Interface
{$IFDEF FPC_DOTTEDUNITS}
uses
System.SysUtils,System.Classes,Xml.Dom,Xml.Read,Xml.Writer;
{$ELSE FPC_DOTTEDUNITS}
uses
sysutils,classes,dom,xmlread,xmlwrite;
{$ENDIF FPC_DOTTEDUNITS}
Type

View File

@ -19,7 +19,11 @@
System dependent Registry implementation - using XML file.
---------------------------------------------------------------------}
{$IFDEF FPC_DOTTEDUNITS}
uses System.TypInfo, System.Xmlreg;
{$ELSE FPC_DOTTEDUNITS}
uses typinfo, xmlreg;
{$ENDIF FPC_DOTTEDUNITS}
Const
XFileName = 'reg.xml';