Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [WINLOGON] Close all dialog boxes on SAS
by Eric Kohl 21 May '18

21 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02f3cb538119727e6a4fa… commit 02f3cb538119727e6a4fa9222716446a8b563767 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon May 21 11:20:50 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon May 21 11:21:42 2018 +0200 [WINLOGON] Close all dialog boxes on SAS CORE-13593 --- base/system/winlogon/sas.c | 8 ++------ base/system/winlogon/winlogon.h | 4 ++-- base/system/winlogon/wlx.c | 12 +++++------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index 3f02df3316..077079d7e1 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -1157,9 +1157,7 @@ DispatchSAS( case STATE_LOGGED_OFF: Session->LogonState = STATE_LOGGED_OFF_SAS; - hwnd = GetTopDialogWindow(); - if (hwnd != NULL) - SendMessage(hwnd, WLX_WM_SAS, 0, 0); + CloseAllDialogWindows(); Session->Options = 0; @@ -1192,9 +1190,7 @@ DispatchSAS( case STATE_LOCKED: Session->LogonState = STATE_LOCKED_SAS; - hwnd = GetTopDialogWindow(); - if (hwnd != NULL) - SendMessage(hwnd, WLX_WM_SAS, 0, 0); + CloseAllDialogWindows(); wlxAction = (DWORD)Session->Gina.Functions.WlxWkstaLockedSAS(Session->Gina.Context, dwSasType); break; diff --git a/base/system/winlogon/winlogon.h b/base/system/winlogon/winlogon.h index a27f1ed9f2..37960e2367 100644 --- a/base/system/winlogon/winlogon.h +++ b/base/system/winlogon/winlogon.h @@ -342,8 +342,8 @@ RemoveStatusMessage(IN PWLSESSION Session); VOID InitDialogListHead(VOID); -HWND -GetTopDialogWindow(VOID); +VOID +CloseAllDialogWindows(VOID); BOOL GinaInit(IN OUT PWLSESSION Session); diff --git a/base/system/winlogon/wlx.c b/base/system/winlogon/wlx.c index ba24de1311..44983e78e9 100644 --- a/base/system/winlogon/wlx.c +++ b/base/system/winlogon/wlx.c @@ -106,24 +106,22 @@ GetDialogListEntry(HWND hwndDlg) HWND -GetTopDialogWindow(VOID) +CloseAllDialogWindows(VOID) { PDIALOG_LIST_ENTRY Current; PLIST_ENTRY ListEntry; ListEntry = DialogListHead.Flink; - if (ListEntry != &DialogListHead) + while (ListEntry != &DialogListHead) { Current = CONTAINING_RECORD(ListEntry, DIALOG_LIST_ENTRY, Entry); - TRACE("Found entry: %p window %p\n", Current, Current->hWnd); - return Current->hWnd; - } + PostMessage(Current->hWnd, WLX_WM_SAS, 0, 0); - TRACE("Found no window\n"); - return NULL; + ListEntry = ListEntry->Flink; + } }

1 0

01/01: [FASTFAT] Properly queue pending write IRPs.
by Pierre Schweitzer 21 May '18

21 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e9e14be6618d0a0bebba5… commit e9e14be6618d0a0bebba556c57eb3fb478c9f45f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon May 21 10:41:59 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon May 21 10:41:59 2018 +0200 [FASTFAT] Properly queue pending write IRPs. Addendum to 30b836b --- drivers/filesystems/fastfat/rw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/filesystems/fastfat/rw.c b/drivers/filesystems/fastfat/rw.c index ad65628876..043bafef6c 100644 --- a/drivers/filesystems/fastfat/rw.c +++ b/drivers/filesystems/fastfat/rw.c @@ -1067,6 +1067,7 @@ VfatWrite( if (!ExAcquireResourceExclusiveLite(&IrpContext->DeviceExt->DirResource, CanWait)) { + Status = STATUS_PENDING; goto ByeBye; }

1 0

01/01: [FASTFAT] When extending a file, also lock the DirResource.
by Pierre Schweitzer 21 May '18

21 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30b836bf3f48055deceb5… commit 30b836bf3f48055deceb5e1a5100921d40cad073 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon May 21 10:28:44 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon May 21 10:30:14 2018 +0200 [FASTFAT] When extending a file, also lock the DirResource. This avoids race conditions under high IOs and thus corruption on the FS, or assertions failures in the kernel. Easily triggered by building ReactOS on ReactOS ;-). --- drivers/filesystems/fastfat/rw.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/filesystems/fastfat/rw.c b/drivers/filesystems/fastfat/rw.c index 76ffff933c..ad65628876 100644 --- a/drivers/filesystems/fastfat/rw.c +++ b/drivers/filesystems/fastfat/rw.c @@ -1064,9 +1064,18 @@ VfatWrite( ByteOffset.u.LowPart + Length > Fcb->RFCB.FileSize.u.LowPart) { LARGE_INTEGER AllocationSize; + + if (!ExAcquireResourceExclusiveLite(&IrpContext->DeviceExt->DirResource, CanWait)) + { + goto ByeBye; + } + AllocationSize.QuadPart = ByteOffset.u.LowPart + Length; Status = VfatSetAllocationSizeInformation(IrpContext->FileObject, Fcb, IrpContext->DeviceExt, &AllocationSize); + + ExReleaseResourceLite(&IrpContext->DeviceExt->DirResource); + if (!NT_SUCCESS (Status)) { goto ByeBye;

1 0

01/01: [SETUPAPI] Add stubs for CM_Detect_Resource_Conflict and CM_Detect_Resource_Conflict_Ex
by Eric Kohl 21 May '18

21 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fbaea843e90d8ba6f48a… commit 0fbaea843e90d8ba6f48a3f797fb3de18a2396ea Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon May 21 02:30:35 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon May 21 02:30:35 2018 +0200 [SETUPAPI] Add stubs for CM_Detect_Resource_Conflict and CM_Detect_Resource_Conflict_Ex --- dll/win32/setupapi/cfgmgr.c | 49 ++++++++++++++++++++++++++++++++++++++++ dll/win32/setupapi/setupapi.spec | 4 ++-- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index 5d2f8cda45..c7087e6d0f 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -1548,6 +1548,55 @@ CM_Delete_Range( } +/*********************************************************************** + * CM_Detect_Resource_Conflict [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Detect_Resource_Conflict( + _In_ DEVINST dnDevInst, + _In_ RESOURCEID ResourceID, + _In_reads_bytes_(ResourceLen) PCVOID ResourceData, + _In_ ULONG ResourceLen, + _Out_ PBOOL pbConflictDetected, + _In_ ULONG ulFlags) +{ + TRACE("CM_Detect_Resource_Conflict(%p %lu %p %lu %p 0x%lx)\n", + dnDevInst, ResourceID, ResourceData, ResourceLen, + pbConflictDetected, ulFlags); + + return CM_Detect_Resource_Conflict_Ex(dnDevInst, + ResourceID, + ResourceData, + ResourceLen, + pbConflictDetected, + ulFlags, + NULL); +} + + +/*********************************************************************** + * CM_Detect_Resource_Conflict_Ex [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Detect_Resource_Conflict_Ex( + _In_ DEVINST dnDevInst, + _In_ RESOURCEID ResourceID, + _In_reads_bytes_(ResourceLen) PCVOID ResourceData, + _In_ ULONG ResourceLen, + _Out_ PBOOL pbConflictDetected, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) +{ + FIXME("CM_Detect_Resource_Conflict_Ex(%p %lu %p %lu %p 0x%lx %p)\n", + dnDevInst, ResourceID, ResourceData, ResourceLen, + pbConflictDetected, ulFlags, hMachine); + + return CR_CALL_NOT_IMPLEMENTED; +} + + /*********************************************************************** * CM_Disable_DevNode [SETUPAPI.@] */ diff --git a/dll/win32/setupapi/setupapi.spec b/dll/win32/setupapi/setupapi.spec index e43a8dbe98..527f4fd42b 100644 --- a/dll/win32/setupapi/setupapi.spec +++ b/dll/win32/setupapi/setupapi.spec @@ -28,8 +28,8 @@ @ stdcall CM_Delete_DevNode_Key(long long long) @ stdcall CM_Delete_DevNode_Key_Ex(long long long ptr) @ stdcall CM_Delete_Range(int64 int64 ptr long) -@ stub CM_Detect_Resource_Conflict -@ stub CM_Detect_Resource_Conflict_Ex +@ stdcall CM_Detect_Resource_Conflict(long long ptr long ptr long) +@ stdcall CM_Detect_Resource_Conflict_Ex(long long ptr long ptr long ptr) @ stdcall CM_Disable_DevNode(long long) @ stdcall CM_Disable_DevNode_Ex(long long ptr) @ stdcall CM_Disconnect_Machine(ptr)

1 0

01/01: [CONUTILS] Remove old code; modify an informative note.
by Hermès Bélusca-Maïto 20 May '18

20 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1eca6258393f5a3c758c3… commit 1eca6258393f5a3c758c3aa30e2c668a66e8d510 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 20 22:38:48 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 20 22:39:21 2018 +0200 [CONUTILS] Remove old code; modify an informative note. --- sdk/lib/conutils/outstream.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sdk/lib/conutils/outstream.c b/sdk/lib/conutils/outstream.c index 645452f3ef..d884c92334 100644 --- a/sdk/lib/conutils/outstream.c +++ b/sdk/lib/conutils/outstream.c @@ -49,13 +49,11 @@ #include "stream_private.h" -// #define RC_STRING_MAX_SIZE 4096 +// Also known as: RC_STRING_MAX_SIZE, MAX_BUFFER_SIZE (some programs: +// wlanconf, shutdown, set it to 5024), OUTPUT_BUFFER_SIZE (name given +// in cmd/console.c), MAX_STRING_SIZE (name given in diskpart) or +// MAX_MESSAGE_SIZE (set to 512 in shutdown). #define CON_RC_STRING_MAX_SIZE 4096 -// #define MAX_BUFFER_SIZE 4096 // Some programs (wlanconf, shutdown) set it to 5024 -// #define OUTPUT_BUFFER_SIZE 4096 // Name given in cmd/console.c -// MAX_STRING_SIZE // Name given in diskpart - -// #define MAX_MESSAGE_SIZE 512 // See shutdown... /** @@ -93,8 +91,6 @@ ConWrite( DWORD TotalLen = len, dwNumBytes = 0; PVOID p; - // CHAR strOem[CON_RC_STRING_MAX_SIZE]; // Some static buffer... - /* If we do not write anything, just return */ if (!szStr || len == 0) return 0;

1 0

01/01: [SDK] "0.4.10-dev" Starts here.
by Joachim Henze 20 May '18

20 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cfb8f97968aae849ca148… commit cfb8f97968aae849ca148fbc3e009a33e07a347b Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun May 20 20:35:12 2018 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun May 20 20:35:12 2018 +0200 [SDK] "0.4.10-dev" Starts here. tag will be added in next commit. --- sdk/include/reactos/version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index 70fb1bbe99..75dacc321c 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -2,7 +2,7 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") -set(KERNEL_VERSION_PATCH_LEVEL "9") +set(KERNEL_VERSION_PATCH_LEVEL "10") set(COPYRIGHT_YEAR "2018") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds

1 0

01/01: [CMD] Use string-safe call to build the new console title (possibly truncated, we don't care), avoiding any buffer overflow. Caught by David Quintana.
by Hermès Bélusca-Maïto 20 May '18

20 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ddd03a89736370b0132b9… commit ddd03a89736370b0132b955927f4f0bfa8f4c91a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 20 19:57:43 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 20 19:57:43 2018 +0200 [CMD] Use string-safe call to build the new console title (possibly truncated, we don't care), avoiding any buffer overflow. Caught by David Quintana. --- base/shell/cmd/cmd.c | 3 ++- base/shell/cmd/precomp.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index bc92e70e6c..974fd3e626 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -382,7 +382,8 @@ Execute(LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd) /* Save the original console title and build a new one */ GetConsoleTitle(szWindowTitle, ARRAYSIZE(szWindowTitle)); bTitleSet = FALSE; - _stprintf(szNewTitle, _T("%s - %s%s"), szWindowTitle, First, Rest); + StringCchPrintf(szNewTitle, ARRAYSIZE(szNewTitle), + _T("%s - %s%s"), szWindowTitle, First, Rest); ConSetTitle(szNewTitle); /* check if this is a .BAT or .CMD file */ diff --git a/base/shell/cmd/precomp.h b/base/shell/cmd/precomp.h index a8e1418bbe..7c0e76dc3d 100644 --- a/base/shell/cmd/precomp.h +++ b/base/shell/cmd/precomp.h @@ -25,6 +25,8 @@ #define NTOS_MODE_USER #include <ndk/rtlfuncs.h> +#include <strsafe.h> + #include <conutils.h> #include "resource.h"

1 0

01/01: [USETUP] Remove now-unneeded file.
by Hermès Bélusca-Maïto 20 May '18

20 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b618314c21f219e15b00… commit 7b618314c21f219e15b00e134f04bbd588c7e50e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 20 19:27:57 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 20 19:27:57 2018 +0200 [USETUP] Remove now-unneeded file. --- base/setup/usetup/host.h | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/base/setup/usetup/host.h b/base/setup/usetup/host.h deleted file mode 100644 index 6d8a84bfdb..0000000000 --- a/base/setup/usetup/host.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifdef __REACTOS__ - -#include "native/host_native.h" -#define HOST_InitConsole NATIVE_InitConsole -#define HOST_InitMemory NATIVE_InitMemory -#define HOST_CreateFileSystemList NATIVE_CreateFileSystemList - -#else - -#include "win32/host_win32.h" -#define HOST_InitConsole WIN32_InitConsole -#define HOST_InitMemory WIN32_InitMemory -#define HOST_CreateFileSystemList WIN32_CreateFileSystemList - -#endif - -BOOLEAN -HOST_InitConsole(VOID); - -BOOLEAN -HOST_InitMemory(VOID); - -BOOLEAN -HOST_CreateFileSystemList( - IN PFILE_SYSTEM_LIST List); - -BOOLEAN -HOST_FormatPartition( - IN PFILE_SYSTEM_ITEM FileSystem, - IN PCUNICODE_STRING DriveRoot, - IN PFMIFSCALLBACK Callback);

1 0

01/01: [BOOTDATA] Set the 'BootExecute' SMSS value to an empty value as we do not want AutoChk to start when booting the LiveCD. CORE-14633 Add also a missing closing quote.
by Hermès Bélusca-Maïto 20 May '18

20 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb679a89176c48626515b… commit cb679a89176c48626515b617f1b6a629f9dc3d6a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 20 18:32:59 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 20 18:34:35 2018 +0200 [BOOTDATA] Set the 'BootExecute' SMSS value to an empty value as we do not want AutoChk to start when booting the LiveCD. CORE-14633 Add also a missing closing quote. --- boot/bootdata/hivesys.inf | 2 +- boot/bootdata/livecd.inf | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 0fdd69a32b..31f50ed773 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1396,7 +1396,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x00010000, \ "Parallel arbitrator", \ "Extended Base" \ "PCI Configuration", \ - "MS Transactions + "MS Transactions" ; Set the timeout for directx/ReactX graphic surface lock see _EDD_DIRECTDRAW_GLOBAL struct for more info HKLM,"SYSTEM\CurrentControlSet\Control\GraphicsDrivers\DCI","Timeout",0x00010001,0x00000007 diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index 7b1336a212..f826a7f6c4 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -19,6 +19,9 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Start",0x00010001,0x00000000 ; FIXME: Disable NTFS driver HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000004 +; Reset BootExecute to an empty value: AutoChk should not start in MiniNT mode +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","BootExecute",0x00010000,"" + ; Shell HKLM,"SYSTEM\Setup","CmdLine",0x00020000,"setup -mini"

1 0

01/01: [SETUPAPI] Fix MSVC build; pathetic GCC/LD didn't see we were using two different prototypes for these functions.
by Hermès Bélusca-Maïto 20 May '18

20 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=edc0aeb5a87a6f0424586… commit edc0aeb5a87a6f042458645392ce4135812c02c3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 20 15:31:45 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 20 15:32:06 2018 +0200 [SETUPAPI] Fix MSVC build; pathetic GCC/LD didn't see we were using two different prototypes for these functions. --- dll/win32/setupapi/setupapi.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/setupapi/setupapi.spec b/dll/win32/setupapi/setupapi.spec index e3db70232a..e43a8dbe98 100644 --- a/dll/win32/setupapi/setupapi.spec +++ b/dll/win32/setupapi/setupapi.spec @@ -126,9 +126,9 @@ @ stdcall CM_Get_Res_Des_Data_Ex(ptr ptr long long ptr) @ stdcall CM_Get_Res_Des_Data_Size(ptr ptr long) @ stdcall CM_Get_Res_Des_Data_Size_Ex(ptr ptr long ptr) -@ stub CM_Get_Resource_Conflict_Count -@ stub CM_Get_Resource_Conflict_DetailsA -@ stub CM_Get_Resource_Conflict_DetailsW +@ stdcall CM_Get_Resource_Conflict_Count(ptr ptr) +@ stdcall CM_Get_Resource_Conflict_DetailsA(ptr long ptr) +@ stdcall CM_Get_Resource_Conflict_DetailsW(ptr long ptr) @ stdcall CM_Get_Sibling(ptr long long) @ stdcall CM_Get_Sibling_Ex(ptr long long ptr) @ stdcall CM_Get_Version()

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