Ros-diffs February 2018

ros-diffs@reactos.org

24 participants
240 discussions

01/01: [CDFS_NEW] Fix a bug in Microsoft CDFS implementation where the top level IRP is set before locking is actually attempted for Cc worker thread (lazy write/read ahead). So in case locking fails, the top level IRP is set and never unset, and latter call will hit the assert where it expects the top level IRP to be NULL.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5e89014dc943b2cbddb1… commit a5e89014dc943b2cbddb16fc4d92e13b7e5068e1 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Feb 12 20:45:12 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Feb 12 20:47:32 2018 +0100 [CDFS_NEW] Fix a bug in Microsoft CDFS implementation where the top level IRP is set before locking is actually attempted for Cc worker thread (lazy write/read ahead). So in case locking fails, the top level IRP is set and never unset, and latter call will hit the assert where it expects the top level IRP to be NULL. Should be reported upstream (tm). CORE-14315 --- drivers/filesystems/cdfs_new/resrcsup.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/filesystems/cdfs_new/resrcsup.c b/drivers/filesystems/cdfs_new/resrcsup.c index c9eaa7be26..3bb38bb529 100755 --- a/drivers/filesystems/cdfs_new/resrcsup.c +++ b/drivers/filesystems/cdfs_new/resrcsup.c @@ -164,10 +164,20 @@ Return Value: { PAGED_CODE(); +#ifdef __REACTOS__ + if (!ExAcquireResourceSharedLite( Fcb->Resource, Wait )) { + return FALSE; + } +#endif + NT_ASSERT(IoGetTopLevelIrp() == NULL); IoSetTopLevelIrp((PIRP)FSRTL_CACHE_TOP_LEVEL_IRP); +#ifndef __REACTOS__ return ExAcquireResourceSharedLite( Fcb->Resource, Wait ); +#else + return TRUE; +#endif }

6 years, 10 months

01/01: [SERVICES] Set a complete service status for running boot start or system start drivers

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c9cdd84bb43439dfdad0… commit 6c9cdd84bb43439dfdad0c7abc804fac7928bcde Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Feb 12 15:50:30 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Feb 12 15:50:30 2018 +0100 [SERVICES] Set a complete service status for running boot start or system start drivers --- base/system/services/database.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/base/system/services/database.c b/base/system/services/database.c index b450fe486d..d31d353a87 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -1040,6 +1040,11 @@ ScmCheckDriver(PSERVICE Service) /* Mark service as 'running' */ Service->Status.dwCurrentState = SERVICE_RUNNING; + Service->Status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + Service->Status.dwWin32ExitCode = ERROR_SUCCESS; + Service->Status.dwServiceSpecificExitCode = 0; + Service->Status.dwCheckPoint = 0; + Service->Status.dwWaitHint = 0; /* Mark the service group as 'running' */ if (Service->lpGroup != NULL)

6 years, 10 months

01/01: [SERVICES] Fix the initial service status

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e917471e0457e949800f4… commit e917471e0457e949800f4246a6465b4fa735af48 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Feb 12 14:58:02 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Feb 12 14:58:02 2018 +0100 [SERVICES] Fix the initial service status - The initial dwWin32ExitCode for a disabled service is ERROR_SERVICE_DISABLED and ERROR_SRVICE_NEVER_STARTED for non-disabled services. - The initial dwWaitHint is 2000 (2 seconds) for (user-mode) services and 0 for drivers. - Move all driver-related code to driver.c. --- base/system/services/database.c | 29 ++++++++++++++++------------- base/system/services/driver.c | 27 +++++++++++++++++++++++++-- base/system/services/rpcserver.c | 6 +++--- base/system/services/services.h | 7 ++++--- 4 files changed, 48 insertions(+), 21 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index 19c4e05724..b450fe486d 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -559,7 +559,9 @@ ScmGetServiceEntryByResumeCount(DWORD dwResumeCount) DWORD ScmCreateNewServiceRecord(LPCWSTR lpServiceName, - PSERVICE* lpServiceRecord) + PSERVICE *lpServiceRecord, + DWORD dwServiceType, + DWORD dwStartType) { PSERVICE lpService = NULL; @@ -579,6 +581,9 @@ ScmCreateNewServiceRecord(LPCWSTR lpServiceName, lpService->lpServiceName = lpService->szServiceName; lpService->lpDisplayName = lpService->lpServiceName; + /* Set the start type */ + lpService->dwStartType = dwStartType; + /* Set the resume count */ lpService->dwResumeCount = ResumeCount++; @@ -587,12 +592,15 @@ ScmCreateNewServiceRecord(LPCWSTR lpServiceName, &lpService->ServiceListEntry); /* Initialize the service status */ + lpService->Status.dwServiceType = dwServiceType; lpService->Status.dwCurrentState = SERVICE_STOPPED; lpService->Status.dwControlsAccepted = 0; - lpService->Status.dwWin32ExitCode = ERROR_SERVICE_NEVER_STARTED; + lpService->Status.dwWin32ExitCode = + (dwStartType == SERVICE_DISABLED) ? ERROR_SERVICE_DISABLED : ERROR_SERVICE_NEVER_STARTED; lpService->Status.dwServiceSpecificExitCode = 0; lpService->Status.dwCheckPoint = 0; - lpService->Status.dwWaitHint = 2000; /* 2 seconds */ + lpService->Status.dwWaitHint = + (dwServiceType & SERVICE_DRIVER) ? 0 : 2000; /* 2 seconds */ return ERROR_SUCCESS; } @@ -719,12 +727,12 @@ CreateServiceListEntry(LPCWSTR lpServiceName, DPRINT("Display name: %S\n", lpDisplayName); dwError = ScmCreateNewServiceRecord(lpServiceName, - &lpService); + &lpService, + dwServiceType, + dwStartType); if (dwError != ERROR_SUCCESS) goto done; - lpService->Status.dwServiceType = dwServiceType; - lpService->dwStartType = dwStartType; lpService->dwErrorControl = dwErrorControl; lpService->dwTag = dwTagId; @@ -1801,13 +1809,8 @@ ScmLoadService(PSERVICE Service, if (Service->Status.dwServiceType & SERVICE_DRIVER) { - /* Load driver */ - dwError = ScmLoadDriver(Service); - if (dwError == ERROR_SUCCESS) - { - Service->Status.dwCurrentState = SERVICE_RUNNING; - Service->Status.dwControlsAccepted = SERVICE_ACCEPT_STOP; - } + /* Start the driver */ + dwError = ScmStartDriver(Service); } else // if (Service->Status.dwServiceType & (SERVICE_WIN32 | SERVICE_INTERACTIVE_PROCESS)) { diff --git a/base/system/services/driver.c b/base/system/services/driver.c index de8bfc1aa3..819183e5c0 100644 --- a/base/system/services/driver.c +++ b/base/system/services/driver.c @@ -19,6 +19,7 @@ /* FUNCTIONS ****************************************************************/ +static DWORD ScmLoadDriver(PSERVICE lpService) { @@ -70,7 +71,7 @@ done: return RtlNtStatusToDosError(Status); } - +static DWORD ScmUnloadDriver(PSERVICE lpService) { @@ -123,6 +124,7 @@ done: } +static DWORD ScmGetDriverStatus(PSERVICE lpService, LPSERVICE_STATUS lpServiceStatus) @@ -285,6 +287,27 @@ ScmGetDriverStatus(PSERVICE lpService, } +DWORD +ScmStartDriver(PSERVICE pService) +{ + DWORD dwError; + + DPRINT("ScmStartDriver(%p)\n", pService); + + dwError = ScmLoadDriver(pService); + if (dwError == ERROR_SUCCESS) + { + pService->Status.dwCurrentState = SERVICE_RUNNING; + pService->Status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + pService->Status.dwWin32ExitCode = ERROR_SUCCESS; + } + + DPRINT("ScmStartDriver returns %lu\n", dwError); + + return dwError; +} + + DWORD ScmControlDriver(PSERVICE lpService, DWORD dwControl, @@ -328,7 +351,7 @@ ScmControlDriver(PSERVICE lpService, dwError = ERROR_INVALID_SERVICE_CONTROL; } -done:; +done: DPRINT("ScmControlDriver() done (Erorr: %lu)\n", dwError); return dwError; diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index f1ce146a92..a4718aa15f 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -2279,13 +2279,13 @@ RCreateServiceW( /* Allocate a new service entry */ dwError = ScmCreateNewServiceRecord(lpServiceName, - &lpService); + &lpService, + dwServiceType, + dwStartType); if (dwError != ERROR_SUCCESS) goto done; /* Fill the new service entry */ - lpService->Status.dwServiceType = dwServiceType; - lpService->dwStartType = dwStartType; lpService->dwErrorControl = dwErrorControl; /* Fill the display name */ diff --git a/base/system/services/services.h b/base/system/services/services.h index 1d20f120d1..0f03849967 100644 --- a/base/system/services/services.h +++ b/base/system/services/services.h @@ -168,7 +168,9 @@ PSERVICE ScmGetServiceEntryByName(LPCWSTR lpServiceName); PSERVICE ScmGetServiceEntryByDisplayName(LPCWSTR lpDisplayName); PSERVICE ScmGetServiceEntryByResumeCount(DWORD dwResumeCount); DWORD ScmCreateNewServiceRecord(LPCWSTR lpServiceName, - PSERVICE *lpServiceRecord); + PSERVICE *lpServiceRecord, + DWORD dwServiceType, + DWORD dwStartType); VOID ScmDeleteServiceRecord(PSERVICE lpService); DWORD ScmMarkServiceForDelete(PSERVICE pService); @@ -185,8 +187,7 @@ VOID ScmDeleteNamedPipeCriticalSection(VOID); /* driver.c */ -DWORD ScmLoadDriver(PSERVICE lpService); -DWORD ScmUnloadDriver(PSERVICE lpService); +DWORD ScmStartDriver(PSERVICE lpService); DWORD ScmControlDriver(PSERVICE lpService, DWORD dwControl, LPSERVICE_STATUS lpServiceStatus);

6 years, 10 months

01/01: [APPSHIM_APITEST] Fix 2 Clang-Cl warnings about ok2

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12b0dfb71ec0578acff8c… commit 12b0dfb71ec0578acff8cebc3cfc61c4d154f85f Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Feb 11 23:15:06 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Feb 12 12:34:20 2018 +0100 [APPSHIM_APITEST] Fix 2 Clang-Cl warnings about ok2 "warning: expression result unused [-Wunused-value]" CORE-14306 --- modules/rostests/apitests/appshim/versionlie.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/appshim/versionlie.c b/modules/rostests/apitests/appshim/versionlie.c index aaac992c1e..5848f98aaf 100644 --- a/modules/rostests/apitests/appshim/versionlie.c +++ b/modules/rostests/apitests/appshim/versionlie.c @@ -62,7 +62,7 @@ static void verify_shima_imp(PHOOKAPI hook, const VersionLieInfo* info, PCSTR sh while (v1.dwOSVersionInfoSize) { - ok1 = GetVersionExA((LPOSVERSIONINFOA)&v1), ok2; + ok1 = GetVersionExA((LPOSVERSIONINFOA)&v1); hook->OriginalFunction = GetVersionExA; ok2 = ((GETVERSIONEXAPROC)hook->ReplacementFunction)(&v2); @@ -127,7 +127,7 @@ static void verify_shimw_imp(PHOOKAPI hook, const VersionLieInfo* info, PCSTR sh while (v1.dwOSVersionInfoSize) { - ok1 = GetVersionExW((LPOSVERSIONINFOW)&v1), ok2; + ok1 = GetVersionExW((LPOSVERSIONINFOW)&v1); hook->OriginalFunction = GetVersionExW; ok2 = ((GETVERSIONEXWPROC)hook->ReplacementFunction)(&v2);

6 years, 10 months

01/01: [EXPLORER] Fix a Clang-Cl warning about Icon->ProcessId

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1535c2d6e4f5e23e431a… commit f1535c2d6e4f5e23e431a5e2125d021e52917a2e Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Feb 11 23:57:15 2018 +0100 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Mon Feb 12 08:41:26 2018 +0000 [EXPLORER] Fix a Clang-Cl warning about Icon->ProcessId "warning: expression result unused [-Wunused-value]" Regressed in be2bf9b. CORE-14306 --- base/shell/explorer/syspager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index a1982e7881..7be7eeb694 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -332,7 +332,7 @@ bool CIconWatcher::AddIconToWatcher(_In_ CONST NOTIFYICONDATA *iconData) IconWatcherData *Icon = new IconWatcherData(iconData); Icon->hProcess = hProcess; - Icon->ProcessId; + Icon->ProcessId = ProcessId; bool Added = false; EnterCriticalSection(&m_ListLock);

6 years, 10 months

01/01: [EXPLORER] WatchList should be freed with delete[], not delete (#374)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abdde0b764540617fd99e… commit abdde0b764540617fd99ef397287421a3ace1dfc Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Feb 11 22:56:38 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 11 22:56:38 2018 +0100 [EXPLORER] WatchList should be freed with delete[], not delete (#374) WatchList is a set of array objects, initialized with "new[]", so it should be freed with "delete[]" to free all of its elements. Otherwise using only "delete" only frees the first variable but not its array. This would lead to an undefined behaviour. --- base/shell/explorer/syspager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 0fa8eae4e3..a1982e7881 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -413,7 +413,7 @@ UINT WINAPI CIconWatcher::WatcherThread(_In_opt_ LPVOID lpParam) ASSERT(Size <= MAXIMUM_WAIT_OBJECTS); if (WatchList) - delete WatchList; + delete[] WatchList; WatchList = new HANDLE[Size]; WatchList[0] = This->m_WakeUpEvent; @@ -479,7 +479,7 @@ UINT WINAPI CIconWatcher::WatcherThread(_In_opt_ LPVOID lpParam) } if (WatchList) - delete WatchList; + delete[] WatchList; return 0; }

6 years, 10 months

01/01: [CONUTILS] Relax the enforcement of using FORMAT_MESSAGE_MAX_WIDTH_MASK in the ConMsg* and ConResMsg* functions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=075d58cc647b44ab849d5… commit 075d58cc647b44ab849d512d9703f3d1d55f5793 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 11 18:08:39 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 11 18:10:08 2018 +0100 [CONUTILS] Relax the enforcement of using FORMAT_MESSAGE_MAX_WIDTH_MASK in the ConMsg* and ConResMsg* functions. --- sdk/lib/conutils/outstream.c | 55 ++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 35 deletions(-) diff --git a/sdk/lib/conutils/outstream.c b/sdk/lib/conutils/outstream.c index 580269cf1e..a36a5ddaa2 100644 --- a/sdk/lib/conutils/outstream.c +++ b/sdk/lib/conutils/outstream.c @@ -331,7 +331,7 @@ ConWrite( #define CON_STREAM_WRITE_CALL(Stream, Str, Len) \ - (Stream)->WriteFunc((Stream), (Str), (Len)); + (Stream)->WriteFunc((Stream), (Str), (Len)) /* Lock the stream only in non-USE_CRT mode (otherwise use the CRT stream lock) */ #ifndef USE_CRT @@ -358,9 +358,7 @@ do { \ } while(0) #define CON_STREAM_WRITE(Stream, Str, Len) \ -do { \ - CON_STREAM_WRITE_CALL((Stream), (Str), (Len)); \ -} while(0) + CON_STREAM_WRITE_CALL((Stream), (Str), (Len)) #endif @@ -797,8 +795,8 @@ ConResPrintf( * The formatting options, and how to interpret the @p lpSource parameter. * See FormatMessage() for more details. The @b FORMAT_MESSAGE_ALLOCATE_BUFFER * and @b FORMAT_MESSAGE_ARGUMENT_ARRAY flags are always ignored. - * The function implicitly uses the @b FORMAT_MESSAGE_IGNORE_INSERTS and - * @b FORMAT_MESSAGE_MAX_WIDTH_MASK flags to implement its behaviour. + * The function implicitly uses the @b FORMAT_MESSAGE_IGNORE_INSERTS flag + * to implement its behaviour. * * @param[in] lpSource * The location of the message definition. The type of this parameter @@ -841,8 +839,6 @@ ConMsgPuts( dwFlags |= FORMAT_MESSAGE_IGNORE_INSERTS; // Ignore inserts for FormatMessage. dwFlags &= ~FORMAT_MESSAGE_ARGUMENT_ARRAY; - dwFlags |= FORMAT_MESSAGE_MAX_WIDTH_MASK; - /* * Retrieve the message string without appending extra newlines. * Wrap in SEH to protect from invalid string parameters. @@ -916,8 +912,6 @@ ConMsgPrintf2V( dwFlags |= FORMAT_MESSAGE_IGNORE_INSERTS; // Ignore inserts for FormatMessage. dwFlags &= ~FORMAT_MESSAGE_ARGUMENT_ARRAY; - dwFlags |= FORMAT_MESSAGE_MAX_WIDTH_MASK; - /* * Retrieve the message string without appending extra newlines. * Wrap in SEH to protect from invalid string parameters. @@ -976,9 +970,8 @@ ConMsgPrintf2V( * * @param[in] dwFlags * The formatting options, and how to interpret the @p lpSource parameter. - * See FormatMessage() for more details. The @b FORMAT_MESSAGE_ALLOCATE_BUFFER - * flags is always ignored. The function implicitly uses the - * @b FORMAT_MESSAGE_MAX_WIDTH_MASK flag to implement its behaviour. + * See FormatMessage() for more details. + * The @b FORMAT_MESSAGE_ALLOCATE_BUFFER flag is always ignored. * * @param[in] lpSource * The location of the message definition. The type of this parameter @@ -1034,10 +1027,6 @@ ConMsgPrintfV( /* Sanitize dwFlags */ dwFlags |= FORMAT_MESSAGE_ALLOCATE_BUFFER; // Always allocate an internal buffer. - // - // NOTE: Technique taken from eventvwr.c!GetMessageStringFromDll() - // - dwFlags |= FORMAT_MESSAGE_MAX_WIDTH_MASK; /* * Retrieve the message string without appending extra newlines. @@ -1091,8 +1080,6 @@ ConMsgPrintfV( * The formatting options, and how to interpret the @p lpSource parameter. * See FormatMessage() for more details. The @b FORMAT_MESSAGE_ALLOCATE_BUFFER * and @b FORMAT_MESSAGE_ARGUMENT_ARRAY flags are always ignored. - * The function implicitly uses the @b FORMAT_MESSAGE_MAX_WIDTH_MASK flag - * to implement its behaviour. * * @param[in] lpSource * The location of the message definition. The type of this parameter @@ -1170,9 +1157,10 @@ ConMsgPrintf( * * @param[in] dwFlags * The formatting options, see FormatMessage() for more details. - * The only valid flags are @b FORMAT_MESSAGE_ARGUMENT_ARRAY and - * @b FORMAT_MESSAGE_IGNORE_INSERTS. All the other flags are internally - * overridden by the function to implement its behaviour. + * The only valid flags are @b FORMAT_MESSAGE_ARGUMENT_ARRAY, + * @b FORMAT_MESSAGE_IGNORE_INSERTS and @b FORMAT_MESSAGE_MAX_WIDTH_MASK. + * All the other flags are internally overridden by the function + * to implement its behaviour. * * @param[in] uID * The identifier of the message string. The format string follows the @@ -1234,10 +1222,6 @@ ConResMsgPrintfExV( /* Sanitize dwFlags */ dwFlags |= FORMAT_MESSAGE_ALLOCATE_BUFFER; // Always allocate an internal buffer. - // - // NOTE: Technique taken from eventvwr.c!GetMessageStringFromDll() - // - dwFlags |= FORMAT_MESSAGE_MAX_WIDTH_MASK; /* The string has already been manually loaded */ dwFlags &= ~(FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM); @@ -1291,9 +1275,10 @@ ConResMsgPrintfExV( * * @param[in] dwFlags * The formatting options, see FormatMessage() for more details. - * The only valid flags are @b FORMAT_MESSAGE_ARGUMENT_ARRAY and - * @b FORMAT_MESSAGE_IGNORE_INSERTS. All the other flags are internally - * overridden by the function to implement its behaviour. + * The only valid flags are @b FORMAT_MESSAGE_ARGUMENT_ARRAY, + * @b FORMAT_MESSAGE_IGNORE_INSERTS and @b FORMAT_MESSAGE_MAX_WIDTH_MASK. + * All the other flags are internally overridden by the function + * to implement its behaviour. * * @param[in] uID * The identifier of the message string. The format string follows the @@ -1357,9 +1342,9 @@ ConResMsgPrintfV( * * @param[in] dwFlags * The formatting options, see FormatMessage() for more details. - * The only valid flag is @b FORMAT_MESSAGE_IGNORE_INSERTS. - * All the other flags are internally overridden by the function - * to implement its behaviour. + * The only valid flags are @b FORMAT_MESSAGE_IGNORE_INSERTS and + * @b FORMAT_MESSAGE_MAX_WIDTH_MASK. All the other flags are internally + * overridden by the function to implement its behaviour. * * @param[in] uID * The identifier of the message string. The format string follows the @@ -1431,9 +1416,9 @@ ConResMsgPrintfEx( * * @param[in] dwFlags * The formatting options, see FormatMessage() for more details. - * The only valid flag is @b FORMAT_MESSAGE_IGNORE_INSERTS. - * All the other flags are internally overridden by the function - * to implement its behaviour. + * The only valid flags are @b FORMAT_MESSAGE_IGNORE_INSERTS and + * @b FORMAT_MESSAGE_MAX_WIDTH_MASK. All the other flags are internally + * overridden by the function to implement its behaviour. * * @param[in] uID * The identifier of the message string. The format string follows the

6 years, 10 months

01/01: [MAGNIFY] Call PostQuitMessage() only at the very end.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3403eff05288c09ee744… commit a3403eff05288c09ee744181e5a59149fac728ad Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 11 00:35:29 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 11 00:35:29 2018 +0100 [MAGNIFY] Call PostQuitMessage() only at the very end. --- base/applications/magnify/magnifier.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/base/applications/magnify/magnifier.c b/base/applications/magnify/magnifier.c index 4c403d618a..057942eda2 100644 --- a/base/applications/magnify/magnifier.c +++ b/base/applications/magnify/magnifier.c @@ -741,12 +741,14 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) return 0; case WM_DESTROY: - if(AppBarConfig.uEdge>=0) DoAppBarStuff(ABM_REMOVE); + { + if (AppBarConfig.uEdge >= 0) + DoAppBarStuff(ABM_REMOVE); + + KillTimer(hWnd, 1); /* Save settings to registry */ SaveSettings(); - KillTimer(hWnd , 1); - PostQuitMessage(0); /* Cleanup notification icon */ ZeroMemory(&nid, sizeof(nid)); @@ -755,11 +757,13 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) nid.hWnd = hWnd; nid.uCallbackMessage = APPMSG_NOTIFYICON; Shell_NotifyIcon(NIM_DELETE, &nid); - DestroyIcon(notifyIcon); DestroyWindow(hOptionsDialog); + + PostQuitMessage(0); return 0; + } case WM_CREATE: { @@ -769,7 +773,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) hDesktopWindow = GetDesktopWindow(); /* Set the timer */ - SetTimer (hWnd , 1, TIMER_SPEED , NULL); + SetTimer(hWnd, 1, TIMER_SPEED, NULL); /* Notification icon */ notifyIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 16, 16, 0); @@ -781,7 +785,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) nid.uCallbackMessage = APPMSG_NOTIFYICON; nid.hIcon = notifyIcon; Shell_NotifyIcon(NIM_ADD, &nid); - + tempMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDC_MAGNIFIER)); notifyMenu = GetSubMenu(tempMenu, 0); RemoveMenu(tempMenu, 0, MF_BYPOSITION);

6 years, 10 months

01/01: [NTOSKRNL] In debug builds, print more information about the top level IRP in the Cc worker thread

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd709879097ca09224a4c… commit bd709879097ca09224a4c1d6680cec3e7f5a4598 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 10 23:49:33 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 10 23:50:26 2018 +0100 [NTOSKRNL] In debug builds, print more information about the top level IRP in the Cc worker thread CORE-14315 --- ntoskrnl/cc/lazywrite.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/ntoskrnl/cc/lazywrite.c b/ntoskrnl/cc/lazywrite.c index adb9fb09d7..ddb7bc42c3 100644 --- a/ntoskrnl/cc/lazywrite.c +++ b/ntoskrnl/cc/lazywrite.c @@ -204,12 +204,26 @@ CcWorkerThread( KIRQL OldIrql; BOOLEAN DropThrottle; PWORK_QUEUE_ITEM Item; +#if DBG + PIRP TopLevel; +#endif /* Get back our thread item */ Item = Parameter; /* And by default, don't touch throttle */ DropThrottle = FALSE; +#if DBG + /* Top level IRP should be clean when started + * Save it to catch buggy drivers (or bugs!) + */ + TopLevel = IoGetTopLevelIrp(); + if (TopLevel != NULL) + { + DPRINT1("(%p) TopLevel IRP for this thread: %p\n", PsGetCurrentThread(), TopLevel); + } +#endif + /* Loop till we have jobs */ while (TRUE) { @@ -288,6 +302,14 @@ CcWorkerThread( /* One less worker */ --CcNumberActiveWorkerThreads; KeReleaseQueuedSpinLock(LockQueueWorkQueueLock, OldIrql); + +#if DBG + /* Top level shouldn't have changed */ + if (TopLevel != IoGetTopLevelIrp()) + { + DPRINT1("(%p) Mismatching TopLevel: %p, %p\n", PsGetCurrentThread(), TopLevel, IoGetTopLevelIrp()); + } +#endif } /*

6 years, 10 months

01/01: [SDK] Fix NT6 building issues and improve SDK NT6 headers.

by Denis Malikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=420c0360acd3743120ec8… commit 420c0360acd3743120ec89e97a92f49b8fae53b2 Author: Denis Malikov <filedem(a)gmail.com> AuthorDate: Sun Feb 4 18:29:23 2018 +0700 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 10 18:58:35 2018 +0100 [SDK] Fix NT6 building issues and improve SDK NT6 headers. CORE-12596 --- sdk/include/asm/ks386.template.h | 2 +- sdk/include/asm/ksx.template.h | 6 ++++-- sdk/include/ddk/fcb.h | 1 + sdk/include/ndk/i386/asm.h | 9 +++++++++ sdk/include/ndk/peb_teb.h | 2 +- sdk/include/psdk/winddi.h | 2 +- sdk/include/psdk/winuser.h | 8 ++++++++ sdk/include/psdk/ws2spi.h | 2 +- 8 files changed, 26 insertions(+), 6 deletions(-) diff --git a/sdk/include/asm/ks386.template.h b/sdk/include/asm/ks386.template.h index e5f672cb1b..ac94afdc0f 100644 --- a/sdk/include/asm/ks386.template.h +++ b/sdk/include/asm/ks386.template.h @@ -556,7 +556,7 @@ HEADER("Data access macros"), RAW("#define USERDATA ds:[HEX(0FFDF0000)]"), RAW("#define PCR fs:"), -#if (NTDDI_VERSION >= NTDDI_VISTA) +#if (NTDDI_VERSION >= NTDDI_WIN8) HEADER("KNODE offsets"), OFFSET(NdIdleCpuSet, KNODE, IdleCpuSet), #endif diff --git a/sdk/include/asm/ksx.template.h b/sdk/include/asm/ksx.template.h index 1daf46f414..96d64c3d47 100644 --- a/sdk/include/asm/ksx.template.h +++ b/sdk/include/asm/ksx.template.h @@ -125,7 +125,7 @@ RAW("#else"), {TYPE_CONSTANT, "SYNCH_LEVEL", (IPI_LEVEL - 2)}, RAW("#endif"), -#if (NTDDI_VERSION >= NTDDI_VISTA) +#if (NTDDI_VERSION >= NTDDI_WIN8) HEADER("Entropy Timing Constants"), CONSTANT(KENTROPY_TIMING_INTERRUPTS_PER_BUFFER), CONSTANT(KENTROPY_TIMING_BUFFER_MASK), @@ -797,7 +797,9 @@ SIZE(KernelThreadObjectLength, KTHREAD), HEADER("KTIMER"), OFFSET(TiType, KTIMER, Header.Type), OFFSET(TiSize, KTIMER, Header.Size), -OFFSET(TiInserted, KTIMER, Header.Inserted), // not in win 10 +#if (NTDDI_VERSION < NTDDI_WIN7) +OFFSET(TiInserted, KTIMER, Header.Inserted), +#endif OFFSET(TiSignalState, KTIMER, Header.SignalState), OFFSET(TiDueTime, KTIMER, DueTime), OFFSET(TiTimerListEntry, KTIMER, TimerListEntry), diff --git a/sdk/include/ddk/fcb.h b/sdk/include/ddk/fcb.h index 417b610c78..ba16a86719 100644 --- a/sdk/include/ddk/fcb.h +++ b/sdk/include/ddk/fcb.h @@ -525,6 +525,7 @@ RxGetFileSizeWithLock( _Out_ PLONGLONG FileSize); #if (_WIN32_WINNT >= 0x0600) +PFCB RxCreateNetFcb( _In_ PRX_CONTEXT RxContext, _In_ PIRP Irp, diff --git a/sdk/include/ndk/i386/asm.h b/sdk/include/ndk/i386/asm.h index 3c203e5890..242cc74e1d 100644 --- a/sdk/include/ndk/i386/asm.h +++ b/sdk/include/ndk/i386/asm.h @@ -627,6 +627,15 @@ Author: #define EXCEPTION_NPX_ERROR 0x010 #define EXCEPTION_ALIGNMENT_CHECK 0x011 +// +// Hypervisor Enlightenment Definitions +// +#define HV_MMU_USE_HYPERCALL_FOR_ADDRESS_SWITCH 0x01 +#define HV_MMU_USE_HYPERCALL_FOR_LOCAL_FLUSH 0x02 +#define HV_MMU_USE_HYPERCALL_FOR_REMOTE_FLUSH 0x04 +#define HV_APIC_ENLIGHTENED 0x10 +#define HV_KE_USE_HYPERCALL_FOR_LONG_SPIN_WAIT 0x40 + // // VDM State Pointer // diff --git a/sdk/include/ndk/peb_teb.h b/sdk/include/ndk/peb_teb.h index c52b161dc7..89a022853f 100644 --- a/sdk/include/ndk/peb_teb.h +++ b/sdk/include/ndk/peb_teb.h @@ -344,7 +344,7 @@ typedef struct STRUCT(_TEB) #endif PTR(PVOID) WinSockData; ULONG GdiBatchCount; -#if (NTDDI_VERSION >= NTDDI_WIN10) +#if (NTDDI_VERSION >= NTDDI_WIN7) union { PROCESSOR_NUMBER CurrentIdealProcessor; diff --git a/sdk/include/psdk/winddi.h b/sdk/include/psdk/winddi.h index 1d1019ae0d..892604da1e 100644 --- a/sdk/include/psdk/winddi.h +++ b/sdk/include/psdk/winddi.h @@ -4352,7 +4352,7 @@ typedef HBITMAP #endif /* (NTDDI_VERSION >= NTDDI_WIN8) */ _Out_ HANDLE* phSharedSurface); typedef FN_DrvCreateDeviceBitmapEx *PFN_DrvCreateDeviceBitmapEx; -extern DrvCreateDeviceBitmapEx DrvCreateDeviceBitmapEx +extern FN_DrvCreateDeviceBitmapEx DrvCreateDeviceBitmapEx; typedef VOID (APIENTRY FN_DrvDeleteDeviceBitmapEx)( diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index 7fe3a14fe0..4f77a9c973 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -3446,6 +3446,14 @@ typedef struct tagSOUNDSENTRYW { DWORD iWindowsEffectOrdinal; } SOUNDSENTRYW,*LPSOUNDSENTRYW; +#if (_WIN32_WINNT >= 0x0600) +typedef struct tagAUDIODESCRIPTION { + UINT cbSize; + BOOL Enabled; + LCID Locale; +} AUDIODESCRIPTION, *LPAUDIODESCRIPTION; +#endif + typedef struct tagSTICKYKEYS { DWORD cbSize; DWORD dwFlags; diff --git a/sdk/include/psdk/ws2spi.h b/sdk/include/psdk/ws2spi.h index 6fb353dde4..99276e0106 100644 --- a/sdk/include/psdk/ws2spi.h +++ b/sdk/include/psdk/ws2spi.h @@ -880,7 +880,7 @@ WSCGetProviderInfo( _In_ LPGUID lpProviderId, _In_ WSC_PROVIDER_INFO_TYPE InfoType, _Out_writes_bytes_to_(*InfoSize, *InfoSize) PBYTE Info, - _Inout_ *InfoSize, + _Inout_ size_t *InfoSize, _In_ DWORD Flags, _Out_ LPINT lpErrno);

6 years, 10 months

← Newer
1
...
11
12
13
14
15
16
17
...
24
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 February 2018