Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[hpoussin] 18091: Update .inf files
by hpoussin＠svn.reactos.com 26 Sep '05

26 Sep '05

Update .inf files Modified: trunk/reactos/media/inf/mouse.inf Modified: trunk/reactos/media/inf/ports.inf Modified: trunk/reactos/media/inf/usbport.inf _____ Modified: trunk/reactos/media/inf/mouse.inf --- trunk/reactos/media/inf/mouse.inf 2005-09-26 11:43:14 UTC (rev 18090) +++ trunk/reactos/media/inf/mouse.inf 2005-09-26 12:05:27 UTC (rev 18091) @@ -25,13 +25,18 @@ [Manufacturer] %StdMfg% = StdMfg +%IbmMfg% = IbmMfg %LogMfg% = LogMfg %MSMfg% = MSMfg [StdMfg] %SERIAL_MOUSE.DeviceDesc% = Serial_Inst,*PNP0F0C,SERENUM\PNP0F0C,*PNP0F17,SERENUM\PNP0F17,SERIAL_MOU SE %PS2_MOUSE.DeviceDesc% = PS2_Inst,*PNP0F0E,*PNP0F19,PS2_MOUSE +%HID_MOUSE.DeviceDesc% = HID_Inst,HID_DEVICE_SYSTEM_MOUSE +[IbmMfg] +*IBM3780.DeviceDesc = PS2_Inst,*IBM3780 + [LogMfg] %*PNP0F08.DeviceDesc% = Serial_Inst,*PNP0F08,SERENUM\PNP0F08 %*PNP0F12.DeviceDesc% = PS2_Inst,*PNP0F12 @@ -97,31 +102,44 @@ HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSys Rq",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","MouseResol ution",0x00010001,0x00000003 +;---------------------------- HID MOUSE DRIVER -------------------------- + +[HID_Inst.NT] +CopyFiles = HID_CopyFiles, Mouclass_CopyFiles + +[HID_CopyFiles] +mouhid.sys + +[HID_Inst.NT.Services] +AddService = mouhid, 0x00000002, mouhid_Service_Inst +AddService = mouclass, , mouclass_Service_Inst + +[mouhid_Service_Inst] +ServiceType = 1 +StartType = 3 +ErrorControl = 0 +ServiceBinary = %12%\mouhid.sys +LoadOrderGroup = Pointer Port + ;-------------------------------- STRINGS ------------------------------- [Strings] ReactOS = "ReactOS Team" MouseClassName = "Mice and other pointing devices" + StdMfg = "(Standard mice)" +SERIAL_MOUSE.DeviceDesc = "Standard Serial Mouse" +PS2_MOUSE.DeviceDesc = "Standard PS/2 Mouse" +HID_MOUSE.DeviceDesc = "HID Mouse" + +IbmMfg = "IBM" +*IBM3780.DeviceDesc = "IBM PS/2 Trackpoint" + LogMfg = "Logitech" -MSMfg = "Microsoft" +*PNP0F08.DeviceDesc = "Logitech Serial Mouse" +*PNP0F12.DeviceDesc = "Logitech PS/2-style Mouse" +MSMfg = "Microsoft" *PNP0F01.DeviceDesc = "Microsoft Serial Mouse" *PNP0F03.DeviceDesc = "Microsoft PS/2-style Mouse" -*PNP0F08.DeviceDesc = "Logitech Serial Mouse" -*PNP0F12.DeviceDesc = "Logitech PS/2-style Mouse" *PNP0F13.DeviceDesc = "PS/2 port for PS/2-style mice" -SERIAL_MOUSE.DeviceDesc = "Standard Serial Mouse" -PS2_MOUSE.DeviceDesc = "Standard PS/2 Mouse" - -[String.040c] -MouseClassName = "Souris et autres dispositifs de pointage" -StdMfg = "(Souris standard)" - -*PNP0F01.DeviceDesc = "Souris Microsoft sur port sÚrie" -*PNP0F03.DeviceDesc = "Souris Microsoft sur port PS/2" -*PNP0F08.DeviceDesc = "Souris Logitech sur port sÚrie" -*PNP0F12.DeviceDesc = "Souris Logitech sur port PS/2" -*PNP0F13.DeviceDesc = "Souris compatible PS/2" -SERIAL_MOUSE.DeviceDesc = "Souris standard sur port sÚrie" -PS2_MOUSE.DeviceDesc = "Souris standard sur port PS/2" \ No newline at end of file _____ Modified: trunk/reactos/media/inf/ports.inf --- trunk/reactos/media/inf/ports.inf 2005-09-26 11:43:14 UTC (rev 18090) +++ trunk/reactos/media/inf/ports.inf 2005-09-26 12:05:27 UTC (rev 18091) @@ -61,14 +61,7 @@ [Strings] ReactOS = "ReactOS Team" PortsClassName = "Serial and parallel ports" -StdMfg = "(Standard ports)" +StdMfg = "(Standard ports)" *PNP0500.DeviceDesc = "Serial communication port" *PNP0501.DeviceDesc = "Serial communication port" - -[String.040c] -PortsClassName = "Ports (SÚrie et parallÞle)" -StdMfg = "(Ports standard)" - -*PNP0500.DeviceDesc = "Port de communication sÚrie" -*PNP0501.DeviceDesc = "Port de communication sÚrie" \ No newline at end of file _____ Modified: trunk/reactos/media/inf/usbport.inf --- trunk/reactos/media/inf/usbport.inf 2005-09-26 11:43:14 UTC (rev 18090) +++ trunk/reactos/media/inf/usbport.inf 2005-09-26 12:05:27 UTC (rev 18091) @@ -39,7 +39,7 @@ ;------------------------------ UHCI DRIVER ----------------------------- [UHCI_Inst.NT] -CopyFiles = UHCI_CopyFiles +CopyFiles = UHCI_CopyFiles.NT [UHCI_CopyFiles.NT] usbport.sys @@ -58,7 +58,7 @@ ;------------------------------ OHCI DRIVER ----------------------------- [OHCI_Inst.NT] -CopyFiles = OHCI_CopyFiles +CopyFiles = OHCI_CopyFiles.NT [OHCI_CopyFiles.NT] usbport.sys @@ -77,7 +77,7 @@ ;------------------------------ EHCI DRIVER ----------------------------- [EHCI_Inst.NT] -CopyFiles = EHCI_CopyFiles +CopyFiles = EHCI_CopyFiles.NT [EHCI_CopyFiles.NT] usbport.sys @@ -96,7 +96,7 @@ ;---------------------------- ROOT HUB DRIVER --------------------------- [RootHub_Inst.NT] -CopyFiles = RootHub_CopyFiles +CopyFiles = RootHub_CopyFiles.NT [RootHub_CopyFiles.NT] usbport.sys

1 0

[hpoussin] 18090: Fix signedness (SetupGetIntField takes a PINT argument, not a PUINT one)
by hpoussin＠svn.reactos.com 26 Sep '05

26 Sep '05

Fix signedness (SetupGetIntField takes a PINT argument, not a PUINT one) Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-09-26 11:39:24 UTC (rev 18089) +++ trunk/reactos/lib/setupapi/devinst.c 2005-09-26 11:43:14 UTC (rev 18090) @@ -4385,7 +4385,7 @@ DWORD SectionNameLength = 0; BOOL Result = FALSE; INFCONTEXT ContextService; - UINT Flags; + INT Flags; DWORD RequiredSize; HINF hInf = NULL; LPCWSTR AssociatedService = NULL;

1 0

[hpoussin] 18089: Implement parts of SetupDiInstallDevice
by hpoussin＠svn.reactos.com 26 Sep '05

26 Sep '05

Implement parts of SetupDiInstallDevice Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-09-26 11:37:32 UTC (rev 18088) +++ trunk/reactos/lib/setupapi/devinst.c 2005-09-26 11:39:24 UTC (rev 18089) @@ -4377,22 +4377,227 @@ IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData) { + struct DriverInfoElement *DriverInfo; + struct DeviceInfoSet *DevInfoSet = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfoElement *DevInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + SYSTEMTIME DriverDate; + WCHAR SectionName[MAX_PATH]; + DWORD SectionNameLength = 0; + BOOL Result = FALSE; + INFCONTEXT ContextService; + UINT Flags; + DWORD RequiredSize; + HINF hInf = NULL; + LPCWSTR AssociatedService = NULL; + BOOL RebootRequired = FALSE; + HKEY hEnumKey, hKey; + LONG rc; + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); - /* Steps to follow: - * 0. If DI_FLAGSEX_SETFAILEDINSTALL is set, set FAILEDINSTALL flag in ConfigFlags registry and exit - * 1. Create driver key and write InfPath and ProviderName - * 2a Process inf sections: {DDInstall}, {DDInstall}.HW [SetupDiOpenDevRegKey] - * b Process {DDInstall}.LogConfigOverride if present [SetupDiOpenDevRegKey] - * c Process {DDInstall}.Services [SetupDiOpenDevRegKey] - * 3. Copy inf file to Inf\ directory [SetupCopyOEMInf] - * 4. Install other waiting files - * 5. Load the driver/Call AddDevice - * 6. Send IRP_MN_START_DEVICE if DI_NEEDRESTART, DI_NEEDREBOOT and DI_DONOTCALLCONFIGMG are not set - */ + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + SetLastError(ERROR_INVALID_HANDLE); + else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (DeviceInfoData && ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->SelectedDriver == NULL) + SetLastError(ERROR_INVALID_PARAMETER); + else if (!DeviceInfoData && ((struct DeviceInfoSet *)DeviceInfoSet)->SelectedDriver == NULL) + SetLastError(ERROR_INVALID_PARAMETER); + else + Result = TRUE; - FIXME("SetupDiInstallDevice not implemented. Doing nothing\n"); - //SetLastError(ERROR_GEN_FAILURE); - //return FALSE; + if (!Result) + { + /* One parameter is bad */ + return FALSE; + } + + /* FIXME: If DI_FLAGSEX_SETFAILEDINSTALL is set, set FAILEDINSTALL flag in ConfigFlags registry and exit */ + + if (DeviceInfoData) + DriverInfo = ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->SelectedDriver; + else + DriverInfo = ((struct DeviceInfoSet *)DeviceInfoSet)->SelectedDriver; + FileTimeToSystemTime(&DriverInfo->Info.DriverDate, &DriverDate); + + hInf = SetupOpenInfFileW(DriverInfo->InfPath, NULL, INF_STYLE_WIN4, NULL); + if (hInf == INVALID_HANDLE_VALUE) + return FALSE; + + Result = SetupDiGetActualSectionToInstallW(hInf, DriverInfo->InfSection, + SectionName, MAX_PATH, &SectionNameLength, NULL); + if (!Result || SectionNameLength > MAX_PATH - 9) + { + SetupCloseInfFile(hInf); + return FALSE; + } + + /* Create driver key information */ + FIXME("FIXME: Create driver key information\n"); + + /* Write information to driver key */ + FIXME("FIXME: Write information to driver key\n"); + FIXME("DriverDate : '%u-%u-%u'\n", 0, DriverDate.wMonth, DriverDate.wDay, DriverDate.wYear); + FIXME("DriverDateData :"); { ULONG i; for (i = 0; i < sizeof(DriverInfo->Info.DriverDate); i++) DbgPrint(" %02x", ((PCHAR)&DriverInfo->Info.DriverDate)[i] & 0xff); } DbgPrint("\n"); + FIXME("DriverDesc : '%S'\n", DriverInfo->Info.Description); + FIXME("DriverVersion : '%u.%u.%u.%u'\n", DriverInfo->Info.DriverVersion & 0xff, (DriverInfo->Info.DriverVersion >> 8) & 0xff, (DriverInfo->Info.DriverVersion >> 16) & 0xff, (DriverInfo->Info.DriverVersion >> 24) & 0xff); + FIXME("InfPath : '%S'\n", DriverInfo->InfPath); + FIXME("InfSection : '%S'\n", DriverInfo->InfSection); /* FIXME: remove extension */ + FIXME("InfSectionExt : '%S'\n", L"???"); /* FIXME */ + FIXME("MatchingDeviceId: '%S'\n", L"???"); /* FIXME */ + FIXME("ProviderName : '%S'\n", DriverInfo->Info.ProviderName); + + /* Install services */ + wcscat(SectionName, L".Services"); + Result = SetupFindFirstLineW(hInf, SectionName, NULL, &ContextService); + while (Result) + { + LPWSTR ServiceName = NULL; + LPWSTR ServiceSection = NULL; + + Result = SetupGetStringFieldW( + &ContextService, + 1, /* Field index */ + NULL, 0, + &RequiredSize); + if (!Result) + goto cleanup; + if (RequiredSize > 0) + { + /* We got the needed size for the buffer */ + ServiceName = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); + if (!ServiceName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + Result = SetupGetStringFieldW( + &ContextService, + 1, /* Field index */ + ServiceName, RequiredSize, + &RequiredSize); + if (!Result) + goto cleanup; + } + Result = SetupGetIntField( + &ContextService, + 2, /* Field index */ + &Flags); + if (!Result) + { + /* The field may be empty. Ignore the error */ + Flags = 0; + } + Result = SetupGetStringFieldW( + &ContextService, + 3, /* Field index */ + NULL, 0, + &RequiredSize); + if (!Result) + goto cleanup; + if (RequiredSize > 0) + { + /* We got the needed size for the buffer */ + ServiceSection = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); + if (!ServiceSection) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + Result = SetupGetStringFieldW( + &ContextService, + 3, /* Field index */ + ServiceSection, RequiredSize, + &RequiredSize); + if (!Result) + goto cleanup; + } + SetLastError(ERROR_SUCCESS); + Result = SetupInstallServicesFromInfSectionExW(hInf, ServiceSection, Flags, DeviceInfoSet, DeviceInfoData, NULL, NULL); + if (Result && (Flags & SPSVCINST_ASSOCSERVICE)) + { + AssociatedService = ServiceName; + ServiceName = NULL; + if (GetLastError() == ERROR_SUCCESS_REBOOT_REQUIRED) + RebootRequired = TRUE; + } +cleanup: + HeapFree(GetProcessHeap(), 0, ServiceName); + HeapFree(GetProcessHeap(), 0, ServiceSection); + if (!Result) + { + HeapFree(GetProcessHeap(), 0, (LPWSTR)AssociatedService); + SetupCloseInfFile(hInf); + return FALSE; + } + Result = SetupFindNextLine(&ContextService, &ContextService); + } + + /* Copy .inf file to Inf\ directory */ + FIXME("FIXME: Copy .inf file to Inf\\ directory\n"); /* SetupCopyOEMInf */ + + /* Write information to enum key */ + rc = RegOpenKeyExW(DevInfoSet->HKLM, + EnumKeyName, + 0, + KEY_ENUMERATE_SUB_KEYS, + &hEnumKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + HeapFree(GetProcessHeap(), 0, (LPWSTR)AssociatedService); + SetupCloseInfFile(hInf); + return FALSE; + } + rc = RegOpenKeyExW( + hEnumKey, + DevInfo->DeviceName, + 0, /* Options */ + KEY_SET_VALUE, + &hKey); + RegCloseKey(hEnumKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + HeapFree(GetProcessHeap(), 0, (LPWSTR)AssociatedService); + SetupCloseInfFile(hInf); + return FALSE; + } + FIXME("FIXME: Write information to enum key\n"); + FIXME("ParentIdPrefix : '%S'\n", L"0000"); /* FIXME */ + //FIXME("Service : '%S'\n", AssociatedService); + FIXME("Class : '%S'\n", L"???"); /* FIXME: SetupDiGetINFClass */ + FIXME("ClassGUID : '%S'\n", L"???"); /* FIXME: SetupDiGetINFClass */ + //FIXME("DeviceDesc : '%S'\n", DriverInfo->Info.Description); + FIXME("Driver : '%S'\n", L"???"); /* FIXME: autogenerated key */ + //FIXME("Mfg : '%S'\n", DriverInfo->Info.MfgName); + rc = RegSetValueEx(hKey, L"Service", 0, REG_SZ, (const BYTE *)AssociatedService, (wcslen(AssociatedService) + 1) * sizeof(WCHAR)); + if (rc == ERROR_SUCCESS) + rc = RegSetValueEx(hKey, L"DeviceDesc", 0, REG_SZ, (const BYTE *)DriverInfo->Info.Description, (wcslen(DriverInfo->Info.Description) + 1) * sizeof(WCHAR)); + if (rc == ERROR_SUCCESS) + rc = RegSetValueEx(hKey, L"Mfg", 0, REG_SZ, (const BYTE *)DriverInfo->Info.MfgName, (wcslen(DriverInfo->Info.MfgName) + 1) * sizeof(WCHAR)); + RegCloseKey(hKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + HeapFree(GetProcessHeap(), 0, (LPWSTR)AssociatedService); + SetupCloseInfFile(hInf); + return FALSE; + } + + /* Load the driver/call AddDevice */ + FIXME("FIXME: Load the driver/call AddDevice\n"); + + /* Send IRP_MN_START_DEVICE if needed */ + //if (!RebootRequired && !(Flags & (DI_NEEDRESTART | DI_NEEDREBOOT | DI_DONOTCALLCONFIGMG))) + FIXME("FIXME: Send IRP_MN_START_DEVICE\n"); + + /* End of installation */ + HeapFree(GetProcessHeap(), 0, (LPWSTR)AssociatedService); + SetupCloseInfFile(hInf); return TRUE; }

1 0

[hpoussin] 18088: Implement SetupInstallServicesFromInfSectionA/W, SetupInstallServicesFromInfSectionExW
by hpoussin＠svn.reactos.com 26 Sep '05

26 Sep '05

Implement SetupInstallServicesFromInfSectionA/W, SetupInstallServicesFromInfSectionExW Add stub for SetupInstallServicesFromInfSectionExW Modified: trunk/reactos/lib/setupapi/install.c Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/lib/setupapi/stubs.c _____ Modified: trunk/reactos/lib/setupapi/install.c --- trunk/reactos/lib/setupapi/install.c 2005-09-26 11:35:23 UTC (rev 18087) +++ trunk/reactos/lib/setupapi/install.c 2005-09-26 11:37:32 UTC (rev 18088) @@ -953,3 +953,43 @@ RtlFreeUnicodeString( &cmdlineW ); } } + + +/********************************************************************** * + * SetupInstallServicesFromInfSectionA (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallServicesFromInfSectionA( HINF hinf, PCSTR sectionname, DWORD flags ) +{ + return SetupInstallServicesFromInfSectionExA( hinf, sectionname, flags, + NULL, NULL, NULL, NULL ); +} + + +/********************************************************************** * + * SetupInstallServicesFromInfSectionW (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallServicesFromInfSectionW( HINF hinf, PCWSTR sectionname, DWORD flags ) +{ + return SetupInstallServicesFromInfSectionExW( hinf, sectionname, flags, + NULL, NULL, NULL, NULL ); +} + + +/********************************************************************** * + * SetupInstallServicesFromInfSectionExA (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallServicesFromInfSectionExA( HINF hinf, PCSTR sectionname, DWORD flags, HDEVINFO devinfo, PSP_DEVINFO_DATA devinfo_data, PVOID reserved1, PVOID reserved2 ) +{ + UNICODE_STRING sectionnameW; + BOOL ret = FALSE; + + if (RtlCreateUnicodeStringFromAsciiz( &sectionnameW, sectionname )) + { + ret = SetupInstallServicesFromInfSectionExW( hinf, sectionnameW.Buffer, flags, devinfo, devinfo_data, reserved1, reserved2 ); + RtlFreeUnicodeString( &sectionnameW ); + } + else + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + + return ret; +} _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-09-26 11:35:23 UTC (rev 18087) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-09-26 11:37:32 UTC (rev 18088) @@ -437,10 +437,10 @@ @ stdcall SetupInstallFilesFromInfSectionW(long long long wstr wstr long) @ stdcall SetupInstallFromInfSectionA(long long str long long str long ptr ptr long ptr) @ stdcall SetupInstallFromInfSectionW(long long wstr long long wstr long ptr ptr long ptr) -@ stub SetupInstallServicesFromInfSectionA -@ stub SetupInstallServicesFromInfSectionExA -@ stub SetupInstallServicesFromInfSectionExW -@ stub SetupInstallServicesFromInfSectionW +@ stdcall SetupInstallServicesFromInfSectionA(long str long) +@ stdcall SetupInstallServicesFromInfSectionExA(long str long ptr ptr ptr ptr) +@ stdcall SetupInstallServicesFromInfSectionExW(long wstr long ptr ptr ptr ptr) +@ stdcall SetupInstallServicesFromInfSectionW(long wstr long) @ stdcall SetupIterateCabinetA(str long ptr ptr) @ stdcall SetupIterateCabinetW(wstr long ptr ptr) @ stub SetupLogErrorA _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-09-26 11:35:23 UTC (rev 18087) +++ trunk/reactos/lib/setupapi/stubs.c 2005-09-26 11:37:32 UTC (rev 18088) @@ -125,6 +125,15 @@ } /*********************************************************************** + * SetupInstallServicesFromInfSectionExW (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallServicesFromInfSectionExW( HINF hinf, PCWSTR sectionname, DWORD flags, HDEVINFO devinfo, PSP_DEVINFO_DATA devinfo_data, PVOID reserved1, PVOID reserved2 ) +{ + FIXME("Stub %p, %s, 0x%lx, %p, %p, %p, %p\n", hinf, debugstr_w(sectionname), flags, devinfo, devinfo_data, reserved1, reserved2); + return TRUE; +} + +/********************************************************************** * * SetupTerminateFileLog(SETUPAPI.@) */ BOOL WINAPI SetupTerminateFileLog(HANDLE FileLogHandle)

1 0

[weiden] 18087: copy the buffer to the right place in IntWriteConsoleOutput
by weiden＠svn.reactos.com 26 Sep '05

26 Sep '05

copy the buffer to the right place in IntWriteConsoleOutput Modified: trunk/reactos/lib/kernel32/misc/console.c _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-09-26 11:14:34 UTC (rev 18086) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-09-26 11:35:23 UTC (rev 18087) @@ -2013,7 +2013,7 @@ (PVOID*)&Request.Data.WriteConsoleOutputRequest.CharInfo); /* Copy from the buffer */ - RtlCopyMemory(&Request.Data.WriteConsoleOutputRequest.CharInfo, lpBuffer, Size); + RtlCopyMemory(Request.Data.WriteConsoleOutputRequest.CharInfo, lpBuffer, Size); /* Set up the data to send to the Console Server */ CsrRequest = MAKE_CSR_API(WRITE_CONSOLE_OUTPUT, CSR_CONSOLE);

1 0

[weiden] 18086: - fixed uninitialized variable warning
by weiden＠svn.reactos.com 26 Sep '05

26 Sep '05

- fixed uninitialized variable warning - fixed memory leak in SetupDiBuildDriverInfoList() Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-09-26 11:11:48 UTC (rev 18085) +++ trunk/reactos/lib/setupapi/devinst.c 2005-09-26 11:14:34 UTC (rev 18086) @@ -3454,7 +3454,9 @@ &RequiredSize); } //FIXME: DriverDate = Version.DriverVer => invalid date = 00/00/00 + RtlZeroMemory(DriverDate, sizeof(FILETIME)); //FIXME: DriverVersion = Version.DriverVer => invalid = 0 + *DriverVersion = 0; *pProviderName = ProviderName; return TRUE; @@ -3613,9 +3615,7 @@ /* Check if the ClassGuid in this .inf file is corresponding with our needs */ if (!IsEqualIID(&list->ClassGuid, &GUID_NULL) && !IsEqualIID(&list->ClassGuid, &ClassGuid)) { - SetupCloseInfFile(hInf); - hInf = INVALID_HANDLE_VALUE; - continue; + goto next; } } @@ -3766,9 +3766,11 @@ ManufacturerName = ManufacturerSection = NULL; Result = SetupFindNextLine(&ContextManufacturer, &ContextManufacturer); } + + ret = TRUE; +next: HeapFree(GetProcessHeap(), 0, ProviderName); ProviderName = NULL; - ret = TRUE; SetupCloseInfFile(hInf); hInf = INVALID_HANDLE_VALUE;

1 0

[weiden] 18085: fixed uninitialized variable warning
by weiden＠svn.reactos.com 26 Sep '05

26 Sep '05

fixed uninitialized variable warning Modified: trunk/reactos/lib/rtl/debug.c _____ Modified: trunk/reactos/lib/rtl/debug.c --- trunk/reactos/lib/rtl/debug.c 2005-09-26 11:10:27 UTC (rev 18084) +++ trunk/reactos/lib/rtl/debug.c 2005-09-26 11:11:48 UTC (rev 18085) @@ -256,6 +256,7 @@ va_list ap; /* Call the internal routine that also handles ControlC */ + va_start(ap, Format); return vDbgPrintExWithPrefixInternal(NULL, -1, DPFLTR_ERROR_LEVEL,

1 0

[weiden] 18084: don't copy the buffer to a random pointer in IntWriteConsoleOutput()
by weiden＠svn.reactos.com 26 Sep '05

26 Sep '05

don't copy the buffer to a random pointer in IntWriteConsoleOutput() Modified: trunk/reactos/lib/kernel32/misc/console.c _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-09-26 08:21:38 UTC (rev 18083) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-09-26 11:10:27 UTC (rev 18084) @@ -1999,7 +1999,6 @@ PCSR_CAPTURE_BUFFER CaptureBuffer; NTSTATUS Status; ULONG Size; - PVOID BufferTargetBase; Size = dwBufferSize.Y * dwBufferSize.X * sizeof(CHAR_INFO); @@ -2014,7 +2013,7 @@ (PVOID*)&Request.Data.WriteConsoleOutputRequest.CharInfo); /* Copy from the buffer */ - RtlCopyMemory(BufferTargetBase, lpBuffer, Size); + RtlCopyMemory(&Request.Data.WriteConsoleOutputRequest.CharInfo, lpBuffer, Size); /* Set up the data to send to the Console Server */ CsrRequest = MAKE_CSR_API(WRITE_CONSOLE_OUTPUT, CSR_CONSOLE);

1 0

[gvg] 18083: Silence some debug messages
by gvg＠svn.reactos.com 26 Sep '05

26 Sep '05

Silence some debug messages Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-09-26 07:43:55 UTC (rev 18082) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-09-26 08:21:38 UTC (rev 18083) @@ -273,7 +273,7 @@ */ if ((Apc->ApcMode != KernelMode) && (Apc->KernelRoutine == (PKKERNEL_ROUTINE)PsExitSpecialApc)) { - DPRINT1("Inserting the Thread Exit APC for '%.16s' into the Queue\n", ((PETHREAD)Thread)->ThreadsProcess->ImageFileName); + DPRINT("Inserting the Thread Exit APC for '%.16s' into the Queue\n", ((PETHREAD)Thread)->ThreadsProcess->ImageFileName); Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->UserApcPending = TRUE; InsertHeadList(&Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcLis tHead[(int)Apc->ApcMode], &Apc->ApcListEntry); _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-09-26 07:43:55 UTC (rev 18082) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-09-26 08:21:38 UTC (rev 18083) @@ -396,8 +396,8 @@ PVOID* SystemArgument1, PVOID* SystemArguemnt2) { - DPRINT1("PsExitSpecialApc called: 0x%x (proc: 0x%x, '%.16s')\n", - PsGetCurrentThread(), PsGetCurrentProcess(), PsGetCurrentProcess()->ImageFileName); + DPRINT("PsExitSpecialApc called: 0x%x (proc: 0x%x, '%.16s')\n", + PsGetCurrentThread(), PsGetCurrentProcess(), PsGetCurrentProcess()->ImageFileName); /* Don't do anything unless we are in User-Mode */ if (Apc->SystemArgument2) @@ -425,8 +425,8 @@ PETHREAD Thread = PsGetCurrentThread(); NTSTATUS ExitStatus; - DPRINT1("PspExitNormalApc called: 0x%x (proc: 0x%x, '%.16s')\n", - PsGetCurrentThread(), PsGetCurrentProcess(), PsGetCurrentProcess()->ImageFileName); + DPRINT("PspExitNormalApc called: 0x%x (proc: 0x%x, '%.16s')\n", + PsGetCurrentThread(), PsGetCurrentProcess(), PsGetCurrentProcess()->ImageFileName); /* This should never happen */ ASSERT(!SystemArgument2); @@ -446,7 +446,7 @@ } /* If we're here, this is not a System Thread, so kill it from User-Mode */ - DPRINT1("Initializing User-Mode APC\n"); + DPRINT("Initializing User-Mode APC\n"); KeInitializeApc(Apc, &Thread->Tcb, OriginalApcEnvironment,

1 0

[ion] 18082: - Fix a bug in CSR Capture APIs
by ion＠svn.reactos.com 26 Sep '05

26 Sep '05

- Fix a bug in CSR Capture APIs - Fix bugs in kernel32 console APIs. - These changes fix vim and fix bug 796 as I promised. Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/lib/ntdll/csr/capture.c Modified: trunk/reactos/lib/ntdll/csr/connect.c _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-09-26 05:41:35 UTC (rev 18081) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-09-26 07:43:55 UTC (rev 18082) @@ -1548,7 +1548,6 @@ CSR_API_MESSAGE Request; ULONG CsrRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; NTSTATUS Status; - PVOID BufferTargetBase; ULONG Size; if(lpBuffer == NULL) @@ -1560,38 +1559,38 @@ Size = nLength * sizeof(INPUT_RECORD); /* Allocate a Capture Buffer */ - DPRINT1("IntPeekConsoleInput: %lx %p\n", Size, lpNumberOfEventsRead); + DPRINT("IntPeekConsoleInput: %lx %p\n", Size, lpNumberOfEventsRead); CaptureBuffer = CsrAllocateCaptureBuffer(1, Size); /* Allocate space in the Buffer */ - CsrCaptureMessageBuffer(CaptureBuffer, NULL, Size, &BufferTargetBase); - DPRINT1("Allocated message buffer: %p %p\n", CaptureBuffer, BufferTargetBase); + CsrCaptureMessageBuffer(CaptureBuffer, + NULL, + Size, + (PVOID*)&Request.Data.PeekConsoleInputRequest.InputRecord); /* Set up the data to send to the Console Server */ CsrRequest = MAKE_CSR_API(PEEK_CONSOLE_INPUT, CSR_CONSOLE); Request.Data.PeekConsoleInputRequest.ConsoleHandle = hConsoleInput; Request.Data.PeekConsoleInputRequest.Unicode = bUnicode; Request.Data.PeekConsoleInputRequest.Length = nLength; - Request.Data.PeekConsoleInputRequest.InputRecord = (INPUT_RECORD*)BufferTargetBase; /* Call the server */ - DPRINT1("Calling Server\n"); Status = CsrClientCallServer(&Request, CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); - DPRINT1("Server returned: %x\n", Request.Status); + DPRINT("Server returned: %x\n", Request.Status); /* Check for success*/ if (NT_SUCCESS(Request.Status)) { /* Return the number of events read */ - DPRINT1("Events read: %lx\n", Request.Data.PeekConsoleInputRequest.Length); + DPRINT("Events read: %lx\n", Request.Data.PeekConsoleInputRequest.Length); *lpNumberOfEventsRead = Request.Data.PeekConsoleInputRequest.Length; /* Copy into the buffer */ - DPRINT1("Copying to buffer\n"); - RtlCopyMemory(lpBuffer, + DPRINT("Copying to buffer\n"); + RtlCopyMemory(lpBuffer, Request.Data.PeekConsoleInputRequest.InputRecord, sizeof(INPUT_RECORD) * *lpNumberOfEventsRead); } @@ -1603,7 +1602,6 @@ } /* Release the capture buffer */ - DPRINT1("Release buffer and return\n"); CsrFreeCaptureBuffer(CaptureBuffer); /* Return TRUE or FALSE */ @@ -1767,7 +1765,6 @@ { CSR_API_MESSAGE Request; ULONG CsrRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - PVOID BufferTargetBase; NTSTATUS Status; DWORD Size; @@ -1780,37 +1777,37 @@ Size = nLength * sizeof(INPUT_RECORD); /* Allocate a Capture Buffer */ - DPRINT1("IntWriteConsoleInput: %lx %p\n", Size, lpNumberOfEventsWritten); + DPRINT("IntWriteConsoleInput: %lx %p\n", Size, lpNumberOfEventsWritten); CaptureBuffer = CsrAllocateCaptureBuffer(1, Size); /* Allocate space in the Buffer */ - CsrCaptureMessageBuffer(CaptureBuffer, NULL, Size, &BufferTargetBase); - DPRINT1("Allocated message buffer: %p %p\n", CaptureBuffer, BufferTargetBase); + CsrCaptureMessageBuffer(CaptureBuffer, + NULL, + Size, + (PVOID*)&Request.Data.WriteConsoleInputRequest.InputRecord); /* Set up the data to send to the Console Server */ CsrRequest = MAKE_CSR_API(WRITE_CONSOLE_INPUT, CSR_CONSOLE); Request.Data.WriteConsoleInputRequest.ConsoleHandle = hConsoleInput; Request.Data.WriteConsoleInputRequest.Unicode = bUnicode; Request.Data.WriteConsoleInputRequest.Length = nLength; - Request.Data.WriteConsoleInputRequest.InputRecord = (PINPUT_RECORD)BufferTargetBase; /* Call the server */ - DPRINT1("Calling Server\n"); Status = CsrClientCallServer(&Request, CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); - DPRINT1("Server returned: %x\n", Request.Status); + DPRINT("Server returned: %x\n", Request.Status); /* Check for success*/ if (NT_SUCCESS(Request.Status)) { /* Return the number of events read */ - DPRINT1("Events read: %lx\n", Request.Data.WriteConsoleInputRequest.Length); + DPRINT("Events read: %lx\n", Request.Data.WriteConsoleInputRequest.Length); *lpNumberOfEventsWritten = Request.Data.WriteConsoleInputRequest.Length; /* Copy into the buffer */ - DPRINT1("Copying to buffer\n"); + DPRINT("Copying to buffer\n"); RtlCopyMemory(lpBuffer, Request.Data.WriteConsoleInputRequest.InputRecord, sizeof(INPUT_RECORD) * *lpNumberOfEventsWritten); @@ -1823,7 +1820,6 @@ } /* Release the capture buffer */ - DPRINT1("Release buffer and return\n"); CsrFreeCaptureBuffer(CaptureBuffer); /* Return TRUE or FALSE */ @@ -1885,7 +1881,6 @@ { CSR_API_MESSAGE Request; ULONG CsrRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - PVOID BufferTargetBase; NTSTATUS Status; DWORD Size, SizeX, SizeY; @@ -1898,12 +1893,14 @@ Size = dwBufferSize.X * dwBufferSize.Y * sizeof(CHAR_INFO); /* Allocate a Capture Buffer */ - DPRINT1("IntReadConsoleOutput: %lx %p\n", Size, lpReadRegion); + DPRINT("IntReadConsoleOutput: %lx %p\n", Size, lpReadRegion); CaptureBuffer = CsrAllocateCaptureBuffer(1, Size); /* Allocate space in the Buffer */ - CsrCaptureMessageBuffer(CaptureBuffer, NULL, Size, &BufferTargetBase); - DPRINT1("Allocated message buffer: %p %p\n", CaptureBuffer, BufferTargetBase); + CsrCaptureMessageBuffer(CaptureBuffer, + NULL, + Size, + (PVOID*)&Request.Data.ReadConsoleOutputRequest.CharInfo); /* Set up the data to send to the Console Server */ CsrRequest = MAKE_CSR_API(READ_CONSOLE_OUTPUT, CSR_CONSOLE); @@ -1912,21 +1909,19 @@ Request.Data.ReadConsoleOutputRequest.BufferSize = dwBufferSize; Request.Data.ReadConsoleOutputRequest.BufferCoord = dwBufferCoord; Request.Data.ReadConsoleOutputRequest.ReadRegion = *lpReadRegion; - Request.Data.ReadConsoleOutputRequest.CharInfo = (PCHAR_INFO)BufferTargetBase; /* Call the server */ - DPRINT1("Calling Server\n"); Status = CsrClientCallServer(&Request, CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); - DPRINT1("Server returned: %x\n", Request.Status); + DPRINT("Server returned: %x\n", Request.Status); /* Check for success*/ if (NT_SUCCESS(Request.Status)) { /* Copy into the buffer */ - DPRINT1("Copying to buffer\n"); + DPRINT("Copying to buffer\n"); SizeX = Request.Data.ReadConsoleOutputRequest.ReadRegion.Right - Request.Data.ReadConsoleOutputRequest.ReadRegion.Left + 1; SizeY = Request.Data.ReadConsoleOutputRequest.ReadRegion.Bottom - @@ -1942,11 +1937,10 @@ } /* Return the read region */ - DPRINT1("read region: %lx\n", Request.Data.ReadConsoleOutputRequest.ReadRegion); + DPRINT("read region: %lx\n", Request.Data.ReadConsoleOutputRequest.ReadRegion); *lpReadRegion = Request.Data.ReadConsoleOutputRequest.ReadRegion; /* Release the capture buffer */ - DPRINT1("Release buffer and return\n"); CsrFreeCaptureBuffer(CaptureBuffer); /* Return TRUE or FALSE */ @@ -2010,15 +2004,16 @@ Size = dwBufferSize.Y * dwBufferSize.X * sizeof(CHAR_INFO); /* Allocate a Capture Buffer */ - DPRINT1("IntWriteConsoleOutput: %lx %p\n", Size, lpWriteRegion); + DPRINT("IntWriteConsoleOutput: %lx %p\n", Size, lpWriteRegion); CaptureBuffer = CsrAllocateCaptureBuffer(1, Size); /* Allocate space in the Buffer */ - CsrCaptureMessageBuffer(CaptureBuffer, NULL, Size, &BufferTargetBase); - DPRINT1("Allocated message buffer: %p %p\n", CaptureBuffer, BufferTargetBase); + CsrCaptureMessageBuffer(CaptureBuffer, + NULL, + Size, + (PVOID*)&Request.Data.WriteConsoleOutputRequest.CharInfo); /* Copy from the buffer */ - DPRINT1("Copying into buffer\n"); RtlCopyMemory(BufferTargetBase, lpBuffer, Size); /* Set up the data to send to the Console Server */ @@ -2028,15 +2023,13 @@ Request.Data.WriteConsoleOutputRequest.BufferSize = dwBufferSize; Request.Data.WriteConsoleOutputRequest.BufferCoord = dwBufferCoord; Request.Data.WriteConsoleOutputRequest.WriteRegion = *lpWriteRegion; - Request.Data.WriteConsoleOutputRequest.CharInfo = (CHAR_INFO*)BufferTargetBase; /* Call the server */ - DPRINT1("Calling Server\n"); Status = CsrClientCallServer(&Request, CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); - DPRINT1("Server returned: %x\n", Request.Status); + DPRINT("Server returned: %x\n", Request.Status); /* Check for success*/ if (!NT_SUCCESS(Request.Status)) @@ -2046,11 +2039,10 @@ } /* Return the read region */ - DPRINT1("read region: %lx\n", Request.Data.WriteConsoleOutputRequest.WriteRegion); + DPRINT("read region: %lx\n", Request.Data.WriteConsoleOutputRequest.WriteRegion); *lpWriteRegion = Request.Data.WriteConsoleOutputRequest.WriteRegion; /* Release the capture buffer */ - DPRINT1("Release buffer and return\n"); CsrFreeCaptureBuffer(CaptureBuffer); /* Return TRUE or FALSE */ _____ Modified: trunk/reactos/lib/ntdll/csr/capture.c --- trunk/reactos/lib/ntdll/csr/capture.c 2005-09-26 05:41:35 UTC (rev 18081) +++ trunk/reactos/lib/ntdll/csr/capture.c 2005-09-26 07:43:55 UTC (rev 18082) @@ -142,12 +142,12 @@ CaptureBuffer->BufferEnd += MessageLength; } + /* Write down this pointer in the array */ + CaptureBuffer->PointerArray[CaptureBuffer->PointerCount] = (ULONG_PTR)CaptureData; + /* Increase the pointer count */ CaptureBuffer->PointerCount++; - /* Write down this pointer in the array */ - CaptureBuffer->PointerArray[CaptureBuffer->PointerCount] = (ULONG_PTR)CaptureData; - /* Return the aligned length */ return MessageLength; } _____ Modified: trunk/reactos/lib/ntdll/csr/connect.c --- trunk/reactos/lib/ntdll/csr/connect.c 2005-09-26 05:41:35 UTC (rev 18081) +++ trunk/reactos/lib/ntdll/csr/connect.c 2005-09-26 07:43:55 UTC (rev 18082) @@ -57,7 +57,7 @@ PULONG_PTR Pointers; ULONG_PTR CurrentPointer; DPRINT("CsrClientCallServer\n"); - + /* Fill out the Port Message Header */ ApiMessage->Header.u1.s1.DataLength = RequestLength - sizeof(PORT_MESSAGE); ApiMessage->Header.u1.s1.TotalLength = RequestLength; @@ -79,7 +79,6 @@ if (CaptureBuffer) { /* We have to convert from our local view to the remote view */ - DPRINT1("Converting CaptureBuffer\n"); ApiMessage->CsrCaptureData = (PVOID)((ULONG_PTR)CaptureBuffer + CsrPortMemoryDelta); @@ -91,14 +90,19 @@ Pointers = CaptureBuffer->PointerArray; /* Loop through every pointer and convert it */ + DPRINT("PointerCount: %lx\n", PointerCount); while (PointerCount--) { /* Get this pointer and check if it's valid */ + DPRINT("Array Address: %p. This pointer: %p. Data: %p\n", + &Pointers, Pointers, *Pointers); if ((CurrentPointer = *Pointers++)) { /* Update it */ + DPRINT("CurrentPointer: %p.\n", *(PULONG_PTR)CurrentPointer); *(PULONG_PTR)CurrentPointer += CsrPortMemoryDelta; Pointers[-1] = CurrentPointer - (ULONG_PTR)ApiMessage; + DPRINT("CurrentPointer: %p.\n", *(PULONG_PTR)CurrentPointer); } } } @@ -112,7 +116,7 @@ if (CaptureBuffer) { /* We have to convert from the remote view to our remote view */ - DPRINT1("Reconverting CaptureBuffer\n"); + DPRINT("Reconverting CaptureBuffer\n"); ApiMessage->CsrCaptureData = (PVOID)((ULONG_PTR) ApiMessage->CsrCaptureData - CsrPortMemoryDelta);

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
59
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2005