U packages/fcl-db/src/base/db.pas
U packages/paszlib/src/zstream.pp
--- Recording mergeinfo for merge of r49490 into '.':
U .
--- Merging r49491 into '.':
G packages/fcl-db/src/base/db.pas
--- Recording mergeinfo for merge of r49491 into '.':
G .
--- Merging r49492 into '.':
U packages/paszlib/src/infblock.pas
U packages/paszlib/src/infcodes.pas
U packages/paszlib/src/inffast.pas
U packages/paszlib/src/zbase.pas
U packages/paszlib/src/zconf.inc
U packages/paszlib/src/zdeflate.pas
--- Recording mergeinfo for merge of r49492 into '.':
G .
--- Merging r49565 into '.':
U rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r49565 into '.':
G .
--- Merging r49590 into '.':
U packages/gtk2/src/gtkext/gtkstatusicon.inc
U packages/gtk2/src/gtkext/gtkstatusiconh.inc
--- Recording mergeinfo for merge of r49590 into '.':
G .
# revisions: 49490,49491,49492,49565,49590
r49490 | marco | 2021-06-08 10:52:50 +0200 (Tue, 08 Jun 2021) | 2 lines
Changed paths:
M /trunk/packages/fcl-db/src/base/db.pas
M /trunk/packages/paszlib/src/zstream.pp
* use local buffer for seek mantis #38930 patch by Hendi.
r49491 | marco | 2021-06-08 10:53:42 +0200 (Tue, 08 Jun 2021) | 2 lines
Changed paths:
M /trunk/packages/fcl-db/src/base/db.pas
* revert accidentally modified file.
r49492 | marco | 2021-06-08 10:58:21 +0200 (Tue, 08 Jun 2021) | 2 lines
Changed paths:
M /trunk/packages/paszlib/src/infblock.pas
M /trunk/packages/paszlib/src/infcodes.pas
M /trunk/packages/paszlib/src/inffast.pas
M /trunk/packages/paszlib/src/zbase.pas
M /trunk/packages/paszlib/src/zconf.inc
M /trunk/packages/paszlib/src/zdeflate.pas
* commit second patch (from Hendi) from mantis #38930, make debug define compiling again
r49565 | marco | 2021-06-26 20:36:37 +0200 (Sat, 26 Jun 2021) | 1 line
Changed paths:
M /trunk/rtl/win/wininc/defines.inc
* redo psd constants, mantis #39022
r49590 | marco | 2021-07-10 14:07:55 +0200 (Sat, 10 Jul 2021) | 6 lines
Changed paths:
M /trunk/packages/gtk2/src/gtkext/gtkstatusicon.inc
M /trunk/packages/gtk2/src/gtkext/gtkstatusiconh.inc
* add gtk_status_icon_set_tooltip_text as per Juha's patch, mantis #39199
--This line, and those below, will be ignored--
M gtk2/src/gtkext/gtkstatusicon.inc
M gtk2/src/gtkext/gtkstatusiconh.inc
git-svn-id: branches/fixes_3_2@49607 -
U rtl/win/sysutils.pp
--- Recording mergeinfo for merge of r49244 into '.':
U .
--- Merging r49245 into '.':
U packages/winunits-base/src/comserv.pp
--- Recording mergeinfo for merge of r49245 into '.':
G .
--- Merging r49250 into '.':
G rtl/win/sysutils.pp
--- Recording mergeinfo for merge of r49250 into '.':
G .
# revisions: 49244,49245,49250
r49244 | marco | 2021-04-22 16:00:51 +0200 (Thu, 22 Apr 2021) | 1 line
Changed paths:
M /trunk/rtl/win/sysutils.pp
* use W variant to get localestrs.
r49245 | marco | 2021-04-22 17:11:38 +0200 (Thu, 22 Apr 2021) | 1 line
Changed paths:
M /trunk/packages/winunits-base/src/comserv.pp
* patch by Wallaby, mantis 0038382, load filename via -W function
r49250 | marco | 2021-04-23 21:06:18 +0200 (Fri, 23 Apr 2021) | 1 line
Changed paths:
M /trunk/rtl/win/sysutils.pp
* avoid rangecheck mantis 0038791
git-svn-id: branches/fixes_3_2@49288 -
U packages/rtl-objpas/src/inc/variants.pp
--- Recording mergeinfo for merge of r49040 into '.':
U .
--- Merging r49044 into '.':
U packages/rtl-objpas/src/inc/strutils.pp
--- Recording mergeinfo for merge of r49044 into '.':
G .
--- Merging r49047 into '.':
U packages/regexpr/src/regexpr.pas
--- Recording mergeinfo for merge of r49047 into '.':
G .
--- Merging r49101 into '.':
U rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r49101 into '.':
G .
--- Merging r49104 into '.':
C compiler/aarch64/cgcpu.pas
A tests/webtbs/tw38695.pp
--- Recording mergeinfo for merge of r49104 into '.':
G .
Summary of conflicts:
Text conflicts: 1
# revisions: 49040,49044,49047,49101,49104
r49040 | florian | 2021-03-23 21:57:18 +0100 (Tue, 23 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/variants.pp
* patch by Arnaud Bouchez: initialize dummy_data properly, resolves#38653
r49044 | michael | 2021-03-24 11:40:03 +0100 (Wed, 24 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/strutils.pp
Fix casing, bug ID #38660
r49047 | michael | 2021-03-24 18:05:26 +0100 (Wed, 24 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/regexpr/src/regexpr.pas
* Fix issue #38442
r49101 | marco | 2021-04-02 16:54:40 +0200 (Fri, 02 Apr 2021) | 1 line
Changed paths:
M /trunk/rtl/win/wininc/struct.inc
* split propsheetheader in -A and -W variants.
r49104 | florian | 2021-04-02 18:44:43 +0200 (Fri, 02 Apr 2021) | 2 lines
Changed paths:
M /trunk/compiler/aarch64/cgcpu.pas
A /trunk/tests/webtbs/tw38695.pp
* Aarch64: patch by J. Gareth Moreton: fix constant writing, resolves#38695
+ test
git-svn-id: branches/fixes_3_2@49110 -
U rtl/nativent/systhrd.inc
U rtl/os2/systhrd.inc
U rtl/win/systhrd.inc
--- Recording mergeinfo for merge of r45159 into '.':
U .
--- Merging r45160 into '.':
U rtl/amicommon/athreads.pp
U rtl/beos/bethreads.pp
U rtl/inc/thread.inc
U rtl/inc/threadh.inc
G rtl/nativent/systhrd.inc
U rtl/netware/systhrd.inc
U rtl/netwlibc/systhrd.inc
U rtl/objpas/classes/classes.inc
U rtl/objpas/classes/classesh.inc
G rtl/os2/systhrd.inc
U rtl/unix/cthreads.pp
G rtl/win/systhrd.inc
--- Recording mergeinfo for merge of r45160 into '.':
G .
--- Merging r45206 into '.':
U rtl/win/sysos.inc
G rtl/win/systhrd.inc
U rtl/win/syswin.inc
--- Recording mergeinfo for merge of r45206 into '.':
G .
--- Merging r45207 into '.':
U rtl/linux/pthread.inc
--- Recording mergeinfo for merge of r45207 into '.':
G .
--- Merging r45233 into '.':
G rtl/linux/pthread.inc
G rtl/unix/cthreads.pp
--- Recording mergeinfo for merge of r45233 into '.':
G .
--- Merging r45237 into '.':
G rtl/unix/cthreads.pp
G rtl/win/systhrd.inc
--- Recording mergeinfo for merge of r45237 into '.':
G .
git-svn-id: branches/fixes_3_2@47806 -
* fix for Mantis #36706: only link a library against the dynamic loader if we're not linking against the C library anyway
Note: I did not yet find a case where we *do* need to link a library against the loader; this will have to be investigated further, but for 3.2.0 this is safest
........
* fix for Mantis #36738: when copying a record using its copy operator we assume that we've copied the whole record; this way managed records inside non-managed records are handled correctly
+ added (adjusted) test
........
* when checking for an existing operator overload for the assignment operator, check for the correct variant (explicit or not) matching the overload
+ added tests
........
* GetLoadErrorStr (currently) returns a ShortString, so avoid a useless conversion to AnsiString
........
git-svn-id: branches/fixes_3_2@47771 -
U rtl/win/sysutils.pp
--- Recording mergeinfo for merge of r46855 into '.':
U .
# revisions: 46855
r46855 | svenbarth | 2020-09-12 10:03:10 +0200 (Sat, 12 Sep 2020) | 1 line
Changed paths:
M /trunk/rtl/win/sysutils.pp
* handle reparse points that are neither symlinks nor mount points as normal files
git-svn-id: branches/fixes_3_2@47100 -
U rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r44258 into '.':
U .
--- Merging r44259 into '.':
U packages/winunits-base/src/commctrl.pp
U packages/winunits-base/src/nb30.pp
--- Recording mergeinfo for merge of r44259 into '.':
G .
--- Merging r44260 into '.':
G packages/winunits-base/src/commctrl.pp
--- Recording mergeinfo for merge of r44260 into '.':
G .
# revisions: 44258,44259,44260
git-svn-id: branches/fixes_3_2@44263 -
U packages/fpmake_add.inc
U packages/fpmake_proc.inc
A packages/vcl-compat
A packages/vcl-compat/Makefile
A packages/vcl-compat/Makefile.fpc
A packages/vcl-compat/fpmake.pp
A packages/vcl-compat/src
A packages/vcl-compat/src/System.NetEncoding.pp
A packages/vcl-compat/tests
A packages/vcl-compat/tests/tcnetencoding.pp
A packages/vcl-compat/tests/testcompat.lpi
A packages/vcl-compat/tests/testcompat.lpr
--- Recording mergeinfo for merge of r42937 into '.':
U .
--- Merging r42939 into '.':
U packages/vcl-compat/fpmake.pp
--- Recording mergeinfo for merge of r42939 into '.':
G .
--- Merging r42975 into '.':
U packages/paszlib/src/zipper.pp
--- Recording mergeinfo for merge of r42975 into '.':
G .
--- Merging r42976 into '.':
U rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r42976 into '.':
G .
--- Merging r43058 into '.':
U utils/fpcm/fpmake.pp
--- Recording mergeinfo for merge of r43058 into '.':
G .
--- Merging r43059 into '.':
U packages/graph/src/ptcgraph/ptcmouse.pp
U packages/ptc/docs/CHANGES.txt
U packages/ptc/src/ptcwrapper/ptcwrapper.pp
--- Recording mergeinfo for merge of r43059 into '.':
G .
--- Merging r43085 into '.':
G packages/vcl-compat/fpmake.pp
A packages/vcl-compat/src/system.netencoding.pp
D packages/vcl-compat/src/System.NetEncoding.pp
--- Recording mergeinfo for merge of r43085 into '.':
G .
--- Merging r43086 into '.':
G packages/paszlib/src/zipper.pp
--- Recording mergeinfo for merge of r43086 into '.':
G .
# revisions: 42937,42939,42975,42976,43058,43059,43085,43086
git-svn-id: branches/fixes_3_2@43173 -
U rtl/win/wininc/defines.inc
U rtl/win/wininc/func.inc
U rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r42994 into '.':
U .
--- Merging r42995 into '.':
G rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r42995 into '.':
G .
--- Merging r42996 into '.':
G rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r42996 into '.':
G .
# revisions: 42994,42995,42996
git-svn-id: branches/fixes_3_2@43030 -
U rtl/win/sysosh.inc
--- Recording mergeinfo for merge of r41636 into '.':
U .
--- Merging r41795 into '.':
U rtl/objpas/classes/classesh.inc
U rtl/objpas/classes/collect.inc
--- Recording mergeinfo for merge of r41795 into '.':
G .
--- Merging r41881 into '.':
U rtl/objpas/sysutils/syshelph.inc
--- Recording mergeinfo for merge of r41881 into '.':
G .
--- Merging r42149 into '.':
U rtl/msdos/dos.pp
--- Recording mergeinfo for merge of r42149 into '.':
G .
--- Merging r42180 into '.':
U rtl/freebsd/sysnr.inc
--- Recording mergeinfo for merge of r42180 into '.':
G .
--- Merging r42452 into '.':
U rtl/objpas/sysutils/datih.inc
--- Recording mergeinfo for merge of r42452 into '.':
G .
--- Merging r42775 into '.':
U packages/winunits-base/src/mmsystem.pp
--- Recording mergeinfo for merge of r42775 into '.':
G .
# revisions: 41636,41795,41881,42149,42180,42452,42775
git-svn-id: branches/fixes_3_2@42911 -
U rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r42008 into '.':
U .
--- Merging r42013 into '.':
U rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r42013 into '.':
G .
--- Merging r42027 into '.':
G rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r42027 into '.':
G .
--- Merging r42028 into '.':
U rtl/win/wininc/ascdef.inc
U rtl/win/wininc/ascfun.inc
U rtl/win/wininc/unidef.inc
U rtl/win/wininc/unifun.inc
--- Recording mergeinfo for merge of r42028 into '.':
G .
--- Merging r42029 into '.':
G rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r42029 into '.':
G .
--- Merging r42030 into '.':
G rtl/win/wininc/defines.inc
G rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r42030 into '.':
G .
--- Merging r42043 into '.':
U rtl/win/syswin.inc
--- Recording mergeinfo for merge of r42043 into '.':
G .
# revisions: 42008,42013,42027,42028,42029,42030,42043
git-svn-id: branches/fixes_3_2@42130 -
U rtl/win/wininc/ascdef.inc
U rtl/win/wininc/ascfun.inc
U rtl/win/wininc/unidef.inc
U rtl/win/wininc/unifun.inc
--- Recording mergeinfo for merge of r41918 into '.':
U .
--- Merging r41919 into '.':
U rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r41919 into '.':
G .
--- Merging r41920 into '.':
G rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r41920 into '.':
G .
--- Merging r41921 into '.':
U rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r41921 into '.':
G .
--- Merging r41922 into '.':
U rtl/win/wininc/messages.inc
--- Recording mergeinfo for merge of r41922 into '.':
G .
--- Merging r41925 into '.':
G rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r41925 into '.':
G .
--- Merging r41926 into '.':
G rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r41926 into '.':
G .
--- Merging r41930 into '.':
G rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r41930 into '.':
G .
# revisions: 41918,41919,41920,41921,41922,41925,41926,41930
r41918 | marco | 2019-04-21 20:00:24 +0200 (Sun, 21 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/ascdef.inc
M /trunk/rtl/win/wininc/ascfun.inc
M /trunk/rtl/win/wininc/unidef.inc
M /trunk/rtl/win/wininc/unifun.inc
* QueryFullProcessImageName
r41919 | marco | 2019-04-21 20:06:09 +0200 (Sun, 21 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/defines.inc
* PROCESS_NAME_NATIVE constant
r41920 | marco | 2019-04-21 20:10:12 +0200 (Sun, 21 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/defines.inc
* PROCESS_QUERY_LIMITED_INFORMATION, mantis 35423
r41921 | marco | 2019-04-21 20:12:57 +0200 (Sun, 21 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/func.inc
* IsDebuggerPresent, bug #35422
r41922 | marco | 2019-04-22 11:42:44 +0200 (Mon, 22 Apr 2019) | 1 line
Changed paths:
M /trunk/rtl/win/wininc/messages.inc
* add uint typecast to some negative message numbers Mantis 035324
r41925 | marco | 2019-04-22 21:51:41 +0200 (Mon, 22 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/func.inc
* wow64 related functions from mantis 034328
r41926 | marco | 2019-04-23 09:50:12 +0200 (Tue, 23 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/func.inc
* iswow64present and enable*fsredirection with a byte as param because the BOOLEAN type is a byte according to MSDN. Mantis 035429
r41930 | marco | 2019-04-25 11:06:23 +0200 (Thu, 25 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/func.inc
* GetPhysicallyInstalledSystemMemory mantis 035439 by 440bx
git-svn-id: branches/fixes_3_2@41937 -
U packages/fpmake_add.inc
U packages/fpmake_proc.inc
A packages/libmagic
A packages/libmagic/Makefile
A packages/libmagic/Makefile.fpc
A packages/libmagic/examples
A packages/libmagic/examples/basic.pp
A packages/libmagic/fpmake.pp
A packages/libmagic/src
A packages/libmagic/src/libmagic.pp
--- Recording mergeinfo for merge of r41271 into '.':
U .
--- Merging r41330 into '.':
U rtl/objpas/sysutils/syssr.inc
U rtl/objpas/sysutils/sysstr.inc
U rtl/objpas/sysutils/sysstrh.inc
U rtl/objpas/sysutils/sysuni.inc
U rtl/objpas/sysutils/sysunih.inc
U rtl/objpas/sysutils/syswide.inc
U rtl/objpas/sysutils/syswideh.inc
--- Recording mergeinfo for merge of r41330 into '.':
G .
--- Merging r41336 into '.':
G rtl/objpas/sysutils/sysstr.inc
G rtl/objpas/sysutils/sysstrh.inc
U rtl/win/sysutils.pp
--- Recording mergeinfo for merge of r41336 into '.':
G .
--- Merging r41337 into '.':
G rtl/win/sysutils.pp
--- Recording mergeinfo for merge of r41337 into '.':
G .
--- Merging r41342 into '.':
U rtl/objpas/objpas.pp
--- Recording mergeinfo for merge of r41342 into '.':
G .
--- Merging r41343 into '.':
U packages/rtl-objpas/src/inc/strutils.pp
--- Recording mergeinfo for merge of r41343 into '.':
G .
--- Recording mergeinfo for merge of r41400 into '.':
G .
--- Merging r41547 into '.':
U rtl/objpas/sysutils/sysencodingh.inc
--- Recording mergeinfo for merge of r41547 into '.':
G .
# revisions: 41271,41330,41336,41337,41342,41343,41400,41547
r41271 | michael | 2019-02-09 20:57:11 +0100 (Sat, 09 Feb 2019) | 1 line
Changed paths:
M /trunk/packages/fpmake_add.inc
M /trunk/packages/fpmake_proc.inc
A /trunk/packages/libmagic
A /trunk/packages/libmagic/Makefile
A /trunk/packages/libmagic/Makefile.fpc
A /trunk/packages/libmagic/examples
A /trunk/packages/libmagic/examples/basic.pp
A /trunk/packages/libmagic/fpmake.pp
A /trunk/packages/libmagic/src
A /trunk/packages/libmagic/src/libmagic.pp
* libmagic headers by Silvio Clecio
r41330 | michael | 2019-02-16 08:55:26 +0100 (Sat, 16 Feb 2019) | 1 line
Changed paths:
M /trunk/rtl/objpas/sysutils/syssr.inc
M /trunk/rtl/objpas/sysutils/sysstr.inc
M /trunk/rtl/objpas/sysutils/sysstrh.inc
M /trunk/rtl/objpas/sysutils/sysuni.inc
M /trunk/rtl/objpas/sysutils/sysunih.inc
M /trunk/rtl/objpas/sysutils/syswide.inc
M /trunk/rtl/objpas/sysutils/syswideh.inc
* Add overloaded version of stringreplace with replacement count (ID 23987)
r41336 | michael | 2019-02-16 11:50:31 +0100 (Sat, 16 Feb 2019) | 1 line
Changed paths:
M /trunk/rtl/objpas/sysutils/sysstr.inc
M /trunk/rtl/objpas/sysutils/sysstrh.inc
M /trunk/rtl/win/sysutils.pp
* Complete the implementation of IsLeadChar
r41337 | michael | 2019-02-16 11:52:51 +0100 (Sat, 16 Feb 2019) | 1 line
Changed paths:
M /trunk/rtl/win/sysutils.pp
* Actually call InitLeadBytes
r41342 | michael | 2019-02-16 13:52:00 +0100 (Sat, 16 Feb 2019) | 1 line
Changed paths:
M /trunk/rtl/objpas/objpas.pp
* Add overloaded version of AssignFile with codepage. See bug ID #34889
r41343 | michael | 2019-02-16 15:52:17 +0100 (Sat, 16 Feb 2019) | 1 line
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/strutils.pp
* Fix bug ID #35098 (count param)
r41400 | yury | 2019-02-20 16:11:45 +0100 (Wed, 20 Feb 2019) | 1 line
Changed paths:
M /trunk/rtl/android/sysandroid.inc
M /trunk/rtl/linux/system.pp
* android: Fixed stdio redirection for threads.
r41547 | michael | 2019-03-02 11:42:19 +0100 (Sat, 02 Mar 2019) | 1 line
Changed paths:
M /trunk/rtl/objpas/sysutils/sysencodingh.inc
* Make FreeEncodings protected: they cannot be public, as it causes AVs (see bug ID #34856)
git-svn-id: branches/fixes_3_2@41933 -
U rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r40842 into '.':
U .
--- Merging r41555 into '.':
U rtl/win/wininc/unifun.inc
U rtl/win/wininc/ascdef.inc
U rtl/win/wininc/redef.inc
U rtl/win/wininc/unidef.inc
U rtl/win/wininc/ascfun.inc
--- Recording mergeinfo for merge of r41555 into '.':
G .
--- Merging r41556 into '.':
U rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r41556 into '.':
G .
--- Merging r41559 into '.':
U rtl/win/wininc/base.inc
U rtl/win/wininc/func.inc
G rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r41559 into '.':
G .
--- Merging r41560 into '.':
G rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r41560 into '.':
G .
--- Merging r41562 into '.':
G rtl/win/wininc/ascfun.inc
G rtl/win/wininc/struct.inc
G rtl/win/wininc/unifun.inc
G rtl/win/wininc/ascdef.inc
G rtl/win/wininc/unidef.inc
G rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r41562 into '.':
G .
--- Merging r41635 into '.':
G rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r41635 into '.':
G .
--- Merging r41845 into '.':
G rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r41845 into '.':
G .
--- Merging r41854 into '.':
G rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r41854 into '.':
G .
--- Merging r41857 into '.':
G rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r41857 into '.':
G .
--- Merging r41861 into '.':
G rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r41861 into '.':
G .
--- Merging r41891 into '.':
G rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r41891 into '.':
G .
--- Merging r41892 into '.':
G rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r41892 into '.':
G .
--- Merging r41893 into '.':
G rtl/win/wininc/func.inc
G rtl/win/wininc/redef.inc
--- Recording mergeinfo for merge of r41893 into '.':
G .
# revisions: 40842,41555,41556,41559,41560,41562,41635,41845,41854,41857,41861,41891,41892,41893
r40842 | marco | 2019-01-11 15:01:15 +0100 (Fri, 11 Jan 2019) | 6 lines
Changed paths:
M /trunk/rtl/win/wininc/struct.inc
* problems reported by nanobit mantis #34850 corrected.
- (probably Copy and paste) error in emrpolyline16
- EMREXTCREATEFONTINDIRECTW.elfw is of a W type
- a few missing ^ pointer to's.
r41555 | marco | 2019-03-02 15:35:33 +0100 (Sat, 02 Mar 2019) | 5 lines
Changed paths:
M /trunk/rtl/win/wininc/ascdef.inc
M /trunk/rtl/win/wininc/ascfun.inc
M /trunk/rtl/win/wininc/redef.inc
M /trunk/rtl/win/wininc/unidef.inc
M /trunk/rtl/win/wininc/unifun.inc
* Fix for #35146 getfullpathname.
* asc* uni* versions become pointer variants.
* delphi overloads move to redef.
* remove old comment (<2005) from redef. Possible related to constness. (LPCSTR vs LPSTR)
* also added $ifdef unicode version. Most redefs don't.
r41556 | marco | 2019-03-02 15:46:27 +0100 (Sat, 02 Mar 2019) | 1 line
Changed paths:
M /trunk/rtl/win/wininc/defines.inc
* add missing file_attribute constants, mantis #35120
r41559 | marco | 2019-03-02 19:22:01 +0100 (Sat, 02 Mar 2019) | 1 line
Changed paths:
M /trunk/rtl/win/wininc/base.inc
M /trunk/rtl/win/wininc/defines.inc
M /trunk/rtl/win/wininc/func.inc
* fix for #35111 EnumTimeFormatsEx. Prepared by 440bx
r41560 | marco | 2019-03-02 19:24:42 +0100 (Sat, 02 Mar 2019) | 1 line
Changed paths:
M /trunk/rtl/win/wininc/func.inc
* fix for #35119 geterrormode declaration by 440bx.
r41562 | marco | 2019-03-02 22:09:18 +0100 (Sat, 02 Mar 2019) | 1 line
Changed paths:
M /trunk/rtl/win/wininc/ascdef.inc
M /trunk/rtl/win/wininc/ascfun.inc
M /trunk/rtl/win/wininc/defines.inc
M /trunk/rtl/win/wininc/struct.inc
M /trunk/rtl/win/wininc/unidef.inc
M /trunk/rtl/win/wininc/unifun.inc
* GetComputerNameEx/A/W Mantis #35115
r41635 | svenbarth | 2019-03-08 15:47:22 +0100 (Fri, 08 Mar 2019) | 1 line
Changed paths:
M /trunk/rtl/win/wininc/defines.inc
+ fix for Mantis #35203: add TLS_OUT_OF_INDEXES constant to Windows unit
r41845 | marco | 2019-04-06 16:57:50 +0200 (Sat, 06 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/defines.inc
* metrics constants by Gareth and 440bx. Added SM_CARETBLINKINGENABLED for good measure.
r41854 | marco | 2019-04-09 15:21:17 +0200 (Tue, 09 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/defines.inc
* readd bottomleft #35350
r41857 | marco | 2019-04-10 16:48:27 +0200 (Wed, 10 Apr 2019) | 1 line
Changed paths:
M /trunk/rtl/win/wininc/func.inc
* add readdirectorychangedw (only -W function) mantis 35311
r41861 | marco | 2019-04-11 10:11:31 +0200 (Thu, 11 Apr 2019) | 1 line
Changed paths:
M /trunk/rtl/win/wininc/defines.inc
* add MB_CANCELTRYCONTINUE and MB*MASK constants. mantis 35244
r41891 | marco | 2019-04-17 17:57:05 +0200 (Wed, 17 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/func.inc
* fix mantis 35368 and mantis 35369
r41892 | marco | 2019-04-17 18:01:50 +0200 (Wed, 17 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/func.inc
* and the setters.
r41893 | marco | 2019-04-18 11:00:42 +0200 (Thu, 18 Apr 2019) | 1 line
Changed paths:
M /trunk/rtl/win/wininc/func.inc
M /trunk/rtl/win/wininc/redef.inc
* Mantis 35257 modifyworldtransform, defined with var parameter could also take NIL. Split into straight pointer + redef var overload.
git-svn-id: branches/fixes_3_2@41894 -
C rtl/win/wininc/defines.inc -> manually fixed order to match trunk
U rtl/win/wininc/struct.inc
U rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r41262 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 41262
r41262 | marco | 2019-02-09 13:07:30 +0100 (Sat, 09 Feb 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/defines.inc
M /trunk/rtl/win/wininc/func.inc
M /trunk/rtl/win/wininc/struct.inc
* flashwindowex, mantis #35048, patch by 440bx
git-svn-id: branches/fixes_3_2@41315 -
U packages/winunits-base/src/activex.pp
--- Recording mergeinfo for merge of r41264 into '.':
U .
--- Merging r41265 into '.':
U rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r41265 into '.':
G .
--- Merging r41266 into '.':
G rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r41266 into '.':
G .
--- Merging r41269 into '.':
U rtl/win/wininc/base.inc
--- Recording mergeinfo for merge of r41269 into '.':
G .
# revisions: 41264,41265,41266,41269
r41264 | marco | 2019-02-09 14:29:14 +0100 (Sat, 09 Feb 2019) | 2 lines
Changed paths:
M /trunk/packages/winunits-base/src/activex.pp
* regcls constants from MSDN
r41265 | marco | 2019-02-09 14:34:52 +0100 (Sat, 09 Feb 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/defines.inc
* some _E_ and _S_ constants from winerror.h used in activex patch.
r41266 | marco | 2019-02-09 14:41:22 +0100 (Sat, 09 Feb 2019) | 1 line
Changed paths:
M /trunk/rtl/win/wininc/defines.inc
* _S_ and _E_ first and last were already there, just in an unexpected winerror. Found after testing ->revert all but the last line.
r41269 | marco | 2019-02-09 18:53:05 +0100 (Sat, 09 Feb 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/base.inc
* makerop to dword mantis #34712
git-svn-id: branches/fixes_3_2@41296 -
U rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r41253 into '.':
U .
--- Merging r41254 into '.':
G rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r41254 into '.':
G .
# revisions: 41253,41254
git-svn-id: branches/fixes_3_2@41261 -
U rtl/wince/wininc/defines.inc
U rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r39670 into '.':
U .
# revisions: 39670
git-svn-id: branches/fixes_3_2@39791 -
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 -
Note that the enumfont* functions seem to use the var prototypes, while only redef functions should use them. Probably not worth breaking compat for though (in since 2016)
git-svn-id: trunk@39480 -
