Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [CHARMAP_NEW] Remove non-existing entries.
by Hermès Bélusca-Maïto 17 May '20

17 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=591f7ff5d73dccfb418c8… commit 591f7ff5d73dccfb418c8a531aefd17ad9218371 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 17 18:46:14 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 17 18:46:42 2020 +0200 [CHARMAP_NEW] Remove non-existing entries. --- base/applications/charmap_new/charmap.rc | 60 -------------------------------- 1 file changed, 60 deletions(-) diff --git a/base/applications/charmap_new/charmap.rc b/base/applications/charmap_new/charmap.rc index 3d6e9a7b585..d788f2f21a4 100644 --- a/base/applications/charmap_new/charmap.rc +++ b/base/applications/charmap_new/charmap.rc @@ -18,24 +18,9 @@ IDI_ICON ICON "res/charmap.ico" /* UTF-8 */ #pragma code_page(65001) -#ifdef LANGUAGE_BG_BG - #include "lang/bg-BG.rc" -#endif -#ifdef LANGUAGE_CA_ES - #include "lang/ca-ES.rc" -#endif -#ifdef LANGUAGE_CS_CZ - #include "lang/cs-CZ.rc" -#endif -#ifdef LANGUAGE_DE_DE - #include "lang/de-DE.rc" -#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif -#ifdef LANGUAGE_EL_GR - #include "lang/el-GR.rc" -#endif #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif @@ -45,63 +30,18 @@ IDI_ICON ICON "res/charmap.ico" #ifdef LANGUAGE_EU_ES #include "lang/eu-ES.rc" #endif -#ifdef LANGUAGE_FR_FR - #include "lang/fr-FR.rc" -#endif -#ifdef LANGUAGE_HE_IL - #include "lang/he-IL.rc" -#endif -#ifdef LANGUAGE_ID_ID - #include "lang/id-ID.rc" -#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif -#ifdef LANGUAGE_JA_JP - #include "lang/ja-JP.rc" -#endif -#ifdef LANGUAGE_KO_KR - #include "lang/ko-KR.rc" -#endif -#ifdef LANGUAGE_LT_LT - #include "lang/lt-LT.rc" -#endif -#ifdef LANGUAGE_NL_NL - #include "lang/nl-NL.rc" -#endif -#ifdef LANGUAGE_NB_NO - #include "lang/no-NO.rc" -#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif -#ifdef LANGUAGE_PT_BR - #include "lang/pt-BR.rc" -#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif -#ifdef LANGUAGE_RU_RU - #include "lang/ru-RU.rc" -#endif -#ifdef LANGUAGE_SK_SK - #include "lang/sk-SK.rc" -#endif -#ifdef LANGUAGE_SQ_AL - #include "lang/sq-AL.rc" -#endif -#ifdef LANGUAGE_SV_SE - #include "lang/sv-SE.rc" -#endif #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif -#ifdef LANGUAGE_UK_UA - #include "lang/uk-UA.rc" -#endif #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif -#ifdef LANGUAGE_ZH_TW - #include "lang/zh-TW.rc" -#endif

1 0

[reactos] 01/01: [BOOTVID][HALXBOX] Implement boot video driver for Xbox (#2774)
by Stanislav Motylkov 17 May '20

17 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa1ec0a2ed44fd4e5e05f… commit fa1ec0a2ed44fd4e5e05fec85450940281481ce9 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue May 12 17:32:37 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun May 17 19:18:32 2020 +0300 [BOOTVID][HALXBOX] Implement boot video driver for Xbox (#2774) Also make HalpBiosDisplayReset() function always return FALSE, because we don't have a BIOS on Xbox. CORE-16216 CORE-16219 --- drivers/base/bootvid/CMakeLists.txt | 9 + drivers/base/bootvid/bootvid.rc | 2 + drivers/base/bootvid/i386/xbox/bootvid.c | 441 +++++++++++++++++++++++++++++++ drivers/base/bootvid/i386/xbox/nv2a.h | 63 +++++ drivers/base/bootvid/precomp.h | 2 + hal/halx86/generic/bios.c | 4 + 6 files changed, 521 insertions(+) diff --git a/drivers/base/bootvid/CMakeLists.txt b/drivers/base/bootvid/CMakeLists.txt index 033a37c53ef..d9f1819478b 100644 --- a/drivers/base/bootvid/CMakeLists.txt +++ b/drivers/base/bootvid/CMakeLists.txt @@ -4,15 +4,24 @@ spec2def(bootvid.dll bootvid.spec ADD_IMPORTLIB) if((ARCH STREQUAL "i386") OR (ARCH STREQUAL "amd64")) if(SARCH STREQUAL "pc98") list(APPEND SOURCE + i386/pc98/pc98.h i386/pc98/bootvid.c) + elseif(SARCH STREQUAL "xbox") + list(APPEND SOURCE + i386/xbox/nv2a.h + i386/xbox/bootvid.c) else() list(APPEND SOURCE + i386/pc/pc.h + i386/pc/cmdcnst.h i386/pc/bootvid.c i386/pc/bootdata.c + i386/pc/vga.h i386/pc/vga.c) endif() elseif(ARCH STREQUAL "arm") list(APPEND SOURCE + arm/arm.h arm/bootvid.c) endif() diff --git a/drivers/base/bootvid/bootvid.rc b/drivers/base/bootvid/bootvid.rc index 18d91d14650..8706fe26d69 100644 --- a/drivers/base/bootvid/bootvid.rc +++ b/drivers/base/bootvid/bootvid.rc @@ -2,6 +2,8 @@ #if defined(SARCH_PC98) #define REACTOS_STR_FILE_DESCRIPTION "NEC PC-98 Boot Video Driver" +#elif defined(SARCH_XBOX) +#define REACTOS_STR_FILE_DESCRIPTION "Original Xbox Boot Video Driver" #else #define REACTOS_STR_FILE_DESCRIPTION "VGA Boot Driver" #endif diff --git a/drivers/base/bootvid/i386/xbox/bootvid.c b/drivers/base/bootvid/i386/xbox/bootvid.c new file mode 100644 index 00000000000..5fddab54769 --- /dev/null +++ b/drivers/base/bootvid/i386/xbox/bootvid.c @@ -0,0 +1,441 @@ +/* + * PROJECT: ReactOS Boot Video Driver for Original Xbox + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Main file + * COPYRIGHT: Copyright 2004 Gé van Geldorp (gvg(a)reactos.org) + * Copyright 2005 Filip Navara (navaraf(a)reactos.org) + * Copyright 2020 Stanislav Motylkov (x86corez(a)gmail.com) + */ + +#include "precomp.h" + +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +static ULONG_PTR FrameBufferStart = 0; +static ULONG FrameBufferWidth, FrameBufferHeight, PanH, PanV; +static UCHAR BytesPerPixel; +static RGBQUAD CachedPalette[BV_MAX_COLORS]; +static PUCHAR BackBuffer = NULL; + +/* PRIVATE FUNCTIONS *********************************************************/ + +static UCHAR +NvGetCrtc( + ULONG Base, + UCHAR Index) +{ + WRITE_REGISTER_UCHAR((PUCHAR)(Base + NV2A_CRTC_REGISTER_INDEX), Index); + return READ_REGISTER_UCHAR((PUCHAR)(Base + NV2A_CRTC_REGISTER_VALUE)); +} + +static UCHAR +NvGetBytesPerPixel( + ULONG Base, + ULONG ScreenWidth) +{ + /* Get BPP directly from NV2A CRTC (magic constants are from Cromwell) */ + UCHAR BytesPerPixel = 8 * (((NvGetCrtc(Base, 0x19) & 0xE0) << 3) | (NvGetCrtc(Base, 0x13) & 0xFF)) / ScreenWidth; + + if (BytesPerPixel == 4) + { + ASSERT((NvGetCrtc(Base, 0x28) & 0xF) == BytesPerPixel - 1); + } + else + { + ASSERT((NvGetCrtc(Base, 0x28) & 0xF) == BytesPerPixel); + } + + return BytesPerPixel; +} + +static VOID +ApplyPalette(VOID) +{ + PULONG Frame = (PULONG)FrameBufferStart; + ULONG x, y; + + /* Top panning */ + for (x = 0; x < PanV * FrameBufferWidth; x++) + { + *Frame++ = CachedPalette[0]; + } + + /* Left panning */ + for (y = 0; y < SCREEN_HEIGHT; y++) + { + Frame = (PULONG)(FrameBufferStart + FB_OFFSET(-PanH, y)); + + for (x = 0; x < PanH; x++) + { + *Frame++ = CachedPalette[0]; + } + } + + /* Screen redraw */ + PUCHAR Back = BackBuffer; + for (y = 0; y < SCREEN_HEIGHT; y++) + { + Frame = (PULONG)(FrameBufferStart + FB_OFFSET(0, y)); + + for (x = 0; x < SCREEN_WIDTH; x++) + { + *Frame++ = CachedPalette[*Back++]; + } + } + + /* Right panning */ + for (y = 0; y < SCREEN_HEIGHT; y++) + { + Frame = (PULONG)(FrameBufferStart + FB_OFFSET(SCREEN_WIDTH, y)); + + for (x = 0; x < PanH; x++) + { + *Frame++ = CachedPalette[0]; + } + } + + /* Bottom panning */ + Frame = (PULONG)(FrameBufferStart + FB_OFFSET(-PanH, SCREEN_HEIGHT)); + for (x = 0; x < PanV * FrameBufferWidth; x++) + { + *Frame++ = CachedPalette[0]; + } +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +BOOLEAN +NTAPI +VidInitialize( + _In_ BOOLEAN SetMode) +{ + BOOLEAN Result = FALSE; + + /* FIXME: Add platform check */ + /* 1. Access PCI device 1:0:0 */ + /* 2. Check if device ID is 10DE:02A0 */ + + /* FIXME: Get device MMIO ranges from PCI */ + PHYSICAL_ADDRESS PhysControlStart = {.QuadPart = 0xFD000000}; + PHYSICAL_ADDRESS PhysFrameBufferStart = {.QuadPart = 0xF0000000}; + ULONG ControlLength = 16 * 1024 * 1024; + + ULONG_PTR ControlStart = (ULONG_PTR)MmMapIoSpace(PhysControlStart, ControlLength, MmNonCached); + if (!ControlStart) + { + DPRINT1("Out of memory!\n"); + return FALSE; + } + + ULONG_PTR FrameBuffer = READ_REGISTER_ULONG((PULONG)(ControlStart + NV2A_CONTROL_FRAMEBUFFER_ADDRESS_OFFSET)); + FrameBufferWidth = READ_REGISTER_ULONG((PULONG)(ControlStart + NV2A_RAMDAC_FP_HVALID_END)) + 1; + FrameBufferHeight = READ_REGISTER_ULONG((PULONG)(ControlStart + NV2A_RAMDAC_FP_VVALID_END)) + 1; + + FrameBuffer &= 0x0FFFFFFF; + if (FrameBuffer != 0x3C00000 && FrameBuffer != 0x7C00000) + { + /* Check framebuffer address (high 4 MB of either 64 or 128 MB RAM) */ + DPRINT1("Non-standard framebuffer address 0x%p\n", FrameBuffer); + } + /* Verify that framebuffer address is page-aligned */ + ASSERT(FrameBuffer % PAGE_SIZE == 0); + + if (FrameBufferWidth < SCREEN_WIDTH || FrameBufferHeight < SCREEN_HEIGHT) + { + DPRINT1("Unsupported screen resolution!\n"); + goto cleanup; + } + + BytesPerPixel = NvGetBytesPerPixel(ControlStart, FrameBufferWidth); + ASSERT(BytesPerPixel >= 1 && BytesPerPixel <= 4); + + if (BytesPerPixel != 4) + { + DPRINT1("Unsupported BytesPerPixel = %d\n", BytesPerPixel); + goto cleanup; + } + + /* Calculate panning values */ + PanH = (FrameBufferWidth - SCREEN_WIDTH) / 2; + PanV = (FrameBufferHeight - SCREEN_HEIGHT) / 2; + + /* Verify that screen fits framebuffer size */ + ULONG FrameBufferSize = FrameBufferWidth * FrameBufferHeight * BytesPerPixel; + + /* FIXME: obtain fb size from firmware somehow (Cromwell reserves high 4 MB of RAM) */ + if (FrameBufferSize > NV2A_VIDEO_MEMORY_SIZE) + { + DPRINT1("Current screen resolution exceeds video memory bounds!\n"); + goto cleanup; + } + + /* + * Reserve off-screen area for the backbuffer that contains 8-bit indexed + * color screen image, plus preserved row data. + */ + ULONG BackBufferSize = SCREEN_WIDTH * (SCREEN_HEIGHT + BOOTCHAR_HEIGHT + 1); + + /* Make sure there is enough video memory for backbuffer */ + if (NV2A_VIDEO_MEMORY_SIZE - FrameBufferSize < BackBufferSize) + { + DPRINT1("Out of memory!\n"); + goto cleanup; + } + + /* Return the address back to GPU memory mapped I/O */ + PhysFrameBufferStart.QuadPart += FrameBuffer; + FrameBufferStart = (ULONG_PTR)MmMapIoSpace(PhysFrameBufferStart, NV2A_VIDEO_MEMORY_SIZE, MmNonCached); + if (!FrameBufferStart) + { + DPRINT1("Out of memory!\n"); + goto cleanup; + } + + Result = TRUE; + + /* Place backbuffer in the hidden part of framebuffer */ + BackBuffer = (PUCHAR)(FrameBufferStart + NV2A_VIDEO_MEMORY_SIZE - BackBufferSize); + + /* Now check if we have to set the mode */ + if (SetMode) + VidResetDisplay(TRUE); + +cleanup: + if (ControlStart) + MmUnmapIoSpace((PVOID)ControlStart, ControlLength); + + /* Video is ready */ + return Result; +} + +VOID +NTAPI +VidCleanUp(VOID) +{ + /* Just fill the screen black */ + VidSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, BV_COLOR_BLACK); +} + +VOID +NTAPI +VidResetDisplay( + _In_ BOOLEAN HalReset) +{ + /* Clear the current position */ + VidpCurrentX = 0; + VidpCurrentY = 0; + + /* Clear the screen with HAL if we were asked to */ + if (HalReset) + HalResetDisplay(); + + /* Re-initialize the palette and fill the screen black */ + RtlZeroMemory((PULONG)FrameBufferStart, NV2A_VIDEO_MEMORY_SIZE); + InitializePalette(); + VidSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, BV_COLOR_BLACK); +} + +VOID +NTAPI +InitPaletteWithTable( + _In_ PULONG Table, + _In_ ULONG Count) +{ + PULONG Entry = Table; + + for (ULONG i = 0; i < Count; i++, Entry++) + { + CachedPalette[i] = *Entry | 0xFF000000; + } + ApplyPalette(); +} + +VOID +PrepareForSetPixel(VOID) +{ + /* Nothing to prepare */ + NOTHING; +} + +VOID +SetPixel( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ UCHAR Color) +{ + PUCHAR Back = BackBuffer + BB_OFFSET(Left, Top); + PULONG Frame = (PULONG)(FrameBufferStart + FB_OFFSET(Left, Top)); + + *Back = Color; + *Frame = CachedPalette[Color]; +} + +VOID +NTAPI +PreserveRow( + _In_ ULONG CurrentTop, + _In_ ULONG TopDelta, + _In_ BOOLEAN Restore) +{ + PUCHAR NewPosition, OldPosition; + + /* Calculate the position in memory for the row */ + if (Restore) + { + /* Restore the row by copying back the contents saved off-screen */ + NewPosition = BackBuffer + BB_OFFSET(0, CurrentTop); + OldPosition = BackBuffer + BB_OFFSET(0, SCREEN_HEIGHT); + } + else + { + /* Preserve the row by saving its contents off-screen */ + NewPosition = BackBuffer + BB_OFFSET(0, SCREEN_HEIGHT); + OldPosition = BackBuffer + BB_OFFSET(0, CurrentTop); + } + + /* Set the count and loop every pixel of backbuffer */ + ULONG Count = TopDelta * SCREEN_WIDTH; + + RtlCopyMemory(NewPosition, OldPosition, Count); + + if (Restore) + { + NewPosition = BackBuffer + BB_OFFSET(0, CurrentTop); + + /* Set the count and loop every pixel of framebuffer */ + for (ULONG y = 0; y < TopDelta; y++) + { + PULONG Frame = (PULONG)(FrameBufferStart + FB_OFFSET(0, CurrentTop + y)); + + Count = SCREEN_WIDTH; + while (Count--) + { + *Frame++ = CachedPalette[*NewPosition++]; + } + } + } +} + +VOID +NTAPI +DoScroll( + _In_ ULONG Scroll) +{ + ULONG RowSize = VidpScrollRegion[2] - VidpScrollRegion[0] + 1; + + /* Calculate the position in memory for the row */ + PUCHAR OldPosition = BackBuffer + BB_OFFSET(VidpScrollRegion[0], VidpScrollRegion[1] + Scroll); + PUCHAR NewPosition = BackBuffer + BB_OFFSET(VidpScrollRegion[0], VidpScrollRegion[1]); + + /* Start loop */ + for (ULONG Top = VidpScrollRegion[1]; Top <= VidpScrollRegion[3]; ++Top) + { + ULONG i; + + /* Scroll the row */ + RtlCopyMemory(NewPosition, OldPosition, RowSize); + + PULONG Frame = (PULONG)(FrameBufferStart + FB_OFFSET(VidpScrollRegion[0], Top)); + + for (i = 0; i < RowSize; ++i) + Frame[i] = CachedPalette[NewPosition[i]]; + + OldPosition += SCREEN_WIDTH; + NewPosition += SCREEN_WIDTH; + } +} + +VOID +NTAPI +DisplayCharacter( + _In_ CHAR Character, + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG TextColor, + _In_ ULONG BackColor) +{ + /* Get the font and pixel pointer */ + PUCHAR FontChar = GetFontPtr(Character); + + /* Loop each pixel height */ + for (ULONG y = Top; y < Top + BOOTCHAR_HEIGHT; y++, FontChar += FONT_PTR_DELTA) + { + /* Loop each pixel width */ + ULONG x = Left; + + for (UCHAR bit = 1 << (BOOTCHAR_WIDTH - 1); bit > 0; bit >>= 1, x++) + { + /* Check if we should draw this pixel */ + if (*FontChar & bit) + { + /* We do, use the given Text Color */ + SetPixel(x, y, (UCHAR)TextColor); + } + else if (BackColor < BV_COLOR_NONE) + { + /* + * This is a background pixel. We're drawing it + * unless it's transparent. + */ + SetPixel(x, y, (UCHAR)BackColor); + } + } + } +} + +VOID +NTAPI +VidSolidColorFill( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ UCHAR Color) +{ + while (Top <= Bottom) + { + PUCHAR Back = BackBuffer + BB_OFFSET(Left, Top); + PULONG Frame = (PULONG)(FrameBufferStart + FB_OFFSET(Left, Top)); + ULONG L = Left; + + while (L++ <= Right) + { + *Back++ = Color; + *Frame++ = CachedPalette[Color]; + } + Top++; + } +} + +VOID +NTAPI +VidScreenToBufferBlt( + _Out_ PUCHAR Buffer, + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Width, + _In_ ULONG Height, + _In_ ULONG Delta) +{ + /* Clear the destination buffer */ + RtlZeroMemory(Buffer, Delta * Height); + + /* Start the outer Y height loop */ + for (ULONG y = 0; y < Height; y++) + { + /* Set current scanline */ + PUCHAR Back = BackBuffer + BB_OFFSET(Left, Top + y); + PUCHAR Buf = Buffer + y * Delta; + + /* Start the X inner loop */ + for (ULONG x = 0; x < Width; x += 2) + { + /* Read the current value */ + *Buf = (*Back++ & 0xF) << 4; + *Buf |= *Back++ & 0xF; + Buf++; + } + } +} diff --git a/drivers/base/bootvid/i386/xbox/nv2a.h b/drivers/base/bootvid/i386/xbox/nv2a.h new file mode 100644 index 00000000000..e7581fee646 --- /dev/null +++ b/drivers/base/bootvid/i386/xbox/nv2a.h @@ -0,0 +1,63 @@ +/* + * PROJECT: ReactOS Boot Video Driver for Original Xbox + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Arch-specific header file + * COPYRIGHT: Copyright 2004 Gé van Geldorp (gvg(a)reactos.org) + * Copyright 2005 Filip Navara (navaraf(a)reactos.org) + * Copyright 2020 Stanislav Motylkov (x86corez(a)gmail.com) + */ + +#ifndef _BOOTVID_NV2A_H_ +#define _BOOTVID_NV2A_H_ + +#pragma once + +/* FIXME: obtain fb size from firmware somehow (Cromwell reserves high 4 MB of RAM) */ +#define NV2A_VIDEO_MEMORY_SIZE (4 * 1024 * 1024) + +#define NV2A_CONTROL_FRAMEBUFFER_ADDRESS_OFFSET 0x600800 +#define NV2A_CRTC_REGISTER_INDEX 0x6013D4 +#define NV2A_CRTC_REGISTER_VALUE 0x6013D5 +#define NV2A_RAMDAC_FP_HVALID_END 0x680838 +#define NV2A_RAMDAC_FP_VVALID_END 0x680818 + +#define BB_OFFSET(x, y) ((y) * SCREEN_WIDTH + (x)) +#define FB_OFFSET(x, y) (((PanV + (y)) * FrameBufferWidth + PanH + (x)) * BytesPerPixel) + +VOID +NTAPI +InitPaletteWithTable( + _In_ PULONG Table, + _In_ ULONG Count); + +VOID +PrepareForSetPixel(VOID); + +VOID +SetPixel( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ UCHAR Color); + +VOID +NTAPI +PreserveRow( + _In_ ULONG CurrentTop, + _In_ ULONG TopDelta, + _In_ BOOLEAN Restore); + +VOID +NTAPI +DoScroll( + _In_ ULONG Scroll); + +VOID +NTAPI +DisplayCharacter( + _In_ CHAR Character, + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG TextColor, + _In_ ULONG BackColor); + +#endif /* _BOOTVID_NV2A_H_ */ diff --git a/drivers/base/bootvid/precomp.h b/drivers/base/bootvid/precomp.h index a5a27f3ead2..bf11f82473b 100644 --- a/drivers/base/bootvid/precomp.h +++ b/drivers/base/bootvid/precomp.h @@ -9,6 +9,8 @@ #if defined(_M_IX86) || defined(_M_AMD64) #if defined(SARCH_PC98) #include "i386/pc98/pc98.h" +#elif defined(SARCH_XBOX) +#include "i386/xbox/nv2a.h" #else #include "i386/pc/vga.h" #include "i386/pc/pc.h" diff --git a/hal/halx86/generic/bios.c b/hal/halx86/generic/bios.c index 85a9d5b37d5..2fe73aa15e5 100644 --- a/hal/halx86/generic/bios.c +++ b/hal/halx86/generic/bios.c @@ -645,6 +645,9 @@ BOOLEAN NTAPI HalpBiosDisplayReset(VOID) { +#ifdef SARCH_XBOX + return FALSE; +#else ULONG Flags; PHARDWARE_PTE IdtPte; BOOLEAN RestoreWriteProtection = FALSE; @@ -709,6 +712,7 @@ HalpBiosDisplayReset(VOID) // __writeeflags(Flags); return TRUE; +#endif } #endif

1 0

[reactos] 01/01: [ACPPAGE] Add Portuguese translation (#2802)
by Jose Carlos Jesus 17 May '20

17 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd0c06bef33ccaa7bd4b2… commit cd0c06bef33ccaa7bd4b21fcfe5e9763549586f9 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sun May 17 17:12:11 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun May 17 18:12:11 2020 +0200 [ACPPAGE] Add Portuguese translation (#2802) --- dll/shellext/acppage/ACPPage.rc | 3 +++ dll/shellext/acppage/lang/pt-PT.rc | 42 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/dll/shellext/acppage/ACPPage.rc b/dll/shellext/acppage/ACPPage.rc index 3c741cd5115..341ae29ee26 100644 --- a/dll/shellext/acppage/ACPPage.rc +++ b/dll/shellext/acppage/ACPPage.rc @@ -61,6 +61,9 @@ IDR_ACPPAGE REGISTRY "res/acppage.rgs" #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/dll/shellext/acppage/lang/pt-PT.rc b/dll/shellext/acppage/lang/pt-PT.rc new file mode 100644 index 00000000000..7d2fc5b9b90 --- /dev/null +++ b/dll/shellext/acppage/lang/pt-PT.rc @@ -0,0 +1,42 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_ACPPAGESHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Compatibilidade" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Se tiver problemas para executar este programa no ReactOS, seleccione o sistema operacional que o ReactOS deve reportar ao aplicativo.\nTenha em atenção que este é um trabalho em desenvolvimento.", IDC_EXPLANATION, 7, 7, 210, 31 + GROUPBOX "Mode de compatibilidade", IDC_COMPATGROUP, 7, 41, 210, 49 + CHECKBOX "Exec. este programa em modo de compatibilidade para:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "Definições de visualização", -1, 7, 99, 210, 61, BS_GROUPBOX + CHECKBOX "Executar em 256 cores", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Executar na resolução de ecrã 640x480", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Desactivar temas visuais", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + PUSHBUTTON "E&ditar modos de compatibilidade...", IDC_EDITCOMPATIBILITYMODES, 105, 167, 112, 15 + LTEXT "",IDC_ENABLED_LAYERS,7,185,210,21 + CONTROL "Aprenda mais acerca <A>compatibilidade de programas</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Editar modos de compatibilidade" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "&Cancelar",IDCANCEL,240,114,60,14 + LTEXT "Modos disponíveis",-1,6,6,52,8 + LTEXT "Modos seleccionados",-1,168,6,51,8 +END + +STRINGTABLE +BEGIN + IDS_COMPAT_TITLE "Compatibilidade" + IDS_FAILED_NETWORK "Os modos de compatibilidade não podem ser definidos neste programa porque ele está numa unidade de rede." + IDS_FAILED_PROTECTED "Os modos de compatibilidade não podem ser definidos neste programa porque faz parte do ReactOS." +END

1 0

[reactos] 06/06: [COMDLG32] Differentiate between real and virtual folders, do not allow traversal inside virtual folders when selecting a file CORE-16908
by Mark Jansen 17 May '20

17 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=332889b8d7b452df9bd89… commit 332889b8d7b452df9bd899a5ed04d41dd22876de Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed May 6 22:04:11 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun May 17 17:09:05 2020 +0200 [COMDLG32] Differentiate between real and virtual folders, do not allow traversal inside virtual folders when selecting a file CORE-16908 --- dll/win32/comdlg32/filedlg.c | 8 ++++---- dll/win32/comdlg32/filedlgbrowser.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/comdlg32/filedlg.c b/dll/win32/comdlg32/filedlg.c index af3c5c4a3ac..6e5134f6ce3 100644 --- a/dll/win32/comdlg32/filedlg.c +++ b/dll/win32/comdlg32/filedlg.c @@ -2782,12 +2782,12 @@ int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, PathAddBackslashW(lpwstrTemp); } - dwAttributes = SFGAO_FOLDER; + dwAttributes = SFGAO_FOLDER | SFGAO_FILESYSANCESTOR; if(SUCCEEDED(IShellFolder_ParseDisplayName(*ppsf, hwnd, NULL, lpwstrTemp, &dwEaten, &pidl, &dwAttributes))) { /* the path component is valid, we have a pidl of the next path component */ TRACE("parse OK attr=0x%08x pidl=%p\n", dwAttributes, pidl); - if(dwAttributes & SFGAO_FOLDER) + if((dwAttributes & (SFGAO_FOLDER | SFGAO_FILESYSANCESTOR)) == (SFGAO_FOLDER | SFGAO_FILESYSANCESTOR)) { if(FAILED(IShellFolder_BindToObject(*ppsf, pidl, 0, &IID_IShellFolder, (LPVOID*)&lpsfChild))) { @@ -4468,7 +4468,7 @@ static LPITEMIDLIST GetPidlFromName(IShellFolder *lpsf,LPWSTR lpcstrFileName) */ static BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl) { - ULONG uAttr = SFGAO_FOLDER | SFGAO_HASSUBFOLDER; + ULONG uAttr = SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR; HRESULT ret; TRACE("%p, %p\n", psf, pidl); @@ -4477,7 +4477,7 @@ static BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl) TRACE("-- 0x%08x 0x%08x\n", uAttr, ret); /* see documentation shell 4.1*/ - return uAttr & (SFGAO_FOLDER | SFGAO_HASSUBFOLDER); + return (uAttr & (SFGAO_FOLDER | SFGAO_HASSUBFOLDER)) && (uAttr & SFGAO_FILESYSANCESTOR); } /*********************************************************************** diff --git a/dll/win32/comdlg32/filedlgbrowser.c b/dll/win32/comdlg32/filedlgbrowser.c index 5b5323f4d22..83d5f5e9e09 100644 --- a/dll/win32/comdlg32/filedlgbrowser.c +++ b/dll/win32/comdlg32/filedlgbrowser.c @@ -774,9 +774,9 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand(ICommDl { HRESULT hRes; - ULONG ulAttr = SFGAO_FOLDER | SFGAO_HASSUBFOLDER; + ULONG ulAttr = SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR; IShellFolder_GetAttributesOf(fodInfos->Shell.FOIShellFolder, 1, (LPCITEMIDLIST *)&pidl, &ulAttr); - if (ulAttr & (SFGAO_FOLDER | SFGAO_HASSUBFOLDER) ) + if ((ulAttr & (SFGAO_FOLDER | SFGAO_HASSUBFOLDER)) && (ulAttr & SFGAO_FILESYSANCESTOR)) { hRes = IShellBrowser_BrowseObject(&This->IShellBrowser_iface,pidl,SBSP_RELATIVE); if(fodInfos->ofnInfos->Flags & OFN_EXPLORER)

1 0

[reactos] 05/06: [SHELLUTILS] Fix Win32DbgPrint's result
by Mark Jansen 17 May '20

17 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84513890412e309e25afe… commit 84513890412e309e25afe9a703cd072625c49718 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Oct 13 18:05:34 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun May 17 17:09:05 2020 +0200 [SHELLUTILS] Fix Win32DbgPrint's result --- sdk/include/reactos/shellutils.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/include/reactos/shellutils.h b/sdk/include/reactos/shellutils.h index 8cc51f379d4..82f2f708eee 100644 --- a/sdk/include/reactos/shellutils.h +++ b/sdk/include/reactos/shellutils.h @@ -30,7 +30,6 @@ Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) char *szMsgStart; const char *fname; va_list vl; - ULONG uRet; fname = strrchr(filename, '\\'); if (fname == NULL) @@ -48,12 +47,13 @@ Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) szMsgStart = szMsg + sprintf(szMsg, "%s:%d: ", fname, line); va_start(vl, lpFormat); - uRet = (ULONG) vsprintf(szMsgStart, lpFormat, vl); + vsprintf(szMsgStart, lpFormat, vl); va_end(vl); OutputDebugStringA(szMsg); - return uRet; + /* Return STATUS_SUCCESS, since we are supposed to mimic DbgPrint */ + return 0; } #define DbgPrint(fmt, ...) \

1 0

[reactos] 04/06: [SHELL32] Properly enumerate virtual shell folders (on files) as fake folders CORE-16908
by Mark Jansen 17 May '20

17 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f379a29606aa03c74f521… commit f379a29606aa03c74f521de5b9028eb623ed4055 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Apr 27 20:43:16 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun May 17 17:09:04 2020 +0200 [SHELL32] Properly enumerate virtual shell folders (on files) as fake folders CORE-16908 --- dll/win32/shell32/folders/CFSFolder.cpp | 100 +++++++++++++++++++++++++++++++- sdk/include/reactos/shlwapi_undoc.h | 1 + 2 files changed, 99 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index 266a7478367..a97ad5d4980 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -371,6 +371,52 @@ private: BOOL bDirectory = (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; + HRESULT hr; + if (bDirectory) + { + // Skip the current and parent directory nodes + if (!strcmpW(FindData.cFileName, L".") || !strcmpW(FindData.cFileName, L"..")) + return S_OK; + + // Does this directory need special handling? + if ((FindData.dwFileAttributes & (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_READONLY)) != 0) + { + WCHAR Tmp[MAX_PATH]; + CLSID clsidFolder; + + PathCombineW(Tmp, sParentDir, FindData.cFileName); + + hr = SHELL32_GetCLSIDForDirectory(Tmp, L"CLSID", &clsidFolder); + if (SUCCEEDED(hr)) + { + ERR("SHOULD DO SOMETHING WITH CLSID?\n"); + } + } + } + else + { + CLSID clsidFile; + LPWSTR pExtension = PathFindExtensionW(FindData.cFileName); + if (pExtension) + { + // FIXME: Cache this? + hr = GetCLSIDForFileTypeFromExtension(pExtension, L"CLSID", &clsidFile); + if (hr == S_OK) + { + HKEY hkey; + hr = SHRegGetCLSIDKeyW(clsidFile, L"ShellFolder", FALSE, FALSE, &hkey); + if (SUCCEEDED(hr)) + { + ::RegCloseKey(hkey); + + // This should be presented as directory! + bDirectory = TRUE; + TRACE("Treating '%S' as directory!\n", FindData.cFileName); + } + } + } + } + LPITEMIDLIST pidl = NULL; if (bDirectory) { @@ -573,10 +619,60 @@ HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDW dwShellAttributes = SFGAO_CANCOPY | SFGAO_CANMOVE | SFGAO_CANLINK | SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSTEM; - if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - dwShellAttributes |= (SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR | SFGAO_STORAGEANCESTOR | SFGAO_STORAGE); + BOOL bDirectory = (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; + + if (!bDirectory) + { + // https://git.reactos.org/?p=reactos.git;a=blob;f=dll/shellext/zipfldr/res/zi… + WCHAR szFileName[MAX_PATH]; + LPWSTR pExtension; + + if (_ILSimpleGetTextW(pidl, szFileName, _countof(szFileName)) && (pExtension = PathFindExtensionW(szFileName))) + { + CLSID clsidFile; + // FIXME: Cache this? + HRESULT hr = GetCLSIDForFileTypeFromExtension(pExtension, L"CLSID", &clsidFile); + if (hr == S_OK) + { + HKEY hkey; + hr = SHRegGetCLSIDKeyW(clsidFile, L"ShellFolder", FALSE, FALSE, &hkey); + if (SUCCEEDED(hr)) + { + DWORD dwAttributes = 0; + DWORD dwSize = sizeof(dwAttributes); + LSTATUS Status; + + Status = SHRegGetValueW(hkey, NULL, L"Attributes", RRF_RT_REG_DWORD, NULL, &dwAttributes, &dwSize); + if (Status == STATUS_SUCCESS) + { + ERR("Augmenting '%S' with dwAttributes=0x%x\n", szFileName, dwAttributes); + dwShellAttributes |= dwAttributes; + } + ::RegCloseKey(hkey); + + // This should be presented as directory! + bDirectory = TRUE; + ERR("Treating '%S' as directory!\n", szFileName); + } + } + } + } + + // This is a directory + if (bDirectory) + { + dwShellAttributes |= (SFGAO_FOLDER | /*SFGAO_HASSUBFOLDER |*/ SFGAO_STORAGE); + + // Is this a real directory? + if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + dwShellAttributes |= (SFGAO_FILESYSANCESTOR | SFGAO_STORAGEANCESTOR); + } + } else + { dwShellAttributes |= SFGAO_STREAM; + } if (dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) dwShellAttributes |= SFGAO_HIDDEN; diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index a90537fbd30..08af85972d7 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -53,6 +53,7 @@ HRESULT WINAPI IsQSForward(REFGUID pguidCmdGroup,ULONG cCmds, OLECMD *prgCmds); BOOL WINAPI SHIsChildOrSelf(HWND hParent, HWND hChild); HRESULT WINAPI SHForwardContextMenuMsg(IUnknown* pUnk, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* pResult, BOOL useIContextMenu2); +HRESULT WINAPI SHRegGetCLSIDKeyW(REFGUID guid, LPCWSTR lpszValue, BOOL bUseHKCU, BOOL bCreate, PHKEY phKey); BOOL WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewItem); BOOL WINAPI SHRemoveDataBlock(LPDBLIST* lppList, DWORD dwSignature);

1 0

[reactos] 03/06: [SHELL32] Update CFileSysEnum to be maintaineable CORE-16908
by Mark Jansen 17 May '20

17 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b1003ae909f5a76d38944… commit b1003ae909f5a76d38944852c82c5bdd863ab15d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Apr 27 16:11:21 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun May 17 17:09:04 2020 +0200 [SHELL32] Update CFileSysEnum to be maintaineable CORE-16908 --- dll/win32/shell32/folders/CFSFolder.cpp | 264 ++++++++++++++++++-------------- dll/win32/shell32/folders/CFSFolder.h | 36 ++--- 2 files changed, 161 insertions(+), 139 deletions(-) diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index cfba27e0008..266a7478367 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -1,53 +1,23 @@ - /* - * file system folder - * - * Copyright 1997 Marcus Meissner - * Copyright 1998, 1999, 2002 Juergen Schmied - * Copyright 2019 Katayama Hirofumi MZ - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: shell32 + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: file system folder + * COPYRIGHT: Copyright 1997 Marcus Meissner + * Copyright 1998, 1999, 2002 Juergen Schmied + * Copyright 2019 Katayama Hirofumi MZ + * Copyright 2020 Mark Jansen (mark.jansen(a)reactos.org) */ #include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL (shell); -HKEY OpenKeyFromFileType(PCUIDLIST_RELATIVE pidl, LPCWSTR KeyName) -{ - HKEY hkey; +static HRESULT SHELL32_GetCLSIDForDirectory(LPCWSTR pwszDir, LPCWSTR KeyName, CLSID* pclsidFolder); - if (!_ILIsValue(pidl)) - { - ERR("Invalid pidl!\n"); - return NULL; - } - FileStructW* pDataW = _ILGetFileStructW(pidl); - if (!pDataW) - { - ERR("Invalid pidl!\n"); - return NULL; - } - - LPWSTR pExtension = PathFindExtensionW(pDataW->wszName); - if (!pExtension || *pExtension == NULL) - { - WARN("No extension for %S!\n", pDataW->wszName); - return NULL; - } +HKEY OpenKeyFromFileType(LPWSTR pExtension, LPCWSTR KeyName) +{ + HKEY hkey; WCHAR FullName[MAX_PATH]; DWORD dwSize = sizeof(FullName); @@ -60,7 +30,7 @@ HKEY OpenKeyFromFileType(PCUIDLIST_RELATIVE pidl, LPCWSTR KeyName) res = RegGetValueW(HKEY_CLASSES_ROOT, pExtension, NULL, RRF_RT_REG_SZ, NULL, FullName, &dwSize); if (res) { - WARN("Failed to get progid for file %S, extension %S (%x), address %x, pidl: %x, error %d\n", pDataW->wszName, pExtension, pExtension, &dwSize, pidl, res); + WARN("Failed to get progid for extension %S (%x), error %d\n", pExtension, pExtension, res); return NULL; } @@ -75,9 +45,33 @@ HKEY OpenKeyFromFileType(PCUIDLIST_RELATIVE pidl, LPCWSTR KeyName) return hkey; } -HRESULT GetCLSIDForFileType(PCUIDLIST_RELATIVE pidl, LPCWSTR KeyName, CLSID* pclsid) +LPWSTR ExtensionFromPidl(PCUIDLIST_RELATIVE pidl) { - HKEY hkeyProgId = OpenKeyFromFileType(pidl, KeyName); + if (!_ILIsValue(pidl)) + { + ERR("Invalid pidl!\n"); + return NULL; + } + + FileStructW* pDataW = _ILGetFileStructW(pidl); + if (!pDataW) + { + ERR("Invalid pidl!\n"); + return NULL; + } + + LPWSTR pExtension = PathFindExtensionW(pDataW->wszName); + if (!pExtension || *pExtension == UNICODE_NULL) + { + WARN("No extension for %S!\n", pDataW->wszName); + return NULL; + } + return pExtension; +} + +HRESULT GetCLSIDForFileTypeFromExtension(LPWSTR pExtension, LPCWSTR KeyName, CLSID* pclsid) +{ + HKEY hkeyProgId = OpenKeyFromFileType(pExtension, KeyName); if (!hkeyProgId) { WARN("OpenKeyFromFileType failed for key %S\n", KeyName); @@ -130,6 +124,15 @@ HRESULT GetCLSIDForFileType(PCUIDLIST_RELATIVE pidl, LPCWSTR KeyName, CLSID* pcl return S_OK; } +HRESULT GetCLSIDForFileType(PCUIDLIST_RELATIVE pidl, LPCWSTR KeyName, CLSID* pclsid) +{ + LPWSTR pExtension = ExtensionFromPidl(pidl); + if (!pExtension) + return S_FALSE; + + return GetCLSIDForFileTypeFromExtension(pExtension, KeyName, pclsid); +} + static HRESULT getDefaultIconLocation(LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT uFlags) { @@ -293,7 +296,8 @@ HRESULT CFSExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, RE } else { - HKEY hkey = OpenKeyFromFileType(pidl, L"DefaultIcon"); + LPWSTR pExtension = ExtensionFromPidl(pidl); + HKEY hkey = pExtension ? OpenKeyFromFileType(pExtension, L"DefaultIcon") : NULL; if (!hkey) WARN("Could not open DefaultIcon key!\n"); @@ -342,98 +346,128 @@ including formatting a drive, reconnecting a network share drive, and requesting be inserted in a removable drive. */ -/*********************************************************************** -* IShellFolder implementation -*/ class CFileSysEnum : public CEnumIDListBase { - private: - public: - CFileSysEnum(); - ~CFileSysEnum(); - HRESULT WINAPI Initialize(LPWSTR sPathTarget, DWORD dwFlags); +private: + HRESULT _AddFindResult(LPWSTR sParentDir, const WIN32_FIND_DATAW& FindData, DWORD dwFlags) + { +#define SUPER_HIDDEN (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM) - BEGIN_COM_MAP(CFileSysEnum) - COM_INTERFACE_ENTRY_IID(IID_IEnumIDList, IEnumIDList) - END_COM_MAP() -}; + // Does it need special handling because it is hidden? + if (FindData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) + { + DWORD dwHidden = FindData.dwFileAttributes & SUPER_HIDDEN; -CFileSysEnum::CFileSysEnum() -{ -} + // Is it hidden, but are we not asked to include hidden? + if (dwHidden == FILE_ATTRIBUTE_HIDDEN && !(dwFlags & SHCONTF_INCLUDEHIDDEN)) + return S_OK; -CFileSysEnum::~CFileSysEnum() -{ -} + // Is it a system file, but are we not asked to include those? + if (dwHidden == SUPER_HIDDEN && !(dwFlags & SHCONTF_INCLUDESUPERHIDDEN)) + return S_OK; + } -HRESULT WINAPI CFileSysEnum::Initialize(LPWSTR lpszPath, DWORD dwFlags) -{ - WIN32_FIND_DATAW stffile; - HANDLE hFile; - WCHAR szPath[MAX_PATH]; - BOOL succeeded = TRUE; - static const WCHAR stars[] = { '*','.','*',0 }; - static const WCHAR dot[] = { '.',0 }; - static const WCHAR dotdot[] = { '.','.',0 }; + BOOL bDirectory = (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; + + LPITEMIDLIST pidl = NULL; + if (bDirectory) + { + if (dwFlags & SHCONTF_FOLDERS) + { + TRACE("(%p)-> (folder=%s)\n", this, debugstr_w(FindData.cFileName)); + pidl = _ILCreateFromFindDataW(&FindData); + } + } + else + { + if (dwFlags & SHCONTF_NONFOLDERS) + { + TRACE("(%p)-> (file =%s)\n", this, debugstr_w(FindData.cFileName)); + pidl = _ILCreateFromFindDataW(&FindData); + } + } + + if (pidl && !AddToEnumList(pidl)) + { + FAILED_UNEXPECTEDLY(E_FAIL); + return E_FAIL; + } - TRACE("(%p)->(path=%s flags=0x%08x)\n", this, debugstr_w(lpszPath), dwFlags); + return S_OK; + } - if(!lpszPath || !lpszPath[0]) return FALSE; +public: + CFileSysEnum() + { - wcscpy(szPath, lpszPath); - PathAddBackslashW(szPath); - wcscat(szPath,stars); + } - hFile = FindFirstFileW(szPath,&stffile); - if ( hFile != INVALID_HANDLE_VALUE ) + ~CFileSysEnum() { - BOOL findFinished = FALSE; + } -#define HIDDEN FILE_ATTRIBUTE_HIDDEN -#define SUPER_HIDDEN (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM) + HRESULT WINAPI Initialize(LPWSTR sPathTarget, DWORD dwFlags) + { + TRACE("(%p)->(path=%s flags=0x%08x)\n", this, debugstr_w(sPathTarget), dwFlags); + + if (!sPathTarget || !sPathTarget[0]) + { + FAILED_UNEXPECTEDLY(E_INVALIDARG); + return E_INVALIDARG; + } + + WCHAR szFindPattern[MAX_PATH]; + HRESULT hr = StringCchCopyW(szFindPattern, _countof(szFindPattern), sPathTarget); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + /* FIXME: UNSAFE CRAP */ + PathAddBackslashW(szFindPattern); + + hr = StringCchCatW(szFindPattern, _countof(szFindPattern), L"*.*"); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + + WIN32_FIND_DATAW FindData; + HANDLE hFind = FindFirstFileW(szFindPattern, &FindData); + if (hFind == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); do { - if ((stffile.dwFileAttributes & HIDDEN) == 0 || - ((dwFlags & SHCONTF_INCLUDEHIDDEN) && - (stffile.dwFileAttributes & SUPER_HIDDEN) == HIDDEN) || - ((dwFlags & SHCONTF_INCLUDESUPERHIDDEN) && - (stffile.dwFileAttributes & SUPER_HIDDEN) == SUPER_HIDDEN)) - { - LPITEMIDLIST pidl = NULL; + hr = _AddFindResult(sPathTarget, FindData, dwFlags); - if ( (stffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && - dwFlags & SHCONTF_FOLDERS && - strcmpW(stffile.cFileName, dot) && strcmpW(stffile.cFileName, dotdot)) - { - pidl = _ILCreateFromFindDataW(&stffile); - succeeded = succeeded && AddToEnumList(pidl); - } - else if (!(stffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - && dwFlags & SHCONTF_NONFOLDERS) - { - pidl = _ILCreateFromFindDataW(&stffile); - succeeded = succeeded && AddToEnumList(pidl); - } - } - if (succeeded) + if (FAILED_UNEXPECTEDLY(hr)) + break; + + } while(FindNextFileW(hFind, &FindData)); + + if (SUCCEEDED(hr)) + { + DWORD dwError = GetLastError(); + if (dwError != ERROR_NO_MORE_FILES) { - if (!FindNextFileW(hFile, &stffile)) - { - if (GetLastError() == ERROR_NO_MORE_FILES) - findFinished = TRUE; - else - succeeded = FALSE; - } + hr = HRESULT_FROM_WIN32(dwError); + FAILED_UNEXPECTEDLY(hr); } - } while (succeeded && !findFinished); - FindClose(hFile); + } + TRACE("(%p)->(hr=0x%08x)\n", this, hr); + FindClose(hFind); + return hr; } - return succeeded; -} + BEGIN_COM_MAP(CFileSysEnum) + COM_INTERFACE_ENTRY_IID(IID_IEnumIDList, IEnumIDList) + END_COM_MAP() +}; + + +/*********************************************************************** + * IShellFolder implementation + */ CFSFolder::CFSFolder() { diff --git a/dll/win32/shell32/folders/CFSFolder.h b/dll/win32/shell32/folders/CFSFolder.h index c5f1d1bf2ae..c88f9f042e8 100644 --- a/dll/win32/shell32/folders/CFSFolder.h +++ b/dll/win32/shell32/folders/CFSFolder.h @@ -1,23 +1,11 @@ /* - * file system folder - * - * Copyright 1997 Marcus Meissner - * Copyright 1998, 1999, 2002 Juergen Schmied - * Copyright 2009 Andrew Hill - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: shell32 + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: file system folder + * COPYRIGHT: Copyright 1997 Marcus Meissner + * Copyright 1998, 1999, 2002 Juergen Schmied + * Copyright 2009 Andrew Hill + * Copyright 2020 Mark Jansen (mark.jansen(a)reactos.org) */ #ifndef _CFSFOLDER_H_ @@ -111,12 +99,12 @@ class CFSFolder : return S_OK; } - DECLARE_REGISTRY_RESOURCEID(IDR_SHELLFSFOLDER) - DECLARE_NOT_AGGREGATABLE(CFSFolder) + DECLARE_REGISTRY_RESOURCEID(IDR_SHELLFSFOLDER) + DECLARE_NOT_AGGREGATABLE(CFSFolder) - DECLARE_PROTECT_FINAL_CONSTRUCT() + DECLARE_PROTECT_FINAL_CONSTRUCT() - BEGIN_COM_MAP(CFSFolder) + BEGIN_COM_MAP(CFSFolder) COM_INTERFACE_ENTRY_IID(IID_IShellFolder2, IShellFolder2) COM_INTERFACE_ENTRY_IID(IID_IShellFolder, IShellFolder) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) @@ -125,7 +113,7 @@ class CFSFolder : COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) COM_INTERFACE_ENTRY_IID(IID_IShellFolderViewCB, IShellFolderViewCB) COM_INTERFACE_ENTRY_IID(IID_IItemNameLimits, IItemNameLimits) - END_COM_MAP() + END_COM_MAP() protected: HRESULT WINAPI GetCustomViewInfo(ULONG unknown, SFVM_CUSTOMVIEWINFO_DATA *data);

1 0

[reactos] 02/06: [SHLWAPI] Fix SHRegGetCLSIDKeyW
by Mark Jansen 17 May '20

17 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac215455bb6a76d2431d4… commit ac215455bb6a76d2431d42b8ab5d1b78dcd35709 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Apr 27 12:53:47 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun May 17 17:09:04 2020 +0200 [SHLWAPI] Fix SHRegGetCLSIDKeyW --- dll/win32/shlwapi/reg.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dll/win32/shlwapi/reg.c b/dll/win32/shlwapi/reg.c index a72f4c24e46..5f9c218a545 100644 --- a/dll/win32/shlwapi/reg.c +++ b/dll/win32/shlwapi/reg.c @@ -2422,16 +2422,32 @@ HRESULT WINAPI SHRegGetCLSIDKeyA(REFGUID guid, LPCSTR lpszValue, BOOL bUseHKCU, HRESULT WINAPI SHRegGetCLSIDKeyW(REFGUID guid, LPCWSTR lpszValue, BOOL bUseHKCU, BOOL bCreate, PHKEY phKey) { +#ifndef __REACTOS__ static const WCHAR szClassIdKey[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'E','x','p','l','o','r','e','r','\\','C','L','S','I','D','\\' }; +#endif #define szClassIdKeyLen (sizeof(szClassIdKey)/sizeof(WCHAR)) WCHAR szKey[MAX_PATH]; DWORD dwRet; HKEY hkey; /* Create the key string */ +#ifdef __REACTOS__ + // https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/reg/reggetc… + WCHAR* ptr; + + wcscpy(szKey, bUseHKCU ? L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CLSID\\" : L"CLSID\\"); + ptr = szKey + wcslen(szKey); + SHStringFromGUIDW(guid, ptr, 39); /* Append guid */ + if (lpszValue) + { + ptr = szKey + wcslen(szKey); + wcscat(ptr, L"\\"); + wcscat(++ptr, lpszValue); + } +#else memcpy(szKey, szClassIdKey, sizeof(szClassIdKey)); SHStringFromGUIDW(guid, szKey + szClassIdKeyLen, 39); /* Append guid */ @@ -2440,6 +2456,7 @@ HRESULT WINAPI SHRegGetCLSIDKeyW(REFGUID guid, LPCWSTR lpszValue, BOOL bUseHKCU, szKey[szClassIdKeyLen + 39] = '\\'; strcpyW(szKey + szClassIdKeyLen + 40, lpszValue); /* Append value name */ } +#endif hkey = bUseHKCU ? HKEY_CURRENT_USER : HKEY_CLASSES_ROOT;

1 0

[reactos] 01/06: [PSDK] Add argument names to SHRegGetValue functions
by Mark Jansen 17 May '20

17 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6a8a9c1458f7b8c91b29… commit c6a8a9c1458f7b8c91b29e4a2606f88cd8592260 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Apr 27 16:00:20 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun May 17 17:08:57 2020 +0200 [PSDK] Add argument names to SHRegGetValue functions --- sdk/include/psdk/shlwapi.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sdk/include/psdk/shlwapi.h b/sdk/include/psdk/shlwapi.h index 65f9db98312..6c796acfc38 100644 --- a/sdk/include/psdk/shlwapi.h +++ b/sdk/include/psdk/shlwapi.h @@ -262,23 +262,23 @@ typedef INT SRRF; LSTATUS WINAPI SHRegGetValueA( - _In_ HKEY, - _In_opt_ LPCSTR, - _In_opt_ LPCSTR, - _In_ SRRF, - _Out_opt_ LPDWORD, - _Out_writes_bytes_to_opt_(*pcbData, *pcbData) LPVOID, + _In_ HKEY hkey, + _In_opt_ LPCSTR pszSubKey, + _In_opt_ LPCSTR pszValue, + _In_ SRRF srrfFlags, + _Out_opt_ LPDWORD pdwType, + _Out_writes_bytes_to_opt_(*pcbData, *pcbData) LPVOID pvData, _Inout_opt_ LPDWORD pcbData); LSTATUS WINAPI SHRegGetValueW( - _In_ HKEY, - _In_opt_ LPCWSTR, - _In_opt_ LPCWSTR, - _In_ SRRF, - _Out_opt_ LPDWORD, - _Out_writes_bytes_to_opt_(*pcbData, *pcbData) LPVOID, + _In_ HKEY hkey, + _In_opt_ LPCWSTR pszSubKey, + _In_opt_ LPCWSTR pszValue, + _In_ SRRF srrfFlags, + _Out_opt_ LPDWORD pdwType, + _Out_writes_bytes_to_opt_(*pcbData, *pcbData) LPVOID pvData, _Inout_opt_ LPDWORD pcbData); #define SHRegGetValue WINELIB_NAME_AW(SHRegGetValue)

1 0

[reactos] 01/01: [NTOS:SE] Implement job case in PsImpersonateClient. CORE-8787
by Thomas Faber 17 May '20

17 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db180c29c7be2794e18d5… commit db180c29c7be2794e18d5dc0622495e5427bfe94 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon May 11 08:41:38 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun May 17 16:05:00 2020 +0200 [NTOS:SE] Implement job case in PsImpersonateClient. CORE-8787 --- ntoskrnl/ps/security.c | 30 ++++++++++++++++++++++++++++-- sdk/include/ndk/pstypes.h | 8 ++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ps/security.c b/ntoskrnl/ps/security.c index 619ff56d247..0b3f97fbf06 100644 --- a/ntoskrnl/ps/security.c +++ b/ntoskrnl/ps/security.c @@ -615,6 +615,8 @@ PsImpersonateClient(IN PETHREAD Thread, { PPS_IMPERSONATION_INFORMATION Impersonation, OldData; PTOKEN OldToken = NULL; + PEJOB Job; + PAGED_CODE(); PSTRACE(PS_SECURITY_DEBUG, "Thread: %p, Token: %p\n", Thread, Token); @@ -668,8 +670,32 @@ PsImpersonateClient(IN PETHREAD Thread, } } - /* Check if this is a job, which we don't support yet */ - if (Thread->ThreadsProcess->Job) ASSERT(FALSE); + /* FIXME: If the process token can't impersonate, we need to make a copy instead */ + + /* Check if this is a job */ + Job = Thread->ThreadsProcess->Job; + if (Job != NULL) + { + /* No admin allowed in this job */ + if ((Job->SecurityLimitFlags & JOB_OBJECT_SECURITY_NO_ADMIN) && + SeTokenIsAdmin(Token)) + { + return STATUS_ACCESS_DENIED; + } + + /* No restricted tokens allowed in this job */ + if ((Job->SecurityLimitFlags & JOB_OBJECT_SECURITY_RESTRICTED_TOKEN) && + SeTokenIsRestricted(Token)) + { + return STATUS_ACCESS_DENIED; + } + + /* We don't support job filters yet */ + if (Job->Filter != NULL) + { + ASSERT(Job->Filter == NULL); + } + } /* Lock thread security */ PspLockThreadSecurityExclusive(Thread); diff --git a/sdk/include/ndk/pstypes.h b/sdk/include/ndk/pstypes.h index 219b880368f..55839aca37a 100644 --- a/sdk/include/ndk/pstypes.h +++ b/sdk/include/ndk/pstypes.h @@ -216,6 +216,14 @@ extern POBJECT_TYPE NTSYSAPI PsJobType; #define JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK 0x1000 #define JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE 0x2000 +// +// Job Security Limit Flags +// +#define JOB_OBJECT_SECURITY_NO_ADMIN 0x0001 +#define JOB_OBJECT_SECURITY_RESTRICTED_TOKEN 0x0002 +#define JOB_OBJECT_SECURITY_ONLY_TOKEN 0x0004 +#define JOB_OBJECT_SECURITY_FILTER_TOKENS 0x0008 + // // Cross Thread Flags //

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