Ros-diffs February 2018

ros-diffs@reactos.org

24 participants
240 discussions

03/03: [SHLWAPI] Cherry-pick Wine commit 7be8beab68c (Don't attempt to un-expect ComputerName in PathUnExpandEnvStrings) by Katayama Hirofumi MZ. CORE-13816

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af6c5806d5c1ba531a44b… commit af6c5806d5c1ba531a44b19e453c69108e84161d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 24 14:15:48 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 24 14:18:29 2018 +0100 [SHLWAPI] Cherry-pick Wine commit 7be8beab68c (Don't attempt to un-expect ComputerName in PathUnExpandEnvStrings) by Katayama Hirofumi MZ. CORE-13816 --- dll/win32/shlwapi/path.c | 2 -- modules/rostests/winetests/shlwapi/path.c | 18 ++++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dll/win32/shlwapi/path.c b/dll/win32/shlwapi/path.c index 342ef46e54..94472580d9 100644 --- a/dll/win32/shlwapi/path.c +++ b/dll/win32/shlwapi/path.c @@ -4120,7 +4120,6 @@ BOOL WINAPI PathUnExpandEnvStringsA(LPCSTR path, LPSTR buffer, UINT buf_len) static const WCHAR allusersprofileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%',0}; static const WCHAR appdataW[] = {'%','A','P','P','D','A','T','A','%',0}; -static const WCHAR computernameW[] = {'%','C','O','M','P','U','T','E','R','N','A','M','E','%',0}; static const WCHAR programfilesW[] = {'%','P','r','o','g','r','a','m','F','i','l','e','s','%',0}; static const WCHAR systemrootW[] = {'%','S','y','s','t','e','m','R','o','o','t','%',0}; static const WCHAR systemdriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%',0}; @@ -4157,7 +4156,6 @@ BOOL WINAPI PathUnExpandEnvStringsW(LPCWSTR path, LPWSTR buffer, UINT buf_len) struct envvars_map envvars[] = { { allusersprofileW, sizeof(allusersprofileW)/sizeof(WCHAR) }, { appdataW, sizeof(appdataW)/sizeof(WCHAR) }, - { computernameW, sizeof(computernameW)/sizeof(WCHAR) }, { programfilesW, sizeof(programfilesW)/sizeof(WCHAR) }, { systemrootW, sizeof(systemrootW)/sizeof(WCHAR) }, { systemdriveW, sizeof(systemdriveW)/sizeof(WCHAR) }, diff --git a/modules/rostests/winetests/shlwapi/path.c b/modules/rostests/winetests/shlwapi/path.c index 6edafc6f9f..78f9090069 100755 --- a/modules/rostests/winetests/shlwapi/path.c +++ b/modules/rostests/winetests/shlwapi/path.c @@ -1455,10 +1455,11 @@ static void test_PathUnExpandEnvStrings(void) static const WCHAR sysrootW[] = {'%','S','y','s','t','e','m','R','o','o','t','%',0}; static const WCHAR sysdriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%',0}; static const WCHAR nonpathW[] = {'p','a','t','h',0}; + static const WCHAR computernameW[] = {'C','O','M','P','U','T','E','R','N','A','M','E',0}; static const char sysrootA[] = "%SystemRoot%"; static const char sysdriveA[] = "%SystemDrive%"; - WCHAR pathW[MAX_PATH], buffW[MAX_PATH], sysdrvW[3]; - char path[MAX_PATH], buff[MAX_PATH], sysdrvA[3], envvarA[10]; + WCHAR pathW[MAX_PATH], buffW[MAX_PATH], sysdrvW[3], envvarW[30]; + char path[MAX_PATH], buff[MAX_PATH], sysdrvA[3], envvarA[30]; BOOL ret; UINT len; @@ -1468,6 +1469,19 @@ static void test_PathUnExpandEnvStrings(void) return; } + /* The value of ComputerName is not a path */ + ret = GetEnvironmentVariableA("COMPUTERNAME", envvarA, sizeof(envvarA)); + ok(ret, "got %d\n", ret); + SetLastError(0xdeadbeef); + ret = pPathUnExpandEnvStringsA(envvarA, buff, sizeof(buff)); + ok(!ret && GetLastError() == 0xdeadbeef, "got %d, error %d\n", ret, GetLastError()); + + ret = GetEnvironmentVariableW(computernameW, envvarW, sizeof(envvarW)/sizeof(WCHAR)); + ok(ret, "got %d\n", ret); + SetLastError(0xdeadbeef); + ret = pPathUnExpandEnvStringsW(envvarW, buffW, sizeof(buffW)/sizeof(WCHAR)); + ok(!ret && GetLastError() == 0xdeadbeef, "got %d, error %d\n", ret, GetLastError()); + /* something that can't be represented with env var */ strcpy(path, "somepath_name"); strcpy(buff, "xx");

6 years, 10 months

02/03: [KERNEL32_WINETEST] Cherry-pick Wine commit 85f515292aa (Close process / thread handles) by Mark Jansen.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ac94af4361638770c2ee… commit 9ac94af4361638770c2ee1b5598a62eb3b58ab27 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 24 14:14:35 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 24 14:18:15 2018 +0100 [KERNEL32_WINETEST] Cherry-pick Wine commit 85f515292aa (Close process / thread handles) by Mark Jansen. --- modules/rostests/winetests/kernel32/process.c | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/modules/rostests/winetests/kernel32/process.c b/modules/rostests/winetests/kernel32/process.c index 1c710a8470..ee3bb22117 100755 --- a/modules/rostests/winetests/kernel32/process.c +++ b/modules/rostests/winetests/kernel32/process.c @@ -605,6 +605,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); GetStartupInfoA(&si); okChildInt("StartupInfoA", "cb", startup.cb); @@ -643,6 +645,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -681,6 +685,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", si.lpDesktop); @@ -719,6 +725,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -757,6 +765,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -797,6 +807,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -835,6 +847,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -875,6 +889,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("Arguments", "argcA", 5); okChildString("Arguments", "argvA4", "C:\\Program Files\\my nice app.exe"); @@ -896,6 +912,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("Arguments", "argcA", 7); okChildString("Arguments", "argvA4", "a\"b\\"); @@ -917,6 +935,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); sprintf(buffer, "./%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); @@ -932,6 +952,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); sprintf(buffer, ".\\%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); @@ -952,6 +974,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); if (p) sprintf(buffer, "..%s/%s", p, exename); else sprintf(buffer, "./%s", exename); okChildString("Arguments", "argvA0", buffer); @@ -975,6 +999,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); sprintf(buffer, "tests/process.c dump %s", resfile); okChildString("Arguments", "argvA0", "dummy"); okChildString("Arguments", "CommandLineA", buffer2); @@ -1072,6 +1098,8 @@ static void test_Directory(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildIString("Misc", "CurrDirA", windir); release_memory(); @@ -1080,6 +1108,8 @@ static void test_Directory(void) /* search PATH for the exe if directory is NULL */ ok(CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(TerminateProcess(info.hProcess, 0), "Child process termination\n"); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); /* if any directory is provided, don't search PATH, error on bad directory */ SetLastError(0xdeadbeef);

6 years, 10 months

01/03: [IMAGEHLP_WINETEST] Un-mark a ROS-diff that's been committed upstream.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5a6c6419faeef50ae294… commit a5a6c6419faeef50ae294afa1056e94b3408fa25 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 24 12:05:12 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 24 14:17:58 2018 +0100 [IMAGEHLP_WINETEST] Un-mark a ROS-diff that's been committed upstream. --- modules/rostests/winetests/imagehlp/image.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/modules/rostests/winetests/imagehlp/image.c b/modules/rostests/winetests/imagehlp/image.c index f16ba5e146..65f59700e3 100644 --- a/modules/rostests/winetests/imagehlp/image.c +++ b/modules/rostests/winetests/imagehlp/image.c @@ -56,11 +56,7 @@ struct Imports { } ibn; char dllname[0x10]; }; -#ifdef __REACTOS__ #define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks)) -#else -#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks[0])) -#endif static struct _PeImage { IMAGE_DOS_HEADER dos_header; @@ -223,12 +219,8 @@ static const struct expected_blob b1[] = { {FILE_IDATA-FILE_TEXT, &bin.text_section}, {sizeof(bin.idata_section.descriptors[0].u.OriginalFirstThunk), &bin.idata_section.descriptors[0].u.OriginalFirstThunk}, -#ifdef __REACTOS__ {FIELD_OFFSET(struct Imports, thunks)- (FIELD_OFFSET(struct Imports, descriptors)+FIELD_OFFSET(IMAGE_IMPORT_DESCRIPTOR, Name)), -#else - {FIELD_OFFSET(struct Imports, thunks)-FIELD_OFFSET(struct Imports, descriptors[0].Name), -#endif &bin.idata_section.descriptors[0].Name}, {FILE_TOTAL-FILE_IDATA-FIELD_OFFSET(struct Imports, ibn), &bin.idata_section.ibn}

6 years, 10 months

02/02: [NTOSKRNL] Return some Cc counters in SystemPerformanceInformation

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45964099f31a221a729bf… commit 45964099f31a221a729bf97744541f3848f418c5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 24 13:35:17 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 24 13:36:26 2018 +0100 [NTOSKRNL] Return some Cc counters in SystemPerformanceInformation --- ntoskrnl/cc/pin.c | 4 ++++ ntoskrnl/ex/sysinfo.c | 8 ++++---- ntoskrnl/include/internal/cc.h | 8 ++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index d0a0d7e930..07afd1847f 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -18,6 +18,10 @@ extern NPAGED_LOOKASIDE_LIST iBcbLookasideList; +/* Counters: + * - Number of calls to CcMapData that could wait + * - Number of calls to CcMapData that couldn't wait + */ ULONG CcMapDataWait = 0; ULONG CcMapDataNoWait = 0; diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index 14809474da..59c6d263c2 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -687,8 +687,8 @@ QSI_DEF(SystemPerformanceInformation) Spi->CcFastMdlReadResourceMiss = 0; /* FIXME */ Spi->CcFastMdlReadNotPossible = 0; /* FIXME */ - Spi->CcMapDataNoWait = 0; /* FIXME */ - Spi->CcMapDataWait = 0; /* FIXME */ + Spi->CcMapDataNoWait = CcMapDataNoWait; + Spi->CcMapDataWait = CcMapDataWait; Spi->CcMapDataNoWaitMiss = 0; /* FIXME */ Spi->CcMapDataWaitMiss = 0; /* FIXME */ @@ -707,8 +707,8 @@ QSI_DEF(SystemPerformanceInformation) Spi->CcMdlReadNoWaitMiss = 0; /* FIXME */ Spi->CcMdlReadWaitMiss = 0; /* FIXME */ Spi->CcReadAheadIos = 0; /* FIXME */ - Spi->CcLazyWriteIos = 0; /* FIXME */ - Spi->CcLazyWritePages = 0; /* FIXME */ + Spi->CcLazyWriteIos = CcLazyWriteIos; + Spi->CcLazyWritePages = CcLazyWritePages; Spi->CcDataFlushes = 0; /* FIXME */ Spi->CcDataPages = 0; /* FIXME */ Spi->ContextSwitches = 0; /* FIXME */ diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 5751ab665e..c404cd9179 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -53,6 +53,14 @@ extern LIST_ENTRY CcPostTickWorkQueue; extern NPAGED_LOOKASIDE_LIST CcTwilightLookasideList; extern LARGE_INTEGER CcIdleDelay; +// +// Counters +// +extern ULONG CcLazyWritePages; +extern ULONG CcLazyWriteIos; +extern ULONG CcMapDataWait; +extern ULONG CcMapDataNoWait; + typedef struct _PF_SCENARIO_ID { WCHAR ScenName[30];

6 years, 10 months

01/02: [NTOSKRNL] Add the CcMapDataWait and CcMapDataNoWait counters

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=227c4321c26f42068bf64… commit 227c4321c26f42068bf64aefcc37cad16e08cd94 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 24 13:28:45 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 24 13:36:26 2018 +0100 [NTOSKRNL] Add the CcMapDataWait and CcMapDataNoWait counters --- ntoskrnl/cc/pin.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 7b8d878731..d0a0d7e930 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -18,6 +18,9 @@ extern NPAGED_LOOKASIDE_LIST iBcbLookasideList; +ULONG CcMapDataWait = 0; +ULONG CcMapDataNoWait = 0; + /* FUNCTIONS *****************************************************************/ /* @@ -45,6 +48,15 @@ CcMapData ( " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, Length, Flags, pBcb, pBuffer); + if (Flags & MAP_WAIT) + { + ++CcMapDataWait; + } + else + { + ++CcMapDataNoWait; + } + ReadOffset = FileOffset->QuadPart; ASSERT(FileObject);

6 years, 10 months

01/01: [SERVICES][ADVAPI32] Fix the broken service stop sequence

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1dfbed9c3dbd135c7bf51… commit 1dfbed9c3dbd135c7bf51090b9cadde6d2642340 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 24 11:14:05 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 24 11:14:05 2018 +0100 [SERVICES][ADVAPI32] Fix the broken service stop sequence services\database.c: - Refactor ScmControlService() so that it can be used to send the dispatcher loop stop command. - Separate the code to decrement the image run counter from the service image cleanup code. services\rpcserver.c: - RSetServiceStatus(): Stop the dispatcher loop when the image run counter is zero and remove the service image after that. advapi32\service\sctrl.c: - Do not terminate the service dispatcher loop when the last service is being stopped. Wait for an explicit dispatcher stop command (empty service name). CORE-12413 --- base/system/services/database.c | 105 +++++++++++++++++++------------------ base/system/services/rpcserver.c | 28 +++++++++- base/system/services/services.h | 5 +- dll/win32/advapi32/service/sctrl.c | 70 +++++++++++++------------ 4 files changed, 121 insertions(+), 87 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index d31d353a87..d28a98c082 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -432,41 +432,34 @@ done: } -static VOID -ScmDereferenceServiceImage(PSERVICE_IMAGE pServiceImage) +VOID +ScmRemoveServiceImage(PSERVICE_IMAGE pServiceImage) { - DPRINT1("ScmDereferenceServiceImage() called\n"); - - pServiceImage->dwImageRunCount--; - - if (pServiceImage->dwImageRunCount == 0) - { - DPRINT1("dwImageRunCount == 0\n"); + DPRINT1("ScmRemoveServiceImage() called\n"); - /* FIXME: Terminate the process */ + /* FIXME: Terminate the process */ - /* Remove the service image from the list */ - RemoveEntryList(&pServiceImage->ImageListEntry); + /* Remove the service image from the list */ + RemoveEntryList(&pServiceImage->ImageListEntry); - /* Close the process handle */ - if (pServiceImage->hProcess != INVALID_HANDLE_VALUE) - CloseHandle(pServiceImage->hProcess); + /* Close the process handle */ + if (pServiceImage->hProcess != INVALID_HANDLE_VALUE) + CloseHandle(pServiceImage->hProcess); - /* Close the control pipe */ - if (pServiceImage->hControlPipe != INVALID_HANDLE_VALUE) - CloseHandle(pServiceImage->hControlPipe); + /* Close the control pipe */ + if (pServiceImage->hControlPipe != INVALID_HANDLE_VALUE) + CloseHandle(pServiceImage->hControlPipe); - /* Unload the user profile */ - if (pServiceImage->hProfile != NULL) - UnloadUserProfile(pServiceImage->hToken, pServiceImage->hProfile); + /* Unload the user profile */ + if (pServiceImage->hProfile != NULL) + UnloadUserProfile(pServiceImage->hToken, pServiceImage->hProfile); - /* Close the logon token */ - if (pServiceImage->hToken != NULL) - CloseHandle(pServiceImage->hToken); + /* Close the logon token */ + if (pServiceImage->hToken != NULL) + CloseHandle(pServiceImage->hToken); - /* Release the service image */ - HeapFree(GetProcessHeap(), 0, pServiceImage); - } + /* Release the service image */ + HeapFree(GetProcessHeap(), 0, pServiceImage); } @@ -618,7 +611,15 @@ ScmDeleteServiceRecord(PSERVICE lpService) /* Dereference the service image */ if (lpService->lpImage) - ScmDereferenceServiceImage(lpService->lpImage); + { + lpService->lpImage->dwImageRunCount--; + + if (lpService->lpImage->dwImageRunCount == 0) + { + ScmRemoveServiceImage(lpService->lpImage); + lpService->lpImage = NULL; + } + } /* Decrement the group reference counter */ ScmSetServiceGroup(lpService, NULL); @@ -1095,7 +1096,9 @@ ScmGetBootAndSystemDriverState(VOID) DWORD -ScmControlService(PSERVICE Service, +ScmControlService(HANDLE hControlPipe, + PWSTR pServiceName, + SERVICE_STATUS_HANDLE hServiceStatus, DWORD dwControl) { PSCM_CONTROL_PACKET ControlPacket; @@ -1116,7 +1119,7 @@ ScmControlService(PSERVICE Service, /* Calculate the total length of the start command line */ PacketSize = sizeof(SCM_CONTROL_PACKET); - PacketSize += (DWORD)((wcslen(Service->lpServiceName) + 1) * sizeof(WCHAR)); + PacketSize += (DWORD)((wcslen(pServiceName) + 1) * sizeof(WCHAR)); ControlPacket = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -1129,17 +1132,17 @@ ScmControlService(PSERVICE Service, ControlPacket->dwSize = PacketSize; ControlPacket->dwControl = dwControl; - ControlPacket->hServiceStatus = (SERVICE_STATUS_HANDLE)Service; + ControlPacket->hServiceStatus = hServiceStatus; ControlPacket->dwServiceNameOffset = sizeof(SCM_CONTROL_PACKET); Ptr = (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset); - wcscpy(Ptr, Service->lpServiceName); + wcscpy(Ptr, pServiceName); ControlPacket->dwArgumentsCount = 0; ControlPacket->dwArgumentsOffset = 0; - bResult = WriteFile(Service->lpImage->hControlPipe, + bResult = WriteFile(hControlPipe, ControlPacket, PacketSize, &dwWriteCount, @@ -1153,13 +1156,13 @@ ScmControlService(PSERVICE Service, { DPRINT("dwError: ERROR_IO_PENDING\n"); - dwError = WaitForSingleObject(Service->lpImage->hControlPipe, + dwError = WaitForSingleObject(hControlPipe, PipeTimeout); DPRINT("WaitForSingleObject() returned %lu\n", dwError); if (dwError == WAIT_TIMEOUT) { - bResult = CancelIo(Service->lpImage->hControlPipe); + bResult = CancelIo(hControlPipe); if (bResult == FALSE) { DPRINT1("CancelIo() failed (Error: %lu)\n", GetLastError()); @@ -1170,7 +1173,7 @@ ScmControlService(PSERVICE Service, } else if (dwError == WAIT_OBJECT_0) { - bResult = GetOverlappedResult(Service->lpImage->hControlPipe, + bResult = GetOverlappedResult(hControlPipe, &Overlapped, &dwWriteCount, TRUE); @@ -1193,7 +1196,7 @@ ScmControlService(PSERVICE Service, /* Read the reply */ Overlapped.hEvent = (HANDLE) NULL; - bResult = ReadFile(Service->lpImage->hControlPipe, + bResult = ReadFile(hControlPipe, &ReplyPacket, sizeof(SCM_REPLY_PACKET), &dwReadCount, @@ -1207,13 +1210,13 @@ ScmControlService(PSERVICE Service, { DPRINT("dwError: ERROR_IO_PENDING\n"); - dwError = WaitForSingleObject(Service->lpImage->hControlPipe, + dwError = WaitForSingleObject(hControlPipe, PipeTimeout); DPRINT("WaitForSingleObject() returned %lu\n", dwError); if (dwError == WAIT_TIMEOUT) { - bResult = CancelIo(Service->lpImage->hControlPipe); + bResult = CancelIo(hControlPipe); if (bResult == FALSE) { DPRINT1("CancelIo() failed (Error: %lu)\n", GetLastError()); @@ -1224,7 +1227,7 @@ ScmControlService(PSERVICE Service, } else if (dwError == WAIT_OBJECT_0) { - bResult = GetOverlappedResult(Service->lpImage->hControlPipe, + bResult = GetOverlappedResult(hControlPipe, &Overlapped, &dwReadCount, TRUE); @@ -1255,13 +1258,6 @@ Done: dwError = ReplyPacket.dwError; } - if (dwError == ERROR_SUCCESS && - dwControl == SERVICE_CONTROL_STOP) - { - ScmDereferenceServiceImage(Service->lpImage); - Service->lpImage = NULL; - } - LeaveCriticalSection(&ControlServiceCriticalSection); DPRINT("ScmControlService() done\n"); @@ -1831,8 +1827,12 @@ ScmLoadService(PSERVICE Service, } else { - ScmDereferenceServiceImage(Service->lpImage); - Service->lpImage = NULL; + Service->lpImage->dwImageRunCount--; + if (Service->lpImage->dwImageRunCount == 0) + { + ScmRemoveServiceImage(Service->lpImage); + Service->lpImage = NULL; + } } } } @@ -2168,8 +2168,11 @@ ScmAutoShutdownServices(VOID) CurrentService->Status.dwCurrentState == SERVICE_START_PENDING) { /* shutdown service */ - DPRINT("Shutdown service: %S\n", CurrentService->szServiceName); - ScmControlService(CurrentService, SERVICE_CONTROL_SHUTDOWN); + DPRINT("Shutdown service: %S\n", CurrentService->lpServiceName); + ScmControlService(CurrentService->lpImage->hControlPipe, + CurrentService->lpServiceName, + (SERVICE_STATUS_HANDLE)CurrentService, + SERVICE_CONTROL_SHUTDOWN); } ServiceEntry = ServiceEntry->Flink; diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index a4718aa15f..0a518d06ad 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -1228,7 +1228,9 @@ RControlService( } /* Send control code to the service */ - dwError = ScmControlService(lpService, + dwError = ScmControlService(lpService->lpImage->hControlPipe, + lpService->lpServiceName, + (SERVICE_STATUS_HANDLE)lpService, dwControl); /* Return service status information */ @@ -1725,6 +1727,28 @@ RSetServiceStatus( /* Restore the previous service type */ lpService->Status.dwServiceType = dwPreviousType; + /* Handle a stopped service */ + if ((lpServiceStatus->dwServiceType & SERVICE_WIN32) && + (lpServiceStatus->dwCurrentState == SERVICE_STOPPED)) + { + /* Decrement the image run counter */ + lpService->lpImage->dwImageRunCount--; + + /* If we just stopped the last running service... */ + if (lpService->lpImage->dwImageRunCount == 0) + { + /* Stop the dispatcher thread */ + ScmControlService(lpService->lpImage->hControlPipe, + L"", + (SERVICE_STATUS_HANDLE)lpService, + SERVICE_CONTROL_STOP); + + /* Remove the service image */ + ScmRemoveServiceImage(lpService->lpImage); + lpService->lpImage = NULL; + } + } + /* Unlock the service database */ ScmUnlockDatabase(); @@ -1773,6 +1797,8 @@ RSetServiceStatus( lpLogStrings); } + + DPRINT("Set %S to %lu\n", lpService->lpDisplayName, lpService->Status.dwCurrentState); DPRINT("RSetServiceStatus() done\n"); diff --git a/base/system/services/services.h b/base/system/services/services.h index 0f03849967..3592ba2560 100644 --- a/base/system/services/services.h +++ b/base/system/services/services.h @@ -164,6 +164,7 @@ DWORD ScmStartService(PSERVICE Service, DWORD argc, LPWSTR *argv); +VOID ScmRemoveServiceImage(PSERVICE_IMAGE pServiceImage); PSERVICE ScmGetServiceEntryByName(LPCWSTR lpServiceName); PSERVICE ScmGetServiceEntryByDisplayName(LPCWSTR lpDisplayName); PSERVICE ScmGetServiceEntryByResumeCount(DWORD dwResumeCount); @@ -174,7 +175,9 @@ DWORD ScmCreateNewServiceRecord(LPCWSTR lpServiceName, VOID ScmDeleteServiceRecord(PSERVICE lpService); DWORD ScmMarkServiceForDelete(PSERVICE pService); -DWORD ScmControlService(PSERVICE Service, +DWORD ScmControlService(HANDLE hControlPipe, + PWSTR pServiceName, + SERVICE_STATUS_HANDLE hServiceStatus, DWORD dwControl); BOOL ScmLockDatabaseExclusive(VOID); diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c index 4a0ae5665d..fe2469732f 100644 --- a/dll/win32/advapi32/service/sctrl.c +++ b/dll/win32/advapi32/service/sctrl.c @@ -544,7 +544,7 @@ ScServiceDispatcher(HANDLE hPipe, { DWORD Count; BOOL bResult; - DWORD dwRunningServices = 0; + BOOL bRunning = TRUE; LPWSTR lpServiceName; PACTIVE_SERVICE lpService; SCM_REPLY_PACKET ReplyPacket; @@ -555,7 +555,7 @@ ScServiceDispatcher(HANDLE hPipe, if (ControlPacket == NULL || dwBufferSize < sizeof(SCM_CONTROL_PACKET)) return FALSE; - while (TRUE) + while (bRunning) { /* Read command from the control pipe */ bResult = ReadFile(hPipe, @@ -572,39 +572,44 @@ ScServiceDispatcher(HANDLE hPipe, lpServiceName = (LPWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset); TRACE("Service: %S\n", lpServiceName); - if (ControlPacket->dwControl == SERVICE_CONTROL_START_OWN) - lpActiveServices[0].bOwnProcess = TRUE; - - lpService = ScLookupServiceByServiceName(lpServiceName); - if (lpService != NULL) + if (lpServiceName[0] == UNICODE_NULL) { - /* Execute command */ - switch (ControlPacket->dwControl) - { - case SERVICE_CONTROL_START_SHARE: - case SERVICE_CONTROL_START_OWN: - TRACE("Start command - received SERVICE_CONTROL_START\n"); - dwError = ScStartService(lpService, ControlPacket); - if (dwError == ERROR_SUCCESS) - dwRunningServices++; - break; - - case SERVICE_CONTROL_STOP: - TRACE("Stop command - received SERVICE_CONTROL_STOP\n"); - dwError = ScControlService(lpService, ControlPacket); - if (dwError == ERROR_SUCCESS) - dwRunningServices--; - break; - - default: - TRACE("Command %lu received", ControlPacket->dwControl); - dwError = ScControlService(lpService, ControlPacket); - break; - } + ERR("Stop dispatcher thread\n"); + bRunning = FALSE; + dwError = ERROR_SUCCESS; } else { - dwError = ERROR_SERVICE_DOES_NOT_EXIST; + if (ControlPacket->dwControl == SERVICE_CONTROL_START_OWN) + lpActiveServices[0].bOwnProcess = TRUE; + + lpService = ScLookupServiceByServiceName(lpServiceName); + if (lpService != NULL) + { + /* Execute command */ + switch (ControlPacket->dwControl) + { + case SERVICE_CONTROL_START_SHARE: + case SERVICE_CONTROL_START_OWN: + TRACE("Start command - received SERVICE_CONTROL_START\n"); + dwError = ScStartService(lpService, ControlPacket); + break; + + case SERVICE_CONTROL_STOP: + TRACE("Stop command - received SERVICE_CONTROL_STOP\n"); + dwError = ScControlService(lpService, ControlPacket); + break; + + default: + TRACE("Command %lu received", ControlPacket->dwControl); + dwError = ScControlService(lpService, ControlPacket); + break; + } + } + else + { + dwError = ERROR_SERVICE_DOES_NOT_EXIST; + } } ReplyPacket.dwError = dwError; @@ -620,9 +625,6 @@ ScServiceDispatcher(HANDLE hPipe, ERR("Pipe write failed (Error: %lu)\n", GetLastError()); return FALSE; } - - if (dwRunningServices == 0) - break; } return TRUE;

6 years, 10 months

01/01: [IPHLPAPI] Fix getNumRoutes() return value, on Mib error (#391)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6c060ce04be831efa7f1… commit b6c060ce04be831efa7f1b9f39c29836f45650a3 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Feb 23 18:35:02 2018 +0100 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Fri Feb 23 17:35:02 2018 +0000 [IPHLPAPI] Fix getNumRoutes() return value, on Mib error (#391) --- dll/win32/iphlpapi/ipstats_reactos.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/iphlpapi/ipstats_reactos.c b/dll/win32/iphlpapi/ipstats_reactos.c index 2b981c1112..ed95d42705 100644 --- a/dll/win32/iphlpapi/ipstats_reactos.c +++ b/dll/win32/iphlpapi/ipstats_reactos.c @@ -387,9 +387,9 @@ DWORD getNumRoutes(void) memset( &isnmp, 0, sizeof( isnmp ) ); status = tdiGetMibForIpEntity( tcpFile, &entitySet[i], &isnmp ); if( !NT_SUCCESS(status) ) { - tdiFreeThingSet( entitySet ); - closeTcpFile( tcpFile ); - return status; + WARN("tdiGetMibForIpEntity failed for i = %d", i); + numRoutes = 0; + break; } numRoutes += isnmp.ipsi_numroutes; }

6 years, 10 months

01/01: [SHELL32] -CMenuToolbarBase: Remove all buttons on destruction. CORE-13194 It seems that TBN_DELETINGBUTTON isn't called when the toolbar gets destroyed so the only way to avoid leaking the data is emptying it ourselves.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b38fed77603a13ff6997… commit 5b38fed77603a13ff6997ea45949a742b288be44 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Fri Feb 23 12:27:48 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Fri Feb 23 12:27:48 2018 +0200 [SHELL32] -CMenuToolbarBase: Remove all buttons on destruction. CORE-13194 It seems that TBN_DELETINGBUTTON isn't called when the toolbar gets destroyed so the only way to avoid leaking the data is emptying it ourselves. --- dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index c1cd0b1a95..a33070af2c 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -287,6 +287,8 @@ CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager) : CMenuToolbarBase::~CMenuToolbarBase() { + ClearToolbar(); + if (m_hWnd) DestroyWindow();

6 years, 10 months

01/01: [SHIMENG] Do not crash on a NULL ModuleName & BaseAddress. CORE-14376

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f52a61e7dfdb821cc79c… commit 5f52a61e7dfdb821cc79c7daf4c357fd6199eab9 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Feb 22 23:25:34 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Feb 22 23:25:57 2018 +0100 [SHIMENG] Do not crash on a NULL ModuleName & BaseAddress. CORE-14376 --- dll/appcompat/apphelp/shimeng.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dll/appcompat/apphelp/shimeng.c b/dll/appcompat/apphelp/shimeng.c index e03a57389a..3b0e7d0866 100644 --- a/dll/appcompat/apphelp/shimeng.c +++ b/dll/appcompat/apphelp/shimeng.c @@ -315,6 +315,11 @@ PHOOKMODULEINFO SeiFindHookModuleInfo(PUNICODE_STRING ModuleName, PVOID BaseAddr { DWORD n; + if (ModuleName == NULL && BaseAddress == NULL) + { + BaseAddress = NtCurrentPeb()->ImageBaseAddress; + } + for (n = 0; n < ARRAY_Size(&g_pHookArray); ++n) { PHOOKMODULEINFO pModuleInfo = ARRAY_At(&g_pHookArray, HOOKMODULEINFO, n);

6 years, 10 months

01/01: [KMTESTS:FSRTL] Fix all FsRtlLargeMcbTestsFastFat() checks

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8271c9a462fa18288281… commit e8271c9a462fa1828828150c5dd10d1b09559b9a Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Feb 22 16:03:42 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Feb 22 22:26:34 2018 +0100 [KMTESTS:FSRTL] Fix all FsRtlLargeMcbTestsFastFat() checks Addendum to 22037684e42e29abc99a9a280278b16305eaa2e2. - Result: check "== FALSE" not "= TRUE". - Report compared values, not different ones. CORE-11819 --- modules/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c b/modules/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c index 8f833d6208..2bdb95bd2e 100644 --- a/modules/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c +++ b/modules/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c @@ -699,18 +699,18 @@ static VOID FsRtlLargeMcbTestsFastFat() Lbn = -1; SectorCount = -1; Result = FsRtlLookupLargeMcbEntry(&FirstMcb, 8388607LL, &Lbn, &SectorCount, NULL, NULL, NULL); - ok(Result = TRUE, "Expected TRUE, got FALSE\n"); - ok(Lbn == -1, "Expected Lbn 44, got: %I64d\n", Lbn); - ok(SectorCount == -1, "Expected SectorCount 44, got: %I64d\n", SectorCount); + ok_bool_false(Result, "FsRtlLookupLargeMcbEntry returned"); + ok_eq_longlong(Lbn, -1); + ok_eq_longlong(SectorCount, -1); Vbn = -1; Lbn = -1; - Index = -1; + Index = (ULONG) -1; Result = FsRtlLookupLastLargeMcbEntryAndIndex(&FirstMcb, &Vbn, &Lbn, &Index); - ok(Result = TRUE, "Expected TRUE, got FALSE\n"); - ok(Vbn == -1, "Expected Vbn 0, got: %I64d\n", Vbn); - ok(Lbn == -1, "Expected Lbn 0, got: %I64d\n", Lbn); - ok(Index == -1, "Expected Index 0, got: %d\n", Index); + ok_bool_false(Result, "FsRtlLookupLastLargeMcbEntryAndIndex returned"); + ok_eq_longlong(Vbn, -1); + ok_eq_longlong(Lbn, -1); + ok_eq_ulong(Index, (ULONG) -1); FsRtlUninitializeLargeMcb(&FirstMcb); }

6 years, 10 months

← Newer
1
2
3
4
5
6
7
8
...
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