Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [COMSUPP] Relicense as BSD.
by Thomas Faber 16 Mar '22

16 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be336316295278be728ea… commit be336316295278be728ea81156f77e24e7ed193a Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Mar 15 22:09:16 2022 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Mar 15 22:54:17 2022 -0400 [COMSUPP] Relicense as BSD. --- sdk/lib/comsupp/comsupp.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sdk/lib/comsupp/comsupp.cpp b/sdk/lib/comsupp/comsupp.cpp index 05152224502..a3e096496d9 100644 --- a/sdk/lib/comsupp/comsupp.cpp +++ b/sdk/lib/comsupp/comsupp.cpp @@ -1,8 +1,9 @@ /* - * PROJECT: ReactOS crt library - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Compiler support for COM - * PROGRAMMER: Thomas Faber (thomas.faber(a)reactos.org) + * PROJECT: ReactOS crt library + * LICENSE: BSD-2-Clause (https://spdx.org/licenses/BSD-2-Clause) + * PURPOSE: Compiler support for COM + * COPYRIGHT: Copyright 2013 Thomas Faber (thomas.faber(a)reactos.org) + * Copyright 2015 Hermès Bélusca-Maïto (hermes.belusca-maito(a)reactos.org) */ #include <stdarg.h>

1 0

[reactos] 01/01: [NETCFGX] Fix uninitialized variable use.
by Thomas Faber 13 Mar '22

13 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=680f103f3d52bf46b41eb… commit 680f103f3d52bf46b41eb5249c17d097ac55a3c2 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 19 09:49:27 2022 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Mar 13 16:20:44 2022 -0400 [NETCFGX] Fix uninitialized variable use. --- dll/win32/netcfgx/propertypage.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dll/win32/netcfgx/propertypage.c b/dll/win32/netcfgx/propertypage.c index 3742e1bfe8f..d0a49e2906a 100644 --- a/dll/win32/netcfgx/propertypage.c +++ b/dll/win32/netcfgx/propertypage.c @@ -594,13 +594,11 @@ BuildParameterArray( dwDefaultMin = 0UL; dwDefaultMax = 65535UL; // MAX_WORD; } -#if 0 else if (ParamArray->Array[dwIndex].Type == DWORD_TYPE) { dwDefaultMin = 0UL; dwDefaultMax = 4294967295UL; //MAX_DWORD; } -#endif if (ParamArray->Array[dwIndex].Type == INT_TYPE || ParamArray->Array[dwIndex].Type == LONG_TYPE)

1 0

[reactos] 01/01: [DISKPART] Fix GCC build. Addendum to 28d565ae9af.
by Stanislav Motylkov 13 Mar '22

13 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3f3a97b1e757f86edf30… commit d3f3a97b1e757f86edf30206777b3c9a33f7afcd Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Mar 13 17:58:06 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Mar 13 17:58:06 2022 +0300 [DISKPART] Fix GCC build. Addendum to 28d565ae9af. --- base/system/diskpart/list.c | 1 - 1 file changed, 1 deletion(-) diff --git a/base/system/diskpart/list.c b/base/system/diskpart/list.c index 5b3d6438969..dd7e54c8f38 100644 --- a/base/system/diskpart/list.c +++ b/base/system/diskpart/list.c @@ -13,7 +13,6 @@ /* FUNCTIONS ******************************************************************/ -static ULONGLONG RoundingDivide( IN ULONGLONG Dividend,

1 0

[reactos] 01/01: [DISKPART] Add dump command to dump a sector of a disk or partition
by Eric Kohl 13 Mar '22

13 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2aaa28436e47180ffb72… commit a2aaa28436e47180ffb72397571fac02d8f61a08 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 13 14:20:47 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 13 14:26:10 2022 +0100 [DISKPART] Add dump command to dump a sector of a disk or partition Select a disk and run "dump disk 0" to dump the MBR of the disk. --- base/system/diskpart/dump.c | 278 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 278 insertions(+) diff --git a/base/system/diskpart/dump.c b/base/system/diskpart/dump.c new file mode 100644 index 00000000000..6e2e46a8733 --- /dev/null +++ b/base/system/diskpart/dump.c @@ -0,0 +1,278 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/dump.c + * PURPOSE: Manages all the partitions of the OS in an interactive way. + * PROGRAMMERS: Eric Kohl + */ + +#include "diskpart.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +static +VOID +HexDump( + _In_ UCHAR *addr, + _In_ int len) +{ + WCHAR Buffer[17]; + UCHAR *pc; + int i; + + Buffer[16] = L'\0'; + + pc = addr; + for (i = 0; i < len; i++) + { + if ((i % 16) == 0) + ConPrintf(StdOut, L" %04x ", i); + + ConPrintf(StdOut, L" %02x", pc[i]); + + if ((pc[i] < 0x20) || (pc[i] > 0x7e)) + Buffer[i % 16] = L'.'; + else + Buffer[i % 16] = (WCHAR)(USHORT)pc[i]; + + if ((i % 16) == (16 - 1)) + ConPrintf(StdOut, L" %s\n", Buffer); + } +} + + +static +VOID +DumpDisk( + _In_ INT argc, + _In_ LPWSTR *argv) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + WCHAR Buffer[MAX_PATH]; + UNICODE_STRING Name; + HANDLE FileHandle = NULL; + PUCHAR pSectorBuffer = NULL; + LARGE_INTEGER FileOffset; + LONGLONG Sector; + LPWSTR endptr = NULL; + +#if 0 + if (argc == 2) + { + ConResPuts(StdOut, IDS_HELP_CMD_DUMP_DISK); + return TRUE; + } +#endif + + if (CurrentDisk == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_DISK); + return; + } + + Sector = _wcstoi64(argv[2], &endptr, 0); + if (((Sector == 0) && (endptr == argv[2])) || + (Sector < 0)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return; + } + + pSectorBuffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, CurrentDisk->BytesPerSector); + if (pSectorBuffer == NULL) + { + DPRINT1("\n"); + /* Error message */ + goto done; + } + + swprintf(Buffer, + L"\\Device\\Harddisk%d\\Partition0", + CurrentDisk->DiskNumber); + RtlInitUnicodeString(&Name, + Buffer); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + 0, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + FILE_READ_DATA | FILE_READ_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, + &Iosb, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + DPRINT1("\n"); + goto done; + } + + FileOffset.QuadPart = Sector * CurrentDisk->BytesPerSector; + Status = NtReadFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + (PVOID)pSectorBuffer, + CurrentDisk->BytesPerSector, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtReadFile failed, status=%x\n", Status); + goto done; + } + + HexDump(pSectorBuffer, CurrentDisk->BytesPerSector); + +done: + if (FileHandle) + NtClose(FileHandle); + + RtlFreeHeap(RtlGetProcessHeap(), 0, pSectorBuffer); + + return; +} + + +static +VOID +DumpPartition( + _In_ INT argc, + _In_ LPWSTR *argv) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + WCHAR Buffer[MAX_PATH]; + UNICODE_STRING Name; + HANDLE FileHandle = NULL; + PUCHAR pSectorBuffer = NULL; + LARGE_INTEGER FileOffset; + LONGLONG Sector; + LPWSTR endptr = NULL; + + +#if 0 + if (argc == 2) + { + ConResPuts(StdOut, IDS_HELP_CMD_DUMP_DISK); + return TRUE; + } +#endif + + if (CurrentDisk == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_DISK); + return; + } + + if (CurrentPartition == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_PARTITION); + return; + } + + Sector = _wcstoi64(argv[2], &endptr, 0); + if (((Sector == 0) && (endptr == argv[2])) || + (Sector < 0)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return; + } + + pSectorBuffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, CurrentDisk->BytesPerSector); + if (pSectorBuffer == NULL) + { + DPRINT1("\n"); + /* Error message */ + goto done; + } + + swprintf(Buffer, + L"\\Device\\Harddisk%d\\Partition%d", + CurrentDisk->DiskNumber, + CurrentPartition->PartitionNumber); + RtlInitUnicodeString(&Name, + Buffer); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + 0, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + FILE_READ_DATA | FILE_READ_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, + &Iosb, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + DPRINT1("\n"); + goto done; + } + + FileOffset.QuadPart = Sector * CurrentDisk->BytesPerSector; + Status = NtReadFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + (PVOID)pSectorBuffer, + CurrentDisk->BytesPerSector, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtReadFile failed, status=%x\n", Status); + goto done; + } + + HexDump(pSectorBuffer, CurrentDisk->BytesPerSector); + +done: + if (FileHandle) + NtClose(FileHandle); + + RtlFreeHeap(RtlGetProcessHeap(), 0, pSectorBuffer); + + return; +} + + +BOOL +dump_main( + _In_ INT argc, + _In_ LPWSTR *argv) +{ + /* gets the first word from the string */ +#if 0 + if (argc == 1) + { + ConResPuts(StdOut, IDS_HELP_CMD_LIST); + return TRUE; + } +#endif + + /* determines which to list (disk, partition, etc.) */ + if (!wcsicmp(argv[1], L"disk")) + DumpDisk(argc, argv); + else if (!wcsicmp(argv[1], L"partition")) + DumpPartition(argc, argv); +#if 0 + else + ConResPuts(StdOut, IDS_HELP_CMD_LIST); +#endif + + return TRUE; +}

1 0

[reactos] 01/01: [DISKPART] Add dump command to dump a sector of a disk or partition
by Eric Kohl 13 Mar '22

13 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28d565ae9af8cd81e3f9f… commit 28d565ae9af8cd81e3f9fa524af56c9cf6f10c6e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 13 14:20:47 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 13 14:20:47 2022 +0100 [DISKPART] Add dump command to dump a sector of a disk or partition Select a disk and run "dump disk 0" to dump the MBR of the disk. --- base/system/diskpart/CMakeLists.txt | 1 + base/system/diskpart/diskpart.h | 8 ++++++++ base/system/diskpart/interpreter.c | 1 + 3 files changed, 10 insertions(+) diff --git a/base/system/diskpart/CMakeLists.txt b/base/system/diskpart/CMakeLists.txt index 7675dad1d83..f9b5bdd5a3f 100644 --- a/base/system/diskpart/CMakeLists.txt +++ b/base/system/diskpart/CMakeLists.txt @@ -17,6 +17,7 @@ list(APPEND SOURCE detach.c detail.c diskpart.c + dump.c expand.c extend.c filesystems.c diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index 9a56e16a018..abfc2213c74 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -225,6 +225,9 @@ BOOL detail_main(INT argc, LPWSTR *argv); /* diskpart.c */ +/* dump.c */ +BOOL dump_main(INT argc, LPWSTR *argv); + /* expand.c */ BOOL expand_main(INT argc, LPWSTR *argv); @@ -258,6 +261,11 @@ VOID InterpretMain(VOID); /* list.c */ BOOL list_main(INT argc, LPWSTR *argv); +ULONGLONG +RoundingDivide( + _In_ ULONGLONG Dividend, + _In_ ULONGLONG Divisor); + /* merge.c */ BOOL merge_main(INT argc, LPWSTR *argv); diff --git a/base/system/diskpart/interpreter.c b/base/system/diskpart/interpreter.c index 59f75570aba..dde15688029 100644 --- a/base/system/diskpart/interpreter.c +++ b/base/system/diskpart/interpreter.c @@ -29,6 +29,7 @@ COMMAND cmds[] = {L"delete", delete_main, IDS_HELP_CMD_DELETE, IDS_HELP_CMD_DESC_DELETE}, {L"detail", detail_main, IDS_HELP_CMD_DETAIL, IDS_HELP_CMD_DESC_DETAIL}, {L"detach", detach_main, IDS_HELP_CMD_DETACH, IDS_HELP_CMD_DESC_DETACH}, + {L"dump", dump_main, IDS_NONE, IDS_NONE}, {L"exit", NULL, IDS_NONE, IDS_HELP_CMD_DESC_EXIT}, {L"expand", expand_main, IDS_HELP_CMD_EXPAND, IDS_HELP_CMD_DESC_EXPAND}, {L"extend", extend_main, IDS_HELP_CMD_EXTEND, IDS_HELP_CMD_DESC_EXTEND},

1 0

[reactos] 01/01: [SHELL32] Do not reopen the drive properties dialog on cancel (#4383)
by Mark Jansen 12 Mar '22

12 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af33607a273f46e704d66… commit af33607a273f46e704d66e92eaf09799d3a5834f Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Mar 12 15:25:48 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 12 15:25:48 2022 +0100 [SHELL32] Do not reopen the drive properties dialog on cancel (#4383) CORE-18073 --- dll/win32/shell32/dialogs/drive.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dll/win32/shell32/dialogs/drive.cpp b/dll/win32/shell32/dialogs/drive.cpp index be1c8c8b109..8f2484e298a 100644 --- a/dll/win32/shell32/dialogs/drive.cpp +++ b/dll/win32/shell32/dialogs/drive.cpp @@ -226,10 +226,8 @@ SH_ShowDriveProperties(WCHAR *pwszDrive, LPCITEMIDLIST pidlFolder, PCUITEMID_CHI if (pDrvDefExt) pDrvDefExt->Release(); - if (ret > 0) + if (ret >= 0) return S_OK; - if (ret == 0) - return S_FALSE; return E_FAIL; }

1 0

[reactos] 01/01: [WINFILE] de-DE.rc White-space addendum in context of CORE-18077
by Joachim Henze 10 Mar '22

10 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=248fe4714ab183af4b63a… commit 248fe4714ab183af4b63a86b3704f9c3102aa3ef Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Thu Mar 10 23:58:48 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Thu Mar 10 23:58:48 2022 +0100 [WINFILE] de-DE.rc White-space addendum in context of CORE-18077 Addendum to 0.4.15-dev-3887-g c3f4c11af13c86c23c615ee8defee9061ea09c30 --- modules/rosapps/applications/winfile/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rosapps/applications/winfile/lang/de-DE.rc b/modules/rosapps/applications/winfile/lang/de-DE.rc index 1390903c8b1..cfe17a28d86 100644 --- a/modules/rosapps/applications/winfile/lang/de-DE.rc +++ b/modules/rosapps/applications/winfile/lang/de-DE.rc @@ -32,7 +32,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDM_WINEFILE MENU { POPUP "&Datei" { - MENUITEM "Ö&ffnen\tENTER", ID_ACTIVATE + MENUITEM "Ö&ffnen\tENTER", ID_ACTIVATE MENUITEM "&Verschieben...\tF7", ID_FILE_MOVE MENUITEM "&Kopieren...\tF8", ID_FILE_COPY MENUITEM "&In Zwischenablage...\tF9", 118

1 0

[reactos] 01/01: [NETKVM] Fix calling convention for callback and variadic functions
by Dmitry Borisov 10 Mar '22

10 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc6dfbf6687be49306d62… commit dc6dfbf6687be49306d62a765be36a036628765e Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Wed Mar 9 19:17:22 2022 +0600 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Thu Mar 10 13:31:10 2022 +0300 [NETKVM] Fix calling convention for callback and variadic functions Addendum to 4c37757e81109128109feb0a0a9342452c6caf78. --- drivers/network/dd/netkvm/Common/ParaNdis-Common.c | 2 +- drivers/network/dd/netkvm/Common/ParaNdis-Debug.c | 14 +++++++------- drivers/network/dd/netkvm/Common/ndis56common.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/network/dd/netkvm/Common/ParaNdis-Common.c b/drivers/network/dd/netkvm/Common/ParaNdis-Common.c index 71fa0de46a4..7191592458e 100644 --- a/drivers/network/dd/netkvm/Common/ParaNdis-Common.c +++ b/drivers/network/dd/netkvm/Common/ParaNdis-Common.c @@ -2209,7 +2209,7 @@ void ParaNdis_ReportLinkStatus(PARANDIS_ADAPTER *pContext, BOOLEAN bForce) ParaNdis_IndicateConnect(pContext, bConnected, bForce); } -static BOOLEAN RestartQueueSynchronously(tSynchronizedContext *SyncContext) +static BOOLEAN NTAPI RestartQueueSynchronously(tSynchronizedContext *SyncContext) { struct virtqueue * _vq = (struct virtqueue *) SyncContext->Parameter; bool res = true; diff --git a/drivers/network/dd/netkvm/Common/ParaNdis-Debug.c b/drivers/network/dd/netkvm/Common/ParaNdis-Debug.c index f66b92502f8..2a64e81050f 100644 --- a/drivers/network/dd/netkvm/Common/ParaNdis-Debug.c +++ b/drivers/network/dd/netkvm/Common/ParaNdis-Debug.c @@ -51,25 +51,25 @@ static VOID NTAPI ParaNdis_OnBugCheck( ); static VOID ParaNdis_PrepareBugCheckData(); -typedef BOOLEAN (*KeRegisterBugCheckReasonCallbackType) ( +typedef BOOLEAN (NTAPI *KeRegisterBugCheckReasonCallbackType) ( __out PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord, __in PKBUGCHECK_REASON_CALLBACK_ROUTINE CallbackRoutine, __in KBUGCHECK_CALLBACK_REASON Reason, __in PUCHAR Component ); -typedef BOOLEAN (*KeDeregisterBugCheckReasonCallbackType) ( +typedef BOOLEAN (NTAPI *KeDeregisterBugCheckReasonCallbackType) ( __inout PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord ); -typedef ULONG (*vDbgPrintExType)( +typedef ULONG (NTAPI *vDbgPrintExType)( __in ULONG ComponentId, __in ULONG Level, __in PCCH Format, __in va_list arglist ); -static ULONG DummyPrintProcedure( +static ULONG NTAPI DummyPrintProcedure( __in ULONG ComponentId, __in ULONG Level, __in PCCH Format, @@ -78,7 +78,7 @@ static ULONG DummyPrintProcedure( { return 0; } -static BOOLEAN KeRegisterBugCheckReasonCallbackDummyProc( +static BOOLEAN NTAPI KeRegisterBugCheckReasonCallbackDummyProc( __out PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord, __in PKBUGCHECK_REASON_CALLBACK_ROUTINE CallbackRoutine, __in KBUGCHECK_CALLBACK_REASON Reason, @@ -89,7 +89,7 @@ static BOOLEAN KeRegisterBugCheckReasonCallbackDummyProc( return FALSE; } -BOOLEAN KeDeregisterBugCheckReasonCallbackDummyProc( +BOOLEAN NTAPI KeDeregisterBugCheckReasonCallbackDummyProc( __inout PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord ) { @@ -105,7 +105,7 @@ KBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord; #if defined(DPFLTR_MASK) //common case, except Win2K -static void DebugPrint(const char *fmt, ...) +static void __cdecl DebugPrint(const char *fmt, ...) { va_list list; va_start(list, fmt); diff --git a/drivers/network/dd/netkvm/Common/ndis56common.h b/drivers/network/dd/netkvm/Common/ndis56common.h index 7cf4236be65..93b624c848c 100644 --- a/drivers/network/dd/netkvm/Common/ndis56common.h +++ b/drivers/network/dd/netkvm/Common/ndis56common.h @@ -500,7 +500,7 @@ typedef struct _tagSynchronizedContext PVOID Parameter; }tSynchronizedContext; -typedef BOOLEAN (*tSynchronizedProcedure)(tSynchronizedContext *context); +typedef BOOLEAN (NTAPI *tSynchronizedProcedure)(tSynchronizedContext *context); /********************************************************** LAZY release procedure returns buffers to VirtIO

1 0

[reactos] 01/01: [ATL] Add atlsync.h (#4382)
by Katayama Hirofumi MZ 07 Mar '22

07 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd5a634611ca45ed14ed8… commit dd5a634611ca45ed14ed84ca9cf5a120537a8b90 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Mar 7 11:02:42 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 7 11:02:42 2022 +0900 [ATL] Add atlsync.h (#4382) - Add atlsync.h and implement CCriticalSection, CEvent, CMutex and CSemaphore classes. CORE-13950 --- sdk/lib/atl/atlsync.h | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/sdk/lib/atl/atlsync.h b/sdk/lib/atl/atlsync.h new file mode 100644 index 00000000000..5a72ca5a52c --- /dev/null +++ b/sdk/lib/atl/atlsync.h @@ -0,0 +1,201 @@ +/* + * PROJECT: ReactOS ATL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: ATL Synchronization + * COPYRIGHT: Copyright 2022 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#pragma once + +#ifndef __ATLSYNC_H__ +#define __ATLSYNC_H__ + +#include "atlbase.h" + +namespace ATL +{ + +class CCriticalSection : public CRITICAL_SECTION +{ + CCriticalSection() + { + ::InitializeCriticalSection(this); + } + + ~CCriticalSection() + { + ::DeleteCriticalSection(this); + } + + void Enter() + { + ::EnterCriticalSection(this); + } + + void Leave() + { + ::LeaveCriticalSection(this); + } + + BOOL TryEnter() + { + return ::TryEnterCriticalSection(this); + } +}; + +class CEvent : public CHandle +{ + CEvent() + { + } + + CEvent(CEvent& hEvent) : CHandle(hEvent) + { + } + + CEvent(BOOL bManualReset, BOOL bInitialState) + { + Create(NULL, bManualReset, bInitialState, NULL); + } + + CEvent(LPSECURITY_ATTRIBUTES pSecurity, BOOL bManualReset, BOOL bInitialState, LPCTSTR pszName) + { + Create(pSecurity, bManualReset, bInitialState, pszName); + } + + explicit CEvent(HANDLE hEvent) : CHandle(hEvent) + { + } + + BOOL Create(LPSECURITY_ATTRIBUTES pSecurity, BOOL bManualReset, BOOL bInitialState, LPCTSTR pszName) + { + HANDLE hEvent = ::CreateEvent(pSecurity, bManualReset, bInitialState, pszName); + ATLASSERT(hEvent != NULL); + Attach(hEvent); + return hEvent != NULL; + } + + BOOL Open(DWORD dwAccess, BOOL bInheritHandle, LPCTSTR pszName) + { + HANDLE hEvent = ::OpenEvent(dwAccess, bInheritHandle, pszName); + ATLASSERT(hEvent != NULL); + Attach(hEvent); + return hEvent != NULL; + } + + BOOL Set() + { + ATLASSERT(*this); + return ::SetEvent(*this); + } + + BOOL Reset() + { + ATLASSERT(*this); + return ::ResetEvent(*this); + } + + BOOL Pulse() + { + ATLASSERT(*this); + return ::PulseEvent(*this); + } +}; + +class CMutex : public CHandle +{ + CMutex() + { + } + + CMutex(CMutex& hMutex) : CHandle(hMutex) + { + } + + explicit CMutex(BOOL bInitialOwner) + { + Create(NULL, bInitialOwner, NULL); + } + + CMutex(LPSECURITY_ATTRIBUTES pSecurity, BOOL bInitialOwner, LPCTSTR pszName) + { + Create(pSecurity, bInitialOwner, pszName); + } + + explicit CMutex(HANDLE hMutex) : CHandle(hMutex) + { + } + + BOOL Create(LPSECURITY_ATTRIBUTES pSecurity, BOOL bInitialOwner, LPCTSTR pszName) + { + HANDLE hMutex = ::CreateMutex(pSecurity, bInitialOwner, pszName); + ATLASSERT(hMutex != NULL); + Attach(hMutex); + return hMutex != NULL; + } + + BOOL Open(DWORD dwAccess, BOOL bInheritHandle, LPCTSTR pszName) + { + HANDLE hMutex = ::OpenMutex(dwAccess, bInheritHandle, pszName); + ATLASSERT(hMutex != NULL); + Attach(hMutex); + return hMutex != NULL; + } + + BOOL Release() + { + ATLASSERT(*this); + return ::ReleaseMutex(*this); + } +}; + +class CSemaphore : public CHandle +{ + CSemaphore() + { + } + + CSemaphore(CSemaphore& hSemaphore) : CHandle(hSemaphore) + { + } + + CSemaphore(LONG nInitialCount, LONG nMaxCount) + { + Create(NULL, nInitialCount, nMaxCount, NULL); + } + + CSemaphore(LPSECURITY_ATTRIBUTES pSecurity, LONG nInitialCount, LONG nMaxCount, LPCTSTR pszName) + { + Create(pSecurity, nInitialCount, nMaxCount, pszName); + } + + explicit CSemaphore(HANDLE hSemaphore) : CHandle(hSemaphore) + { + } + + BOOL Create(LPSECURITY_ATTRIBUTES pSecurity, LONG nInitialCount, LONG nMaxCount, LPCTSTR pszName) + { + HANDLE hSemaphore = ::CreateSemaphore(pSecurity, nInitialCount, nMaxCount, pszName); + ATLASSERT(hSemaphore != NULL); + Attach(hSemaphore); + return hSemaphore != NULL; + } + + BOOL Open(DWORD dwAccess, BOOL bInheritHandle, LPCTSTR pszName) + { + HANDLE hSemaphore = ::OpenSemaphore(dwAccess, bInheritHandle, pszName); + ATLASSERT(hSemaphore != NULL); + Attach(hSemaphore); + return hSemaphore != NULL; + } + + BOOL Release(LONG nReleaseCount = 1, LPLONG pnOldCount = NULL) + { + ATLASSERT(*this); + return ::ReleaseSemaphore(*this, nReleaseCount, pnOldCount); + } +}; + +} // namespace ATL + +#endif // __ATLSYNC_H__

1 0

[reactos] 01/01: [SHELL32] Support CSIDL_FLAG_NO_ALIAS (#4381)
by Katayama Hirofumi MZ 06 Mar '22

06 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6cb1e57a630e09ba90a3e… commit 6cb1e57a630e09ba90a3e0c292beaf5754e0b7de Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 6 15:25:45 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 6 15:25:45 2022 +0900 [SHELL32] Support CSIDL_FLAG_NO_ALIAS (#4381) Adding the CSIDL_FLAG_NO_ALIAS flag to SHGetSpecialFolderLocation should return the physical PIDL if possible. CORE-18079 --- dll/win32/shell32/wine/shellpath.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index 736092b20a5..70409260e69 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -2888,6 +2888,9 @@ HRESULT WINAPI SHGetFolderLocation( LPITEMIDLIST *ppidl) { HRESULT hr = E_INVALIDARG; +#ifdef __REACTOS__ + WCHAR szPath[MAX_PATH]; +#endif TRACE("%p 0x%08x %p 0x%08x %p\n", hwndOwner, nFolder, hToken, dwReserved, ppidl); @@ -2897,6 +2900,15 @@ HRESULT WINAPI SHGetFolderLocation( if (dwReserved) return E_INVALIDARG; +#ifdef __REACTOS__ + if ((nFolder & CSIDL_FLAG_NO_ALIAS) && + SHGetSpecialFolderPathW(hwndOwner, szPath, (nFolder & CSIDL_FOLDER_MASK), FALSE)) + { + *ppidl = ILCreateFromPathW(szPath); + if (*ppidl) + return S_OK; + } +#endif /* The virtual folders' locations are not user-dependent */ *ppidl = NULL; switch (nFolder & CSIDL_FOLDER_MASK)

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