Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 51975: [WIN32K] - Refactor EngLoadModuleEx, add the loaded module to a global list, don't map files multiple times, increase reference instead. - Implement EngMapFontFileFD and EngUnmapF...
by tkreuzer＠svn.reactos.org 28 May '11

28 May '11

Author: tkreuzer Date: Sat May 28 15:57:47 2011 New Revision: 51975 URL: http://svn.reactos.org/svn/reactos?rev=51975&view=rev Log: [WIN32K] - Refactor EngLoadModuleEx, add the loaded module to a global list, don't map files multiple times, increase reference instead. - Implement EngMapFontFileFD and EngUnmapFontFileFD Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] Sat May 28 15:57:47 2011 @@ -12,7 +12,8 @@ #include <debug.h> HANDLE ghSystem32Directory; -HANDLE ghRootDirectory; +HSEMAPHORE ghsemModuleList; +LIST_ENTRY gleModulelist = {&gleModulelist, &gleModulelist}; PVOID NTAPI @@ -221,21 +222,29 @@ UNICODE_STRING ustrFileName; IO_STATUS_BLOCK IoStatusBlock; FILE_BASIC_INFORMATION FileInformation; - POBJECT_NAME_INFORMATION pNameInfo; - HANDLE hFile; + HANDLE hFile = NULL; NTSTATUS Status; LARGE_INTEGER liSize; - ULONG cjInfo, cjDesired; - - /* Check if the file is relative to system32 */ - if (fl & FVF_SYSTEMROOT) - { - hRootDir = ghSystem32Directory; - } - else - { - hRootDir = ghRootDirectory; - } + PLIST_ENTRY ple; + ULONG cjSize; + + /* Acquire module list lock */ + EngAcquireSemaphore(ghsemModuleList); + + /* Loop the list of loaded modules */ + for (ple = gleModulelist.Flink; ple != &gleModulelist; ple = ple->Flink) + { + pFileView = CONTAINING_RECORD(ple, FILEVIEW, leLink); + if (_wcsnicmp(pFileView->pwszPath, pwsz, MAX_PATH) == 0) + { + /* Increment reference count and leave */ + pFileView->cRefs++; + goto cleanup; + } + } + + /* Use system32 root dir or absolute path */ + hRootDir = fl & FVF_SYSTEMROOT ? ghSystem32Directory : NULL; /* Initialize unicode string and object attributes */ RtlInitUnicodeString(&ustrFileName, pwsz); @@ -258,15 +267,18 @@ NULL, 0); + if (!NT_SUCCESS(Status)) + { + pFileView = NULL; + goto cleanup; + } + /* Check if this is a font file */ if (fl & FVF_FONTFILE) { - /* Query name information length */ - Status = ZwQueryObject(hFile, ObjectNameInformation, NULL, 0, &cjInfo); - if (Status != STATUS_INFO_LENGTH_MISMATCH) goto cleanup; - /* Allocate a FONTFILEVIEW structure */ - pffv = EngAllocMem(0, sizeof(FONTFILEVIEW) + cjInfo, 'vffG'); + cjSize = sizeof(FONTFILEVIEW) + ustrFileName.Length + sizeof(WCHAR); + pffv = EngAllocMem(0, cjSize, 'vffG'); pFileView = (PFILEVIEW)pffv; if (!pffv) { @@ -274,17 +286,8 @@ goto cleanup; } - /* Query name information */ - pNameInfo = (POBJECT_NAME_INFORMATION)(pffv + 1); - Status = ZwQueryObject(hFile, - ObjectNameInformation, - pNameInfo, - cjInfo, - &cjDesired); - if (!NT_SUCCESS(Status)) goto cleanup; - /* Initialize extended fields */ - pffv->pwszPath = pNameInfo->Name.Buffer; + pffv->pwszPath = (PWSTR)&pffv[1]; pffv->ulRegionSize = 0; pffv->cKRefCount = 0; pffv->cRefCountFD = 0; @@ -294,29 +297,34 @@ else { /* Allocate a FILEVIEW structure */ - pFileView = EngAllocMem(0, sizeof(FILEVIEW), 'liFg'); + cjSize = sizeof(FILEVIEW) + ustrFileName.Length + sizeof(WCHAR); + pFileView = EngAllocMem(0, cjSize, 'liFg'); if (!pFileView) { Status = STATUS_NO_MEMORY; goto cleanup; } + + pFileView->pwszPath = (PWSTR)&pFileView[1]; } /* Initialize the structure */ + pFileView->cRefs = 1; pFileView->pvKView = NULL; pFileView->pvViewFD = NULL; pFileView->cjView = 0; + /* Copy the file name */ + wcscpy(pFileView->pwszPath, pwsz); + /* Query the last write time */ + FileInformation.LastWriteTime.QuadPart = 0; Status = ZwQueryInformationFile(hFile, &IoStatusBlock, &FileInformation, sizeof(FILE_BASIC_INFORMATION), FileBasicInformation); - if (NT_SUCCESS(Status)) - { - pFileView->LastWriteTime = FileInformation.LastWriteTime; - } + pFileView->LastWriteTime = FileInformation.LastWriteTime; /* Create a section from the file */ liSize.QuadPart = cjSizeOfModule; @@ -329,16 +337,22 @@ hFile, NULL); + if (!NT_SUCCESS(Status)) + { + EngFreeMem(pFileView); + pFileView = NULL; + goto cleanup; + } + + /* Insert the structure into the list */ + InsertTailList(&gleModulelist, &pFileView->leLink); + cleanup: /* Close the file handle */ - ZwClose(hFile); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create a section Status=0x%x\n", Status); - EngFreeMem(pFileView); - return NULL; - } + if (hFile) ZwClose(hFile); + + /* Release module list lock */ + EngReleaseSemaphore(ghsemModuleList); return pFileView; } @@ -394,19 +408,36 @@ PFILEVIEW pFileView = (PFILEVIEW)h; NTSTATUS Status; - /* Unmap the section */ - Status = MmUnmapViewInSessionSpace(pFileView->pvKView); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MmUnmapViewInSessionSpace failed: 0x%lx\n", Status); - ASSERT(FALSE); - } - - /* Dereference the section */ - ObDereferenceObject(pFileView->pSection); - - /* Free the file view memory */ - EngFreeMem(pFileView); + /* Acquire module list lock */ + EngAcquireSemaphore(ghsemModuleList); + + /* Decrement reference count and check if its 0 */ + if (--pFileView->cRefs == 0) + { + /* Check if the section was mapped */ + if (pFileView->pvKView) + { + /* Unmap the section */ + Status = MmUnmapViewInSessionSpace(pFileView->pvKView); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MmUnmapViewInSessionSpace failed: 0x%lx\n", Status); + ASSERT(FALSE); + } + } + + /* Dereference the section */ + ObDereferenceObject(pFileView->pSection); + + /* Remove the entry from the list */ + RemoveEntryList(&pFileView->leLink); + + /* Free the file view memory */ + EngFreeMem(pFileView); + } + + /* Release module list lock */ + EngReleaseSemaphore(ghsemModuleList); } PVOID @@ -460,9 +491,28 @@ OUT PULONG *ppjBuf, OUT ULONG *pcjBuf) { - // www.osr.com/ddk/graphics/gdifncs_0co7.htm - UNIMPLEMENTED; - return FALSE; + PFONTFILEVIEW pffv = (PFONTFILEVIEW)iFile; + NTSTATUS Status = STATUS_SUCCESS; + + // should be exclusively accessing this file! + + /* Increment reference count and check if its the 1st */ + if (++pffv->cRefCountFD == 1) + { + /* Map the file into the address space of CSRSS */ + Status = MmMapViewOfSection(pffv->pSection, + gpepCSRSS, + &pffv->pvViewFD, + 0, + 0, + NULL, + &pffv->cjView, + ViewUnmap, + 0, + PAGE_READONLY); + } + + return NT_SUCCESS(Status); } VOID @@ -470,8 +520,17 @@ EngUnmapFontFileFD( IN ULONG_PTR iFile) { - // http://www.osr.com/ddk/graphics/gdifncs_6wbr.htm - UNIMPLEMENTED; + PFONTFILEVIEW pffv = (PFONTFILEVIEW)iFile; + NTSTATUS Status = STATUS_SUCCESS; + + // should be exclusively accessing this file! + + /* Decrement reference count and check if we reached 0 */ + if (--pffv->cRefCountFD == 0) + { + /* Unmap the file from the address space of CSRSS */ + Status = MmUnmapViewOfSection(gpepCSRSS, pffv->pvViewFD); + } } BOOL Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h [iso-8859-1] Sat May 28 15:57:47 2011 @@ -2,6 +2,8 @@ // HACK!!! #define MmMapViewInSessionSpace MmMapViewInSystemSpace #define MmUnmapViewInSessionSpace MmUnmapViewInSystemSpace + +extern PEPROCESS gpepCSRSS; typedef struct _ENGSECTION { @@ -13,6 +15,9 @@ typedef struct _FILEVIEW { + LIST_ENTRY leLink; + PWSTR pwszPath; + ULONG cRefs; LARGE_INTEGER LastWriteTime; PVOID pvKView; PVOID pvViewFD; @@ -23,8 +28,6 @@ typedef struct _FONTFILEVIEW { FILEVIEW; - DWORD reserved[2]; - PWSTR pwszPath; SIZE_T ulRegionSize; ULONG cKRefCount; ULONG cRefCountFD;

1 0

[cgutman] 51974: [UNPNPMGR] - Simplify and fix a few bugs in the ClassGUID reading code
by cgutman＠svn.reactos.org 28 May '11

28 May '11

Author: cgutman Date: Sat May 28 13:42:06 2011 New Revision: 51974 URL: http://svn.reactos.org/svn/reactos?rev=51974&view=rev Log: [UNPNPMGR] - Simplify and fix a few bugs in the ClassGUID reading code Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sat May 28 13:42:06 2011 @@ -2249,7 +2249,6 @@ PROCESS_INFORMATION ProcessInfo; STARTUPINFOW StartupInfo; UUID RandomUuid; - WCHAR RegistryPath[MAX_PATH]; HKEY DeviceKey; /* The following lengths are constant (see below), they cannot overflow */ @@ -2262,11 +2261,8 @@ ZeroMemory(&ProcessInfo, sizeof(ProcessInfo)); - wcscpy(RegistryPath, L"SYSTEM\\CurrentControlSet\\Enum\\"); - wcscat(RegistryPath, DeviceInstance); - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - RegistryPath, + if (RegOpenKeyExW(hEnumKey, + DeviceInstance, 0, KEY_QUERY_VALUE, &DeviceKey) == ERROR_SUCCESS) @@ -2279,10 +2275,11 @@ NULL) == ERROR_SUCCESS) { DPRINT("No need to install: %S\n", DeviceInstance); + RegCloseKey(DeviceKey); return TRUE; } - CloseHandle(DeviceKey); + RegCloseKey(DeviceKey); } DPRINT1("Installing: %S\n", DeviceInstance);

1 0

[jimtabor] 51973: [ScreenSaver] - Fixed screen saver load and save plus the registry problems.
by jimtabor＠svn.reactos.org 28 May '11

28 May '11

Author: jimtabor Date: Sat May 28 11:39:36 2011 New Revision: 51973 URL: http://svn.reactos.org/svn/reactos?rev=51973&view=rev Log: [ScreenSaver] - Fixed screen saver load and save plus the registry problems. Modified: trunk/reactos/base/system/winlogon/screensaver.c trunk/reactos/dll/cpl/desk/screensaver.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/base/system/winlogon/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree… ============================================================================== --- trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] Sat May 28 11:39:36 2011 @@ -240,7 +240,7 @@ StartScreenSaver( IN PWLSESSION Session) { - HKEY hKey = NULL; + HKEY hKey = NULL, hCurrentUser = NULL; WCHAR szApplicationName[MAX_PATH]; WCHAR szCommandLine[MAX_PATH + 3]; DWORD bufferSize = sizeof(szApplicationName) - sizeof(WCHAR); @@ -258,8 +258,17 @@ goto cleanup; } + rc = RegOpenCurrentUser( + KEY_READ, + &hCurrentUser); + if (rc != ERROR_SUCCESS) + { + ERR("WL: RegOpenCurrentUser Error!\n"); + goto cleanup; + } + rc = RegOpenKeyExW( - HKEY_CURRENT_USER, + hCurrentUser, L"Control Panel\\Desktop", 0, KEY_QUERY_VALUE, @@ -343,6 +352,8 @@ RevertToSelf(); if (hKey) RegCloseKey(hKey); + if (hCurrentUser) + RegCloseKey(hCurrentUser); if (!ret) { PostMessageW(Session->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_SCRNSVR_ACTIVITY, 0); Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… ============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] Sat May 28 11:39:36 2011 @@ -460,6 +460,7 @@ SetScreenSaver(HWND hwndDlg, PDATA pData) { HKEY regKey; + BOOL DeleteMode = FALSE; if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Control Panel\\Desktop"), @@ -486,6 +487,7 @@ { /* Windows deletes the value if no screensaver is set */ RegDeleteValue(regKey, _T("SCRNSAVE.EXE")); + DeleteMode = TRUE; } /* set the screensaver time delay */ @@ -505,6 +507,10 @@ REG_SZ, (PBYTE)szTime, _tcslen(szTime) * sizeof(TCHAR)); + + if (DeleteMode) Time = 0; + + SystemParametersInfoW(SPI_SETSCREENSAVETIMEOUT, Time, 0, SPIF_SENDCHANGE); /* set the secure value */ Ret = SendDlgItemMessage(hwndDlg, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sat May 28 11:39:36 2011 @@ -75,14 +75,15 @@ VOID FASTCALL DoTheScreenSaver(VOID) { LARGE_INTEGER TickCount; - DWORD Test; + DWORD Test, TO; if (gspv.iScrSaverTimeout > 0) // Zero means Off. { KeQueryTickCount(&TickCount); Test = MsqCalculateMessageTime(&TickCount); Test = Test - LastInputTick; - if (Test > gspv.iScrSaverTimeout) + TO = 1000 * gspv.iScrSaverTimeout; + if (Test > TO) { DPRINT("Screensaver Message Start! Tick %d Timeout %d \n", Test, gspv.iScrSaverTimeout); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Sat May 28 11:39:36 2011 @@ -59,6 +59,7 @@ static const WCHAR* KEY_DESKTOP = L"Control Panel\\Desktop"; static const WCHAR* VAL_SCRTO = L"ScreenSaveTimeOut"; +static const WCHAR* VAL_SCRNSV = L"SCRNSAVE.EXE"; static const WCHAR* VAL_SCRACT = L"ScreenSaveActive"; static const WCHAR* VAL_GRID = L"GridGranularity"; static const WCHAR* VAL_DRAG = L"DragFullWindows"; @@ -134,6 +135,20 @@ return dValue; } return Result; +} + +static +DWORD +SpiLoadTimeOut(VOID) +{ // Must have the string! + WCHAR szApplicationName[MAX_PATH]; + RtlZeroMemory(&szApplicationName, sizeof(szApplicationName)); + if (!RegReadUserSetting(KEY_DESKTOP, VAL_SCRNSV, REG_SZ, &szApplicationName, sizeof(szApplicationName))) + { + return 0; + } + if (wcslen(szApplicationName) == 0) return 0; + return SpiLoadInt(KEY_DESKTOP, VAL_SCRTO, 0); } static @@ -280,7 +295,7 @@ gspv.bDropShadow = 1; gspv.dwMenuShowDelay = 100; - gspv.iScrSaverTimeout = 600000; // TO in 10 minutes. + gspv.iScrSaverTimeout = SpiLoadTimeOut(); gspv.bScrSaverActive = FALSE; gspv.bScrSaverRunning = FALSE; #if(WINVER >= 0x0600)

1 0

[jimtabor] 51972: - No need to do extra work when the process starts.
by jimtabor＠svn.reactos.org 28 May '11

28 May '11

Author: jimtabor Date: Sat May 28 00:32:15 2011 New Revision: 51972 URL: http://svn.reactos.org/svn/reactos?rev=51972&view=rev Log: - No need to do extra work when the process starts. Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sat May 28 00:32:15 2011 @@ -64,7 +64,6 @@ SIZE_T ViewSize = 0; LARGE_INTEGER Offset; PVOID UserBase = NULL; - BOOL Connected; PRTL_USER_PROCESS_PARAMETERS pParams = NULL; NTSTATUS Status; extern PSECTION_OBJECT GlobalUserHeapSection; @@ -117,14 +116,10 @@ Win32Process->peProcess = Process; /* setup process flags */ - Win32Process->W32PF_flags = 0; - - Connected = !(Win32Process->W32PF_flags & W32PF_THREADCONNECTED); - Win32Process->W32PF_flags |= W32PF_THREADCONNECTED; + Win32Process->W32PF_flags = W32PF_THREADCONNECTED; if ( pParams && - pParams->WindowFlags & STARTF_SCRNSAVER && - Connected) + pParams->WindowFlags & STARTF_SCRNSAVER ) { ppiScrnSaver = Win32Process; Win32Process->W32PF_flags |= W32PF_SCREENSAVER;

1 0

[jimtabor] 51971: [Win32k] - Get screen saver running. Need more work on WinLogon register issues and problems. - Miscellaneous changes and cleanups.
by jimtabor＠svn.reactos.org 27 May '11

27 May '11

Author: jimtabor Date: Fri May 27 23:18:57 2011 New Revision: 51971 URL: http://svn.reactos.org/svn/reactos?rev=51971&view=rev Log: [Win32k] - Get screen saver running. Need more work on WinLogon register issues and problems. - Miscellaneous changes and cleanups. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/screensaver.c trunk/reactos/include/reactos/ks386.inc trunk/reactos/include/reactos/undocuser.h trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Fri May 27 23:18:57 2011 @@ -24,6 +24,8 @@ #define HK_CTRL_ALT_DEL 0 #define HK_CTRL_SHIFT_ESC 1 + +static BOOL inScrn = FALSE; /* FUNCTIONS ****************************************************************/ @@ -962,6 +964,28 @@ } break; } + case LN_START_SCREENSAVE: + { + BOOL bSecure = FALSE; + + if (inScrn) + break; + + inScrn = TRUE; + + // lParam 1 == Secure + if (lParam) + { + if (Session->Gina.Functions.WlxScreenSaverNotify(Session->Gina.Context, &bSecure)) + { + if (bSecure) DoGenericAction(Session, WLX_SAS_ACTION_LOCK_WKSTA); + } + } + + StartScreenSaver(Session); + inScrn = FALSE; + break; + } default: { ERR("WM_LOGONNOTIFY case %d is unimplemented\n", wParam); Modified: trunk/reactos/base/system/winlogon/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree… ============================================================================== --- trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] Fri May 27 23:18:57 2011 @@ -231,7 +231,7 @@ if (ScreenSaverThread) CloseHandle(ScreenSaverThread); else - WARN("WL: Unable to start screen saver thread\n"); + ERR("WL: Unable to start screen saver thread\n"); return TRUE; } @@ -254,7 +254,7 @@ if (!ImpersonateLoggedOnUser(Session->UserToken)) { - ERR("ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); + ERR("WL: ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); goto cleanup; } @@ -265,7 +265,10 @@ KEY_QUERY_VALUE, &hKey); if (rc != ERROR_SUCCESS) - goto cleanup; + { + ERR("WL: RegOpenKeyEx Error!\n"); + goto cleanup; + } rc = RegQueryValueExW( hKey, @@ -275,15 +278,24 @@ (LPBYTE)szApplicationName, &bufferSize); if (rc != ERROR_SUCCESS || dwType != REG_SZ) - goto cleanup; + { + ERR("WL: RegQueryValueEx Error!\n"); + goto cleanup; + } if (bufferSize == 0) - goto cleanup; + { + ERR("WL: Buffer size is NULL!\n"); + goto cleanup; + } szApplicationName[bufferSize / sizeof(WCHAR)] = 0; /* Terminate the string */ if (wcslen(szApplicationName) == 0) - goto cleanup; + { + ERR("WL: Application Name length is zero!\n"); + goto cleanup; + } wsprintfW(szCommandLine, L"%s /s", szApplicationName); TRACE("WL: Executing %S\n", szCommandLine); @@ -291,6 +303,7 @@ ZeroMemory(&StartupInfo, sizeof(STARTUPINFOW)); ZeroMemory(&ProcessInformation, sizeof(PROCESS_INFORMATION)); StartupInfo.cb = sizeof(STARTUPINFOW); + StartupInfo.dwFlags = STARTF_SCRNSAVER; /* FIXME: run the screen saver on the screen saver desktop */ ret = CreateProcessW( szApplicationName, @@ -305,7 +318,7 @@ &ProcessInformation); if (!ret) { - WARN("WL: Unable to start %S, error %lu\n", szApplicationName, GetLastError()); + ERR("WL: Unable to start %S, error %lu\n", szApplicationName, GetLastError()); goto cleanup; } CloseHandle(ProcessInformation.hThread); Modified: trunk/reactos/include/reactos/ks386.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/ks386.inc?… ============================================================================== --- trunk/reactos/include/reactos/ks386.inc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/ks386.inc [iso-8859-1] Fri May 27 23:18:57 2011 @@ -456,6 +456,7 @@ TeGdiBatchCount = 0xf70 TeGuaranteedStackBytes = 0xf78 TeFlsData = 0xfb4 +TeSafeThunkCall = 0xfb8 ThreadEnvironmentBlockLength = 0xfbc /* TIME_FIELDS */ Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Fri May 27 23:18:57 2011 @@ -82,6 +82,9 @@ #define LN_LOCK_WORKSTATION 0x5 #define LN_UNLOCK_WORKSTATION 0x6 #define LN_MESSAGE_BEEP 0x9 +#define LN_START_SCREENSAVE 0xA + +#define STARTF_SCRNSAVER 0x80000000 #define CW_USEDEFAULT16 ((short)0x8000) Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Fri May 27 23:18:57 2011 @@ -3146,12 +3146,6 @@ ULONG nBufSize, DWORD Reserved); - -/* Should be done in usermode and use NtUserGetCPD. */ -ULONG_PTR -NTAPI -NtUserGetClassLong(HWND hWnd, INT Offset, BOOL Ansi); - UINT NTAPI NtUserGetMenuDefaultItem( Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Fri May 27 23:18:57 2011 @@ -23,6 +23,7 @@ PSERVERINFO gpsi = NULL; // Global User Server Information. SHORT gusLanguageID; +PPROCESSINFO ppiScrnSaver; extern ULONG_PTR Win32kSSDT[]; extern UCHAR Win32kSSPT[]; @@ -63,6 +64,8 @@ SIZE_T ViewSize = 0; LARGE_INTEGER Offset; PVOID UserBase = NULL; + BOOL Connected; + PRTL_USER_PROCESS_PARAMETERS pParams = NULL; NTSTATUS Status; extern PSECTION_OBJECT GlobalUserHeapSection; DPRINT("Creating W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); @@ -109,11 +112,23 @@ /* map the gdi handle table to user land */ Process->Peb->GdiSharedHandleTable = GDI_MapHandleTable(Process); Process->Peb->GdiDCAttributeList = GDI_BATCH_LIMIT; + pParams = Process->Peb->ProcessParameters; } Win32Process->peProcess = Process; /* setup process flags */ Win32Process->W32PF_flags = 0; + + Connected = !(Win32Process->W32PF_flags & W32PF_THREADCONNECTED); + Win32Process->W32PF_flags |= W32PF_THREADCONNECTED; + + if ( pParams && + pParams->WindowFlags & STARTF_SCRNSAVER && + Connected) + { + ppiScrnSaver = Win32Process; + Win32Process->W32PF_flags |= W32PF_SCREENSAVER; + } /* Create pools for GDI object attributes */ Win32Process->pPoolDcAttr = GdiPoolCreate(sizeof(DC_ATTR), 'acdG'); @@ -127,6 +142,8 @@ { DPRINT("Destroying W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); Win32Process->W32PF_flags |= W32PF_TERMINATED; + + if (ppiScrnSaver == Win32Process) ppiScrnSaver = NULL; /* Notify logon application to restart shell if needed */ if(Win32Process->rpdeskStartup->pDeskInfo) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Fri May 27 23:18:57 2011 @@ -115,6 +115,7 @@ { case SC_SCREENSAVE: DPRINT1("Screensaver Called!\n"); + UserPostMessage(hwndSAS, WM_LOGONNOTIFY, LN_START_SCREENSAVE, 0); // always lParam 0 == not Secure break; default: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Fri May 27 23:18:57 2011 @@ -18,6 +18,7 @@ extern BYTE gQueueKeyStateTable[]; extern NTSTATUS Win32kInitWin32Thread(PETHREAD Thread); +extern PPROCESSINFO ppiScrnSaver; /* GLOBALS *******************************************************************/ @@ -27,6 +28,7 @@ PKTIMER MasterTimer = NULL; PATTACHINFO gpai = NULL; +static DWORD LastInputTick = 0; static HANDLE MouseDeviceHandle; static HANDLE MouseThreadHandle; static CLIENT_ID MouseThreadId; @@ -59,15 +61,49 @@ DWORD IntLastInputTick(BOOL LastInputTickSetGet) { - static DWORD LastInputTick = 0; - if (LastInputTickSetGet == TRUE) - { - LARGE_INTEGER TickCount; - KeQueryTickCount(&TickCount); - LastInputTick = TickCount.u.LowPart * (KeQueryTimeIncrement() / 10000); - if (gpsi) gpsi->dwLastRITEventTickCount = LastInputTick; - } - return LastInputTick; + if (LastInputTickSetGet == TRUE) + { + LARGE_INTEGER TickCount; + KeQueryTickCount(&TickCount); + LastInputTick = MsqCalculateMessageTime(&TickCount); + if (gpsi) gpsi->dwLastRITEventTickCount = LastInputTick; + } + return LastInputTick; +} + + +VOID FASTCALL DoTheScreenSaver(VOID) +{ + LARGE_INTEGER TickCount; + DWORD Test; + + if (gspv.iScrSaverTimeout > 0) // Zero means Off. + { + KeQueryTickCount(&TickCount); + Test = MsqCalculateMessageTime(&TickCount); + Test = Test - LastInputTick; + if (Test > gspv.iScrSaverTimeout) + { + DPRINT("Screensaver Message Start! Tick %d Timeout %d \n", Test, gspv.iScrSaverTimeout); + + if (ppiScrnSaver) // We are or we are not the screensaver, prevent reentry... + { + if (!(ppiScrnSaver->W32PF_flags & W32PF_IDLESCREENSAVER)) + { + ppiScrnSaver->W32PF_flags |= W32PF_IDLESCREENSAVER; + DPRINT1("Screensaver is Idle\n"); + } + } + else + { + PUSER_MESSAGE_QUEUE ForegroundQueue = IntGetFocusMessageQueue(); + if (ForegroundQueue && ForegroundQueue->ActiveWindow) + UserPostMessage(hwndSAS, WM_LOGONNOTIFY, LN_START_SCREENSAVE, 1); // lParam 1 == Secure + else + UserPostMessage(hwndSAS, WM_LOGONNOTIFY, LN_START_SCREENSAVE, 0); + } + } + } } VOID FASTCALL @@ -449,7 +485,7 @@ co_IntKeyboardSendAltKeyMsg() { DPRINT1("co_IntKeyboardSendAltKeyMsg\n"); - //co_MsqPostKeyboardMessage(WM_SYSCOMMAND,SC_KEYMENU,0); // This sends everything into a msg loop! +// co_MsqPostKeyboardMessage(WM_SYSCOMMAND,SC_KEYMENU,0); // This sends everything into a msg loop! } static VOID APIENTRY Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Fri May 27 23:18:57 2011 @@ -16,6 +16,8 @@ #define NDEBUG #include <debug.h> + +VOID FASTCALL DoTheScreenSaver(VOID); /* GLOBALS *******************************************************************/ @@ -1581,7 +1583,7 @@ CALLBACK HungAppSysTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) { - //DoTheScreenSaver(); + DoTheScreenSaver(); DPRINT("HungAppSysTimerProc\n"); // Process list of windows that are hung and waiting. } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Fri May 27 23:18:57 2011 @@ -280,7 +280,7 @@ gspv.bDropShadow = 1; gspv.dwMenuShowDelay = 100; - gspv.iScrSaverTimeout = 10; + gspv.iScrSaverTimeout = 600000; // TO in 10 minutes. gspv.bScrSaverActive = FALSE; gspv.bScrSaverRunning = FALSE; #if(WINVER >= 0x0600)

1 0

[cgutman] 51970: [PCIIDE/PCIIDEX] - Also update cmake files
by cgutman＠svn.reactos.org 27 May '11

27 May '11

Author: cgutman Date: Fri May 27 22:53:39 2011 New Revision: 51970 URL: http://svn.reactos.org/svn/reactos?rev=51970&view=rev Log: [PCIIDE/PCIIDEX] - Also update cmake files Modified: trunk/reactos/drivers/storage/ide/pciide/CMakeLists.txt trunk/reactos/drivers/storage/ide/pciidex/CMakeLists.txt Modified: trunk/reactos/drivers/storage/ide/pciide/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciide/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciide/CMakeLists.txt [iso-8859-1] Fri May 27 22:53:39 2011 @@ -4,4 +4,4 @@ set_module_type(pciide kernelmodedriver) add_importlibs(pciide pciidex ntoskrnl) -add_cd_file(TARGET pciide DESTINATION reactos/system32/drivers FOR all) +add_cd_file(TARGET pciide DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/storage/ide/pciidex/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] Fri May 27 22:53:39 2011 @@ -15,5 +15,5 @@ set_module_type(pciidex kernelmodedriver) add_importlibs(pciidex ntoskrnl) -add_cd_file(TARGET pciidex DESTINATION reactos/system32/drivers FOR all) +add_cd_file(TARGET pciidex DESTINATION reactos/system32/drivers NO_CAB FOR all) add_importlib_target(pciidex.spec)

1 0

[cgutman] 51969: [USETUP] - Load other driver sections from txtsetup.sif - Enable a debug print [TXTSETUP] - Add PnP entries for storage devices [PCIIDE/PCIIDEX] - Add to bootcd - Both usetup's PnP...
by cgutman＠svn.reactos.org 27 May '11

27 May '11

Author: cgutman Date: Fri May 27 22:35:05 2011 New Revision: 51969 URL: http://svn.reactos.org/svn/reactos?rev=51969&view=rev Log: [USETUP] - Load other driver sections from txtsetup.sif - Enable a debug print [TXTSETUP] - Add PnP entries for storage devices [PCIIDE/PCIIDEX] - Add to bootcd - Both usetup's PnP manager and the user-mode PnP manager now recognize PCI IDE channels Modified: trunk/reactos/base/setup/usetup/interface/devinst.c trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/drivers/storage/ide/pciide/pciide.rbuild trunk/reactos/drivers/storage/ide/pciidex/pciidex.rbuild Modified: trunk/reactos/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] Fri May 27 22:35:05 2011 @@ -65,6 +65,8 @@ /* Find associated driver name */ /* FIXME: check in other sections too! */ if (!SetupFindFirstLineW(hInf, L"BootBusExtenders.Load", Driver, &Context) + && !SetupFindFirstLineW(hInf, L"BusExtenders.Load", Driver, &Context) + && !SetupFindFirstLineW(hInf, L"SCSI.Load", Driver, &Context) && !SetupFindFirstLineW(hInf, L"Keyboard.Load", Driver, &Context)) return FALSE; if (!INF_GetDataField(&Context, 1, &ImagePath)) @@ -81,7 +83,7 @@ RtlCopyMemory(FullImagePath, PathPrefix.Buffer, PathPrefix.MaximumLength); wcscat(FullImagePath, ImagePath); - DPRINT("Using driver '%S' for device '%S'\n", ImagePath, DeviceId); + DPRINT1("Using driver '%S' for device '%S'\n", ImagePath, DeviceId); /* Create service key */ RtlInitUnicodeString(&StringU, Driver); Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri May 27 22:35:05 2011 @@ -41,6 +41,8 @@ ramdisk.sys=,,,,,,x,,,,,,4 ext2fs.sys=,,,,,,x,,,,,,4 classpnp.sys=,,,,,,,,,,,,4 +pciide.sys=,,,,,,,,,,,,4 +pciidex.sys=,,,,,,,,,,,,4 pcix.sys=,,,,,,,,,,,,4 pcmcia.sys=,,,,,,,,,,,,4 swenum.sys=,,,,,,,,,,,,4 @@ -52,11 +54,24 @@ *PNP0C08 = acpi ;PCI\CC_0601 = isapnp PCI\CC_0604 = pci +PCI\VEN_104B&CC_0100 = buslogic +PCI\CC_0101 = pciide +PCI\CC_0104 = uniata +PCI\CC_0105 = uniata +PCI\CC_0106 = uniata +*PNP0600 = uniata [BootBusExtenders.Load] acpi = acpi.sys pci = pci.sys isapnp = isapnp.sys + +[BusExtenders.Load] +pciide = pciide.sys + +[SCSI.Load] +uniata = uniata.sys +buslogic = buslogic.sys [Cabinets] Cabinet=reactos.cab Modified: trunk/reactos/drivers/storage/ide/pciide/pciide.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciide/pciide.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciide/pciide.rbuild [iso-8859-1] Fri May 27 22:35:05 2011 @@ -1,6 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="pciide" type="kernelmodedriver" installbase="system32/drivers" installname="pciide.sys"> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <library>pciidex</library> <library>ntoskrnl</library> <file>pciide.c</file> Modified: trunk/reactos/drivers/storage/ide/pciidex/pciidex.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/pciidex.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciidex/pciidex.rbuild [iso-8859-1] Fri May 27 22:35:05 2011 @@ -1,6 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="pciidex" type="kernelmodedriver" installbase="system32/drivers" installname="pciidex.sys"> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <importlibrary definition="pciidex.spec" /> <library>ntoskrnl</library> <file>fdo.c</file>

1 0

[cgutman] 51968: [HDC] - PCIIDE should be installed for each PCI IDE controller and UNIATA should be installed for each IDE channel - Remove an extra comma in the compatible adapters entries
by cgutman＠svn.reactos.org 27 May '11

27 May '11

Author: cgutman Date: Fri May 27 22:27:37 2011 New Revision: 51968 URL: http://svn.reactos.org/svn/reactos?rev=51968&view=rev Log: [HDC] - PCIIDE should be installed for each PCI IDE controller and UNIATA should be installed for each IDE channel - Remove an extra comma in the compatible adapters entries Modified: trunk/reactos/media/inf/hdc.inf Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=5196… ============================================================================== Binary files - no diff available.

1 0

[cgutman] 51967: [PCIIDEX] - Don't report raw device support to allow the IDE channel driver (uniata) to take over control of the enumerated devices - Ideally the PnP manager should deal with a dri...
by cgutman＠svn.reactos.org 27 May '11

27 May '11

Author: cgutman Date: Fri May 27 22:06:43 2011 New Revision: 51967 URL: http://svn.reactos.org/svn/reactos?rev=51967&view=rev Log: [PCIIDEX] - Don't report raw device support to allow the IDE channel driver (uniata) to take over control of the enumerated devices - Ideally the PnP manager should deal with a driver collision like this but it doesn't currently Modified: trunk/reactos/drivers/storage/ide/pciidex/pdo.c Modified: trunk/reactos/drivers/storage/ide/pciidex/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciidex/pdo.c [iso-8859-1] Fri May 27 22:06:43 2011 @@ -441,7 +441,7 @@ DeviceCapabilities->DockDevice = FALSE; DeviceCapabilities->UniqueID = FALSE; DeviceCapabilities->SilentInstall = FALSE; - DeviceCapabilities->RawDeviceOK = TRUE; + DeviceCapabilities->RawDeviceOK = FALSE; DeviceCapabilities->SurpriseRemovalOK = TRUE; DeviceCapabilities->HardwareDisabled = FALSE; /* FIXME */ //DeviceCapabilities->NoDisplayInUI = FALSE; /* FIXME */

1 0

[cgutman] 51966: [NTOSKRNL] - Add a special case in IopLoadServiceModule for 1st stage setup when we have no service entries so we can still load drivers - Fixes an old regression with 1st stage Pn...
by cgutman＠svn.reactos.org 27 May '11

27 May '11

Author: cgutman Date: Fri May 27 21:56:55 2011 New Revision: 51966 URL: http://svn.reactos.org/svn/reactos?rev=51966&view=rev Log: [NTOSKRNL] - Add a special case in IopLoadServiceModule for 1st stage setup when we have no service entries so we can still load drivers - Fixes an old regression with 1st stage PnP which now can load drivers again Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Fri May 27 21:56:55 2011 @@ -310,51 +310,65 @@ return STATUS_UNSUCCESSFUL; } - /* Open CurrentControlSet */ - RtlInitUnicodeString(&CCSName, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services"); - Status = IopOpenRegistryKeyEx(&CCSKey, NULL, &CCSName, KEY_READ); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); - return Status; - } - - /* Open service key */ - Status = IopOpenRegistryKeyEx(&ServiceKey, CCSKey, ServiceName, KEY_READ); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); + if (ExpInTextModeSetup) + { + /* We have no registry, but luckily we know where all the drivers are */ + + /* ServiceStart < 4 is all that matters */ + ServiceStart = 0; + + /* IopNormalizeImagePath will do all of the work for us if we give it an empty string */ + ServiceImagePath.Length = ServiceImagePath.MaximumLength = 0; + ServiceImagePath.Buffer = NULL; + } + else + { + /* Open CurrentControlSet */ + RtlInitUnicodeString(&CCSName, + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services"); + Status = IopOpenRegistryKeyEx(&CCSKey, NULL, &CCSName, KEY_READ); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); + return Status; + } + + /* Open service key */ + Status = IopOpenRegistryKeyEx(&ServiceKey, CCSKey, ServiceName, KEY_READ); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); + ZwClose(CCSKey); + return Status; + } + + /* + * Get information about the service. + */ + + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + + RtlInitUnicodeString(&ServiceImagePath, NULL); + + QueryTable[0].Name = L"Start"; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[0].EntryContext = &ServiceStart; + + QueryTable[1].Name = L"ImagePath"; + QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[1].EntryContext = &ServiceImagePath; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE, + (PWSTR)ServiceKey, QueryTable, NULL, NULL); + + ZwClose(ServiceKey); ZwClose(CCSKey); - return Status; - } - - /* - * Get information about the service. - */ - - RtlZeroMemory(QueryTable, sizeof(QueryTable)); - - RtlInitUnicodeString(&ServiceImagePath, NULL); - - QueryTable[0].Name = L"Start"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[0].EntryContext = &ServiceStart; - - QueryTable[1].Name = L"ImagePath"; - QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[1].EntryContext = &ServiceImagePath; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE, - (PWSTR)ServiceKey, QueryTable, NULL, NULL); - - ZwClose(ServiceKey); - ZwClose(CCSKey); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlQueryRegistryValues() failed (Status %x)\n", Status); - return Status; + + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlQueryRegistryValues() failed (Status %x)\n", Status); + return Status; + } } /* @@ -369,20 +383,20 @@ return Status; } - /* - * Case for disabled drivers - */ - - if (ServiceStart >= 4) - { - /* FIXME: Check if it is the right status code */ - Status = STATUS_PLUGPLAY_NO_DEVICE; - } - else - { - DPRINT("Loading module\n"); - Status = MmLoadSystemImage(&ServiceImagePath, NULL, NULL, 0, (PVOID)ModuleObject, &BaseAddress); - } + /* + * Case for disabled drivers + */ + + if (ServiceStart >= 4) + { + /* FIXME: Check if it is the right status code */ + Status = STATUS_PLUGPLAY_NO_DEVICE; + } + else + { + DPRINT("Loading module\n"); + Status = MmLoadSystemImage(&ServiceImagePath, NULL, NULL, 0, (PVOID)ModuleObject, &BaseAddress); + } ExFreePool(ServiceImagePath.Buffer);

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