Ros-diffs January 2019

ros-diffs@reactos.org

31 participants
300 discussions

[reactos] 01/01: [WIN32SS][NTGDI] Fix UnsafeSetBitmapBits (#1310)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0aa21c3366fff15429449… commit 0aa21c3366fff15429449a6eacea1547745e93cf Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jan 27 15:32:52 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 27 15:32:52 2019 +0900 [WIN32SS][NTGDI] Fix UnsafeSetBitmapBits (#1310) CORE-15657 --- win32ss/gdi/ntgdi/bitmaps.c | 37 +++++++++++++++++++++++++------------ win32ss/gdi/ntgdi/bitmaps.h | 7 ------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/win32ss/gdi/ntgdi/bitmaps.c b/win32ss/gdi/ntgdi/bitmaps.c index e4639d861c..c0c587482a 100644 --- a/win32ss/gdi/ntgdi/bitmaps.c +++ b/win32ss/gdi/ntgdi/bitmaps.c @@ -3,7 +3,8 @@ * PROJECT: ReactOS kernel * PURPOSE: Bitmap functions * FILE: win32ss/gdi/ntgdi/bitmaps.c - * PROGRAMER: Timo Kreuzer <timo.kreuzer(a)reactos.org> + * PROGRAMERS: Timo Kreuzer <timo.kreuzer(a)reactos.org> + * Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include <win32k.h> @@ -42,7 +43,7 @@ GreSetBitmapOwner( return GreSetObjectOwner(hbmp, ulOwner); } -BOOL +LONG NTAPI UnsafeSetBitmapBits( _Inout_ PSURFACE psurf, @@ -52,34 +53,46 @@ UnsafeSetBitmapBits( PUCHAR pjDst; const UCHAR *pjSrc; LONG lDeltaDst, lDeltaSrc; - ULONG nWidth, nHeight, cBitsPixel; + ULONG Y, iSrc, iDst, cbSrc, cbDst, nWidth, nHeight, cBitsPixel; + NT_ASSERT(psurf->flags & API_BITMAP); NT_ASSERT(psurf->SurfObj.iBitmapFormat <= BMF_32BPP); nWidth = psurf->SurfObj.sizlBitmap.cx; - nHeight = psurf->SurfObj.sizlBitmap.cy; + nHeight = labs(psurf->SurfObj.sizlBitmap.cy); cBitsPixel = BitsPerFormat(psurf->SurfObj.iBitmapFormat); - /* Get pointers */ pjDst = psurf->SurfObj.pvScan0; pjSrc = pvBits; lDeltaDst = psurf->SurfObj.lDelta; lDeltaSrc = WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel); - NT_ASSERT(lDeltaSrc <= abs(lDeltaDst)); + NT_ASSERT(lDeltaSrc <= labs(lDeltaDst)); - /* Make sure the buffer is large enough*/ - if (cjBits < (lDeltaSrc * nHeight)) - return FALSE; + cbDst = labs(lDeltaDst) * nHeight; + cbSrc = lDeltaSrc * nHeight; + cjBits = min(cjBits, cbSrc); - while (nHeight--) + iSrc = iDst = 0; + for (Y = 0; Y < nHeight; Y++) { + if (iSrc + lDeltaSrc > cjBits || iDst + labs(lDeltaDst) > cbDst) + { + LONG lDelta = min(cjBits - iSrc, cbDst - iDst); + NT_ASSERT(lDelta >= 0); + RtlCopyMemory(pjDst, pjSrc, lDelta); + iSrc += lDelta; + break; + } + /* Copy one line */ - memcpy(pjDst, pjSrc, lDeltaSrc); + RtlCopyMemory(pjDst, pjSrc, lDeltaSrc); pjSrc += lDeltaSrc; pjDst += lDeltaDst; + iSrc += lDeltaSrc; + iDst += labs(lDeltaDst); } - return TRUE; + return iSrc; } HBITMAP diff --git a/win32ss/gdi/ntgdi/bitmaps.h b/win32ss/gdi/ntgdi/bitmaps.h index 2f9ac4d394..56719ab9b1 100644 --- a/win32ss/gdi/ntgdi/bitmaps.h +++ b/win32ss/gdi/ntgdi/bitmaps.h @@ -44,13 +44,6 @@ GreCreateDIBitmapInternal( IN UINT cjMaxBits, IN HANDLE hcmXform); -BOOL -NTAPI -UnsafeSetBitmapBits( - _Inout_ PSURFACE psurf, - _In_ ULONG cjBits, - _In_ const VOID *pvBits); - BOOL NTAPI GreGetBitmapDimension(

5 years, 7 months

[reactos] 02/02: [MOUNTMGR][MUP] Use global definition of INIT_FUNCTION/INIT_SECTION (Addendum to 71fefa32).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53abbb06b532fd052d575… commit 53abbb06b532fd052d575231a219ca5683e05514 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 27 02:34:20 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 27 02:40:11 2019 +0100 [MOUNTMGR][MUP] Use global definition of INIT_FUNCTION/INIT_SECTION (Addendum to 71fefa32). --- drivers/filesystems/mup/dfs.h | 9 +-------- drivers/filters/mountmgr/mntmgr.h | 9 ++------- drivers/filters/mountmgr/mountmgr.c | 4 ++-- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/filesystems/mup/dfs.h b/drivers/filesystems/mup/dfs.h index d158a055ab..49194bdc7f 100644 --- a/drivers/filesystems/mup/dfs.h +++ b/drivers/filesystems/mup/dfs.h @@ -1,14 +1,7 @@ #ifndef _DFS_PCH_ #define _DFS_PCH_ -#ifndef INIT_SECTION -#ifdef __GNUC__ -#define INIT_SECTION __attribute__((section ("INIT"))) -#else -#define INIT_SECTION /* Done via alloc_text for MSC */ -#endif -#define INIT_FUNCTION INIT_SECTION -#endif +#include <section_attribs.h> #define DFS_OPEN_CONTEXT 0xFF444653 #define DFS_DOWNLEVEL_OPEN_CONTEXT 0x11444653 diff --git a/drivers/filters/mountmgr/mntmgr.h b/drivers/filters/mountmgr/mntmgr.h index 4153add678..dacbfa7d69 100644 --- a/drivers/filters/mountmgr/mntmgr.h +++ b/drivers/filters/mountmgr/mntmgr.h @@ -8,12 +8,7 @@ #include <wdmguid.h> #include <ndk/psfuncs.h> #include <ntdddisk.h> - -#ifdef __GNUC__ -#define INIT_SECTION __attribute__((section ("INIT"))) -#else -#define INIT_SECTION /* Done via alloc_text for MSC */ -#endif +#include <section_attribs.h> typedef struct _DEVICE_EXTENSION { @@ -233,7 +228,7 @@ HasDriveLetter( IN PDEVICE_INFORMATION DeviceInformation ); -INIT_SECTION +INIT_FUNCTION BOOLEAN MountmgrReadNoAutoMount( IN PUNICODE_STRING RegistryPath diff --git a/drivers/filters/mountmgr/mountmgr.c b/drivers/filters/mountmgr/mountmgr.c index 0e273b3957..0b2fe8e7ba 100644 --- a/drivers/filters/mountmgr/mountmgr.c +++ b/drivers/filters/mountmgr/mountmgr.c @@ -908,7 +908,7 @@ MountMgrUnload(IN struct _DRIVER_OBJECT *DriverObject) /* * @implemented */ -INIT_SECTION +INIT_FUNCTION BOOLEAN MountmgrReadNoAutoMount(IN PUNICODE_STRING RegistryPath) { @@ -1802,7 +1802,7 @@ MountMgrShutdown(IN PDEVICE_OBJECT DeviceObject, /* FUNCTIONS ****************************************************************/ -INIT_SECTION +INIT_FUNCTION NTSTATUS NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject,

5 years, 7 months

[reactos] 01/02: [MVDM] Use again the correct CMAKE_C_COMPILER to pre-process the ASM code (addendum to 09c06a2f).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19f6fc2525cb27dfb2224… commit 19f6fc2525cb27dfb22246d72eb6be30193a97a3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 27 01:44:21 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 27 02:40:10 2019 +0100 [MVDM] Use again the correct CMAKE_C_COMPILER to pre-process the ASM code (addendum to 09c06a2f). --- subsystems/mvdm/asm16.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/subsystems/mvdm/asm16.cmake b/subsystems/mvdm/asm16.cmake index 4aea5f884b..8cc77dd1d5 100644 --- a/subsystems/mvdm/asm16.cmake +++ b/subsystems/mvdm/asm16.cmake @@ -106,10 +106,15 @@ function(add_asm16_bin _target _binary_file _base_address) set(_pp_asm16_compile_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_preprocessed_asm_file}) endif() - # FIXME: clang-cl can't compile this so use cl here instead of ${CMAKE_C_COMPILER} in the meantime + if(USE_CLANG_CL) + set(_no_std_includes_flag "-nostdinc") + else() + set(_no_std_includes_flag "/X") + endif() + add_custom_command( OUTPUT ${_preprocessed_asm_file} ${_object_file} - COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_concatenated_asm_file} > ${_preprocessed_asm_file} && ${_pp_asm16_compile_command} + COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag} /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_concatenated_asm_file} > ${_preprocessed_asm_file} && ${_pp_asm16_compile_command} DEPENDS ${_concatenated_asm_file}) add_custom_command(

5 years, 7 months

[reactos] 04/04: [FREELDR] Re-integrate the ASM files (and corresponding C code) in MSVC builds, that were previously compiled just for GCC builds. (#1224)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b1e1df5c90efe0500e57… commit 6b1e1df5c90efe0500e57360e0433b733161f13a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 20 02:47:25 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 27 00:51:26 2019 +0100 [FREELDR] Re-integrate the ASM files (and corresponding C code) in MSVC builds, that were previously compiled just for GCC builds. (#1224) - Multiboot support added back in FreeLdr MSVC builds so that it can be booted using e.g. GRUB. See CORE-15563. - Re-introduce the disk drive mapper code. --- boot/freeldr/freeldr/CMakeLists.txt | 18 +++--- boot/freeldr/freeldr/arch/i386/drivemap.c | 8 +-- boot/freeldr/freeldr/arch/i386/drvmap.S | 19 ++++--- boot/freeldr/freeldr/arch/i386/entry.S | 5 +- boot/freeldr/freeldr/arch/i386/mb.S | 51 ----------------- boot/freeldr/freeldr/arch/i386/multiboot.S | 71 ++++++++++++++++-------- boot/freeldr/freeldr/bootmgr.c | 2 +- boot/freeldr/freeldr/freeldr_i386.msvc.lds | 2 +- boot/freeldr/freeldr/include/arch/pc/x86common.h | 3 - 9 files changed, 77 insertions(+), 102 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 88c1c2a528..14723b6c70 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -159,14 +159,19 @@ list(APPEND FREELDR_BOOTMGR_SOURCE video/palette.c video/video.c) +list(APPEND FREELDR_BASE_ASM_SOURCE) + if(ARCH STREQUAL "i386") + list(APPEND FREELDR_BASE_ASM_SOURCE + arch/i386/multiboot.S) + list(APPEND FREELDR_COMMON_ASM_SOURCE + arch/i386/drvmap.S arch/i386/entry.S arch/i386/int386.S arch/i386/pnpbios.S arch/i386/i386trap.S - arch/i386/linux.S - arch/i386/mb.S) + arch/i386/linux.S) list(APPEND FREELDR_NTLDR_SOURCE ntldr/arch/i386/winldr.c @@ -202,9 +207,6 @@ if(ARCH STREQUAL "i386") arch/i386/xboxrtc.c arch/i386/xboxvideo.c disk/scsiport.c) - if(NOT MSVC) - list(APPEND FREELDR_COMMON_ASM_SOURCE arch/i386/drvmap.S) - endif() elseif(ARCH STREQUAL "amd64") list(APPEND FREELDR_COMMON_ASM_SOURCE @@ -271,13 +273,15 @@ set(PCH_SOURCE add_pch(freeldr_common include/freeldr.h PCH_SOURCE) add_dependencies(freeldr_common bugcodes asm xdk) -if(ARCH STREQUAL "i386" AND NOT MSVC) - list(APPEND FREELDR_BASE_SOURCE arch/i386/multiboot.S) ## GCC builds need this extra thing for some reason... +if(ARCH STREQUAL "i386" AND NOT MSVC) target_link_libraries(freeldr_common mini_hal) endif() +add_asm_files(freeldr_base_asm ${FREELDR_BASE_ASM_SOURCE}) + list(APPEND FREELDR_BASE_SOURCE + ${freeldr_base_asm} bootmgr.c # This file is compiled with custom definitions freeldr.c ntldr/setupldr.c ## Strangely enough this file is needed in GCC builds diff --git a/boot/freeldr/freeldr/arch/i386/drivemap.c b/boot/freeldr/freeldr/arch/i386/drivemap.c index 1b8335dbc3..c1ea58742c 100644 --- a/boot/freeldr/freeldr/arch/i386/drivemap.c +++ b/boot/freeldr/freeldr/arch/i386/drivemap.c @@ -20,21 +20,20 @@ #include <freeldr.h> #include <debug.h> -DBG_DEFAULT_CHANNEL(WARNING); +DBG_DEFAULT_CHANNEL(DISK); BOOLEAN DriveMapInstalled = FALSE; // Tells us if we have already installed our drive map int 13h handler code ULONG OldInt13HandlerAddress = 0; // Address of BIOS int 13h handler ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler ULONG DriveMapHandlerSegOff = 0; // Segment:offset style address of our drive map handler -#ifndef _MSC_VER VOID DriveMapMapDrivesInSection(PCSTR SectionName) { CHAR SettingName[80]; CHAR SettingValue[80]; CHAR Drive1[80]; CHAR Drive2[80]; - ULONG SectionId; + ULONG_PTR SectionId; ULONG SectionItemCount; ULONG Index; ULONG Index2; @@ -143,7 +142,6 @@ BOOLEAN DriveMapIsValidDriveString(PCSTR DriveString) return TRUE; } -#endif UCHAR DriveMapGetBiosDriveNumber(PCSTR DeviceName) { @@ -172,7 +170,6 @@ UCHAR DriveMapGetBiosDriveNumber(PCSTR DeviceName) return BiosDriveNumber; } -#ifndef _MSC_VER VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap) { ULONG* RealModeIVT = (ULONG*)0x00000000; @@ -226,4 +223,3 @@ VOID DriveMapRemoveInt13Handler(VOID) DriveMapInstalled = FALSE; } } -#endif diff --git a/boot/freeldr/freeldr/arch/i386/drvmap.S b/boot/freeldr/freeldr/arch/i386/drvmap.S index 649f8738d9..561c19a52e 100644 --- a/boot/freeldr/freeldr/arch/i386/drvmap.S +++ b/boot/freeldr/freeldr/arch/i386/drvmap.S @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - #include <asm.inc> #include <arch/pc/x86common.h> @@ -25,8 +24,8 @@ PUBLIC _DriveMapInt13HandlerStart _DriveMapInt13HandlerStart: -Int13Handler: +Int13Handler: push bp mov bp, sp push ax @@ -40,14 +39,14 @@ Int13Handler: mov word ptr cs:[CallersFlags - Int13Handler], ax /* Save the drive number they passed in */ - mov cs:[PassedInDriveNumber - Int13Handler], dl + mov byte ptr cs:[PassedInDriveNumber - Int13Handler], dl /* Now we need to perform the mapping */ xor cx, cx mov si, offset Int13HandlerMapCount - Int13Handler /* Get the count of drives in the map list */ - mov cl, cs:[si] + mov cl, byte ptr cs:[si] inc si /* If the map list is empty then just call the old int 13h handler */ @@ -56,8 +55,8 @@ Int13Handler: GetMappedDriveNumberLoop: - /* Get the next drive number in the list */ - lods ax, cs:[si] + /* Get the next drive number in the list (store it in AX) */ + lods word ptr cs:[si] /* Check to see if it's the one they are calling int 13h for */ cmp dl, al @@ -84,7 +83,6 @@ CallOldInt13Handler: /* Put flags onto stack */ push word ptr cs:[CallersFlags - Int13Handler] - /* Call old int 13h handler with new drive number */ .byte HEX(9a) /* lcall */ PUBLIC _DriveMapOldInt13HandlerAddress @@ -100,7 +98,7 @@ _DriveMapOldInt13HandlerAddress: pop ax /* Restore the callers drive number */ - mov dl, cs:[PassedInDriveNumber - Int13Handler] + mov dl, byte ptr cs:[PassedInDriveNumber - Int13Handler] pop bp @@ -112,6 +110,7 @@ CallersFlags: PassedInDriveNumber: .byte 0 +/* See the DRIVE_MAP_LIST structure in include/arch/i386/drivemap.h */ PUBLIC _DriveMapInt13HandlerMapList _DriveMapInt13HandlerMapList: Int13HandlerMapCount: @@ -139,3 +138,7 @@ Int13HandlerDriveNew4: PUBLIC _DriveMapInt13HandlerEnd _DriveMapInt13HandlerEnd: + +.endcode16 + +END diff --git a/boot/freeldr/freeldr/arch/i386/entry.S b/boot/freeldr/freeldr/arch/i386/entry.S index 6e2b1826de..7de40ca026 100644 --- a/boot/freeldr/freeldr/arch/i386/entry.S +++ b/boot/freeldr/freeldr/arch/i386/entry.S @@ -25,7 +25,7 @@ EXTERN _BootMain:PROC EXTERN _InitIdt:PROC EXTERN _i386Idt:DWORD //EXTERN _i386idtptr:FWORD -// EXTERN cmdline:DWORD +EXTERN cmdline:DWORD #ifdef _USE_ML EXTERN __bss_start__:DWORD @@ -89,8 +89,7 @@ ASSUME /*CS:_TEXT,*/ DS:_DATA, ES:_DATA, FS:_DATA, GS:_DATA, SS:_DATA call _InitIdt /* Pass the command line to BootMain */ - // mov eax, offset cmdline - xor eax, eax + mov eax, offset cmdline /* GO! */ push eax diff --git a/boot/freeldr/freeldr/arch/i386/mb.S b/boot/freeldr/freeldr/arch/i386/mb.S deleted file mode 100644 index cfaf5c73bc..0000000000 --- a/boot/freeldr/freeldr/arch/i386/mb.S +++ /dev/null @@ -1,51 +0,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2002 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <asm.inc> -#include <arch/pc/x86common.h> -#include <multiboot.h> - -.code32 -PUBLIC _PageDirectoryStart - -PUBLIC _startup_pagedirectory -PUBLIC _lowmem_pagetable -PUBLIC _kernel_pagetable -PUBLIC _apic_pagetable -PUBLIC _PageDirectoryEnd - -#ifndef _USE_ML -.bss -#endif -_PageDirectoryStart: -_startup_pagedirectory: - .fill 4096, 1, 0 - -_lowmem_pagetable: - .fill 4096, 1, 0 - -_kernel_pagetable: - .fill 2*4096, 1, 0 - -_apic_pagetable: - .fill 4096, 1, 0 - -_PageDirectoryEnd: - -END diff --git a/boot/freeldr/freeldr/arch/i386/multiboot.S b/boot/freeldr/freeldr/arch/i386/multiboot.S index d00333e264..6094000a0e 100644 --- a/boot/freeldr/freeldr/arch/i386/multiboot.S +++ b/boot/freeldr/freeldr/arch/i386/multiboot.S @@ -42,6 +42,18 @@ */ #define INITIAL_BASE HEX(200000) + +#ifdef _USE_ML +EXTERN __bss_start__:DWORD +EXTERN __bss_end__:DWORD +#endif + + +#ifdef _USE_ML +.MBDATA SEGMENT PUBLIC 'DATA' +ASSUME nothing +#endif + /* Align to 32 bits boundary */ .align 4 @@ -54,7 +66,7 @@ MultibootHeader: /* checksum */ .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) /* header_addr */ - .long INITIAL_BASE + MultibootHeader - FREELDR_BASE + .long MultibootHeader + INITIAL_BASE - FREELDR_BASE /* load_addr */ .long INITIAL_BASE /* load_end_addr */ @@ -62,15 +74,27 @@ MultibootHeader: /* bss_end_addr */ .long 0 /* entry_addr */ - .long INITIAL_BASE + MultibootEntry - FREELDR_BASE + .long MultibootEntry + INITIAL_BASE - FREELDR_BASE + +#ifdef _USE_ML +.MBDATA ENDS +#endif + + +.code32 +ASSUME ES:NOTHING, FS:NOTHING, GS:NOTHING MultibootEntry: cld + /* Check for valid multiboot signature */ + cmp eax, MULTIBOOT_BOOTLOADER_MAGIC + jne mbfail + /* Save command line */ - test dword ptr [ebx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_COMMAND_LINE + test dword ptr ds:[ebx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_COMMAND_LINE jz mb2 - mov esi, [ebx + MB_INFO_COMMAND_LINE_OFFSET] + mov esi, dword ptr ds:[ebx + MB_INFO_COMMAND_LINE_OFFSET] mov edi, offset cmdline + INITIAL_BASE - FREELDR_BASE mov ecx, CMDLINE_SIZE - 1 mb1: @@ -83,14 +107,14 @@ mb1: mb2: /* See if the boot device was passed in */ - test dword ptr [ebx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_BOOT_DEVICE + test dword ptr ds:[ebx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_BOOT_DEVICE /* If no boot device known, assume first partition of first harddisk */ mov dx, HEX(0180) jz mb3 /* Load boot drive into DL, boot partition into DH */ - mov edx, [ebx + MB_INFO_BOOT_DEVICE_OFFSET] + mov edx, dword ptr ds:[ebx + MB_INFO_BOOT_DEVICE_OFFSET] bswap edx inc dh @@ -103,7 +127,11 @@ mb3: rep movsd /* Load segment registers for real-address mode */ - lgdt gdtptr +#ifdef _USE_ML + lgdt fword ptr ds:[gdtptr] +#else + lgdt ds:[gdtptr] +#endif mov ax, HEX(10) mov ds, ax mov es, ax @@ -114,6 +142,11 @@ mb3: /* Jump to relocated code */ ljmp HEX(08), mb4 +mbfail: + int 3 +mbstop: + jmp short mbstop /* We should never get here */ + .code16 mb4: /* Disable protected mode */ @@ -123,26 +156,20 @@ mb4: /* Jump to real entry point */ ljmp16 0, FREELDR_BASE +.endcode16 + /* Force 8-byte alignment */ .align 8 gdt: - /* 16-bit flat CS (!) */ - .word HEX(FFFF) - .word HEX(0000) - .word HEX(9B00) - .word HEX(008F) - - /* 16-bit real mode DS */ - .word HEX(FFFF) - .word HEX(0000) - .word HEX(9300) - .word HEX(0000) - - /* GDT pointer */ + .word HEX(0000), HEX(0000), HEX(0000), HEX(0000) /* 00: NULL descriptor */ + .word HEX(FFFF), HEX(0000), HEX(9B00), HEX(008F) /* 08: 16-bit flat CS (!) */ + .word HEX(FFFF), HEX(0000), HEX(9300), HEX(0000) /* 10: 16-bit real mode DS */ + +/* GDT table pointer */ gdtptr: - .word HEX(17) /* Limit */ - .long gdt - 8 /* Base Address */ + .word HEX(17) /* Limit */ + .long gdt /* Base Address */ PUBLIC cmdline cmdline: diff --git a/boot/freeldr/freeldr/bootmgr.c b/boot/freeldr/freeldr/bootmgr.c index ed506aedd7..69b7d98359 100644 --- a/boot/freeldr/freeldr/bootmgr.c +++ b/boot/freeldr/freeldr/bootmgr.c @@ -88,8 +88,8 @@ VOID LoadOperatingSystem(IN OperatingSystemItem* OperatingSystem) } } +#if defined(_M_IX86) /* Install the drive mapper according to this section drive mappings */ -#if defined(_M_IX86) && !defined(_MSC_VER) DriveMapMapDrivesInSection(SectionName); #endif diff --git a/boot/freeldr/freeldr/freeldr_i386.msvc.lds b/boot/freeldr/freeldr/freeldr_i386.msvc.lds index 061221f2b8..bcfc19204e 100644 --- a/boot/freeldr/freeldr/freeldr_i386.msvc.lds +++ b/boot/freeldr/freeldr/freeldr_i386.msvc.lds @@ -32,7 +32,7 @@ * Otherwise they are kept separated, unless an explicit /MERGE is used. */ -#pragma comment(linker, "/SECTION:.text,ERW /SECTION:.data,RW /MERGE:INIT=.text /MERGE:.edata=.rdata") +#pragma comment(linker, "/SECTION:.text,ERW /SECTION:.data,RW /MERGE:.MBDATA=.text /MERGE:INIT=.text /MERGE:.edata=.rdata") #endif diff --git a/boot/freeldr/freeldr/include/arch/pc/x86common.h b/boot/freeldr/freeldr/include/arch/pc/x86common.h index 2cda9fffb0..1b40ca3905 100644 --- a/boot/freeldr/freeldr/include/arch/pc/x86common.h +++ b/boot/freeldr/freeldr/include/arch/pc/x86common.h @@ -77,6 +77,3 @@ #define LMODE_DS HEX(18) #define CMODE_CS HEX(30) //#endif - -/* Makes "x" a global variable or label */ -#define EXTERN(x) .global x; x:

5 years, 7 months

[reactos] 03/04: [FREELDR] Introduce a MSVC "linker script" file that centralizes the commands for defining section-limit symbols, and the ordering and merging of PE sections, and the necessary CMake code to use it. (#1224)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed8355222976c1834ba15… commit ed8355222976c1834ba15446782c3f6dfd5ec0a8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 19 23:28:17 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 27 00:51:25 2019 +0100 [FREELDR] Introduce a MSVC "linker script" file that centralizes the commands for defining section-limit symbols, and the ordering and merging of PE sections, and the necessary CMake code to use it. (#1224) As the MSVC linker alone doesn't permit such control, the file uses ASM language (C can alternatively be used), together with extra linker command-line switches. It is pre-processed 3 times: first for generating the ASM code, second for the C code and the third time for generating the linker response file. In our case, the ASM code defines the __bss_start__ and __bss_end__ symbols that allow us to find the limits of the .bss section (which is by the way automatically appended to the .data section by the MSVC linker). The C code is used to specify the list of linker switches that can be passed through the `#pragma comment(linker, ...)' directive (the can be alternatively specified in the linker response section). Finally the linker response section contains all the linker switches that cannot be specified with the `#pragma comment(linker, ...)' directive. Using all this we can recycle the BSS initialization code, that has been written originally for GCC only, also for the MSVC builds. Also, remove the outdated .text16 section merging. --- boot/freeldr/freeldr/CMakeLists.txt | 80 ++++++++++++++++++++++++++++-- boot/freeldr/freeldr/arch/amd64/entry.S | 21 +++++++- boot/freeldr/freeldr/arch/i386/entry.S | 31 ++++++------ boot/freeldr/freeldr/freeldr_i386.lds | 5 ++ boot/freeldr/freeldr/freeldr_i386.msvc.lds | 78 +++++++++++++++++++++++++++++ boot/freeldr/freeldr/include/mm.h | 10 ++-- 6 files changed, 199 insertions(+), 26 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index ff7731e6ba..88c1c2a528 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -5,6 +5,74 @@ if(SEPARATE_DBG) set(CMAKE_LDR_PE_HELPER_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") endif() +if(NOT MSVC) +### +### For GCC +### +function(add_linker_script _target _linker_script_file) + get_filename_component(_file_full_path ${_linker_script_file} ABSOLUTE) + add_target_link_flags(${_target} "-Wl,-T,${_file_full_path}") + + # Unfortunately LINK_DEPENDS is ignored in non-Makefile generators (for now...) + # See also http://www.cmake.org/pipermail/cmake/2010-May/037206.html + add_target_property(${_target} LINK_DEPENDS ${_file_full_path}) +endfunction() + +else() +### +### For MSVC +### +function(add_linker_script _target _linker_script_file) + get_filename_component(_file_full_path ${_linker_script_file} ABSOLUTE) + get_filename_component(_file_name ${_linker_script_file} NAME) + set(_generated_file_path_prefix "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_target}.dir/${_file_name}") + + # Generate the ASM module containing sections specifications and layout. + set(_generated_file "${_generated_file_path_prefix}.S") + add_custom_command( + OUTPUT ${_generated_file} + COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${_file_full_path}" "${_generated_file}" + DEPENDS ${_file_full_path}) + set_source_files_properties(${_generated_file} PROPERTIES LANGUAGE "ASM" GENERATED TRUE) + add_asm_files(freeldr_linker_file ${_generated_file}) + + # Generate the C module containing extra sections specifications and layout, + # as well as comment-type linker #pragma directives. + set(_generated_file "${_generated_file_path_prefix}.c") + add_custom_command( + OUTPUT ${_generated_file} + COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${_file_full_path}" "${_generated_file}" + DEPENDS ${_file_full_path}) + set_source_files_properties(${_generated_file} PROPERTIES LANGUAGE "C" GENERATED TRUE) + list(APPEND freeldr_linker_file ${_generated_file}) + + # Add both files to the sources of the target. + target_sources(${_target} PRIVATE ${freeldr_linker_file}) + + # Create the additional linker response file. + set(_generated_file "${_generated_file_path_prefix}.rsp") + if(USE_CLANG_CL) + set(_no_std_includes_flag "-nostdinc") + else() + set(_no_std_includes_flag "/X") + endif() + add_custom_command( + #OUTPUT ${_generated_file} + TARGET ${_target} PRE_LINK + COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag} /D__LINKER__ /EP /c "${_file_full_path}" > "${_generated_file}" + DEPENDS ${_file_full_path} + VERBATIM) + set_source_files_properties(${_generated_file} PROPERTIES GENERATED TRUE) + add_target_link_flags(${_target} "@${_generated_file}") + + # Unfortunately LINK_DEPENDS is ignored in non-Makefile generators (for now...) + # See also http://www.cmake.org/pipermail/cmake/2010-May/037206.html + add_target_property(${_target} LINK_DEPENDS ${_generated_file}) +endfunction() + +endif() + + if(MSVC) # We don't need hotpatching replace_compile_flags("/hotpatch" " ") @@ -238,12 +306,16 @@ if(MSVC) add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER") add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER") else() - add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:INIT=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text") - add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:INIT=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text") + add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /FILEALIGN:0x200 /ALIGN:0x200") + add_linker_script(freeldr_pe freeldr_i386.msvc.lds) + add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /FILEALIGN:0x200 /ALIGN:0x200") + add_linker_script(freeldr_pe_dbg freeldr_i386.msvc.lds) endif() else() - add_target_link_flags(freeldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds") - add_target_link_flags(freeldr_pe_dbg "-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds") + add_target_link_flags(freeldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x200,--section-alignment,0x200") + add_linker_script(freeldr_pe freeldr_i386.lds) + add_target_link_flags(freeldr_pe_dbg "-Wl,--exclude-all-symbols,--file-alignment,0x200,--section-alignment,0x200") + add_linker_script(freeldr_pe_dbg freeldr_i386.lds) endif() set_image_base(freeldr_pe 0x10000) diff --git a/boot/freeldr/freeldr/arch/amd64/entry.S b/boot/freeldr/freeldr/arch/amd64/entry.S index 075778f884..e5620bd300 100644 --- a/boot/freeldr/freeldr/arch/amd64/entry.S +++ b/boot/freeldr/freeldr/arch/amd64/entry.S @@ -3,6 +3,12 @@ #include <arch/pc/x86common.h> EXTERN BootMain:PROC +// EXTERN cmdline:DWORD + +#ifdef _USE_ML +EXTERN __bss_start__:FWORD +EXTERN __bss_end__:FWORD +#endif .code64 @@ -40,13 +46,24 @@ FrldrStartup: mov eax, dword ptr [BSS_RealModeEntry] mov dword ptr [AddressOfRealModeEntryPoint], eax - /* GO! */ + /* Clean out BSS */ + xor rax, rax + mov rdi, offset __bss_start__ + mov rcx, offset __bss_end__ + 7 + sub rcx, rdi + shr rcx, 3 + rep stosq + + /* Pass the command line to BootMain */ + // mov rcx, offset cmdline xor rcx, rcx + + /* GO! */ call BootMain /* We should never get here */ stop: - jmp stop + jmp short stop nop nop diff --git a/boot/freeldr/freeldr/arch/i386/entry.S b/boot/freeldr/freeldr/arch/i386/entry.S index 90a40272d4..6e2b1826de 100644 --- a/boot/freeldr/freeldr/arch/i386/entry.S +++ b/boot/freeldr/freeldr/arch/i386/entry.S @@ -25,6 +25,12 @@ EXTERN _BootMain:PROC EXTERN _InitIdt:PROC EXTERN _i386Idt:DWORD //EXTERN _i386idtptr:FWORD +// EXTERN cmdline:DWORD + +#ifdef _USE_ML +EXTERN __bss_start__:DWORD +EXTERN __bss_end__:DWORD +#endif .code32 @@ -59,6 +65,8 @@ ContinueAddress: _FrldrStartup: +ASSUME /*CS:_TEXT,*/ DS:_DATA, ES:_DATA, FS:_DATA, GS:_DATA, SS:_DATA + /* Store BootDrive and BootPartition */ mov byte ptr ds:[_FrldrBootDrive], dl xor eax, eax @@ -69,11 +77,7 @@ _FrldrStartup: mov eax, dword ptr ds:[BSS_RealModeEntry] mov dword ptr ds:[SwitchToReal16Address], eax - /* Initialize the idt */ - call _InitIdt - -#ifndef _USE_ML - /* Clean out bss */ + /* Clean out BSS */ xor eax, eax mov edi, offset __bss_start__ mov ecx, offset __bss_end__ + 3 @@ -81,11 +85,12 @@ _FrldrStartup: shr ecx, 2 rep stosd + /* Initialize the idt */ + call _InitIdt + /* Pass the command line to BootMain */ - mov eax, offset cmdline -#else + // mov eax, offset cmdline xor eax, eax -#endif /* GO! */ push eax @@ -93,7 +98,7 @@ _FrldrStartup: /* We should never get here */ stop: - jmp stop + jmp short stop nop nop @@ -181,7 +186,7 @@ SwitchToReal: mov ss, ax /* Save 32-bit stack pointer */ - mov dword ptr [stack32], esp + mov dword ptr ds:[stack32], esp /* jmp to 16-bit segment to set the limit correctly */ .byte HEX(0ea) // jmp far RMODE_CS:switch_to_real16 @@ -236,11 +241,7 @@ gdtptr: .word HEX(27) /* Limit */ .long gdt /* Base Address */ -/* Real-mode IDT pointer */ -rmode_idtptr: - .word HEX(3ff) /* Limit */ - .long 0 /* Base Address */ - +// See _i386IdtDescriptor PUBLIC i386idtptr i386idtptr: .word 255 /* Limit */ diff --git a/boot/freeldr/freeldr/freeldr_i386.lds b/boot/freeldr/freeldr/freeldr_i386.lds index 5cb2cb6c7b..56df8f63ee 100644 --- a/boot/freeldr/freeldr/freeldr_i386.lds +++ b/boot/freeldr/freeldr/freeldr_i386.lds @@ -12,6 +12,11 @@ SECTIONS *(SORT(.rdata*)) } + /* + * LD needs an explicit .edata block to make the binary correctly export + * symbols, otherwise, if .edata is merged with another section (e.g. .rdata) + * the exports are not exported! + */ .edata BLOCK(__file_alignment__) : { *(.edata) diff --git a/boot/freeldr/freeldr/freeldr_i386.msvc.lds b/boot/freeldr/freeldr/freeldr_i386.msvc.lds new file mode 100644 index 0000000000..061221f2b8 --- /dev/null +++ b/boot/freeldr/freeldr/freeldr_i386.msvc.lds @@ -0,0 +1,78 @@ +/*****************************************************************************\ + *** MSVC Linker Script File -- Sections specifications & layout *** +\*****************************************************************************/ + +#ifndef _MSC_VER +#error This file must be used only with the MSVC compiler and linker. +#endif + +#if defined(__LINKER__) +/*********************************\ + ** Linker response file ** +\*********************************/ + +// /LAST:.bss +/LAST:.data + +#elif !defined(_USE_ML) +/*********************************\ + ** C Linker #pragma directives ** +\*********************************/ + +/* + * Notes about automatic LINK.EXE behaviour that cannot be changed: + * + * - If a .data section is present, the .bss section is appended to it in case + * both of these have either Initialized or Uninitialized data (which is the + * case, unless one has manually modified the attributes). + * + * - If the /DRIVER flag is NOT used, and if both the .rdata and the .edata + * sections (read-only data and exports, respectively) have the same + * attributes, the .edata section is appended to the .rdata section. + * Otherwise they are kept separated, unless an explicit /MERGE is used. + */ + +#pragma comment(linker, "/SECTION:.text,ERW /SECTION:.data,RW /MERGE:INIT=.text /MERGE:.edata=.rdata") + +#endif + + +#if defined(_USE_ML) // && !defined(__LINKER__) +/************************\ + ** ASM definitions ** +\************************/ + +#include <asm.inc> + +/* +#pragma bss_seg(".bss") +// __declspec(allocate(".bss")) +void* __bss_start__; +#pragma bss_seg() +*/ +_BSS1 SEGMENT 'BSS' ALIAS('.bss') +PUBLIC __bss_start__ +__bss_start__: + .long ? +_BSS1 ENDS + +/* +#pragma bss_seg(".bss$ZZZ") +// __declspec(allocate(".bss$ZZZ")) +void* __bss_end__; +#pragma bss_seg() +*/ +_BSS2 SEGMENT 'BSS' ALIAS('.bss$ZZZ') +PUBLIC __bss_end__ +__bss_end__: + .long ? +_BSS2 ENDS + +END + +#elif !defined(__LINKER__) +/************************\ + ** C definitions ** +\************************/ + +#endif diff --git a/boot/freeldr/freeldr/include/mm.h b/boot/freeldr/freeldr/include/mm.h index adc13d0ebf..e86424f17a 100644 --- a/boot/freeldr/freeldr/include/mm.h +++ b/boot/freeldr/freeldr/include/mm.h @@ -21,15 +21,15 @@ extern char __ImageBase; #ifdef __GNUC__ -/* .text, .edata and .bss */ +/* .text/.data/.rdata, .edata and .bss */ #define FREELDR_SECTION_COUNT 3 #else #ifdef _M_AMD64 -/* .text and .pdata */ -#define FREELDR_SECTION_COUNT 2 +/* .text, .rdata/.edata, .pdata and .data/.bss */ +#define FREELDR_SECTION_COUNT 4 #else -/* .text and .edata */ -#define FREELDR_SECTION_COUNT 2 +/* .text, .rdata/.edata and .data/.bss */ +#define FREELDR_SECTION_COUNT 3 #endif #endif

5 years, 7 months

[reactos] 02/04: [FREELDR] Minor code maintenance.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aaee856cea0430e011d56… commit aaee856cea0430e011d56a875e780d13c21bef65 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 13 01:56:19 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 27 00:51:19 2019 +0100 [FREELDR] Minor code maintenance. - Whitespace; - Explicitly use string pooling (option "/GF"), so that even if it's used globally in the main ReactOS CMAKE file or not, we still have it there, because we are quite size-constrained; - Rename the source lists (OK, we understand it's _COMMON_ ...); - Remove redundant double inclusion of linuxboot.c; - In the 'freeldr_common' static library, compile the ASM code first. --- boot/freeldr/freeldr/CMakeLists.txt | 49 +++++++++++++----------- boot/freeldr/freeldr/include/arch/pc/x86common.h | 2 +- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 3b5698133c..ff7731e6ba 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -6,8 +6,11 @@ if(SEPARATE_DBG) endif() if(MSVC) - # We don't need it here + # We don't need hotpatching replace_compile_flags("/hotpatch" " ") + + # Explicitly use string pooling + add_compile_flags("/GF") endif() spec2def(freeldr_pe.exe freeldr.spec) @@ -32,7 +35,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/elf) add_definitions(-D_NTHAL_ -D_BLDR_ -D_NTSYSTEM_) -list(APPEND FREELDR_BOOTLIB_COMMON_SOURCE +list(APPEND FREELDR_BOOTLIB_SOURCE lib/debug.c lib/peloader.c lib/comm/rs232.c @@ -50,14 +53,14 @@ list(APPEND FREELDR_BOOTLIB_COMMON_SOURCE lib/mm/mm.c lib/mm/heap.c) -list(APPEND FREELDR_NTLDR_COMMON_SOURCE +list(APPEND FREELDR_NTLDR_SOURCE ntldr/conversion.c ntldr/registry.c ntldr/winldr.c ntldr/wlmemory.c ntldr/wlregistry.c) -list(APPEND FREELDR_ARC_COMMON_SOURCE +list(APPEND FREELDR_ARC_SOURCE arcname.c machine.c arch/archwsup.c @@ -68,7 +71,7 @@ list(APPEND FREELDR_ARC_COMMON_SOURCE disk/ramdisk.c) #disk/scsiport.c -list(APPEND FREELDR_COMMON_SOURCE +list(APPEND FREELDR_BOOTMGR_SOURCE include/freeldr.h cmdline.c custom.c @@ -97,11 +100,11 @@ if(ARCH STREQUAL "i386") arch/i386/linux.S arch/i386/mb.S) - list(APPEND FREELDR_NTLDR_COMMON_SOURCE + list(APPEND FREELDR_NTLDR_SOURCE ntldr/arch/i386/winldr.c ntldr/headless.c) - list(APPEND FREELDR_ARC_COMMON_SOURCE + list(APPEND FREELDR_ARC_SOURCE lib/fs/pxe.c arch/i386/halstub.c arch/i386/ntoskrnl.c @@ -134,16 +137,17 @@ if(ARCH STREQUAL "i386") if(NOT MSVC) list(APPEND FREELDR_COMMON_ASM_SOURCE arch/i386/drvmap.S) endif() + elseif(ARCH STREQUAL "amd64") list(APPEND FREELDR_COMMON_ASM_SOURCE arch/amd64/entry.S arch/amd64/int386.S arch/amd64/pnpbios.S) - list(APPEND FREELDR_NTLDR_COMMON_SOURCE + list(APPEND FREELDR_NTLDR_SOURCE ntldr/arch/amd64/winldr.c) - list(APPEND FREELDR_ARC_COMMON_SOURCE + list(APPEND FREELDR_ARC_SOURCE lib/fs/pxe.c arch/i386/ntoskrnl.c arch/i386/drivemap.c @@ -161,14 +165,15 @@ elseif(ARCH STREQUAL "amd64") arch/i386/pcmem.c arch/i386/pcrtc.c arch/i386/pcvideo.c) + elseif(ARCH STREQUAL "arm") list(APPEND FREELDR_COMMON_ASM_SOURCE arch/arm/boot.S) - list(APPEND FREELDR_NTLDR_COMMON_SOURCE + list(APPEND FREELDR_NTLDR_SOURCE ntldr/arch/arm/winldr.c) - list(APPEND FREELDR_ARC_COMMON_SOURCE + list(APPEND FREELDR_ARC_SOURCE arch/arm/entry.c arch/arm/macharm.c) else() @@ -178,12 +183,11 @@ endif() add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE}) add_library(freeldr_common - ${FREELDR_BOOTLIB_COMMON_SOURCE} - ${FREELDR_ARC_COMMON_SOURCE} - ${FREELDR_NTLDR_COMMON_SOURCE} - ${FREELDR_COMMON_SOURCE} ${freeldr_common_asm} - linuxboot.c) + ${FREELDR_BOOTLIB_SOURCE} + ${FREELDR_ARC_SOURCE} + ${FREELDR_NTLDR_SOURCE} + ${FREELDR_BOOTMGR_SOURCE}) if(USE_CLANG_CL) # We need to reduce the binary size @@ -191,16 +195,17 @@ if(USE_CLANG_CL) endif() set(PCH_SOURCE - ${FREELDR_BOOTLIB_COMMON_SOURCE} - ${FREELDR_ARC_COMMON_SOURCE} - ${FREELDR_NTLDR_COMMON_SOURCE} - ${FREELDR_COMMON_SOURCE}) + ${FREELDR_BOOTLIB_SOURCE} + ${FREELDR_ARC_SOURCE} + ${FREELDR_NTLDR_SOURCE} + ${FREELDR_BOOTMGR_SOURCE}) add_pch(freeldr_common include/freeldr.h PCH_SOURCE) add_dependencies(freeldr_common bugcodes asm xdk) if(ARCH STREQUAL "i386" AND NOT MSVC) list(APPEND FREELDR_BASE_SOURCE arch/i386/multiboot.S) +## GCC builds need this extra thing for some reason... target_link_libraries(freeldr_common mini_hal) endif() @@ -208,7 +213,7 @@ list(APPEND FREELDR_BASE_SOURCE bootmgr.c # This file is compiled with custom definitions freeldr.c ntldr/setupldr.c ## Strangely enough this file is needed in GCC builds - ## even if ${FREELDR_NTLDR_COMMON_SOURCE} is not added, + ## even if ${FREELDR_NTLDR_SOURCE} is not added, ## otherwise we get linking errors with Rtl**Bitmap** APIs. ## Do not happen on MSVC builds however... lib/inffile/inffile.c @@ -279,7 +284,7 @@ else() add_custom_target(freeldr ALL DEPENDS freeldr_pe) endif() -# rename freeldr on livecd to setupldr.sys because isoboot.bin looks for setupldr.sys +# Rename freeldr on livecd to setupldr.sys because isoboot.bin looks for setupldr.sys add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR bootcd regtest) add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR livecd hybridcd NAME_ON_CD setupldr.sys) diff --git a/boot/freeldr/freeldr/include/arch/pc/x86common.h b/boot/freeldr/freeldr/include/arch/pc/x86common.h index 850499cee3..2cda9fffb0 100644 --- a/boot/freeldr/freeldr/include/arch/pc/x86common.h +++ b/boot/freeldr/freeldr/include/arch/pc/x86common.h @@ -66,7 +66,7 @@ /* Defines needed for switching between real and protected mode */ //#ifdef _M_IX86 -#define NULL_DESC HEX(00) /* NULL descriptor */ +#define NULL_DESC HEX(00) /* NULL descriptor */ #define PMODE_CS HEX(08) /* PMode code selector, base 0 limit 4g */ #define PMODE_DS HEX(10) /* PMode data selector, base 0 limit 4g */ #define RMODE_CS HEX(18) /* RMode code selector, base 0 limit 64k */

5 years, 7 months

[reactos] 01/04: [SDK/INCLUDE] Fix the .code16 macro definition for MASM/ML.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ee02b2c4d04170e0e68e… commit 0ee02b2c4d04170e0e68eae538da871f47680ddd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 13 01:32:38 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 27 00:51:00 2019 +0100 [SDK/INCLUDE] Fix the .code16 macro definition for MASM/ML. Modify the .code16 macro so that the 16-bit code segment can get a chance to be correctly merged with other (possibly 32-bit) code segments, without keeping generating multiple .text segments with different attributes and generating the corresponding LNK4078 warning. This fixes the warning when compiling NTOSKRNL on MSVC: "v86.S.obj : warning LNK4078: multiple '.text' sections found with different attributes (C0520040)". --- sdk/include/asm/asm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/asm/asm.inc b/sdk/include/asm/asm.inc index f8bc9126e1..7612815607 100644 --- a/sdk/include/asm/asm.inc +++ b/sdk/include/asm/asm.inc @@ -100,7 +100,7 @@ ENDM .code16 MACRO ASSUME nothing - .text SEGMENT use16 + .text SEGMENT use16 PUBLIC 'CODE' .586P ENDM

5 years, 7 months

[reactos] 01/01: [MSADP32.ACM] Sync with Wine Staging 4.0. CORE-15682

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c90b53d5ad57f22090807… commit c90b53d5ad57f2209080791764c633ecbe37ed03 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Jan 26 13:18:47 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Jan 26 13:18:47 2019 +0100 [MSADP32.ACM] Sync with Wine Staging 4.0. CORE-15682 --- dll/win32/msadp32.acm/msadp32.c | 23 ++++++++++------------- media/doc/README.WINE | 2 +- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dll/win32/msadp32.acm/msadp32.c b/dll/win32/msadp32.acm/msadp32.c index 24e0c6a72b..78d99a21de 100644 --- a/dll/win32/msadp32.acm/msadp32.c +++ b/dll/win32/msadp32.acm/msadp32.c @@ -83,9 +83,6 @@ static const Format ADPCM_Formats[] = {1, 4, 22050}, {2, 4, 22050}, {1, 4, 44100}, {2, 4, 44100}, }; -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) -#define NUM_ADPCM_FORMATS (sizeof(ADPCM_Formats) / sizeof(ADPCM_Formats[0])) - static int MS_Delta[] = { 230, 230, 230, 230, 307, 409, 512, 614, @@ -109,11 +106,11 @@ static DWORD ADPCM_GetFormatIndex(const WAVEFORMATEX* wfx) switch (wfx->wFormatTag) { case WAVE_FORMAT_PCM: - hi = NUM_PCM_FORMATS; + hi = ARRAY_SIZE(PCM_Formats); fmts = PCM_Formats; break; case WAVE_FORMAT_ADPCM: - hi = NUM_ADPCM_FORMATS; + hi = ARRAY_SIZE(ADPCM_Formats); fmts = ADPCM_Formats; break; default: @@ -389,13 +386,13 @@ static LRESULT ADPCM_DriverDetails(PACMDRIVERDETAILSW add) add->cFilterTags = 0; add->hicon = NULL; MultiByteToWideChar( CP_ACP, 0, "MS-ADPCM", -1, - add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); + add->szShortName, ARRAY_SIZE( add->szShortName )); MultiByteToWideChar( CP_ACP, 0, "Wine MS ADPCM converter", -1, - add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); + add->szLongName, ARRAY_SIZE( add->szLongName )); MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1, - add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR) ); + add->szCopyright, ARRAY_SIZE( add->szCopyright )); MultiByteToWideChar( CP_ACP, 0, "Refer to LICENSE file", -1, - add->szLicensing, sizeof(add->szLicensing)/sizeof(WCHAR) ); + add->szLicensing, ARRAY_SIZE( add->szLicensing )); add->szFeatures[0] = 0; return MMSYSERR_NOERROR; @@ -441,13 +438,13 @@ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) case 0: aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); - aftd->cStandardFormats = NUM_PCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); lstrcpyW(aftd->szFormatTag, szPcm); break; case 1: aftd->dwFormatTag = WAVE_FORMAT_ADPCM; aftd->cbFormatSize = sizeof(ADPCMWAVEFORMAT) + (7 - 1) * sizeof(ADPCMCOEFSET); - aftd->cStandardFormats = NUM_ADPCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(ADPCM_Formats); lstrcpyW(aftd->szFormatTag, szMsAdPcm); break; } @@ -470,7 +467,7 @@ static LRESULT ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) switch (afd->dwFormatTag) { case WAVE_FORMAT_PCM: - if (afd->dwFormatIndex >= NUM_PCM_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(PCM_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = PCM_Formats[afd->dwFormatIndex].nBits; @@ -483,7 +480,7 @@ static LRESULT ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign; break; case WAVE_FORMAT_ADPCM: - if (afd->dwFormatIndex >= NUM_ADPCM_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(ADPCM_Formats)) return ACMERR_NOTPOSSIBLE; if (afd->cbwfx < sizeof(ADPCMWAVEFORMAT) + (7 - 1) * sizeof(ADPCMCOEFSET)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = ADPCM_Formats[afd->dwFormatIndex].nChannels; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index d27f4d3675..8910a723dc 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -102,7 +102,7 @@ reactos/dll/win32/mpr # Synced to WineStaging-3.17 reactos/dll/win32/mprapi # Synced to WineStaging-3.3 reactos/dll/win32/msacm32 # Synced to WineStaging-4.0 reactos/dll/win32/msacm32.drv # Synced to WineStaging-3.3 -reactos/dll/win32/msadp32.acm # Synced to WineStaging-3.3 +reactos/dll/win32/msadp32.acm # Synced to WineStaging-4.0 reactos/dll/win32/mscat32 # Synced to WineStaging-3.3 reactos/dll/win32/mscms # Synced to WineStaging-3.3 reactos/dll/win32/mscoree # Synced to Wine-1.5.4

5 years, 7 months

[reactos] 01/01: [MSACM32] Sync with Wine Staging 4.0. CORE-15682

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ea85289098802d3484fd… commit 3ea85289098802d3484fdc5b113d98a014bae959 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Jan 26 13:18:13 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Jan 26 13:18:13 2019 +0100 [MSACM32] Sync with Wine Staging 4.0. CORE-15682 --- dll/win32/msacm32/CMakeLists.txt | 1 + dll/win32/msacm32/filter.c | 4 ++-- dll/win32/msacm32/format.c | 18 +++++++++--------- dll/win32/msacm32/internal.c | 14 +++++++------- dll/win32/msacm32/pcmconverter.c | 22 ++++++++++------------ media/doc/README.WINE | 2 +- 6 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dll/win32/msacm32/CMakeLists.txt b/dll/win32/msacm32/CMakeLists.txt index 88a5830b0b..b1be7b9b48 100644 --- a/dll/win32/msacm32/CMakeLists.txt +++ b/dll/win32/msacm32/CMakeLists.txt @@ -1,4 +1,5 @@ +add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(msacm32.dll msacm32.spec ADD_IMPORTLIB) diff --git a/dll/win32/msacm32/filter.c b/dll/win32/msacm32/filter.c index 53db82777d..8d5abced9d 100644 --- a/dll/win32/msacm32/filter.c +++ b/dll/win32/msacm32/filter.c @@ -361,8 +361,8 @@ MMRESULT WINAPI acmFilterTagDetailsW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd if (mmr == MMSYSERR_NOERROR && paftd->dwFilterTag == WAVE_FORMAT_PCM && paftd->szFilterTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFilterTag, - sizeof(paftd->szFilterTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFilterTag, + ARRAY_SIZE(paftd->szFilterTag)); return mmr; } diff --git a/dll/win32/msacm32/format.c b/dll/win32/msacm32/format.c index b3d2900393..fcc0d9b1c6 100644 --- a/dll/win32/msacm32/format.c +++ b/dll/win32/msacm32/format.c @@ -503,9 +503,9 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD wsprintfW(pafd->szFormat + lstrlenW(pafd->szFormat), fmt2, pafd->pwfx->wBitsPerSample); } - MultiByteToWideChar( CP_ACP, 0, (pafd->pwfx->nChannels == 1) ? "; Mono" : "; Stereo", -1, - pafd->szFormat + strlenW(pafd->szFormat), - sizeof(pafd->szFormat)/sizeof(WCHAR) - strlenW(pafd->szFormat) ); + MultiByteToWideChar(CP_ACP, 0, (pafd->pwfx->nChannels == 1) ? "; Mono" : "; Stereo", -1, + pafd->szFormat + strlenW(pafd->szFormat), + ARRAY_SIZE(pafd->szFormat) - strlenW(pafd->szFormat)); } TRACE("=> %d\n", mmr); @@ -929,8 +929,8 @@ MMRESULT WINAPI acmFormatTagDetailsW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd if (mmr == MMSYSERR_NOERROR && paftd->dwFormatTag == WAVE_FORMAT_PCM && paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + ARRAY_SIZE(paftd->szFormatTag)); return mmr; } @@ -1036,8 +1036,8 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { if (paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + ARRAY_SIZE(paftd->szFormatTag)); /* (WS) I'm preserving this PCM hack since it seems to be * correct. Please notice this block was borrowed from * below. @@ -1062,8 +1062,8 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { if (paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + ARRAY_SIZE(paftd->szFormatTag)); /* FIXME (EPP): I'm not sure this is the correct * algorithm (should make more sense to apply the same * for all already loaded formats, but this will do diff --git a/dll/win32/msacm32/internal.c b/dll/win32/msacm32/internal.c index 7bafcaad5e..aad071e8ad 100644 --- a/dll/win32/msacm32/internal.c +++ b/dll/win32/msacm32/internal.c @@ -72,7 +72,7 @@ PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry) /* The requested registry entry must have the format msacm.XXXXX in order to be recognized in any future sessions of msacm */ - if (0 == strncmpiW(pszRegEntry, msacmW, sizeof(msacmW)/sizeof(WCHAR))) { + if (0 == strncmpiW(pszRegEntry, msacmW, ARRAY_SIZE(msacmW))) { lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, drvkey, 0, KEY_QUERY_VALUE, &hKey); if (lRet != ERROR_SUCCESS) { WARN("unable to open registry key - 0x%08x\n", lRet); @@ -373,31 +373,31 @@ void MSACM_RegisterAllDrivers(void) if (lRet == ERROR_SUCCESS) { RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, 0, 0, 0, 0, 0, 0, 0); for (i = 0; i < cnt; i++) { - bufLen = sizeof(buf) / sizeof(buf[0]); + bufLen = ARRAY_SIZE(buf); lRet = RegEnumKeyExW(hKey, i, buf, &bufLen, 0, 0, 0, &lastWrite); if (lRet != ERROR_SUCCESS) continue; - if (strncmpiW(buf, msacmW, sizeof(msacmW)/sizeof(msacmW[0]))) continue; + if (strncmpiW(buf, msacmW, ARRAY_SIZE(msacmW))) continue; if (!(name = strchrW(buf, '='))) continue; *name = 0; MSACM_RegisterDriver(buf, name + 1, 0); } i = 0; - cnt = sizeof(valname) / sizeof(*valname); + cnt = ARRAY_SIZE(valname); bufLen = sizeof(buf); while(RegEnumValueW(hKey, i, valname, &cnt, 0, &type, (BYTE*)buf, &bufLen) == ERROR_SUCCESS){ - if(!strncmpiW(valname, msacmW, sizeof(msacmW) / sizeof(*msacmW))) + if (!strncmpiW(valname, msacmW, ARRAY_SIZE(msacmW))) MSACM_RegisterDriver(valname, buf, 0); ++i; } RegCloseKey( hKey ); } - if (GetPrivateProfileSectionW(drv32, buf, sizeof(buf)/sizeof(buf[0]), sys)) + if (GetPrivateProfileSectionW(drv32, buf, ARRAY_SIZE(buf), sys)) { for(s = buf; *s; s += strlenW(s) + 1) { - if (strncmpiW(s, msacmW, sizeof(msacmW)/sizeof(msacmW[0]))) continue; + if (strncmpiW(s, msacmW, ARRAY_SIZE(msacmW))) continue; if (!(name = strchrW(s, '='))) continue; *name = 0; MSACM_RegisterDriver(s, name + 1, 0); diff --git a/dll/win32/msacm32/pcmconverter.c b/dll/win32/msacm32/pcmconverter.c index d52662ac76..dc10f11e7a 100644 --- a/dll/win32/msacm32/pcmconverter.c +++ b/dll/win32/msacm32/pcmconverter.c @@ -71,7 +71,6 @@ static DWORD PCM_drvClose(DWORD dwDevID) return 1; } -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) #define NUM_OF(a,b) ((a)/(b)) /* flags for fdwDriver */ @@ -114,7 +113,7 @@ static DWORD PCM_GetFormatIndex(LPWAVEFORMATEX wfx) unsigned int i; TRACE("(%p)\n", wfx); - for (i = 0; i < NUM_PCM_FORMATS; i++) { + for (i = 0; i < ARRAY_SIZE(PCM_Formats); i++) { if (wfx->nChannels == PCM_Formats[i].nChannels && wfx->nSamplesPerSec == PCM_Formats[i].rate && wfx->wBitsPerSample == PCM_Formats[i].nBits) @@ -985,14 +984,13 @@ static LRESULT PCM_DriverDetails(PACMDRIVERDETAILSW add) add->cFormatTags = 1; add->cFilterTags = 0; add->hicon = NULL; - MultiByteToWideChar( CP_ACP, 0, "MS-PCM", -1, - add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, "Wine PCM converter", -1, - add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1, - add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, "Refer to LICENSE file", -1, - add->szLicensing, sizeof(add->szLicensing)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "MS-PCM", -1, add->szShortName, ARRAY_SIZE(add->szShortName)); + MultiByteToWideChar(CP_ACP, 0, "Wine PCM converter", -1, + add->szLongName, ARRAY_SIZE(add->szLongName)); + MultiByteToWideChar(CP_ACP, 0, "Brought to you by the Wine team...", -1, + add->szCopyright, ARRAY_SIZE(add->szCopyright)); + MultiByteToWideChar(CP_ACP, 0, "Refer to LICENSE file", -1, + add->szLicensing, ARRAY_SIZE(add->szLicensing) ); add->szFeatures[0] = 0; return MMSYSERR_NOERROR; @@ -1035,7 +1033,7 @@ static LRESULT PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); aftd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CONVERTER; - aftd->cStandardFormats = NUM_PCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); aftd->szFormatTag[0] = 0; return MMSYSERR_NOERROR; @@ -1057,7 +1055,7 @@ static LRESULT PCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) } break; case ACM_FORMATDETAILSF_INDEX: - assert(afd->dwFormatIndex < NUM_PCM_FORMATS); + assert(afd->dwFormatIndex < ARRAY_SIZE(PCM_Formats)); afd->pwfx->wFormatTag = WAVE_FORMAT_PCM; afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index bb6ca8c70a..d27f4d3675 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -100,7 +100,7 @@ reactos/dll/win32/mlang # Synced to WineStaging-4.0 reactos/dll/win32/mmdevapi # Synced to WineStaging-4.0 reactos/dll/win32/mpr # Synced to WineStaging-3.17 reactos/dll/win32/mprapi # Synced to WineStaging-3.3 -reactos/dll/win32/msacm32 # Synced to WineStaging-3.3 +reactos/dll/win32/msacm32 # Synced to WineStaging-4.0 reactos/dll/win32/msacm32.drv # Synced to WineStaging-3.3 reactos/dll/win32/msadp32.acm # Synced to WineStaging-3.3 reactos/dll/win32/mscat32 # Synced to WineStaging-3.3

5 years, 7 months

[reactos] 01/01: [MMDEVAPI_WINETEST] Sync with Wine Staging 4.0. CORE-15682

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=127d443593e2bd8368311… commit 127d443593e2bd83683116a3bf7b2e0db5f3776e Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Jan 26 13:17:35 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Jan 26 13:17:35 2019 +0100 [MMDEVAPI_WINETEST] Sync with Wine Staging 4.0. CORE-15682 --- modules/rostests/winetests/mmdevapi/render.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/rostests/winetests/mmdevapi/render.c b/modules/rostests/winetests/mmdevapi/render.c index b1c62f0ccf..7f43eae9e7 100644 --- a/modules/rostests/winetests/mmdevapi/render.c +++ b/modules/rostests/winetests/mmdevapi/render.c @@ -54,7 +54,6 @@ static const unsigned int win_formats[][4] = { {48000, 8, 1}, {48000, 8, 2}, {48000, 16, 1}, {48000, 16, 2}, {96000, 8, 1}, {96000, 8, 2}, {96000, 16, 1}, {96000, 16, 2} }; -#define NB_WIN_FORMATS (sizeof(win_formats)/sizeof(*win_formats)) #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -387,7 +386,7 @@ static void test_formats(AUDCLNT_SHAREMODE mode) fmt.wFormatTag = WAVE_FORMAT_PCM; fmt.cbSize = 0; - for(i = 0; i < NB_WIN_FORMATS; i++) { + for(i = 0; i < ARRAY_SIZE(win_formats); i++) { hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); ok(hr == S_OK, "Activation failed with %08x\n", hr); @@ -951,9 +950,8 @@ static void test_clock(int share) ok(gbsize == bufsize, "BufferSize %u at rate %u\n", gbsize, pwfx->nSamplesPerSec); else - todo_wine - ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024, - "BufferSize %u misfits fragment size %u at rate %u\n", gbsize, fragment, pwfx->nSamplesPerSec); + ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024, + "BufferSize %u misfits fragment size %u at rate %u\n", gbsize, fragment, pwfx->nSamplesPerSec); /* In shared mode, GetCurrentPadding decreases in multiples of * fragment size (i.e. updated only at period ticks), whereas

5 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
30
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 January 2019