Ros-diffs May 2018

ros-diffs@reactos.org

23 participants
218 discussions

01/02: [WINLOGON] Prevent shell restart when the user is logged off
by Eric Kohl 22 May '18

22 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f0fe38634419df2748e8… commit 1f0fe38634419df2748e88cb8aead8d5549764d0 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 22 14:36:55 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 22 14:36:55 2018 +0200 [WINLOGON] Prevent shell restart when the user is logged off --- base/system/winlogon/sas.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index e9861de796..fe558c452c 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -1372,7 +1372,9 @@ SASWindowProc( case LN_SHELL_EXITED: { /* lParam is the exit code */ - if(lParam != 1) + if (lParam != 1 && + Session->LogonState != STATE_LOGGED_OFF && + Session->LogonState != STATE_LOGGED_OFF_SAS) { SetTimer(hwndDlg, 1, 1000, NULL); }

1 0

01/01: [BOOTDATA][MSGINA][SYSSETUP] Rename the DefaultDomain registry value to DefaultDomainName
by Eric Kohl 22 May '18

22 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b784c7bfba3fc2d46b46c… commit b784c7bfba3fc2d46b46c606ea423c83904992a2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 22 11:30:27 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 22 11:30:27 2018 +0200 [BOOTDATA][MSGINA][SYSSETUP] Rename the DefaultDomain registry value to DefaultDomainName --- boot/bootdata/hivesft.inf | 2 +- dll/win32/msgina/msgina.c | 2 +- dll/win32/syssetup/security.c | 2 +- dll/win32/syssetup/wizard.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index b5c7926de3..4e4e81653d 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -1373,7 +1373,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","AutoAdminLogon",0x00000000,"1" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultDomain",0x00000000,"" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultDomainName",0x00000000,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0x00000000,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify",,0x00000012 diff --git a/dll/win32/msgina/msgina.c b/dll/win32/msgina/msgina.c index 6cb3bc5324..90e59250d2 100644 --- a/dll/win32/msgina/msgina.c +++ b/dll/win32/msgina/msgina.c @@ -246,7 +246,7 @@ GetRegistrySettings(PGINA_CONTEXT pgContext) dwSize = sizeof(pgContext->Domain); rc = RegQueryValueExW(hKey, - L"DefaultDomain", + L"DefaultDomainName", NULL, NULL, (LPBYTE)&pgContext->Domain, diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index cc35f9a8a3..221d0152af 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -580,7 +580,7 @@ SetAutoAdminLogon(VOID) if (wcscmp(szAutoAdminLogon, L"1") == 0) { RegSetValueExW(hKey, - L"DefaultDomain", + L"DefaultDomainName", 0, REG_SZ, (LPBYTE)AdminInfo.Domain, diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 9c57f6b2da..b896adf193 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -594,14 +594,14 @@ WriteDefaultLogonData(LPWSTR Domain) return FALSE; lError = RegSetValueEx(hKey, - L"DefaultDomain", + L"DefaultDomainName", 0, REG_SZ, (LPBYTE)Domain, (wcslen(Domain)+ 1) * sizeof(WCHAR)); if (lError != ERROR_SUCCESS) { - DPRINT1("RegSetValueEx(\"DefaultDomain\") failed!\n"); + DPRINT1("RegSetValueEx(\"DefaultDomainName\") failed!\n"); } lError = RegSetValueEx(hKey,

1 0

01/01: [MSGINA] Add the IgnoreShiftOverride feature again
by Eric Kohl 22 May '18

22 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=665926d38bbf7e188111b… commit 665926d38bbf7e188111b3a9b2f8abe9b735002f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 22 11:06:38 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 22 11:06:38 2018 +0200 [MSGINA] Add the IgnoreShiftOverride feature again --- dll/win32/msgina/msgina.c | 25 ++++++++++++++++++++++--- dll/win32/msgina/msgina.h | 5 +---- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dll/win32/msgina/msgina.c b/dll/win32/msgina/msgina.c index 8772df7dc1..6cb3bc5324 100644 --- a/dll/win32/msgina/msgina.c +++ b/dll/win32/msgina/msgina.c @@ -170,6 +170,7 @@ GetRegistrySettings(PGINA_CONTEXT pgContext) LPWSTR lpAutoAdminLogon = NULL; LPWSTR lpDontDisplayLastUserName = NULL; LPWSTR lpShutdownWithoutLogon = NULL; + LPWSTR lpIgnoreShiftOverride = NULL; DWORD dwDisableCAD = 0; DWORD dwSize; LONG rc; @@ -226,6 +227,15 @@ GetRegistrySettings(PGINA_CONTEXT pgContext) pgContext->bDontDisplayLastUserName = TRUE; } + rc = ReadRegSzValue(hKey, + L"IgnoreShiftOverride", + &lpIgnoreShiftOverride); + if (rc == ERROR_SUCCESS) + { + if (wcscmp(lpIgnoreShiftOverride, L"1") == 0) + pgContext->bIgnoreShiftOverride = TRUE; + } + dwSize = sizeof(pgContext->UserName); rc = RegQueryValueExW(hKey, L"DefaultUserName", @@ -250,6 +260,9 @@ GetRegistrySettings(PGINA_CONTEXT pgContext) (LPBYTE)&pgContext->Password, &dwSize); + if (lpIgnoreShiftOverride != NULL) + HeapFree(GetProcessHeap(), 0, lpIgnoreShiftOverride); + if (lpShutdownWithoutLogon != NULL) HeapFree(GetProcessHeap(), 0, lpShutdownWithoutLogon); @@ -893,9 +906,15 @@ WlxDisplaySASNotice( if (pgContext->bAutoAdminLogon) { - /* Don't display the window, we want to do an automatic logon */ - pgContext->pWlxFuncs->WlxSasNotify(pgContext->hWlx, WLX_SAS_TYPE_CTRL_ALT_DEL); - return; + if (pgContext->bIgnoreShiftOverride || + (GetKeyState(VK_SHIFT) >= 0)) + { + /* Don't display the window, we want to do an automatic logon */ + pgContext->pWlxFuncs->WlxSasNotify(pgContext->hWlx, WLX_SAS_TYPE_CTRL_ALT_DEL); + return; + } + + pgContext->bAutoAdminLogon = FALSE; } if (pgContext->bDisableCAD) diff --git a/dll/win32/msgina/msgina.h b/dll/win32/msgina/msgina.h index 38c975eb89..2243cb8222 100644 --- a/dll/win32/msgina/msgina.h +++ b/dll/win32/msgina/msgina.h @@ -28,10 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msgina); #include "resource.h" -/* Values for GINA_CONTEXT.AutoLogonState */ -#define AUTOLOGON_CHECK_REGISTRY 1 -#define AUTOLOGON_ONCE 2 -#define AUTOLOGON_DISABLED 3 typedef struct { @@ -46,6 +42,7 @@ typedef struct BOOL bAutoAdminLogon; BOOL bDontDisplayLastUserName; BOOL bShutdownWithoutLogon; + BOOL bIgnoreShiftOverride; ULONG nShutdownAction;

1 0

01/01: [MSGINA] Simplify the auto logon code path
by Eric Kohl 21 May '18

21 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d308f4b6e6b64d0ecb37… commit 0d308f4b6e6b64d0ecb37d825165531350fef857 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon May 21 16:29:02 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon May 21 16:29:02 2018 +0200 [MSGINA] Simplify the auto logon code path - Get rid of DoAutoLogon() and the AutoLogonState variable. - Handle the auto logon in the normal logon code path instead. - Set bAutoAdminLogon to FALSE on a successful login. This will prevent another automatic logon after a logoff. - The IgnoreShiftOverride feature got lost by this change but I will add it again. --- dll/win32/msgina/gui.c | 16 ++++-- dll/win32/msgina/msgina.c | 131 +++------------------------------------------- dll/win32/msgina/msgina.h | 1 - 3 files changed, 21 insertions(+), 127 deletions(-) diff --git a/dll/win32/msgina/gui.c b/dll/win32/msgina/gui.c index 6d0840c368..46110df992 100644 --- a/dll/win32/msgina/gui.c +++ b/dll/win32/msgina/gui.c @@ -873,6 +873,8 @@ DoLogon( ZeroMemory(pgContext->Password, sizeof(pgContext->Password)); wcscpy(pgContext->Password, Password); + pgContext->bAutoAdminLogon = FALSE; + result = TRUE; done: @@ -944,21 +946,29 @@ LoggedOutWindowProc( pgContext = (PGINA_CONTEXT)lParam; SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pgContext); - if (!pgContext->bDontDisplayLastUserName) + if (pgContext->bAutoAdminLogon || + !pgContext->bDontDisplayLastUserName) SetDlgItemTextW(hwndDlg, IDC_USERNAME, pgContext->UserName); + if (pgContext->bAutoAdminLogon) + SetDlgItemTextW(hwndDlg, IDC_PASSWORD, pgContext->Password); + + SetDomainComboBox(GetDlgItem(hwndDlg, IDC_LOGON_TO), pgContext); + if (pgContext->bDisableCAD) EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); if (!pgContext->bShutdownWithoutLogon) EnableWindow(GetDlgItem(hwndDlg, IDC_SHUTDOWN), FALSE); - SetDomainComboBox(GetDlgItem(hwndDlg, IDC_LOGON_TO), pgContext); - SetFocus(GetDlgItem(hwndDlg, pgContext->bDontDisplayLastUserName ? IDC_USERNAME : IDC_PASSWORD)); /* Draw the logo bitmap */ pgContext->hBitmap = LoadImageW(pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + + if (pgContext->bAutoAdminLogon) + PostMessage(GetDlgItem(hwndDlg, IDOK), BM_CLICK, 0, 0); + return TRUE; } diff --git a/dll/win32/msgina/msgina.c b/dll/win32/msgina/msgina.c index 013c8bce44..8772df7dc1 100644 --- a/dll/win32/msgina/msgina.c +++ b/dll/win32/msgina/msgina.c @@ -242,6 +242,14 @@ GetRegistrySettings(PGINA_CONTEXT pgContext) (LPBYTE)&pgContext->Domain, &dwSize); + dwSize = sizeof(pgContext->Password); + rc = RegQueryValueExW(hKey, + L"DefaultPassword", + NULL, + NULL, + (LPBYTE)&pgContext->Password, + &dwSize); + if (lpShutdownWithoutLogon != NULL) HeapFree(GetProcessHeap(), 0, lpShutdownWithoutLogon); @@ -333,9 +341,6 @@ WlxInitialize( /* Locates the authentication package */ //LsaRegisterLogonProcess(...); - /* Check autologon settings the first time */ - pgContext->AutoLogonState = AUTOLOGON_CHECK_REGISTRY; - pgContext->nShutdownAction = WLX_SAS_ACTION_SHUTDOWN_POWER_OFF; ChooseGinaUI(); @@ -868,115 +873,6 @@ cleanup: } -static BOOL -DoAutoLogon( - IN PGINA_CONTEXT pgContext) -{ - HKEY WinLogonKey = NULL; - LPWSTR AutoLogon = NULL; - LPWSTR AutoCount = NULL; - LPWSTR IgnoreShiftOverride = NULL; - LPWSTR UserName = NULL; - LPWSTR Domain = NULL; - LPWSTR Password = NULL; - BOOL result = FALSE; - LONG rc; - NTSTATUS Status; - NTSTATUS SubStatus = STATUS_SUCCESS; - - TRACE("DoAutoLogon(): AutoLogonState = %lu\n", - pgContext->AutoLogonState); - - if (pgContext->AutoLogonState == AUTOLOGON_DISABLED) - return FALSE; - - rc = RegOpenKeyExW( - HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\WinLogon", - 0, - KEY_QUERY_VALUE, - &WinLogonKey); - if (rc != ERROR_SUCCESS) - goto cleanup; - - if (pgContext->AutoLogonState == AUTOLOGON_CHECK_REGISTRY) - { - /* Set it by default to disabled, we might reenable it again later */ - pgContext->AutoLogonState = AUTOLOGON_DISABLED; - - rc = ReadRegSzValue(WinLogonKey, L"AutoAdminLogon", &AutoLogon); - if (rc != ERROR_SUCCESS) - goto cleanup; - if (wcscmp(AutoLogon, L"1") != 0) - goto cleanup; - - rc = ReadRegSzValue(WinLogonKey, L"AutoLogonCount", &AutoCount); - if (rc == ERROR_SUCCESS && wcscmp(AutoCount, L"0") == 0) - goto cleanup; - else if (rc != ERROR_FILE_NOT_FOUND) - goto cleanup; - - rc = ReadRegSzValue(WinLogonKey, L"IgnoreShiftOverride", &UserName); - if (rc == ERROR_SUCCESS) - { - if (wcscmp(AutoLogon, L"1") != 0 && GetKeyState(VK_SHIFT) < 0) - goto cleanup; - } - else if (GetKeyState(VK_SHIFT) < 0) - { - /* User pressed SHIFT */ - goto cleanup; - } - - pgContext->AutoLogonState = AUTOLOGON_ONCE; - result = TRUE; - } - else /* pgContext->AutoLogonState == AUTOLOGON_ONCE */ - { - pgContext->AutoLogonState = AUTOLOGON_DISABLED; - - rc = ReadRegSzValue(WinLogonKey, L"DefaultUserName", &UserName); - if (rc != ERROR_SUCCESS) - goto cleanup; - rc = ReadRegSzValue(WinLogonKey, L"DefaultDomain", &Domain); - if (rc != ERROR_SUCCESS && rc != ERROR_FILE_NOT_FOUND) - goto cleanup; - rc = ReadRegSzValue(WinLogonKey, L"DefaultPassword", &Password); - if (rc != ERROR_SUCCESS) - goto cleanup; - - Status = DoLoginTasks(pgContext, UserName, Domain, Password, &SubStatus); - if (!NT_SUCCESS(Status)) - { - /* FIXME: Handle errors!!! */ - result = FALSE; - goto cleanup; - } - - result = CreateProfile(pgContext, UserName, Domain, Password); - if (result) - { - ZeroMemory(pgContext->Password, sizeof(pgContext->Password)); - wcscpy(pgContext->Password, Password); - - NotifyBootConfigStatus(TRUE); - } - } - -cleanup: - if (WinLogonKey != NULL) - RegCloseKey(WinLogonKey); - HeapFree(GetProcessHeap(), 0, AutoLogon); - HeapFree(GetProcessHeap(), 0, AutoCount); - HeapFree(GetProcessHeap(), 0, IgnoreShiftOverride); - HeapFree(GetProcessHeap(), 0, UserName); - HeapFree(GetProcessHeap(), 0, Domain); - HeapFree(GetProcessHeap(), 0, Password); - TRACE("DoAutoLogon(): AutoLogonState = %lu, returning %d\n", - pgContext->AutoLogonState, result); - return result; -} - /* * @implemented */ @@ -998,12 +894,9 @@ WlxDisplaySASNotice( if (pgContext->bAutoAdminLogon) { /* Don't display the window, we want to do an automatic logon */ - pgContext->AutoLogonState = AUTOLOGON_ONCE; pgContext->pWlxFuncs->WlxSasNotify(pgContext->hWlx, WLX_SAS_TYPE_CTRL_ALT_DEL); return; } - else - pgContext->AutoLogonState = AUTOLOGON_DISABLED; if (pgContext->bDisableCAD) { @@ -1043,14 +936,6 @@ WlxLoggedOutSAS( pgContext->pMprNotifyInfo = pMprNotifyInfo; pgContext->pProfile = pProfile; - if (0 == GetSystemMetrics(SM_REMOTESESSION) && - DoAutoLogon(pgContext)) - { - /* User is local and registry contains information - * to log on him automatically */ - *phToken = pgContext->UserToken; - return WLX_SAS_ACTION_LOGON; - } res = pGinaUI->LoggedOutSAS(pgContext); *phToken = pgContext->UserToken; diff --git a/dll/win32/msgina/msgina.h b/dll/win32/msgina/msgina.h index 44ea5c3d02..38c975eb89 100644 --- a/dll/win32/msgina/msgina.h +++ b/dll/win32/msgina/msgina.h @@ -42,7 +42,6 @@ typedef struct HWND hStatusWindow; HANDLE LsaHandle; ULONG AuthenticationPackage; - DWORD AutoLogonState; BOOL bDisableCAD; BOOL bAutoAdminLogon; BOOL bDontDisplayLastUserName;

1 0

01/01: [WINLOGON] Fix build.
by Pierre Schweitzer 21 May '18

21 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3dc07c91f8c02a654d058… commit 3dc07c91f8c02a654d05815dce55871d52275c59 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon May 21 11:33:02 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon May 21 11:33:02 2018 +0200 [WINLOGON] Fix build. --- base/system/winlogon/sas.c | 1 - base/system/winlogon/wlx.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index 077079d7e1..e9861de796 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -1140,7 +1140,6 @@ DispatchSAS( IN DWORD dwSasType) { DWORD wlxAction = WLX_SAS_ACTION_NONE; - HWND hwnd; PSID LogonSid = NULL; /* FIXME */ BOOL bSecure = TRUE; diff --git a/base/system/winlogon/wlx.c b/base/system/winlogon/wlx.c index 44983e78e9..5557e7fbf5 100644 --- a/base/system/winlogon/wlx.c +++ b/base/system/winlogon/wlx.c @@ -105,7 +105,7 @@ GetDialogListEntry(HWND hwndDlg) } -HWND +VOID CloseAllDialogWindows(VOID) { PDIALOG_LIST_ENTRY Current;

1 0

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

← Newer
1
...
9
10
11
12
13
14
15
...
22
Older →

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 May 2018