Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[fireball] 50107: [NTOS] - Fix incompatibility with newer KiEnterTrap implementation. Should fix spontaneous issues I possibly introduced with my previous commit, and finally fixes that VirtualBox ...

by fireball＠svn.reactos.org

Author: fireball Date: Wed Dec 22 21:27:31 2010 New Revision: 50107 URL: http://svn.reactos.org/svn/reactos?rev=50107&view=rev Log: [NTOS] - Fix incompatibility with newer KiEnterTrap implementation. Should fix spontaneous issues I possibly introduced with my previous commit, and finally fixes that VirtualBox issue. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Wed Dec 22 21:27:31 2010 @@ -140,10 +140,10 @@ /* Initialize TrapFrame segment registers with sane values */ mov eax, 0x23 mov ecx, fs - mov [esp - FrameSize + KTRAP_FRAME_DS], eax - mov [esp - FrameSize + KTRAP_FRAME_ES], eax - mov [esp - FrameSize + KTRAP_FRAME_FS], ecx - mov dword ptr [esp - FrameSize + KTRAP_FRAME_GS], 0 + mov [esp + KTRAP_FRAME_DS], eax + mov [esp + KTRAP_FRAME_ES], eax + mov [esp + KTRAP_FRAME_FS], ecx + mov dword ptr [esp + KTRAP_FRAME_GS], 0 else

13 years, 9 months

[tkreuzer] 50106: [NTDLL] Fix harderror status on machine type mismatch and pass file name.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 22 20:20:52 2010 New Revision: 50106 URL: http://svn.reactos.org/svn/reactos?rev=50106&view=rev Log: [NTDLL] Fix harderror status on machine type mismatch and pass file name. Modified: trunk/reactos/dll/ntdll/ldr/startup.c Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Wed Dec 22 20:20:52 2010 @@ -330,7 +330,6 @@ SYSTEM_BASIC_INFORMATION SystemInformation; NTSTATUS Status; PVOID BaseAddress = SystemArgument1; - ULONG ErrorResponse; DPRINT("LdrpInit()\n"); DPRINT("Peb %p\n", Peb); @@ -354,14 +353,6 @@ { DPRINT1("Image has bad header\n"); ZwTerminateProcess(NtCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT); - } - - if (NTHeaders->FileHeader.Machine != IMAGE_FILE_MACHINE_NATIVE) - { - DPRINT1("Image is for a foreign architecture (0x%x).\n", - NTHeaders->FileHeader.Machine); - NtRaiseHardError(STATUS_IMAGE_MACHINE_TYPE_MISMATCH, 0, 0, NULL, OptionOk, &ErrorResponse); - ZwTerminateProcess(NtCurrentProcess(), STATUS_IMAGE_MACHINE_TYPE_MISMATCH); } /* normalize process parameters */ @@ -408,6 +399,47 @@ ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); } + /* Check for correct machine type */ + if (NTHeaders->FileHeader.Machine != IMAGE_FILE_MACHINE_NATIVE) + { + ULONG_PTR HardErrorParameters[1]; + UNICODE_STRING ImageNameU; + ANSI_STRING ImageNameA; + WCHAR *Ptr; + ULONG ErrorResponse; + + DPRINT1("Image %wZ is for a foreign architecture (0x%x).\n", + &Peb->ProcessParameters->ImagePathName, NTHeaders->FileHeader.Machine); + + /* Get the full image path name */ + ImageNameU = Peb->ProcessParameters->ImagePathName; + + /* Get the file name */ + Ptr = Peb->ProcessParameters->ImagePathName.Buffer + + (Peb->ProcessParameters->ImagePathName.Length / sizeof(WCHAR)) -1; + while ((Ptr >= Peb->ProcessParameters->ImagePathName.Buffer) && + (*Ptr != L'\\')) Ptr--; + ImageNameU.Buffer = Ptr + 1; + ImageNameU.Length = Peb->ProcessParameters->ImagePathName.Length - + (ImageNameU.Buffer - Peb->ProcessParameters->ImagePathName.Buffer) * sizeof(WCHAR); + ImageNameU.MaximumLength = ImageNameU.Length; + + /*`Convert to ANSI, harderror message needs that */ + RtlUnicodeStringToAnsiString(&ImageNameA, &ImageNameU, TRUE); + + /* Raise harderror */ + HardErrorParameters[0] = (ULONG_PTR)&ImageNameA; + NtRaiseHardError(STATUS_IMAGE_MACHINE_TYPE_MISMATCH_EXE, + 1, + 1, + HardErrorParameters, + OptionOk, + &ErrorResponse); + + RtlFreeAnsiString(&ImageNameA); + ZwTerminateProcess(NtCurrentProcess(), STATUS_IMAGE_MACHINE_TYPE_MISMATCH_EXE); + } + /* initialized vectored exception handling */ RtlpInitializeVectoredExceptionHandling();

13 years, 9 months

[rmessiant] 50105: [I8042PRT] - Calculate packet type according to PS/2++ spec (CID 1810). - Fix technical detail in comment to match spec.

by rmessiant＠svn.reactos.org

Author: rmessiant Date: Wed Dec 22 19:09:25 2010 New Revision: 50105 URL: http://svn.reactos.org/svn/reactos?rev=50105&view=rev Log: [I8042PRT] - Calculate packet type according to PS/2++ spec (CID 1810). - Fix technical detail in comment to match spec. Modified: trunk/reactos/drivers/input/i8042prt/ps2pp.c Modified: trunk/reactos/drivers/input/i8042prt/ps2pp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/ps2… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/ps2pp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/ps2pp.c [iso-8859-1] Wed Dec 22 19:09:25 2010 @@ -31,7 +31,7 @@ * a normal packet. * * Otherwise, the packet is different, like this: - * 1: E 1 b3 b2 x x x x + * 1: E 1 b3 b2 1 x x x * 2: x x b1 b0 x1 x0 1 0 * 3: x x x x x x x1 x0 * @@ -93,8 +93,8 @@ } /* Now get the packet type */ - PktType = ((DeviceExtension->MouseLogiBuffer[0] & 0x30) >> 4) & - ((DeviceExtension->MouseLogiBuffer[1] & 0x30) >> 6); + PktType = ((DeviceExtension->MouseLogiBuffer[0] & 0x30) >> 2) | + ((DeviceExtension->MouseLogiBuffer[1] & 0x30) >> 4); switch (PktType) {

13 years, 9 months

[janderwald] 50104: [KS] - Add sanity checks - Acquire device entry lock before dealing with device entries - Fix acquiring bus device extension for parent bus device object - Store result in irp i...

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Dec 22 18:53:08 2010 New Revision: 50104 URL: http://svn.reactos.org/svn/reactos?rev=50104&view=rev Log: [KS] - Add sanity checks - Acquire device entry lock before dealing with device entries - Fix acquiring bus device extension for parent bus device object - Store result in irp io status block - get install interface from assoicated system buffer - Fixes install of new audio devices with ros ks in windows - Tested with VBOX 3.2.10+WINXP+SP3 Modified: branches/audio-bringup/drivers/ksfilter/ks/filter.c branches/audio-bringup/drivers/ksfilter/ks/swenum.c Modified: branches/audio-bringup/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/filter.c [iso-8859-1] Wed Dec 22 18:53:08 2010 @@ -1858,7 +1858,6 @@ if (!KsGateCaptureThreshold(Gate)) { /* filter control gate is closed */ - DPRINT1("Gate %p Closed %x\n", Gate, Gate->Count); return; } DPRINT1("processing\n"); Modified: branches/audio-bringup/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/swenum.c [iso-8859-1] Wed Dec 22 18:53:08 2010 @@ -972,6 +972,9 @@ HANDLE hKey, hDeviceKey, hInterfaceKey, hReferenceKey; NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; + + /* sanity check */ + ASSERT(InstallInterface); /* calculate length */ Length = wcslen(InstallInterface->ReferenceString); @@ -1059,13 +1062,18 @@ PLIST_ENTRY Entry; PBUS_DEVICE_ENTRY DeviceEntry; PSWENUM_INSTALL_INTERFACE InstallInterface; + KIRQL OldLevel; PBUS_INSTALL_ENUM_CONTEXT Context = (PBUS_INSTALL_ENUM_CONTEXT)Ctx; /* get current irp stack location */ IoStack = IoGetCurrentIrpStackLocation(Context->Irp); /* get install request */ - InstallInterface = (PSWENUM_INSTALL_INTERFACE)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + InstallInterface = (PSWENUM_INSTALL_INTERFACE)Context->Irp->AssociatedIrp.SystemBuffer; + + /* sanity check */ + ASSERT(InstallInterface); + ASSERT(Context->BusDeviceExtension); if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(SWENUM_INSTALL_INTERFACE)) { @@ -1094,6 +1102,9 @@ /* done */ return; } + + /* acquire device entry lock */ + KeAcquireSpinLock(&Context->BusDeviceExtension->Lock, &OldLevel); /* now iterate all device entries */ Entry = Context->BusDeviceExtension->Common.Entry.Flink; @@ -1114,7 +1125,13 @@ break; } } - } + + /* move to next entry */ + Entry = Entry->Flink; + } + + /* release device entry lock */ + KeReleaseSpinLock(&Context->BusDeviceExtension->Lock, OldLevel); /* signal that bus driver relations has changed */ IoInvalidateDeviceRelations(Context->BusDeviceExtension->PhysicalDeviceObject, BusRelations); @@ -1364,7 +1381,7 @@ DeviceExtension = (PDEV_EXTENSION)IoStack->DeviceObject->DeviceExtension; /* get bus device extension */ - BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)DeviceExtension->Ext->BusDeviceExtension; + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)DeviceExtension->Ext; /* sanity checks */ ASSERT(BusDeviceExtension); @@ -1715,7 +1732,7 @@ PDEV_EXTENSION DeviceExtension; PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; - DPRINT1("KsGetBusEnumPnpDeviceObject\n"); + DPRINT1("KsInstallBusEnumInterface\n"); /* get current irp stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -1737,7 +1754,7 @@ DeviceExtension = (PDEV_EXTENSION)IoStack->DeviceObject->DeviceExtension; /* get bus device extension */ - BusDeviceExtension = DeviceExtension->Ext->BusDeviceExtension; + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)DeviceExtension->Ext; /* initialize context */ @@ -1748,9 +1765,11 @@ /* queue the work item */ ExQueueWorkItem(&Context.WorkItem, DelayedWorkQueue); - /* wait for completion */ KeWaitForSingleObject(&Context.Event, Executive, KernelMode, FALSE, NULL); + + /* store result */ + Irp->IoStatus.Status = Context.Status; /* done */ return Context.Status;

13 years, 9 months

[tkreuzer] 50103: [WIN32K] Silence 3 DPRINTs

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 22 18:30:59 2010 New Revision: 50103 URL: http://svn.reactos.org/svn/reactos?rev=50103&view=rev Log: [WIN32K] Silence 3 DPRINTs Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Wed Dec 22 18:30:59 2010 @@ -239,7 +239,7 @@ ptiMouse = PsGetCurrentThreadWin32Thread(); ptiMouse->TIF_flags |= TIF_SYSTEMTHREAD; - DPRINT1("\nMouse Thread 0x%x \n", ptiMouse); + DPRINT("Mouse Thread 0x%x \n", ptiMouse); KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3); @@ -539,7 +539,7 @@ ptiKeyboard = PsGetCurrentThreadWin32Thread(); ptiKeyboard->TIF_flags |= TIF_SYSTEMTHREAD; - DPRINT1("\nKeyboard Thread 0x%x \n", ptiKeyboard); + DPRINT("Keyboard Thread 0x%x \n", ptiKeyboard); KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3); @@ -902,7 +902,7 @@ ptiRawInput = PsGetCurrentThreadWin32Thread(); ptiRawInput->TIF_flags |= TIF_SYSTEMTHREAD; - DPRINT1("\nRaw Input Thread 0x%x \n", ptiRawInput); + DPRINT("Raw Input Thread 0x%x \n", ptiRawInput); KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3); @@ -1342,7 +1342,7 @@ /* All messages have to contain the cursor point. */ Msg.pt = gpsi->ptCursor; - + KbdHookData.vkCode = vk_hook; KbdHookData.scanCode = ki->wScan; KbdHookData.flags = flags >> 8;

13 years, 9 months

[greatlrd] 50102: [win32k] function DxEngGetHdevData Activate support for PDev->pldev it seam have been implement in reactos now

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Dec 22 17:55:15 2010 New Revision: 50102 URL: http://svn.reactos.org/svn/reactos?rev=50102&view=rev Log: [win32k] function DxEngGetHdevData Activate support for PDev->pldev it seam have been implement in reactos now Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Wed Dec 22 17:55:15 2010 @@ -357,9 +357,8 @@ retVal = (DWORD_PTR) PDev->gdiinfo.flRaster & RC_PALETTE; break; case DxEGShDevData_ldev: - DPRINT1("DxEGShDevData_ldev not supported yet\n"); - // ATM we do not support the Loader Device driver structure. -// retVal = (DWORD) PDev->pldev; + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_ldev \n"); + retVal = (DWORD_PTR) PDev->pldev; break; case DxEGShDevData_GDev: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_GDev\n"); @@ -441,8 +440,7 @@ * * @remarks. * We do not have type 2 implemented yet -* -*--*/ +**--*/ DWORD_PTR APIENTRY DxEngGetDCState(HDC hDC,

13 years, 9 months

[akhaldi] 50101: [CMAKE] - Add rostests to build when the folder exists. - Alter the importlib target macro to handle definition files along with spec files.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 22 16:37:32 2010 New Revision: 50101 URL: http://svn.reactos.org/svn/reactos?rev=50101&view=rev Log: [CMAKE] - Add rostests to build when the folder exists. - Alter the importlib target macro to handle definition files along with spec files. Added: branches/cmake-bringup/modules/CMakeLists.txt (with props) Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:37:32 2010 @@ -142,6 +142,7 @@ add_subdirectory(hal) add_subdirectory(lib) add_subdirectory(media) +add_subdirectory(modules) add_subdirectory(ntoskrnl) add_subdirectory(subsystems) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=501… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Wed Dec 22 16:37:32 2010 @@ -192,23 +192,37 @@ endforeach() endmacro() -macro(add_importlib_target _spec_file) - get_filename_component(_name ${_spec_file} NAME_WE) +macro(add_importlib_target _exports_file) + + get_filename_component(_name ${_exports_file} NAME_WE) + get_filename_component(_extension ${_exports_file} EXT) + + if (${_extension} STREQUAL ".spec") + if (${ARGC} GREATER 1) + set(DLLNAME_OPTION "-n=${ARGV1}") + else() + set(DLLNAME_OPTION "") + endif() - if (${ARGC} GREATER 1) - set(DLLNAME_OPTION "-n=${ARGV1}") + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a + COMMAND native-spec2def ${DLLNAME_OPTION} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} + COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) + + elseif(${_extension} STREQUAL ".def") + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a + COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) else() - set(DLLNAME_OPTION "") + message(FATAL_ERROR "Unsupported exports file extension: ${_extension}") endif() - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a - COMMAND native-spec2def ${DLLNAME_OPTION} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} - COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) add_custom_target( lib${_name} DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a) + endmacro() macro(spec2def _dllname _spec_file) Added: branches/cmake-bringup/modules/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/modules/CMakeList… ============================================================================== --- branches/cmake-bringup/modules/CMakeLists.txt (added) +++ branches/cmake-bringup/modules/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:37:32 2010 @@ -1,0 +1,4 @@ + +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/rostests/) +add_subdirectory(rostests) +endif() Propchange: branches/cmake-bringup/modules/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=501… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Wed Dec 22 16:37:32 2010 @@ -139,14 +139,14 @@ set(IDL_DLLDATA_ARG /dlldata ) # Thanks MS for creating a stupid linker -macro(add_importlib_target _spec_file) - get_filename_component(_name ${_spec_file} NAME_WE) +macro(add_importlib_target _exports_file) + get_filename_component(_name ${_exports_file} NAME_WE) # Generate the asm stub file and the export def file add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def - COMMAND native-spec2def -@ -r -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) + COMMAND native-spec2def -@ -r -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) # Assemble the stub file add_custom_command(

13 years, 9 months

[akhaldi] 50100: [CMAKE] - Add the apitests to build. - Improve some winetests.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 22 16:33:37 2010 New Revision: 50100 URL: http://svn.reactos.org/svn/reactos?rev=50100&view=rev Log: [CMAKE] - Add the apitests to build. - Improve some winetests. Added: trunk/rostests/apitests/CMakeLists.txt (with props) trunk/rostests/apitests/dciman32/CMakeLists.txt (with props) trunk/rostests/apitests/gdi32/CMakeLists.txt (with props) trunk/rostests/apitests/ntdll/CMakeLists.txt (with props) trunk/rostests/apitests/user32/CMakeLists.txt (with props) trunk/rostests/apitests/w32kdll/CMakeLists.txt (with props) trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt (with props) trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt (with props) trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt (with props) trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt (with props) trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt (with props) trunk/rostests/apitests/w32knapi/CMakeLists.txt (with props) trunk/rostests/apitests/ws2_32/CMakeLists.txt (with props) Modified: trunk/rostests/CMakeLists.txt trunk/rostests/winetests/amstream/CMakeLists.txt trunk/rostests/winetests/powrprof/CMakeLists.txt Modified: trunk/rostests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=50100&… ============================================================================== --- trunk/rostests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,5 +1,5 @@ -#add_subdirectory(apitests) +add_subdirectory(apitests) #add_subdirectory(dibtests) #add_subdirectory(dxtest) #add_subdirectory(regtests) Added: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt (added) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,0 +1,14 @@ + +add_library(apitest apitest.c) + +add_subdirectory(dciman32) +add_subdirectory(gdi32) +#add_subdirectory(ntdll) The asm file needs to be fixed. +add_subdirectory(user32) + +if(ARCH MATCHES i386) +add_subdirectory(w32kdll) +add_subdirectory(w32knapi) +endif() + +add_subdirectory(ws2_32) Propchange: trunk/rostests/apitests/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/dciman32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/dciman32/CMakeLists.txt (added) +++ trunk/rostests/apitests/dciman32/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,0 +1,7 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) + +add_executable(dciman32_apitest DCICreatePrimary.c testlist.c) +target_link_libraries(dciman32_apitest wine) +set_module_type(dciman32_apitest win32cui) +add_importlibs(dciman32_apitest msvcrt kernel32 ntdll) Propchange: trunk/rostests/apitests/dciman32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt (added) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,0 +1,49 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + AddFontResource.c + AddFontResourceEx.c + BeginPath.c + CreateBitmapIndirect.c + CreateCompatibleDC.c + CreateFont.c + CreateFontIndirect.c + CreatePen.c + CreateRectRgn.c + EngAcquireSemaphore.c + EngCreateSemaphore.c + EngDeleteSemaphore.c + EngReleaseSemaphore.c + ExtCreatePen.c + GdiConvertBitmap.c + GdiConvertBrush.c + GdiConvertDC.c + GdiConvertFont.c + GdiConvertPalette.c + GdiConvertRegion.c + GdiDeleteLocalDC.c + GdiGetCharDimensions.c + GdiGetLocalBrush.c + GdiGetLocalDC.c + GdiReleaseLocalDC.c + GdiSetAttrs.c + GetClipRgn.c + GetCurrentObject.c + GetDIBits.c + GetObject.c + GetStockObject.c + GetTextExtentExPoint.c + GetTextFace.c + SelectObject.c + SetDCPenColor.c + SetMapMode.c + SetSysColors.c + SetWindowExtEx.c + SetWorldTransform.c + testlist.c) + +add_executable(gdi32_apitest ${SOURCE}) +target_link_libraries(gdi32_apitest wine ${PSEH_LIB}) +set_module_type(gdi32_apitest win32cui) +add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/apitests/gdi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt (added) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,0 +1,18 @@ + +#add_definitions(-D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + RtlInitializeBitMap.c + ZwContinue.c + testlist.c) + +if(ARCH MATCHES i386) +list(APPEND SOURCE i386/ZwContinue.asm) +endif() + +add_executable(ntdll_apitest ${SOURCE}) +target_link_libraries(ntdll_apitest wine + #${PSEH_LIB} + ) +set_module_type(ntdll_apitest win32cui) +add_importlibs(ntdll_apitest ntdll) Propchange: trunk/rostests/apitests/ntdll/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt (added) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,0 +1,15 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + InitializeLpkHooks.c + RealGetWindowClass.c + ScrollDC.c + ScrollWindowEx.c + GetSystemMetrics.c + testlist.c) + +add_executable(user32_apitest ${SOURCE}) +target_link_libraries(user32_apitest wine) +set_module_type(user32_apitest win32cui) +add_importlibs(user32_apitest gdi32 user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/apitests/user32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32kdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/CMakeLis… ============================================================================== --- trunk/rostests/apitests/w32kdll/CMakeLists.txt (added) +++ trunk/rostests/apitests/w32kdll/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,0 +1,6 @@ + +add_subdirectory(w32kdll_ros) +add_subdirectory(w32kdll_xpsp2) +add_subdirectory(w32kdll_2ksp4) +add_subdirectory(w32kdll_2k3sp2) +add_subdirectory(w32kdll_vista) Propchange: trunk/rostests/apitests/w32kdll/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt (added) +++ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,0 +1,6 @@ + +add_library(w32kdll_2k3sp2 SHARED main.c w32kdll_2k3sp2.S) +set_entrypoint(w32kdll_2k3sp2 0) +target_link_libraries(w32kdll_2k3sp2 ${CMAKE_CURRENT_SOURCE_DIR}/w32kdll_2k3sp2.def) +add_dependencies(w32kdll_2k3sp2 psdk buildno_header) +add_importlib_target(w32kdll_2k3sp2.def) Propchange: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt (added) +++ trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,0 +1,6 @@ + +add_library(w32kdll_2ksp4 SHARED main.c w32kdll_2ksp4.S) +set_entrypoint(w32kdll_2ksp4 0) +target_link_libraries(w32kdll_2ksp4 ${CMAKE_CURRENT_SOURCE_DIR}/w32kdll_2ksp4.def) +add_dependencies(w32kdll_2ksp4 psdk buildno_header) +add_importlib_target(w32kdll_2ksp4.def) Propchange: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt (added) +++ trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,0 +1,11 @@ + +add_library(w32kdll SHARED main.c) + +set_entrypoint(w32kdll 0) + +target_link_libraries(w32kdll + ${CMAKE_CURRENT_SOURCE_DIR}/w32kdll_ros.def + win32ksys) + +add_dependencies(w32kdll psdk buildno_header) +add_importlib_target(w32kdll_ros.def) Propchange: trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt (added) +++ trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,0 +1,6 @@ + +add_library(w32kdll_vista SHARED main.c w32kdll_vista.S) +set_entrypoint(w32kdll_vista 0) +target_link_libraries(w32kdll_vista ${CMAKE_CURRENT_SOURCE_DIR}/w32kdll_vista.def) +add_dependencies(w32kdll_vista psdk buildno_header) +add_importlib_target(w32kdll_vista.def) Propchange: trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt (added) +++ trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,0 +1,6 @@ + +add_library(w32kdll_xpsp2 SHARED main.c w32kdll_xpsp2.S) +set_entrypoint(w32kdll_xpsp2 0) +target_link_libraries(w32kdll_xpsp2 ${CMAKE_CURRENT_SOURCE_DIR}/w32kdll_xpsp2.def) +add_dependencies(w32kdll_xpsp2 psdk buildno_header) +add_importlib_target(w32kdll_xpsp2.def) Propchange: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32knapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/CMakeLi… ============================================================================== --- trunk/rostests/apitests/w32knapi/CMakeLists.txt (added) +++ trunk/rostests/apitests/w32knapi/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,0 +1,13 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + osver.c + testlist.c + w32knapi.c + w32knapi.rc) + +add_executable(w32knapi ${SOURCE}) +target_link_libraries(w32knapi apitest) +set_module_type(w32knapi win32cui) +add_importlibs(w32knapi w32kdll_ros gdi32 user32 shell32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/apitests/w32knapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/CMakeList… ============================================================================== --- trunk/rostests/apitests/ws2_32/CMakeLists.txt (added) +++ trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,0 +1,13 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + helpers.c + ioctlsocket.c + recv.c + testlist.c) + +add_executable(ws2_32_apitest ${SOURCE}) +target_link_libraries(ws2_32_apitest wine) +set_module_type(ws2_32_apitest win32cui) +add_importlibs(ws2_32_apitest ws2_32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/apitests/ws2_32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/amstream/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/amstream/CMakeL… ============================================================================== --- trunk/rostests/winetests/amstream/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/amstream/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -4,3 +4,4 @@ target_link_libraries(amstream_winetest wine uuid) set_module_type(amstream_winetest win32cui) add_importlibs(amstream_winetest ole32 user32 ddraw msvcrt kernel32 ntdll) +add_dependencies(amstream_winetest dxsdk) Modified: trunk/rostests/winetests/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/powrprof/CMakeL… ============================================================================== --- trunk/rostests/winetests/powrprof/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/powrprof/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -6,4 +6,4 @@ add_executable(powrprof_winetest pwrprof.c testlist.c) set_module_type(powrprof_winetest win32cui) -add_importlibs(powrprof_winetest advapi32 pwrprof msvcrt kernel32 ntdll) +add_importlibs(powrprof_winetest advapi32 powrprof msvcrt kernel32 ntdll)

13 years, 9 months

[tkreuzer] 50099: [NTDLL] Raise harderror and terminate process when the image is of a foreign architecture.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 22 16:19:40 2010 New Revision: 50099 URL: http://svn.reactos.org/svn/reactos?rev=50099&view=rev Log: [NTDLL] Raise harderror and terminate process when the image is of a foreign architecture. Modified: trunk/reactos/dll/ntdll/ldr/startup.c Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Wed Dec 22 16:19:40 2010 @@ -330,6 +330,7 @@ SYSTEM_BASIC_INFORMATION SystemInformation; NTSTATUS Status; PVOID BaseAddress = SystemArgument1; + ULONG ErrorResponse; DPRINT("LdrpInit()\n"); DPRINT("Peb %p\n", Peb); @@ -344,14 +345,23 @@ /* If MZ header exists */ PEDosHeader = (PIMAGE_DOS_HEADER) ImageBase; + NTHeaders = (PIMAGE_NT_HEADERS)((ULONG_PTR)ImageBase + PEDosHeader->e_lfanew); DPRINT("PEDosHeader %p\n", PEDosHeader); if (PEDosHeader->e_magic != IMAGE_DOS_SIGNATURE || PEDosHeader->e_lfanew == 0L || - *(PULONG)((PUCHAR)ImageBase + PEDosHeader->e_lfanew) != IMAGE_NT_SIGNATURE) + NTHeaders->Signature != IMAGE_NT_SIGNATURE) { DPRINT1("Image has bad header\n"); ZwTerminateProcess(NtCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT); + } + + if (NTHeaders->FileHeader.Machine != IMAGE_FILE_MACHINE_NATIVE) + { + DPRINT1("Image is for a foreign architecture (0x%x).\n", + NTHeaders->FileHeader.Machine); + NtRaiseHardError(STATUS_IMAGE_MACHINE_TYPE_MISMATCH, 0, 0, NULL, OptionOk, &ErrorResponse); + ZwTerminateProcess(NtCurrentProcess(), STATUS_IMAGE_MACHINE_TYPE_MISMATCH); } /* normalize process parameters */ @@ -363,8 +373,6 @@ Peb->UnicodeCaseTableData, &NlsTable); RtlResetRtlTranslations(&NlsTable); - - NTHeaders = (PIMAGE_NT_HEADERS)((ULONG_PTR)ImageBase + PEDosHeader->e_lfanew); /* Get number of processors */ DPRINT("Here\n");

13 years, 9 months

[tkreuzer] 50098: [NDK] Add IMAGE_FILE_MACHINE_NATIVE [NTOS] Remove IMAGE_FILE_MACHINE_NATIVE and IMAGE_FILE_MACHINE_ARCHITECTURE definitions, use only the former

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 22 16:14:58 2010 New Revision: 50098 URL: http://svn.reactos.org/svn/reactos?rev=50098&view=rev Log: [NDK] Add IMAGE_FILE_MACHINE_NATIVE [NTOS] Remove IMAGE_FILE_MACHINE_NATIVE and IMAGE_FILE_MACHINE_ARCHITECTURE definitions, use only the former Modified: trunk/reactos/include/ndk/rtltypes.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/amd64/ke.h trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h trunk/reactos/ntoskrnl/kd64/kddata.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Wed Dec 22 16:14:58 2010 @@ -141,6 +141,19 @@ HEAP_CREATE_ENABLE_EXECUTE) #ifdef C_ASSERT C_ASSERT(HEAP_CREATE_VALID_MASK == 0x0007F0FF); +#endif + +// +// Native image architecture +// +#if defined(_M_IX86) +#define IMAGE_FILE_MACHINE_NATIVE IMAGE_FILE_MACHINE_I386 +#elif defined(_M_ARM) +#define IMAGE_FILE_MACHINE_NATIVE IMAGE_FILE_MACHINE_ARM +#elif defined(_M_AMD64) +#define IMAGE_FILE_MACHINE_NATIVE IMAGE_FILE_MACHINE_AMD64 +#else +#error Define these please! #endif // Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=500… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Wed Dec 22 16:14:58 2010 @@ -1286,8 +1286,8 @@ SharedUserData->NtMinorVersion = NtMinorVersion; /* Set the machine type */ - SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_ARCHITECTURE; - SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_ARCHITECTURE; + SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_NATIVE; + SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_NATIVE; } VOID Modified: trunk/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Wed Dec 22 16:14:58 2010 @@ -75,8 +75,6 @@ extern ULONG KeI386CpuType; extern ULONG KeI386CpuStep; -#define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_AMD64 - // // INT3 is 1 byte long // @@ -171,7 +169,7 @@ VOID KeRegisterInterruptHandler(IN ULONG Vector, IN PVOID Handler) -{ +{ UCHAR Entry; PKIDTENTRY64 Idt; @@ -207,8 +205,8 @@ Idt = &KeGetPcr()->IdtBase[Entry]; /* Return the address */ - return (PVOID)((ULONG64)Idt->OffsetHigh << 32 | - (ULONG64)Idt->OffsetMiddle << 16 | + return (PVOID)((ULONG64)Idt->OffsetHigh << 32 | + (ULONG64)Idt->OffsetMiddle << 16 | (ULONG64)Idt->OffsetLow); } Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] Wed Dec 22 16:14:58 2010 @@ -9,8 +9,6 @@ // #define PCR_ENTRY 0 #define PDR_ENTRY 2 - -#define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_ARM // // BKPT is 4 bytes long @@ -104,7 +102,7 @@ VOID KiApcInterrupt( - VOID + VOID ); #include "mm.h" Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Wed Dec 22 16:14:58 2010 @@ -9,8 +9,6 @@ // #define DR_MASK(x) (1 << (x)) #define DR_REG_MASK 0x4F - -#define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_I386 // // INT3 is 1 byte long @@ -33,7 +31,7 @@ #define KiGetLinkedTrapFrame(x) \ (PKTRAP_FRAME)((x)->Edx) - + #define KeGetContextReturnRegister(Context) \ ((Context)->Eax) @@ -77,7 +75,7 @@ #define KTE_SKIP_PM_BIT (((KTRAP_EXIT_SKIP_BITS) { { .SkipPreviousMode = TRUE } }).Bits) #define KTE_SKIP_SEG_BIT (((KTRAP_EXIT_SKIP_BITS) { { .SkipSegments = TRUE } }).Bits) #define KTE_SKIP_VOL_BIT (((KTRAP_EXIT_SKIP_BITS) { { .SkipVolatiles = TRUE } }).Bits) - + typedef union _KTRAP_EXIT_SKIP_BITS { struct @@ -165,7 +163,7 @@ FX_SAVE_AREA NpxArea; KV86_FRAME V86Frame; } KV8086_STACK_FRAME, *PKV8086_STACK_FRAME; - + // // Registers an interrupt handler with an IDT vector // @@ -173,7 +171,7 @@ VOID KeRegisterInterruptHandler(IN ULONG Vector, IN PVOID Handler) -{ +{ UCHAR Entry; ULONG_PTR Address; PKIPCR Pcr = (PKIPCR)KeGetPcr(); @@ -388,7 +386,7 @@ VdmDispatchBop( IN PKTRAP_FRAME TrapFrame ); - + BOOLEAN FASTCALL KiVdmOpcodePrefix( @@ -609,7 +607,7 @@ IN ULONG StackBytes) { NTSTATUS Result; - + /* * This sequence does a RtlCopyMemory(Stack - StackBytes, Arguments, StackBytes) * and then calls the function associated with the system call. @@ -705,7 +703,7 @@ FORCEINLINE KiConvertToGuiThread(VOID) { - NTSTATUS Result; + NTSTATUS Result; PVOID StackFrame; /* @@ -769,7 +767,7 @@ "subl %1, %%esp\n" "pushl %2\n" "jmp _KiSystemStartupBootStack@0\n" - : + : : "c"(InitialStack), "i"(NPX_FRAME_LENGTH + KTRAP_FRAME_ALIGN + KTRAP_FRAME_LENGTH), "i"(CR0_EM | CR0_TS | CR0_MP) @@ -825,7 +823,7 @@ /* Disable interrupts and end the interrupt */ _disable(); HalEndSystemInterrupt(Irql, TrapFrame); - + /* Exit the interrupt */ KiEoiHelper(TrapFrame); } Modified: trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] Wed Dec 22 16:14:58 2010 @@ -34,8 +34,6 @@ } KIRQ_TRAPFRAME, *PKIRQ_TRAPFRAME; extern ULONG KePPCCacheAlignment; - -#define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_POWERPC //#define KD_BREAKPOINT_TYPE //#define KD_BREAKPOINT_SIZE Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Wed Dec 22 16:14:58 2010 @@ -378,7 +378,7 @@ #else DBGKD_VERS_FLAG_DATA, #endif - IMAGE_FILE_MACHINE_ARCHITECTURE, + IMAGE_FILE_MACHINE_NATIVE, PACKET_TYPE_MAX, 0, 0, Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Dec 22 16:14:58 2010 @@ -85,31 +85,21 @@ #define PTE_COUNT PTE_PER_PAGE #endif -#ifdef _M_IX86 -#define IMAGE_FILE_MACHINE_NATIVE IMAGE_FILE_MACHINE_I386 -#elif _M_ARM -#define IMAGE_FILE_MACHINE_NATIVE IMAGE_FILE_MACHINE_ARM -#elif _M_AMD64 -#define IMAGE_FILE_MACHINE_NATIVE IMAGE_FILE_MACHINE_AMD64 -#else -#error Define these please! -#endif - // // Protection Bits part of the internal memory manager Protection Mask // Taken from http://www.reactos.org/wiki/Techwiki:Memory_management_in_the_Windows_XP_ke… // and public assertions. // #define MM_ZERO_ACCESS 0 -#define MM_READONLY 1 -#define MM_EXECUTE 2 -#define MM_EXECUTE_READ 3 +#define MM_READONLY 1 +#define MM_EXECUTE 2 +#define MM_EXECUTE_READ 3 #define MM_READWRITE 4 -#define MM_WRITECOPY 5 -#define MM_EXECUTE_READWRITE 6 -#define MM_EXECUTE_WRITECOPY 7 -#define MM_NOCACHE 8 -#define MM_DECOMMIT 0x10 +#define MM_WRITECOPY 5 +#define MM_EXECUTE_READWRITE 6 +#define MM_EXECUTE_WRITECOPY 7 +#define MM_NOCACHE 8 +#define MM_DECOMMIT 0x10 #define MM_NOACCESS (MM_DECOMMIT | MM_NOCACHE) #define MM_INVALID_PROTECTION 0xFFFFFFFF @@ -122,7 +112,7 @@ // // For example, in the logical attributes, we want to express read-only as a flag // but on x86, it is writability that must be set. On the other hand, on x86, just -// like in the kernel, it is disabling the caches that requires a special flag, +// like in the kernel, it is disabling the caches that requires a special flag, // while on certain architectures such as ARM, it is enabling the cache which // requires a flag. // @@ -171,10 +161,10 @@ // #define MI_IS_SESSION_IMAGE_ADDRESS(Address) \ (((Address) >= MiSessionImageStart) && ((Address) < MiSessionImageEnd)) - + #define MI_IS_SESSION_ADDRESS(Address) \ (((Address) >= MmSessionBase) && ((Address) < MiSessionSpaceEnd)) - + #define MI_IS_SESSION_PTE(Pte) \ ((((PMMPTE)Pte) >= MiSessionBasePte) && (((PMMPTE)Pte) < MiSessionLastPte)) @@ -186,7 +176,7 @@ #define MI_IS_PAGE_TABLE_OR_HYPER_ADDRESS(Address) \ (((PVOID)(Address) >= (PVOID)PTE_BASE) && ((PVOID)(Address) <= (PVOID)MmHyperSpaceEnd)) - + // // Corresponds to MMPTE_SOFTWARE.Protection // @@ -537,14 +527,14 @@ MiDetermineUserGlobalPteMask(IN PVOID PointerPte) { MMPTE TempPte; - + /* Start fresh */ TempPte.u.Long = 0; - + /* Make it valid and accessed */ TempPte.u.Hard.Valid = TRUE; MI_MAKE_ACCESSED_PAGE(&TempPte); - + /* Is this for user-mode? */ if ((PointerPte <= (PVOID)MiHighestUserPte) || ((PointerPte >= (PVOID)MiAddressToPde(NULL)) && @@ -553,9 +543,9 @@ /* Set the owner bit */ MI_MAKE_OWNER_PAGE(&TempPte); } - + /* FIXME: We should also set the global bit */ - + /* Return the protection */ return TempPte.u.Long; } @@ -574,10 +564,10 @@ ASSERT(MappingPte > MiHighestUserPte); ASSERT(!MI_IS_SESSION_PTE(MappingPte)); ASSERT((MappingPte < (PMMPTE)PDE_BASE) || (MappingPte > (PMMPTE)PDE_TOP)); - + /* Start fresh */ *NewPte = ValidKernelPte; - + /* Set the protection and page */ NewPte->u.Hard.PageFrameNumber = PageFrameNumber; NewPte->u.Long |= MmProtectToPteMask[ProtectionMask]; @@ -611,10 +601,10 @@ { /* Only valid for kernel, non-session PTEs */ ASSERT(MappingPte <= MiHighestUserPte); - + /* Start fresh */ *NewPte = ValidKernelPte; - + /* Set the protection and page */ NewPte->u.Hard.Owner = TRUE; NewPte->u.Hard.PageFrameNumber = PageFrameNumber; @@ -635,7 +625,7 @@ /* Mark this as a prototype */ NewPte->u.Long = 0; NewPte->u.Proto.Prototype = 1; - + /* * Prototype PTEs are only valid in paged pool by design, this little trick * lets us only use 28 bits for the adress of the PTE @@ -658,7 +648,7 @@ MI_IS_PHYSICAL_ADDRESS(IN PVOID Address) { PMMPDE PointerPde; - + /* Large pages are never paged out, always physically resident */ PointerPde = MiAddressToPde(Address); return ((PointerPde->u.Hard.LargePage) && (PointerPde->u.Hard.Valid)); @@ -785,11 +775,11 @@ ASSERT(MI_WS_OWNER(Process)); /* This can't be checked because Vm is used by MAREAs) */ //ASSERT(Process->Vm.Flags.AcquiredUnsafe == 0); - + /* The thread doesn't own it anymore */ ASSERT(Thread->OwnsProcessWorkingSetExclusive == TRUE); Thread->OwnsProcessWorkingSetExclusive = FALSE; - + /* FIXME: Actually release it (we can't because Vm is used by MAREAs) */ /* Unblock APCs */ @@ -806,15 +796,15 @@ { /* Block APCs */ KeEnterGuardedRegion(); - + /* Working set should be in global memory */ ASSERT(MI_IS_SESSION_ADDRESS((PVOID)WorkingSet) == FALSE); - + /* Thread shouldn't already be owning something */ ASSERT(!MM_ANY_WS_LOCK_HELD(Thread)); - + /* FIXME: Actually lock it (we can't because Vm is used by MAREAs) */ - + /* Which working set is this? */ if (WorkingSet == &MmSystemCacheWs) { @@ -848,7 +838,7 @@ { /* Working set should be in global memory */ ASSERT(MI_IS_SESSION_ADDRESS((PVOID)WorkingSet) == FALSE); - + /* Which working set is this? */ if (WorkingSet == &MmSystemCacheWs) { @@ -870,7 +860,7 @@ (Thread->OwnsProcessWorkingSetShared)); Thread->OwnsProcessWorkingSetExclusive = FALSE; } - + /* FIXME: Actually release it (we can't because Vm is used by MAREAs) */ /* Unblock APCs */ @@ -947,7 +937,7 @@ MiInitializeMemoryEvents( VOID ); - + PFN_NUMBER NTAPI MxGetNextPage( @@ -960,21 +950,21 @@ IN PLOADER_PARAMETER_BLOCK LoaderBlock, IN PBOOLEAN IncludeType ); - + PFN_NUMBER NTAPI MiPagesInLoaderBlock( IN PLOADER_PARAMETER_BLOCK LoaderBlock, IN PBOOLEAN IncludeType ); - + VOID FASTCALL MiSyncARM3WithROS( IN PVOID AddressStart, IN PVOID AddressEnd ); - + NTSTATUS NTAPI MmArmAccessFault( @@ -1170,7 +1160,7 @@ IN ULONG Flags, OUT PPFN_NUMBER ValidPages ); - + PLDR_DATA_TABLE_ENTRY NTAPI MiLookupDataTableEntry( @@ -1318,7 +1308,7 @@ IN PMMVAD Vad, IN ULONG_PTR Vpn ); - + // // MiRemoveZeroPage will use inline code to zero out the page manually if only // free pages are available. In some scenarios, we don't/can't run that piece of

13 years, 9 months

← Newer
1
...
12
13
14
15
16
17
18
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2010