Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 06/11: [VGAMP] Correctly check and report legacy resources (VGA I/O ports and memory)
by Hervé Poussineau 14 Oct '21

14 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=951dc66c6695cceebaeda… commit 951dc66c6695cceebaeda16b874847d43e263cda Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Oct 7 21:40:13 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Oct 14 23:39:30 2021 +0200 [VGAMP] Correctly check and report legacy resources (VGA I/O ports and memory) As we are a non PNP driver, the call chain will be DriverEntry -> VidePortInitialize -> VideoPortFindAdapter -> HwFindAdapter. If legacy resources are available, we will fail VGAFindAdapter, so DriverEntry will fail, so vgamp.sys driver won't be used. CORE-17789 --- win32ss/drivers/miniport/vga/vgamp.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/win32ss/drivers/miniport/vga/vgamp.c b/win32ss/drivers/miniport/vga/vgamp.c index f4cd3a26c41..4b892cc281e 100644 --- a/win32ss/drivers/miniport/vga/vgamp.c +++ b/win32ss/drivers/miniport/vga/vgamp.c @@ -10,6 +10,13 @@ #include <dderror.h> #include <devioctl.h> +VIDEO_ACCESS_RANGE VGAAccessRange[] = +{ + { {{0x3b0}}, 0x3bb - 0x3b0 + 1, 1, 0, 0 }, + { {{0x3c0}}, 0x3df - 0x3c0 + 1, 1, 0, 0 }, + { {{0xa0000}}, 0x20000, 0, 0, 0 }, +}; + // ------------------------------------------------------- Public Interface // DriverEntry @@ -45,6 +52,8 @@ DriverEntry(IN PVOID Context1, /* InitData.HwInterrupt = VGAInterrupt; */ InitData.HwResetHw = VGAResetHw; /* InitData.HwTimer = VGATimer; */ + InitData.HwLegacyResourceList = VGAAccessRange; + InitData.HwLegacyResourceCount = ARRAYSIZE(VGAAccessRange); return VideoPortInitialize(Context1, Context2, &InitData, NULL); } @@ -82,12 +91,21 @@ VGAFindAdapter(PVOID DeviceExtension, PVIDEO_PORT_CONFIG_INFO ConfigInfo, PUCHAR Again) { - /* FIXME: Determine if the adapter is present */ - *Again = FALSE; + VP_STATUS Status; + + /* FIXME: Determine if the adapter is present */ + *Again = FALSE; + + if (ConfigInfo->Length < sizeof(VIDEO_PORT_CONFIG_INFO)) + return ERROR_INVALID_PARAMETER; + + Status = VideoPortVerifyAccessRanges(DeviceExtension, ARRAYSIZE(VGAAccessRange), VGAAccessRange); + if (Status != NO_ERROR) + return Status; - ConfigInfo->VdmPhysicalVideoMemoryAddress.QuadPart = 0xa000; - ConfigInfo->VdmPhysicalVideoMemoryLength = 0x2000; - return NO_ERROR; + ConfigInfo->VdmPhysicalVideoMemoryAddress = VGAAccessRange[2].RangeStart; + ConfigInfo->VdmPhysicalVideoMemoryLength = VGAAccessRange[2].RangeLength; + return NO_ERROR; /* FIXME: Claim any necessary memory/IO resources for the adapter */ /* FIXME: Map resources into system memory for the adapter */

1 0

[reactos] 05/11: [VBEMP] Correctly report legacy resources (VGA I/O ports and memory)
by Hervé Poussineau 14 Oct '21

14 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6dd94572e5eb4bdfe529c… commit 6dd94572e5eb4bdfe529c807e341b3c149af5e08 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Oct 7 21:39:06 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Oct 14 23:39:30 2021 +0200 [VBEMP] Correctly report legacy resources (VGA I/O ports and memory) CORE-17789 --- win32ss/drivers/miniport/vbe/vbemp.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/win32ss/drivers/miniport/vbe/vbemp.c b/win32ss/drivers/miniport/vbe/vbemp.c index 68692647f6e..c577902366d 100644 --- a/win32ss/drivers/miniport/vbe/vbemp.c +++ b/win32ss/drivers/miniport/vbe/vbemp.c @@ -36,6 +36,13 @@ #define LOWORD(l) ((USHORT)((ULONG_PTR)(l))) #define HIWORD(l) ((USHORT)(((ULONG_PTR)(l)>>16)&0xFFFF)) +VIDEO_ACCESS_RANGE VBEAccessRange[] = +{ + { {{0x3b0}}, 0x3bb - 0x3b0 + 1, 1, 1, 0 }, + { {{0x3c0}}, 0x3df - 0x3c0 + 1, 1, 1, 0 }, + { {{0xa0000}}, 0x20000, 0, 1, 0 }, +}; + /* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ ULONG NTAPI @@ -53,6 +60,8 @@ DriverEntry(IN PVOID Context1, IN PVOID Context2) InitData.HwSetPowerState = VBESetPowerState; InitData.HwGetVideoChildDescriptor = VBEGetVideoChildDescriptor; InitData.HwDeviceExtensionSize = sizeof(VBE_DEVICE_EXTENSION); + InitData.HwLegacyResourceList = VBEAccessRange; + InitData.HwLegacyResourceCount = ARRAYSIZE(VBEAccessRange); return VideoPortInitialize(Context1, Context2, &InitData, NULL); } @@ -76,8 +85,11 @@ VBEFindAdapter( if (VideoPortIsNoVesa()) return ERROR_DEV_NOT_EXIST; - ConfigInfo->VdmPhysicalVideoMemoryAddress.QuadPart = 0xa000; - ConfigInfo->VdmPhysicalVideoMemoryLength = 0x2000; + if (ConfigInfo->Length < sizeof(VIDEO_PORT_CONFIG_INFO)) + return ERROR_INVALID_PARAMETER; + + ConfigInfo->VdmPhysicalVideoMemoryAddress = VBEAccessRange[2].RangeStart; + ConfigInfo->VdmPhysicalVideoMemoryLength = VBEAccessRange[2].RangeLength; return NO_ERROR; }

1 0

[reactos] 04/11: [VBEMP] Fail HwInitialize (ie IRP_MJ_CREATE) when /NOVESA switch is present
by Hervé Poussineau 14 Oct '21

14 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3379de392489da92ed63f… commit 3379de392489da92ed63f84bba93a96e03a7ef9e Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Oct 13 08:02:01 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Oct 14 23:39:30 2021 +0200 [VBEMP] Fail HwInitialize (ie IRP_MJ_CREATE) when /NOVESA switch is present In that case, we want a simple VGA driver to drive the graphic adapter. CORE-17789 --- win32ss/drivers/miniport/vbe/vbemp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/win32ss/drivers/miniport/vbe/vbemp.c b/win32ss/drivers/miniport/vbe/vbemp.c index 14eaac91061..68692647f6e 100644 --- a/win32ss/drivers/miniport/vbe/vbemp.c +++ b/win32ss/drivers/miniport/vbe/vbemp.c @@ -180,6 +180,13 @@ VBEInitialize(PVOID HwDeviceExtension) ULONG CurrentMode; PVBE_MODEINFO VbeModeInfo; + if (VideoPortIsNoVesa()) + { + VBEDeviceExtension->Int10Interface.Version = 0; + VBEDeviceExtension->Int10Interface.Size = 0; + return FALSE; + } + /* * Get the Int 10 interface that we will use for allocating real * mode memory and calling the video BIOS.

1 0

[reactos] 03/11: [ISAPNP] Generate a name for PDO, as required
by Hervé Poussineau 14 Oct '21

14 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac13f37d0a4a0cff9096c… commit ac13f37d0a4a0cff9096c22be12e2ea6e57c5d01 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Oct 7 20:53:38 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Oct 14 23:39:30 2021 +0200 [ISAPNP] Generate a name for PDO, as required --- drivers/bus/isapnp/isapnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index 877d69bf5a5..0ff17876e75 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -1246,7 +1246,7 @@ IsaPnpCreateReadPortDO( sizeof(ISAPNP_PDO_EXTENSION), NULL, FILE_DEVICE_CONTROLLER, - FILE_DEVICE_SECURE_OPEN, + FILE_DEVICE_SECURE_OPEN | FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &FdoExt->ReadPortPdo); if (!NT_SUCCESS(Status))

1 0

[reactos] 02/11: [NTOS:IO] Remove final NULL char of PDO name before writing to registry
by Hervé Poussineau 14 Oct '21

14 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a86c3794a6d47bd5c9f4c… commit a86c3794a6d47bd5c9f4c06eacd6eecfc49181b4 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Oct 7 20:50:38 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Oct 14 23:39:30 2021 +0200 [NTOS:IO] Remove final NULL char of PDO name before writing to registry Otherwise, if a PDO has no name (bad!), you'll see two "(Default)" entries in HKLM\HARDWARE\RESOURCEMAP\PnP Manager\PnpManager --- ntoskrnl/io/pnpmgr/pnpres.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/pnpres.c b/ntoskrnl/io/pnpmgr/pnpres.c index 1cdf1d85b84..57eabfe69c2 100644 --- a/ntoskrnl/io/pnpmgr/pnpres.c +++ b/ntoskrnl/io/pnpmgr/pnpres.c @@ -915,7 +915,7 @@ IopUpdateResourceMap( ASSERT(FALSE); } - NameU.Length = (USHORT)OldLength; + NameU.Length = (USHORT)OldLength - sizeof(UNICODE_NULL); /* Remove final NULL */ RtlAppendUnicodeStringToString(&NameU, &RawSuffix); @@ -933,7 +933,7 @@ IopUpdateResourceMap( } /* "Remove" the suffix by setting the length back to what it used to be */ - NameU.Length = (USHORT)OldLength; + NameU.Length = (USHORT)OldLength - sizeof(UNICODE_NULL); /* Remove final NULL */ RtlAppendUnicodeStringToString(&NameU, &TranslatedSuffix);

1 0

[reactos] 01/11: [DEVMGR] Display current assigned resources, instead of boot resources
by Hervé Poussineau 14 Oct '21

14 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=500f00de6a38a379cdfde… commit 500f00de6a38a379cdfdea3b805150620a6d58ef Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Oct 7 19:31:27 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Oct 14 23:39:30 2021 +0200 [DEVMGR] Display current assigned resources, instead of boot resources --- dll/win32/devmgr/properties/hwresource.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/devmgr/properties/hwresource.cpp b/dll/win32/devmgr/properties/hwresource.cpp index a3e1a88b65e..6803c716431 100644 --- a/dll/win32/devmgr/properties/hwresource.cpp +++ b/dll/win32/devmgr/properties/hwresource.cpp @@ -363,7 +363,7 @@ GetResourceList( CStringW keyName = L"SYSTEM\\CurrentControlSet\\Enum\\"; keyName += pszDeviceID; - keyName += L"\\LogConf"; + keyName += L"\\Control"; dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, keyName, 0, KEY_READ, &hKey); if (dwError != ERROR_SUCCESS) @@ -373,7 +373,7 @@ GetResourceList( } dwSize = 0; - RegQueryValueExW(hKey, L"BootConfig", NULL, NULL, NULL, &dwSize); + RegQueryValueExW(hKey, L"AllocConfig", NULL, NULL, NULL, &dwSize); if (dwSize == 0) goto done; @@ -381,7 +381,7 @@ GetResourceList( if (pResourceList == NULL) goto done; - dwError = RegQueryValueExW(hKey, L"BootConfig", NULL, NULL, (LPBYTE)pResourceList, &dwSize); + dwError = RegQueryValueExW(hKey, L"AllocConfig", NULL, NULL, (LPBYTE)pResourceList, &dwSize); if (dwError != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, pResourceList);

1 0

[reactos] 01/01: [SHELL32] Bypass OpenWith for Delete and F2 (Rename) Keys (#4032) CORE-17810
by Doug Lyons 14 Oct '21

14 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cee171f5d20c0d3c26837… commit cee171f5d20c0d3c268372085ca4f32bc44d6740 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Thu Oct 14 16:03:53 2021 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 14 23:03:53 2021 +0200 [SHELL32] Bypass OpenWith for Delete and F2 (Rename) Keys (#4032) CORE-17810 Logspam started during 0.4.9-dev'ing when zipfldr got committed, logspam became much worse by 0.4.10-dev-599-g 932df378bf35146a56c796bec36c5c689109fbd6 But the actual bug of 'calling those functions when not needed' is much older than that. I do intend to port this improvement back into older rls-branches. --- dll/win32/shell32/CDefView.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 00e310397f4..1a15523491d 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1573,19 +1573,21 @@ cleanup: LRESULT CDefView::OnExplorerCommand(UINT uCommand, BOOL bUseSelection) { HRESULT hResult; - HMENU hMenu; - - hMenu = CreatePopupMenu(); - if (!hMenu) - return 0; + HMENU hMenu = NULL; hResult = GetItemObject( bUseSelection ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu, &m_pCM)); if (FAILED_UNEXPECTEDLY( hResult)) goto cleanup; + if ((uCommand != FCIDM_SHVIEW_DELETE) && (uCommand != FCIDM_SHVIEW_RENAME)) + { + hMenu = CreatePopupMenu(); + if (!hMenu) + return 0; - hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); - if (FAILED_UNEXPECTEDLY( hResult)) - goto cleanup; + hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); + if (FAILED_UNEXPECTEDLY(hResult)) + goto cleanup; + } if (bUseSelection) {

1 0

[reactos] 01/01: [CMAKE] Remove /fallback compile flag from clang-cl builds
by Victor Perevertkin 14 Oct '21

14 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55f1f3000a8bc5273b4e4… commit 55f1f3000a8bc5273b4e4edaca70f3f3fef8b7ad Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Oct 14 19:27:02 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Oct 14 20:30:27 2021 +0300 [CMAKE] Remove /fallback compile flag from clang-cl builds This option is not needed anymore and was removed from LLVM 13 --- drivers/filesystems/ext2/CMakeLists.txt | 11 +---------- sdk/lib/crt/stdlib/stdlib.cmake | 4 ---- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/filesystems/ext2/CMakeLists.txt b/drivers/filesystems/ext2/CMakeLists.txt index b948b50c9b5..005bfcb6dac 100644 --- a/drivers/filesystems/ext2/CMakeLists.txt +++ b/drivers/filesystems/ext2/CMakeLists.txt @@ -88,10 +88,6 @@ list(APPEND SOURCE add_library(ext2fs MODULE ${SOURCE} ext2fs.rc) -if(USE_CLANG_CL) - set_property(SOURCE src/create.c src/fileinfo.c src/memory.c src/read.c APPEND_STRING PROPERTY COMPILE_FLAGS " /fallback") -endif() - if(MSVC) if (NOT CLANG) # Disable warning C4101: 'i': unreferenced local variable @@ -120,12 +116,7 @@ target_link_libraries(ext2fs memcmp ${PSEH_LIB}) add_definitions(-D__KERNEL__ -D_CRT_NO_POSIX_ERROR_CODES) set_module_type(ext2fs kernelmodedriver) add_importlibs(ext2fs ntoskrnl hal) - set_property(TARGET ext2fs PROPERTY C_STANDARD 90) - -if(NOT USE_CLANG_CL) - # The fallback we have above prevents cl and clang-cl from using the same PCH - add_pch(ext2fs inc/ext2fs.h SOURCE) -endif() +add_pch(ext2fs inc/ext2fs.h SOURCE) add_cd_file(TARGET ext2fs DESTINATION reactos/system32/drivers FOR all) diff --git a/sdk/lib/crt/stdlib/stdlib.cmake b/sdk/lib/crt/stdlib/stdlib.cmake index 5325319f839..aaf745c4519 100644 --- a/sdk/lib/crt/stdlib/stdlib.cmake +++ b/sdk/lib/crt/stdlib/stdlib.cmake @@ -33,10 +33,6 @@ list(APPEND CRT_STDLIB_SOURCE ) if(USE_CLANG_CL) - # clang-cl is missing pragma function support - # https://bugs.llvm.org/show_bug.cgi?id=35116 - set_property(SOURCE stdlib/rot.c APPEND_STRING PROPERTY COMPILE_FLAGS " /fallback") - if(ARCH STREQUAL "i386") list(APPEND CRT_STDLIB_ASM_SOURCE stdlib/clang-alias.s

1 0

[reactos] 01/01: [Win32K] Fix typo
by James Tabor 14 Oct '21

14 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63e7d6c29ed5f1ee73910… commit 63e7d6c29ed5f1ee73910bec165c8dfaa87837ed Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Thu Oct 14 09:59:53 2021 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Thu Oct 14 09:59:53 2021 -0500 [Win32K] Fix typo Fix a GERRRR typo. --- win32ss/gdi/ntgdi/dcutil.c | 2 +- win32ss/include/ntgdityp.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/ntgdi/dcutil.c b/win32ss/gdi/ntgdi/dcutil.c index cb41e6cfcd5..d66086d72d8 100644 --- a/win32ss/gdi/ntgdi/dcutil.c +++ b/win32ss/gdi/ntgdi/dcutil.c @@ -492,7 +492,7 @@ NtGdiGetDCDword( SafeResult = pdcattr->lBreakExtra; break; - case GdiGerCharBreak: + case GdiGetCharBreak: SafeResult = pdcattr->cBreak; break; diff --git a/win32ss/include/ntgdityp.h b/win32ss/include/ntgdityp.h index 3144df2745d..137937ee498 100644 --- a/win32ss/include/ntgdityp.h +++ b/win32ss/include/ntgdityp.h @@ -48,7 +48,7 @@ typedef enum _GETDCDWORD GdiGetJournal, GdiGetRelAbs, GdiGetBreakExtra, - GdiGerCharBreak, + GdiGetCharBreak, GdiGetArcDirection, GdiGetEMFRestorDc, GdiGetFontLanguageInfo,

1 0

[reactos] 01/01: [NOTEPAD] Improve Japanese translation
by Katayama Hirofumi MZ 14 Oct '21

14 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e356a9b6c4508cccbb53… commit 6e356a9b6c4508cccbb53888b2baa28c9b2f211c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 14 13:08:38 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Oct 14 13:08:38 2021 +0900 [NOTEPAD] Improve Japanese translation --- base/applications/notepad/lang/ja-JP.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc index b4f42011326..ad1359f9aca 100644 --- a/base/applications/notepad/lang/ja-JP.rc +++ b/base/applications/notepad/lang/ja-JP.rc @@ -24,7 +24,7 @@ BEGIN POPUP "ファイル(&F)" BEGIN MENUITEM "新規作成(&N)\tCtrl+N", CMD_NEW - MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "新規ウィンドウ(&W)\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "開く(&O)...\tCtrl+O", CMD_OPEN MENUITEM "上書き保存(&S)\tCtrl+S", CMD_SAVE MENUITEM "名前を付けて保存(&A)...", CMD_SAVE_AS @@ -64,7 +64,7 @@ BEGIN BEGIN MENUITEM "目次(&C)", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "メモ帳について(&A)", CMD_HELP_ABOUT_NOTEPAD END END

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