Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[jimtabor] 51972: - No need to do extra work when the process starts.

by jimtabor＠svn.reactos.org

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;

13 years, 3 months

[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

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)

13 years, 3 months

[cgutman] 51970: [PCIIDE/PCIIDEX] - Also update cmake files

by cgutman＠svn.reactos.org

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)

13 years, 3 months

[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

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>

13 years, 3 months

[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

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.

13 years, 3 months

[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

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 */

13 years, 3 months

[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

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);

13 years, 3 months

[pschweitzer] 51965: [NTOSKRNL] Fix struct size checking for debug remove locks. Spotted by Roel

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri May 27 21:21:36 2011 New Revision: 51965 URL: http://svn.reactos.org/svn/reactos?rev=51965&view=rev Log: [NTOSKRNL] Fix struct size checking for debug remove locks. Spotted by Roel Modified: trunk/reactos/ntoskrnl/io/iomgr/remlock.c Modified: trunk/reactos/ntoskrnl/io/iomgr/remlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/remlock.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] Fri May 27 21:21:36 2011 @@ -50,7 +50,7 @@ switch (RemlockSize) { /* Check if this is a debug lock */ - case sizeof(IO_REMOVE_LOCK_DBG_BLOCK): + case (sizeof(IO_REMOVE_LOCK_DBG_BLOCK) + sizeof(IO_REMOVE_LOCK_COMMON_BLOCK)): /* Setup debug parameters */ Lock->Dbg.Signature = 'COLR'; Lock->Dbg.HighWatermark = HighWatermark; @@ -92,7 +92,7 @@ if (!Lock->Common.Removed) { /* Check what kind of lock this is */ - if (RemlockSize == sizeof(IO_REMOVE_LOCK_DBG_BLOCK)) + if (RemlockSize == (sizeof(IO_REMOVE_LOCK_DBG_BLOCK) + sizeof(IO_REMOVE_LOCK_COMMON_BLOCK))) { ASSERT(Lock->Dbg.HighWatermark == 0 || LockValue <= Lock->Dbg.HighWatermark); @@ -154,7 +154,7 @@ PEXTENDED_IO_REMOVE_LOCK Lock = (PEXTENDED_IO_REMOVE_LOCK)RemoveLock; /* Check what kind of lock this is */ - if (RemlockSize == sizeof(IO_REMOVE_LOCK_DBG_BLOCK)) + if (RemlockSize == (sizeof(IO_REMOVE_LOCK_DBG_BLOCK) + sizeof(IO_REMOVE_LOCK_COMMON_BLOCK))) { /* Acquire blocks queue */ KeAcquireSpinLock(&(Lock->Dbg.Spin), &OldIrql); @@ -265,7 +265,7 @@ } /* Check what kind of lock this is */ - if (RemlockSize == sizeof(IO_REMOVE_LOCK_DBG_BLOCK)) + if (RemlockSize == (sizeof(IO_REMOVE_LOCK_DBG_BLOCK) + sizeof(IO_REMOVE_LOCK_COMMON_BLOCK))) { /* A block must be remaining */ ASSERT(Lock->Dbg.Blocks);

13 years, 3 months

[nyadav] 51964: [AUDSRV] Add Playback of virtual buffer on virtual server to audio client

by nyadav＠svn.reactos.org

Author: nyadav Date: Fri May 27 21:11:53 2011 New Revision: 51964 URL: http://svn.reactos.org/svn/reactos?rev=51964&view=rev Log: [AUDSRV] Add Playback of virtual buffer on virtual server to audio client Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] Fri May 27 21:11:53 2011 @@ -27,7 +27,7 @@ #include "audsrvrpc_s.h" -typedef struct PortStream +typedef struct ServerStream { int volume; LONG freq; @@ -35,8 +35,9 @@ int channels; ULONG channelmask; HANDLE thread; - struct PortStream * next; -} PortStream; + float balance; + struct ServerStream * next; +} ServerStream; typedef struct MixerEngine { @@ -60,6 +61,7 @@ HANDLE PinHandle; PKSPROPERTY Property; PKSSTREAM_HEADER Packet; + ServerStream * serverstreamlist; } MixerEngine; extern MixerEngine engine; Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt [iso-8859-1] Fri May 27 21:11:53 2011 @@ -1,5 +1,5 @@ include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/audsrv) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs) spec2def(audsrvapi.dll audsrvapi.spec) Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Fri May 27 21:11:53 2011 @@ -1,1 +1,70 @@ -#include "audsrvapi.h" +#include "audsrvapi.h" + +/*All the wrappers for Remote Function should be here*/ +int status = 0; /*There can be any structure which can hold the connection status*/ +/*Every Function should ensure connection*/ + +/*Initialize an audio stream + *Return -1 if callbacks are NULL pointers + */ +WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance) +{ + if(clientstream == NULL ) return -1; + if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) return -2; + /*Validity of all other data will be checked at server*/ + /*Check Connection Status If not connected call Connect()*/ + /*If connected Properly call the remote audsrv_initstream() function*/ + /*Analyse the return by the function*/ + /*Currently Suppose the return is 0 and a valid streamid is returned*/ + clientstream->stream = &status; + + clientstream->ClientEventPool[0]=CreateEvent(NULL,FALSE,FALSE,NULL); + clientstream->dead = 0; + + return 0; +} + +WINAPI int playaudio ( ClientStream * clientstream) +{ + /*This is an ActiveScheduler*/ + clientstream->callbacks.OpenComplete(0); + while(1) + { + while(WaitForSingleObject(clientstream->ClientEventPool[0],100)!=0){if(clientstream->dead)goto DEAD;} + /*Check Connection Status If not connected call Connect()*/ + /*If connected Properly call the remote audsrv_play() function,This will be a blocking call, placing a dummy wait function here is a good idea.*/ + Sleep(1000); + printf("Played a virtual buffer on Virtual Audio Server :) %d\n",clientstream->dead); + clientstream->callbacks.BufferCopied(0); + } + clientstream->callbacks.PlayComplete(0); + +DEAD: +printf("\nAudio Thread Ended\n"); + + return 0; +} +WINAPI int stopaudio (ClientStream * clientstream ) +{ + /*Server Side termination is remaining*/ + /*Check Connection Status If not connected call Connect()*/ + /*If connected Properly call the remote audsrv_stop() function*/ + clientstream->dead = 1; /*Client Side termination*/ +} +WINAPI int Volume(ClientStream * clientstream, int * volume ) +{ +} +WINAPI int SetVolume(ClientStream * clientstream ,const int newvolume) +{ +} +WINAPI int Write(ClientStream * clientstream ,const char * aData) +{ + if(clientstream->dead) return -1; + SetEvent(clientstream->ClientEventPool[0]); +} +WINAPI int SetBalance(ClientStream * clientstream ,float balance) +{ +} +WINAPI int GetBalance(ClientStream * clientstream ,float * balance) +{ +} Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h [iso-8859-1] Fri May 27 21:11:53 2011 @@ -1,2 +1,2 @@ #include "audsrvrpc_c.h" -#include <audsrvapi.h> +#include <audsrv/audsrvapi.h> Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec [iso-8859-1] Fri May 27 21:11:53 2011 @@ -1,0 +1,8 @@ +@ stdcall initstream (ptr long long long long long long long) +@ stdcall playaudio ( ptr); +@ stdcall stopaudio (ptr ); +@ stdcall Volume(ptr ptr ); +@ stdcall SetVolume(ptr long); +@ stdcall Write(ptr ptr); +@ stdcall SetBalance(ptr long); +@ stdcall GetBalance(ptr ptr); Modified: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/drivers/wdm… ============================================================================== --- branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] Fri May 27 21:11:53 2011 @@ -3,10 +3,54 @@ #include <audsrvapi.h> #include <stdio.h> + +void opencomplete (int error ); +void buffercopied (int error ); +void playcomplete (int error ); + +ClientStream clientstream = {NULL,0,{NULL},{opencomplete,buffercopied,playcomplete}};/*This initialization should not be necessary for a typical client*/ + +DWORD WINAPI RunAudioThread(LPVOID param) +{ + ClientStream * localstream = (ClientStream *) param; + printf("Starting Audio Thread \n"); + playaudio(localstream); +} +void opencomplete (int error ) +{ + /*Copy First Buffer and write*/ + Write(&clientstream,"HELLO_RANDOM_STRING"); +} +void buffercopied (int error ) +{ + Write(&clientstream,"HELLO_RANDOM_STRING"); +} +void playcomplete (int error ) +{ + printf("Play Complete Code %d\n",error); +} int __cdecl wmain(int argc, char* argv[]) { - printf("ReactOS Audio Mixer Sample Client.\n"); + int error; + DWORD dwID; + HANDLE audiothread; + char input='\0'; + printf("ReactOS Audio Mixer Sample Client.Enter 'a' to Stop.\n"); + //if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) printf(""); + error = initstream ( &clientstream , 44100 , 2 , 16 , KSAUDIO_SPEAKER_STEREO , 1000 , 0, 0.0 ); /*[out]HANDLE * streamhandle,[in] long frequency,[in] int number of channels,[in] int bitspersample,[in]ULONG channelmask,[in] int volume,[in] int mute,[in] float balance*/ + if ( error ) + printf("Failed to Initialize Stream.Error %d\n", error); + else + { + printf("StreamID : %d\n",*((int *)clientstream.stream)); + audiothread = CreateThread(NULL,0,RunAudioThread,&clientstream,0,&dwID); + } + while ( input != 'a' ) + scanf("%c",&input); + printf("Stoping Audio Stream.\n"); + stopaudio(&clientstream); + WaitForSingleObject(audiothread,INFINITE); return 0; -} +} Modified: branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… ============================================================================== --- branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] Fri May 27 21:11:53 2011 @@ -1,5 +1,34 @@ -#ifndef _PORTINTERFACE_H -#define _PORTINTERFACE_H +#ifndef _AUDSRVAPI_H +#define _AUDSRVAPI_H +#include <windows.h> +#include <ks.h> +#include <ksmedia.h> +#include <stdio.h> +/********************Structures*********************/ +typedef struct CallBacks +{ + void (*OpenComplete) (int error ); + void (*BufferCopied) (int error ); + void (*PlayComplete) (int error ); +} CallBacks; + +typedef struct ClientStream +{ +HANDLE stream; +int dead; +HANDLE ClientEventPool[1]; /*[0]th event is for Activescheduler*/ +struct CallBacks callbacks; +} ClientStream; + +/********************API Functions******************/ +WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance); +WINAPI int playaudio ( ClientStream * clientstream); +WINAPI int stopaudio (ClientStream * clientstream ); +WINAPI int Volume(ClientStream * clientstream, int * volume ); +WINAPI int SetVolume(ClientStream * clientstream ,const int newvolume); +WINAPI int Write(ClientStream * clientstream ,const char * aData); +WINAPI int SetBalance(ClientStream * clientstream ,float balance); +WINAPI int GetBalance(ClientStream * clientstream ,float * balance); #endif

13 years, 3 months

[cgutman] 51963: [UMPNPMGR] - Determine whether the device is really installed by reading the ClassGUID key instead of looking at the device flags - Add a debug print for device installation (shoul...

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri May 27 20:50:17 2011 New Revision: 51963 URL: http://svn.reactos.org/svn/reactos?rev=51963&view=rev Log: [UMPNPMGR] - Determine whether the device is really installed by reading the ClassGUID key instead of looking at the device flags - Add a debug print for device installation (shouldn't be too spammy except and will be helpful for hotplugging) [USETUP] - Reenable the 1st stage PnP manager Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/base/setup/usetup/interface/usetup.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] Fri May 27 20:50:17 2011 @@ -2241,8 +2241,6 @@ static BOOL InstallDevice(PCWSTR DeviceInstance, BOOL ShowWizard) { - PLUGPLAY_CONTROL_STATUS_DATA PlugPlayData; - NTSTATUS Status; BOOL DeviceInstalled = FALSE; DWORD BytesWritten; DWORD Value; @@ -2251,6 +2249,8 @@ PROCESS_INFORMATION ProcessInfo; STARTUPINFOW StartupInfo; UUID RandomUuid; + WCHAR RegistryPath[MAX_PATH]; + HKEY DeviceKey; /* The following lengths are constant (see below), they cannot overflow */ WCHAR CommandLine[116]; @@ -2262,26 +2262,30 @@ ZeroMemory(&ProcessInfo, sizeof(ProcessInfo)); - RtlInitUnicodeString(&PlugPlayData.DeviceInstance, - DeviceInstance); - PlugPlayData.Operation = 0; /* Get status */ - - /* Get device status */ - Status = NtPlugPlayControl(PlugPlayControlDeviceStatus, - (PVOID)&PlugPlayData, - sizeof(PLUGPLAY_CONTROL_STATUS_DATA)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtPlugPlayControl('%S') failed with status 0x%08lx\n", DeviceInstance, Status); - return FALSE; - } - - if ((PlugPlayData.DeviceStatus & (DNF_STARTED | DNF_START_FAILED)) != 0) - { - /* Device is already started, or disabled due to some problem. Don't install it */ - DPRINT("No need to install '%S'\n", DeviceInstance); - return TRUE; - } + wcscpy(RegistryPath, L"SYSTEM\\CurrentControlSet\\Enum\\"); + wcscat(RegistryPath, DeviceInstance); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + RegistryPath, + 0, + KEY_QUERY_VALUE, + &DeviceKey) == ERROR_SUCCESS) + { + if (RegQueryValueExW(DeviceKey, + L"ClassGUID", + NULL, + NULL, + NULL, + NULL) == ERROR_SUCCESS) + { + DPRINT("No need to install: %S\n", DeviceInstance); + return TRUE; + } + + CloseHandle(DeviceKey); + } + + DPRINT1("Installing: %S\n", DeviceInstance); /* Create a random UUID for the named pipe */ UuidCreate(&RandomUuid); @@ -2386,6 +2390,8 @@ if(ProcessInfo.hThread) CloseHandle(ProcessInfo.hThread); + + DPRINT1("Success? %d\n", DeviceInstalled); return DeviceInstalled; } Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Fri May 27 20:50:17 2011 @@ -3776,14 +3776,10 @@ INPUT_RECORD Ir; PAGE_NUMBER Page; LARGE_INTEGER Time; -// NTSTATUS Status; + NTSTATUS Status; NtQuerySystemTime(&Time); -#if 0 /* This minimal PnP implementation causes problems because it writes - * half complete registry entries which cause devices installed by this - * method (PCI) to be improperly installed and not recognized by device manager - */ Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, @@ -3795,7 +3791,6 @@ &hPnpThread, NULL); if (!NT_SUCCESS(Status)) -#endif hPnpThread = INVALID_HANDLE_VALUE; if (!CONSOLE_Init())

13 years, 3 months

← Newer
1
...
4
5
6
7
8
9
10
...
52
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 May 2011