Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 19616: Add stub for HalAllocateCrashDumpRegisters
by hpoussin＠svn.reactos.com 26 Nov '05

26 Nov '05

Add stub for HalAllocateCrashDumpRegisters Modified: trunk/reactos/hal/hal/hal.c Modified: trunk/reactos/hal/hal/hal.def Modified: trunk/reactos/hal/halx86/generic/misc.c _____ Modified: trunk/reactos/hal/hal/hal.c --- trunk/reactos/hal/hal/hal.c 2005-11-26 08:19:38 UTC (rev 19615) +++ trunk/reactos/hal/hal/hal.c 2005-11-26 08:21:42 UTC (rev 19616) @@ -126,6 +126,16 @@ } +VOID +NTAPI +HalAllocateCrashDumpRegisters( + ULONG Unknown1, + ULONG Unknown2) +{ + UNIMPLEMENTED; +} + + NTSTATUS NTAPI HalAssignSlotResources( _____ Modified: trunk/reactos/hal/hal/hal.def --- trunk/reactos/hal/hal/hal.def 2005-11-26 08:19:38 UTC (rev 19615) +++ trunk/reactos/hal/hal/hal.def 2005-11-26 08:21:42 UTC (rev 19616) @@ -11,7 +11,7 @@ HalAllProcessorsStarted@0 HalAllocateAdapterChannel@16 HalAllocateCommonBuffer@16 -;HalAllocateCrashDumpRegisters@8 +HalAllocateCrashDumpRegisters@8 HalAssignSlotResources@32 HalBeginSystemInterrupt@12 HalCalibratePerformanceCounter@4 _____ Modified: trunk/reactos/hal/halx86/generic/misc.c --- trunk/reactos/hal/halx86/generic/misc.c 2005-11-26 08:19:38 UTC (rev 19615) +++ trunk/reactos/hal/halx86/generic/misc.c 2005-11-26 08:21:42 UTC (rev 19616) @@ -16,6 +16,17 @@ /* FUNCTIONS ****************************************************************/ + +VOID +NTAPI +HalAllocateCrashDumpRegisters( + ULONG Unknown1, + ULONG Unknown2) +{ + UNIMPLEMENTED; +} + + VOID STDCALL HalHandleNMI(ULONG Unused) {

1 0

[hpoussin] 19615: Install one more time the .SoftwareSettings section in registry (no, I really don't want to create a symlink)
by hpoussin＠svn.reactos.com 26 Nov '05

26 Nov '05

Install one more time the .SoftwareSettings section in registry (no, I really don't want to create a symlink) Modified: trunk/reactos/lib/cpl/desk/classinst.c _____ Modified: trunk/reactos/lib/cpl/desk/classinst.c --- trunk/reactos/lib/cpl/desk/classinst.c 2005-11-26 08:15:41 UTC (rev 19614) +++ trunk/reactos/lib/cpl/desk/classinst.c 2005-11-26 08:19:38 UTC (rev 19615) @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Plug & Play + * PROJECT: ReactOS Display Control Panel * FILE: lib/cpl/desk/classinst.c * PURPOSE: Display class installer * @@ -24,6 +24,8 @@ TCHAR SectionName[MAX_PATH]; TCHAR ServiceName[MAX_SERVICE_NAME_LEN]; SP_DRVINFO_DETAIL_DATA DriverInfoDetailData; + HKEY hDriverKey = INVALID_HANDLE_VALUE; + HKEY hSettingsKey = INVALID_HANDLE_VALUE; HKEY hServicesKey = INVALID_HANDLE_VALUE; HKEY hServiceKey = INVALID_HANDLE_VALUE; HKEY hDeviceSubKey = INVALID_HANDLE_VALUE; @@ -34,6 +36,7 @@ if (InstallFunction != DIF_INSTALLDEVICE) return ERROR_DI_DO_DEFAULT; + /* Set DI_NEEDRESTART flag */ InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); result = SetupDiGetDeviceInstallParams(DeviceInfoSet, DeviceInfoData, &InstallParams); if (!result) @@ -53,6 +56,7 @@ goto cleanup; } + /* Get .inf file name and section name */ DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA); result = SetupDiGetSelectedDriver(DeviceInfoSet, DeviceInfoData, &DriverInfoData); if (!result) @@ -93,6 +97,7 @@ } _tcscat(SectionName, _T(".SoftwareSettings")); + /* Do normal install */ result = SetupDiInstallDevice(DeviceInfoSet, DeviceInfoData); if (!result) { @@ -101,6 +106,46 @@ goto cleanup; } + /* Open driver registry key and create Settings subkey */ + hDriverKey = SetupDiOpenDevRegKey( + DeviceInfoSet, DeviceInfoData, + DICS_FLAG_GLOBAL, 0, DIREG_DRV, + KEY_CREATE_SUB_KEY); + if (hDriverKey == INVALID_HANDLE_VALUE) + { + rc = GetLastError(); + DPRINT("SetupDiOpenDevRegKey() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegCreateKeyEx( + hDriverKey, L"Settings", + 0, NULL, REG_OPTION_NON_VOLATILE, +#if _WIN32_WINNT >= 0x502 + KEY_READ | KEY_WRITE, +#else + KEY_ALL_ACCESS, +#endif + NULL, &hSettingsKey, &disposition); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyEx() failed with error 0x%lx\n", rc); + goto cleanup; + } + + /* Install .SoftwareSettings to Settings subkey */ + result = SetupInstallFromInfSection( + InstallParams.hwndParent, hInf, SectionName, + SPINST_REGISTRY, hSettingsKey, + NULL, 0, NULL, NULL, + NULL, NULL); + if (!result) + { + rc = GetLastError(); + DPRINT("SetupInstallFromInfSection() failed with error 0x%lx\n", rc); + goto cleanup; + } + + /* Get service name and open service registry key */ result = SetupDiGetDeviceRegistryProperty( DeviceInfoSet, DeviceInfoData, SPDRP_SERVICE, NULL, @@ -147,6 +192,8 @@ } /* Install SoftwareSettings section */ + /* Yes, we're installing this section for the second time. + * We don't want to create a link to Settings subkey */ result = SetupInstallFromInfSection( InstallParams.hwndParent, hInf, SectionName, SPINST_REGISTRY, hDeviceSubKey, @@ -166,6 +213,10 @@ cleanup: if (hInf != INVALID_HANDLE_VALUE) SetupCloseInfFile(hInf); + if (hDriverKey != INVALID_HANDLE_VALUE) + RegCloseKey(hDriverKey); + if (hSettingsKey != INVALID_HANDLE_VALUE) + RegCloseKey(hSettingsKey); if (hServicesKey != INVALID_HANDLE_VALUE) RegCloseKey(hServicesKey); if (hServiceKey != INVALID_HANDLE_VALUE)

1 0

[hpoussin] 19614: Fix French control panel description
by hpoussin＠svn.reactos.com 26 Nov '05

26 Nov '05

Fix French control panel description Modified: trunk/reactos/lib/cpl/sysdm/fr.rc _____ Modified: trunk/reactos/lib/cpl/sysdm/fr.rc --- trunk/reactos/lib/cpl/sysdm/fr.rc 2005-11-26 08:13:04 UTC (rev 19613) +++ trunk/reactos/lib/cpl/sysdm/fr.rc 2005-11-26 08:15:41 UTC (rev 19614) @@ -137,5 +137,5 @@ STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "SystÞme" - IDS_CPLSYSTEMDESCRIPTION "Afficher les informations sur votre odrinateur et changer les paramÞtres du systÞme et du matÚriel." + IDS_CPLSYSTEMDESCRIPTION "Affiche des informations sur votre ordinateur et permet de change les paramÞtres du systÞme et du matÚriel." END

1 0

[hpoussin] 19613: Implement SetupDiGetDeviceInstanceIdW
by hpoussin＠svn.reactos.com 26 Nov '05

26 Nov '05

Implement SetupDiGetDeviceInstanceIdW Fix debug message Modified: trunk/reactos/lib/devmgr/hwpage.c Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/stubs.c _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 04:29:40 UTC (rev 19612) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 08:13:04 UTC (rev 19613) @@ -143,7 +143,7 @@ 0, &DeviceInstanceIdLen)) { - DPRINT1("SetupDiGetDeviceInterfaceDetail unexpectedly returned TRUE!\n"); + DPRINT1("SetupDiGetDeviceInstanceId unexpectedly returned TRUE!\n"); goto Cleanup; } _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-26 04:29:40 UTC (rev 19612) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-26 08:13:04 UTC (rev 19613) @@ -3004,7 +3004,7 @@ { BOOL ret = FALSE; - TRACE("%ld %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); + TRACE("%u %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); if (!DeviceInfoSet) SetLastError(ERROR_INVALID_PARAMETER); @@ -3063,7 +3063,7 @@ DefaultHandler = SetupDiSelectBestCompatDrv; break; default: - ERR("Install function %lu not supported\n", InstallFunction); + ERR("Install function %u not supported\n", InstallFunction); SetLastError(ERROR_NOT_SUPPORTED); } @@ -3463,6 +3463,71 @@ } /*********************************************************************** + * SetupDiGetDeviceInstanceIdA(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDeviceInstanceIdA( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT PSTR DeviceInstanceId, + IN DWORD DeviceInstanceIdSize, + OUT PDWORD RequiredSize) +{ + FIXME ("Stub %p %p %p %d %p\n", + DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** * + * SetupDiGetDeviceInstanceIdW(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDeviceInstanceIdW( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT PWSTR DeviceInstanceId, + IN DWORD DeviceInstanceIdSize, + OUT PDWORD RequiredSize) +{ + BOOL ret = FALSE; + + TRACE("%p %p %p %lu %p\n", DeviceInfoSet, DeviceInfoData, + DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); + + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_HANDLE); + else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (!DeviceInfoData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (!DeviceInstanceId && DeviceInstanceIdSize > 0) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInstanceId && DeviceInstanceIdSize == 0) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + struct DeviceInfoElement *DevInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + DWORD required; + + required = (wcslen(DevInfo->DeviceName) + 1) * sizeof(WCHAR); + if (RequiredSize) + *RequiredSize = required; + + if (required <= DeviceInstanceIdSize) + { + wcscpy(DeviceInstanceId, DevInfo->DeviceName); + ret = TRUE; + } + else + SetLastError(ERROR_INSUFFICIENT_BUFFER); + } + + TRACE("Returning 0x%p\n", ret); + return ret; +} + +/********************************************************************** * * SetupDiCreateDevRegKeyA (SETUPAPI.@) */ HKEY WINAPI SetupDiCreateDevRegKeyA( _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-11-26 04:29:40 UTC (rev 19612) +++ trunk/reactos/lib/setupapi/stubs.c 2005-11-26 08:13:04 UTC (rev 19613) @@ -225,33 +225,8 @@ return TRUE; } -/********************************************************************** * - * SetupDiGetDeviceInstanceIdA(SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetDeviceInstanceIdA(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, - PSTR DeviceInstanceId, DWORD DeviceInstanceIdSize, - PDWORD RequiredSize) -{ - FIXME ("Stub %p %p %p %d %p\n", - DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} /*********************************************************************** - * SetupDiGetDeviceInstanceIdW(SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetDeviceInstanceIdW(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, - PWSTR DeviceInstanceId, DWORD DeviceInstanceIdSize, - PDWORD RequiredSize) -{ - FIXME ("Stub %p %p %p %d %p\n", - DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/********************************************************************** * * SetupDiGetClassDevPropertySheetsA(SETUPAPI.@) */ BOOL WINAPI SetupDiGetClassDevPropertySheetsA(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData,

1 0

[royce] 19612: remove transient debugging code
by royce＠svn.reactos.com 26 Nov '05

26 Nov '05

remove transient debugging code Modified: trunk/reactos/tools/rbuild/XML.cpp _____ Modified: trunk/reactos/tools/rbuild/XML.cpp --- trunk/reactos/tools/rbuild/XML.cpp 2005-11-26 04:24:17 UTC (rev 19611) +++ trunk/reactos/tools/rbuild/XML.cpp 2005-11-26 04:29:40 UTC (rev 19612) @@ -635,8 +635,6 @@ else { XMLElement* e2 = XMLParse ( f, is_include ? NULL : includes, path, &end_tag ); - if ( e->name == "project" && e2->name == "1" ) - e = e; if ( !e2 ) { string e_location = e->location;

1 0

[royce] 19611: XML: better descriptions on a couple errors, more accurate line number reporting ( was overshooting ), better clean-up of memory
by royce＠svn.reactos.com 26 Nov '05

26 Nov '05

XML: better descriptions on a couple errors, more accurate line number reporting ( was overshooting ), better clean-up of memory mingw/directory: move msvc fix for popen with the rest of the code that got moved rbuild.dsp: added new files to project Modified: trunk/reactos/tools/rbuild/XML.cpp Modified: trunk/reactos/tools/rbuild/XML.h Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/directory.cpp Modified: trunk/reactos/tools/rbuild/rbuild.dsp _____ Modified: trunk/reactos/tools/rbuild/XML.cpp --- trunk/reactos/tools/rbuild/XML.cpp 2005-11-26 04:07:39 UTC (rev 19610) +++ trunk/reactos/tools/rbuild/XML.cpp 2005-11-26 04:24:17 UTC (rev 19611) @@ -348,6 +348,13 @@ return true; } +bool +XMLFile::get_token ( string& token, string& location ) +{ + location = Location(); + return get_token ( token ); +} + string XMLFile::Location() const { @@ -547,8 +554,8 @@ const Path& path, bool* pend_tag = NULL ) { - string token; - if ( !f.get_token(token) ) + string token, location; + if ( !f.get_token(token,location) ) return NULL; bool end_tag, is_include = false; @@ -557,15 +564,15 @@ || !strncmp ( token.c_str (), "<?", 2 ) ) { if ( token[0] != '<' ) - throw XMLSyntaxErrorException ( f.Location (), + throw XMLSyntaxErrorException ( location, "expecting xml tag, not '%s'", token.c_str () ); - if ( !f.get_token(token) ) + if ( !f.get_token(token,location) ) return NULL; } XMLElement* e = new XMLElement ( &f, - f.Location () ); + location ); bool bNeedEnd = e->Parse ( token, end_tag ); if ( e->name == "xi:include" && includes ) @@ -586,7 +593,7 @@ else if ( end_tag ) { delete e; - throw XMLSyntaxErrorException ( f.Location (), + throw XMLSyntaxErrorException ( location, "end tag '%s' not expected", token.c_str() ); return NULL; @@ -598,27 +605,27 @@ { if ( f.next_is_text () ) { - if ( !f.get_token ( token ) || token.size () == 0 ) + if ( !f.get_token ( token, location ) || token.size () == 0 ) { throw InvalidBuildFileException ( - f.Location(), + location, "internal tool error - get_token() failed when more_tokens() returned true" ); break; } if ( e->subElements.size() && !bThisMixingErrorReported ) { - throw XMLSyntaxErrorException ( f.Location (), + throw XMLSyntaxErrorException ( location, "mixing of inner text with sub elements" ); bThisMixingErrorReported = true; } if ( strchr ( token.c_str (), '>' ) ) { - throw XMLSyntaxErrorException ( f.Location (), + throw XMLSyntaxErrorException ( location, "invalid symbol '>'" ); } if ( e->value.size() > 0 ) { - throw XMLSyntaxErrorException ( f.Location (), + throw XMLSyntaxErrorException ( location, "multiple instances of inner text" ); e->value += " " + token; } @@ -628,20 +635,33 @@ else { XMLElement* e2 = XMLParse ( f, is_include ? NULL : includes, path, &end_tag ); + if ( e->name == "project" && e2->name == "1" ) + e = e; if ( !e2 ) { + string e_location = e->location; + string e_name = e->name; + delete e; throw InvalidBuildFileException ( - e->location, - "end of file found looking for end tag" ); + e_location, + "end of file found looking for end tag: </%s>", + e_name.c_str() ); break; } if ( end_tag ) { if ( e->name != e2->name ) { + string e2_location = e2->location; + string e_name = e->name; + string e2_name = e2->name; + delete e; delete e2; - throw XMLSyntaxErrorException ( f.Location (), - "end tag name mismatch" ); + throw XMLSyntaxErrorException ( + e2_location, + "end tag name mismatch - found </%s> but was expecting </%s>", + e2_name.c_str(), + e_name.c_str() ); break; } delete e2; @@ -649,7 +669,9 @@ } if ( e->value.size () > 0 && !bThisMixingErrorReported ) { - throw XMLSyntaxErrorException ( f.Location (), + string e_location = e->location; + delete e; + throw XMLSyntaxErrorException ( e_location, "mixing of inner text with sub elements" ); bThisMixingErrorReported = true; } _____ Modified: trunk/reactos/tools/rbuild/XML.h --- trunk/reactos/tools/rbuild/XML.h 2005-11-26 04:07:39 UTC (rev 19610) +++ trunk/reactos/tools/rbuild/XML.h 2005-11-26 04:24:17 UTC (rev 19611) @@ -81,7 +81,8 @@ void next_token(); bool next_is_text(); bool more_tokens(); - bool get_token(std::string& token); + bool get_token ( std::string& token ); + bool get_token ( std::string& token, std::string& location ); const std::string& filename() { return _filename; } std::string Location() const; _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-11-26 04:07:39 UTC (rev 19610) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-11-26 04:24:17 UTC (rev 19611) @@ -21,6 +21,11 @@ #include <assert.h> #include "modulehandler.h" +#ifdef _MSC_VER +#define popen _popen +#define pclose _pclose +#endif//_MSC_VER + using std::string; using std::vector; using std::set; _____ Modified: trunk/reactos/tools/rbuild/directory.cpp --- trunk/reactos/tools/rbuild/directory.cpp 2005-11-26 04:07:39 UTC (rev 19610) +++ trunk/reactos/tools/rbuild/directory.cpp 2005-11-26 04:24:17 UTC (rev 19611) @@ -19,10 +19,7 @@ #include <assert.h> #include "rbuild.h" -#ifdef _MSC_VER -#define popen _popen -#define pclose _pclose -#else +#ifndef _MSC_VER #include <dirent.h> #endif//_MSC_VER _____ Modified: trunk/reactos/tools/rbuild/rbuild.dsp --- trunk/reactos/tools/rbuild/rbuild.dsp 2005-11-26 04:07:39 UTC (rev 19610) +++ trunk/reactos/tools/rbuild/rbuild.dsp 2005-11-26 04:24:17 UTC (rev 19611) @@ -181,6 +181,14 @@ # End Source File # Begin Source File +SOURCE=.\compilationunit.cpp +# End Source File +# Begin Source File + +SOURCE=.\compilationunitsupportcode.cpp +# End Source File +# Begin Source File + SOURCE=.\compilerflag.cpp # End Source File # Begin Source File @@ -193,6 +201,10 @@ # End Source File # Begin Source File +SOURCE=.\directory.cpp +# End Source File +# Begin Source File + SOURCE=.\exception.cpp # End Source File # Begin Source File @@ -201,6 +213,10 @@ # End Source File # Begin Source File +SOURCE=.\global.cpp +# End Source File +# Begin Source File + SOURCE=.\include.cpp # End Source File # Begin Source File @@ -213,6 +229,10 @@ # End Source File # Begin Source File +SOURCE=.\linkerscript.cpp +# End Source File +# Begin Source File + SOURCE=.\module.cpp # End Source File # Begin Source File

1 0

[jimtabor] 19610: Clean up Xml files, show usbd functions as implemented and implemente PcGetTimeInterval.
by jimtabor＠svn.reactos.com 26 Nov '05

26 Nov '05

Clean up Xml files, show usbd functions as implemented and implemente PcGetTimeInterval. Modified: trunk/reactos/drivers/directory.xml Modified: trunk/reactos/drivers/multimedia/directory.xml Modified: trunk/reactos/drivers/multimedia/portcls/portcls.c Modified: trunk/reactos/drivers/usb/usbd/usbd.c _____ Modified: trunk/reactos/drivers/directory.xml --- trunk/reactos/drivers/directory.xml 2005-11-26 03:52:19 UTC (rev 19609) +++ trunk/reactos/drivers/directory.xml 2005-11-26 04:07:39 UTC (rev 19610) @@ -26,7 +26,7 @@ <directory name="usb"> <xi:include href="usb/directory.xml" /> </directory> - +</directory> </group> _____ Modified: trunk/reactos/drivers/multimedia/directory.xml --- trunk/reactos/drivers/multimedia/directory.xml 2005-11-26 03:52:19 UTC (rev 19609) +++ trunk/reactos/drivers/multimedia/directory.xml 2005-11-26 04:07:39 UTC (rev 19610) @@ -4,21 +4,17 @@ This is mostly incomplete at the moment. --> -<directory name="portcls"> - <xi:include href="portcls/portcls.xml" /> -</directory> -  -  + <directory name="portcls"> <xi:include href="portcls/portcls.xml" /> </directory> -<directory name="avtest"> + + - _____ Modified: trunk/reactos/drivers/multimedia/portcls/portcls.c --- trunk/reactos/drivers/multimedia/portcls/portcls.c 2005-11-26 03:52:19 UTC (rev 19609) +++ trunk/reactos/drivers/multimedia/portcls/portcls.c 2005-11-26 04:07:39 UTC (rev 19610) @@ -239,15 +239,18 @@ } /* - * @unimplemented + * @implemented */ ULONGLONG STDCALL PcGetTimeInterval( ULONGLONG Timei ) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + LARGE_INTEGER CurrentTime; + + KeQuerySystemTime( &CurrentTime); + + return (Timei - CurrentTime.QuadPart); } /* _____ Modified: trunk/reactos/drivers/usb/usbd/usbd.c --- trunk/reactos/drivers/usb/usbd/usbd.c 2005-11-26 03:52:19 UTC (rev 19609) +++ trunk/reactos/drivers/usb/usbd/usbd.c 2005-11-26 04:07:39 UTC (rev 19610) @@ -16,8 +16,8 @@ * USBD_CreateConfigurationRequestEx (implemented) * USBD_CreateConfigurationRequest * USBD_GetInterfaceLength (implemented) - * USBD_ParseConfigurationDescriptorEx - * USBD_ParseDescriptors + * USBD_ParseConfigurationDescriptorEx (implemented) + * USBD_ParseDescriptors (implemented) * USBD_GetPdoRegistryParameters (implemented) */ @@ -369,7 +369,7 @@ } /* - * @unimplemented + * @implemented */ PUSB_COMMON_DESCRIPTOR STDCALL USBD_ParseDescriptors( @@ -394,7 +394,7 @@ /* - * @unimplemented + * @implemented */ PUSB_INTERFACE_DESCRIPTOR STDCALL USBD_ParseConfigurationDescriptorEx(

1 0

[weiden] 19609: properly handle the case where devices don't supply any property pages
by weiden＠svn.reactos.com 26 Nov '05

26 Nov '05

properly handle the case where devices don't supply any property pages Modified: trunk/reactos/lib/devmgr/advprop.c Modified: trunk/reactos/lib/devmgr/hwpage.c _____ Modified: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-11-26 03:49:20 UTC (rev 19608) +++ trunk/reactos/lib/devmgr/advprop.c 2005-11-26 03:52:19 UTC (rev 19609) @@ -52,7 +52,7 @@ * * NOTE * - * @unimplemented + * @implemented */ int WINAPI @@ -128,7 +128,8 @@ &psh, 0, &nPropSheets, - DIGCDP_FLAG_ADVANCED)) + DIGCDP_FLAG_ADVANCED) && + nPropSheets != 0) { DPRINT1("SetupDiGetClassDevPropertySheets unexpectedly returned TRUE!\n"); goto Cleanup; @@ -147,6 +148,8 @@ goto Cleanup; } + /* FIXME - add the "General" and "Driver" pages */ + if (!SetupDiGetClassDevPropertySheets(hDevInfo, &DevInfoData, &psh, @@ -157,8 +160,6 @@ goto Cleanup; } - /* FIXME - add "General" and "Driver" page */ - Ret = pPropertySheetW(&psh); } @@ -194,7 +195,7 @@ * * NOTE * - * @unimplemented + * @implemented */ int WINAPI _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 03:49:20 UTC (rev 19608) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 03:52:19 UTC (rev 19609) @@ -967,6 +967,8 @@ * RETURN VALUE * Returns the handle of the hardware page window that has been created or * NULL if it failed. + * + * @implemented */ HWND WINAPI @@ -1053,10 +1055,7 @@ * Returns the handle of the hardware page window that has been created or * NULL if it failed. * - * REVISIONS - * - * NOTE - * + * @implemented */ HWND WINAPI

1 0

[royce] 19608: much better check for gnu make 3.80+
by royce＠svn.reactos.com 26 Nov '05

26 Nov '05

much better check for gnu make 3.80+ this check was borrowed from the GMSL project - which is GPL. I gave - I think - ample notice where the code came from. If someone thinks it needs more - please let me know Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-11-26 03:37:37 UTC (rev 19607) +++ trunk/reactos/Makefile 2005-11-26 03:49:20 UTC (rev 19608) @@ -107,9 +107,19 @@ # -ps Generate proxy makefiles in source tree instead of the output tree. # check for versions of make that don't have features we need... -ifneq ($(filter 3.7%, $(shell $(MAKE) -v)),) -$(error GNU Make $(filter 3.7%, $(shell $(MAKE) -v)) WILL NOT WORK - UPGRADE TO 3.80+) +# the function "eval" is only available in 3.80+, which happens to be the minimum +# version that has the features we use... +# THIS CHECK IS BORROWED FROM THE "GMSL" PROJECT, AND IS COVERED BY THE GPL LICENSE +# YOU CAN FIND OUT MORE ABOUT GMSL - A VERY COOL PROJECT - AT: +# http://gmsl.sourceforge.net/ + +__gmsl_have_eval := +__gmsl_ignore := $(eval __gmsl_have_eval := T) + +ifndef __gmsl_have_eval +$(error ReactOS's makefiles use GNU Make 3.80+ features, you have $(MAKE_VERSION), you MUST UPGRADE in order to build ReactOS - Sorry) endif +# END of code borrowed from GMSL ( http://gmsl.sourceforge.net/ ) .PHONY: all .PHONY: clean

1 0

[royce] 19607: gnu make 3.7x will not work - give users an early and clear error message stating as much
by royce＠svn.reactos.com 26 Nov '05

26 Nov '05

gnu make 3.7x will not work - give users an early and clear error message stating as much Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-11-26 03:33:07 UTC (rev 19606) +++ trunk/reactos/Makefile 2005-11-26 03:37:37 UTC (rev 19607) @@ -106,6 +106,11 @@ # -mi Let make handle creation of install directories. Rbuild will not generate the directories. # -ps Generate proxy makefiles in source tree instead of the output tree. +# check for versions of make that don't have features we need... +ifneq ($(filter 3.7%, $(shell $(MAKE) -v)),) +$(error GNU Make $(filter 3.7%, $(shell $(MAKE) -v)) WILL NOT WORK - UPGRADE TO 3.80+) +endif + .PHONY: all .PHONY: clean all: makefile.auto

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs