Ros-diffs December 2021

ros-diffs@reactos.org

33 participants
155 discussions

[reactos] 01/01: [WIN32SS][NTDDRAW] Improve DxEngGetDCState type 2 implementation (#4176)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a6312abda24d11d6c9ab… commit 8a6312abda24d11d6c9abfe133013b32e4aef3e6 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Mon Dec 20 20:27:13 2021 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 20 21:27:13 2021 +0100 [WIN32SS][NTDDRAW] Improve DxEngGetDCState type 2 implementation (#4176) - Use the REGION_Complexity() function to get the actual region complexity instead of just number of rectangles. - Don't use prgnRao at all, because it is always uninitialized when passed to the function. So in condition between prgnRao and prgnVis, the 2nd one always succeeds. - Update the comment accordingly. - Additionally, add a DPRINT to the end of the function, which displays the returned value. This allows to properly enable and use DirectDraw and Direct3D hardware acceleration with the following MS DirectX components: ddraw.dll, d3d8.dll, d3d9.dll and dxg.sys. As in VM, same on real hardware. But note that now the bugcheck 0x50 (PAGE_FAULT_IN_NONPAGED_AREA) occurs when executing fullscreen DDraw apps, after switching display mode. It's unhidden by this fix. Addendum to 855bf46. CORE-17561 --- win32ss/reactx/ntddraw/dxeng.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/win32ss/reactx/ntddraw/dxeng.c b/win32ss/reactx/ntddraw/dxeng.c index 24cb542643e..7004e58e480 100644 --- a/win32ss/reactx/ntddraw/dxeng.c +++ b/win32ss/reactx/ntddraw/dxeng.c @@ -464,8 +464,8 @@ DxEngGetDCState(HDC hDC, retVal = (DWORD_PTR) pDC->fs & DC_FLAG_FULLSCREEN; break; case 2: - /* Return the number of rectangles in the visible region. */ - retVal = (DWORD_PTR) pDC->prgnRao ? pDC->prgnRao->rdh.nCount : pDC->prgnVis->rdh.nCount; + /* Return the complexity of the visible region. */ + retVal = (DWORD_PTR) REGION_Complexity(pDC->prgnVis); break; case 3: { @@ -481,6 +481,8 @@ DxEngGetDCState(HDC hDC, DC_UnlockDc(pDC); } + DPRINT1("Return value %08lx\n", retVal); + return retVal; }

3 years

[reactos] 01/01: [NTFS][UDFS] Fix build with NDEBUG undefined (#4171)

by Ronny Borchert

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d33a2056ed6fa26b3e94… commit 9d33a2056ed6fa26b3e94cfcfb073e311e977ecd Author: Ronny Borchert <rborchert(a)live.de> AuthorDate: Fri Dec 17 23:21:01 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 20 21:19:53 2021 +0100 [NTFS][UDFS] Fix build with NDEBUG undefined (#4171) - Fix DumpBTreeNode() parameters in ntfs/btree.c - Comment out unused variable in env_spec.cpp - Fix missed brackets in else clause in wcache_lib.cpp --- drivers/filesystems/ntfs/btree.c | 6 +++--- drivers/filesystems/udfs/Include/wcache_lib.cpp | 3 ++- drivers/filesystems/udfs/env_spec.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/filesystems/ntfs/btree.c b/drivers/filesystems/ntfs/btree.c index e8462ae8308..ed53df2c8f0 100644 --- a/drivers/filesystems/ntfs/btree.c +++ b/drivers/filesystems/ntfs/btree.c @@ -1901,7 +1901,7 @@ SplitBTreeNode(PB_TREE Tree, CaseSensitive ? "TRUE" : "FALSE"); #ifndef NDEBUG - DumpBTreeNode(Node, 0, 0); + DumpBTreeNode(Tree, Node, 0, 0); #endif // Create the right hand sibling @@ -2020,10 +2020,10 @@ SplitBTreeNode(PB_TREE Tree, #ifndef NDEBUG DPRINT1("Left-hand node after split:\n"); - DumpBTreeNode(Node, 0, 0); + DumpBTreeNode(Tree, Node, 0, 0); DPRINT1("Right-hand sibling node after split:\n"); - DumpBTreeNode(*NewRightHandSibling, 0, 0); + DumpBTreeNode(Tree, *NewRightHandSibling, 0, 0); #endif return STATUS_SUCCESS; diff --git a/drivers/filesystems/udfs/Include/wcache_lib.cpp b/drivers/filesystems/udfs/Include/wcache_lib.cpp index 2ab2a2dbf01..dc933aa260a 100644 --- a/drivers/filesystems/udfs/Include/wcache_lib.cpp +++ b/drivers/filesystems/udfs/Include/wcache_lib.cpp @@ -1128,10 +1128,11 @@ WCacheUpdatePacket( (PVOID)WCacheSectorAddr(block_array, Lba0), BS) != BS); } - if(mod) + if(mod) { DbgCopyMemory(tmp_buff2 + (i << BSh), (PVOID)WCacheSectorAddr(block_array, Lba0), BS); + } } } diff --git a/drivers/filesystems/udfs/env_spec.cpp b/drivers/filesystems/udfs/env_spec.cpp index 32dc56181c0..93bb08322c6 100644 --- a/drivers/filesystems/udfs/env_spec.cpp +++ b/drivers/filesystems/udfs/env_spec.cpp @@ -307,7 +307,7 @@ UDFPhWriteSynchronous( KeQuerySystemTime((PLARGE_INTEGER)&IoEnterTime); #endif //MEASURE_IO_PERFORMANCE -#if defined UDF_DBG || defined USE_PERF_PRINT +#ifdef USE_PERF_PRINT ULONG Lba = (ULONG)(Offset>>0xb); // ASSERT(!(Lba & (32-1))); PerfPrint(("UDFPhWrite: Length: %x Lba: %lx\n",Length>>0xb,Lba));

3 years

[reactos] 01/01: [HALX86] HalpDmaAllocateChildAdapter(): Fix memory leak, on error (#4156)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fd3e515808e6c0cc4dd2… commit 0fd3e515808e6c0cc4dd2c662133aeb6e3f9e7b2 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Dec 20 21:14:36 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 20 21:14:36 2021 +0100 [HALX86] HalpDmaAllocateChildAdapter(): Fix memory leak, on error (#4156) Simplify code, instead of adding 2 missing ObDereferenceObject(). (Note that ObInsertObject() always dereferences the object in case of failure.) CORE-17904 --- hal/halx86/generic/dma.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hal/halx86/generic/dma.c b/hal/halx86/generic/dma.c index 19d70517b5f..2966a5b2983 100644 --- a/hal/halx86/generic/dma.c +++ b/hal/halx86/generic/dma.c @@ -477,12 +477,6 @@ HalpDmaAllocateChildAdapter(IN ULONG NumberOfMapRegisters, (PVOID)&AdapterObject); if (!NT_SUCCESS(Status)) return NULL; - Status = ObReferenceObjectByPointer(AdapterObject, - FILE_READ_DATA | FILE_WRITE_DATA, - IoAdapterObjectType, - KernelMode); - if (!NT_SUCCESS(Status)) return NULL; - RtlZeroMemory(AdapterObject, sizeof(ADAPTER_OBJECT)); Status = ObInsertObject(AdapterObject, @@ -493,6 +487,8 @@ HalpDmaAllocateChildAdapter(IN ULONG NumberOfMapRegisters, &Handle); if (!NT_SUCCESS(Status)) return NULL; + ObReferenceObject(AdapterObject); + ZwClose(Handle); AdapterObject->DmaHeader.Version = (USHORT)DeviceDescription->Version;

3 years

[reactos] 01/01: [KEYBOARD] Switch to QWERTZ for Croatian keyboard layout (#4177)

by Andrej Bartulin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2196a06fc1d11243899e3… commit 2196a06fc1d11243899e36124c965ee0399bd31b Author: Andrej Bartulin <andrej.bartulinvr(a)gmail.com> AuthorDate: Mon Dec 20 15:23:16 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 20 15:23:16 2021 +0100 [KEYBOARD] Switch to QWERTZ for Croatian keyboard layout (#4177) --- dll/keyboard/kbdcr/kbdcr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/keyboard/kbdcr/kbdcr.c b/dll/keyboard/kbdcr/kbdcr.c index 87345c22187..64f26976dc7 100644 --- a/dll/keyboard/kbdcr/kbdcr.c +++ b/dll/keyboard/kbdcr/kbdcr.c @@ -41,7 +41,7 @@ ROSDATA USHORT scancode_to_vk[] = { /* - 0f - */ /* First Letters Row */ VK_TAB, 'Q', 'W', 'E', - 'R', 'T', 'Y', 'U', + 'R', 'T', 'Z', 'U', 'I', 'O', 'P', VK_OEM_4, VK_OEM_6, VK_RETURN, /* - 1d - */ @@ -53,7 +53,7 @@ ROSDATA USHORT scancode_to_vk[] = { VK_LSHIFT, VK_OEM_5, /* - 2c - */ /* Third letters row */ - 'Z', 'X', 'C', 'V', + 'Y', 'X', 'C', 'V', 'B', 'N', 'M', VK_OEM_COMMA, VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KBDEXT, /* - 37 - */

3 years

[reactos] 01/01: [STORPROP] Fix MSVC build. Addendum to 9a7bd386

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2bf37e73e5f091907fba3… commit 2bf37e73e5f091907fba39ae40c594a28f548369 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Dec 20 02:46:47 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Dec 20 02:46:47 2021 +0300 [STORPROP] Fix MSVC build. Addendum to 9a7bd386 --- dll/win32/storprop/resource.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/storprop/resource.h b/dll/win32/storprop/resource.h index 89c57e0cb82..8b16e0e26d6 100644 --- a/dll/win32/storprop/resource.h +++ b/dll/win32/storprop/resource.h @@ -2,4 +2,4 @@ #define IDD_DISK_POLICIES 100 #define IDC_QUICK_REMOVAL_BUTTON 101 -#define IDC_BETTER_PERFORMANCE_BUTTON 102 \ No newline at end of file +#define IDC_BETTER_PERFORMANCE_BUTTON 102

3 years

[reactos] 01/01: [STORPROP] Add missing stubs and move some functions around

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a7bd386b9b38fa591733… commit 9a7bd386b9b38fa5917331502a9d3de92b199b9f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 20 00:08:06 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 20 00:08:06 2021 +0100 [STORPROP] Add missing stubs and move some functions around --- dll/win32/storprop/CMakeLists.txt | 13 ++-- dll/win32/storprop/disk.c | 116 ++++++++++++++++++++++++++++++++++++ dll/win32/storprop/dvd.c | 122 ++++++++++++++++++++++++++++++++++++++ dll/win32/storprop/ide.c | 29 +++++++++ dll/win32/storprop/lang/en-US.rc | 18 ++++++ dll/win32/storprop/precomp.h | 21 +++++++ dll/win32/storprop/resource.h | 4 ++ dll/win32/storprop/storprop.c | 76 +----------------------- dll/win32/storprop/storprop.spec | 9 +-- 9 files changed, 326 insertions(+), 82 deletions(-) diff --git a/dll/win32/storprop/CMakeLists.txt b/dll/win32/storprop/CMakeLists.txt index 3244c669a6d..7cb5ce5dae6 100644 --- a/dll/win32/storprop/CMakeLists.txt +++ b/dll/win32/storprop/CMakeLists.txt @@ -1,13 +1,18 @@ spec2def(storprop.dll storprop.spec) +list(APPEND SOURCE + disk.c + dvd.c + ide.c + storprop.c) + add_library(storprop MODULE - storprop.c + ${SOURCE} 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_importlibs(storprop setupapi comctl32 advapi32 user32 msvcrt kernel32 ntdll) +add_pch(storprop precomp.h SOURCE) add_cd_file(TARGET storprop DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/storprop/disk.c b/dll/win32/storprop/disk.c new file mode 100644 index 00000000000..cf45c29b7bf --- /dev/null +++ b/dll/win32/storprop/disk.c @@ -0,0 +1,116 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Storage device properties + * COPYRIGHT: 2021 Eric Kohl (eric.kohl(a)reactos.org) + */ + +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + + +static +INT_PTR +CALLBACK +DiskPropPageDialog( + _In_ HWND hwnd, + _In_ UINT uMsg, + _In_ WPARAM wParam, + _In_ LPARAM lParam) +{ + DPRINT1("DiskPropPageDialog()\n"); + + switch (uMsg) + { + case WM_INITDIALOG: + return TRUE; //OnInitDialog(hwnd, wParam, lParam); + + case WM_COMMAND: + EndDialog(hwnd, 0); //OnCommand(hwnd, wParam, lParam); + break; +/* + case WM_NOTIFY: + OnNotify(hwnd, wParam, lParam); + break; + + case WM_DESTROY: + OnDestroy(hwnd); + break; +*/ + } + + return FALSE; +} + + +/* + * @unimplemented + */ +DWORD +WINAPI +DiskClassInstaller( + _In_ DI_FUNCTION InstallFunction, + _In_ HDEVINFO DeviceInfoSet, + _In_ PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + SP_ADDPROPERTYPAGE_DATA AddPropertyPageData = {0}; + PROPSHEETPAGE Page; + HPROPSHEETPAGE PageHandle; + + DPRINT1("DiskClassInstaller(%u %p %p)\n", + InstallFunction, DeviceInfoSet, DeviceInfoData); + + if (InstallFunction == DIF_ADDPROPERTYPAGE_ADVANCED) + { + if (DeviceInfoData == NULL) + return ERROR_DI_DO_DEFAULT; + + AddPropertyPageData.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER); + if (SetupDiGetClassInstallParamsW(DeviceInfoSet, + DeviceInfoData, + (PSP_CLASSINSTALL_HEADER)&AddPropertyPageData, + sizeof(SP_ADDPROPERTYPAGE_DATA), + NULL)) + { + DPRINT1("\n"); + if (AddPropertyPageData.NumDynamicPages >= MAX_INSTALLWIZARD_DYNAPAGES) + return ERROR_SUCCESS; + + ZeroMemory(&Page, sizeof(PROPSHEETPAGE)); + Page.dwSize = sizeof(PROPSHEETPAGE); + Page.dwFlags = PSP_USECALLBACK; + Page.hInstance = hInstance; + Page.pszTemplate = MAKEINTRESOURCE(IDD_DISK_POLICIES); + Page.pfnDlgProc = DiskPropPageDialog; + Page.pfnCallback = NULL; //DiskPropPageCallback; + Page.lParam = (LPARAM)NULL; + + PageHandle = CreatePropertySheetPage(&Page); + if (PageHandle == NULL) + { + DPRINT1("CreatePropertySheetPage() failed!\n"); + return ERROR_SUCCESS; + } + + AddPropertyPageData.DynamicPages[AddPropertyPageData.NumDynamicPages] = PageHandle; + AddPropertyPageData.NumDynamicPages++; + DPRINT1("Pages: %ld\n", AddPropertyPageData.NumDynamicPages); + + if (!SetupDiSetClassInstallParamsW(DeviceInfoSet, + DeviceInfoData, + (PSP_CLASSINSTALL_HEADER)&AddPropertyPageData, + sizeof(SP_ADDPROPERTYPAGE_DATA))) + { + DPRINT1("SetupDiSetClassInstallParamsW() failed (Error %lu)\n", GetLastError()); + } + } + + return ERROR_SUCCESS; + } + + return ERROR_DI_DO_DEFAULT; +} + +/* EOF */ diff --git a/dll/win32/storprop/dvd.c b/dll/win32/storprop/dvd.c new file mode 100644 index 00000000000..2c527843377 --- /dev/null +++ b/dll/win32/storprop/dvd.c @@ -0,0 +1,122 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Storage device properties + * COPYRIGHT: 2021 Eric Kohl (eric.kohl(a)reactos.org) + */ + +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + + +/* + * @unimplemented + */ +LONG +WINAPI +CdromDisableDigitalPlayback( + _In_ HDEVINFO DeviceInfoSet, + _In_ PSP_DEVINFO_DATA DeviceInfoData) +{ + DPRINT1("CdromDisableDigitalPlayback(%p %p)\n", + DeviceInfoSet, DeviceInfoData); + return ERROR_SUCCESS; +} + + +/* + * @unimplemented + */ +LONG +WINAPI +CdromEnableDigitalPlayback( + _In_ HDEVINFO DeviceInfoSet, + _In_ PSP_DEVINFO_DATA DeviceInfoData, + _In_ BOOLEAN ForceUnknown) +{ + DPRINT1("CdromEnableDigitalPlayback(%p %p %u)\n", + DeviceInfoSet, DeviceInfoData, ForceUnknown); + return ERROR_SUCCESS; +} + + +/* + * @unimplemented + */ +LONG +WINAPI +CdromIsDigitalPlaybackEnabled( + _In_ HDEVINFO DeviceInfoSet, + _In_ PSP_DEVINFO_DATA DeviceInfoData, + _Out_ PBOOLEAN Enabled) +{ + DPRINT1("CdromIsDigitalPlaybackEnabled(%p %p %p)\n", + DeviceInfoSet, DeviceInfoData, Enabled); + return ERROR_SUCCESS; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +CdromKnownGoodDigitalPlayback( + _In_ HDEVINFO DeviceInfoSet, + _In_ PSP_DEVINFO_DATA DeviceInfoData) +{ + DPRINT1("CdromKnownGoodDigitalPlayback(%p %p)\n", + DeviceInfoSet, DeviceInfoData); + return TRUE; +} + + +/* + * @unimplemented + */ +DWORD +WINAPI +DvdClassInstaller( + _In_ DI_FUNCTION InstallFunction, + _In_ HDEVINFO DeviceInfoSet, + _In_ PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + DPRINT1("DvdClassInstaller(%u %p %p)\n", + InstallFunction, DeviceInfoSet, DeviceInfoData); + + return ERROR_DI_DO_DEFAULT; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +DvdPropPageProvider( + _In_ PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, + _In_ LPFNADDPROPSHEETPAGE lpfnAddPropSheetPageProc, + _In_ LPARAM lParam) +{ + DPRINT1("DvdPropPageProvider(%p %p %lx)\n", + lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +DvdLauncher( + _In_ HWND HWnd, + _In_ CHAR DriveLetter) +{ + DPRINT1("DvdLauncher(%p %c)\n", HWnd, DriveLetter); + return FALSE; +} + +/* EOF */ diff --git a/dll/win32/storprop/ide.c b/dll/win32/storprop/ide.c new file mode 100644 index 00000000000..72559dd6b8a --- /dev/null +++ b/dll/win32/storprop/ide.c @@ -0,0 +1,29 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Storage device properties + * COPYRIGHT: 2021 Eric Kohl (eric.kohl(a)reactos.org) + */ + +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + + +/* + * @unimplemented + */ +BOOL +WINAPI +IdePropPageProvider( + _In_ PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, + _In_ LPFNADDPROPSHEETPAGE lpfnAddPropSheetPageProc, + _In_ LPARAM lParam) +{ + DPRINT1("IdePropPageProvider(%p %p %lx)\n", + lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); + return FALSE; +} + +/* EOF */ diff --git a/dll/win32/storprop/lang/en-US.rc b/dll/win32/storprop/lang/en-US.rc new file mode 100644 index 00000000000..401da1572e3 --- /dev/null +++ b/dll/win32/storprop/lang/en-US.rc @@ -0,0 +1,18 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Storage device properties + * COPYRIGHT: 2021 Eric Kohl (eric.kohl(a)reactos.org) + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_DISK_POLICIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Policies" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Removal Policy", -1, 7, 7, 238, 204 + AUTORADIOBUTTON "Quick removal", IDC_QUICK_REMOVAL_BUTTON, 14, 28, 127, 10 + AUTORADIOBUTTON "Better performance", IDC_BETTER_PERFORMANCE_BUTTON, 14, 28, 127, 10 +END diff --git a/dll/win32/storprop/precomp.h b/dll/win32/storprop/precomp.h new file mode 100644 index 00000000000..c9a9bae0fe6 --- /dev/null +++ b/dll/win32/storprop/precomp.h @@ -0,0 +1,21 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Storage device properties + * COPYRIGHT: 2021 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> + +#include "resource.h" + +extern HINSTANCE hInstance; + +/* EOF */ diff --git a/dll/win32/storprop/resource.h b/dll/win32/storprop/resource.h index 6f70f09beec..89c57e0cb82 100644 --- a/dll/win32/storprop/resource.h +++ b/dll/win32/storprop/resource.h @@ -1 +1,5 @@ #pragma once + +#define IDD_DISK_POLICIES 100 +#define IDC_QUICK_REMOVAL_BUTTON 101 +#define IDC_BETTER_PERFORMANCE_BUTTON 102 \ No newline at end of file diff --git a/dll/win32/storprop/storprop.c b/dll/win32/storprop/storprop.c index 7a07a3bff82..d1967421216 100644 --- a/dll/win32/storprop/storprop.c +++ b/dll/win32/storprop/storprop.c @@ -5,86 +5,13 @@ * 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> +#include "precomp.h" #define NDEBUG #include <debug.h> HINSTANCE hInstance = NULL; -/* - * @unimplemented - */ -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); - - if (InstallFunction == DIF_ADDPROPERTYPAGE_ADVANCED) - { - return ERROR_SUCCESS; - } - - return ERROR_DI_DO_DEFAULT; -} - -/* - * @unimplemented - */ -DWORD -WINAPI -DvdClassInstaller( - _In_ DI_FUNCTION InstallFunction, - _In_ HDEVINFO DeviceInfoSet, - _In_ PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) -{ - DPRINT("DvdClassInstaller(%u %p %p)\n", - InstallFunction, DeviceInfoSet, DeviceInfoData); - - return ERROR_DI_DO_DEFAULT; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -DvdPropPageProvider( - _In_ PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, - _In_ LPFNADDPROPSHEETPAGE lpfnAddPropSheetPageProc, - _In_ LPARAM lParam) -{ - DPRINT("DvdPropPageProvider(%p %p %lx)\n", - lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -IdePropPageProvider( - _In_ PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, - _In_ LPFNADDPROPSHEETPAGE lpfnAddPropSheetPageProc, - _In_ LPARAM lParam) -{ - DPRINT("IdePropPageProvider(%p %p %lx)\n", - lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); - return FALSE; -} /* * @implemented @@ -101,6 +28,7 @@ VolumePropPageProvider( return FALSE; } + BOOL WINAPI DllMain( diff --git a/dll/win32/storprop/storprop.spec b/dll/win32/storprop/storprop.spec index f0d37a3bb16..49c080b58d7 100644 --- a/dll/win32/storprop/storprop.spec +++ b/dll/win32/storprop/storprop.spec @@ -1,10 +1,11 @@ -@ stub CdromDisableDigitalPlayback -@ stub CdromEnableDigitalPlayback -@ stub CdromIsDigitalPlaybackEnabled +@ stdcall CdromDisableDigitalPlayback(ptr ptr) +@ stdcall CdromEnableDigitalPlayback(ptr ptr long) +@ stdcall CdromIsDigitalPlaybackEnabled(ptr ptr ptr) +@ stdcall CdromKnownGoodDigitalPlayback(ptr ptr) @ stdcall DiskClassInstaller(long ptr ptr) @ stdcall DllMain(ptr long ptr) @ stdcall DvdClassInstaller(long ptr ptr) -@ stub DvdLauncher +@ stdcall DvdLauncher(ptr long) @ stdcall DvdPropPageProvider(ptr ptr long) @ stdcall IdePropPageProvider(ptr ptr long) @ stdcall VolumePropPageProvider(ptr ptr long)

3 years

[reactos] 01/01: [WIN32K:NTUSER] Make sure to hold User Global Lock before mapping desktop heap (#4144)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d375b7f6c5f6d78830670… commit d375b7f6c5f6d78830670e88b7ea9063598d4354 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Dec 19 23:34:35 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 19 23:34:35 2021 +0100 [WIN32K:NTUSER] Make sure to hold User Global Lock before mapping desktop heap (#4144) Addendum to 8c098ee8d. CORE-17890 --- win32ss/user/ntuser/desktop.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index 4d8f2956b44..43120cc7750 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -202,12 +202,16 @@ NTAPI IntDesktopObjectOpen( _In_ PVOID Parameters) { + NTSTATUS Ret; PWIN32_OPENMETHOD_PARAMETERS OpenParameters = Parameters; PPROCESSINFO ppi = PsGetProcessWin32Process(OpenParameters->Process); if (ppi == NULL) return STATUS_SUCCESS; - return IntMapDesktopView((PDESKTOP)OpenParameters->Object); + UserEnterExclusive(); + Ret = IntMapDesktopView((PDESKTOP)OpenParameters->Object); + UserLeave(); + return Ret; } NTSTATUS

3 years

[reactos] 01/01: [WIN32SS] Do not remove message from the Msg Queue if it is not for us. (#4129)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d1b50394b90b94f5d08e… commit 7d1b50394b90b94f5d08ecb2b248e421ae2a1c5d Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Dec 19 09:03:22 2021 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 19 16:03:22 2021 +0100 [WIN32SS] Do not remove message from the Msg Queue if it is not for us. (#4129) CORE-8217 Patch from 'I_Kill_Bugs' contributor. --- win32ss/user/ntuser/msgqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/msgqueue.c b/win32ss/user/ntuser/msgqueue.c index 354475a8aa8..c82245f6d2d 100644 --- a/win32ss/user/ntuser/msgqueue.c +++ b/win32ss/user/ntuser/msgqueue.c @@ -1524,7 +1524,7 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, BOOL* NotForUs, L { // This is not for us and we should leave so the other thread can check for messages!!! *NotForUs = TRUE; - *RemoveMessages = TRUE; + *RemoveMessages = FALSE; return FALSE; }

3 years

[reactos] 01/01: [MSI] Remove read-only bit when copying the package file

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63bb43adbb83f47df121d… commit 63bb43adbb83f47df121d00e7578490bf59b5c01 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Feb 12 14:46:56 2021 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Dec 18 15:44:04 2021 +0300 [MSI] Remove read-only bit when copying the package file CopyFileW also copies the file attributes, and the copy will be opened with write access later on. This is import of Wine commit: https://source.winehq.org/git/wine.git/commit/e830975806df9ef283c89f7153b06… Fixes MS Office 2000/2003 installers and probably others. CORE-17693 --- dll/win32/msi/package.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c index 5aa3dd0e128..f65e2eea4cf 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -1498,6 +1498,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) r = get_local_package( file, localfile ); if (r != ERROR_SUCCESS || GetFileAttributesW( localfile ) == INVALID_FILE_ATTRIBUTES) { + DWORD localfile_attr; + r = msi_create_empty_local_file( localfile, dotmsi ); if (r != ERROR_SUCCESS) { @@ -1514,6 +1516,11 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) return r; } delete_on_close = TRUE; + + /* Remove read-only bit, we are opening it with write access in MSI_OpenDatabaseW below. */ + localfile_attr = GetFileAttributesW( localfile ); + if (localfile_attr & FILE_ATTRIBUTE_READONLY) + SetFileAttributesW( localfile, localfile_attr & ~FILE_ATTRIBUTE_READONLY); } TRACE("opening package %s\n", debugstr_w( localfile )); r = MSI_OpenDatabaseW( localfile, MSIDBOPEN_TRANSACT, &db );

3 years

[reactos] 01/01: [TASKMGR] Make 'Hide When Minimized' non-default (#4169)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8a7e0da2bcbd842f95e4… commit e8a7e0da2bcbd842f95e4224e72bfb5d748dbd05 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 18 18:21:32 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 18 18:21:32 2021 +0900 [TASKMGR] Make 'Hide When Minimized' non-default (#4169) HideWhenMinimized = FALSE; at LoadSettings function. AlwaysOnTop = TRUE; at LoadSettings function. --- base/applications/taskmgr/taskmgr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/taskmgr/taskmgr.c b/base/applications/taskmgr/taskmgr.c index 1708c12b734..12cec3bcb52 100644 --- a/base/applications/taskmgr/taskmgr.c +++ b/base/applications/taskmgr/taskmgr.c @@ -863,9 +863,9 @@ void LoadSettings(void) TaskManagerSettings.ActiveTabPage = 0; /* Options menu settings */ - TaskManagerSettings.AlwaysOnTop = FALSE; + TaskManagerSettings.AlwaysOnTop = TRUE; TaskManagerSettings.MinimizeOnUse = TRUE; - TaskManagerSettings.HideWhenMinimized = TRUE; + TaskManagerSettings.HideWhenMinimized = FALSE; TaskManagerSettings.Show16BitTasks = TRUE; /* Update speed settings */ @@ -875,7 +875,7 @@ void LoadSettings(void) TaskManagerSettings.ViewMode = ID_VIEW_DETAILS; /* Processes page settings */ - TaskManagerSettings.ShowProcessesFromAllUsers = FALSE; /* Server-only? */ + TaskManagerSettings.ShowProcessesFromAllUsers = FALSE; /* It's the default */ for (i = 0; i < COLUMN_NMAX; i++) { TaskManagerSettings.Columns[i] = ColumnPresets[i].bDefaults;

3 years

← Newer
1
...
7
8
9
10
11
12
13
...
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 December 2021