--- Merging r39666 into '.':

U    packages/fcl-registry/src/winreg.inc
--- Recording mergeinfo for merge of r39666 into '.':
 U   .
--- Merging r39667 into '.':
U    packages/fcl-registry/src/registry.pp
--- Recording mergeinfo for merge of r39667 into '.':
 G   .
--- Merging r39673 into '.':
U    rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r39673 into '.':
 G   .
--- Merging r39675 into '.':
U    rtl/win/wininc/defines.inc
U    rtl/win/wininc/redef.inc
--- Recording mergeinfo for merge of r39675 into '.':
 G   .
--- Merging r39676 into '.':
U    packages/fcl-image/src/fpreadpng.pp
--- Recording mergeinfo for merge of r39676 into '.':
 G   .

# revisions: 39666,39667,39673,39675,39676

git-svn-id: branches/fixes_3_2@39677 -

packages/fcl-image/src/fpreadpng.pp

@@ -833,7 +833,7 @@ begin
     ZData.Free;
     if not img.UsePalette and assigned(FPalette) then
       begin
-      FPalette.Free;
+      FreeAndNil(FPalette);
       end;
   end;
 end;

packages/fcl-registry/src/registry.pp

@@ -331,7 +331,7 @@ Var
 
 begin
   Result := GetData(Name, @Buffer, BufSize, RegDataType);
-  If (RegDataType<>rdBinary) Then
+  If not (RegDataType in [rdBinary, rdUnknown]) Then
     Raise ERegistryException.CreateFmt(SInvalidRegType, [Name]);
 end;
 

packages/fcl-registry/src/winreg.inc

@@ -58,7 +58,7 @@ begin
                               0,
                               '',
                               REG_OPTION_NON_VOLATILE,
-                              KEY_ALL_ACCESS,
+                              FACCESS,
                               SecurityAttributes,
                               Handle,
                               @Disposition);

rtl/inc/systemh.inc

@@ -109,6 +109,7 @@ Type
   Cardinal = LongWord;
   Integer  = SmallInt;
   UInt64   = QWord;
+  Boolean8 = Boolean;
 
   { moved here from psystem.pas
     Delphi allows chose of overloaded procedure depending

rtl/win/wininc/defines.inc

@@ -646,13 +646,10 @@
      ALTERNATE = 1;
      WINDING = 2;
   { CreateProcess  }
-     CREATE_DEFAULT_ERROR_MODE = 67108864;
      CREATE_NEW_CONSOLE = 16;
      CREATE_NEW_PROCESS_GROUP = 512;
-     CREATE_SEPARATE_WOW_VDM = 2048;
      CREATE_SUSPENDED = 4;
      STACK_SIZE_PARAM_IS_A_RESERVATION = $10000;
-     CREATE_UNICODE_ENVIRONMENT = 1024;
      DEBUG_PROCESS = 1;
      DEBUG_ONLY_THIS_PROCESS = 2;
      DETACHED_PROCESS = 8;
@@ -660,6 +657,31 @@
      IDLE_PRIORITY_CLASS = 64;
      NORMAL_PRIORITY_CLASS = 32;
      REALTIME_PRIORITY_CLASS = 256;
+     CREATE_UNICODE_ENVIRONMENT        = $00000400;
+     CREATE_SEPARATE_WOW_VDM           = $00000800;
+
+     CREATE_SHARED_WOW_VDM             = $00001000;
+     CREATE_FORCEDOS                   = $00002000;
+     BELOW_NORMAL_PRIORITY_CLASS       = $00004000;
+     ABOVE_NORMAL_PRIORITY_CLASS       = $00008000;
+
+     INHERIT_PARENT_AFFINITY           = $00010000;
+     INHERIT_CALLER_PRIORITY           = $00020000;    // Deprecated
+     CREATE_PROTECTED_PROCESS          = $00040000;
+     EXTENDED_STARTUPINFO_PRESENT      = $00080000;
+
+     PROCESS_MODE_BACKGROUND_BEGIN     = $00100000;
+     PROCESS_MODE_BACKGROUND_END       = $00200000;
+
+     CREATE_BREAKAWAY_FROM_JOB         = $01000000;
+     CREATE_PRESERVE_CODE_AUTHZ_LEVEL  = $02000000;
+     CREATE_DEFAULT_ERROR_MODE         = $04000000;
+     CREATE_NO_WINDOW                  = $08000000;
+
+     PROFILE_USER                      = $10000000;
+     PROFILE_KERNEL                    = $20000000;
+     PROFILE_SERVER                    = $40000000;
+     CREATE_IGNORE_SYSTEM_DEFAULT      = $80000000;  
   { CreateService  }
      SERVICE_ALL_ACCESS = $f01ff;
      SERVICE_CHANGE_CONFIG = 2;
@@ -2411,6 +2433,7 @@ Type
      REG_RESOURCE_LIST = 8;
      REG_RESOURCE_REQUIREMENTS_LIST = 10;
      REG_SZ = 1;
+     REG_QWORD = 11;
   { RegisterHotKey  }
      MOD_ALT = 1;
      MOD_CONTROL = 2;

rtl/win/wininc/redef.inc

@@ -104,7 +104,6 @@ const
   SIF_TRACKPOS = $10;
   CP_UTF7 = 65000;
   CP_UTF8 = 65001;
-  CREATE_NO_WINDOW = $08000000;
 
   WHEEL_DELTA = 120;
   WHEEL_PAGESCROLL = MAXDWORD;