Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[cgutman] 52355: [VIDEOPRT] - Initialize PnP IRPs with the correct status
by cgutman＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: cgutman Date: Sun Jun 19 01:40:10 2011 New Revision: 52355 URL: http://svn.reactos.org/svn/reactos?rev=52355&view=rev Log: [VIDEOPRT] - Initialize PnP IRPs with the correct status Modified: trunk/reactos/drivers/video/videoprt/agp.c Modified: trunk/reactos/drivers/video/videoprt/agp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/agp… ============================================================================== --- trunk/reactos/drivers/video/videoprt/agp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/agp.c [iso-8859-1] Sun Jun 19 01:40:10 2011 @@ -56,8 +56,8 @@ IoStatusBlock); /* PNP IRPs are always initialized with a status code of - STATUS_NOT_IMPLEMENTED */ - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + STATUS_NOT_SUPPORTED */ + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; IrpSp = IoGetNextIrpStackLocation(Irp);

1 0

[akhaldi] 52354: [XMLLITE_WINETEST] * Fix msvc build.
by akhaldi＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: akhaldi Date: Sat Jun 18 23:04:39 2011 New Revision: 52354 URL: http://svn.reactos.org/svn/reactos?rev=52354&view=rev Log: [XMLLITE_WINETEST] * Fix msvc build. Modified: trunk/rostests/winetests/xmllite/CMakeLists.txt trunk/rostests/winetests/xmllite/reader.c Modified: trunk/rostests/winetests/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/CMakeLi… ============================================================================== --- trunk/rostests/winetests/xmllite/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/CMakeLists.txt [iso-8859-1] Sat Jun 18 23:04:39 2011 @@ -1,10 +1,13 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) add_executable(xmllite_winetest reader.c testlist.c) target_link_libraries(xmllite_winetest wine) + +if(MSVC) + target_link_libraries(xmllite_winetest uuid) +endif() + set_module_type(xmllite_winetest win32cui) add_importlibs(xmllite_winetest xmllite ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET xmllite_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.… ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Sat Jun 18 23:04:39 2011 @@ -32,8 +32,8 @@ DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); -HRESULT WINAPI (*pCreateXmlReader)(REFIID riid, void **ppvObject, IMalloc *pMalloc); -HRESULT WINAPI (*pCreateXmlReaderInputWithEncodingName)(IUnknown *stream, +HRESULT (WINAPI *pCreateXmlReader)(REFIID riid, void **ppvObject, IMalloc *pMalloc); +HRESULT (WINAPI *pCreateXmlReaderInputWithEncodingName)(IUnknown *stream, IMalloc *pMalloc, LPCWSTR encoding, BOOL hint,

1 0

[akhaldi] 52353: [GLU32] * Fix linking in msvc build. * Remove /OPT:NOWIN98 linker flag.
by akhaldi＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: akhaldi Date: Sat Jun 18 22:51:34 2011 New Revision: 52353 URL: http://svn.reactos.org/svn/reactos?rev=52353&view=rev Log: [GLU32] * Fix linking in msvc build. * Remove /OPT:NOWIN98 linker flag. Modified: trunk/reactos/dll/win32/glu32/CMakeLists.txt trunk/reactos/dll/win32/glu32/include/gluos.h Modified: trunk/reactos/dll/win32/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:51:34 2011 @@ -109,7 +109,10 @@ add_library(glu32 SHARED ${SOURCE}) set_entrypoint(glu32 0) -target_link_libraries(glu32 stlport -lsupc++ -lgcc -lmingw32 oldnames) + +if(NOT MSVC) + target_link_libraries(glu32 stlport -lsupc++ -lgcc -lmingw32 oldnames) +endif() add_importlibs(glu32 opengl32 Modified: trunk/reactos/dll/win32/glu32/include/gluos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/include/gl… ============================================================================== --- trunk/reactos/dll/win32/glu32/include/gluos.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/include/gluos.h [iso-8859-1] Sat Jun 18 22:51:34 2011 @@ -108,9 +108,11 @@ #pragma warning(disable : 4761) #endif +/* #if defined(_MSC_VER) && _MSC_VER >= 1200 #pragma comment(linker, "/OPT:NOWIN98") #endif +*/ #ifndef GLAPIENTRY #define GLAPIENTRY APIENTRY

1 0

[akhaldi] 52352: [CMAKE] * Remove duplicate _DLL and __USE_CRTIMP definitions. * Link some modules to uuid/oldnames in msvc build.
by akhaldi＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: akhaldi Date: Sat Jun 18 22:02:28 2011 New Revision: 52352 URL: http://svn.reactos.org/svn/reactos?rev=52352&view=rev Log: [CMAKE] * Remove duplicate _DLL and __USE_CRTIMP definitions. * Link some modules to uuid/oldnames in msvc build. Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt trunk/rostests/winetests/comdlg32/CMakeLists.txt trunk/rostests/winetests/inetcomm/CMakeLists.txt trunk/rostests/winetests/itss/CMakeLists.txt trunk/rostests/winetests/jscript/CMakeLists.txt trunk/rostests/winetests/msctf/CMakeLists.txt trunk/rostests/winetests/mstask/CMakeLists.txt trunk/rostests/winetests/msvcrt/CMakeLists.txt trunk/rostests/winetests/qmgr/CMakeLists.txt Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) @@ -38,6 +36,11 @@ add_executable(comctl32_winetest ${SOURCE}) target_link_libraries(comctl32_winetest wine) + +if(MSVC) + target_link_libraries(comctl32_winetest uuid) +endif() + set_module_type(comctl32_winetest win32cui) add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET comctl32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comdlg32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE filedlg.c @@ -12,6 +10,11 @@ add_executable(comdlg32_winetest ${SOURCE}) target_link_libraries(comdlg32_winetest wine) + +if(MSVC) + target_link_libraries(comdlg32_winetest uuid) +endif() + set_module_type(comdlg32_winetest win32cui) add_importlibs(comdlg32_winetest comdlg32 winspool user32 gdi32 msvcrt kernel32 ntdll) add_cd_file(TARGET comdlg32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetcomm/CMakeL… ============================================================================== --- trunk/rostests/winetests/inetcomm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/inetcomm/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE mimeintl.c @@ -10,6 +8,11 @@ add_executable(inetcomm_winetest ${SOURCE}) target_link_libraries(inetcomm_winetest wine) + +if(MSVC) + target_link_libraries(inetcomm_winetest uuid) +endif() + set_module_type(inetcomm_winetest win32cui) add_importlibs(inetcomm_winetest inetcomm oleaut32 ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET inetcomm_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/itss/CMakeLists… ============================================================================== --- trunk/rostests/winetests/itss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/itss/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,12 +1,15 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) set_rc_compiler() add_executable(itss_winetest protocol.c testlist.c rsrc.rc) target_link_libraries(itss_winetest wine) + +if(MSVC) + target_link_libraries(itss_winetest uuid) +endif() + set_module_type(itss_winetest win32cui) add_importlibs(itss_winetest ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET itss_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/CMakeLi… ============================================================================== --- trunk/rostests/winetests/jscript/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) set_rc_compiler() @@ -14,6 +12,11 @@ add_executable(jscript_winetest ${SOURCE}) target_link_libraries(jscript_winetest wine) + +if(MSVC) + target_link_libraries(jscript_winetest uuid) +endif() + set_module_type(jscript_winetest win32cui) add_importlibs(jscript_winetest ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET jscript_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/msctf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/CMakeList… ============================================================================== --- trunk/rostests/winetests/msctf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msctf/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,10 +1,13 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) add_executable(msctf_winetest inputprocessor.c testlist.c) target_link_libraries(msctf_winetest wine) + +if(MSVC) + target_link_libraries(msctf_winetest uuid) +endif() + set_module_type(msctf_winetest win32cui) add_importlibs(msctf_winetest ole32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET msctf_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/mstask/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mstask/CMakeLis… ============================================================================== --- trunk/rostests/winetests/mstask/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mstask/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE task.c @@ -11,6 +9,11 @@ add_executable(mstask_winetest ${SOURCE}) target_link_libraries(mstask_winetest wine) + +if(MSVC) + target_link_libraries(mstask_winetest uuid) +endif() + set_module_type(mstask_winetest win32cui) add_importlibs(mstask_winetest ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET mstask_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/CMakeLis… ============================================================================== --- trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,8 +1,7 @@ add_definitions( -D__ROS_LONG64__ - -D_CRT_NONSTDC_NO_DEPRECATE - -D_DLL -D__USE_CRTIMP) + -D_CRT_NONSTDC_NO_DEPRECATE) list(APPEND SOURCE cpp.c @@ -22,6 +21,11 @@ time.c) add_executable(msvcrt_winetest ${SOURCE}) + +if(MSVC) + target_link_libraries(msvcrt_winetest oldnames) +endif() + set_module_type(msvcrt_winetest win32cui) add_importlibs(msvcrt_winetest msvcrt kernel32 ntdll) add_cd_file(TARGET msvcrt_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/qmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qmgr/CMakeLists… ============================================================================== --- trunk/rostests/winetests/qmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/qmgr/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE enum_files.c @@ -13,6 +11,11 @@ add_executable(qmgr_winetest ${SOURCE}) target_link_libraries(qmgr_winetest wine) + +if(MSVC) + target_link_libraries(qmgr_winetest uuid) +endif() + set_module_type(qmgr_winetest win32cui) add_importlibs(qmgr_winetest ole32 shlwapi user32 msvcrt kernel32 ntdll) add_cd_file(TARGET qmgr_winetest DESTINATION reactos/bin FOR all)

1 0

[akhaldi] 52351: [WINEMP3.ACM] * Fix msvc build.
by akhaldi＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: akhaldi Date: Sat Jun 18 21:44:52 2011 New Revision: 52351 URL: http://svn.reactos.org/svn/reactos?rev=52351&view=rev Log: [WINEMP3.ACM] * Fix msvc build. Modified: trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt Modified: trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/CMak… ============================================================================== --- trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Sat Jun 18 21:44:52 2011 @@ -15,7 +15,7 @@ set_entrypoint(winemp3.acm 0) set_target_properties(winemp3.acm PROPERTIES SUFFIX "") -target_link_libraries(winemp3.acm wine libmpg123) +target_link_libraries(winemp3.acm wine libmpg123 oldnames) add_importlibs(winemp3.acm winmm

1 0

[akhaldi] 52350: [CMAKE] * Temporarily add liboldnames.a, I mean, oldnames.lib, to the importlibs folder, until we get one for msvc. * Link crtdll to oldnames in msvc build.
by akhaldi＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: akhaldi Date: Sat Jun 18 21:39:27 2011 New Revision: 52350 URL: http://svn.reactos.org/svn/reactos?rev=52350&view=rev Log: [CMAKE] * Temporarily add liboldnames.a, I mean, oldnames.lib, to the importlibs folder, until we get one for msvc. * Link crtdll to oldnames in msvc build. Added: trunk/reactos/importlibs/oldnames.lib (with props) Modified: trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/win32/crtdll/CMakeLists.txt Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=52350… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Jun 18 21:39:27 2011 @@ -29,7 +29,7 @@ set(SPEC2DEF_ARCH i386) endif() -link_directories("${REACTOS_BINARY_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/sdk/crt) +link_directories(${REACTOS_SOURCE_DIR}/importlibs ${REACTOS_BINARY_DIR}/importlibs ${REACTOS_BINARY_DIR}/lib/sdk/crt) set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") Modified: trunk/reactos/dll/win32/crtdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] Sat Jun 18 21:39:27 2011 @@ -23,9 +23,11 @@ set_entrypoint(crtdll DllMain@12) -target_link_libraries(crtdll - wine - crt) +target_link_libraries(crtdll wine crt) + +if(MSVC) + target_link_libraries(crtdll oldnames) +endif() add_importlibs(crtdll kernel32 ntdll) add_pch(crtdll precomp.h) Added: trunk/reactos/importlibs/oldnames.lib URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/oldnames.lib?re… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/importlibs/oldnames.lib ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[akhaldi] 52349: [CMAKE] * Add missing dependency. * Properly set the compiler flag.
by akhaldi＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: akhaldi Date: Sat Jun 18 20:47:44 2011 New Revision: 52349 URL: http://svn.reactos.org/svn/reactos?rev=52349&view=rev Log: [CMAKE] * Add missing dependency. * Properly set the compiler flag. Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sat Jun 18 20:47:44 2011 @@ -2,7 +2,7 @@ include_directories(include/internal/mingw-w64) if(NOT MSVC) - add_definitions(-Wno-main) + add_compiler_flags(-Wno-main) endif() list(APPEND MSVCRTEX_SOURCE @@ -65,4 +65,4 @@ target_link_libraries(msvcrtex oldnames) endif() -add_dependencies(msvcrtex psdk) +add_dependencies(msvcrtex psdk asm)

1 0

[tkreuzer] 52348: [FREELDR] More syntax fixes for ML
by tkreuzer＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: tkreuzer Date: Sat Jun 18 19:51:26 2011 New Revision: 52348 URL: http://svn.reactos.org/svn/reactos?rev=52348&view=rev Log: [FREELDR] More syntax fixes for ML Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] Sat Jun 18 19:51:26 2011 @@ -39,17 +39,17 @@ mov ss, ax /* Setup protected mode stack */ - mov esp, dword ptr [stack32] + mov esp, dword ptr ds:[stack32] /* Load the IDT */ #ifdef _USE_ML - lidt fword ptr [i386idtptr] + lidt fword ptr ds:[i386idtptr] #else lidt i386idtptr #endif /* Continue execution */ - jmp dword ptr [ContinueAddress] + jmp dword ptr ds:[ContinueAddress] ContinueAddress: .long _FrldrStartup @@ -60,9 +60,9 @@ /* Store BootDrive and BootPartition */ xor eax, eax mov al, dl - mov dword ptr [_FrldrBootDrive], eax + mov dword ptr ds:[_FrldrBootDrive], eax mov al, dh - mov dword ptr [_FrldrBootPartition], eax + mov dword ptr ds:[_FrldrBootPartition], eax /* Patch long jump with real mode entry point */ mov eax, dword ptr ds:[BSS_RealModeEntry]

1 0

[tkreuzer] 52347: [FREELDR] Fix syntax for ML
by tkreuzer＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: tkreuzer Date: Sat Jun 18 19:41:01 2011 New Revision: 52347 URL: http://svn.reactos.org/svn/reactos?rev=52347&view=rev Log: [FREELDR] Fix syntax for ML Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc trunk/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc trunk/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc [iso-8859-1] Sat Jun 18 19:41:01 2011 @@ -49,8 +49,8 @@ PUBLIC start start: - // This code is loaded at 0000:8000 so we have to - // encode a jmp instruction to jump to 0000:8200 + // This code is loaded at 0000:F800 so we have to + // encode a jmp instruction to jump to 0000:FA00 .byte HEX(e9), HEX(fd), HEX(01) // Now starts the extra boot code that we will store @@ -217,7 +217,8 @@ ret -msgLoading: .asciz "Loading FreeLoader...", CR, LF +msgLoading: + .ascii "Loading FreeLoader...", CR, LF, NUL .org 510 // Pad to 510 bytes .word HEX(0aa55) // BootSector signature Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc [iso-8859-1] Sat Jun 18 19:41:01 2011 @@ -2,7 +2,7 @@ PnpBiosGetDeviceNodeCount: - mov ax, word ptr [BSS_PnpBiosDataSegment] + mov ax, word ptr ds:[BSS_PnpBiosDataSegment] push ax push cs @@ -27,16 +27,16 @@ PnpBiosGetDeviceNode: /* push bios segment */ - mov ax, word ptr [BSS_PnpBiosDataSegment] + mov ax, word ptr ds:[BSS_PnpBiosDataSegment] push ax /* push control flag */ push 1 /* push pointer to node buffer (segment/offset) */ - mov ax, word ptr [BSS_PnpBiosBufferSegment] + mov ax, word ptr ds:[BSS_PnpBiosBufferSegment] push ax - mov ax, word ptr [BSS_PnpBiosBufferOffset] + mov ax, word ptr ds:[BSS_PnpBiosBufferOffset] push ax /* push pointer to node number (segment/offset) */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc [iso-8859-1] Sat Jun 18 19:41:01 2011 @@ -20,11 +20,11 @@ PxeCallApi: - mov ax, [BSS_PxeBufferSegment] + mov ax, word ptr ds:[BSS_PxeBufferSegment] push ax - mov ax, [BSS_PxeBufferOffset] + mov ax, word ptr ds:[BSS_PxeBufferOffset] push ax - mov ax, [BSS_PxeFunction] + mov ax, word ptr ds:[BSS_PxeFunction] push ax call dword ptr ds:[BSS_PxeEntryPoint] add esp, 6

1 0

[tkreuzer] 52346: [FREELDR] - Change base addresses to 0xF800 (realmode code) and 0x10000 (PE file) - use FREELDR_BASE constant in bootsectors - Use es segment to address PE file from realmode
by tkreuzer＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: tkreuzer Date: Sat Jun 18 17:19:28 2011 New Revision: 52346 URL: http://svn.reactos.org/svn/reactos?rev=52346&view=rev Log: [FREELDR] - Change base addresses to 0xF800 (realmode code) and 0x10000 (PE file) - use FREELDR_BASE constant in bootsectors - Use es segment to address PE file from realmode Modified: trunk/reactos/boot/freeldr/bootsect/fat.S trunk/reactos/boot/freeldr/bootsect/fat32.S trunk/reactos/boot/freeldr/bootsect/isoboot.S trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h Modified: trunk/reactos/boot/freeldr/bootsect/fat.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat.… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat.S [iso-8859-1] Sat Jun 18 17:19:28 2011 @@ -39,6 +39,7 @@ // boots dramatically. #include <asm.inc> +#include "../freeldr/include/arch/pc/x86common.h" #define BP_REL(x) [bp+x-offset start] @@ -210,7 +211,7 @@ // ES:DI has dir entry (ES:DI == 07E0:XXXX) mov ax, word ptr es:[di + HEX(1a)] // Get start cluster push ax // Save start cluster - push HEX(800) // Put 800h on the stack and load it + push FREELDR_BASE / 16 // Put load segment on the stack and load it pop es // Into ES so that we load the cluster at 0000:8000 call ReadCluster // Read the cluster pop ax // Restore start cluster of FreeLoader @@ -227,7 +228,7 @@ // 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. - ljmp16 0, HEX(8003) + ljmp16 0, FREELDR_BASE + 3 Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] Sat Jun 18 17:19:28 2011 @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ #include <asm.inc> +#include "../freeldr/include/arch/pc/x86common.h" #define BP_REL(x) [bp+x-offset start] @@ -390,7 +391,7 @@ jmp PrintFileSystemError // If so exit with error InitializeLoadSegment: - mov bx, HEX(800) + mov bx, FREELDR_BASE / 16 mov es, bx LoadFile: @@ -421,7 +422,7 @@ mov dh, byte ptr ds:[BootPartition] // Load boot partition into DH /* Transfer execution to the bootloader */ - ljmp16 0, HEX(8000) + ljmp16 0, FREELDR_BASE // Returns the FAT entry for a given cluster number // On entry EAX has cluster number Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] Sat Jun 18 17:19:28 2011 @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ #include <asm.inc> +#include "../freeldr/include/arch/pc/x86common.h" .code16 @@ -359,11 +360,7 @@ call crlf #endif -#ifdef _USE_ML - mov bx, HEX(F000) // bx = load address -#else - mov bx, HEX(8000) // bx = load address -#endif + mov bx, FREELDR_BASE // bx = load address mov si, di // restore file pointer mov cx, HEX(0FFFF) // load the whole file call getfssec // get the whole file @@ -378,11 +375,7 @@ mov dh, 0 // dh = boot partition /* Transfer execution to the bootloader */ -#ifdef _USE_ML - ljmp16 0, HEX(F000) -#else - ljmp16 0, HEX(8000) -#endif + ljmp16 0, FREELDR_BASE // // searchdir: Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sat Jun 18 17:19:28 2011 @@ -1,16 +1,9 @@ if(ARCH MATCHES i386) - if (NOT MSVC) CreateBootSectorTarget2(frldr16 ${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/i386.S ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - 8000) - else() - CreateBootSectorTarget2(frldr16 - ${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/i386.S - ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - F000) - endif() + F800) endif() include_directories(BEFORE include) @@ -175,12 +168,11 @@ if(NOT MSVC) set_target_properties(freeldr_pe PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk") - set_image_base(freeldr_pe 0x9000) else() set_target_properties(freeldr_pe PROPERTIES LINK_FLAGS "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION") - set_image_base(freeldr_pe 0x10000) -endif() - +endif() + +set_image_base(freeldr_pe 0x10000) set_subsystem(freeldr_pe native) set_entrypoint(freeldr_pe RealEntryPoint) @@ -224,12 +216,11 @@ if(NOT MSVC) set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") - set_image_base(setupldr_pe 0x9000) else() set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "/DRIVER /SECTION:.text,ERWP,ALIGN=0x1000" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") - set_image_base(setupldr_pe 0x10000) -endif() - +endif() + +set_image_base(setupldr_pe 0x10000) set_subsystem(setupldr_pe native) set_entrypoint(setupldr_pe RealEntryPoint) Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc [iso-8859-1] Sat Jun 18 17:19:28 2011 @@ -74,7 +74,7 @@ pop ax // AX has start cluster of freeldr.sys - mov bx, HEX(800) + mov bx, FREELDR_BASE / 16 mov es,bx LoadFile: Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] Sat Jun 18 17:19:28 2011 @@ -33,16 +33,24 @@ /* Safe real mode entry point in shared memory */ mov dword ptr ds:[BSS_RealModeEntry], offset switch_to_real16 + /* Address the image with es segment */ + mov ax, FREELDR_PE_BASE / 16 + mov es, ax + /* Get address of optional header */ - mov eax, dword ptr ds:[FREELDR_PE_BASE + IMAGE_DOS_HEADER_e_lfanew] - add eax, FREELDR_PE_BASE + 4 + IMAGE_FILE_HEADER_SIZE + mov eax, dword ptr es:[IMAGE_DOS_HEADER_e_lfanew] + add eax, 4 + IMAGE_FILE_HEADER_SIZE /* Get address of entry point */ - mov eax, dword ptr ds:[eax + IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint] + mov eax, dword ptr es:[eax + IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint] add eax, FREELDR_PE_BASE /* Save entry point */ mov dword ptr ds:[pm_entrypoint], eax + + /* Restore es */ + xor ax, ax + mov es, ax jmp exit_to_protected Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] Sat Jun 18 17:19:28 2011 @@ -6,13 +6,8 @@ /* Memory layout */ #define STACK16ADDR HEX(6F00) /* The 16-bit stack top will be at 0000:6F00 */ #define BSS_START HEX(6F00) -#if defined(_USE_ML) || defined(_MSC_VER) -#define FREELDR_BASE HEX(f000) +#define FREELDR_BASE HEX(F800) #define FREELDR_PE_BASE HEX(10000) -#else -#define FREELDR_BASE HEX(8000) -#define FREELDR_PE_BASE HEX(9000) -#endif #define STACK32ADDR HEX(78000) /* The 32-bit stack top will be at 7000:8000, or 0x78000 */ #define BIOSCALLBUFFER HEX(78000) /* Buffer to store temporary data for any Int386() call */ #define BIOSCALLBUFSEGMENT HEX(7800) /* Buffer to store temporary data for any Int386() call */

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
46
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 June 2011