Browse Source

Merged revisions 7483,7486,7504,7506-7509,7522,7527,7534-7536,7558-7559,7563-7565,7567,7570-7571,7573-7576,7586,7589,7592-7594,7607,7612,7615,7619-7620,7622-7623,7626,7628,7631,7633,7646,7663,7677,7681-7683,7689,7697,7704-7712,7725,7736,7738,7740,7744-7746,7751,7753,7764,7767,7769-7770,7776-7777,7788,7830,7836-7839,7846,7849,7862,7864-7865,7869,7872,7877,7882,7927-7929,7953,7961,7967,7971,7986-7987,7990-7994,7998-8000,8004-8006,8008-8012,8016,8027,8034,8036-8037,8039,8044,8046,8048,8051,8060,8064,8066 via svnmerge from
http://svn.freepascal.org/svn/fpc/trunk

........
r7483 | jonas | 2007-05-27 12:05:03 +0200 (So, 27 Mai 2007) | 2 lines

+ added
........
r8064 | florian | 2007-07-15 17:58:58 +0200 (So, 15 Jul 2007) | 3 lines

* fixed wrong declaration of TreeView_GetItemRect
* fixed code of TreeView_GetItemRect
........
r8066 | florian | 2007-07-15 19:16:21 +0200 (So, 15 Jul 2007) | 2 lines

* don't add empty symtables when specializing generics
........

git-svn-id: branches/fixes_2_2@8076 -

florian 18 years ago
parent
commit
1c5005beb2

+ 3 - 0
.gitattributes

@@ -6294,6 +6294,9 @@ tests/test/cg/obj/linux/powerpc64/tcext3.o -text
 tests/test/cg/obj/linux/powerpc64/tcext4.o -text
 tests/test/cg/obj/linux/powerpc64/tcext5.o -text
 tests/test/cg/obj/linux/sparc/ctest.o -text
+tests/test/cg/obj/linux/sparc/tcext3.o -text
+tests/test/cg/obj/linux/sparc/tcext4.o -text
+tests/test/cg/obj/linux/sparc/tcext5.o -text
 tests/test/cg/obj/linux/x86_64/ctest.o -text
 tests/test/cg/obj/linux/x86_64/tcext3.o -text
 tests/test/cg/obj/linux/x86_64/tcext4.o -text

+ 4 - 2
compiler/psub.pas

@@ -1765,8 +1765,10 @@ implementation
             symtablestack.push(pu.u.globalsymtable);
             pu:=tused_unit(pu.next);
           end;
-        symtablestack.push(hmodule.globalsymtable);
-        symtablestack.push(hmodule.localsymtable);
+        if assigned(hmodule.globalsymtable) then
+          symtablestack.push(hmodule.globalsymtable);
+        if assigned(hmodule.localsymtable) then
+          symtablestack.push(hmodule.localsymtable);
 
         { definitions }
         for i:=0 to tobjectdef(ttypesym(p).typedef).symtable.DefList.Count-1 do

+ 3 - 3
packages/base/winunits/commctrl.pp

@@ -5657,7 +5657,7 @@ CONST
          TVM_GETITEMRECT                = (TV_FIRST + 4);
 
 // Macro 160
-Function TreeView_GetItemRect( hwnd : hwnd; hitem: TREEITEM; code : WPARAM; prc : pRECT):BOOL;inline;
+Function TreeView_GetItemRect( hwnd : hwnd; hitem: HTREEITEM; code : WPARAM; prc : pRECT):BOOL;inline;
 Function TreeView_GetItemRect( hwnd : hwnd; hitem: HTREEITEM; var prc : TRECT;code : Bool):BOOL;inline;
 
 CONST
@@ -10776,9 +10776,9 @@ end;
 // #define TreeView_GetItemRect(hwnd, hitem, prc, code) \
 //     (*(HTREEITEM *)prc = (hitem), (BOOL)SNDMSG((hwnd), TVM_GETITEMRECT, (WPARAM)(code), (LPARAM)(RECT *)(prc)))
 
-Function TreeView_GetItemRect( hwnd : hwnd; hitem: TREEITEM; code : WPARAM; prc : pRECT):BOOL;inline;
+Function TreeView_GetItemRect( hwnd : hwnd; hitem: HTREEITEM; code : WPARAM; prc : pRECT):BOOL;inline;
 Begin
- HTREEITEM(prc)^:=HITEM;
+ HTREEITEM(prc):=HITEM;
  Result:=Bool(SendMessage((hwnd), TVM_GETITEMRECT, code, LPARAM(prc)));
 end;
 

BIN
tests/test/cg/obj/linux/sparc/tcext3.o


BIN
tests/test/cg/obj/linux/sparc/tcext4.o


BIN
tests/test/cg/obj/linux/sparc/tcext5.o