Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[spetreolle] 69814: [ARP] Sssh, secret ansi unicode plan is secret.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Nov 4 21:22:37 2015 New Revision: 69814 URL: http://svn.reactos.org/svn/reactos?rev=69814&view=rev Log: [ARP] Sssh, secret ansi unicode plan is secret. Modified: trunk/reactos/base/applications/network/arp/CMakeLists.txt Modified: trunk/reactos/base/applications/network/arp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/arp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/arp/CMakeLists.txt [iso-8859-1] Wed Nov 4 21:22:37 2015 @@ -1,5 +1,5 @@ add_executable(arp arp.c arp.rc) -set_module_type(arp win32cui ANSI) +set_module_type(arp win32cui) add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32) add_cd_file(TARGET arp DESTINATION reactos/system32 FOR all)

9 years, 1 month

[spetreolle] 69813: [PARTINFO][ARP] Arch, manual define of UNICODE/_UNICODE is a call for trouble.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Nov 4 21:19:45 2015 New Revision: 69813 URL: http://svn.reactos.org/svn/reactos?rev=69813&view=rev Log: [PARTINFO][ARP] Arch, manual define of UNICODE/_UNICODE is a call for trouble. Modified: trunk/reactos/base/applications/network/arp/CMakeLists.txt trunk/reactos/base/applications/network/arp/arp.c trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.c Modified: trunk/reactos/base/applications/network/arp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/arp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/arp/CMakeLists.txt [iso-8859-1] Wed Nov 4 21:19:45 2015 @@ -1,5 +1,5 @@ add_executable(arp arp.c arp.rc) -set_module_type(arp win32cui) +set_module_type(arp win32cui ANSI) add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32) add_cd_file(TARGET arp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/network/arp/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/arp/arp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/arp/arp.c [iso-8859-1] Wed Nov 4 21:19:45 2015 @@ -38,9 +38,6 @@ #define _INC_WINDOWS #include <winsock2.h> #include <iphlpapi.h> - -#define UNICODE -#define _UNICODE /* * Globals Modified: trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.c [iso-8859-1] Wed Nov 4 21:19:45 2015 @@ -10,7 +10,6 @@ //#define DUMP_DATA #define DUMP_SIZE_INFO -#define UNICODE #ifdef DUMP_DATA void HexDump(char *buffer, ULONG size) @@ -116,7 +115,7 @@ sprintf(DriveName, "\\\\.\\PHYSICALDRIVE%lu", ulDrive); /* Open drive */ - hDisk = CreateFile(DriveName, + hDisk = CreateFileA(DriveName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,

9 years, 1 month

[akhaldi] 69812: [CMAKE] Properly handle hotpatchable flags requirements in MSVC builds. CORE-10477

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Nov 4 18:06:16 2015 New Revision: 69812 URL: http://svn.reactos.org/svn/reactos?rev=69812&view=rev Log: [CMAKE] Properly handle hotpatchable flags requirements in MSVC builds. CORE-10477 Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt trunk/reactos/dll/directx/wine/dinput/CMakeLists.txt trunk/reactos/dll/directx/wine/dinput8/CMakeLists.txt trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/opengl/opengl32/CMakeLists.txt trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/winmm/CMakeLists.txt trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt trunk/reactos/win32ss/user/user32/CMakeLists.txt Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -540,7 +540,7 @@ endfunction() function(set_module_type MODULE TYPE) - cmake_parse_arguments(__module "UNICODE;HOTPATCHABLE" "IMAGEBASE" "ENTRYPOINT" ${ARGN}) + cmake_parse_arguments(__module "UNICODE" "IMAGEBASE" "ENTRYPOINT" ${ARGN}) if(__module_UNPARSED_ARGUMENTS) message(STATUS "set_module_type : unparsed arguments ${__module_UNPARSED_ARGUMENTS}, module : ${MODULE}") @@ -572,17 +572,6 @@ #set unicode definitions if(__module_UNICODE) add_target_compile_definitions(${MODULE} UNICODE _UNICODE) - endif() - - # Handle hotpatchable images. - # GCC has this as a function attribute so we're handling it using DECLSPEC_HOTPATCH - if(__module_HOTPATCHABLE AND MSVC AND (NOT ARCH STREQUAL "arm")) - if(ARCH STREQUAL "i386") - set_property(TARGET ${MODULE} APPEND_STRING PROPERTY COMPILE_FLAGS " /hotpatch") - set_property(TARGET ${MODULE} APPEND_STRING PROPERTY LINK_FLAGS " /FUNCTIONPADMIN:5") - elseif(ARCH STREQUAL "amd64") - set_property(TARGET ${MODULE} APPEND_STRING PROPERTY LINK_FLAGS " /FUNCTIONPADMIN:6") - endif() endif() # set entry point Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=69812… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -95,6 +95,14 @@ add_definitions("/D NDEBUG") endif() +# Hotpatchable images +if(ARCH STREQUAL "i386") + add_compile_flags("/hotpatch") + set(_hotpatch_link_flag "/FUNCTIONPADMIN:5") +elseif(ARCH STREQUAL "amd64") + set(_hotpatch_link_flag "/FUNCTIONPADMIN:6") +endif() + if(MSVC_IDE AND (NOT DEFINED USE_FOLDER_STRUCTURE)) set(USE_FOLDER_STRUCTURE FALSE) endif() @@ -108,9 +116,9 @@ add_compile_flags("/RTC1") endif() -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE") -set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE /IGNORE:4104") -set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE") +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE ${_hotpatch_link_flag}") +set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE /IGNORE:4104 ${_hotpatch_link_flag}") +set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE ${_hotpatch_link_flag}") if(CMAKE_DISABLE_NINJA_DEPSLOG) set(cl_includes_flag "") Modified: trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -25,7 +25,7 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def) -set_module_type(d3d8 win32dll UNICODE HOTPATCHABLE) +set_module_type(d3d8 win32dll UNICODE) target_link_libraries(d3d8 uuid wine) add_importlibs(d3d8 d3dwine msvcrt kernel32 ntdll) add_pch(d3d8 d3d8_private.h SOURCE) Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -28,7 +28,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/d3d9_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3d9.def) -set_module_type(d3d9 win32dll UNICODE HOTPATCHABLE) +set_module_type(d3d9 win32dll UNICODE) target_link_libraries(d3d9 wine) add_importlibs(d3d9 d3dwine msvcrt kernel32 ntdll) add_pch(d3d9 d3d9_private.h SOURCE) Modified: trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/CMa… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -34,7 +34,7 @@ ddraw.rc ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def) -set_module_type(ddraw win32dll HOTPATCHABLE) +set_module_type(ddraw win32dll) target_link_libraries(ddraw wine uuid dxguid ${PSEH_LIB}) add_importlibs(ddraw advapi32 gdi32 user32 d3dwine msvcrt kernel32 ntdll) add_dependencies(ddraw wineheaders) Modified: trunk/reactos/dll/directx/wine/dinput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/CM… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -24,7 +24,7 @@ add_library(dinput_data_formats data_formats.c) add_dependencies(dinput_data_formats psdk) -set_module_type(dinput win32dll HOTPATCHABLE) +set_module_type(dinput win32dll) target_link_libraries(dinput dxguid uuid wine) add_importlibs(dinput comctl32 ole32 user32 advapi32 msvcrt kernel32 ntdll) add_pch(dinput dinput_private.h SOURCE) Modified: trunk/reactos/dll/directx/wine/dinput8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput8/C… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput8/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput8/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -8,7 +8,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/dinput8.def) add_library(dinput8 SHARED ${SOURCE} version.rc) -set_module_type(dinput8 win32dll HOTPATCHABLE) +set_module_type(dinput8 win32dll) target_link_libraries(dinput8 dxguid uuid wine) add_importlibs(dinput8 ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET dinput8 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -43,7 +43,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/ntdll_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/ntdll.def) -set_module_type(ntdll win32dll HOTPATCHABLE ENTRYPOINT 0) +set_module_type(ntdll win32dll ENTRYPOINT 0) ############################################# ## HACK FOR MSVC COMPILATION WITH win32dll ## set_subsystem(ntdll console) Modified: trunk/reactos/dll/opengl/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/CMakeL… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -57,8 +57,7 @@ target_link_libraries(opengl32 mingwex) endif() -set_module_type(opengl32 win32dll HOTPATCHABLE) - +set_module_type(opengl32 win32dll) add_importlibs(opengl32 gdi32 user32 advapi32 msvcrt kernel32 ntdll) add_pch(opengl32 opengl32.h SOURCE) add_cd_file(TARGET opengl32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -25,7 +25,7 @@ iphlpapi.rc ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def) -set_module_type(iphlpapi win32dll UNICODE HOTPATCHABLE) +set_module_type(iphlpapi win32dll UNICODE) target_link_libraries(iphlpapi wine tdilib) add_importlibs(iphlpapi icmp dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll) add_pch(iphlpapi iphlpapi_private.h SOURCE) Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -103,7 +103,7 @@ kernel32.rc ${CMAKE_CURRENT_BINARY_DIR}/kernel32.def) -set_module_type(kernel32 win32dll HOTPATCHABLE ENTRYPOINT DllMain 12) +set_module_type(kernel32 win32dll ENTRYPOINT DllMain 12) ############################################# ## HACK FOR MSVC COMPILATION WITH win32dll ## set_subsystem(kernel32 console) Modified: trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/C… ============================================================================== --- trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -12,7 +12,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/kernel32_vista.def) add_library(kernel32_vista SHARED ${SOURCE}) -set_module_type(kernel32_vista win32dll HOTPATCHABLE ENTRYPOINT DllMain 12) +set_module_type(kernel32_vista win32dll ENTRYPOINT DllMain 12) add_importlibs(kernel32_vista kernel32 ntdll) add_dependencies(kernel32_vista psdk) add_cd_file(TARGET kernel32_vista DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -81,7 +81,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) -set_module_type(shell32 win32dll UNICODE HOTPATCHABLE) +set_module_type(shell32 win32dll UNICODE) target_link_libraries(shell32 shellmenu shelldesktop atlnew wine uuid recyclebin) add_delay_importlibs(shell32 uxtheme ole32 userenv version fmifs) add_importlibs(shell32 advapi32 browseui gdi32 user32 powrprof comctl32 comdlg32 shdocvw shlwapi devmgr winspool winmm msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -21,7 +21,7 @@ winmm_res.rc ${CMAKE_CURRENT_BINARY_DIR}/winmm.def) -set_module_type(winmm win32dll HOTPATCHABLE) +set_module_type(winmm win32dll) target_link_libraries(winmm wine ${PSEH_LIB}) add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) add_pch(winmm winemm.h SOURCE) Modified: trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/CMakeL… ============================================================================== --- trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -8,7 +8,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def) add_library(xinput1_3 SHARED ${SOURCE} version.rc) -set_module_type(xinput1_3 win32dll HOTPATCHABLE) +set_module_type(xinput1_3 win32dll) target_link_libraries(xinput1_3 wine) add_importlibs(xinput1_3 msvcrt kernel32 ntdll) add_cd_file(TARGET xinput1_3 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -69,7 +69,7 @@ user32.rc ${CMAKE_CURRENT_BINARY_DIR}/user32.def) -set_module_type(user32 win32dll ENTRYPOINT DllMain 12 UNICODE HOTPATCHABLE) +set_module_type(user32 win32dll ENTRYPOINT DllMain 12 UNICODE) target_link_libraries(user32 user32_wsprintf wine win32ksys ${PSEH_LIB}) if(MSVC)

9 years, 1 month

[akhaldi] 69811: [HAL] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Nov 4 13:30:52 2015 New Revision: 69811 URL: http://svn.reactos.org/svn/reactos?rev=69811&view=rev Log: [HAL] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114 Modified: trunk/reactos/hal/halarm/generic/cache.S trunk/reactos/hal/halarm/generic/sysinfo.c trunk/reactos/hal/halppc/generic/beep.c trunk/reactos/hal/halppc/generic/bus.c trunk/reactos/hal/halppc/generic/cmos.c trunk/reactos/hal/halppc/generic/display.c trunk/reactos/hal/halppc/generic/dma.c trunk/reactos/hal/halppc/generic/drive.c trunk/reactos/hal/halppc/generic/enum.c trunk/reactos/hal/halppc/generic/fmutex.c trunk/reactos/hal/halppc/generic/font.c trunk/reactos/hal/halppc/generic/halinit.c trunk/reactos/hal/halppc/generic/irql.c trunk/reactos/hal/halppc/generic/isa.c trunk/reactos/hal/halppc/generic/misc.c trunk/reactos/hal/halppc/generic/pci.c trunk/reactos/hal/halppc/generic/portio.c trunk/reactos/hal/halppc/generic/processor.c trunk/reactos/hal/halppc/generic/profil.c trunk/reactos/hal/halppc/generic/reboot.c trunk/reactos/hal/halppc/generic/spinlock.c trunk/reactos/hal/halppc/generic/sysinfo.c trunk/reactos/hal/halppc/generic/timer.c trunk/reactos/hal/halppc/include/hal.h trunk/reactos/hal/halppc/up/halinit_up.c trunk/reactos/hal/halx86/acpi/busemul.c trunk/reactos/hal/halx86/acpi/halacpi.c trunk/reactos/hal/halx86/acpi/halpnpdd.c trunk/reactos/hal/halx86/amd64/mps.S trunk/reactos/hal/halx86/amd64/systimer.S trunk/reactos/hal/halx86/amd64/x86bios.c trunk/reactos/hal/halx86/apic/apic.c trunk/reactos/hal/halx86/apic/halinit_apic.c trunk/reactos/hal/halx86/apic/rtctimer.c trunk/reactos/hal/halx86/apic/tsc.c trunk/reactos/hal/halx86/generic/bios.c trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/hal/halx86/generic/misc.c trunk/reactos/hal/halx86/generic/spinlock.c trunk/reactos/hal/halx86/generic/systimer.S trunk/reactos/hal/halx86/generic/trap.S trunk/reactos/hal/halx86/legacy/bus/bushndlr.c trunk/reactos/hal/halx86/legacy/bus/cmosbus.c trunk/reactos/hal/halx86/legacy/bus/isabus.c trunk/reactos/hal/halx86/legacy/bus/pcibus.c trunk/reactos/hal/halx86/legacy/bus/sysbus.c trunk/reactos/hal/halx86/legacy/bussupp.c trunk/reactos/hal/halx86/legacy/halpcat.c trunk/reactos/hal/halx86/legacy/halpnpdd.c trunk/reactos/hal/halx86/up/halinit_mini.c trunk/reactos/hal/halx86/up/halinit_up.c trunk/reactos/hal/halx86/up/pic.c trunk/reactos/hal/halx86/xbox/halinit_xbox.c Modified: trunk/reactos/hal/halarm/generic/cache.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/cache.S… ============================================================================== --- trunk/reactos/hal/halarm/generic/cache.S [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/cache.S [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halarm/generic/cache.s + * FILE: hal/halarm/generic/cache.S * PURPOSE: Implements cache clean, invalidate routines for ARM machines * PROGRAMMERS: Copyright (C) 2005 ARM Ltd. */ Modified: trunk/reactos/hal/halarm/generic/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/sysinfo… ============================================================================== --- trunk/reactos/hal/halarm/generic/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/sysinfo.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: hal/halarm/generic/spinlock.c + * FILE: hal/halarm/generic/sysinfo.c * PURPOSE: HAL Information Routines * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/hal/halppc/generic/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/beep.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/beep.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/beep.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/beep.c + * FILE: hal/halppc/generic/beep.c * PURPOSE: Speaker function (it's only one) * PROGRAMMER: Eric Kohl * UPDATE HISTORY: Modified: trunk/reactos/hal/halppc/generic/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/bus.c?r… ============================================================================== --- trunk/reactos/hal/halppc/generic/bus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/bus.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/bus.c + * FILE: hal/halppc/generic/bus.c * PURPOSE: Bus Support Routines * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/hal/halppc/generic/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/cmos.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/cmos.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/cmos.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/cmos.c + * FILE: hal/halppc/generic/cmos.c * PURPOSE: CMOS Access Routines (Real Time Clock and LastKnownGood) * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Eric Kohl Modified: trunk/reactos/hal/halppc/generic/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/display… ============================================================================== --- trunk/reactos/hal/halppc/generic/display.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/display.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/display.c + * FILE: hal/halppc/generic/display.c * PURPOSE: Blue screen display * PROGRAMMER: Eric Kohl * UPDATE HISTORY: Modified: trunk/reactos/hal/halppc/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halppc/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/dma.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/dma.c + * FILE: hal/halppc/generic/dma.c * PURPOSE: DMA functions * PROGRAMMERS: David Welch (welch(a)mcmail.com) * Filip Navara (navaraf(a)reactos.com) Modified: trunk/reactos/hal/halppc/generic/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/drive.c… ============================================================================== --- trunk/reactos/hal/halppc/generic/drive.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/drive.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/drive.c + * FILE: hal/halppc/generic/drive.c * PURPOSE: I/O HAL Routines for Disk Access * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/hal/halppc/generic/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/enum.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/enum.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/enum.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/enum.c + * FILE: hal/halppc/generic/enum.c * PURPOSE: Motherboard device enumerator * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * UPDATE HISTORY: Modified: trunk/reactos/hal/halppc/generic/fmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/fmutex.… ============================================================================== --- trunk/reactos/hal/halppc/generic/fmutex.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/fmutex.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS HAL - * FILE: ntoskrnl/hal/x86/fmutex.c + * FILE: hal/halppc/generic/fmutex.c * PURPOSE: Deprecated HAL Fast Mutex * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/hal/halppc/generic/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/font.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/font.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/font.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: Xbox HAL - * FILE: hal/halx86/xbox/font.h + * FILE: hal/halppc/generic/font.c * PURPOSE: Font glyphs * PROGRAMMER: Ge van Geldorp (gvg(a)reactos.com) * UPDATE HISTORY: Modified: trunk/reactos/hal/halppc/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/halinit… ============================================================================== --- trunk/reactos/hal/halppc/generic/halinit.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/halinit.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/halinit.c + * FILE: hal/halppc/generic/halinit.c * PURPOSE: HAL Entrypoint and Initialization * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/hal/halppc/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/irql.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/irql.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/irql.c + * FILE: hal/halppc/generic/irql.c * PURPOSE: Implements IRQLs * PROGRAMMER: David Welch (welch(a)cwcom.net) */ Modified: trunk/reactos/hal/halppc/generic/isa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/isa.c?r… ============================================================================== --- trunk/reactos/hal/halppc/generic/isa.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/isa.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/isa.c + * FILE: hal/halppc/generic/isa.c * PURPOSE: Interfaces to the ISA bus * PROGRAMMER: David Welch (welch(a)mcmail.com) * UPDATE HISTORY: Modified: trunk/reactos/hal/halppc/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/misc.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/misc.c + * FILE: hal/halppc/generic/misc.c * PURPOSE: Miscellanous Routines * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Eric Kohl Modified: trunk/reactos/hal/halppc/generic/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/pci.c?r… ============================================================================== --- trunk/reactos/hal/halppc/generic/pci.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/pci.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/pci.c + * FILE: hal/halppc/generic/pci.c * PURPOSE: PCI Bus Support (Configuration Space, Resource Allocation) * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/hal/halppc/generic/portio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/portio.… ============================================================================== --- trunk/reactos/hal/halppc/generic/portio.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/portio.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/portio.c + * FILE: hal/halppc/generic/portio.c * PURPOSE: Port I/O functions * PROGRAMMER: Eric Kohl * UPDATE HISTORY: Modified: trunk/reactos/hal/halppc/generic/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/process… ============================================================================== --- trunk/reactos/hal/halppc/generic/processor.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/processor.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: hal/halx86/generic/processor.c + * FILE: hal/halppc/generic/processor.c * PURPOSE: Intel MultiProcessor specification support * PROGRAMMER: David Welch (welch(a)cwcom.net) * Casper S. Hornstrup (chorns(a)users.sourceforge.net) Modified: trunk/reactos/hal/halppc/generic/profil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/profil.… ============================================================================== --- trunk/reactos/hal/halppc/generic/profil.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/profil.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/profil.c + * FILE: hal/halppc/generic/profil.c * PURPOSE: System Profiling * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/hal/halppc/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/reboot.… ============================================================================== --- trunk/reactos/hal/halppc/generic/reboot.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/reboot.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/reboot.c + * FILE: hal/halppc/generic/reboot.c * PURPOSE: Reboot functions. * PROGRAMMER: Eric Kohl * UPDATE HISTORY: Modified: trunk/reactos/hal/halppc/generic/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/spinloc… ============================================================================== --- trunk/reactos/hal/halppc/generic/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/spinlock.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/up/spinlock.c + * FILE: hal/halppc/generic/spinlock.c * PURPOSE: Spinlock and Queued Spinlock Support * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/hal/halppc/generic/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/sysinfo… ============================================================================== --- trunk/reactos/hal/halppc/generic/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/sysinfo.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HA: * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/sysinfo.c + * FILE: hal/halppc/generic/sysinfo.c * PURPOSE: HAL Information Routines * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/hal/halppc/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halppc/generic/timer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/timer.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/timer.c + * FILE: hal/halppc/generic/timer.c * PURPOSE: HAL Timer Routines * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/hal/halppc/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halppc/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/include/hal.h [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Hardware Abstraction Layer - * FILE: hal/halx86/include/hal.h + * FILE: hal/halppc/include/hal.h * PURPOSE: HAL Header * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/hal/halppc/up/halinit_up.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/up/halinit_up.c… ============================================================================== --- trunk/reactos/hal/halppc/up/halinit_up.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/up/halinit_up.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/halinit.c + * FILE: hal/halppc/up/halinit_up.c * PURPOSE: Initialize the x86 hal * PROGRAMMER: David Welch (welch(a)cwcom.net) * UPDATE HISTORY: Modified: trunk/reactos/hal/halx86/acpi/busemul.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/busemul.c?… ============================================================================== --- trunk/reactos/hal/halx86/acpi/busemul.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/busemul.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: hal/halx86/generic/acpi/busemul.c + * FILE: hal/halx86/acpi/busemul.c * PURPOSE: ACPI HAL Bus Handler Emulation Code * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/hal/halx86/acpi/halacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/halacpi.c?… ============================================================================== --- trunk/reactos/hal/halx86/acpi/halacpi.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/halacpi.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: hal/halx86/generic/acpi/halacpi.c + * FILE: hal/halx86/acpi/halacpi.c * PURPOSE: HAL ACPI Code * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/hal/halx86/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/halpnpdd.c… ============================================================================== --- trunk/reactos/hal/halx86/acpi/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/halpnpdd.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: hal/halx86/generic/acpi/halpnpdd.c + * FILE: hal/halx86/acpi/halpnpdd.c * PURPOSE: HAL Plug and Play Device Driver * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/hal/halx86/amd64/mps.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/amd64/mps.S?rev… ============================================================================== --- trunk/reactos/hal/halx86/amd64/mps.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/amd64/mps.S [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/amd64/generic/mps.S + * FILE: hal/halx86/amd64/mps.S * PURPOSE: Intel MultiProcessor specification support * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ Modified: trunk/reactos/hal/halx86/amd64/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/amd64/systimer.… ============================================================================== --- trunk/reactos/hal/halx86/amd64/systimer.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/amd64/systimer.S [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,5 +1,5 @@ /* - * FILE: hal/halx86/generic/timer.S + * FILE: hal/halx86/amd64/systimer.S * COPYRIGHT: See COPYING in the top level directory * PURPOSE: System Timer Interrupt and Management * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) Modified: trunk/reactos/hal/halx86/amd64/x86bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/amd64/x86bios.c… ============================================================================== --- trunk/reactos/hal/halx86/amd64/x86bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/amd64/x86bios.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL, See COPYING in the top level directory - * FILE: hal/halx86/generic/amd64/x86bios.c + * FILE: hal/halx86/amd64/x86bios.c * PURPOSE: * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ Modified: trunk/reactos/hal/halx86/apic/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/apic.c?rev… ============================================================================== --- trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GNU GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/apic.c + * FILE: hal/halx86/apic/apic.c * PURPOSE: HAL APIC Management and Control Code * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) * REFERENCES: http://www.joseflores.com/docs/ExploringIrql.html Modified: trunk/reactos/hal/halx86/apic/halinit_apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/halinit_ap… ============================================================================== --- trunk/reactos/hal/halx86/apic/halinit_apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/halinit_apic.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/halinit.c + * FILE: hal/halx86/apic/halinit_apic.c * PURPOSE: Initialize the x86 hal * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ Modified: trunk/reactos/hal/halx86/apic/rtctimer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/rtctimer.c… ============================================================================== --- trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GNU GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/apic.c + * FILE: hal/halx86/apic/rtctimer.c * PURPOSE: HAL APIC Management and Control Code * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) * REFERENCES: Modified: trunk/reactos/hal/halx86/apic/tsc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/tsc.c?rev=… ============================================================================== --- trunk/reactos/hal/halx86/apic/tsc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/tsc.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halamd64/generic/tsc.c + * FILE: hal/halx86/apic/tsc.c * PURPOSE: HAL Routines for TSC handling * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Hardware Abstraction Layer (HAL) * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: halx86/generic/bios.c + * FILE: hal/halx86/generic/bios.c * PURPOSE: BIOS Access Routines * PROGRAMMERS: ReactOS Portable Systems Group * Alex Ionescu (alex.ionescu(a)reactos.org) Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/dma.c + * FILE: hal/halx86/generic/dma.c * PURPOSE: DMA functions * PROGRAMMERS: David Welch (welch(a)mcmail.com) * Filip Navara (navaraf(a)reactos.com) Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Hardware Abstraction Layer (HAL) * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: halx86/generic/misc.c + * FILE: hal/halx86/generic/misc.c * PURPOSE: NMI, I/O Mapping and x86 Subs * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/hal/halx86/generic/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/spinloc… ============================================================================== --- trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/up/spinlock.c + * FILE: hal/halx86/generic/spinlock.c * PURPOSE: Spinlock and Queued Spinlock Support * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systime… ============================================================================== --- trunk/reactos/hal/halx86/generic/systimer.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/systimer.S [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,5 +1,5 @@ /* - * FILE: hal/halx86/generic/timer.S + * FILE: hal/halx86/generic/systimer.S * COPYRIGHT: See COPYING in the top level directory * PURPOSE: System Timer Interrupt and Management * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) Modified: trunk/reactos/hal/halx86/generic/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/trap.S?… ============================================================================== --- trunk/reactos/hal/halx86/generic/trap.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/trap.S [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,5 +1,5 @@ /* - * FILE: ntoskrnl/ke/i386/trap.S + * FILE: hal/halx86/generic/trap.S * COPYRIGHT: See COPYING in the top level directory * PURPOSE: System Traps, Entrypoints and Exitpoints * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) Modified: trunk/reactos/hal/halx86/legacy/bus/bushndlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/bush… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bus/bushndlr.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bus/bushndlr.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/bus/bushndlr.c + * FILE: hal/halx86/legacy/bus/bushndlr.c * PURPOSE: Generic HAL Bus Handler Support * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) */ Modified: trunk/reactos/hal/halx86/legacy/bus/cmosbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/cmos… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bus/cmosbus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bus/cmosbus.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/bus/sysbus.c + * FILE: hal/halx86/legacy/bus/cmosbus.c * PURPOSE: * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) */ Modified: trunk/reactos/hal/halx86/legacy/bus/isabus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/isab… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bus/isabus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bus/isabus.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/bus/isabus.c + * FILE: hal/halx86/legacy/bus/isabus.c * PURPOSE: * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) */ Modified: trunk/reactos/hal/halx86/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pcib… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bus/pcibus.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/bus/pcibus.c + * FILE: hal/halx86/legacy/bus/pcibus.c * PURPOSE: PCI Bus Support (Configuration Space, Resource Allocation) * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/hal/halx86/legacy/bus/sysbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/sysb… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bus/sysbus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bus/sysbus.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/bus/sysbus.c + * FILE: hal/halx86/legacy/bus/sysbus.c * PURPOSE: * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) */ Modified: trunk/reactos/hal/halx86/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bussupp.… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: hal/halx86/generic/legacy/bussupp.c + * FILE: hal/halx86/legacy/bussupp.c * PURPOSE: HAL Legacy Bus Support Code * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/hal/halx86/legacy/halpcat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/halpcat.… ============================================================================== --- trunk/reactos/hal/halx86/legacy/halpcat.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/halpcat.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: hal/halx86/generic/legacy/halpcat.c + * FILE: hal/halx86/legacy/halpcat.c * PURPOSE: HAL Legacy Support Code * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/hal/halx86/legacy/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/halpnpdd… ============================================================================== --- trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: hal/halx86/generic/legacy/halpnpdd.c + * FILE: hal/halx86/legacy/halpnpdd.c * PURPOSE: HAL Plug and Play Device Driver * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/hal/halx86/up/halinit_mini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halinit_mini… ============================================================================== --- trunk/reactos/hal/halx86/up/halinit_mini.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up/halinit_mini.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/halinit.c + * FILE: hal/halx86/up/halinit_mini.c * PURPOSE: Initialize the x86 hal * PROGRAMMER: David Welch (welch(a)cwcom.net) * UPDATE HISTORY: Modified: trunk/reactos/hal/halx86/up/halinit_up.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halinit_up.c… ============================================================================== --- trunk/reactos/hal/halx86/up/halinit_up.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up/halinit_up.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/halinit.c + * FILE: hal/halx86/up/halinit_up.c * PURPOSE: Initialize the x86 hal * PROGRAMMER: David Welch (welch(a)cwcom.net) * UPDATE HISTORY: Modified: trunk/reactos/hal/halx86/up/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=69… ============================================================================== --- trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: hal/halx86/generic/pic.c + * FILE: hal/halx86/up/pic.c * PURPOSE: HAL PIC Management and Control Code * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/halinit_xb… ============================================================================== --- trunk/reactos/hal/halx86/xbox/halinit_xbox.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/xbox/halinit_xbox.c [iso-8859-1] Wed Nov 4 13:30:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/halinit.c + * FILE: hal/halx86/xbox/halinit_xbox.c * PURPOSE: Initialize the x86 hal * PROGRAMMER: David Welch (welch(a)cwcom.net) * UPDATE HISTORY:

9 years, 1 month

[jimtabor] 69810: [Win32SS] - Quick fix for double free unlink crash. See CORE-9210.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Nov 4 08:14:53 2015 New Revision: 69810 URL: http://svn.reactos.org/svn/reactos?rev=69810&view=rev Log: [Win32SS] - Quick fix for double free unlink crash. See CORE-9210. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Wed Nov 4 08:14:53 2015 @@ -840,8 +840,8 @@ if(SentMessage->Msg.hwnd == Window->head.h) { - TRACE("Remove Window Messages From Sent Queue\n"); - + ERR("Remove Window Messages %p From Sent Queue\n",SentMessage); +#if 0 // Should mark these as invalid and allow the rest clean up, so far no harm by just commenting out. See CORE-9210. ClearMsgBitsMask(pti, SentMessage->QS_Flags); /* wake the sender's thread */ @@ -860,6 +860,8 @@ FreeUserMessage(SentMessage); CurrentEntry = pti->SentMessagesListHead.Flink; +#endif + CurrentEntry = CurrentEntry->Flink; } else { @@ -2181,7 +2183,7 @@ CurrentEntry = pti->SentMessagesListHead.Flink; CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); - ERR("Thread Cleanup Sent Messages\n"); + ERR("Thread Cleanup Sent Messages %p\n",CurrentSentMessage); /* wake the sender's thread */ if (CurrentSentMessage->pkCompletionEvent != NULL) @@ -2208,7 +2210,7 @@ CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); CurrentEntry = CurrentEntry->Flink; - TRACE("Found troubled messages on the list\n"); + TRACE("Found troubled messages %p on the list\n",CurrentSentMessage); if ( pti == CurrentSentMessage->ptiReceiver ) {

9 years, 1 month

[fireball] 69809: [ARWINSS] - Change base addresses so that user32, gdi32 and kernel32 don't get relocated.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Nov 3 22:31:23 2015 New Revision: 69809 URL: http://svn.reactos.org/svn/reactos?rev=69809&view=rev Log: [ARWINSS] - Change base addresses so that user32, gdi32 and kernel32 don't get relocated. Modified: branches/arwinss/trunk.diff Modified: branches/arwinss/trunk.diff URL: http://svn.reactos.org/svn/reactos/branches/arwinss/trunk.diff?rev=69809&r1… ============================================================================== --- branches/arwinss/trunk.diff [iso-8859-1] (original) +++ branches/arwinss/trunk.diff [iso-8859-1] Tue Nov 3 22:31:23 2015 @@ -1,137 +1,139 @@ Index: base/system/smss/smsubsys.c =================================================================== ---- base/system/smss/smsubsys.c (revision 69519) +--- base/system/smss/smsubsys.c (revision 69795) +++ base/system/smss/smsubsys.c (working copy) @@ -10,7 +10,7 @@ - - #include "smss.h" - --#define NDEBUG -+//#define NDEBUG - #include <debug.h> - - /* GLOBALS ********************************************************************/ + + #include "smss.h" + +-#define NDEBUG ++//#define NDEBUG + #include <debug.h> + + /* GLOBALS ********************************************************************/ Index: base/system/winlogon/winlogon.c =================================================================== ---- base/system/winlogon/winlogon.c (revision 69519) +--- base/system/winlogon/winlogon.c (revision 69795) +++ base/system/winlogon/winlogon.c (working copy) @@ -397,7 +397,7 @@ - HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); - ExitProcess(1); - } -- -+ERR("WL Desktop: %x\n", WLSession->WinlogonDesktop); - DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); - - #if 0 + HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); + ExitProcess(1); + } +- ++ERR("WL Desktop: %x\n", WLSession->WinlogonDesktop); + DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); + + #if 0 Index: cmake/baseaddress.cmake =================================================================== ---- cmake/baseaddress.cmake (revision 69519) +--- cmake/baseaddress.cmake (revision 69795) +++ cmake/baseaddress.cmake (working copy) -@@ -2,7 +2,7 @@ - set(baseaddress_kernel32 0x7c770000) - set(baseaddress_msvcrt 0x7c6c0000) - set(baseaddress_advapi32 0x7c610000) --set(baseaddress_gdi32 0x7c570000) -+set(baseaddress_gdi32 0x7c580000) - set(baseaddress_user32 0x7c3d0000) - set(baseaddress_dhcpcsvc 0x7c380000) - set(baseaddress_dnsapi 0x7c330000) +@@ -2,8 +2,8 @@ + set(baseaddress_kernel32 0x7c750000) + set(baseaddress_msvcrt 0x7c6b0000) + set(baseaddress_advapi32 0x7c610000) +-set(baseaddress_gdi32 0x7c570000) +-set(baseaddress_user32 0x7c3d0000) ++set(baseaddress_gdi32 0x7c530000) ++set(baseaddress_user32 0x7c380000) + set(baseaddress_dhcpcsvc 0x7c380000) + set(baseaddress_dnsapi 0x7c330000) + set(baseaddress_icmp 0x7c300000) Index: cmake/config.cmake =================================================================== ---- cmake/config.cmake (revision 69519) +--- cmake/config.cmake (revision 69795) +++ cmake/config.cmake (working copy) @@ -58,6 +58,9 @@ - "Whether to compile support for ELF files. - Do not enable unless you know what you're doing.") - -+set(_ARWINSS_ TRUE CACHE BOOL -+"Whether to build and use Wine-based Win32 subsystem.") -+ - set(NSWPAT FALSE CACHE BOOL - "Whether to build apps/libs with features covered by software patents. - If you live in a country where software patents are valid/apply, don't + "Whether to compile support for ELF files. + Do not enable unless you know what you're doing.") + ++set(_ARWINSS_ TRUE CACHE BOOL ++"Whether to build and use Wine-based Win32 subsystem.") ++ + set(NSWPAT FALSE CACHE BOOL + "Whether to build apps/libs with features covered by software patents. + If you live in a country where software patents are valid/apply, don't Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt (revision 69519) +--- CMakeLists.txt (revision 69795) +++ CMakeLists.txt (working copy) -@@ -166,6 +166,10 @@ - add_definitions(-D_WINKD_=1) - endif() - -+ if(_ARWINSS_) -+ add_definitions(-D_ARWINSS_=1) -+ endif() -+ - if(CMAKE_VERSION MATCHES "ReactOS") - set(PCH 1 CACHE BOOL "Whether to use precompiled headers") - else() -@@ -279,6 +283,9 @@ - add_subdirectory(subsystems) - add_subdirectory(tools/wpp) - add_subdirectory(win32ss) -+ if (_ARWINSS_) -+ add_subdirectory(arwinss) -+ endif() - - # Create the registry hives - create_registry_hives() +@@ -165,6 +165,10 @@ + add_definitions(-D_WINKD_=1) + endif() + ++ if(_ARWINSS_) ++ add_definitions(-D_ARWINSS_=1) ++ endif() ++ + if(CMAKE_VERSION MATCHES "ReactOS") + set(PCH 1 CACHE BOOL "Whether to use precompiled headers") + else() +@@ -278,6 +282,9 @@ + add_subdirectory(subsystems) + add_subdirectory(tools/wpp) + add_subdirectory(win32ss) ++ if (_ARWINSS_) ++ add_subdirectory(arwinss) ++ endif() + + # Create the registry hives + create_registry_hives() Index: dll/win32/kernel32/client/dllmain.c =================================================================== ---- dll/win32/kernel32/client/dllmain.c (revision 69519) +--- dll/win32/kernel32/client/dllmain.c (revision 69795) +++ dll/win32/kernel32/client/dllmain.c (working copy) @@ -131,7 +131,7 @@ - SessionId, - WIN_OBJ_DIR); - } -- -+DPRINT1("About to connect to CSR!\n"); - /* Connect to the Base Server */ - Status = CsrClientConnectToServer(SessionDir, - BASESRV_SERVERDLL_INDEX, + SessionId, + WIN_OBJ_DIR); + } +- ++DPRINT1("About to connect to CSR!\n"); + /* Connect to the Base Server */ + Status = CsrClientConnectToServer(SessionDir, + BASESRV_SERVERDLL_INDEX, Index: dll/win32/msgina/gui.c =================================================================== ---- dll/win32/msgina/gui.c (revision 69519) +--- dll/win32/msgina/gui.c (revision 69795) +++ dll/win32/msgina/gui.c (working copy) @@ -73,6 +73,7 @@ - - /* When SetThreadDesktop is called the system closes the desktop handle when needed - so we have to create a new handle because this handle may still be in use by winlogon */ -+#ifndef _ARWINSS_ - if (!DuplicateHandle ( GetCurrentProcess(), - msg->hDesktop, - GetCurrentProcess(), + + /* When SetThreadDesktop is called the system closes the desktop handle when needed + so we have to create a new handle because this handle may still be in use by winlogon */ ++#ifndef _ARWINSS_ + if (!DuplicateHandle ( GetCurrentProcess(), + msg->hDesktop, + GetCurrentProcess(), @@ -85,6 +86,9 @@ - HeapFree(GetProcessHeap(), 0, lpParam); - return FALSE; - } -+#else -+ hDesk = msg->hDesktop; -+#endif - - if(!SetThreadDesktop(hDesk)) - { + HeapFree(GetProcessHeap(), 0, lpParam); + return FALSE; + } ++#else ++ hDesk = msg->hDesktop; ++#endif + + if(!SetThreadDesktop(hDesk)) + { Index: include/asm/syscalls.inc =================================================================== ---- include/asm/syscalls.inc (revision 69519) +--- include/asm/syscalls.inc (revision 69795) +++ include/asm/syscalls.inc (working copy) @@ -1,4 +1,4 @@ -- +- + - #ifdef _M_ARM - - #include <ksarm.h> + #ifdef _M_ARM + + #include <ksarm.h> @@ -52,103 +52,105 @@ - - SyscallId = 0 - --#ifdef _M_IX86 --#define KUSER_SHARED_SYSCALL HEX(7ffe0300) --#define KGDT_R0_CODE 8 --MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -- StackBytes = 4 * ArgCount -- FPO 0, 0, 0, 0, 0, FRAME_FPO -- mov eax, SyscallId + + SyscallId = 0 + +-#ifdef _M_IX86 +-#define KUSER_SHARED_SYSCALL HEX(7ffe0300) +-#define KGDT_R0_CODE 8 +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- StackBytes = 4 * ArgCount +- FPO 0, 0, 0, 0, 0, FRAME_FPO +- mov eax, SyscallId +#ifdef _M_IX86 +#define KUSER_SHARED_SYSCALL HEX(7ffe0300) +#define KGDT_R0_CODE 8 @@ -139,62 +141,62 @@ + StackBytes = 4 * ArgCount + FPO 0, 0, 0, 0, 0, FRAME_FPO + mov eax, SyscallId - mov edx, KUSER_SHARED_SYSCALL - call dword ptr [edx] -- ret StackBytes --ENDM --MACRO(STUBCODE_K, Name, SyscallId, ArgCount) -- StackBytes = 4 * &ArgCount -- FPO 0, 0, 0, 0, 0, FRAME_FPO -- mov eax, SyscallId -- lea edx, [esp + 4] -- pushfd -- push KGDT_R0_CODE -- call _KiSystemService -- ret StackBytes --ENDM --#elif defined(_M_AMD64) --MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -- .ENDPROLOG -- mov eax, SyscallId -- mov r10, rcx -- syscall -- ret --ENDM --MACRO(STUBCODE_K, Name, SyscallId, ArgCount) -- .ENDPROLOG -- EXTERN Nt&Name:PROC -- lea rax, Nt&Name[rip] -- mov r10, ArgCount * 8 -- jmp KiZwSystemService --ENDM --#elif defined(_M_PPC) --MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -- stwu 1,-16(1) -- mflr 0 -- stw 0,0(1) -- li 0, SyscallId -- sc -- lwz 0,0(1) -- mtlr 0 -- addi 1,1,16 -- blr --ENDM --#define STUBCODE_K STUBCODE_U --#elif defined(_M_MIPS) --MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -- li $8, KUSER_SHARED_SYSCALL -- lw $8,0($8) -- j $8 -- nop --ENDM --MACRO(STUBCODE_K, Name, SyscallId, ArgCount) -- j KiSystemService -- nop --ENDM --#else --#error unsupported architecture --#endif + mov edx, KUSER_SHARED_SYSCALL + call dword ptr [edx] +- ret StackBytes +-ENDM +-MACRO(STUBCODE_K, Name, SyscallId, ArgCount) +- StackBytes = 4 * &ArgCount +- FPO 0, 0, 0, 0, 0, FRAME_FPO +- mov eax, SyscallId +- lea edx, [esp + 4] +- pushfd +- push KGDT_R0_CODE +- call _KiSystemService +- ret StackBytes +-ENDM +-#elif defined(_M_AMD64) +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- .ENDPROLOG +- mov eax, SyscallId +- mov r10, rcx +- syscall +- ret +-ENDM +-MACRO(STUBCODE_K, Name, SyscallId, ArgCount) +- .ENDPROLOG +- EXTERN Nt&Name:PROC +- lea rax, Nt&Name[rip] +- mov r10, ArgCount * 8 +- jmp KiZwSystemService +-ENDM +-#elif defined(_M_PPC) +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- stwu 1,-16(1) +- mflr 0 +- stw 0,0(1) +- li 0, SyscallId +- sc +- lwz 0,0(1) +- mtlr 0 +- addi 1,1,16 +- blr +-ENDM +-#define STUBCODE_K STUBCODE_U +-#elif defined(_M_MIPS) +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- li $8, KUSER_SHARED_SYSCALL +- lw $8,0($8) +- j $8 +- nop +-ENDM +-MACRO(STUBCODE_K, Name, SyscallId, ArgCount) +- j KiSystemService +- nop +-ENDM +-#else +-#error unsupported architecture +-#endif + ret StackBytes +ENDM +MACRO(STUBCODE_K, Name, SyscallId, ArgCount) @@ -286,370 +288,372 @@ + .ENDP + SyscallId = SyscallId + 1 +ENDM - --#ifdef _M_IX86 --MACRO(MAKE_LABEL, Name, StackBytes) -- PUBLIC _&Name&@&StackBytes -- _&Name&@&StackBytes: --ENDM --MACRO(START_PROC, Name, StackBytes) -- PUBLIC _&Name&@&StackBytes -- .PROC _&Name&@&StackBytes --ENDM --#else --MACRO(MAKE_LABEL, Name, StackBytes) -- PUBLIC &Name -- &Name: --ENDM --MACRO(START_PROC, Name, StackBytes) -- PUBLIC &Name -- .PROC &Name --ENDM - #endif -- --MACRO(STUB_U, Name, ArgCount) -- MAKE_LABEL Zw&Name, %ArgCount * 4 -- START_PROC Nt&Name, %ArgCount * 4 -- STUBCODE_U Name, SyscallId, %ArgCount -- .ENDP -- SyscallId = SyscallId + 1 --ENDM -- --MACRO(STUB_K, Name, ArgCount) -- START_PROC Zw&Name, %ArgCount * 4 -- STUBCODE_K Name, SyscallId, %ArgCount -- .ENDP -- SyscallId = SyscallId + 1 --ENDM -- --#endif + +-#ifdef _M_IX86 +-MACRO(MAKE_LABEL, Name, StackBytes) +- PUBLIC _&Name&@&StackBytes +- _&Name&@&StackBytes: +-ENDM +-MACRO(START_PROC, Name, StackBytes) +- PUBLIC _&Name&@&StackBytes +- .PROC _&Name&@&StackBytes +-ENDM +-#else +-MACRO(MAKE_LABEL, Name, StackBytes) +- PUBLIC &Name +- &Name: +-ENDM +-MACRO(START_PROC, Name, StackBytes) +- PUBLIC &Name +- .PROC &Name +-ENDM + #endif +- +-MACRO(STUB_U, Name, ArgCount) +- MAKE_LABEL Zw&Name, %ArgCount * 4 +- START_PROC Nt&Name, %ArgCount * 4 +- STUBCODE_U Name, SyscallId, %ArgCount +- .ENDP +- SyscallId = SyscallId + 1 +-ENDM +- +-MACRO(STUB_K, Name, ArgCount) +- START_PROC Zw&Name, %ArgCount * 4 +- STUBCODE_K Name, SyscallId, %ArgCount +- .ENDP +- SyscallId = SyscallId + 1 +-ENDM +- +-#endif Index: include/psdk/winddi.h =================================================================== ---- include/psdk/winddi.h (revision 69519) +--- include/psdk/winddi.h (revision 69795) +++ include/psdk/winddi.h (working copy) @@ -2911,7 +2911,7 @@ - _In_ ULONG cjSize, - _Out_bytecap_(cjSize) FONTINFO *pfi); - --#if (NTDDI_VERSION <= NTDDI_WINXP) -+#if 0//(NTDDI_VERSION <= NTDDI_WINXP) - /* Obsolete in Windows 2000 and later */ - GAMMA_TABLES* - APIENTRY + _In_ ULONG cjSize, + _Out_bytecap_(cjSize) FONTINFO *pfi); + +-#if (NTDDI_VERSION <= NTDDI_WINXP) ++#if 0//(NTDDI_VERSION <= NTDDI_WINXP) + /* Obsolete in Windows 2000 and later */ + GAMMA_TABLES* + APIENTRY Index: include/reactos/wine/config.h =================================================================== ---- include/reactos/wine/config.h (revision 69519) +--- include/reactos/wine/config.h (revision 69795) +++ include/reactos/wine/config.h (working copy) @@ -1,3 +1,5 @@ -+#include "reactos/buildno.h" -+ - #define __WINE_CONFIG_H - - /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ ++#include "reactos/buildno.h" ++ + #define __WINE_CONFIG_H + + /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ Index: lib/3rdparty/CMakeLists.txt =================================================================== ---- lib/3rdparty/CMakeLists.txt (revision 69519) +--- lib/3rdparty/CMakeLists.txt (revision 69795) +++ lib/3rdparty/CMakeLists.txt (working copy) @@ -2,7 +2,9 @@ - add_subdirectory(adns) - add_subdirectory(bzip2) - add_subdirectory(cardlib) -+if (NOT _ARWINSS_) - add_subdirectory(freetype) -+endif () - add_subdirectory(fullfat) - add_subdirectory(libmpg123) - add_subdirectory(libsamplerate) + add_subdirectory(adns) + add_subdirectory(bzip2) + add_subdirectory(cardlib) ++if (NOT _ARWINSS_) + add_subdirectory(freetype) ++endif () + add_subdirectory(fullfat) + add_subdirectory(libmpg123) + add_subdirectory(libsamplerate) Index: subsystems/win32/csrsrv/init.c =================================================================== ---- subsystems/win32/csrsrv/init.c (revision 69519) +--- subsystems/win32/csrsrv/init.c (revision 69795) +++ subsystems/win32/csrsrv/init.c (working copy) @@ -20,7 +20,7 @@ - /* DATA ***********************************************************************/ - - // Debug Flag --ULONG CsrDebug = 0; // 0xFFFFFFFF; -+ULONG CsrDebug = 0xFFFFFFFF; - - HANDLE CsrHeap = NULL; - HANDLE CsrObjectDirectory = NULL; + /* DATA ***********************************************************************/ + + // Debug Flag +-ULONG CsrDebug = 0; // 0xFFFFFFFF; ++ULONG CsrDebug = 0xFFFFFFFF; + + HANDLE CsrHeap = NULL; + HANDLE CsrObjectDirectory = NULL; Index: win32ss/CMakeLists.txt =================================================================== ---- win32ss/CMakeLists.txt (revision 69519) +--- win32ss/CMakeLists.txt (revision 69795) +++ win32ss/CMakeLists.txt (working copy) @@ -10,7 +10,10 @@ - PROJECT(WIN32SS) - - add_subdirectory(drivers) -+add_subdirectory(user/winsrv) - -+if (NOT _ARWINSS_) -+ - if(USE_DIBLIB) - add_subdirectory(gdi/diblib) - endif() + PROJECT(WIN32SS) + + add_subdirectory(drivers) ++add_subdirectory(user/winsrv) + ++if (NOT _ARWINSS_) ++ + if(USE_DIBLIB) + add_subdirectory(gdi/diblib) + endif() @@ -18,7 +21,6 @@ - add_subdirectory(gdi/gdi32) - add_subdirectory(reactx) - add_subdirectory(user/user32) --add_subdirectory(user/winsrv) - - spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) - + add_subdirectory(gdi/gdi32) + add_subdirectory(reactx) + add_subdirectory(user/user32) +-add_subdirectory(user/winsrv) + + spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) + @@ -243,3 +245,4 @@ - add_asm_files(win32ksys_asm sys-stubs.S) - add_library(win32ksys ${win32ksys_asm}) - set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE "C") + add_asm_files(win32ksys_asm sys-stubs.S) + add_library(win32ksys ${win32ksys_asm}) + set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE "C") +endif() # _ARWINSS_ \ No newline at end of file Index: win32ss/drivers/CMakeLists.txt =================================================================== ---- win32ss/drivers/CMakeLists.txt (revision 69519) +--- win32ss/drivers/CMakeLists.txt (revision 69795) +++ win32ss/drivers/CMakeLists.txt (working copy) @@ -1,6 +1,8 @@ - - add_subdirectory(displays) -+if (NOT _ARWINSS_) - add_subdirectory(font) -+endif () - add_subdirectory(miniport) - add_subdirectory(videoprt) - add_subdirectory(watchdog) + + add_subdirectory(displays) ++if (NOT _ARWINSS_) + add_subdirectory(font) ++endif () + add_subdirectory(miniport) + add_subdirectory(videoprt) + add_subdirectory(watchdog) Index: win32ss/include/ntgdihdl.h =================================================================== ---- win32ss/include/ntgdihdl.h (revision 69519) +--- win32ss/include/ntgdihdl.h (revision 69795) +++ win32ss/include/ntgdihdl.h (working copy) @@ -260,6 +260,7 @@ - DWORD dwCFCount; - } GDI_SHARED_HANDLE_TABLE, *PGDI_SHARED_HANDLE_TABLE; - -+#ifndef _ARWINSS_ - typedef struct _RGN_ATTR - { - ULONG AttrFlags; + DWORD dwCFCount; + } GDI_SHARED_HANDLE_TABLE, *PGDI_SHARED_HANDLE_TABLE; + ++#ifndef _ARWINSS_ + typedef struct _RGN_ATTR + { + ULONG AttrFlags; @@ -347,6 +348,19 @@ - RGN_ATTR VisRectRegion; - } DC_ATTR, *PDC_ATTR; - -+#else -+ -+typedef struct _DC_ATTR -+{ -+ HDC hdc; -+ HDC hKernelDC; -+ RECT dc_rect; /* DC rectangle relative to drawable */ -+ HRGN region; /* Device region (visible region & clip region) */ -+ int cache_index; /* cache of a currently selected font */ -+} DC_ATTR, *PDC_ATTR; -+ -+#endif -+ - typedef struct _BRUSH_ATTR /* Used with pen too. */ - { - FLONG AttrFlags; + RGN_ATTR VisRectRegion; + } DC_ATTR, *PDC_ATTR; + ++#else ++ ++typedef struct _DC_ATTR ++{ ++ HDC hdc; ++ HDC hKernelDC; ++ RECT dc_rect; /* DC rectangle relative to drawable */ ++ HRGN region; /* Device region (visible region & clip region) */ ++ int cache_index; /* cache of a currently selected font */ ++} DC_ATTR, *PDC_ATTR; ++ ++#endif ++ + typedef struct _BRUSH_ATTR /* Used with pen too. */ + { + FLONG AttrFlags; Index: win32ss/user/winsrv/consrv/conoutput.c =================================================================== ---- win32ss/user/winsrv/consrv/conoutput.c (revision 69519) +--- win32ss/user/winsrv/consrv/conoutput.c (revision 69795) +++ win32ss/user/winsrv/consrv/conoutput.c (working copy) @@ -99,9 +99,13 @@ - * Indeed, the palette handle comes from a console app - * calling ourselves, running in CSRSS. - */ -+#ifndef _ARWINSS_ - NtUserConsoleControl(ConsoleMakePalettePublic, - &SetPaletteRequest->PaletteHandle, - sizeof(SetPaletteRequest->PaletteHandle)); -+#else -+ UNIMPLEMENTED; -+#endif - - Status = ConDrvSetConsolePalette(Buffer->Header.Console, - Buffer, + * Indeed, the palette handle comes from a console app + * calling ourselves, running in CSRSS. + */ ++#ifndef _ARWINSS_ + NtUserConsoleControl(ConsoleMakePalettePublic, + &SetPaletteRequest->PaletteHandle, + sizeof(SetPaletteRequest->PaletteHandle)); ++#else ++ UNIMPLEMENTED; ++#endif + + Status = ConDrvSetConsolePalette(Buffer->Header.Console, + Buffer, Index: win32ss/user/winsrv/consrv/frontends/gui/conwnd.c =================================================================== ---- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 69519) +--- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 69795) +++ win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (working copy) @@ -159,7 +159,11 @@ - } - else - { -+#ifndef _ARWINSS_ - NtUserConsoleControl(GuiConsoleWndClassAtom, &WndClassAtom, sizeof(ATOM)); -+#else -+ UNIMPLEMENTED; -+#endif - } - - return (WndClassAtom != 0); + } + else + { ++#ifndef _ARWINSS_ + NtUserConsoleControl(GuiConsoleWndClassAtom, &WndClassAtom, sizeof(ATOM)); ++#else ++ UNIMPLEMENTED; ++#endif + } + + return (WndClassAtom != 0); Index: win32ss/user/winsrv/consrv/frontends/gui/guiterm.c =================================================================== ---- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (revision 69519) +--- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (revision 69795) +++ win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (working copy) @@ -160,9 +160,14 @@ - /* Assign this console input thread to this desktop */ - DesktopConsoleThreadInfo.DesktopHandle = GuiInitInfo->Desktop; // Duplicated desktop handle - DesktopConsoleThreadInfo.ThreadId = InputThreadId; -+#ifndef _ARWINSS_ - Status = NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, - &DesktopConsoleThreadInfo, - sizeof(DesktopConsoleThreadInfo)); -+#else -+ UNIMPLEMENTED; -+ Status = STATUS_UNSUCCESSFUL; -+#endif - if (!NT_SUCCESS(Status)) goto Quit; - - /* Connect this CSR thread to the USER subsystem */ + /* Assign this console input thread to this desktop */ + DesktopConsoleThreadInfo.DesktopHandle = GuiInitInfo->Desktop; // Duplicated desktop handle + DesktopConsoleThreadInfo.ThreadId = InputThreadId; ++#ifndef _ARWINSS_ + Status = NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, + &DesktopConsoleThreadInfo, + sizeof(DesktopConsoleThreadInfo)); ++#else ++ UNIMPLEMENTED; ++ Status = STATUS_UNSUCCESSFUL; ++#endif + if (!NT_SUCCESS(Status)) goto Quit; + + /* Connect this CSR thread to the USER subsystem */ @@ -295,13 +300,17 @@ - - Quit: - DPRINT("CONSRV: Quit the Input Thread 0x%p, Status = 0x%08lx\n", InputThreadId, Status); -- -+ - /* Remove this console input thread from this desktop */ - // DesktopConsoleThreadInfo.DesktopHandle; - DesktopConsoleThreadInfo.ThreadId = 0; -+#ifndef _ARWINSS_ - NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, - &DesktopConsoleThreadInfo, - sizeof(DesktopConsoleThreadInfo)); -+#else -+ UNIMPLEMENTED -+#endif - - /* Close the duplicated desktop handle */ - CloseDesktop(DesktopConsoleThreadInfo.DesktopHandle); // NtUserCloseDesktop + + Quit: + DPRINT("CONSRV: Quit the Input Thread 0x%p, Status = 0x%08lx\n", InputThreadId, Status); +- ++ + /* Remove this console input thread from this desktop */ + // DesktopConsoleThreadInfo.DesktopHandle; + DesktopConsoleThreadInfo.ThreadId = 0; ++#ifndef _ARWINSS_ + NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, + &DesktopConsoleThreadInfo, + sizeof(DesktopConsoleThreadInfo)); ++#else ++ UNIMPLEMENTED ++#endif + + /* Close the duplicated desktop handle */ + CloseDesktop(DesktopConsoleThreadInfo.DesktopHandle); // NtUserCloseDesktop @@ -358,11 +367,16 @@ - { - RtlInitUnicodeString(&DesktopPath, L"Default"); - } -- -+#ifndef _ARWINSS_ - hDesk = NtUserResolveDesktop(ConsoleLeaderProcessHandle, - &DesktopPath, - 0, - &hWinSta); -+#else -+ UNIMPLEMENTED -+ hDesk = NULL; -+#endif -+ - DPRINT("NtUserResolveDesktop(DesktopPath = '%wZ') returned hDesk = 0x%p; hWinSta = 0x%p\n", - &DesktopPath, hDesk, hWinSta); - + { + RtlInitUnicodeString(&DesktopPath, L"Default"); + } +- ++#ifndef _ARWINSS_ + hDesk = NtUserResolveDesktop(ConsoleLeaderProcessHandle, + &DesktopPath, + 0, + &hWinSta); ++#else ++ UNIMPLEMENTED ++ hDesk = NULL; ++#endif ++ + DPRINT("NtUserResolveDesktop(DesktopPath = '%wZ') returned hDesk = 0x%p; hWinSta = 0x%p\n", + &DesktopPath, hDesk, hWinSta); + Index: win32ss/user/winsrv/usersrv/init.c =================================================================== ---- win32ss/user/winsrv/usersrv/init.c (revision 69519) +--- win32ss/user/winsrv/usersrv/init.c (revision 69795) +++ win32ss/user/winsrv/usersrv/init.c (working copy) -@@ -101,7 +101,20 @@ - NTAPI - CreateSystemThreads(PVOID pParam) - { -+#ifndef _ARWINSS_ - NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); -+#else -+ DWORD WaitRes; -+ HANDLE hDummyEvent; -+ -+ hDummyEvent = CreateEventW(0, FALSE, FALSE, L""); -+ -+ while (TRUE) -+ { -+ WaitRes = WaitForSingleObject(hDummyEvent, INFINITE); -+ } -+ DPRINT1("WaitRes: 0x%x\n", WaitRes); -+#endif - DPRINT1("This thread should not terminate!\n"); - return 0; - } -@@ -173,6 +186,7 @@ - CsrApiPort = CsrQueryApiPort(); - - /* Inform win32k about the API port */ -+#ifndef _ARWINSS_ - Status = NtUserSetInformationThread(NtCurrentThread(), - UserThreadCsrApiPort, - &CsrApiPort, -@@ -181,6 +195,9 @@ - { - return Status; - } -+#else -+ UNIMPLEMENTED -+#endif - } - - /* Check connection info validity */ -@@ -199,9 +216,14 @@ - - /* Pass the request to win32k */ - ConnectInfo->dwDispatchCount = 0; // gDispatchTableValues; -+#ifndef _ARWINSS_ - Status = NtUserProcessConnect(CsrProcess->ProcessHandle, - ConnectInfo, - *ConnectionInfoLength); -+#else -+ Status = STATUS_SUCCESS; -+ UNIMPLEMENTED -+#endif - - return Status; - } -@@ -254,7 +276,11 @@ - } - - /* Set the process creation notify routine for BASE */ -+#ifndef _ARWINSS_ - BaseSetProcessCreateNotify(NtUserNotifyProcessCreate); -+#else -+ UNIMPLEMENTED -+#endif - - /* Initialize the kernel mode subsystem */ - Status = NtUserInitialize(USER_VERSION, +@@ -101,8 +101,22 @@ + NTAPI + CreateSystemThreads(PVOID pParam) + { ++#ifndef _ARWINSS_ + NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); + RtlExitUserThread(0); ++#else ++ DWORD WaitRes; ++ HANDLE hDummyEvent; ++ ++ hDummyEvent = CreateEventW(0, FALSE, FALSE, L""); ++ ++ while (TRUE) ++ { ++ WaitRes = WaitForSingleObject(hDummyEvent, INFINITE); ++ } ++ DPRINT1("WaitRes: 0x%x\n", WaitRes); ++#endif ++ DPRINT1("This thread should not terminate!\n"); + return 0; + } + +@@ -173,6 +187,7 @@ + CsrApiPort = CsrQueryApiPort(); + + /* Inform win32k about the API port */ ++#ifndef _ARWINSS_ + Status = NtUserSetInformationThread(NtCurrentThread(), + UserThreadCsrApiPort, + &CsrApiPort, +@@ -181,6 +196,9 @@ + { + return Status; + } ++#else ++ UNIMPLEMENTED ++#endif + } + + /* Check connection info validity */ +@@ -199,9 +217,14 @@ + + /* Pass the request to win32k */ + ConnectInfo->dwDispatchCount = 0; // gDispatchTableValues; ++#ifndef _ARWINSS_ + Status = NtUserProcessConnect(CsrProcess->ProcessHandle, + ConnectInfo, + *ConnectionInfoLength); ++#else ++ Status = STATUS_SUCCESS; ++ UNIMPLEMENTED ++#endif + + return Status; + } +@@ -254,7 +277,11 @@ + } + + /* Set the process creation notify routine for BASE */ ++#ifndef _ARWINSS_ + BaseSetProcessCreateNotify(NtUserNotifyProcessCreate); ++#else ++ UNIMPLEMENTED ++#endif + + /* Initialize the kernel mode subsystem */ + Status = NtUserInitialize(USER_VERSION, Index: win32ss/user/winsrv/usersrv/shutdown.c =================================================================== ---- win32ss/user/winsrv/usersrv/shutdown.c (revision 69519) +--- win32ss/user/winsrv/usersrv/shutdown.c (revision 69795) +++ win32ss/user/winsrv/usersrv/shutdown.c (working copy) @@ -381,7 +381,12 @@ - static BOOLEAN - IsConsoleMode(VOID) - { -+#ifndef _ARWINSS_ - return (BOOLEAN)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE); -+#else -+ UNIMPLEMENTED -+ return FALSE; -+#endif - } - - + static BOOLEAN + IsConsoleMode(VOID) + { ++#ifndef _ARWINSS_ + return (BOOLEAN)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE); ++#else ++ UNIMPLEMENTED ++ return FALSE; ++#endif + } + + @@ -678,9 +683,14 @@ - while (TRUE) - { - /* Notify Win32k and potentially Winlogon of the shutdown */ -+#ifndef _ARWINSS_ - Status = NtUserSetInformationThread(CsrThread->ThreadHandle, - UserThreadInitiateShutdown, - &Flags, sizeof(Flags)); -+#else -+ Status = STATUS_SUCCESS; -+ UNIMPLEMENTED -+#endif - DPRINT1("Win32k says: %lx\n", Status); - switch (Status) - { + while (TRUE) + { + /* Notify Win32k and potentially Winlogon of the shutdown */ ++#ifndef _ARWINSS_ + Status = NtUserSetInformationThread(CsrThread->ThreadHandle, + UserThreadInitiateShutdown, + &Flags, sizeof(Flags)); ++#else ++ Status = STATUS_SUCCESS; ++ UNIMPLEMENTED ++#endif + DPRINT1("Win32k says: %lx\n", Status); + switch (Status) + { @@ -736,9 +746,13 @@ - // FIXME: If Status == STATUS_CANCELLED, call RecordShutdownReason - - /* Tell Win32k and potentially Winlogon that we're done */ -+#ifndef _ARWINSS_ - NtUserSetInformationThread(CsrThread->ThreadHandle, - UserThreadEndShutdown, - &Status, sizeof(Status)); -+#else -+ UNIMPLEMENTED -+#endif - - DPRINT1("SrvExitWindowsEx returned 0x%08x\n", Status); - + // FIXME: If Status == STATUS_CANCELLED, call RecordShutdownReason + + /* Tell Win32k and potentially Winlogon that we're done */ ++#ifndef _ARWINSS_ + NtUserSetInformationThread(CsrThread->ThreadHandle, + UserThreadEndShutdown, + &Status, sizeof(Status)); ++#else ++ UNIMPLEMENTED ++#endif + + DPRINT1("SrvExitWindowsEx returned 0x%08x\n", Status); +

9 years, 1 month

[akhaldi] 69808: [WS2_32_NEW] Add missing iptypes.h inclusion.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 3 22:13:38 2015 New Revision: 69808 URL: http://svn.reactos.org/svn/reactos?rev=69808&view=rev Log: [WS2_32_NEW] Add missing iptypes.h inclusion. Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/inc/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] Tue Nov 3 22:13:38 2015 @@ -33,6 +33,7 @@ #include <ws2help.h> #include <nsp_dns.h> +#include <iptypes.h> /* Missing definitions */ #define SO_OPENTYPE 0x7008

9 years, 1 month

[akhaldi] 69807: [WS2_32_NEW] Properly handle szLocalName. Properly set Hostent on failure. By Peter Hater. CORE-10440

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 3 22:03:02 2015 New Revision: 69807 URL: http://svn.reactos.org/svn/reactos?rev=69807&view=rev Log: [WS2_32_NEW] Properly handle szLocalName. Properly set Hostent on failure. By Peter Hater. CORE-10440 Modified: trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/g… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c [iso-8859-1] Tue Nov 3 22:03:02 2015 @@ -220,7 +220,7 @@ INT ErrorCode; CHAR ResultsBuffer[RNR_BUFFER_SIZE]; PCHAR Results = ResultsBuffer; - CHAR szLocalName[200]; + CHAR szLocalName[MAX_HOSTNAME_LEN]; PCHAR pszName; PWSPROCESS Process; PWSTHREAD Thread; @@ -238,7 +238,7 @@ if(!name || !*name) { /* This means we should do a local lookup first */ - if(gethostname(szLocalName, 200) != NO_ERROR) return(NULL); + if(gethostname(szLocalName, MAX_HOSTNAME_LEN) != NO_ERROR) return(NULL); pszName = szLocalName; } else @@ -277,7 +277,7 @@ else { /* We failed, so zero it out */ - Hostent = 0; + Hostent = NULL; /* Normalize the error message */ if(GetLastError() == WSASERVICE_NOT_FOUND)

9 years, 1 month

[akhaldi] 69806: [WS2_32_NEW] Do not initialize ProtocolId to 0. By Peter Hater. CORE-10440

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 3 21:57:08 2015 New Revision: 69806 URL: http://svn.reactos.org/svn/reactos?rev=69806&view=rev Log: [WS2_32_NEW] Do not initialize ProtocolId to 0. By Peter Hater. CORE-10440 Modified: trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/e… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c [iso-8859-1] Tue Nov 3 21:57:08 2015 @@ -22,7 +22,7 @@ { BOOL Return = FALSE; DWORD i = 0; - INT ProtocolId = 0; + INT ProtocolId; /* Make sure we have a set */ if (ProtocolSet)

9 years, 1 month

[akhaldi] 69805: [WS2_32_NEW] Fix ProtocolInfo allocation size. By Peter Hater. CORE-10440

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 3 21:54:00 2015 New Revision: 69805 URL: http://svn.reactos.org/svn/reactos?rev=69805&view=rev Log: [WS2_32_NEW] Fix ProtocolInfo allocation size. By Peter Hater. CORE-10440 Modified: trunk/reactos/dll/win32/ws2_32_new/src/dthread.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/dthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dthread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dthread.c [iso-8859-1] Tue Nov 3 21:54:00 2015 @@ -123,7 +123,7 @@ if (!Thread->ProtocolInfo) { /* We don't have a buffer; allocate it */ - Thread->ProtocolInfo = HeapAlloc(WsSockHeap, 0, sizeof(PWSPROTO_BUFFER)); + Thread->ProtocolInfo = HeapAlloc(WsSockHeap, 0, sizeof(WSPROTO_BUFFER)); } /* Return it */

9 years, 1 month

← Newer
1
...
39
40
41
42
43
44
45
46
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 November 2015