Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[tkreuzer] 48186: [NDK] Include the correct mmtypes.h for amd64
by tkreuzer＠svn.reactos.org 22 Jul '10

22 Jul '10

Author: tkreuzer Date: Thu Jul 22 15:18:55 2010 New Revision: 48186 URL: http://svn.reactos.org/svn/reactos?rev=48186&view=rev Log: [NDK] Include the correct mmtypes.h for amd64 Modified: trunk/reactos/include/ndk/arch/mmtypes.h Modified: trunk/reactos/include/ndk/arch/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arch/mmtypes.h… ============================================================================== --- trunk/reactos/include/ndk/arch/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arch/mmtypes.h [iso-8859-1] Thu Jul 22 15:18:55 2010 @@ -22,12 +22,14 @@ // // Include the right file for this architecture. // -#if defined(_M_IX86) || defined(_M_AMD64) +#if defined(_M_IX86) #include <i386/mmtypes.h> #elif defined(_M_PPC) #include <powerpc/mmtypes.h> #elif defined(_M_ARM) #include <arm/mmtypes.h> +#elif defined(_M_AMD64) +#include <amd64/mmtypes.h> #else #error "Unknown processor" #endif

1 0

[tkreuzer] 48185: [NTDLL] - Add amd64 stubs for LdrInitializeThunk and KiUserApcDispatcher
by tkreuzer＠svn.reactos.org 22 Jul '10

22 Jul '10

Author: tkreuzer Date: Thu Jul 22 14:49:42 2010 New Revision: 48185 URL: http://svn.reactos.org/svn/reactos?rev=48185&view=rev Log: [NTDLL] - Add amd64 stubs for LdrInitializeThunk and KiUserApcDispatcher Added: trunk/reactos/dll/ntdll/dispatch/amd64/ (with props) trunk/reactos/dll/ntdll/dispatch/amd64/stubs.c (with props) Modified: trunk/reactos/dll/ntdll/ntdll.rbuild Propchange: trunk/reactos/dll/ntdll/dispatch/amd64/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Jul 22 14:49:42 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/ntdll/dispatch/amd64/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/ntdll/dispatch/amd64/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/ntdll/dispatch/amd64/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/ntdll/dispatch/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/amd64/s… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/amd64/stubs.c (added) +++ trunk/reactos/dll/ntdll/dispatch/amd64/stubs.c [iso-8859-1] Thu Jul 22 14:49:42 2010 @@ -1,0 +1,43 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NT Library + * FILE: dll/ntdll/dispatch/amd64/stubs.c + * PURPOSE: AMD64 stubs + * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntdll.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @unimplemented + */ +VOID +NTAPI +LdrInitializeThunk(ULONG Unknown1, // FIXME: Parameters! + ULONG Unknown2, + ULONG Unknown3, + ULONG Unknown4) +{ + UNIMPLEMENTED; + return; +} + +/* + * @unimplemented + */ +VOID +NTAPI +KiUserApcDispatcher(IN PVOID NormalRoutine, + IN PVOID NormalContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + UNIMPLEMENTED; + return; +} Propchange: trunk/reactos/dll/ntdll/dispatch/amd64/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Thu Jul 22 14:49:42 2010 @@ -32,6 +32,11 @@ <file>dispatch.S</file> </directory> </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>stubs.c</file> + </directory> + </if> <if property="ARCH" value="arm"> <directory name="arm"> <file>stubs_asm.s</file>

1 0

[tkreuzer] 48184: [NTDLL] - Comment out RtlWalkFrameChain for amd64
by tkreuzer＠svn.reactos.org 22 Jul '10

22 Jul '10

Author: tkreuzer Date: Thu Jul 22 14:44:27 2010 New Revision: 48184 URL: http://svn.reactos.org/svn/reactos?rev=48184&view=rev Log: [NTDLL] - Comment out RtlWalkFrameChain for amd64 Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Thu Jul 22 14:44:27 2010 @@ -18,6 +18,8 @@ /* FUNCTIONS ***************************************************************/ +#ifndef _M_AMD64 +// FIXME: Why "Not implemented"??? /* * @implemented */ @@ -30,6 +32,7 @@ /* Not implemented for user-mode */ return 0; } +#endif BOOLEAN NTAPI

1 0

[tkreuzer] 48183: [MSVCRT] - export _ftol only on i386 - fix _setjmp (2nd argument) and redirect setjmp
by tkreuzer＠svn.reactos.org 22 Jul '10

22 Jul '10

Author: tkreuzer Date: Thu Jul 22 10:23:52 2010 New Revision: 48183 URL: http://svn.reactos.org/svn/reactos?rev=48183&view=rev Log: [MSVCRT] - export _ftol only on i386 - fix _setjmp (2nd argument) and redirect setjmp Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Thu Jul 22 10:23:52 2010 @@ -405,9 +405,9 @@ # stub _ftime32_s @ cdecl _ftime64(ptr) # stub _ftime64_s -@ cdecl -ret64 _ftol() -@ cdecl -ret64 _ftol2() _ftol -@ cdecl -ret64 _ftol2_sse() _ftol #FIXME: SSE variant should be implemented +@ cdecl -arch=i386 -ret64 _ftol() +@ cdecl -arch=i386 -ret64 _ftol2() _ftol +@ cdecl -arch=i386 -ret64 _ftol2_sse() _ftol #FIXME: SSE variant should be implemented # stub _ftol2_sse_excpt @ cdecl _fullpath(ptr str long) # stub _fullpath_dbg @@ -814,7 +814,7 @@ # stub _set_output_format @ cdecl _set_sbh_threshold(long) @ cdecl _seterrormode(long) -@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) +@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr ptr) @ cdecl -arch=i386 -norelay _setjmp3(ptr long) @ cdecl -arch=x86_64 -norelay _setjmpex(ptr ptr) @ cdecl _setmaxstdio(long) @@ -1293,7 +1293,7 @@ @ varargs scanf(str) # @ varargs scanf_s(str) @ cdecl setbuf(ptr ptr) -@ cdecl -arch=x86_64 -norelay -private setjmp(ptr) +@ cdecl -arch=x86_64 -norelay -private setjmp(ptr ptr) _setjmp @ cdecl setlocale(long str) @ cdecl setvbuf(ptr str long long) @ cdecl signal(long long)

1 0

[tkreuzer] 48182: [TLIST] link to getopt library
by tkreuzer＠svn.reactos.org 22 Jul '10

22 Jul '10

Author: tkreuzer Date: Thu Jul 22 09:20:35 2010 New Revision: 48182 URL: http://svn.reactos.org/svn/reactos?rev=48182&view=rev Log: [TLIST] link to getopt library Modified: trunk/rosapps/applications/sysutils/tlist/tlist.rbuild Modified: trunk/rosapps/applications/sysutils/tlist/tlist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/tlis… ============================================================================== --- trunk/rosapps/applications/sysutils/tlist/tlist.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/tlist/tlist.rbuild [iso-8859-1] Thu Jul 22 09:20:35 2010 @@ -1,6 +1,7 @@ <module name="tlist" type="win32cui" installbase="system32" installname="tlist.exe"> <library>epsapi</library>  + <library>getopt</library> <library>user32</library> <library>ntdll</library> <file>tlist.c</file>

1 0

[tkreuzer] 48181: [MINGW] - Remove getopt from mingw lib and put it into it's own static library - change crt="dll" to crt="static" for the mingw startup libs, to avoid things like importing from itself.
by tkreuzer＠svn.reactos.org 22 Jul '10

22 Jul '10

Author: tkreuzer Date: Thu Jul 22 09:20:03 2010 New Revision: 48181 URL: http://svn.reactos.org/svn/reactos?rev=48181&view=rev Log: [MINGW] - Remove getopt from mingw lib and put it into it's own static library - change crt="dll" to crt="static" for the mingw startup libs, to avoid things like importing from itself. Modified: trunk/reactos/dll/3rdparty/libtiff/libtiff.rbuild trunk/reactos/lib/3rdparty/mingw/mingw.rbuild Modified: trunk/reactos/dll/3rdparty/libtiff/libtiff.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/libti… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/libtiff.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/libtiff.rbuild [iso-8859-1] Thu Jul 22 09:20:03 2010 @@ -9,6 +9,7 @@ <include base="libtiff">.</include> <include base="ReactOS">include/reactos/libs/zlib</include> <include base="ReactOS">include/reactos/libs/libtiff</include> + <library>getopt</library> <library>user32</library> <library>zlib</library> <file>mkg3states.c</file> Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Thu Jul 22 09:20:03 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="mingw_common" type="staticlibrary" isstartuplib="true" crt="dll"> +<module name="mingw_common" type="staticlibrary" isstartuplib="true" crt="static"> <library>oldnames</library> <library>ntdll</library> <define name="_CRTBLD" /> @@ -22,7 +22,6 @@ <file>crt_handler.c</file> <file>dllentry.c</file> <file>gccmain.c</file> - <file>getopt.c</file> <file>gs_support.c</file> <file>merr.c</file> <file>mingw_helpers.c</file> @@ -49,7 +48,7 @@ <file>crtexe.c</file> <file>dllargv.c</file> </module> -<module name="mingw_wmain" type="staticlibrary" isstartuplib="true" unicode="yes" crt="dll"> +<module name="mingw_wmain" type="staticlibrary" isstartuplib="true" unicode="yes" crt="static"> <define name="_CRTBLD" /> <define name="WPRFLAG" /> <include base="ReactOS">include/reactos/mingw-w64</include> @@ -58,7 +57,7 @@ <file>crtexe.c</file> <file>dllargv.c</file> </module> -<module name="mingw_dllmain" type="staticlibrary" isstartuplib="true" crt="dll"> +<module name="mingw_dllmain" type="staticlibrary" isstartuplib="true" crt="static"> <define name="_CRTBLD" /> <include base="ReactOS">include/reactos/mingw-w64</include> <file>crtdll.c</file> @@ -68,4 +67,7 @@ <define name="_CRTBLD" /> <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" /> </module> +<module name="getopt" type="staticlibrary" crt="dll"> + <file>getopt.c</file> +</module> </group>

1 0

[sir_richard] 48180: [NTOS]: Fix "fail". Dedicated to Timo.
by sir_richard＠svn.reactos.org 22 Jul '10

22 Jul '10

Author: sir_richard Date: Thu Jul 22 05:22:26 2010 New Revision: 48180 URL: http://svn.reactos.org/svn/reactos?rev=48180&view=rev Log: [NTOS]: Fix "fail". Dedicated to Timo. Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Thu Jul 22 05:22:26 2010 @@ -2211,7 +2211,7 @@ } /* Finally, handle the last section */ - CurrentPte = MiPteToAddress(CurrentAddress); + CurrentPte = MiAddressToPte(CurrentAddress); if ((StartPte < LastPte) && (CurrentPte >= StartPte)) { /* Handle overlap */

1 0

[tkreuzer] 48179: [NTOSKRL] Add missing MI_LOWEST_VAD_ADDRESS for amd64
by tkreuzer＠svn.reactos.org 22 Jul '10

22 Jul '10

Author: tkreuzer Date: Thu Jul 22 04:19:27 2010 New Revision: 48179 URL: http://svn.reactos.org/svn/reactos?rev=48179&view=rev Log: [NTOSKRL] Add missing MI_LOWEST_VAD_ADDRESS for amd64 Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Thu Jul 22 04:19:27 2010 @@ -22,6 +22,8 @@ #define MI_DEBUG_MAPPING (PVOID)0xFFFFFFFF80000000ULL // FIXME #define MI_HIGHEST_SYSTEM_ADDRESS (PVOID)0xFFFFFFFFFFFFFFFFULL #define MI_SYSTEM_CACHE_WS_START (PVOID)0xFFFFF78000001000ULL // CHECKME + +#define MI_LOWEST_VAD_ADDRESS (PVOID)0x000000007FF00000ULL /* Memory sizes */ #define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255*1024*1024) >> PAGE_SHIFT)

1 0

[tkreuzer] 48178: [NDK] Fix MMADDRESS_NODE and MM_AVL_TABLE
by tkreuzer＠svn.reactos.org 22 Jul '10

22 Jul '10

Author: tkreuzer Date: Thu Jul 22 04:08:57 2010 New Revision: 48178 URL: http://svn.reactos.org/svn/reactos?rev=48178&view=rev Log: [NDK] Fix MMADDRESS_NODE and MM_AVL_TABLE Modified: trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Thu Jul 22 04:08:57 2010 @@ -607,13 +607,13 @@ { union { - LONG Balance:2; + LONG_PTR Balance:2; struct _MMADDRESS_NODE *Parent; } u1; struct _MMADDRESS_NODE *LeftChild; struct _MMADDRESS_NODE *RightChild; - ULONG StartingVpn; - ULONG EndingVpn; + ULONG_PTR StartingVpn; + ULONG_PTR EndingVpn; } MMADDRESS_NODE, *PMMADDRESS_NODE; // @@ -622,9 +622,13 @@ typedef struct _MM_AVL_TABLE { MMADDRESS_NODE BalancedRoot; - ULONG DepthOfTree:5; - ULONG Unused:3; - ULONG NumberGenericTableElements:24; + ULONG_PTR DepthOfTree:5; + ULONG_PTR Unused:3; +#ifdef _WIN64 + ULONG_PTR NumberGenericTableElements:56; +#else + ULONG_PTR NumberGenericTableElements:24; +#endif PVOID NodeHint; PVOID NodeFreeHint; } MM_AVL_TABLE, *PMM_AVL_TABLE;

1 0

[tkreuzer] 48177: [FREELDR] - In the fat bootsector, don't clobber ax, it contains the number of first cluster of freeldr.sys and is used by the fathelper code. - Fix jump code in the fathelper code, like in the other bootsectors. - Now booting from fat partitions (looks like that's what sysreg does) works again. It's safe under the condition that the cluster size is at least 4352 bytes, which is true for harddisks of sizes bigger than 272MB. Booting from smaller fat disks, like floppy breaks wh
by tkreuzer＠svn.reactos.org 22 Jul '10

22 Jul '10

Author: tkreuzer Date: Thu Jul 22 03:29:25 2010 New Revision: 48177 URL: http://svn.reactos.org/svn/reactos?rev=48177&view=rev Log: [FREELDR] - In the fat bootsector, don't clobber ax, it contains the number of first cluster of freeldr.sys and is used by the fathelper code. - Fix jump code in the fathelper code, like in the other bootsectors. - Now booting from fat partitions (looks like that's what sysreg does) works again. It's safe under the condition that the cluster size is at least 4352 bytes, which is true for harddisks of sizes bigger than 272MB. Booting from smaller fat disks, like floppy breaks when freeldr.sys gets fragmented, which should rarely happen. Modified: trunk/reactos/boot/freeldr/bootsect/fat.asm trunk/reactos/boot/freeldr/freeldr/arch/i386/fathelp.asm Modified: trunk/reactos/boot/freeldr/bootsect/fat.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat.… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat.asm [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat.asm [iso-8859-1] Thu Jul 22 03:29:25 2010 @@ -208,11 +208,11 @@ ; to the helper code. Skip the first three bytes ; because they contain a jump instruction to skip ; over the helper code in the FreeLoader image. - ;jmp 0000:8003h + ;jmp 0000:9003h push 0 ; push segment (0x0000) - mov eax, [0x8000 + 0xA8] ; load the RVA of the EntryPoint into eax - add eax, 0x8003 ; RVA -> VA and skip 3 bytes (jump to fathelper code) - push ax ; push offset + mov bx, [0x8000 + 0xA8] ; load the RVA of the EntryPoint into eax + add bx, 0x8003 ; RVA -> VA and skip 3 bytes (jump to fathelper code) + push bx ; push offset retf ; Transfer control to FreeLoader Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/fathelp.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/fathelp.asm [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/fathelp.asm [iso-8859-1] Thu Jul 22 03:29:25 2010 @@ -125,10 +125,12 @@ LoadFile_Done: mov dl,BYTE [BYTE bp+BootDrive] ; Load the boot drive into DL mov dh,[BootPartition] ; Load the boot partition into DH - push WORD 0x0000 - push WORD 0x8000 ; We will do a far return to 0000:8000h - retf ; Transfer control to ROSLDR - + + push 0 ; push segment (0x0000) + mov bx, [0x8000 + 0xA8] ; load the RVA of the EntryPoint into eax + add bx, 0x8000 ; RVA -> VA and skip 3 bytes (jump to fathelper code) + push bx ; push offset + retf ; Transfer control to FreeLoader ; Reads the entire FAT into memory at 7000:0000 ReadFatIntoMemory:

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2010