WebSVN – Kolibri OS – Path Comparison – / – /kernel/ Rev 206 and /kernel/ Rev 205

Regard whitespace Rev 206 → Rev 205

 /kernel/trunk/core/dll.inc
 ,8 → 523,6
            test eax, eax
            jnz .fail
-           mov eax, [file_size]
            stdcall kernel_alloc, [file_size]
            mov [file], eax
 ,7 → 674,7
            dec ecx
            jnz .next_reloc
 .next:
-           add [sec], COFF_SECTION_SIZE
+           add [sec], 40
            dec [n_sec]
            jnz .fix_sec
 .exit:
 ,7 → 709,7
            add ebx, [edx+CFS.SizeOfRawData]
            add ebx, 15
            and ebx, not 15
-           add edx, COFF_SECTION_SIZE
+           add edx, 18
            dec ecx
            jnz @B
            mov [img_size], ebx
 ,7 → 747,7
 .next:
            add edi, 15
            and edi, not 15
-           add eax, COFF_SECTION_SIZE
+           add eax, 40
            dec ebx
            jnz @B
 ,7 → 835,7
            add ebx, [edx+CFS.SizeOfRawData]
            add ebx, 15
            and ebx, not 15
-           add edx, COFF_SECTION_SIZE
+           add edx, 18
            dec ecx
            jnz @B
            mov [img_size], ebx
 ,7 → 867,7
 .next:
            add edi, 15-new_app_base
            and edi, not 15
-           add eax, COFF_SECTION_SIZE
+           add eax, 40
            dec ebx
            jnz @B
 ,7 → 894,7
            lea eax, [edx+20]
 @@:
            add [eax+CFS.VirtualAddress], edi  ;patch user space offset
-           add eax, COFF_SECTION_SIZE
+           add eax, 40
            dec ebx
            jnz @B

 /kernel/trunk/core/heap.inc
 ,8 → 257,8
            cli
            mov eax, [size]
-           add eax, 4095
-           and eax, not 4095
+           add eax, 0xFFF
+           and eax, 0xFFFFF000;
            mov [size], eax
            cmp eax, [heap_free]
            ja .error
 ,8 → 499,8
            endl
            mov eax, [size]
-           add eax, 4095
-           and eax, not 4095;
+           add eax, 0xFFF
+           and eax, 0xFFFFF000;
            mov [size], eax
            and eax, eax
            jz .error