Ros-diffs March 2020

ros-diffs@reactos.org

25 participants
156 discussions

[reactos] 05/09: [NDK] Fix RTL_PAGED_CODE macro in user mode

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff045b2dbea893b162a20… commit ff045b2dbea893b162a200daa9d1fec641897659 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Mar 26 16:28:10 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Mar 26 16:39:16 2020 +0100 [NDK] Fix RTL_PAGED_CODE macro in user mode NOP_FUNCTION is defined to "(void)0". Calling : RTL_PAGED_CODE(); in user mode was changed to: (void)0(); As "0" is not callable, this was leading to a compilation error. --- sdk/include/ndk/rtlfuncs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/ndk/rtlfuncs.h b/sdk/include/ndk/rtlfuncs.h index 5b6f878b140..68f43745199 100644 --- a/sdk/include/ndk/rtlfuncs.h +++ b/sdk/include/ndk/rtlfuncs.h @@ -247,7 +247,7 @@ RtlConvertUlongToLuid( // // This macro does nothing in user mode // -#define RTL_PAGED_CODE NOP_FUNCTION +#define RTL_PAGED_CODE() #endif

4 years, 9 months

[reactos] 04/09: [SDK] Fix dummy SEH to always reference the parameter in _SEH2_EXCEPT

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7eac585ebf80a99362615… commit 7eac585ebf80a993626158e48be5bfe338b22476 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Mar 26 16:24:59 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Mar 26 16:39:16 2020 +0100 [SDK] Fix dummy SEH to always reference the parameter in _SEH2_EXCEPT Otherwise, we may have compilation errors if this parameter is the name of a static function. --- sdk/include/reactos/libs/pseh/pseh2.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/libs/pseh/pseh2.h b/sdk/include/reactos/libs/pseh/pseh2.h index 1bbce6949ad..6022638313b 100644 --- a/sdk/include/reactos/libs/pseh/pseh2.h +++ b/sdk/include/reactos/libs/pseh/pseh2.h @@ -44,9 +44,9 @@ extern int _SEH2_VolatileExceptionCode; #define _SEH2_TRY { #define _SEH2_FINALLY } { -#define _SEH2_EXCEPT(...) } if (_SEH2_Volatile0) { +#define _SEH2_EXCEPT(...) } if (_SEH2_Volatile0 || (0 && (__VA_ARGS__))) { #define _SEH2_END } -#define _SEH2_GetExceptionInformation() +#define _SEH2_GetExceptionInformation() 0 #define _SEH2_GetExceptionCode() _SEH2_VolatileExceptionCode #define _SEH2_AbnormalTermination() (0) #define _SEH2_YIELD(STMT_) STMT_

4 years, 9 months

[reactos] 03/09: [CMAKE] Add some -D__ROS_LONG64__ to please gcc x64

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ed186763268516b2c44d… commit 5ed186763268516b2c44de5c8ee7b65affa53a4c Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Mar 26 14:40:39 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Mar 26 16:39:16 2020 +0100 [CMAKE] Add some -D__ROS_LONG64__ to please gcc x64 We can now pass a UINT* to a function wanting a DWORD* --- dll/directx/wine/d3d8/CMakeLists.txt | 1 + dll/directx/wine/d3dcompiler_43/CMakeLists.txt | 1 + dll/directx/wine/d3dx9_36/d3dx9.cmake | 1 + dll/directx/wine/ddraw/CMakeLists.txt | 1 + dll/directx/wine/wined3d/CMakeLists.txt | 1 + dll/win32/comctl32/CMakeLists.txt | 1 + dll/win32/crypt32/CMakeLists.txt | 1 + dll/win32/gdiplus/CMakeLists.txt | 1 + dll/win32/inetmib1/CMakeLists.txt | 2 +- dll/win32/itss/CMakeLists.txt | 2 +- dll/win32/jscript/CMakeLists.txt | 1 + dll/win32/mshtml/CMakeLists.txt | 1 + dll/win32/msi/CMakeLists.txt | 2 +- dll/win32/msxml3/CMakeLists.txt | 1 + dll/win32/ole32/CMakeLists.txt | 1 + dll/win32/oleaut32/CMakeLists.txt | 1 + dll/win32/riched20/CMakeLists.txt | 2 +- dll/win32/scrrun/CMakeLists.txt | 2 +- dll/win32/uxtheme/CMakeLists.txt | 2 +- dll/win32/vbscript/CMakeLists.txt | 2 +- dll/win32/wbemprox/CMakeLists.txt | 2 +- dll/win32/windowscodecs/CMakeLists.txt | 1 + 22 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dll/directx/wine/d3d8/CMakeLists.txt b/dll/directx/wine/d3d8/CMakeLists.txt index d3d49e2e76d..98a24bbc5e6 100644 --- a/dll/directx/wine/d3d8/CMakeLists.txt +++ b/dll/directx/wine/d3d8/CMakeLists.txt @@ -1,6 +1,7 @@ add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -DUSE_WIN32_OPENGL) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) diff --git a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt index a036c7ea3e6..c651fb51b02 100644 --- a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt +++ b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt @@ -1,6 +1,7 @@ add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -DDIRECT3D_VERSION=0x0900) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) diff --git a/dll/directx/wine/d3dx9_36/d3dx9.cmake b/dll/directx/wine/d3dx9_36/d3dx9.cmake index 900a8bfe887..80fb5d807ab 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9.cmake +++ b/dll/directx/wine/d3dx9_36/d3dx9.cmake @@ -32,6 +32,7 @@ function(add_d3dx9_target __version) ${CMAKE_CURRENT_BINARY_DIR}/${module}_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/${module}.def) + add_definitions(-D__ROS_LONG64__) set_module_type(${module} win32dll) add_dependencies(${module} d3d_idl_headers) target_link_libraries(${module} dxguid wine) diff --git a/dll/directx/wine/ddraw/CMakeLists.txt b/dll/directx/wine/ddraw/CMakeLists.txt index 03029bdc8f9..cd501d5d19b 100644 --- a/dll/directx/wine/ddraw/CMakeLists.txt +++ b/dll/directx/wine/ddraw/CMakeLists.txt @@ -1,6 +1,7 @@ add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -DUSE_WIN32_OPENGL) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) diff --git a/dll/directx/wine/wined3d/CMakeLists.txt b/dll/directx/wine/wined3d/CMakeLists.txt index 29b337e3bd1..e00033ea397 100644 --- a/dll/directx/wine/wined3d/CMakeLists.txt +++ b/dll/directx/wine/wined3d/CMakeLists.txt @@ -3,6 +3,7 @@ add_definitions( -D__WINESRC__ -D_USE_MATH_DEFINES -DUSE_WIN32_OPENGL + -D__ROS_LONG64__ -Dcopysignf=_copysignf) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) diff --git a/dll/win32/comctl32/CMakeLists.txt b/dll/win32/comctl32/CMakeLists.txt index f6f22daa569..b47f7646bee 100644 --- a/dll/win32/comctl32/CMakeLists.txt +++ b/dll/win32/comctl32/CMakeLists.txt @@ -2,6 +2,7 @@ add_definitions( -D__WINESRC__ -D_WINE + -D__ROS_LONG64__ -D_COMCTL32_) remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) diff --git a/dll/win32/crypt32/CMakeLists.txt b/dll/win32/crypt32/CMakeLists.txt index b00ef45ed70..5c2a93cb9cc 100644 --- a/dll/win32/crypt32/CMakeLists.txt +++ b/dll/win32/crypt32/CMakeLists.txt @@ -4,6 +4,7 @@ add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600) add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -D_WINE -D_CRYPT32_) diff --git a/dll/win32/gdiplus/CMakeLists.txt b/dll/win32/gdiplus/CMakeLists.txt index 172089123a4..11fe7ee2eed 100644 --- a/dll/win32/gdiplus/CMakeLists.txt +++ b/dll/win32/gdiplus/CMakeLists.txt @@ -1,6 +1,7 @@ add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -D_USE_MATH_DEFINES) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) diff --git a/dll/win32/inetmib1/CMakeLists.txt b/dll/win32/inetmib1/CMakeLists.txt index 08c1b0a83fb..85bbeea6d88 100644 --- a/dll/win32/inetmib1/CMakeLists.txt +++ b/dll/win32/inetmib1/CMakeLists.txt @@ -1,5 +1,5 @@ -add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(inetmib1.dll inetmib1.spec) diff --git a/dll/win32/itss/CMakeLists.txt b/dll/win32/itss/CMakeLists.txt index 63cefe61bfc..92a01fe9b32 100644 --- a/dll/win32/itss/CMakeLists.txt +++ b/dll/win32/itss/CMakeLists.txt @@ -1,5 +1,5 @@ -add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(itss.dll itss.spec) diff --git a/dll/win32/jscript/CMakeLists.txt b/dll/win32/jscript/CMakeLists.txt index 826800bacf9..b6f5c42be10 100644 --- a/dll/win32/jscript/CMakeLists.txt +++ b/dll/win32/jscript/CMakeLists.txt @@ -1,6 +1,7 @@ add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -D_USE_MATH_DEFINES) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) diff --git a/dll/win32/mshtml/CMakeLists.txt b/dll/win32/mshtml/CMakeLists.txt index 08e23da71b4..05ad532c9fb 100644 --- a/dll/win32/mshtml/CMakeLists.txt +++ b/dll/win32/mshtml/CMakeLists.txt @@ -4,6 +4,7 @@ add_definitions(-D_WIN32_WINNT=0x600) add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -DCOM_NO_WINDOWS_H) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt index e4f586db632..10306ca814a 100644 --- a/dll/win32/msi/CMakeLists.txt +++ b/dll/win32/msi/CMakeLists.txt @@ -3,7 +3,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) -add_definitions(-D__WINESRC__ -DMSIRUNMODE=MSIRUNMODE_T) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__ -DMSIRUNMODE=MSIRUNMODE_T) spec2def(msi.dll msi.spec ADD_IMPORTLIB) generate_idl_iids(msiserver.idl) diff --git a/dll/win32/msxml3/CMakeLists.txt b/dll/win32/msxml3/CMakeLists.txt index e61ac57f6cd..3cb5997af3b 100644 --- a/dll/win32/msxml3/CMakeLists.txt +++ b/dll/win32/msxml3/CMakeLists.txt @@ -1,6 +1,7 @@ add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -D_WINE -DLIBXML_STATIC -DCOM_NO_WINDOWS_H) diff --git a/dll/win32/ole32/CMakeLists.txt b/dll/win32/ole32/CMakeLists.txt index c0b2f2007a2..6ef97f4402b 100644 --- a/dll/win32/ole32/CMakeLists.txt +++ b/dll/win32/ole32/CMakeLists.txt @@ -5,6 +5,7 @@ add_definitions(-D_WIN32_WINNT=0x600) add_definitions( -D__WINESRC__ -D_OLE32_ + -D__ROS_LONG64__ -DCOM_NO_WINDOWS_H -DENTRY_PREFIX=OLE32_ -DPROXY_CLSID=CLSID_PSFactoryBuffer diff --git a/dll/win32/oleaut32/CMakeLists.txt b/dll/win32/oleaut32/CMakeLists.txt index 30a18b9baa7..6a1523077ba 100644 --- a/dll/win32/oleaut32/CMakeLists.txt +++ b/dll/win32/oleaut32/CMakeLists.txt @@ -4,6 +4,7 @@ add_definitions(-D_WIN32_WINNT=0x600) add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -DCOM_NO_WINDOWS_H -D_OLEAUT32_ -DPROXY_DELEGATION diff --git a/dll/win32/riched20/CMakeLists.txt b/dll/win32/riched20/CMakeLists.txt index 11e185983e6..b61a49dfa06 100644 --- a/dll/win32/riched20/CMakeLists.txt +++ b/dll/win32/riched20/CMakeLists.txt @@ -1,5 +1,5 @@ -add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(riched20.dll riched20.spec ADD_IMPORTLIB) diff --git a/dll/win32/scrrun/CMakeLists.txt b/dll/win32/scrrun/CMakeLists.txt index 791cb93bb65..7dbc453faa8 100644 --- a/dll/win32/scrrun/CMakeLists.txt +++ b/dll/win32/scrrun/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) -add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) spec2def(scrrun.dll scrrun.spec) add_idl_headers(scrrun_idlheader scrrun.idl) add_typelib(scrrun.idl) diff --git a/dll/win32/uxtheme/CMakeLists.txt b/dll/win32/uxtheme/CMakeLists.txt index 80d31bf44c7..37fefc5b7fa 100644 --- a/dll/win32/uxtheme/CMakeLists.txt +++ b/dll/win32/uxtheme/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) -add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) spec2def(uxtheme.dll uxtheme.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/vbscript/CMakeLists.txt b/dll/win32/vbscript/CMakeLists.txt index b95e66abae6..63b97198d87 100644 --- a/dll/win32/vbscript/CMakeLists.txt +++ b/dll/win32/vbscript/CMakeLists.txt @@ -1,5 +1,5 @@ -add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(vbscript.dll vbscript.spec) diff --git a/dll/win32/wbemprox/CMakeLists.txt b/dll/win32/wbemprox/CMakeLists.txt index 3f48d3e6d5c..5d477dfe45d 100644 --- a/dll/win32/wbemprox/CMakeLists.txt +++ b/dll/win32/wbemprox/CMakeLists.txt @@ -2,7 +2,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(wbemprox.dll wbemprox.spec) diff --git a/dll/win32/windowscodecs/CMakeLists.txt b/dll/win32/windowscodecs/CMakeLists.txt index 611334ac2d5..e17a657c213 100644 --- a/dll/win32/windowscodecs/CMakeLists.txt +++ b/dll/win32/windowscodecs/CMakeLists.txt @@ -1,6 +1,7 @@ add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL)

4 years, 9 months

[reactos] 02/09: [ISAPNP] Report DMA channels

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7cda1ed2f52d47ecd9b70… commit 7cda1ed2f52d47ecd9b708a982ceab9cb25a9986 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Mar 22 23:23:04 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Mar 26 16:36:23 2020 +0100 [ISAPNP] Report DMA channels --- drivers/bus/isapnp/hardware.c | 22 +++++++++++- drivers/bus/isapnp/isapnp.c | 79 ++++++++++++++++++++++++++++++++++++++++++- drivers/bus/isapnp/isapnp.h | 6 ++++ drivers/bus/isapnp/isapnphw.h | 6 ++++ 4 files changed, 111 insertions(+), 2 deletions(-) diff --git a/drivers/bus/isapnp/hardware.c b/drivers/bus/isapnp/hardware.c index 36638e0632d..8b84038ef8a 100644 --- a/drivers/bus/isapnp/hardware.c +++ b/drivers/bus/isapnp/hardware.c @@ -199,6 +199,16 @@ ReadIrqType( return ReadByte(ReadDataPort, ISAPNP_IRQTYPE(Index)); } +static +inline +USHORT +ReadDmaChannel( + IN PUCHAR ReadDataPort, + IN USHORT Index) +{ + return ReadByte(ReadDataPort, ISAPNP_DMACHANNEL(Index)); +} + static inline VOID @@ -305,7 +315,7 @@ ReadTags( BOOLEAN res = FALSE; PVOID Buffer; USHORT Tag, TagLen, MaxLen; - ULONG NumberOfIo = 0, NumberOfIrq = 0; + ULONG NumberOfIo = 0, NumberOfIrq = 0, NumberOfDma = 0; LogDev += 1; @@ -344,6 +354,12 @@ ReadTags( Buffer = &LogDevice->Io[NumberOfIo].Description; NumberOfIo++; } + else if (Tag == ISAPNP_TAG_DMA && NumberOfDma < ARRAYSIZE(LogDevice->Dma)) + { + MaxLen = sizeof(LogDevice->Dma[NumberOfDma].Description); + Buffer = &LogDevice->Dma[NumberOfDma].Description; + NumberOfDma++; + } else if (LogDev == 0) { DPRINT1("Found unknown tag 0x%x (len %d)\n", Tag, TagLen); @@ -552,6 +568,10 @@ ProbeIsaPnpBus( LogDevice->Irq[i].CurrentNo = ReadIrqNo(FdoExt->ReadDataPort, i); LogDevice->Irq[i].CurrentType = ReadIrqType(FdoExt->ReadDataPort, i); } + for (i = 0; i < ARRAYSIZE(LogDevice->Dma); i++) + { + LogDevice->Dma[i].CurrentChannel = ReadDmaChannel(FdoExt->ReadDataPort, i); + } DPRINT1("Detected ISA PnP device - VID: '%3s' PID: 0x%x SN: 0x%08x IoBase: 0x%x IRQ:0x%x\n", LogDevice->VendorId, LogDevice->ProdId, LogDevice->SerialNumber, LogDevice->Io[0].CurrentBase, LogDevice->Irq[0].CurrentNo); diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index f810532921e..913721b3acd 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -145,10 +145,12 @@ IsaFdoCreateRequirements( { PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice; RTL_BITMAP IrqBitmap[ARRAYSIZE(LogDev->Irq)]; + RTL_BITMAP DmaBitmap[ARRAYSIZE(LogDev->Dma)]; ULONG IrqData[ARRAYSIZE(LogDev->Irq)]; + ULONG DmaData[ARRAYSIZE(LogDev->Dma)]; ULONG ResourceCount = 0; ULONG ListSize, i, j; - BOOLEAN FirstIrq = TRUE; + BOOLEAN FirstIrq = TRUE, FirstDma = TRUE; PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; PIO_RESOURCE_DESCRIPTOR Descriptor; @@ -174,6 +176,14 @@ IsaFdoCreateRequirements( } if (ResourceCount == 0) return STATUS_SUCCESS; + for (i = 0; i < ARRAYSIZE(LogDev->Irq); i++) + { + if (!LogDev->Dma[i].Description.Mask) + break; + DmaData[i] = LogDev->Dma[i].Description.Mask; + RtlInitializeBitMap(&DmaBitmap[i], &DmaData[i], 8); + ResourceCount += RtlNumberOfSetBits(&DmaBitmap[i]); + } /* Allocate memory to store requirements */ ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) @@ -243,6 +253,41 @@ IsaFdoCreateRequirements( } } } + for (i = 0; i < ARRAYSIZE(LogDev->Dma); i++) + { + if (!LogDev->Dma[i].Description.Mask) + break; + DPRINT("Device.Dma[%d].Mask = 0x%02x\n", i, LogDev->Dma[i].Description.Mask); + DPRINT("Device.Dma[%d].Information = 0x%02x\n", i, LogDev->Dma[i].Description.Information); + for (j = 0; j < 8; j++) + { + if (!RtlCheckBit(&DmaBitmap[i], j)) + continue; + if (FirstDma) + FirstDma = FALSE; + else + Descriptor->Option = IO_RESOURCE_ALTERNATIVE; + Descriptor->Type = CmResourceTypeDma; + switch (LogDev->Dma[i].Description.Information & 0x3) + { + case 0x0: Descriptor->Flags |= CM_RESOURCE_DMA_8; break; + case 0x1: Descriptor->Flags |= CM_RESOURCE_DMA_8_AND_16; break; + case 0x2: Descriptor->Flags |= CM_RESOURCE_DMA_16; break; + default: break; + } + if (LogDev->Dma[i].Description.Information & 0x4) + Descriptor->Flags |= CM_RESOURCE_DMA_BUS_MASTER; + switch ((LogDev->Dma[i].Description.Information >> 5) & 0x3) + { + case 0x1: Descriptor->Flags |= CM_RESOURCE_DMA_TYPE_A; break; + case 0x2: Descriptor->Flags |= CM_RESOURCE_DMA_TYPE_B; break; + case 0x3: Descriptor->Flags |= CM_RESOURCE_DMA_TYPE_F; break; + default: break; + } + Descriptor->u.Dma.MinimumChannel = Descriptor->u.Dma.MaximumChannel = j; + Descriptor++; + } + } PdoExt->RequirementsList = RequirementsList; return STATUS_SUCCESS; @@ -275,6 +320,13 @@ IsaFdoCreateResources( else break; } + for (i = 0; i < ARRAYSIZE(LogDev->Dma); i++) + { + if (LogDev->Dma[i].CurrentChannel != 4) + ResourceCount++; + else + break; + } if (ResourceCount == 0) return STATUS_SUCCESS; @@ -323,6 +375,31 @@ IsaFdoCreateResources( Descriptor->u.Interrupt.Vector = LogDev->Irq[i].CurrentNo; Descriptor->u.Interrupt.Affinity = -1; } + for (i = 0; i < ARRAYSIZE(LogDev->Dma); i++) + { + if (LogDev->Dma[i].CurrentChannel == 4) + continue; + Descriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[ResourceCount++]; + Descriptor->Type = CmResourceTypeDma; + Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; + switch (LogDev->Dma[i].Description.Information & 0x3) + { + case 0x0: Descriptor->Flags |= CM_RESOURCE_DMA_8; break; + case 0x1: Descriptor->Flags |= CM_RESOURCE_DMA_8 | CM_RESOURCE_DMA_16; break; + case 0x2: Descriptor->Flags |= CM_RESOURCE_DMA_16; break; + default: break; + } + if (LogDev->Dma[i].Description.Information & 0x4) + Descriptor->Flags |= CM_RESOURCE_DMA_BUS_MASTER; + switch ((LogDev->Dma[i].Description.Information >> 5) & 0x3) + { + case 0x1: Descriptor->Flags |= CM_RESOURCE_DMA_TYPE_A; break; + case 0x2: Descriptor->Flags |= CM_RESOURCE_DMA_TYPE_B; break; + case 0x3: Descriptor->Flags |= CM_RESOURCE_DMA_TYPE_F; break; + default: break; + } + Descriptor->u.Dma.Channel = LogDev->Dma[i].CurrentChannel; + } PdoExt->ResourceList = ResourceList; PdoExt->ResourceListSize = ListSize; diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index ea7fca25cb6..ed1d81b4bc9 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -27,6 +27,11 @@ typedef struct _ISAPNP_IRQ { ISAPNP_IRQ_DESCRIPTION Description; } ISAPNP_IRQ, *PISAPNP_IRQ; +typedef struct _ISAPNP_DMA { + UCHAR CurrentChannel; + ISAPNP_DMA_DESCRIPTION Description; +} ISAPNP_DMA, *PISAPNP_DMA; + typedef struct _ISAPNP_LOGICAL_DEVICE { PDEVICE_OBJECT Pdo; ISAPNP_LOGDEVID LogDevId; @@ -35,6 +40,7 @@ typedef struct _ISAPNP_LOGICAL_DEVICE { ULONG SerialNumber; ISAPNP_IO Io[8]; ISAPNP_IRQ Irq[2]; + ISAPNP_DMA Dma[2]; UCHAR CSN; UCHAR LDN; LIST_ENTRY ListEntry; diff --git a/drivers/bus/isapnp/isapnphw.h b/drivers/bus/isapnp/isapnphw.h index 86a55073615..9f1cc0c9cab 100644 --- a/drivers/bus/isapnp/isapnphw.h +++ b/drivers/bus/isapnp/isapnphw.h @@ -30,6 +30,7 @@ extern "C" { #define ISAPNP_IOBASE(n) (0x60 + ((n)*2)) #define ISAPNP_IRQNO(n) (0x70 + ((n)*2)) #define ISAPNP_IRQTYPE(n) (0x71 + ((n) * 2)) +#define ISAPNP_DMACHANNEL(n) (0x74 + (n)) #define ISAPNP_CONFIG_RESET (1 << 0) #define ISAPNP_CONFIG_WAIT_FOR_KEY (1 << 1) @@ -116,6 +117,11 @@ typedef struct _ISAPNP_IRQ_DESCRIPTION { UCHAR Information; } ISAPNP_IRQ_DESCRIPTION; +typedef struct _ISAPNP_DMA_DESCRIPTION { + UCHAR Mask; + UCHAR Information; +} ISAPNP_DMA_DESCRIPTION; + #include <poppack.h> #ifdef __cplusplus

4 years, 9 months

[reactos] 01/09: [ISAPNP] Fix reporting of devices with hexadecimal productId

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb66324d7c66fe753627b… commit eb66324d7c66fe753627b03969a426617a385aeb Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Mar 22 23:22:48 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Mar 26 16:36:22 2020 +0100 [ISAPNP] Fix reporting of devices with hexadecimal productId --- drivers/bus/isapnp/isapnp.c | 6 +++--- drivers/bus/isapnp/pdo.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index e8862345cc0..f810532921e 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -80,7 +80,7 @@ IsaFdoCreateDeviceIDs( TempString.MaximumLength / sizeof(WCHAR), &End, NULL, 0, - L"ISAPNP\\%3S%04X", + L"ISAPNP\\%.3S%04x", LogDev->VendorId, LogDev->ProdId); if (!NT_SUCCESS(Status)) @@ -98,8 +98,8 @@ IsaFdoCreateDeviceIDs( TempString.MaximumLength / sizeof(WCHAR), &End, NULL, 0, - L"ISAPNP\\%3S%04X@" - L"*%3S%04X@", + L"ISAPNP\\%.3S%04x@" + L"*%.3S%04x@", LogDev->VendorId, LogDev->ProdId, LogDev->VendorId, diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 7cd8c7d3812..6651cc54710 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -59,7 +59,7 @@ IsaPdoQueryCapabilities( if (LogDev) { - DeviceCapabilities->UniqueID = LogDev->SerialNumber != 0xffffffff; + DeviceCapabilities->UniqueID = TRUE; DeviceCapabilities->Address = LogDev->CSN; } else

4 years, 9 months

[reactos] 01/01: [USERENV] sq-AL: Fix '%SistemDrive%' typo (#2469)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1edfddf07a7ef360eb3d5… commit 1edfddf07a7ef360eb3d5409a67217bd2d36bb0b Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Mar 26 07:28:09 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 26 07:28:09 2020 +0100 [USERENV] sq-AL: Fix '%SistemDrive%' typo (#2469) Not to translate! CORE-16762 --- dll/win32/userenv/lang/sq-AL.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/userenv/lang/sq-AL.rc b/dll/win32/userenv/lang/sq-AL.rc index 763a92b8cc6..5aab4ba11f0 100644 --- a/dll/win32/userenv/lang/sq-AL.rc +++ b/dll/win32/userenv/lang/sq-AL.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL /* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN - IDS_PROFILEPATH "%SistemDrive%\\Dokumente dhe Cilësime" + IDS_PROFILEPATH "%SystemDrive%\\Dokumente dhe Cilësime" IDS_APPDATA "Aplikation Data" IDS_DESKTOP "Desktop" IDS_FAVORITES "Preferuara"

4 years, 9 months

[reactos] 01/01: [BOOTDATA] Add 0845 (bn-bd) language (#2467)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7209755748bc934bda71… commit d7209755748bc934bda71f35149cea3eb2d80215 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Mar 26 02:05:05 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 26 02:05:05 2020 +0100 [BOOTDATA] Add 0845 (bn-bd) language (#2467) In accordance with the NLS value specified in base/setup/lib/lang/bn-BD.h CORE-16766 --- boot/bootdata/hivesys.inf | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 5b45a5fa745..1c899493935 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1127,6 +1127,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0445",0x00000000,"l_intl.n HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0456",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","048f",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0490",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0845",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","Default",0x00000000,"0409" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","InstallLanguage",0x00000000,"0409"

4 years, 9 months

[reactos] 01/01: [PING] Do not abort (as OoM) when request size = 0

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94f6db22d1c5a9e54eede… commit 94f6db22d1c5a9e54eede4abc1ddd9ab729bede2 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Mar 7 13:20:28 2020 +0100 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Wed Mar 25 08:52:28 2020 +0300 [PING] Do not abort (as OoM) when request size = 0 --- base/applications/network/ping/ping.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/base/applications/network/ping/ping.c b/base/applications/network/ping/ping.c index 435fe03f55b..17afdfc5738 100644 --- a/base/applications/network/ping/ping.c +++ b/base/applications/network/ping/ping.c @@ -418,19 +418,22 @@ static void Ping(void) { - PVOID ReplyBuffer = NULL; + PVOID ReplyBuffer; PVOID SendBuffer = NULL; DWORD ReplySize = 0; DWORD Status; - SendBuffer = malloc(RequestSize); - if (SendBuffer == NULL) + if (RequestSize != 0) { - ConResPrintf(StdErr, IDS_NO_RESOURCES); - exit(1); - } + SendBuffer = malloc(RequestSize); + if (SendBuffer == NULL) + { + ConResPrintf(StdErr, IDS_NO_RESOURCES); + exit(1); + } - ZeroMemory(SendBuffer, RequestSize); + ZeroMemory(SendBuffer, RequestSize); + } if (Family == AF_INET6) {

4 years, 9 months

[reactos] 01/01: [WIN32K] Fix bounds calculation when drawing with a pen

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2928084e2f86f1b2b3921… commit 2928084e2f86f1b2b39214dfaf872e76c0561650 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Mar 24 11:20:58 2020 +0000 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Mar 24 14:39:27 2020 +0100 [WIN32K] Fix bounds calculation when drawing with a pen --- win32ss/gdi/ntgdi/line.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/gdi/ntgdi/line.c b/win32ss/gdi/ntgdi/line.c index 5274fa2c228..c922995925d 100644 --- a/win32ss/gdi/ntgdi/line.c +++ b/win32ss/gdi/ntgdi/line.c @@ -25,16 +25,16 @@ AddPenLinesBounds(PDC dc, int count, POINT *points) pbrLine = dc->dclevel.pbrLine; ASSERT(pbrLine); - lWidth = pbrLine->lWidth; + lWidth = 0; // Setup bounds bounds.left = bounds.top = INT_MAX; bounds.right = bounds.bottom = INT_MIN; - if (((pbrLine->ulPenStyle & PS_TYPE_MASK) & PS_GEOMETRIC) || lWidth > 1) + if (((pbrLine->ulPenStyle & PS_TYPE_MASK) & PS_GEOMETRIC) || (pbrLine->lWidth > 1)) { /* Windows uses some heuristics to estimate the distance from the point that will be painted */ - lWidth = lWidth + 2; + lWidth = pbrLine->lWidth + 2; endcap = (PS_ENDCAP_MASK & pbrLine->ulPenStyle); join = (PS_JOIN_MASK & pbrLine->ulPenStyle); if (join == PS_JOIN_MITER)

4 years, 9 months

[reactos] 01/01: [STORPROP] Add storprop.dll and implement the DiskClassInstaller stub

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38788a2b0794eacd10fca… commit 38788a2b0794eacd10fca7febf450904b7d5a572 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 22 16:37:48 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 22 16:40:35 2020 +0100 [STORPROP] Add storprop.dll and implement the DiskClassInstaller stub --- dll/win32/CMakeLists.txt | 1 + dll/win32/storprop/CMakeLists.txt | 13 +++++++++ dll/win32/storprop/resource.h | 1 + dll/win32/storprop/storprop.c | 58 +++++++++++++++++++++++++++++++++++++++ dll/win32/storprop/storprop.rc | 12 ++++++++ dll/win32/storprop/storprop.spec | 10 +++++++ media/inf/disk.inf | 11 ++++++-- 7 files changed, 104 insertions(+), 2 deletions(-) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index 015003826d4..d8ecf5ca50f 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -201,6 +201,7 @@ add_subdirectory(srclient) add_subdirectory(stdole2.tlb) add_subdirectory(stdole32.tlb) add_subdirectory(sti) +add_subdirectory(storprop) add_subdirectory(streamci) add_subdirectory(sxs) add_subdirectory(syssetup) diff --git a/dll/win32/storprop/CMakeLists.txt b/dll/win32/storprop/CMakeLists.txt new file mode 100644 index 00000000000..3244c669a6d --- /dev/null +++ b/dll/win32/storprop/CMakeLists.txt @@ -0,0 +1,13 @@ + +spec2def(storprop.dll storprop.spec) + +add_library(storprop MODULE + storprop.c + storprop.rc + ${CMAKE_CURRENT_BINARY_DIR}/storprop_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/storprop.def) + +set_module_type(storprop win32dll UNICODE) +target_link_libraries(storprop wine) +add_importlibs(storprop setupapi advapi32 msvcrt kernel32 ntdll) +add_cd_file(TARGET storprop DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/storprop/resource.h b/dll/win32/storprop/resource.h new file mode 100644 index 00000000000..6f70f09beec --- /dev/null +++ b/dll/win32/storprop/resource.h @@ -0,0 +1 @@ +#pragma once diff --git a/dll/win32/storprop/storprop.c b/dll/win32/storprop/storprop.c new file mode 100644 index 00000000000..09149c8d795 --- /dev/null +++ b/dll/win32/storprop/storprop.c @@ -0,0 +1,58 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Storage device properties + * COPYRIGHT: 2020 Eric Kohl (eric.kohl(a)reactos.org) + */ + +#define WIN32_NO_STATUS +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winuser.h> +#include <commctrl.h> +#include <setupapi.h> + +#define NDEBUG +#include <debug.h> + +HINSTANCE hInstance = NULL; + +DWORD +WINAPI +DiskClassInstaller( + _In_ DI_FUNCTION InstallFunction, + _In_ HDEVINFO DeviceInfoSet, + _In_ PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + DPRINT("DiskClassInstaller(%u %p %p)\n", + InstallFunction, DeviceInfoSet, DeviceInfoData); + + return ERROR_DI_DO_DEFAULT; +} + + +BOOL +WINAPI +DllMain( + _In_ HINSTANCE hinstDll, + _In_ DWORD dwReason, + _In_ LPVOID reserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDll); + hInstance = hinstDll; + break; + + case DLL_PROCESS_DETACH: + hInstance = NULL; + break; + } + + return TRUE; +} + +/* EOF */ diff --git a/dll/win32/storprop/storprop.rc b/dll/win32/storprop/storprop.rc new file mode 100644 index 00000000000..594b67b6666 --- /dev/null +++ b/dll/win32/storprop/storprop.rc @@ -0,0 +1,12 @@ +#include <windef.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Storage device properties" +#define REACTOS_STR_INTERNAL_NAME "storprop" +#define REACTOS_STR_ORIGINAL_FILENAME "storprop.dll" +#include <reactos/version.rc> + diff --git a/dll/win32/storprop/storprop.spec b/dll/win32/storprop/storprop.spec new file mode 100644 index 00000000000..f04a9ac8020 --- /dev/null +++ b/dll/win32/storprop/storprop.spec @@ -0,0 +1,10 @@ +@ stub CdromDisableDigitalPlayback +@ stub CdromEnableDigitalPlayback +@ stub CdromIsDigitalPlaybackEnabled +@ stdcall DiskClassInstaller(long ptr ptr) +@ stdcall DllMain(ptr long ptr) +@ stub DvdClassInstaller +@ stub DvdLauncher +@ stub DvdPropPageProvider +@ stub IdePropPageProvider +@ stub VolumePropPageProvider diff --git a/media/inf/disk.inf b/media/inf/disk.inf index 72d08fded36..e84f39822f7 100644 --- a/media/inf/disk.inf +++ b/media/inf/disk.inf @@ -12,14 +12,16 @@ Provider = %ReactOS% DriverVer = 10/19/1999,5.00.2157.1 [DestinationDirs] -DefaultDestDir = 12 +disk_CopyFiles.NT = 12 +storprop_CopyFiles.NT = 11 [ClassInstall32.NT] AddReg = DiskClass.NT.AddReg +Copyfiles = storprop_CopyFiles.NT [DiskClass.NT.AddReg] HKR, , , 0, %DiskClassName% -;HKR, , Installer32, 0, "StorProp.dll,DiskClassInstaller" +HKR, , Installer32, 0, "storprop.dll,DiskClassInstaller" HKR, , Icon, 0, "-53" HKR, , NoInstallClass, 0, 1 HKR, , SilentInstall, 0, 1 @@ -49,6 +51,11 @@ ServiceBinary = %12%\disk.sys [disk_CopyFiles.NT] disk.sys +;---------------------------- DISK INSTALLER ---------------------------- + +[storprop_CopyFiles.NT] +storprop.dll + ;-------------------------------- STRINGS ------------------------------- [Strings]

4 years, 9 months

← Newer
1
2
3
4
5
6
7
8
9
...
16
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 March 2020