Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 68151: [NDK][NTDLL][PSAPI] Correct the the names of two LDR_DATA_TABLE_ENTRY fields. Brought to you by Mike Nordell aka tamlin. CORE-9817
by akhaldi＠svn.reactos.org 15 Jun '15

15 Jun '15

Author: akhaldi Date: Mon Jun 15 18:38:57 2015 New Revision: 68151 URL: http://svn.reactos.org/svn/reactos?rev=68151&view=rev Log: [NDK][NTDLL][PSAPI] Correct the the names of two LDR_DATA_TABLE_ENTRY fields. Brought to you by Mike Nordell aka tamlin. CORE-9817 Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/dll/ntdll/ldr/ldrinit.c trunk/reactos/dll/ntdll/ldr/ldrpe.c trunk/reactos/dll/ntdll/ldr/ldrutils.c trunk/reactos/dll/win32/psapi/psapi.c trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Mon Jun 15 18:38:57 2015 @@ -476,7 +476,7 @@ while (NextEntry != ListHead) { /* Get the entry and NT Headers */ - LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InMemoryOrderModuleList); + LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InMemoryOrderLinks); NtHeader = RtlImageNtHeader(LdrEntry->DllBase); if (NtHeader) { @@ -1036,7 +1036,7 @@ while (InitEntry != InitListHead) { - InitModule = CONTAINING_RECORD(InitEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + InitModule = CONTAINING_RECORD(InitEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks); /* Increase the index */ ModulePtr->InitOrderIndex++; @@ -1384,7 +1384,7 @@ /* Get the entry */ LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, - InInitializationOrderModuleList); + InInitializationOrderLinks); NextEntry = NextEntry->Blink; /* Remove flag */ @@ -1408,8 +1408,8 @@ /* Unlink it */ CurrentEntry = LdrEntry; - RemoveEntryList(&CurrentEntry->InInitializationOrderModuleList); - RemoveEntryList(&CurrentEntry->InMemoryOrderModuleList); + RemoveEntryList(&CurrentEntry->InInitializationOrderLinks); + RemoveEntryList(&CurrentEntry->InMemoryOrderLinks); RemoveEntryList(&CurrentEntry->HashLinks); /* If there's more then one active unload */ @@ -1417,7 +1417,7 @@ { /* Flush the cached DLL handle and clear the list */ LdrpLoadedDllHandleCache = NULL; - CurrentEntry->InMemoryOrderModuleList.Flink = NULL; + CurrentEntry->InMemoryOrderLinks.Flink = NULL; } /* Add the entry on the unload list */ @@ -1443,7 +1443,7 @@ /* Set the entry and clear it from the list */ CurrentEntry = LdrEntry; LdrpLoadedDllHandleCache = NULL; - CurrentEntry->InMemoryOrderModuleList.Flink = NULL; + CurrentEntry->InMemoryOrderLinks.Flink = NULL; /* Move it from the global to the local list */ RemoveEntryList(&CurrentEntry->HashLinks); Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Mon Jun 15 18:38:57 2015 @@ -526,7 +526,7 @@ while (NextEntry != ListHead) { /* Get the current entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InMemoryOrderModuleList); + LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InMemoryOrderLinks); /* Make sure it's not ourselves */ if (Peb->ImageBaseAddress != LdrEntry->DllBase) @@ -674,7 +674,7 @@ while (NextEntry != ListHead) { /* Get the Data Entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks); /* Check if we have a Root Entry */ if (LdrRootEntry) @@ -840,7 +840,7 @@ while (NextEntry != ListHead) { /* Get the Data Entrry */ - LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks); /* FIXME: Verify NX Compat */ // LdrpCheckNXCompatibility() @@ -932,7 +932,7 @@ while (NextEntry != ListHead) { /* Get the current entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks); NextEntry = NextEntry->Blink; /* Make sure it's not ourselves */ @@ -1037,7 +1037,7 @@ while (NextEntry != ListHead) { /* Get the current entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks); NextEntry = NextEntry->Blink; /* Make sure it's not ourselves */ @@ -1927,7 +1927,7 @@ /* Link the Init Order List */ InsertHeadList(&Peb->Ldr->InInitializationOrderModuleList, - &LdrpNtDllDataTableEntry->InInitializationOrderModuleList); + &LdrpNtDllDataTableEntry->InInitializationOrderLinks); /* Initialize Wine's active context implementation for the current process */ actctx_init(); Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrpe.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] Mon Jun 15 18:38:57 2015 @@ -318,7 +318,7 @@ { /* Add it to our list */ InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &DllLdrEntry->InInitializationOrderModuleList); + &DllLdrEntry->InInitializationOrderLinks); } /* Check if the Bound Entry is now invalid */ @@ -381,7 +381,7 @@ { /* Add it to our list */ InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &ForwarderLdrEntry->InInitializationOrderModuleList); + &ForwarderLdrEntry->InInitializationOrderLinks); } } @@ -590,7 +590,7 @@ { /* Add the DLL to our list */ InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &DllLdrEntry->InInitializationOrderModuleList); + &DllLdrEntry->InInitializationOrderLinks); } /* Now snap the IAT Entry */ @@ -850,7 +850,7 @@ { /* Add it to the in-init-order list in case of failure */ InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &(*DataTableEntry)->InInitializationOrderModuleList); + &(*DataTableEntry)->InInitializationOrderLinks); } return Status; Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Mon Jun 15 18:38:57 2015 @@ -1273,7 +1273,7 @@ { /* Remove the DLL from the lists */ RemoveEntryList(&LdrEntry->InLoadOrderLinks); - RemoveEntryList(&LdrEntry->InMemoryOrderModuleList); + RemoveEntryList(&LdrEntry->InMemoryOrderLinks); RemoveEntryList(&LdrEntry->HashLinks); /* Remove the LDR Entry */ @@ -1341,7 +1341,7 @@ CandidateEnd = CandidateBase + CandidateEntry->SizeOfImage; /* Make sure this entry isn't unloading */ - if (!CandidateEntry->InMemoryOrderModuleList.Flink) continue; + if (!CandidateEntry->InMemoryOrderLinks.Flink) continue; /* Check if our regions are colliding */ if ((ImageBase >= CandidateBase && ImageBase <= CandidateEnd) || @@ -1465,7 +1465,7 @@ { /* Remove it from the lists */ RemoveEntryList(&LdrEntry->InLoadOrderLinks); - RemoveEntryList(&LdrEntry->InMemoryOrderModuleList); + RemoveEntryList(&LdrEntry->InMemoryOrderLinks); RemoveEntryList(&LdrEntry->HashLinks); /* Unmap it, clear the entry */ @@ -1576,7 +1576,7 @@ /* Insert into other lists */ InsertTailList(&PebData->InLoadOrderModuleList, &LdrEntry->InLoadOrderLinks); - InsertTailList(&PebData->InMemoryOrderModuleList, &LdrEntry->InMemoryOrderModuleList); + InsertTailList(&PebData->InMemoryOrderModuleList, &LdrEntry->InMemoryOrderLinks); } VOID @@ -1630,7 +1630,7 @@ InLoadOrderLinks); /* Make sure it's not unloading and check for a match */ - if ((Current->InMemoryOrderModuleList.Flink) && (Base == Current->DllBase)) + if ((Current->InMemoryOrderLinks.Flink) && (Base == Current->DllBase)) { /* Save in cache */ LdrpLoadedDllHandleCache = Current; @@ -2097,7 +2097,7 @@ ListEntry = ListEntry->Flink; /* Check if it's being unloaded */ - if (!CurEntry->InMemoryOrderModuleList.Flink) continue; + if (!CurEntry->InMemoryOrderLinks.Flink) continue; /* Check if name matches */ if (RtlEqualUnicodeString(&FullDllName, @@ -2195,7 +2195,7 @@ ListEntry = ListEntry->Flink; /* Check if it's in the process of being unloaded */ - if (!CurEntry->InMemoryOrderModuleList.Flink) continue; + if (!CurEntry->InMemoryOrderLinks.Flink) continue; /* The header is untrusted, use SEH */ _SEH2_TRY @@ -2362,7 +2362,7 @@ Entry = NtCurrentPeb()->Ldr->InInitializationOrderModuleList.Blink; LdrEntry = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, - InInitializationOrderModuleList); + InInitializationOrderLinks); /* Make sure we didn't process it yet*/ if (!(LdrEntry->Flags & LDRP_ENTRY_PROCESSED)) @@ -2536,7 +2536,7 @@ /* Clear entrypoint, and insert into list */ LdrEntry->EntryPoint = NULL; InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &LdrEntry->InInitializationOrderModuleList); + &LdrEntry->InInitializationOrderLinks); /* Cancel the load */ LdrpClearLoadInProgress(); @@ -2563,7 +2563,7 @@ /* Insert it into the list */ InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &LdrEntry->InInitializationOrderModuleList); + &LdrEntry->InInitializationOrderLinks); /* If we have to run the entrypoint, make sure the DB is ready */ if (CallInit && LdrpLdrDatabaseIsSetup) @@ -2653,7 +2653,7 @@ /* Get the loader entry */ LdrEntry = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, - InInitializationOrderModuleList); + InInitializationOrderLinks); /* Clear load in progress flag */ LdrEntry->Flags &= ~LDRP_LOAD_IN_PROGRESS; Modified: trunk/reactos/dll/win32/psapi/psapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.c?re… ============================================================================== --- trunk/reactos/dll/win32/psapi/psapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/psapi/psapi.c [iso-8859-1] Mon Jun 15 18:38:57 2015 @@ -187,7 +187,7 @@ { /* Load module data */ if (!ReadProcessMemory(hProcess, - CONTAINING_RECORD(ListEntry, LDR_DATA_TABLE_ENTRY, InMemoryOrderModuleList), + CONTAINING_RECORD(ListEntry, LDR_DATA_TABLE_ENTRY, InMemoryOrderLinks), Module, sizeof(*Module), NULL)) @@ -208,7 +208,7 @@ } /* Get to next listed module */ - ListEntry = Module->InMemoryOrderModuleList.Flink; + ListEntry = Module->InMemoryOrderLinks.Flink; } SetLastError(ERROR_INVALID_HANDLE); Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Mon Jun 15 18:38:57 2015 @@ -128,11 +128,14 @@ // // Loader Data Table Entry // +// NOTE: The field 'InMemoryOrderLinks' MUST have that name. +// It's hard-coded into WinDbg for PEB dumping! +// typedef struct _LDR_DATA_TABLE_ENTRY { LIST_ENTRY InLoadOrderLinks; - LIST_ENTRY InMemoryOrderModuleList; - LIST_ENTRY InInitializationOrderModuleList; + LIST_ENTRY InMemoryOrderLinks; + LIST_ENTRY InInitializationOrderLinks; PVOID DllBase; PVOID EntryPoint; ULONG SizeOfImage;

1 0

[akhaldi] 68150: [CMAKE] Add some FIXMEs so these won't be forgotten.
by akhaldi＠svn.reactos.org 15 Jun '15

15 Jun '15

Author: akhaldi Date: Mon Jun 15 17:45:24 2015 New Revision: 68150 URL: http://svn.reactos.org/svn/reactos?rev=68150&view=rev Log: [CMAKE] Add some FIXMEs so these won't be forgotten. 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=68150&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Jun 15 17:45:24 2015 @@ -241,11 +241,13 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup") if((NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (NOT CMAKE_BUILD_TYPE STREQUAL "Release")) + # FIXME: Set this once Clang toolchain works with it set(_compress_debug_sections_flag "-Wa,--compress-debug-sections") endif() -SET(CMAKE_C_COMPILE_OBJECT "${CCACHE} <CMAKE_C_COMPILER> <DEFINES> ${_compress_debug_sections_flag} <FLAGS> -o <OBJECT> -c <SOURCE>") -SET(CMAKE_CXX_COMPILE_OBJECT "${CCACHE} <CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>") +set(CMAKE_C_COMPILE_OBJECT "${CCACHE} <CMAKE_C_COMPILER> <DEFINES> ${_compress_debug_sections_flag} <FLAGS> -o <OBJECT> -c <SOURCE>") +# FIXME: Once the GCC toolchain bugs are fixed, add _compress_debug_sections_flag to CXX too +set(CMAKE_CXX_COMPILE_OBJECT "${CCACHE} <CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>") set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> ${_compress_debug_sections_flag} -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <FLAGS> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 ${I18N_DEFS} <DEFINES> <SOURCE> <OBJECT>")

1 0

[akhaldi] 68149: [CMAKE] Disable debug sections compression in GCC release builds.
by akhaldi＠svn.reactos.org 15 Jun '15

15 Jun '15

Author: akhaldi Date: Mon Jun 15 17:35:29 2015 New Revision: 68149 URL: http://svn.reactos.org/svn/reactos?rev=68149&view=rev Log: [CMAKE] Disable debug sections compression in 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=68149&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Jun 15 17:35:29 2015 @@ -240,7 +240,7 @@ set(CMAKE_EXE_LINKER_FLAGS "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import,--disable-stdcall-fixup") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup") -if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") +if((NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (NOT CMAKE_BUILD_TYPE STREQUAL "Release")) set(_compress_debug_sections_flag "-Wa,--compress-debug-sections") endif()

1 0

[akhaldi] 68148: [CMAKE] Disable debugging related GCC flags in release mode.
by akhaldi＠svn.reactos.org 15 Jun '15

15 Jun '15

Author: akhaldi Date: Mon Jun 15 17:26:04 2015 New Revision: 68148 URL: http://svn.reactos.org/svn/reactos?rev=68148&view=rev Log: [CMAKE] Disable debugging related GCC flags in release mode. 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=68148&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Jun 15 17:26:04 2015 @@ -87,12 +87,14 @@ endif() # Debugging -if(SEPARATE_DBG) - add_compile_flags("-gdwarf-2 -ggdb") -else() - add_compile_flags("-gdwarf-2 -gstrict-dwarf") - if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") - add_compile_flags("-femit-struct-debug-detailed=none -feliminate-unused-debug-symbols") +if(NOT CMAKE_BUILD_TYPE STREQUAL "Release") + if(SEPARATE_DBG) + add_compile_flags("-gdwarf-2 -ggdb") + else() + add_compile_flags("-gdwarf-2 -gstrict-dwarf") + if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_compile_flags("-femit-struct-debug-detailed=none -feliminate-unused-debug-symbols") + endif() endif() endif()

1 0

[akhaldi] 68147: [CMAKE] Disable rossym for GCC release builds.
by akhaldi＠svn.reactos.org 15 Jun '15

15 Jun '15

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()

1 0

[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 15 Jun '15

15 Jun '15

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)

1 0

[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 15 Jun '15

15 Jun '15

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)

1 0

[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 15 Jun '15

15 Jun '15

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 {

1 0

[dreimer] 68143: [UDFS] VC makefiles and their deps are not needed for us.
by dreimer＠svn.reactos.org 15 Jun '15

15 Jun '15

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

1 0

[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 14 Jun '15

14 Jun '15

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 }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs