Ros-diffs October 2006

ros-diffs@reactos.org

17 participants
357 discussions

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Oct 3 18:28:21 2006 New Revision: 24373 URL: http://svn.reactos.org/svn/reactos?rev=24373&view=rev Log: Fix a few warnings 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 (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Tue Oct 3 18:28:21 2006 @@ -88,6 +88,8 @@ { RPC_STATUS Status; + UNREFERENCED_PARAMETER(lpParameter); + DPRINT("RpcServerThread() called\n"); Status = RpcServerUseProtseqEpW(L"ncacn_np", @@ -157,6 +159,8 @@ PNP_GetVersion(handle_t BindingHandle, unsigned short *Version) { + UNREFERENCED_PARAMETER(BindingHandle); + *Version = 0x0400; return CR_SUCCESS; } @@ -168,6 +172,9 @@ unsigned long *State, unsigned long Flags) { + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(Flags); + *State = CM_GLOBAL_STATE_CAN_DO_UI | CM_GLOBAL_STATE_SERVICES_AVAILABLE; return CR_SUCCESS; } @@ -177,6 +184,8 @@ CONFIGRET PNP_InitDetection(handle_t BindingHandle) { + UNREFERENCED_PARAMETER(BindingHandle); + DPRINT("PNP_InitDetection() called\n"); return CR_SUCCESS; } @@ -189,6 +198,8 @@ unsigned long ProcessId) { HANDLE hProcess; + + UNREFERENCED_PARAMETER(BindingHandle); DPRINT1("PNP_ReportLogOn(%lu, %lu) called\n", Admin, ProcessId); @@ -225,22 +236,12 @@ unsigned long Flags) { CONFIGRET ret = CR_SUCCESS; - HKEY hEnumKey = NULL; HKEY hDeviceKey = NULL; + + UNREFERENCED_PARAMETER(BindingHandle); DPRINT("PNP_ValidateDeviceInstance(%S %lx) called\n", DeviceInstance, Flags); - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"System\\CurrentControlSet\\Enum", - 0, - KEY_ALL_ACCESS, - &hEnumKey)) - { - DPRINT("Could not open the Enum Key!\n"); - ret = CR_FAILURE; - goto Done; - } if (RegOpenKeyExW(hEnumKey, DeviceInstance, @@ -259,9 +260,6 @@ if (hDeviceKey != NULL) RegCloseKey(hDeviceKey); - if (hEnumKey != NULL) - RegCloseKey(hEnumKey); - DPRINT("PNP_ValidateDeviceInstance() done (returns %lx)\n", ret); return ret; @@ -275,6 +273,8 @@ unsigned long Length) { CONFIGRET ret = CR_SUCCESS; + + UNREFERENCED_PARAMETER(BindingHandle); DPRINT("PNP_GetRootDeviceInstance() called\n"); @@ -306,6 +306,9 @@ PLUGPLAY_CONTROL_RELATED_DEVICE_DATA PlugPlayData; CONFIGRET ret = CR_SUCCESS; NTSTATUS Status; + + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(Flags); DPRINT("PNP_GetRelatedDeviceInstance() called\n"); DPRINT(" Relationship %ld\n", Relationship); @@ -350,6 +353,9 @@ CONFIGRET ret = CR_SUCCESS; HKEY hKey; DWORD dwError; + + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(Flags); DPRINT("PNP_EnumerateSubKeys() called\n"); @@ -398,6 +404,10 @@ unsigned long *Length, DWORD Flags) { + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(Filter); + UNREFERENCED_PARAMETER(Flags); + DPRINT("PNP_GetDeviceListSize() called\n"); /* FIXME */ @@ -417,6 +427,9 @@ PLUGPLAY_CONTROL_DEPTH_DATA PlugPlayData; CONFIGRET ret = CR_SUCCESS; NTSTATUS Status; + + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(Flags); DPRINT("PNP_GetDepth() called\n"); @@ -457,6 +470,9 @@ LPWSTR lpValueName = NULL; HKEY hKey = 0; NTSTATUS Status; + + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(Flags); DPRINT("PNP_GetDeviceRegProp() called\n"); @@ -643,6 +659,9 @@ LPWSTR lpValueName = NULL; HKEY hKey = 0; + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(Flags); + DPRINT("PNP_SetDeviceRegProp() called\n"); DPRINT("DeviceId: %S\n", DeviceId); @@ -751,6 +770,11 @@ { CONFIGRET ret = CR_SUCCESS; + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(DeviceId); + UNREFERENCED_PARAMETER(Buffer); + UNREFERENCED_PARAMETER(Length); + DPRINT("PNP_Get_Class_Instance() called\n"); DPRINT("PNP_Get_Class_Instance() done (returns %lx)\n", ret); @@ -767,6 +791,11 @@ unsigned long Flags) { CONFIGRET ret = CR_SUCCESS; + + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(SubKey); + UNREFERENCED_PARAMETER(samDesired); + UNREFERENCED_PARAMETER(Flags); DPRINT("PNP_CreateKey() called\n"); @@ -786,6 +815,12 @@ { CONFIGRET ret = CR_SUCCESS; + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(DeviceId); + UNREFERENCED_PARAMETER(ParentKey); + UNREFERENCED_PARAMETER(ChildKey); + UNREFERENCED_PARAMETER(Flags); + DPRINT("PNP_DeleteRegistryKey() called\n"); DPRINT("PNP_DeleteRegistryKey() done (returns %lx)\n", ret); @@ -803,6 +838,8 @@ { HANDLE hKey = NULL; DWORD dwError; + + UNREFERENCED_PARAMETER(BindingHandle); dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, pszRegPathClass, @@ -846,6 +883,9 @@ HKEY hKey = NULL; ULONG ulSize; + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(Flags); + DPRINT("PNP_GetClassName() called\n"); lstrcpyW(szKeyName, L"System\\CurrentControlSet\\Control\\Class"); @@ -893,6 +933,8 @@ { CONFIGRET ret = CR_SUCCESS; + UNREFERENCED_PARAMETER(BindingHandle); + DPRINT("PNP_GetClassName(%S, %lx) called\n", ClassGuid, Flags); if (Flags & CM_DELETE_CLASS_SUBKEYS) @@ -922,6 +964,12 @@ { CONFIGRET ret = CR_CALL_NOT_IMPLEMENTED; + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(DeviceId); + UNREFERENCED_PARAMETER(ParentDeviceId); + UNREFERENCED_PARAMETER(Length); + UNREFERENCED_PARAMETER(Flags); + DPRINT1("PNP_CreateDevInst() called\n"); DPRINT1("PNP_CreateDevInst() done (returns %lx)\n", ret); @@ -940,6 +988,11 @@ { CONFIGRET ret = CR_SUCCESS; + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(MinorAction); + UNREFERENCED_PARAMETER(DeviceInstance1); + UNREFERENCED_PARAMETER(DeviceInstance2); + DPRINT("PNP_DeviceInstanceAction() called\n"); switch (MajorAction) @@ -997,6 +1050,9 @@ CONFIGRET ret = CR_SUCCESS; NTSTATUS Status; + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(Flags); + DPRINT("PNP_GetDeviceStatus() called\n"); RtlInitUnicodeString(&PlugPlayData.DeviceInstance, @@ -1031,6 +1087,11 @@ { CONFIGRET ret = CR_SUCCESS; + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(DeviceInstance); + UNREFERENCED_PARAMETER(Problem); + UNREFERENCED_PARAMETER(Flags); + DPRINT1("PNP_SetDeviceProblem() called\n"); /* FIXME */ @@ -1049,6 +1110,10 @@ { CONFIGRET ret = CR_SUCCESS; + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(DeviceInstance); + UNREFERENCED_PARAMETER(Flags); + DPRINT1("PNP_UninstallDevInst() called\n"); /* FIXME */ @@ -1070,7 +1135,7 @@ while (*lpPtr != 0) { dwLength = wcslen(lpPtr); - if (!_wcsicmp(lpPtr, lpDeviceId)) + if (0 == _wcsicmp(lpPtr, lpDeviceId)) return TRUE; lpPtr += (dwLength + 1); @@ -1113,6 +1178,8 @@ LPWSTR pszSubKey; DWORD dwDeviceIdListSize; WCHAR szDeviceIdList[512]; + + UNREFERENCED_PARAMETER(BindingHandle); DPRINT("PNP_AddID() called\n"); DPRINT(" DeviceInstance: %S\n", DeviceInstance); @@ -1185,6 +1252,8 @@ DWORD dwValue; DWORD dwSize; CONFIGRET ret = CR_SUCCESS; + + UNREFERENCED_PARAMETER(BindingHandle); DPRINT1("PNP_IsDockStationPresent() called\n"); @@ -1232,6 +1301,8 @@ { CONFIGRET ret = CR_SUCCESS; + UNREFERENCED_PARAMETER(BindingHandle); + DPRINT1("PNP_RequestEjectPC() called\n"); ret = CR_FAILURE; /* FIXME */ @@ -1253,6 +1324,13 @@ { CONFIGRET ret = CR_SUCCESS; + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(Action); + UNREFERENCED_PARAMETER(DeviceId); + UNREFERENCED_PARAMETER(ProfileId); + UNREFERENCED_PARAMETER(Value); + UNREFERENCED_PARAMETER(Flags); + DPRINT1("PNP_HwProfFlags() called\n"); ret = CR_CALL_NOT_IMPLEMENTED; /* FIXME */ @@ -1273,6 +1351,11 @@ { CONFIGRET ret = CR_SUCCESS; + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(DeviceInstance); + UNREFERENCED_PARAMETER(ulPriority); + UNREFERENCED_PARAMETER(ulFlags); + DPRINT1("PNP_AddEmptyLogConf() called\n"); *pulLogConfTag = 0; /* FIXME */ @@ -1293,6 +1376,12 @@ { CONFIGRET ret = CR_SUCCESS; + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(DeviceInstance); + UNREFERENCED_PARAMETER(ulType); + UNREFERENCED_PARAMETER(ulLogConfTag); + UNREFERENCED_PARAMETER(ulFlags); + DPRINT1("PNP_FreeLogConf() called\n"); @@ -1311,6 +1400,11 @@ ULONG ulFlags) { CONFIGRET ret = CR_SUCCESS; + + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(DeviceInstance); + UNREFERENCED_PARAMETER(ulPriority); + UNREFERENCED_PARAMETER(ulFlags); DPRINT1("PNP_GetFirstLogConf() called\n"); @@ -1333,6 +1427,12 @@ { CONFIGRET ret = CR_SUCCESS; + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(DeviceInstance); + UNREFERENCED_PARAMETER(ulLogConfType); + UNREFERENCED_PARAMETER(ulCurrentTag); + UNREFERENCED_PARAMETER(ulFlags); + DPRINT1("PNP_GetNextLogConf() called\n"); *pulNextTag = 0; /* FIXME */ @@ -1354,6 +1454,12 @@ { CONFIGRET ret = CR_SUCCESS; + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(DeviceInstance); + UNREFERENCED_PARAMETER(ulLogConfType); + UNREFERENCED_PARAMETER(ulCurrentTag); + UNREFERENCED_PARAMETER(ulFlags); + DPRINT1("PNP_GetLogConfPriority() called\n"); *pPriority = 0; /* FIXME */ @@ -1369,6 +1475,9 @@ PNP_RunDetection(handle_t BindingHandle, unsigned long Flags) { + UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(Flags); + DPRINT("PNP_RunDetection() called\n"); return CR_CALL_NOT_IMPLEMENTED; } @@ -1396,12 +1505,12 @@ if (!NT_SUCCESS(Status)) return FALSE; - if (PlugPlayData.DeviceStatus & DNF_STARTED || PlugPlayData.DeviceStatus & DNF_START_FAILED) + if ((PlugPlayData.DeviceStatus & (DNF_STARTED | DNF_START_FAILED)) != 0) /* Device is already started, or disabled due to some problem. Don't install it */ return TRUE; /* Install device */ - SetEnvironmentVariable(L"USERPROFILE", L"."); /* FIXME: why is it needed? */ + SetEnvironmentVariableW(L"USERPROFILE", L"."); /* FIXME: why is it needed? */ hNewDev = LoadLibraryW(L"newdev.dll"); if (!hNewDev) @@ -1467,6 +1576,8 @@ DeviceInstallParams* Params; BOOL setupActive; + UNREFERENCED_PARAMETER(lpParameter); + setupActive = SetupIsActive(); SetEnvironmentVariable(L"USERPROFILE", L"."); /* FIXME: why is it needed? */ @@ -1476,7 +1587,7 @@ #ifdef HAVE_SLIST_ENTRY_IMPLEMENTED ListEntry = InterlockedPopEntrySList(&DeviceInstallListHead); #else - if (IsListEmpty(&DeviceInstallListHead)) + if ((BOOL)IsListEmpty(&DeviceInstallListHead)) ListEntry = NULL; else ListEntry = RemoveHeadList(&DeviceInstallListHead); @@ -1484,13 +1595,11 @@ if (ListEntry == NULL) { SetEvent(hNoPendingInstalls); - DPRINT1("*** EVENT SETTED\n"); WaitForSingleObject(hDeviceInstallListNotEmpty, INFINITE); } else { ResetEvent(hNoPendingInstalls); - DPRINT1("*** EVENT RESETTED\n"); Params = CONTAINING_RECORD(ListEntry, DeviceInstallParams, ListEntry); InstallDevice(Params->DeviceIds, setupActive); } @@ -1507,6 +1616,8 @@ ULONG PnpEventSize; NTSTATUS Status; RPC_STATUS RpcStatus; + + UNREFERENCED_PARAMETER(lpParameter); PnpEventSize = 0x1000; PnpEvent = HeapAlloc(GetProcessHeap(), 0, PnpEventSize); @@ -1581,6 +1692,9 @@ HANDLE hThread; DWORD dwThreadId; + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + DPRINT("ServiceMain() called\n"); hNoPendingInstalls = CreateEventW(NULL, @@ -1624,6 +1738,9 @@ { DWORD dwError; + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + DPRINT("Umpnpmgr: main() started\n"); hInstallEvent = CreateEvent(NULL, TRUE, FALSE, NULL);

18 years, 1 month

[gedmurphy] 24372: set processor information in the sysdm control panel applet

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Oct 3 03:35:43 2006 New Revision: 24372 URL: http://svn.reactos.org/svn/reactos?rev=24372&view=rev Log: set processor information in the sysdm control panel applet Modified: trunk/reactos/dll/cpl/sysdm/general.c Modified: trunk/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/general.c (original) +++ trunk/reactos/dll/cpl/sysdm/general.c Tue Oct 3 03:35:43 2006 @@ -71,30 +71,136 @@ static VOID +SetRegTextData(HWND hwnd, + HKEY hKey, + LPTSTR Value, + UINT uID) +{ + LPTSTR lpBuf = NULL; + DWORD BufSize = 0; + DWORD Type; + + if (RegQueryValueEx(hKey, + Value, + NULL, + &Type, + NULL, + &BufSize) == ERROR_SUCCESS) + { + lpBuf = HeapAlloc(GetProcessHeap(), + 0, + BufSize); + if (!lpBuf) return; + + if (RegQueryValueEx(hKey, + Value, + NULL, + &Type, + (PBYTE)lpBuf, + &BufSize) == ERROR_SUCCESS) + { + SetDlgItemText(hwnd, + uID, + lpBuf); + } + + HeapFree(GetProcessHeap(), + 0, + lpBuf); + } +} + +static VOID +SetProcSpeed(HWND hwnd, + HKEY hKey, + LPTSTR Value, + UINT uID) + +{ + TCHAR szBuf[64]; + DWORD dwBuf; + DWORD BufSize = sizeof(DWORD); + DWORD Type = REG_SZ; + + if (RegQueryValueEx(hKey, + Value, + NULL, + &Type, + (PBYTE)&dwBuf, + &BufSize) == ERROR_SUCCESS) + { + if (dwBuf < 1000) + { + wsprintf(szBuf, _T("%lu MHz"), dwBuf); + } + else + { + double flt = dwBuf / 1000.0; + wsprintf(szBuf, _T("%l GHz"), flt); + } + + SetDlgItemText(hwnd, + uID, + szBuf); + } +} + + +static VOID GetSystemInformation(HWND hwnd) { + HKEY hKey; + TCHAR ProcKey[] = _T("HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0"); MEMORYSTATUS MemStat; TCHAR Buf[32]; INT Ret = 0; + + + + /* Get Processor information * + * although undocumented, this information is being pulled + * directly out of the registry instead of via setupapi as it + * contains all the info we need, and should remain static + */ + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + ProcKey, + 0, + KEY_READ, + &hKey) == ERROR_SUCCESS) + { + SetRegTextData(hwnd, + hKey, + _T("VendorIdentifier"), + IDC_PROCESSORMANUFACTURER); + + SetRegTextData(hwnd, + hKey, + _T("ProcessorNameString"), + IDC_PROCESSOR); + + SetProcSpeed(hwnd, + hKey, + _T("~MHz"), + IDC_PROCESSORSPEED); + } + /* Get total physical RAM */ MemStat.dwLength = sizeof(MemStat); GlobalMemoryStatus(&MemStat); if (MemStat.dwTotalPhys < KB_DIV) - Ret = wsprintf(Buf, _T("%luKB of RAM"), MemStat.dwTotalPhys/1024); + Ret = wsprintf(Buf, _T("%luKB of RAM"), MemStat.dwTotalPhys/KB_DIV); else if (MemStat.dwTotalPhys >= KB_DIV && MemStat.dwTotalPhys < GB_DIV) - Ret = wsprintf(Buf, _T("%luMB of RAM"), MemStat.dwTotalPhys/1048576); + Ret = wsprintf(Buf, _T("%luMB of RAM"), MemStat.dwTotalPhys/MB_DIV); else if (MemStat.dwTotalPhys > GB_DIV) - Ret = wsprintf(Buf, _T("%luGB of RAM"), MemStat.dwTotalPhys/1073741824); + Ret = wsprintf(Buf, _T("%luGB of RAM"), MemStat.dwTotalPhys/GB_DIV); if (Ret) { - SendDlgItemMessage(hwnd, - IDC_SYSTEMMEMORY, - WM_SETTEXT, - 0, - (LPARAM)Buf); + SetDlgItemText(hwnd, + IDC_SYSTEMMEMORY, + Buf); } }

18 years, 1 month

[amunger] 24371: Patch from ShadowFlare, bug 1838. "The current implementation continues to register or unregister additional DLLs that were specified, even if one of the earlier ones failed. The behavior on the Microsoft version is different; if one fails, it stops there instead of continuing. Some installers may possibly depend on this behavior."

by amunger＠svn.reactos.org

Author: amunger Date: Tue Oct 3 02:21:37 2006 New Revision: 24371 URL: http://svn.reactos.org/svn/reactos?rev=24371&view=rev Log: Patch from ShadowFlare, bug 1838. "The current implementation continues to register or unregister additional DLLs that were specified, even if one of the earlier ones failed. The behavior on the Microsoft version is different; if one fails, it stops there instead of continuing. Some installers may possibly depend on this behavior." Modified: trunk/reactos/base/system/regsvr32/regsvr32.c Modified: trunk/reactos/base/system/regsvr32/regsvr32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/regsv… ============================================================================== --- trunk/reactos/base/system/regsvr32/regsvr32.c (original) +++ trunk/reactos/base/system/regsvr32/regsvr32.c Tue Oct 3 02:21:37 2006 @@ -1,10 +1,10 @@ /* * ReactOS regsvr32 - * Copyright (C) 2004 ReactOS Team + * Copyright (C) 2004-2006 ReactOS Team * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS regsvr32.exe - * FILE: apps/utils/regsvr32/regsvr32.c + * FILE: base/system/regsvr32/regsvr32.c * PURPOSE: Register a COM component in the registry * PROGRAMMER: ShadowFlare (blakflare(a)hotmail.com) */ @@ -59,13 +59,13 @@ LPCTSTR ModuleTitle = _T("RegSvr32"); TCHAR UsageMessage[RC_STRING_MAX_SIZE]; -TCHAR NoDllSpecified[RC_STRING_MAX_SIZE]; -TCHAR InvalidFlag[RC_STRING_MAX_SIZE]; -TCHAR SwitchN_NoI[RC_STRING_MAX_SIZE]; +TCHAR NoDllSpecified[RC_STRING_MAX_SIZE]; +TCHAR InvalidFlag[RC_STRING_MAX_SIZE]; +TCHAR SwitchN_NoI[RC_STRING_MAX_SIZE]; TCHAR DllNotLoaded[RC_STRING_MAX_SIZE]; TCHAR MissingEntry[RC_STRING_MAX_SIZE]; -TCHAR FailureMessage[RC_STRING_MAX_SIZE]; -TCHAR SuccessMessage[RC_STRING_MAX_SIZE]; +TCHAR FailureMessage[RC_STRING_MAX_SIZE]; +TCHAR SuccessMessage[RC_STRING_MAX_SIZE]; // The macro CommandLineToArgv maps to a function that converts @@ -271,12 +271,12 @@ // Get Langues msg LoadString( GetModuleHandle(NULL), IDS_UsageMessage, (LPTSTR) UsageMessage,RC_STRING_MAX_SIZE); - LoadString( GetModuleHandle(NULL), IDS_NoDllSpecified, (LPTSTR) NoDllSpecified,RC_STRING_MAX_SIZE); + LoadString( GetModuleHandle(NULL), IDS_NoDllSpecified, (LPTSTR) NoDllSpecified,RC_STRING_MAX_SIZE); LoadString( GetModuleHandle(NULL), IDS_InvalidFlag, (LPTSTR) InvalidFlag,RC_STRING_MAX_SIZE); LoadString( GetModuleHandle(NULL), IDS_SwitchN_NoI, (LPTSTR) SwitchN_NoI,RC_STRING_MAX_SIZE); - LoadString( GetModuleHandle(NULL), IDS_DllNotLoaded, (LPTSTR) DllNotLoaded,RC_STRING_MAX_SIZE); - LoadString( GetModuleHandle(NULL), IDS_MissingEntry, (LPTSTR) MissingEntry,RC_STRING_MAX_SIZE); + LoadString( GetModuleHandle(NULL), IDS_DllNotLoaded, (LPTSTR) DllNotLoaded,RC_STRING_MAX_SIZE); + LoadString( GetModuleHandle(NULL), IDS_MissingEntry, (LPTSTR) MissingEntry,RC_STRING_MAX_SIZE); LoadString( GetModuleHandle(NULL), IDS_FailureMessage, (LPTSTR) FailureMessage,RC_STRING_MAX_SIZE); LoadString( GetModuleHandle(NULL), IDS_SuccessMessage, (LPTSTR) SuccessMessage,RC_STRING_MAX_SIZE); @@ -384,7 +384,7 @@ OleInitialize(0); // (Un)register every dll whose filename was passed in the command-line string - for (i = 1; i < argc; i++) { + for (i = 1; i < argc && nRetValue == EXITCODE_SUCCESS; i++) { // Arguments that do not start with a slash (/) are filenames if (*argv[i] != _T('/')) { lptDllName = argv[i]; @@ -425,7 +425,7 @@ } } - if (bInstall) { + if (bInstall && nRetValue == EXITCODE_SUCCESS) { // Get the address of DllInstall fnDllInstall = (DLLINSTALL)GetProcAddress(hDll,szDllInstall); if (fnDllInstall) {

18 years, 1 month

[fireball] 24370: - Add registry entry for usbdriver.sys's legacy loading. Commented out by default. - Add usbdriver.sys to bootcd

by fireball＠svn.reactos.org

Author: fireball Date: Tue Oct 3 01:28:01 2006 New Revision: 24370 URL: http://svn.reactos.org/svn/reactos?rev=24370&view=rev Log: - Add registry entry for usbdriver.sys's legacy loading. Commented out by default. - Add usbdriver.sys to bootcd Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Tue Oct 3 01:28:01 2006 @@ -710,6 +710,13 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 +; USB uhci/ehci driver +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","ErrorControl",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Group",0x00000000,"Base" +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","ImagePath",0x00020000,"system32\drivers\usbdriver.sys" +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Start",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Type",0x00010001,0x00000001 + ; Windows Installer Service HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Adds, modifies, and removes applications provided as a Windows Installer (*.msi) package. If this service is disabled, any services that explicitly depend on it will fail to start." HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Group",0x00000000,"Windows Installer" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Tue Oct 3 01:28:01 2006 @@ -270,6 +270,7 @@ ;drivers\usb\miniport\usbuhci\usbuhci.sys 2 ;drivers\usb\usbhub\usbhub.sys 2 ;drivers\usb\usbport\usbport.sys 2 +drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 drivers\video\displays\vga\vgaddi.dll 1 drivers\video\displays\framebuf\framebuf.dll 1

18 years, 1 month

[fireball] 24369: - Change CONNECT_DATA to DEV_CONNECT_DATA - Add the last bit to the usb mouse driver to make it functional - recognition by mouclass.sys, and sending input data to it - Misc small changes Now USB mouse works in 2nd stage (you need to add usbdriver.sys as a legacy driver to the registry certainly) TODO, but not of the top priority: - Make unloading correct

by fireball＠svn.reactos.org

Author: fireball Date: Tue Oct 3 01:23:41 2006 New Revision: 24369 URL: http://svn.reactos.org/svn/reactos?rev=24369&view=rev Log: - Change CONNECT_DATA to DEV_CONNECT_DATA - Add the last bit to the usb mouse driver to make it functional - recognition by mouclass.sys, and sending input data to it - Misc small changes Now USB mouse works in 2nd stage (you need to add usbdriver.sys as a legacy driver to the registry certainly) TODO, but not of the top priority: - Make unloading correct Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/compdrv.c trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/compdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/compdrv.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/compdrv.c Tue Oct 3 01:23:41 2006 @@ -24,7 +24,7 @@ VOID compdev_set_cfg_completion(PURB purb, PVOID context); VOID compdev_select_driver(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); -BOOLEAN compdev_connect(PCONNECT_DATA param, DEV_HANDLE dev_handle); +BOOLEAN compdev_connect(PDEV_CONNECT_DATA param, DEV_HANDLE dev_handle); BOOLEAN compdev_stop(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); BOOLEAN compdev_disconnect(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); @@ -72,7 +72,7 @@ } BOOLEAN -compdev_connect(PCONNECT_DATA param, DEV_HANDLE dev_handle) +compdev_connect(PDEV_CONNECT_DATA param, DEV_HANDLE dev_handle) { PURB purb; PUSB_CTRL_SETUP_PACKET psetup; @@ -403,7 +403,7 @@ if (credit) { // ok, we find one - CONNECT_DATA param; + DEV_CONNECT_DATA param; if (pcand->disp_tbl.dev_connect) { Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c Tue Oct 3 01:23:41 2006 @@ -1080,9 +1080,9 @@ DEV_HANDLE dev_handle; NTSTATUS status; PUSB_DRIVER pdriver; - PCONNECT_DATA pcd = (PCONNECT_DATA) Parameter; + PDEV_CONNECT_DATA pcd = (PDEV_CONNECT_DATA) Parameter; PUSB_DEV_MANAGER dev_mgr; - CONNECT_DATA param; + DEV_CONNECT_DATA param; if (pcd == NULL) return FALSE; @@ -1111,7 +1111,7 @@ PUSB_DRIVER pdriver, pcand; LONG credit, match, i; DEV_HANDLE handle = 0; - CONNECT_DATA cd; + DEV_CONNECT_DATA cd; USE_BASIC_NON_PENDING_IRQL; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h Tue Oct 3 01:23:41 2006 @@ -1,16 +1,16 @@ #ifndef __DEVMGR_H__ #define __DEVMGR_H__ -typedef struct _CONNECT_DATA +typedef struct _DEV_CONNECT_DATA { DEV_HANDLE dev_handle; struct _USB_DRIVER *pdriver; struct _USB_DEV_MANAGER *dev_mgr; PUSB_INTERFACE_DESC if_desc; -} CONNECT_DATA, *PCONNECT_DATA; - -typedef BOOLEAN ( *PDEV_CONNECT_EX )( PCONNECT_DATA init_param, DEV_HANDLE dev_handle ); +} DEV_CONNECT_DATA, *PDEV_CONNECT_DATA; + +typedef BOOLEAN ( *PDEV_CONNECT_EX )( PDEV_CONNECT_DATA init_param, DEV_HANDLE dev_handle ); typedef BOOLEAN ( *PDEV_CONNECT )( struct _USB_DEV_MANAGER *dev_mgr, DEV_HANDLE dev_handle ); typedef BOOLEAN ( *PDRVR_INIT )( struct _USB_DEV_MANAGER *dev_mgr, struct _USB_DRIVER *pdriver ); Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c Tue Oct 3 01:23:41 2006 @@ -75,7 +75,7 @@ VOID gendrv_set_cfg_completion(PURB purb, PVOID context); -BOOLEAN gendrv_connect(PCONNECT_DATA param, DEV_HANDLE dev_handle); +BOOLEAN gendrv_connect(PDEV_CONNECT_DATA param, DEV_HANDLE dev_handle); BOOLEAN gendrv_stop(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); @@ -168,7 +168,7 @@ } BOOLEAN -gendrv_connect(PCONNECT_DATA param, DEV_HANDLE dev_handle) +gendrv_connect(PDEV_CONNECT_DATA param, DEV_HANDLE dev_handle) { PURB purb; PUSB_CTRL_SETUP_PACKET psetup; @@ -717,7 +717,7 @@ BOOLEAN -gendrv_if_connect(PCONNECT_DATA params, DEV_HANDLE if_handle) +gendrv_if_connect(PDEV_CONNECT_DATA params, DEV_HANDLE if_handle) { // // try to search the registry to find one driver. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c Tue Oct 3 01:23:41 2006 @@ -79,7 +79,7 @@ NTSTATUS hub_start_int_request(PUSB_DEV pdev); -BOOLEAN hub_connect(PCONNECT_DATA init_param, DEV_HANDLE dev_handle); +BOOLEAN hub_connect(PDEV_CONNECT_DATA init_param, DEV_HANDLE dev_handle); BOOLEAN hub_disconnect(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); @@ -1908,7 +1908,7 @@ } BOOLEAN -hub_connect(PCONNECT_DATA param, DEV_HANDLE dev_handle) +hub_connect(PDEV_CONNECT_DATA param, DEV_HANDLE dev_handle) { URB urb, *purb; CHAR buf[512]; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c Tue Oct 3 01:23:41 2006 @@ -8,6 +8,7 @@ #include "usbdriver.h" #include "ntddmou.h" +#include "kbdmou.h" //FIXME: is it needed at all? typedef struct _USBMP_DEVICE_EXTENSION @@ -15,10 +16,14 @@ BOOLEAN IsFDO; } USBMP_DEVICE_EXTENSION, *PUSBMP_DEVICE_EXTENSION; +/* Data for embedded drivers */ +//CONNECT_DATA KbdClassInformation; +CONNECT_DATA MouseClassInformation; + PDEVICE_OBJECT MouseFdo = NULL; -BOOLEAN mouse_connect(PCONNECT_DATA dev_mgr, DEV_HANDLE dev_handle); +BOOLEAN mouse_connect(PDEV_CONNECT_DATA dev_mgr, DEV_HANDLE dev_handle); BOOLEAN mouse_disconnect(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); BOOLEAN mouse_stop(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); VOID mouse_irq(PURB purb, PVOID pcontext); @@ -63,6 +68,9 @@ pdriver->disp_tbl.dev_disconnect = mouse_disconnect; pdriver->disp_tbl.dev_stop = mouse_stop; pdriver->disp_tbl.dev_reserved = NULL; + + // Zero out the class information structure + RtlZeroMemory(&MouseClassInformation, sizeof(CONNECT_DATA)); // Create the device MouseCreateDevice(dev_mgr->usb_driver_obj); @@ -91,7 +99,7 @@ } BOOLEAN -mouse_connect(PCONNECT_DATA param, DEV_HANDLE dev_handle) +mouse_connect(PDEV_CONNECT_DATA param, DEV_HANDLE dev_handle) { PURB purb; NTSTATUS status; @@ -219,7 +227,7 @@ mouse_irq(PURB purb, PVOID pcontext) { MOUSE_INPUT_DATA MouseInputData; - //ULONG InputDataConsumed; + ULONG InputDataConsumed; NTSTATUS status; PMOUSE_DRVR_EXTENSION pdev_ext = (PMOUSE_DRVR_EXTENSION)pcontext; signed char *data = pdev_ext->mouse_data; @@ -275,18 +283,18 @@ } // Commit the input data somewhere... - /*if (UsbPortInterface.MouseConnectData->ClassService) + if (MouseClassInformation.ClassService) { KIRQL OldIrql; KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - (*(PSERVICE_CALLBACK_ROUTINE)UsbPortInterface.MouseConnectData->ClassService)( - UsbPortInterface.MouseConnectData->ClassDeviceObject, + (*(PSERVICE_CALLBACK_ROUTINE)MouseClassInformation.ClassService)( + MouseClassInformation.ClassDeviceObject, &MouseInputData, (&MouseInputData)+1, &InputDataConsumed); KeLowerIrql(OldIrql); - }*/ + } // Save old button data pdev_ext->btn_old = data[0]; @@ -338,7 +346,7 @@ NTSTATUS MouseDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - //NTSTATUS Status = STATUS_INVALID_DEVICE_REQUEST; + NTSTATUS Status = STATUS_INVALID_DEVICE_REQUEST; usb_dbg_print(DBGLVL_MAXIMUM, ("MouseDispatch(DO %p, code 0x%lx) called\n", DeviceObject, @@ -356,7 +364,7 @@ { case IOCTL_INTERNAL_KEYBOARD_CONNECT: DPRINT("IOCTL_INTERNAL_KEYBOARD_CONNECT\n"); - if (Stk->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) { + if (Stk->Parameters.DeviceIoControl.InputBufferLength < sizeof(DEV_CONNECT_DATA)) { DPRINT1("Keyboard IOCTL_INTERNAL_KEYBOARD_CONNECT " "invalid buffer size\n"); Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; @@ -365,7 +373,7 @@ RtlCopyMemory(&KbdClassInformation, Stk->Parameters.DeviceIoControl.Type3InputBuffer, - sizeof(CONNECT_DATA)); + sizeof(DEV_CONNECT_DATA)); Irp->IoStatus.Status = STATUS_SUCCESS; break; @@ -484,7 +492,9 @@ intcontfailure: Status = Irp->IoStatus.Status; } - else if (DeviceObject == MouseFdo) + else +#endif + if (DeviceObject == MouseFdo) { // it's mouse's IOCTL PIO_STACK_LOCATION Stk; @@ -495,10 +505,10 @@ switch (Stk->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_INTERNAL_MOUSE_CONNECT: - DPRINT("IOCTL_INTERNAL_MOUSE_CONNECT\n"); + usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_INTERNAL_MOUSE_CONNECT\n")); if (Stk->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) { - DPRINT1("IOCTL_INTERNAL_MOUSE_CONNECT: " - "invalid buffer size\n"); + usb_dbg_print(DBGLVL_MINIMUM, ("IOCTL_INTERNAL_MOUSE_CONNECT: " + "invalid buffer size\n")); Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; goto intcontfailure2; } @@ -517,28 +527,16 @@ intcontfailure2: Status = Irp->IoStatus.Status; } - else - { - return UsbMpPdoInternalDeviceControlCore(DeviceObject, Irp); - } - - - if (Status == STATUS_INVALID_DEVICE_REQUEST) { - DPRINT1("Invalid internal device request!\n"); + + if (Status == STATUS_INVALID_DEVICE_REQUEST) + { + usb_dbg_print(DBGLVL_MINIMUM, ("Invalid internal device request!\n")); } if (Status != STATUS_PENDING) IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; - -#endif - - // Default handler - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_SUPPORTED; } NTSTATUS @@ -571,7 +569,7 @@ goto cleanup; } - Status = ZwSetValueKey(hPortKey, DeviceName, 0, REG_SZ, (PVOID)RegistryPath, wcslen(RegistryPath) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + Status = ZwSetValueKey(hPortKey, DeviceName, 0, REG_SZ, (PVOID)RegistryPath, (ULONG)(wcslen(RegistryPath) * sizeof(WCHAR) + sizeof(UNICODE_NULL))); if (!NT_SUCCESS(Status)) { usb_dbg_print(DBGLVL_MINIMUM, ("ZwSetValueKey() failed with status 0x%08lx\n", Status)); Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Tue Oct 3 01:23:41 2006 @@ -128,7 +128,7 @@ extern VOID rh_timer_svc_int_completion(PUSB_DEV dev, PVOID context); -ULONG debug_level = DBGLVL_MAXIMUM; +ULONG debug_level = DBGLVL_MINIMUM;//DBGLVL_MAXIMUM; PDRIVER_OBJECT usb_driver_obj = NULL; extern USB_DEV_MANAGER g_dev_mgr; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c Tue Oct 3 01:23:41 2006 @@ -65,7 +65,7 @@ VOID NTAPI umss_start_io(IN PDEVICE_OBJECT dev_obj, IN PIRP irp); NTSTATUS umss_port_dispatch_routine(PDEVICE_OBJECT pdev_obj, PIRP irp); -BOOLEAN umss_connect(PCONNECT_DATA dev_mgr, DEV_HANDLE dev_handle); +BOOLEAN umss_connect(PDEV_CONNECT_DATA dev_mgr, DEV_HANDLE dev_handle); BOOLEAN umss_disconnect(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); BOOLEAN umss_stop(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); NTSTATUS umss_dispatch_routine(PDEVICE_OBJECT pdev_obj, PIRP irp); @@ -384,7 +384,7 @@ } BOOLEAN -umss_connect(PCONNECT_DATA param, DEV_HANDLE dev_handle) +umss_connect(PDEV_CONNECT_DATA param, DEV_HANDLE dev_handle) { PURB purb; NTSTATUS status; @@ -1475,7 +1475,7 @@ } BOOLEAN -umss_if_connect(PCONNECT_DATA params, DEV_HANDLE if_handle) +umss_if_connect(PDEV_CONNECT_DATA params, DEV_HANDLE if_handle) { PURB purb; LONG if_idx, i;

18 years, 1 month

[hpoussin] 24368: Disable keyboard and mouse before checking the i8042 controller. Flush queue before enabling them

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Oct 3 01:14:40 2006 New Revision: 24368 URL: http://svn.reactos.org/svn/reactos?rev=24368&view=rev Log: Disable keyboard and mouse before checking the i8042 controller. Flush queue before enabling them Modified: trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c Tue Oct 3 01:14:40 2006 @@ -80,30 +80,30 @@ NTSTATUS Status; UCHAR Value = 0; - i8042Flush(DeviceExtension); - - if (!i8042Write(DeviceExtension, DeviceExtension->ControlPort, CTRL_SELF_TEST)) - { - DPRINT1("Writing CTRL_SELF_TEST command failed\n"); - return STATUS_IO_TIMEOUT; - } - - Status = i8042ReadDataWait(DeviceExtension, &Value); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to read CTRL_SELF_TEST response, status 0x%08lx\n", Status); - return Status; - } - - if (Value != 0x55) - { - DPRINT1("Got 0x%02x instead of 0x55\n", Value); - return STATUS_IO_DEVICE_ERROR; - } - /* Don't enable keyboard and mouse interrupts, disable keyboard/mouse */ if (!i8042ChangeMode(DeviceExtension, CCB_KBD_INT_ENAB | CCB_MOUSE_INT_ENAB, CCB_KBD_DISAB | CCB_MOUSE_DISAB)) return STATUS_IO_DEVICE_ERROR; + + i8042Flush(DeviceExtension); + + if (!i8042Write(DeviceExtension, DeviceExtension->ControlPort, CTRL_SELF_TEST)) + { + DPRINT1("Writing CTRL_SELF_TEST command failed\n"); + return STATUS_IO_TIMEOUT; + } + + Status = i8042ReadDataWait(DeviceExtension, &Value); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to read CTRL_SELF_TEST response, status 0x%08lx\n", Status); + return Status; + } + + if (Value != 0x55) + { + DPRINT1("Got 0x%02x instead of 0x55\n", Value); + return STATUS_IO_DEVICE_ERROR; + } /* * We used to send a KBD_LINE_TEST (0xAB) command here, but on at least HP @@ -131,11 +131,6 @@ IN PPORT_DEVICE_EXTENSION DeviceExtension) { NTSTATUS Status; - - if (!i8042ChangeMode(DeviceExtension, 0, CCB_KBD_DISAB)) - return FALSE; - - i8042Flush(DeviceExtension); /* Set LEDs (that is not fatal if some error occurs) */ Status = i8042SynchWritePort(DeviceExtension, 0, KBD_CMD_SET_LEDS, TRUE); @@ -332,6 +327,8 @@ { UCHAR FlagsToDisable = 0; UCHAR FlagsToEnable = 0; + + i8042Flush(DeviceExtension); /* Select the devices we have */ if (DeviceExtension->Flags & KEYBOARD_PRESENT)

18 years, 1 month

[hpoussin] 24367: Fix 2 typos (spotted by Fireball)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Oct 2 23:36:14 2006 New Revision: 24367 URL: http://svn.reactos.org/svn/reactos?rev=24367&view=rev Log: Fix 2 typos (spotted by Fireball) Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c Mon Oct 2 23:36:14 2006 @@ -893,7 +893,7 @@ Status = IoGetDeviceObjectPointer(&PortName, FILE_READ_ATTRIBUTES, &FileObject, &PortDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT("IoGetDeviceObjectPointer(%wZ) failed with status 0x%08lx\n", Status); + DPRINT("IoGetDeviceObjectPointer(%wZ) failed with status 0x%08lx\n", &PortName, Status); continue; } DPRINT("Legacy driver found: %wZ\n", &PortDeviceObject->DriverObject->DriverName); Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c Mon Oct 2 23:36:14 2006 @@ -869,7 +869,7 @@ Status = IoGetDeviceObjectPointer(&PortName, FILE_READ_ATTRIBUTES, &FileObject, &PortDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT("IoGetDeviceObjectPointer(%wZ) failed with status 0x%08lx\n", Status); + DPRINT("IoGetDeviceObjectPointer(%wZ) failed with status 0x%08lx\n", &PortName, Status); continue; } DPRINT("Legacy driver found: %wZ\n", &PortDeviceObject->DriverObject->DriverName);

18 years, 1 month

[gedmurphy] 24366: - display system RAM on the general page. - fixes bug 1835

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Oct 2 22:51:31 2006 New Revision: 24366 URL: http://svn.reactos.org/svn/reactos?rev=24366&view=rev Log: - display system RAM on the general page. - fixes bug 1835 Modified: trunk/reactos/dll/cpl/sysdm/general.c trunk/reactos/dll/cpl/sysdm/precomp.h Modified: trunk/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/general.c (original) +++ trunk/reactos/dll/cpl/sysdm/general.c Mon Oct 2 22:51:31 2006 @@ -70,12 +70,32 @@ } -DWORD WINAPI +static VOID GetSystemInformation(HWND hwnd) { - UNREFERENCED_PARAMETER(hwnd); + MEMORYSTATUS MemStat; + TCHAR Buf[32]; + INT Ret = 0; - return 0; + /* Get total physical RAM */ + MemStat.dwLength = sizeof(MemStat); + GlobalMemoryStatus(&MemStat); + + if (MemStat.dwTotalPhys < KB_DIV) + Ret = wsprintf(Buf, _T("%luKB of RAM"), MemStat.dwTotalPhys/1024); + else if (MemStat.dwTotalPhys >= KB_DIV && MemStat.dwTotalPhys < GB_DIV) + Ret = wsprintf(Buf, _T("%luMB of RAM"), MemStat.dwTotalPhys/1048576); + else if (MemStat.dwTotalPhys > GB_DIV) + Ret = wsprintf(Buf, _T("%luGB of RAM"), MemStat.dwTotalPhys/1073741824); + + if (Ret) + { + SendDlgItemMessage(hwnd, + IDC_SYSTEMMEMORY, + WM_SETTEXT, + 0, + (LPARAM)Buf); + } } @@ -97,7 +117,7 @@ { HWND hLink = GetDlgItem(hwndDlg, IDC_ROSHOMEPAGE_LINK); - TextToLink(hLink, + TextToLink(hLink, _T("http://www.reactos.org"), NULL); Modified: trunk/reactos/dll/cpl/sysdm/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/precomp.h?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/precomp.h (original) +++ trunk/reactos/dll/cpl/sysdm/precomp.h Mon Oct 2 22:51:31 2006 @@ -11,6 +11,9 @@ #include "resource.h" #define NUM_APPLETS (1) +#define KB_DIV 1024 +#define MB_DIV 1048576 +#define GB_DIV 1.0737e9 typedef LONG (CALLBACK *APPLET_INITPROC)(VOID);

18 years, 1 month

[hpoussin] 24365: Implement CMP_WaitNoPendingInstallEvents Wait for Pnp manager to finish its job before displaying the 2nd stage setup Thanks Filip for his precious help on the umpnpmgr.exe side (not thread-safe as Single linked list functions are not implemented in ntdll)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Oct 2 22:46:39 2006 New Revision: 24365 URL: http://svn.reactos.org/svn/reactos?rev=24365&view=rev Log: Implement CMP_WaitNoPendingInstallEvents Wait for Pnp manager to finish its job before displaying the 2nd stage setup Thanks Filip for his precious help on the umpnpmgr.exe side (not thread-safe as Single linked list functions are not implemented in ntdll) Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/syssetup/install.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 (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Mon Oct 2 22:46:39 2006 @@ -26,6 +26,7 @@ */ /* INCLUDES *****************************************************************/ +//#define HAVE_SLIST_ENTRY_IMPLEMENTED #define WIN32_NO_STATUS #include <windows.h> #include <cmtypes.h> @@ -61,7 +62,24 @@ static HANDLE hUserToken = NULL; static HANDLE hInstallEvent = NULL; - +static HANDLE hNoPendingInstalls = NULL; + +#ifdef HAVE_SLIST_ENTRY_IMPLEMENTED +static SLIST_HEADER DeviceInstallListHead; +#else +static LIST_ENTRY DeviceInstallListHead; +#endif +static HANDLE hDeviceInstallListNotEmpty; + +typedef struct +{ +#ifdef HAVE_SLIST_ENTRY_IMPLEMENTED + SLIST_ENTRY ListEntry; +#else + LIST_ENTRY ListEntry; +#endif + WCHAR DeviceIds[1]; +} DeviceInstallParams; /* FUNCTIONS *****************************************************************/ @@ -1437,6 +1455,51 @@ } +/* Loop to install all queued devices installations */ +static DWORD WINAPI +DeviceInstallThread(LPVOID lpParameter) +{ +#ifdef HAVE_SLIST_ENTRY_IMPLEMENTED + PSLIST_ENTRY ListEntry; +#else + PLIST_ENTRY ListEntry; +#endif + DeviceInstallParams* Params; + BOOL setupActive; + + setupActive = SetupIsActive(); + + SetEnvironmentVariable(L"USERPROFILE", L"."); /* FIXME: why is it needed? */ + + while (TRUE) + { +#ifdef HAVE_SLIST_ENTRY_IMPLEMENTED + ListEntry = InterlockedPopEntrySList(&DeviceInstallListHead); +#else + if (IsListEmpty(&DeviceInstallListHead)) + ListEntry = NULL; + else + ListEntry = RemoveHeadList(&DeviceInstallListHead); +#endif + if (ListEntry == NULL) + { + SetEvent(hNoPendingInstalls); + DPRINT1("*** EVENT SETTED\n"); + WaitForSingleObject(hDeviceInstallListNotEmpty, INFINITE); + } + else + { + ResetEvent(hNoPendingInstalls); + DPRINT1("*** EVENT RESETTED\n"); + Params = CONTAINING_RECORD(ListEntry, DeviceInstallParams, ListEntry); + InstallDevice(Params->DeviceIds, setupActive); + } + } + + return 0; +} + + static DWORD WINAPI PnpEventThread(LPVOID lpParameter) { @@ -1444,14 +1507,11 @@ ULONG PnpEventSize; NTSTATUS Status; RPC_STATUS RpcStatus; - BOOL setupActive; PnpEventSize = 0x1000; PnpEvent = HeapAlloc(GetProcessHeap(), 0, PnpEventSize); if (PnpEvent == NULL) return ERROR_OUTOFMEMORY; - - setupActive = SetupIsActive(); for (;;) { @@ -1476,19 +1536,35 @@ break; } + /* Process the pnp event */ DPRINT("Received PnP Event\n"); if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) { + DeviceInstallParams* Params; + DWORD len; + DPRINT("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); - InstallDevice(PnpEvent->TargetDevice.DeviceIds, setupActive); + + /* Queue device install (will be dequeued by DeviceInstallThread */ + len = FIELD_OFFSET(DeviceInstallParams, DeviceIds) + + wcslen(PnpEvent->TargetDevice.DeviceIds) * sizeof(WCHAR) + sizeof(UNICODE_NULL); + Params = HeapAlloc(GetProcessHeap(), 0, len); + if (Params) + { + wcscpy(Params->DeviceIds, PnpEvent->TargetDevice.DeviceIds); +#ifdef HAVE_SLIST_ENTRY_IMPLEMENTED + InterlockedPushEntrySList(&DeviceInstallListHead, &Params->ListEntry); +#else + InsertTailList(&DeviceInstallListHead, &Params->ListEntry); +#endif + SetEvent(hDeviceInstallListNotEmpty); + } } else { DPRINT1("Unknown event\n"); } - /* FIXME: Process the pnp event */ - /* Dequeue the current pnp event and signal the next one */ NtPlugPlayControl(PlugPlayControlUserResponse, NULL, 0); } @@ -1506,6 +1582,11 @@ DWORD dwThreadId; DPRINT("ServiceMain() called\n"); + + hNoPendingInstalls = CreateEventW(NULL, + TRUE, + FALSE, + L"Global\\PnP_No_Pending_Install_Events"); hThread = CreateThread(NULL, 0, @@ -1518,6 +1599,15 @@ hThread = CreateThread(NULL, 0, + DeviceInstallThread, + NULL, + 0, + &dwThreadId); + if (hThread != NULL) + CloseHandle(hThread); + + hThread = CreateThread(NULL, + 0, RpcServerThread, NULL, 0, @@ -1544,6 +1634,20 @@ return dwError; } + hDeviceInstallListNotEmpty = CreateEvent(NULL, FALSE, FALSE, NULL); + if (hDeviceInstallListNotEmpty == NULL) + { + dwError = GetLastError(); + DPRINT1("Could not create the Event! (Error %lu)\n", dwError); + return dwError; + } + +#ifdef HAVE_SLIST_ENTRY_IMPLEMENTED + InitializeSListHead(&DeviceInstallListHead); +#else + InitializeListHead(&DeviceInstallListHead); +#endif + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Enum", 0, Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Mon Oct 2 22:46:39 2006 @@ -73,6 +73,25 @@ RpcStringFree(&lpString); return TRUE; +} + + +/*********************************************************************** + * CMP_WaitNoPendingInstallEvents [SETUPAPI.@] + */ +DWORD WINAPI CMP_WaitNoPendingInstallEvents( + DWORD dwTimeout) +{ + HANDLE hEvent; + DWORD ret; + + hEvent = OpenEventW(SYNCHRONIZE, FALSE, L"Global\\PnP_No_Pending_Install_Events"); + if (hEvent == NULL) + return WAIT_FAILED; + + ret = WaitForSingleObject(hEvent, dwTimeout); + CloseHandle(hEvent); + return ret; } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Mon Oct 2 22:46:39 2006 @@ -7,7 +7,7 @@ @ stub CMP_RegisterNotification @ stdcall CMP_Report_LogOn(long long) @ stub CMP_UnregisterNotification -@ stub CMP_WaitNoPendingInstallEvents +@ stdcall CMP_WaitNoPendingInstallEvents(long) @ stub CMP_WaitServicesAvailable @ stdcall CM_Add_Empty_Log_Conf(ptr ptr long long) @ stdcall CM_Add_Empty_Log_Conf_Ex(ptr ptr long long ptr) Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Mon Oct 2 22:46:39 2006 @@ -49,6 +49,8 @@ #include "globals.h" #include "resource.h" +DWORD WINAPI +CMP_WaitNoPendingInstallEvents(DWORD dwTimeout); /* GLOBALS ******************************************************************/ @@ -656,6 +658,12 @@ return 0; } + if (CMP_WaitNoPendingInstallEvents(INFINITE) != WAIT_OBJECT_0) + { + DebugPrint("CMP_WaitNoPendingInstallEvents() failed!\n"); + return 0; + } + InstallWizard(); SetupCloseInfFile(hSysSetupInf);

18 years, 1 month

[gedmurphy] 24364: - Only call SetupDiGetClassDevs once for each class, this makes load time 3 times faster although I'm still not happy with it. We may have to enumerate the drivers in the background. - use UINT for 1 bit flags, reduce the width a little and check the menu.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Oct 2 22:14:58 2006 New Revision: 24364 URL: http://svn.reactos.org/svn/reactos?rev=24364&view=rev Log: - Only call SetupDiGetClassDevs once for each class, this makes load time 3 times faster although I'm still not happy with it. We may have to enumerate the drivers in the background. - use UINT for 1 bit flags, reduce the width a little and check the menu. Modified: trunk/reactos/base/applications/devmgmt/En.rc trunk/reactos/base/applications/devmgmt/enumdevices.c trunk/reactos/base/applications/devmgmt/mainwnd.c trunk/reactos/base/applications/devmgmt/precomp.h trunk/reactos/base/applications/devmgmt/resource.h Modified: trunk/reactos/base/applications/devmgmt/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/En.rc (original) +++ trunk/reactos/base/applications/devmgmt/En.rc Mon Oct 2 22:14:58 2006 @@ -14,7 +14,7 @@ END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_STATIC + MENUITEM "Devices by type", IDC_DEVBYTYPE, CHECKED MENUITEM "Devices by connection", IDC_STATIC, GRAYED MENUITEM "Resources by type", IDC_STATIC, GRAYED MENUITEM "Resources by connection", IDC_STATIC, GRAYED Modified: trunk/reactos/base/applications/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/enumdevices.c (original) +++ trunk/reactos/base/applications/devmgmt/enumdevices.c Mon Oct 2 22:14:58 2006 @@ -9,8 +9,9 @@ #include "precomp.h" -SP_CLASSIMAGELIST_DATA ImageListData; - + +static SP_CLASSIMAGELIST_DATA ImageListData; +static HDEVINFO hDevInfo; static HTREEITEM InsertIntoTreeView(HWND hTV, @@ -60,7 +61,10 @@ { /* all classes enumerated */ if(Ret == CR_NO_SUCH_VALUE) + { + hDevInfo = NULL; return -1; + } if (Ret == CR_INVALID_DATA) ; /*FIXME: what should we do here? */ @@ -84,18 +88,23 @@ &ClassGuid, ClassImage)) { - /* set the blank icon */ + /* FIXME: can we do this? + * Set the blank icon: IDI_SETUPAPI_BLANK = 41 + * it'll be image 24 in the imagelist */ *ClassImage = 41; } - /* FIXME: do we need this? + /* Get device info for all devices of a particular class */ hDevInfo = SetupDiGetClassDevs(&ClassGuid, 0, NULL, DIGCF_PRESENT); if (hDevInfo == INVALID_HANDLE_VALUE) + { + hDevInfo = NULL; return 0; - */ + } + KeyClass = SetupDiOpenClassRegKeyEx(&ClassGuid, MAXIMUM_ALLOWED, @@ -120,9 +129,6 @@ return -3; } - /* FIXME: see above? - SetupDiDestroyDeviceInfoList(hDevInfo); */ - *DevPresent = TRUE; RegCloseKey(KeyClass); @@ -136,7 +142,6 @@ TCHAR* DeviceClassName, TCHAR* DeviceName) { - HDEVINFO hDevInfo; SP_DEVINFO_DATA DeviceInfoData; DWORD RequiredSize = 0; GUID *guids = NULL; @@ -172,13 +177,6 @@ } } -//TimerInfo(_T("IN")); - /* get device info set for our device class */ - hDevInfo = SetupDiGetClassDevs(guids, - 0, - NULL, - DIGCF_PRESENT); -//TimerInfo(_T("OUT")); HeapFree(GetProcessHeap(), 0, guids); if(hDevInfo == INVALID_HANDLE_VALUE) { @@ -198,8 +196,7 @@ if (!bRet) { - //no such device: - SetupDiDestroyDeviceInfoList(hDevInfo); + /* no such device */ return -1; } @@ -223,7 +220,6 @@ if (!bRet) { /* if the description fails, just give up! */ - SetupDiDestroyDeviceInfoList(hDevInfo); return -5; } } @@ -289,6 +285,13 @@ } while (Ret != -1); + /* kill InfoList initialized in EnumDeviceClasses */ + if (hDevInfo) + { + SetupDiDestroyDeviceInfoList(hDevInfo); + hDevInfo = NULL; + } + if (!TreeView_GetChild(Info->hTreeView, hDevItem)) { Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/mainwnd.c (original) +++ trunk/reactos/base/applications/devmgmt/mainwnd.c Mon Oct 2 22:14:58 2006 @@ -546,7 +546,7 @@ WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, CW_USEDEFAULT, CW_USEDEFAULT, - 650, + 600, 450, NULL, NULL, Modified: trunk/reactos/base/applications/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/precomp.h (original) +++ trunk/reactos/base/applications/devmgmt/precomp.h Mon Oct 2 22:14:58 2006 @@ -28,7 +28,7 @@ int nCmdShow; /* status flags */ - BOOL InMenuLoop : 1; + UINT InMenuLoop : 1; } MAIN_WND_INFO, *PMAIN_WND_INFO; Modified: trunk/reactos/base/applications/devmgmt/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/resource.h (original) +++ trunk/reactos/base/applications/devmgmt/resource.h Mon Oct 2 22:14:58 2006 @@ -19,6 +19,7 @@ /* menus */ #define IDR_MAINMENU 102 #define IDR_POPUP 103 +#define IDC_DEVBYTYPE 104 /* tooltips */ #define IDS_TOOLTIP_PROP 6000

18 years, 1 month

← Newer
1
...
29
30
31
32
33
34
35
36
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 October 2006