Ros-diffs June 2015

ros-diffs@reactos.org

13 participants
343 discussions

[akhaldi] 68147: [CMAKE] Disable rossym for GCC release builds.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 15 16:43:11 2015 New Revision: 68147 URL: http://svn.reactos.org/svn/reactos?rev=68147&view=rev Log: [CMAKE] Disable rossym for GCC release builds. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=68147&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Jun 15 16:43:11 2015 @@ -12,7 +12,9 @@ endif() # Dwarf based builds (no rsym) -if(NOT DEFINED NO_ROSSYM) +if(CMAKE_BUILD_TYPE STREQUAL "Release") + set(NO_ROSSYM TRUE) +elseif(NOT DEFINED NO_ROSSYM) set(NO_ROSSYM FALSE) endif()

9 years, 4 months

[dreimer] 68146: [UDFS] Use the same fix for the PIMAGE_NT_HEADERS32 redefinition which is bein used in uniata. Spotted by Thomas Faber

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Jun 15 11:59:49 2015 New Revision: 68146 URL: http://svn.reactos.org/svn/reactos?rev=68146&view=rev Log: [UDFS] Use the same fix for the PIMAGE_NT_HEADERS32 redefinition which is bein used in uniata. Spotted by Thomas Faber Modified: trunk/reactos/drivers/filesystems/udfs/Include/ntddk_ex.h Modified: trunk/reactos/drivers/filesystems/udfs/Include/ntddk_ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/Include/ntddk_ex.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/Include/ntddk_ex.h [iso-8859-1] Mon Jun 15 11:59:49 2015 @@ -95,7 +95,7 @@ typedef unsigned long DWORD; typedef unsigned char BYTE; - +#ifndef __REACTOS__ typedef struct _IMAGE_DOS_HEADER { // DOS .EXE header WORD e_magic; // Magic number WORD e_cblp; // Bytes on last page of file @@ -184,9 +184,7 @@ IMAGE_OPTIONAL_HEADER32 OptionalHeader; } IMAGE_NT_HEADERS32, *PIMAGE_NT_HEADERS32; typedef IMAGE_NT_HEADERS32 IMAGE_NT_HEADERS; -#ifdef _X86_ typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS; -#endif #define IMAGE_DIRECTORY_ENTRY_EXPORT 0 // Export Directory @@ -203,6 +201,7 @@ DWORD AddressOfNames; // RVA from base of image DWORD AddressOfNameOrdinals; // RVA from base of image } IMAGE_EXPORT_DIRECTORY, *PIMAGE_EXPORT_DIRECTORY; +#endif #define IOCTL_DISK_GET_PARTITION_INFO_EX CTL_CODE(IOCTL_DISK_BASE, 0x0012, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_DISK_GET_DRIVE_LAYOUT_EX CTL_CODE(IOCTL_DISK_BASE, 0x0014, METHOD_BUFFERED, FILE_ANY_ACCESS)

9 years, 4 months

[dreimer] 68145: [ARM arch] PATCH: Get configure and host-tools building on arm again by Steven Edwards from dev-ml + adding Timo's portable sqrt variant to where it's needed to fix win32k build. +...

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Jun 15 11:40:33 2015 New Revision: 68145 URL: http://svn.reactos.org/svn/reactos?rev=68145&view=rev Log: [ARM arch] PATCH: Get configure and host-tools building on arm again by Steven Edwards from dev-ml + adding Timo's portable sqrt variant to where it's needed to fix win32k build. + disabled the assert in sqrt.c for now. Modified: trunk/reactos/dll/win32/dbghelp/compat.h trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/libcntpr.cmake trunk/reactos/lib/sdk/crt/math/sqrt.c trunk/reactos/tools/rsym/CMakeLists.txt Modified: trunk/reactos/dll/win32/dbghelp/compat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/compat.h… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/compat.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/compat.h [iso-8859-1] Mon Jun 15 11:40:33 2015 @@ -256,7 +256,108 @@ DWORD SegSs; BYTE ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; } CONTEXT, *PCONTEXT; + +#else /* ARM? */ + +/* The following flags control the contents of the CONTEXT structure. */ + +#define CONTEXT_ARM 0x0200000 +#define CONTEXT_CONTROL (CONTEXT_ARM | 0x00000001) +#define CONTEXT_INTEGER (CONTEXT_ARM | 0x00000002) +#define CONTEXT_FLOATING_POINT (CONTEXT_ARM | 0x00000004) +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM | 0x00000008) + +#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER) + +#define EXCEPTION_READ_FAULT 0 +#define EXCEPTION_WRITE_FAULT 1 +#define EXCEPTION_EXECUTE_FAULT 8 + +typedef struct _RUNTIME_FUNCTION +{ + DWORD BeginAddress; + union { + DWORD UnwindData; + struct { + DWORD Flag : 2; + DWORD FunctionLength : 11; + DWORD Ret : 2; + DWORD H : 1; + DWORD Reg : 3; + DWORD R : 1; + DWORD L : 1; + DWORD C : 1; + DWORD StackAdjust : 10; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; +} RUNTIME_FUNCTION, *PRUNTIME_FUNCTION; + +#define UNWIND_HISTORY_TABLE_SIZE 12 +typedef struct _UNWIND_HISTORY_TABLE_ENTRY +{ + DWORD ImageBase; + PRUNTIME_FUNCTION FunctionEntry; +} UNWIND_HISTORY_TABLE_ENTRY, *PUNWIND_HISTORY_TABLE_ENTRY; + +typedef struct _UNWIND_HISTORY_TABLE +{ + DWORD Count; + BYTE LocalHint; + BYTE GlobalHint; + BYTE Search; + BYTE Once; + DWORD LowAddress; + DWORD HighAddress; + UNWIND_HISTORY_TABLE_ENTRY Entry[UNWIND_HISTORY_TABLE_SIZE]; +} UNWIND_HISTORY_TABLE, *PUNWIND_HISTORY_TABLE; + +typedef struct _CONTEXT { + /* The flags values within this flag control the contents of + a CONTEXT record. + + If the context record is used as an input parameter, then + for each portion of the context record controlled by a flag + whose value is set, it is assumed that that portion of the + context record contains valid context. If the context record + is being used to modify a thread's context, then only that + portion of the threads context will be modified. + + If the context record is used as an IN OUT parameter to capture + the context of a thread, then only those portions of the thread's + context corresponding to set flags will be returned. + + The context record is never used as an OUT only parameter. */ + + ULONG ContextFlags; + + /* This section is specified/returned if the ContextFlags word contains + the flag CONTEXT_INTEGER. */ + ULONG R0; + ULONG R1; + ULONG R2; + ULONG R3; + ULONG R4; + ULONG R5; + ULONG R6; + ULONG R7; + ULONG R8; + ULONG R9; + ULONG R10; + ULONG Fp; + ULONG Ip; + + /* These are selected by CONTEXT_CONTROL */ + ULONG Sp; + ULONG Lr; + ULONG Pc; + ULONG Cpsr; +} CONTEXT; + +BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD); +BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); +PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(ULONG_PTR,DWORD*,UNWIND_HISTORY_TABLE*); #endif + typedef EXCEPTION_DISPOSITION NTAPI Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Mon Jun 15 11:40:33 2015 @@ -505,7 +505,6 @@ math/arm/log.s math/arm/log10.s math/arm/pow.s - math/arm/sqrt.s math/arm/tan.s math/arm/_logb.s math/arm/__dtoi64.s @@ -546,6 +545,7 @@ math/modff.c math/sin.c math/sinhf.c + math/sqrt.c math/sqrtf.c math/tanf.c math/tanhf.c Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Mon Jun 15 11:40:33 2015 @@ -210,6 +210,7 @@ list(APPEND LIBCNTPR_SOURCE math/cos.c math/sin.c + math/sqrt.c mem/memchr.c mem/memcpy.c mem/memmove.c Modified: trunk/reactos/lib/sdk/crt/math/sqrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/sqrt.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/sqrt.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/sqrt.c [iso-8859-1] Mon Jun 15 11:40:33 2015 @@ -58,13 +58,13 @@ 64 bit value, our GCC ignores this and uses an 80 bit FPU register in an intermediate value, so we need to make sure it is stored in a memory location before comparison */ -#if DBG - { - volatile double y1 = y, y2; - y2 = (y + (x / y)) * 0.5; - assert(y1 == y2); - } -#endif +//#if DBG +// { +// volatile double y1 = y, y2; +// y2 = (y + (x / y)) * 0.5; +// assert(y1 == y2); +// } +//#endif return y; } Modified: trunk/reactos/tools/rsym/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/CMakeLists.txt?… ============================================================================== --- trunk/reactos/tools/rsym/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/CMakeLists.txt [iso-8859-1] Mon Jun 15 11:40:33 2015 @@ -7,6 +7,8 @@ add_executable(rsym rsym.c) elseif(ARCH STREQUAL "amd64") add_executable(rsym rsym64.c) +elseif(ARCH STREQUAL "arm") + add_executable(rsym rsym64.c) endif() target_link_libraries(rsym rsym_common dbghelphost zlibhost unicode)

9 years, 4 months

[dreimer] 68144: [UDFS] Fix compilation for AMD64 and ARM. - It's no good idea to use the x86 ASM optimizations on any architecture. Luckily Alter made plain C++ ones for that case, too. Thus modif...

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Jun 15 11:35:30 2015 New Revision: 68144 URL: http://svn.reactos.org/svn/reactos?rev=68144&view=rev Log: [UDFS] Fix compilation for AMD64 and ARM. - It's no good idea to use the x86 ASM optimizations on any architecture. Luckily Alter made plain C++ ones for that case, too. Thus modify the #ifdefs a bit to use em. - Fix a few directly used functions instead of the defined architecture fixed ones of em. - After some discussion with Thomas Faber the ULONG vs UINT32 problems were resolved by using the same platform defines for all three architectures. BUILDS? yes WORKS? Trololololo ^^ Modified: trunk/reactos/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp trunk/reactos/drivers/filesystems/udfs/Include/ntddk_ex.h trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.cpp trunk/reactos/drivers/filesystems/udfs/Include/platform.h trunk/reactos/drivers/filesystems/udfs/Include/wcache_lib.cpp trunk/reactos/drivers/filesystems/udfs/misc.cpp trunk/reactos/drivers/filesystems/udfs/namesup.cpp trunk/reactos/drivers/filesystems/udfs/udf_dbg.h trunk/reactos/drivers/filesystems/udfs/udf_info/alloc.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.cpp Modified: trunk/reactos/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp [iso-8859-1] Mon Jun 15 11:35:30 2015 @@ -806,8 +806,7 @@ #define UDF_UNC_STR_TAG "AppStr" #endif -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) __asm push ebx __asm push esi @@ -869,8 +868,7 @@ USHORT i; -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) __asm push ebx __asm push esi Modified: trunk/reactos/drivers/filesystems/udfs/Include/ntddk_ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/Include/ntddk_ex.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/Include/ntddk_ex.h [iso-8859-1] Mon Jun 15 11:35:30 2015 @@ -184,7 +184,9 @@ IMAGE_OPTIONAL_HEADER32 OptionalHeader; } IMAGE_NT_HEADERS32, *PIMAGE_NT_HEADERS32; typedef IMAGE_NT_HEADERS32 IMAGE_NT_HEADERS; +#ifdef _X86_ typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS; +#endif #define IMAGE_DIRECTORY_ENTRY_EXPORT 0 // Export Directory Modified: trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.cpp [iso-8859-1] Mon Jun 15 11:35:30 2015 @@ -224,7 +224,7 @@ // check if block valid if(Vcb->BSBM_Bitmap) { - if(UDFGetBit__((uint32*)(Vcb->BSBM_Bitmap), UDFRelocateSector(Vcb, lba0+i))) { + if(UDFGetBit((uint32*)(Vcb->BSBM_Bitmap), UDFRelocateSector(Vcb, lba0+i))) { KdPrint((" remap: known BB @ %x, mapped to %x\n", lba0+i, UDFRelocateSector(Vcb, lba0+i))); need_remap = TRUE; } @@ -907,7 +907,7 @@ if(Vcb->BSBM_Bitmap) { ULONG i; for(i=0; i<BCount; i++) { - if(UDFGetBit__((uint32*)(Vcb->BSBM_Bitmap), Lba+i)) { + if(UDFGetBit((uint32*)(Vcb->BSBM_Bitmap), Lba+i)) { KdPrint(("W: Known BB @ %#x\n", Lba)); //return STATUS_FT_WRITE_RECOVERY; // this shall not be treated as error and // we shall get IO request to BAD block @@ -1611,7 +1611,7 @@ } } if(bm) { - UDFSetBit__(bm, Lba); + UDFSetBit(bm, Lba); KdPrint(("Set BB @ %#x\n", Lba)); } #ifdef _BROWSE_UDF_ @@ -3689,7 +3689,7 @@ if(Vcb->BSBM_Bitmap) { ULONG i; for(i=0; i<BCount; i++) { - if(UDFGetBit__((uint32*)(Vcb->BSBM_Bitmap), Lba+i)) { + if(UDFGetBit((uint32*)(Vcb->BSBM_Bitmap), Lba+i)) { KdPrint(("R: Known BB @ %#x\n", Lba)); //return STATUS_FT_WRITE_RECOVERY; // this shall not be treated as error and // we shall get IO request to BAD block Modified: trunk/reactos/drivers/filesystems/udfs/Include/platform.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/Include/platform.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/Include/platform.h [iso-8859-1] Mon Jun 15 11:35:30 2015 @@ -7,7 +7,6 @@ #ifndef _PLATFORM_SPECIFIC_H_ #define _PLATFORM_SPECIFIC_H_ -#if defined _X86_ typedef char int8; typedef short int16; typedef long int32; @@ -20,25 +19,4 @@ typedef uint32 lba_t; -#elif defined _AMD64_ - -typedef __int8 int8; -typedef __int16 int16; -typedef __int32 int32; -typedef __int64 int64; - -typedef unsigned __int8 uint8; -typedef unsigned __int16 uint16; -typedef unsigned __int32 uint32; -typedef unsigned __int64 uint64; - -typedef uint32 lba_t; - - -#else // Please define appropriate types here - -#error !!!! You must define your types here for compilation to proceed !!!! - -#endif // if _X86_ - #endif // _PLATFORM_SPECIFIC_H_ Modified: trunk/reactos/drivers/filesystems/udfs/Include/wcache_lib.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/Include/wcache_lib.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/Include/wcache_lib.cpp [iso-8859-1] Mon Jun 15 11:35:30 2015 @@ -455,8 +455,7 @@ if(!BlockCount) return 0; -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) __asm push ecx __asm push ebx Modified: trunk/reactos/drivers/filesystems/udfs/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/misc.cpp [iso-8859-1] Mon Jun 15 11:35:30 2015 @@ -280,6 +280,7 @@ for(i=0;i<PtrExceptionPointers->ExceptionRecord->NumberParameters;i++) { KdPrint((" %x\n",PtrExceptionPointers->ExceptionRecord->ExceptionInformation[i])); } +#ifdef _X86_ KdPrint(("Exception context:\n")); if(PtrExceptionPointers->ContextRecord->ContextFlags & CONTEXT_INTEGER) { KdPrint(("EAX=%8.8x ",PtrExceptionPointers->ContextRecord->Eax)); @@ -297,6 +298,7 @@ KdPrint(("EIP=%8.8x\n",PtrExceptionPointers->ContextRecord->Eip)); } // KdPrint(("Flags: %s %s ",PtrExceptionPointers->ContextRecord->Eip)); +#endif //_X86_ #endif // UDF_DBG Modified: trunk/reactos/drivers/filesystems/udfs/namesup.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/namesup.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/namesup.cpp [iso-8859-1] Mon Jun 15 11:35:30 2015 @@ -24,8 +24,7 @@ USHORT i; -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) PWCHAR retval; Modified: trunk/reactos/drivers/filesystems/udfs/udf_dbg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_dbg.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_dbg.h [iso-8859-1] Mon Jun 15 11:35:30 2015 @@ -234,8 +234,7 @@ #define ValidateFileInfo(fi) {} #endif -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) __inline VOID UDFTouch(IN PVOID addr) { Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/alloc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/alloc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/alloc.cpp [iso-8859-1] Mon Jun 15 11:35:30 2015 @@ -50,8 +50,7 @@ ) { PUDFPartMap pm = Vcb->Partitions; -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) uint32 retval; __asm { push ebx @@ -322,8 +321,7 @@ array Bitmap. Bitmap scan is limited with Lim. */ -//#if defined _X86_ -#if defined _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) __declspec (naked) uint32 Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp [iso-8859-1] Mon Jun 15 11:35:30 2015 @@ -146,8 +146,7 @@ if(!Extent) return 0; int64 i=0; -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) __asm push ebx __asm push ecx @@ -228,8 +227,7 @@ if(!Extent) return 0; uint32 i=0; -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) __asm push ebx __asm mov ebx,Extent Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp [iso-8859-1] Mon Jun 15 11:35:30 2015 @@ -2932,8 +2932,7 @@ ) { -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) BOOLEAN RC = FALSE; Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp [iso-8859-1] Mon Jun 15 11:35:30 2015 @@ -435,7 +435,7 @@ } } if(bm) { - UDFSetBit__(bm, vItem->lba); + UDFSetBit(bm, vItem->lba); KdPrint(("Set BB @ %#x\n", vItem->lba)); } #ifdef _BROWSE_UDF_ Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.cpp [iso-8859-1] Mon Jun 15 11:35:30 2015 @@ -324,8 +324,7 @@ return STATUS_SUCCESS; } // UDFReadFileEntry() -//#ifndef _X86_ -#ifndef _MSC_VER +#if !defined (_X86_) || !defined (_MSC_VER) /* Decides if a Unicode character matches one of a list of ASCII characters. @@ -373,8 +372,7 @@ ) { // Genuine illegal char's for DOS. -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) _asm { push ebx @@ -4280,8 +4278,7 @@ #pragma warning(disable:4035) // re-enable below #endif -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) __declspec (naked) #endif // _X86_ uint32 @@ -4291,8 +4288,7 @@ IN uint32 len // EDX ) { -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) // uint32 _Size = len; __asm { @@ -4348,8 +4344,7 @@ The polynomial used is: x^16 + x^12 + x^15 + 1 */ -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) __declspec (naked) #endif // _X86_ uint16 @@ -4359,8 +4354,7 @@ uint32 n // EDX ) { -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) // uint32 _Size = n; __asm { @@ -4416,8 +4410,7 @@ #endif // _X86_ } // end UDFUnicodeCksum() -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) __declspec (naked) #endif // _X86_ uint16 @@ -4427,8 +4420,7 @@ uint32 n // EDX ) { -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) // uint32 _Size = n; __asm { @@ -4523,8 +4515,7 @@ The OSTA-UDF(tm) 1.50 standard states that using CRCs is mandatory. The polynomial used is: x^16 + x^12 + x^15 + 1 */ -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) __declspec (naked) #endif // _X86_ uint16 @@ -4534,8 +4525,7 @@ IN uint32 Size // EDX ) { -//#ifdef _X86_ -#ifdef _MSC_VER +#if defined (_X86_) && defined (_MSC_VER) // uint32 _Size = Size; __asm {

9 years, 4 months

[dreimer] 68143: [UDFS] VC makefiles and their deps are not needed for us.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Jun 15 01:35:25 2015 New Revision: 68143 URL: http://svn.reactos.org/svn/reactos?rev=68143&view=rev Log: [UDFS] VC makefiles and their deps are not needed for us. Removed: trunk/reactos/drivers/filesystems/udfs/udf_info/build.mak trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.dep trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.mak Removed: trunk/reactos/drivers/filesystems/udfs/udf_info/build.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/build.mak [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/build.mak (removed) @@ -1,14 +0,0 @@ -#//////////////////////////////////////////////////////////////////// -#// Copyright (C) Alexander Telyatnikov, Ivan Keliukh, Yegor Anchishkin, SKIF Software, 1999-2013. Kiev, Ukraine -#// All rights reserved -#// This file was released under the GPLv2 on June 2015. -#//////////////////////////////////////////////////////////////////// - -SOURCE="$(REL_PATH)\$(SRC).$(SRC_EXT)" -!IF "$(xCFG)" == "UDF - NT4 Release" -"$(INTDIR)\$(SRC).obj" : $(SOURCE) "$(INTDIR)" - @$(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(xCFG)" == "UDF - NT4 Debug" -"$(INTDIR)\$(SRC).obj" : $(SOURCE) "$(INTDIR)" - @$(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF Removed: trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.dep URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.dep [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.dep (removed) @@ -1,35 +0,0 @@ -#//////////////////////////////////////////////////////////////////// -#// Copyright (C) Alexander Telyatnikov, Ivan Keliukh, Yegor Anchishkin, SKIF Software, 1999-2013. Kiev, Ukraine -#// All rights reserved -#// This file was released under the GPLv2 on June 2015. -#//////////////////////////////////////////////////////////////////// -# Dependency File, included by udf_info.mak - -#!IF "$(UDFINFO_DEPENDENCES)" == "" -#UDFINFO_DEPENDENCES=\ -# $(CDRW_DEPENDENCES)\ -# "$(UDF_INFO_PATH)\Udf_info.h"\ -# "$(UDF_INFO_PATH)\Udf_rel.h" -#!ENDIF - -$(UDF_INFO_PATH)\alloc.cpp : \ - $(UDFINFO_DEPENDENCES) - -$(UDF_INFO_PATH)\dirtree.cpp : \ - $(UDFINFO_DEPENDENCES) - -$(UDF_INFO_PATH)\extent.cpp : \ - $(UDFINFO_DEPENDENCES) - -$(UDF_INFO_PATH)\mount.cpp : \ - $(UDFINFO_DEPENDENCES) - -$(UDF_INFO_PATH)\phys_eject.cpp : \ - $(UDFINFO_DEPENDENCES) - -$(UDF_INFO_PATH)\physical.cpp : \ - $(UDFINFO_DEPENDENCES) - -$(UDF_INFO_PATH)\udf_info.cpp : \ - $(UDFINFO_DEPENDENCES) - Removed: trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.mak [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.mak (removed) @@ -1,70 +0,0 @@ -#//////////////////////////////////////////////////////////////////// -#// Copyright (C) Alexander Telyatnikov, Ivan Keliukh, Yegor Anchishkin, SKIF Software, 1999-2013. Kiev, Ukraine -#// All rights reserved -#// This file was released under the GPLv2 on June 2015. -#//////////////////////////////////////////////////////////////////// -# Include make file - -#!MESSAGE Including UDF_INFO... - -!IF "$(UDF_INFO_CFG)" == "SRC" - -#!MESSAGE SRC... - -!IF "$(UDF_INFO_PATH)" == "" -!MESSAGE Defaulting UDF_INFO path -UDF_INFO_PATH=. -!ENDIF - -UDF_INFO_OBJS= \ - "$(INTDIR)\alloc.obj" \ - "$(INTDIR)\extent.obj" \ - "$(INTDIR)\dirtree.obj" \ - "$(INTDIR)\mount.obj" \ - "$(INTDIR)\phys_eject.obj" \ - "$(INTDIR)\physical.obj" \ - "$(INTDIR)\remap.obj" \ - "$(INTDIR)\udf_info.obj" - -!ELSEIF "$(UDF_INFO_CFG)" == "MAKE" - -#!MESSAGE MAKE... -# Explain how to make UDF_INFO sources -!IF "$(xCFG)" == "UDF - NT4 Release" || "$(xCFG)" == "UDF - NT4 Debug" - -.IGNORE: - -REL_PATH=$(UDF_INFO_PATH) -SRC_EXT=cpp - -#!MESSAGE :: $(REL_PATH)\alloc.$(SRC_EXT) :: - -SRC=alloc -!INCLUDE $(UDF_INFO_PATH)\build.mak - -SRC=dirtree -!INCLUDE $(UDF_INFO_PATH)\build.mak - -SRC=extent -!INCLUDE $(UDF_INFO_PATH)\build.mak - -SRC=mount -!INCLUDE $(UDF_INFO_PATH)\build.mak - -SRC=phys_eject -!INCLUDE $(UDF_INFO_PATH)\build.mak - -SRC=physical -!INCLUDE $(UDF_INFO_PATH)\build.mak - -SRC=remap -!INCLUDE $(UDF_INFO_PATH)\build.mak - -SRC=udf_info -!INCLUDE $(UDF_INFO_PATH)\build.mak - - -!ENDIF - - -!ENDIF

9 years, 4 months

[pschweitzer] 68142: [NTOSKRNL] Complete NtQuerySystemInformation - SystemNumaProcessorMap stub so that it is possible to query the highest node number (and only that!) CORE-9680

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jun 14 19:58:45 2015 New Revision: 68142 URL: http://svn.reactos.org/svn/reactos?rev=68142&view=rev Log: [NTOSKRNL] Complete NtQuerySystemInformation - SystemNumaProcessorMap stub so that it is possible to query the highest node number (and only that!) CORE-9680 Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sun Jun 14 19:58:45 2015 @@ -2168,9 +2168,31 @@ /* Class 55 - NUMA processor information */ QSI_DEF(SystemNumaProcessorMap) { + PSYSTEM_NUMA_INFORMATION NumaInformation = (PSYSTEM_NUMA_INFORMATION)Buffer; + + if (Size < sizeof(ULONG)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + +#if 1 // Partial & incomplete implementation just to let GetNumaHighestNodeNumber() work + /* In case of a partial query, just return number of nodes and stop here */ + if (Size < sizeof(SYSTEM_NUMA_INFORMATION)) + { + NumaInformation->HighestNodeNumber = KeNumberNodes - 1; + *ReqSize = sizeof(ULONG); + return STATUS_SUCCESS; + } + else + { + DPRINT1("NtQuerySystemInformation - SystemNumaProcessorMap not implemented\n"); + return STATUS_NOT_IMPLEMENTED; + } +#else /* FIXME */ DPRINT1("NtQuerySystemInformation - SystemNumaProcessorMap not implemented\n"); return STATUS_NOT_IMPLEMENTED; +#endif }

9 years, 4 months

[pschweitzer] 68141: [NTOSKRNL] Stub out NtSetSystemInformation - SystemLoadGdiDriverInSystemSpaceInformation Stub out NtQuerySystemInformation - SystemNumaProcessorMap

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jun 14 19:27:19 2015 New Revision: 68141 URL: http://svn.reactos.org/svn/reactos?rev=68141&view=rev Log: [NTOSKRNL] Stub out NtSetSystemInformation - SystemLoadGdiDriverInSystemSpaceInformation Stub out NtQuerySystemInformation - SystemNumaProcessorMap Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sun Jun 14 19:27:19 2015 @@ -2152,6 +2152,24 @@ { /* FIXME */ DPRINT1("NtQuerySystemInformation - SystemSessionProcessInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +/* Class 54 - Load & map in system space */ +SSI_DEF(SystemLoadGdiDriverInSystemSpaceInformation) +{ + /* FIXME */ + DPRINT1("NtSetSystemInformation - SystemLoadGdiDriverInSystemSpaceInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +/* Class 55 - NUMA processor information */ +QSI_DEF(SystemNumaProcessorMap) +{ + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemNumaProcessorMap not implemented\n"); return STATUS_NOT_IMPLEMENTED; } @@ -2232,7 +2250,9 @@ SI_QX(SystemRangeStartInformation), SI_QS(SystemVerifierInformation), SI_XS(SystemAddVerifier), - SI_QX(SystemSessionProcessesInformation) + SI_QX(SystemSessionProcessesInformation), + SI_XS(SystemLoadGdiDriverInSystemSpaceInformation), + SI_QX(SystemNumaProcessorMap) }; C_ASSERT(SystemBasicInformation == 0);

9 years, 4 months

[pschweitzer] 68140: [KERNEL32] Fix stupidness, spotted by Thomas

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jun 14 18:54:57 2015 New Revision: 68140 URL: http://svn.reactos.org/svn/reactos?rev=68140&view=rev Log: [KERNEL32] Fix stupidness, spotted by Thomas Modified: trunk/reactos/dll/win32/kernel32/client/sysinfo.c Modified: trunk/reactos/dll/win32/kernel32/client/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/sysinfo.c [iso-8859-1] Sun Jun 14 18:54:57 2015 @@ -314,7 +314,7 @@ /* Find ourselves */ Node = 0; - Proc = (1ULL << Processor) >> MAXIMUM_PROCESSORS; + Proc = 1ULL << Processor; while ((Proc & NumaInformation.ActiveProcessorsAffinityMask[Node]) == 0ULL) { ++Node;

9 years, 4 months

[hbelusca] 68139: [TOOLS] Improve bin2c by saving in a #define the size of the generated array, and specify this size in the declaration of the array so that doing sizeof(...) becomes possible. Use...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 14 18:13:50 2015 New Revision: 68139 URL: http://svn.reactos.org/svn/reactos?rev=68139&view=rev Log: [TOOLS] Improve bin2c by saving in a #define the size of the generated array, and specify this size in the declaration of the array so that doing sizeof(...) becomes possible. Use "unsigned char" as the (portable) type of the contents of the array. [HAL] Add PCHAR casts where needed to take into account the previous modifications. Modified: trunk/reactos/hal/halx86/legacy/bussupp.c trunk/reactos/tools/bin2c.c 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] Sun Jun 14 18:13:50 2015 @@ -715,7 +715,7 @@ /* Isolate the class name */ sprintf(LookupString, "C %02x ", PciData->BaseClass); - ClassName = strstr(ClassTable, LookupString); + ClassName = strstr((PCHAR)ClassTable, LookupString); if (ClassName) { /* Isolate the subclass name */ @@ -736,7 +736,7 @@ /* Isolate the vendor name */ sprintf(LookupString, "\r\n%04x ", PciData->VendorID); - VendorName = strstr(VendorTable, LookupString); + VendorName = strstr((PCHAR)VendorTable, LookupString); if (VendorName) { /* Copy the vendor name into our buffer */ Modified: trunk/reactos/tools/bin2c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.c?rev=68139&r1… ============================================================================== --- trunk/reactos/tools/bin2c.c [iso-8859-1] (original) +++ trunk/reactos/tools/bin2c.c [iso-8859-1] Sun Jun 14 18:13:50 2015 @@ -13,8 +13,8 @@ FILE* inFile; FILE* outCFile; FILE* outHFile; + size_t bufLen; unsigned char ch; - unsigned char cnt; /* Validate the arguments */ if (argc < 5) @@ -46,14 +46,6 @@ return -1; } - /* Generate the header file and close it */ - fprintf(outHFile, "/* This file is autogenerated, do not edit. */\n\n"); - fprintf(outHFile, "#ifndef CHAR\n" - "#define CHAR char\n" - "#endif\n\n"); - fprintf(outHFile, "extern CHAR %s[];\n", argv[4]); - fclose(outHFile); - /* Generate the source file and close it */ fprintf(outCFile, "/* This file is autogenerated, do not edit. */\n\n"); if (argc >= 7) @@ -69,25 +61,29 @@ /* Add the array attribute */ fprintf(outCFile, "%s ", argv[5]); } - fprintf(outCFile, "CHAR %s[] =\n{", argv[4]); + fprintf(outCFile, "unsigned char %s[] =\n{", argv[4]); - cnt = 0; - ch = fgetc(inFile); + bufLen = 0; + ch = fgetc(inFile); while (!feof(inFile)) { - if ((cnt % 16) == 0) - { + if ((bufLen % 16) == 0) fprintf(outCFile, "\n "); - cnt = 0; - } + fprintf(outCFile, " 0x%02x,", (unsigned int)ch); - ++cnt; + ++bufLen; ch = fgetc(inFile); } /* Put a final NULL terminator */ - fprintf(outCFile, "\n 0x00"); + fprintf(outCFile, "\n 0x00"); ++bufLen; fprintf(outCFile, "\n};\n"); fclose(outCFile); + + /* Generate the header file and close it */ + fprintf(outHFile, "/* This file is autogenerated, do not edit. */\n\n"); + fprintf(outHFile, "#define %s_SIZE %Iu\n" , argv[4], bufLen); + fprintf(outHFile, "extern unsigned char %s[%Iu];\n", argv[4], bufLen); + fclose(outHFile); /* Close the input file */ fclose(inFile);

9 years, 4 months

[hbelusca] 68138: [NTVDM]: Allocate a dedicated block of memory for the mouse driver, in which we write all the needed info (instead of putting them in the BIOS space). The INT32 stubs go in this r...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 14 16:40:45 2015 New Revision: 68138 URL: http://svn.reactos.org/svn/reactos?rev=68138&view=rev Log: [NTVDM]: Allocate a dedicated block of memory for the mouse driver, in which we write all the needed info (instead of putting them in the BIOS space). The INT32 stubs go in this region, too. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c trunk/reactos/subsystems/mvdm/ntvdm/int32.c trunk/reactos/subsystems/mvdm/ntvdm/int32.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] Sun Jun 14 16:40:45 2015 @@ -27,18 +27,27 @@ #include "memory.h" #include "io.h" #include "dos32krnl/dos.h" +#include "dos32krnl/memory.h" /* PRIVATE VARIABLES **********************************************************/ -// FIXME: Because I don't know a better place to store the string -// I temporarily put it in BIOS space. This need to be moved to a -// proper place when this driver is interfaced correctly with DOS. -#define COPYRIGHT_POINTER MAKELONG(0xE100, 0xF000) -static const CHAR MouseCopyright[] = "ROS PS/2 16/32-bit Mouse Driver Compatible MS-MOUSE 6.26 Copyright (C) ReactOS Team 1996-2015"; - -// See FIXME from above. -#define VERSION_POINTER MAKELONG(0xE160, 0xF000) -static PWORD Version; +static const CHAR MouseCopyright[] = "ROS PS/2 16/32-bit Mouse Driver Compatible MS-MOUSE 6.26 Copyright (C) ReactOS Team 1996-2015\0"; + +#pragma pack(push, 1) + +typedef struct _MOUSE_DRIVER +{ + CHAR Copyright[sizeof(MouseCopyright)]; + WORD Version; + BYTE MouseDosInt16Stub[Int16To32StubSize]; + BYTE MouseIrqInt16Stub[Int16To32StubSize]; +} MOUSE_DRIVER, *PMOUSE_DRIVER; + +#pragma pack(pop) + +/* Global data contained in guest memory */ +WORD MouseDataSegment; +PMOUSE_DRIVER MouseData; #define MICKEYS_PER_CELL_HORIZ 8 #define MICKEYS_PER_CELL_VERT 16 @@ -876,8 +885,8 @@ /* Return Pointer to Copyright String */ case 0x4D: { - setES(HIWORD(COPYRIGHT_POINTER)); - setDI(LOWORD(COPYRIGHT_POINTER)); + setES(MouseDataSegment); + setDI(FIELD_OFFSET(MOUSE_DRIVER, Copyright)); break; } @@ -890,8 +899,8 @@ * 00h BYTE major version * 01h BYTE minor version (BCD) */ - setES(HIWORD(VERSION_POINTER)); - setDI(LOWORD(VERSION_POINTER)); + setES(MouseDataSegment); + setDI(FIELD_OFFSET(MOUSE_DRIVER, Version)); break; } @@ -914,7 +923,8 @@ OldIrqHandler = ((PDWORD)BaseAddress)[MOUSE_IRQ_INT]; /* Set the IRQ handler */ - RegisterDosInt32(MOUSE_IRQ_INT, DosMouseIrq); + RegisterInt32(MAKELONG(FIELD_OFFSET(MOUSE_DRIVER, MouseIrqInt16Stub), MouseDataSegment), + MOUSE_IRQ_INT, DosMouseIrq, NULL); } } @@ -986,21 +996,26 @@ BOOLEAN DosMouseInitialize(VOID) { + /* Initialize some memory for storing our data that should be available to DOS */ + MouseDataSegment = DosAllocateMemory(sizeof(MOUSE_DRIVER), NULL); + if (MouseDataSegment == 0) return FALSE; + MouseData = (PMOUSE_DRIVER)SEG_OFF_TO_PTR(MouseDataSegment, 0x0000); + /* Clear the state */ RtlZeroMemory(&DriverState, sizeof(DriverState)); - /* Setup the version variable in BCD format, compatible MS-MOUSE */ - Version = (PWORD)FAR_POINTER(VERSION_POINTER); - *Version = MAKEWORD(MOUSE_VERSION/0x0100, MOUSE_VERSION%0x0100); - /* Mouse Driver Copyright */ - RtlCopyMemory(FAR_POINTER(COPYRIGHT_POINTER), MouseCopyright, sizeof(MouseCopyright)-1); + RtlCopyMemory(MouseData->Copyright, MouseCopyright, sizeof(MouseCopyright)-1); + + /* Mouse Driver Version in BCD format, compatible MS-MOUSE */ + MouseData->Version = MAKEWORD(MOUSE_VERSION/0x0100, MOUSE_VERSION%0x0100); /* Get the old mouse service interrupt handler */ OldIntHandler = ((PDWORD)BaseAddress)[DOS_MOUSE_INTERRUPT]; /* Initialize the interrupt handler */ - RegisterDosInt32(DOS_MOUSE_INTERRUPT, DosMouseService); + RegisterInt32(MAKELONG(FIELD_OFFSET(MOUSE_DRIVER, MouseDosInt16Stub), MouseDataSegment), + DOS_MOUSE_INTERRUPT, DosMouseService, NULL); DosMouseEnable(); return TRUE; @@ -1014,3 +1029,5 @@ if (DriverState.ShowCount > 0) EraseMouseCursor(); DosMouseDisable(); } + +/* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/int3… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/int32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/int32.c [iso-8859-1] Sun Jun 14 16:40:45 2015 @@ -59,7 +59,7 @@ 0x44, 0x44, // inc sp, inc sp 0xCF, // iret }; -const ULONG Int16To32StubSize = sizeof(Int16To32); +C_ASSERT(sizeof(Int16To32) == Int16To32StubSize); /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/int32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/int3… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/int32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/int32.h [iso-8859-1] Sun Jun 14 16:40:45 2015 @@ -34,7 +34,8 @@ #define STACK_CS 2 #define STACK_FLAGS 3 -extern const ULONG Int16To32StubSize; +// To be adjusted with the Int16To32 handler code in int32.c +#define Int16To32StubSize 17 /* FUNCTIONS ******************************************************************/

9 years, 4 months

← Newer
1
...
16
17
18
19
20
21
22
...
35
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 June 2015