Hi
I use DOM from fcl-xml both for Delphi and FPC development. I work with older version, till I notice serious bugs. Today i've upgrade it from current svn. And problem: Delphi don't compile I've made several changes in dom, xmlutil. Diff attached.

As i expect, bugs in new version disappear.

It's not change much.
Can someone review it?

Reviewed and applied. Thanks !

Michael.

In our previous episode, Michael Van Canneyt said:

I also use parts of fcl-xml under Delphi, and also some fpimage parts.

Since D2009, a lot less patches are needed due to $pointermath

Hm. Something strange with compilation.
I reversed the patch, because xmlutils.pp does not compile with the patch.

Strange that I didn't notice the first time I called make ?

Could you look at FPC compilation and make a new patch ?

Michael.

To my knowledge,
- To make it compilable with Delphi, at least avl_tree.pp from fcl-base

   must be patched, too;

- Using PtrInt for doing pointer math is discouraged in favor of

   PtrUInt;

Sergei

Michael Van Canneyt pisze:

new patch attached.
tested with FPC also, but a cant use testgen

changed xmlconf
1. compilation by Delphi
2. added procedure reload

Darek

- Using PtrInt for doing pointer math is discouraged in favor of PtrUInt;

I've changed PtrInt do PtrUInt, but its not possible in each place

how to resolve
tClass= tClass(PtrUInt +ptrInt)

FPC claim: combined unsigned and signed make result 64bit, which is incompatible with pointer

what is proper way to resolve this

Cast the ptruint to pointer (although I don't know whether this is Delphi-compatible).

Jonas

Jonas Maebe pisze:

I know this, but it look strange

 FCurrBlock := TDOMNode(pointer(ptrUInt(ext) + sizeof(TExtent) +
(AElemCount - 1) * FElementSize));

I can change FElementSize and AElemCount to longword but result sizeof is integer

much better look
 FCurrBlock := TDOMNode(ptrInt(ext) + sizeof(TExtent) + (AElemCount - 1)
* FElementSize);
or
ptrUInt( FCurrBlock) := ptrUInt(ext) + sizeof(TExtent) + (AElemCount -
1) * FElementSize;

which is proper?

This variable was unsigned for a long time, but recently I changed it to signed because it was causing crashes on x86_64 :-)

--- xmlread.pp (wersja 13601)
+++ xmlread.pp (kopia robocza)
@@ -925,7 +925,7 @@

  function TXMLDecodingSource.Reload: Boolean;
  var
-  Remainder: PtrInt;
+  Remainder: ptrUInt;
    r, inLeft: Cardinal;
    rslt: Integer;
  begin

Thank you for the patch. I'll modify it a bit and apply this weekend.

Sergei