Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[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

[weiden] 19606: create the property sheets modally
by weiden＠svn.reactos.com 26 Nov '05

26 Nov '05

create the property sheets modally Modified: trunk/reactos/lib/devmgr/advprop.c _____ Modified: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-11-26 03:25:57 UTC (rev 19605) +++ trunk/reactos/lib/devmgr/advprop.c 2005-11-26 03:33:07 UTC (rev 19606) @@ -19,7 +19,7 @@ /* $Id: hwpage.c 19599 2005-11-26 02:12:58Z weiden $ * * PROJECT: ReactOS devmgr.dll - * FILE: lib/devmgr/hwpage.c + * FILE: lib/devmgr/advprop.c * PURPOSE: ReactOS Device Manager * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> * UPDATE HISTORY: @@ -119,6 +119,7 @@ psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPTITLE; + psh.hwndParent = hWndParent; psh.pszCaption = szDevName; /* find out how many property sheets we need */

1 0

[weiden] 19605: forgot to add this file
by weiden＠svn.reactos.com 26 Nov '05

26 Nov '05

forgot to add this file Added: trunk/reactos/lib/devmgr/advprop.c _____ Added: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-11-26 03:22:22 UTC (rev 19604) +++ trunk/reactos/lib/devmgr/advprop.c 2005-11-26 03:25:57 UTC (rev 19605) @@ -0,0 +1,238 @@ +/* + * ReactOS Device Manager Applet + * Copyright (C) 2004 - 2005 ReactOS Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/* $Id: hwpage.c 19599 2005-11-26 02:12:58Z weiden $ + * + * PROJECT: ReactOS devmgr.dll + * FILE: lib/devmgr/hwpage.c + * PURPOSE: ReactOS Device Manager + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + * UPDATE HISTORY: + * 04-04-2004 Created + */ +#include <precomp.h> + +#define NDEBUG +#include <debug.h> + +typedef INT_PTR (WINAPI *PPROPERTYSHEETW)(LPCPROPSHEETHEADERW); + +/********************************************************************** ***** + * NAME EXPORTED + * DeviceAdvancedPropertiesW + * + * DESCRIPTION + * Invokes the device properties dialog, this version may add some property pages + * for some devices + * + * ARGUMENTS + * hWndParent: Handle to the parent window + * lpMachineName: Machine Name, NULL is the local machine + * lpDeviceID: Specifies the device whose properties are to be shown + * + * RETURN VALUE + * -1: if errors occured + * + * REVISIONS + * + * NOTE + * + * @unimplemented + */ +int +WINAPI +DeviceAdvancedPropertiesW(HWND hWndParent, + LPCWSTR lpMachineName, + LPCWSTR lpDeviceID) +{ + HDEVINFO hDevInfo; + SP_DEVINFO_DATA DevInfoData; + HINSTANCE hComCtl32; + PPROPERTYSHEETW pPropertySheetW; + int Ret = -1; + + /* FIXME - handle remote device properties */ + + UNREFERENCED_PARAMETER(lpMachineName); + + /* dynamically load comctl32 */ + hComCtl32 = LoadAndInitComctl32(); + if (hComCtl32 == NULL || + !(pPropertySheetW = (PPROPERTYSHEETW)GetProcAddress(hComCtl32, + "PropertySheetW"))) + { + return -1; + } + + hDevInfo = SetupDiCreateDeviceInfoList(NULL, + hWndParent); + if (hDevInfo == INVALID_HANDLE_VALUE) + { + goto Cleanup; + } + + DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + if (SetupDiOpenDeviceInfo(hDevInfo, + lpDeviceID, + hWndParent, + 0, + &DevInfoData)) + { + WCHAR szDevName[255]; + DWORD RegDataType; + PROPSHEETHEADER psh = {0}; + DWORD nPropSheets = 0; + + /* get the device name */ + if ((SetupDiGetDeviceRegistryProperty(hDevInfo, + &DevInfoData, + SPDRP_FRIENDLYNAME, + &RegDataType, + (PBYTE)szDevName, + sizeof(szDevName), + NULL) || + SetupDiGetDeviceRegistryProperty(hDevInfo, + &DevInfoData, + SPDRP_DEVICEDESC, + &RegDataType, + (PBYTE)szDevName, + sizeof(szDevName), + NULL)) && + RegDataType == REG_SZ) + { + /* FIXME - check string for NULL termination! */ + + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPTITLE; + psh.pszCaption = szDevName; + + /* find out how many property sheets we need */ + if (SetupDiGetClassDevPropertySheets(hDevInfo, + &DevInfoData, + &psh, + 0, + &nPropSheets, + DIGCDP_FLAG_ADVANCED)) + { + DPRINT1("SetupDiGetClassDevPropertySheets unexpectedly returned TRUE!\n"); + goto Cleanup; + } + + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + goto Cleanup; + } + + psh.phpage = HeapAlloc(GetProcessHeap(), + 0, + nPropSheets * sizeof(HPROPSHEETPAGE)); + if (psh.phpage == NULL) + { + goto Cleanup; + } + + if (!SetupDiGetClassDevPropertySheets(hDevInfo, + &DevInfoData, + &psh, + nPropSheets, + NULL, + DIGCDP_FLAG_ADVANCED)) + { + goto Cleanup; + } + + /* FIXME - add "General" and "Driver" page */ + + Ret = pPropertySheetW(&psh); + } + +Cleanup: + HeapFree(GetProcessHeap(), + 0, + psh.phpage); + } + + SetupDiDestroyDeviceInfoList(hDevInfo); + FreeLibrary(hComCtl32); + + return Ret; +} + +/********************************************************************** ***** + * NAME EXPORTED + * DeviceAdvancedPropertiesA + * + * DESCRIPTION + * Invokes the device properties dialog, this version may add some property pages + * for some devices + * + * ARGUMENTS + * hWndParent: Handle to the parent window + * lpMachineName: Machine Name, NULL is the local machine + * lpDeviceID: Specifies the device whose properties are to be shown + * + * RETURN VALUE + * -1: if errors occured + * + * REVISIONS + * + * NOTE + * + * @unimplemented + */ +int +WINAPI +DeviceAdvancedPropertiesA(HWND hWndParent, + LPCSTR lpMachineName, + LPCSTR lpDeviceID) +{ + LPWSTR lpMachineNameW = NULL; + LPWSTR lpDeviceIDW = NULL; + int Ret = -1; + + if (lpMachineName != NULL) + { + if (!(lpMachineNameW = ConvertMultiByteToUnicode(lpMachineName, + CP_ACP))) + { + goto Cleanup; + } + } + if (lpDeviceID != NULL) + { + if (!(lpDeviceIDW = ConvertMultiByteToUnicode(lpDeviceID, + CP_ACP))) + { + goto Cleanup; + } + } + + Ret = DeviceAdvancedPropertiesW(hWndParent, + lpMachineNameW, + lpDeviceIDW); + +Cleanup: + HeapFree(GetProcessHeap(), + 0, + lpMachineNameW); + HeapFree(GetProcessHeap(), + 0, + lpDeviceIDW); + + return Ret; +} Property changes on: trunk/reactos/lib/devmgr/advprop.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native

1 0

[weiden] 19604: initial implementation of DeviceAdvancedPropertiesA/W
by weiden＠svn.reactos.com 26 Nov '05

26 Nov '05

initial implementation of DeviceAdvancedPropertiesA/W Modified: trunk/reactos/lib/devmgr/devmgr.xml Modified: trunk/reactos/lib/devmgr/hwpage.c Modified: trunk/reactos/lib/devmgr/misc.c Modified: trunk/reactos/lib/devmgr/precomp.h Modified: trunk/reactos/lib/devmgr/stubs.c _____ Modified: trunk/reactos/lib/devmgr/devmgr.xml --- trunk/reactos/lib/devmgr/devmgr.xml 2005-11-26 03:21:41 UTC (rev 19603) +++ trunk/reactos/lib/devmgr/devmgr.xml 2005-11-26 03:22:22 UTC (rev 19604) @@ -13,6 +13,7 @@ <library>setupapi</library> <library>user32</library> <file>devmgr.rc</file> + <file>advprop.c</file> <file>hwpage.c</file> <file>misc.c</file> <file>stubs.c</file> _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 03:21:41 UTC (rev 19603) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 03:22:22 UTC (rev 19604) @@ -30,8 +30,6 @@ #define NDEBUG #include <debug.h> -typedef VOID (WINAPI *PINITCOMMONCONTROLS)(VOID); - typedef enum { HWPD_STANDARDLIST = 0, @@ -978,7 +976,6 @@ IN HWPAGE_DISPLAYMODE DisplayMode) { PHARDWARE_PAGE_DATA hpd; - PINITCOMMONCONTROLS pInitCommonControls; /* allocate the HARDWARE_PAGE_DATA structure. Make sure it is zeroed because the initialization code assumes that in @@ -1006,21 +1003,12 @@ } /* load comctl32.dll dynamically */ - hpd->hComCtl32 = LoadLibrary(TEXT("comctl32.dll")); + hpd->hComCtl32 = LoadAndInitComctl32(); if (hpd->hComCtl32 == NULL) { goto Cleanup; } - /* initialize the common controls */ - pInitCommonControls = (PINITCOMMONCONTROLS)GetProcAddress(hpd->hComCtl32, - "InitCommonControls"); - if (pInitCommonControls == NULL) - { - goto Cleanup; - } - pInitCommonControls(); - /* create the dialog */ hWnd = CreateDialogParam(hDllInstance, MAKEINTRESOURCE(IDD_HARDWARE), _____ Modified: trunk/reactos/lib/devmgr/misc.c --- trunk/reactos/lib/devmgr/misc.c 2005-11-26 03:21:41 UTC (rev 19603) +++ trunk/reactos/lib/devmgr/misc.c 2005-11-26 03:22:22 UTC (rev 19604) @@ -149,6 +149,69 @@ return 0; } +LPWSTR +ConvertMultiByteToUnicode(IN LPCSTR lpMultiByteStr, + IN UINT uCodePage) +{ + LPWSTR lpUnicodeStr; + INT nLength; + + nLength = MultiByteToWideChar(uCodePage, + 0, + lpMultiByteStr, + -1, + NULL, + 0); + if (nLength == 0) + return NULL; + + lpUnicodeStr = HeapAlloc(GetProcessHeap(), + 0, + nLength * sizeof(WCHAR)); + if (lpUnicodeStr == NULL) + return NULL; + + if (!MultiByteToWideChar(uCodePage, + 0, + lpMultiByteStr, + nLength, + lpUnicodeStr, + nLength)) + { + HeapFree(GetProcessHeap(), + 0, + lpUnicodeStr); + return NULL; + } + + return lpUnicodeStr; +} + +HINSTANCE +LoadAndInitComctl32(VOID) +{ + typedef VOID (WINAPI *PINITCOMMONCONTROLS)(VOID); + PINITCOMMONCONTROLS pInitCommonControls; + HINSTANCE hComCtl32; + + hComCtl32 = LoadLibrary(L"comctl32.dll"); + if (hComCtl32 != NULL) + { + /* initialize the common controls */ + pInitCommonControls = (PINITCOMMONCONTROLS)GetProcAddress(hComCtl32, + "InitCommonControls"); + if (pInitCommonControls == NULL) + { + FreeLibrary(hComCtl32); + return NULL; + } + + pInitCommonControls(); + } + + return hComCtl32; +} + BOOL STDCALL DllMain(IN HINSTANCE hinstDLL, _____ Modified: trunk/reactos/lib/devmgr/precomp.h --- trunk/reactos/lib/devmgr/precomp.h 2005-11-26 03:21:41 UTC (rev 19603) +++ trunk/reactos/lib/devmgr/precomp.h 2005-11-26 03:22:22 UTC (rev 19604) @@ -191,6 +191,13 @@ LPARAM ListViewGetSelectedItemData(IN HWND hwnd); +LPWSTR +ConvertMultiByteToUnicode(IN LPCSTR lpMultiByteStr, + IN UINT uCodePage); + +HINSTANCE +LoadAndInitComctl32(VOID); + #endif /* __DEVMGR_H */ /* EOF */ _____ Modified: trunk/reactos/lib/devmgr/stubs.c --- trunk/reactos/lib/devmgr/stubs.c 2005-11-26 03:21:41 UTC (rev 19603) +++ trunk/reactos/lib/devmgr/stubs.c 2005-11-26 03:22:22 UTC (rev 19604) @@ -548,72 +548,6 @@ /*********************************************************************** **** * NAME EXPORTED - * DeviceAdvancedPropertiesA - * - * DESCRIPTION - * Invokes the device properties dialog, this version may add some property pages - * for some devices - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * lpMachineName: Machine Name, NULL is the local machine - * lpDeviceID: Specifies the device whose properties are to be shown - * - * RETURN VALUE - * -1: if errors occured - * - * REVISIONS - * - * NOTE - * - * @unimplemented - */ -int -WINAPI -DeviceAdvancedPropertiesA(HWND hWndParent, - LPCSTR lpMachineName, - LPCSTR lpDeviceID) -{ - UNIMPLEMENTED; - return -1; -} - - -/********************************************************************** ***** - * NAME EXPORTED - * DeviceAdvancedPropertiesW - * - * DESCRIPTION - * Invokes the device properties dialog, this version may add some property pages - * for some devices - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * lpMachineName: Machine Name, NULL is the local machine - * lpDeviceID: Specifies the device whose properties are to be shown - * - * RETURN VALUE - * -1: if errors occured - * - * REVISIONS - * - * NOTE - * - * @unimplemented - */ -int -WINAPI -DeviceAdvancedPropertiesW(HWND hWndParent, - LPCWSTR lpMachineName, - LPCWSTR lpDeviceID) -{ - UNIMPLEMENTED; - return -1; -} - - -/********************************************************************** ***** - * NAME EXPORTED * DevicePropertiesExA * * DESCRIPTION

1 0

[weiden] 19603: added stubs for SetupDiGetClassDevPropertySheetsA/W
by weiden＠svn.reactos.com 26 Nov '05

26 Nov '05

added stubs for SetupDiGetClassDevPropertySheetsA/W Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/lib/setupapi/stubs.c _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-11-26 03:01:18 UTC (rev 19602) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-11-26 03:21:41 UTC (rev 19603) @@ -306,8 +306,8 @@ @ stdcall SetupDiGetClassDescriptionExA(ptr str long ptr str ptr) @ stdcall SetupDiGetClassDescriptionExW(ptr wstr long ptr wstr ptr) @ stdcall SetupDiGetClassDescriptionW(ptr wstr long ptr) -@ stub SetupDiGetClassDevPropertySheetsA -@ stub SetupDiGetClassDevPropertySheetsW +@ stdcall SetupDiGetClassDevPropertySheetsA(ptr ptr ptr long ptr long) +@ stdcall SetupDiGetClassDevPropertySheetsW(ptr ptr ptr long ptr long) @ stdcall SetupDiGetClassDevsA(ptr ptr long long) @ stdcall SetupDiGetClassDevsExA(ptr str ptr long ptr str ptr) @ stdcall SetupDiGetClassDevsExW(ptr wstr ptr long ptr wstr ptr) _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-11-26 03:01:18 UTC (rev 19602) +++ trunk/reactos/lib/setupapi/stubs.c 2005-11-26 03:21:41 UTC (rev 19603) @@ -250,3 +250,33 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************** * + * SetupDiGetClassDevPropertySheetsA(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetClassDevPropertySheetsA(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, + LPPROPSHEETHEADERA PropertySheetHeader, + DWORD PropertySheetHeaderPageListSize, PDWORD RequiredSize, + DWORD PropertySheetType) +{ + FIXME ("Stub %p %p %p %d %p %d\n", + DeviceInfoSet, DeviceInfoData, PropertySheetHeader, PropertySheetHeaderPageListSize, + RequiredSize, PropertySheetType); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** * + * SetupDiGetClassDevPropertySheetsW(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetClassDevPropertySheetsW(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, + LPPROPSHEETHEADERW PropertySheetHeader, + DWORD PropertySheetHeaderPageListSize, PDWORD RequiredSize, + DWORD PropertySheetType) +{ + FIXME ("Stub %p %p %p %d %p %d\n", + DeviceInfoSet, DeviceInfoData, PropertySheetHeader, PropertySheetHeaderPageListSize, + RequiredSize, PropertySheetType); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005