Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[navaraf] 15680: Add MSVFW32 and MSWSOCK to the build.
by navaraf＠svn.reactos.com 30 May '05

30 May '05

Add MSVFW32 and MSWSOCK to the build. Modified: trunk/reactos/baseaddress.xml Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/lib/directory.xml Deleted: trunk/reactos/lib/msvideo/Makefile Deleted: trunk/reactos/lib/msvideo/Makefile.ros-template Added: trunk/reactos/lib/msvideo/msvfw32.xml Deleted: trunk/reactos/lib/mswsock/Makefile Added: trunk/reactos/lib/mswsock/mswsock.xml _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-05-30 08:12:30 UTC (rev 15679) +++ trunk/reactos/baseaddress.xml 2005-05-30 12:52:38 UTC (rev 15680) @@ -75,6 +75,8 @@ <property name="BASEADDRESS_DNSAPI" value="0x77f00000" /> <property name="BASEADDRESS_MSVCRT" value="0x78000000" /> <property name="BASEADDRESS_MSVCRT20" value="0x78500000" /> +<property name="BASEADDRESS_MSVFW32" value="0x77400000" /> +<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> <property name="BASEADDRESS_KERNEL32" value="0x7c800000" /> <property name="BASEADDRESS_NTDLL" value="0x7C900000" /> <property name="BASEADDRESS_FREETYPE" value="0x7F000000" /> @@ -84,9 +86,7 @@ <property name="BASEADDRESS_HID" value="0x688F0000" /> <property name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> <property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> -<property name="BASEADDRESS_DISPLAY" value="DISPLAY" /> <property name="BASEADDRESS_ACLUI" value="0x71550000" /> -<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> <property name="BASEADDRESS_WINFAX" value="0x722C0000" /> <property name="BASEADDRESS_DEVMGR" value="0x72a90000" /> <property name="BASEADDRESS_WINSCARD" value="0x723D0000" /> _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-05-30 08:12:30 UTC (rev 15679) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-05-30 12:52:38 UTC (rev 15680) @@ -107,6 +107,8 @@ lib\msimg32\msimg32.dll 1 lib\msvcrt\msvcrt.dll 1 lib\msvcrt20\msvcrt20.dll 1 +lib\msvideo\msvfw32.dll 1 +lib\mswsock\mswsock.dll 1 lib\netapi32\netapi32.dll 1 lib\ntdll\ntdll.dll 1 lib\ole32\ole32.dll 1 _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-05-30 08:12:30 UTC (rev 15679) +++ trunk/reactos/lib/directory.xml 2005-05-30 12:52:38 UTC (rev 15680) @@ -166,6 +166,12 @@ <directory name="msvcrt20"> <xi:include href="msvcrt20/msvcrt20.xml" /> </directory> +<directory name="msvideo"> + <xi:include href="msvideo/msvfw32.xml" /> +</directory> +<directory name="mswsock"> + <xi:include href="mswsock/mswsock.xml" /> +</directory> <directory name="netapi32"> <xi:include href="netapi32/netapi32.xml" /> </directory> _____ Deleted: trunk/reactos/lib/msvideo/Makefile --- trunk/reactos/lib/msvideo/Makefile 2005-05-30 08:12:30 UTC (rev 15679) +++ trunk/reactos/lib/msvideo/Makefile 2005-05-30 12:52:38 UTC (rev 15680) @@ -1,9 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../.. - -TARGET_TYPE = winedll - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: trunk/reactos/lib/msvideo/Makefile.ros-template --- trunk/reactos/lib/msvideo/Makefile.ros-template 2005-05-30 08:12:30 UTC (rev 15679) +++ trunk/reactos/lib/msvideo/Makefile.ros-template 2005-05-30 12:52:38 UTC (rev 15680) @@ -1,21 +0,0 @@ -# $Id$ - -TARGET_NAME = msvfw32 - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ - -TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a - -TARGET_BASE = $(TARGET_BASE_LIB_WINMM) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk _____ Added: trunk/reactos/lib/msvideo/msvfw32.xml --- trunk/reactos/lib/msvideo/msvfw32.xml 2005-05-30 08:12:30 UTC (rev 15679) +++ trunk/reactos/lib/msvideo/msvfw32.xml 2005-05-30 12:52:38 UTC (rev 15680) @@ -0,0 +1,21 @@ +<module name="msvfw32" type="win32dll" baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32" installname="msvfw32.dll"> + <importlibrary definition="msvfw32.spec.def" /> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>winmm</library> + <library>gdi32</library> + <library>comctl32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>drawdib.c</file> + <file>mciwnd.c</file> + <file>msvfw32.rc</file> + <file>msvideo_main.c</file> + <file>msvfw32.spec</file> +</module> _____ Deleted: trunk/reactos/lib/mswsock/Makefile --- trunk/reactos/lib/mswsock/Makefile 2005-05-30 08:12:30 UTC (rev 15679) +++ trunk/reactos/lib/mswsock/Makefile 2005-05-30 12:52:38 UTC (rev 15680) @@ -1,37 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../.. - -TARGET_TYPE = dynlink - -TARGET_NAME = mswsock - -TARGET_BASE = $(TARGET_BASE_LIB_MSWSOCK) - -TARGET_CFLAGS = \ - -I./include \ - -Wall \ - -Werror \ - -fno-builtin \ - -DUNICODE \ - -DLE \ - -DDBG \ - -D__USE_W32API - -TARGET_LFLAGS = -nostartfiles -nostdlib - -TARGET_SDKLIBS = kernel32.a ws2_32.a - -TARGET_OBJECTS = stubs.o extensions.o - -TARGET_CLEAN = $(DEP_FILES) - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# Automatic dependency tracking -DEP_OBJECTS := $(TARGET_OBJECTS) -include $(PATH_TO_TOP)/tools/depend.mk - -# EOF _____ Added: trunk/reactos/lib/mswsock/mswsock.xml --- trunk/reactos/lib/mswsock/mswsock.xml 2005-05-30 08:12:30 UTC (rev 15679) +++ trunk/reactos/lib/mswsock/mswsock.xml 2005-05-30 12:52:38 UTC (rev 15680) @@ -0,0 +1,11 @@ +<module name="mswsock" type="win32dll" baseaddress="${BASEADDRESS_MSWSOCK}" installbase="system32" installname="mswsock.dll"> + <importlibrary definition="mswsock.def" /> + <define name="UNICODE" /> + <define name="LE" /> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>ws2_32</library> + <file>extensions.c</file> + <file>stubs.c</file> + <file>mswsock.rc</file> +</module>

1 0

[navaraf] 15679: Remove redundant line...
by navaraf＠svn.reactos.com 30 May '05

30 May '05

Remove redundant line... Modified: trunk/reactos/baseaddress.xml _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-05-30 07:27:22 UTC (rev 15678) +++ trunk/reactos/baseaddress.xml 2005-05-30 08:12:30 UTC (rev 15679) @@ -98,6 +98,5 @@ <property name="BASEADDRESS_ODBC32" value="0x76660000" /> <property name="BASEADDRESS_MSACM32" value="0x77400000" /> <property name="BASEADDRESS_PACKET" value="0x77780000" /> -<property name="BASEADDRESS_W2_32" value="0x77780000" /> <property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> <property name="BASEADDRESS_WSHTCPIP" value="0x777c0000" />

1 0

[greatlrd] 15678: fix winquake color glitc bug
by greatlrd＠svn.reactos.com 30 May '05

30 May '05

fix winquake color glitc bug the text are now whie instead for black Modified: trunk/reactos/subsys/win32k/objects/color.c _____ Modified: trunk/reactos/subsys/win32k/objects/color.c --- trunk/reactos/subsys/win32k/objects/color.c 2005-05-29 22:33:25 UTC (rev 15677) +++ trunk/reactos/subsys/win32k/objects/color.c 2005-05-30 07:27:22 UTC (rev 15678) @@ -32,7 +32,7 @@ //static HPALETTE hLastRealizedPalette = 0; // UnrealizeObject() needs it -static UINT SystemPaletteUse = SYSPAL_STATIC; /* currently not considered */ +static UINT SystemPaletteUse = SYSPAL_NOSTATIC; /* the program need save the palate and restore it */ const PALETTEENTRY COLOR_sysPalTemplate[NB_RESERVED_COLORS] = {

1 0

[greatlrd] 15677: add rospref to defualt build
by greatlrd＠svn.reactos.com 29 May '05

29 May '05

add rospref to defualt build and remove a makefile that is not need it patch By WaxDragon Deleted: trunk/reactos/apps/utils/Makefile Modified: trunk/reactos/apps/utils/directory.xml Added: trunk/reactos/apps/utils/rosperf/rosperf.xml _____ Deleted: trunk/reactos/apps/utils/Makefile --- trunk/reactos/apps/utils/Makefile 2005-05-29 21:40:17 UTC (rev 15676) +++ trunk/reactos/apps/utils/Makefile 2005-05-29 22:33:25 UTC (rev 15677) @@ -1,71 +0,0 @@ -# -# ReactOS system utilities makefile -# - -PATH_TO_TOP = ../.. - -include $(PATH_TO_TOP)/rules.mak - - -# Console system utilities -# cabman cat net objdir partinfo pice ps sc stats -UTIL_APPS = cat objdir pnpdump sc shutdown stats tickcount ps - -UTIL_NET_APPS = arp finger ftp ipconfig netstat ping route telnet whois - - -all: $(UTIL_APPS) $(UTIL_NET_APPS) - -depends: - -implib: $(UTIL_APPS:%=%_implib) \ - $(UTIL_NET_APPS:%=%_implib) - -clean: $(UTIL_APPS:%=%_clean) \ - $(UTIL_NET_APPS:%=%_clean) - -install: $(UTIL_APPS:%=%_install) \ - $(UTIL_NET_APPS:%=%_install) - -.PHONY: all depends implib clean install - - -# -# Utility Applications -# -$(UTIL_APPS): %: - $(MAKE) -C $* - -$(UTIL_APPS:%=%_implib): %_implib: - $(MAKE) -C $* implib - -$(UTIL_APPS:%=%_clean): %_clean: - $(MAKE) -C $* clean - -$(UTIL_APPS:%=%_install): %_install: - $(MAKE) -C $* install - -.PHONY: $(UTIL_APPS) $(UTIL_APPS:%=%_implib) $(UTIL_APPS:%=%_clean) $(UTIL_APPS:%=%_install) - -# -# GUI Utility Applications -# -$(UTIL_NET_APPS): %: - $(MAKE) -C net/$* - -$(UTIL_NET_APPS:%=%_implib): %_implib: - $(MAKE) -C net/$* implib - -$(UTIL_NET_APPS:%=%_clean): %_clean: - $(MAKE) -C net/$* clean - -$(UTIL_NET_APPS:%=%_install): %_install: - $(MAKE) -C net/$* install - -.PHONY: $(UTIL_NET_APPS) $(UTIL_NET_APPS:%=%_implib) $(UTIL_NET_APPS:%=%_clean) $(UTIL_NET_APPS:%=%_install) - - -etags: - find . -name "*.[ch]" -print | etags --language=c - - -# EOF _____ Modified: trunk/reactos/apps/utils/directory.xml --- trunk/reactos/apps/utils/directory.xml 2005-05-29 21:40:17 UTC (rev 15676) +++ trunk/reactos/apps/utils/directory.xml 2005-05-29 22:33:25 UTC (rev 15677) @@ -1,3 +1,7 @@ <directory name="net"> <xi:include href="net/directory.xml" /> </directory> +<directory name="rosperf"> + <xi:include href="rosperf/rosperf.xml" /> +</directory> + _____ Added: trunk/reactos/apps/utils/rosperf/rosperf.xml --- trunk/reactos/apps/utils/rosperf/rosperf.xml 2005-05-29 21:40:17 UTC (rev 15676) +++ trunk/reactos/apps/utils/rosperf/rosperf.xml 2005-05-29 22:33:25 UTC (rev 15677) @@ -0,0 +1,14 @@ +<module name="rosperf" type="win32cui" installbase="system32" installname="rosperf.exe"> + <include base="rosperf">.</include> + <define name="__USE_W32API" /> + <library>version</library> + <library>gdi32</library> + <library>user32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>rosperf.c</file> + <file>lines.c</file> + <file>fill.c</file> + <file>testlist.c</file> + <file>rosperf.rc</file> +</module> \ No newline at end of file

1 0

[gvg] 15676: Prevent kernel32.dll and winmm.dll from overlapping
by gvg＠svn.reactos.com 29 May '05

29 May '05

Prevent kernel32.dll and winmm.dll from overlapping Modified: trunk/reactos/baseaddress.xml _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-05-29 21:16:29 UTC (rev 15675) +++ trunk/reactos/baseaddress.xml 2005-05-29 21:40:17 UTC (rev 15676) @@ -73,9 +73,9 @@ <property name="BASEADDRESS_USER32" value="0x77e50000" /> <property name="BASEADDRESS_GDI32" value="0x77ee0000" /> <property name="BASEADDRESS_DNSAPI" value="0x77f00000" /> -<property name="BASEADDRESS_KERNEL32" value="0x77800000" /> <property name="BASEADDRESS_MSVCRT" value="0x78000000" /> <property name="BASEADDRESS_MSVCRT20" value="0x78500000" /> +<property name="BASEADDRESS_KERNEL32" value="0x7c800000" /> <property name="BASEADDRESS_NTDLL" value="0x7C900000" /> <property name="BASEADDRESS_FREETYPE" value="0x7F000000" />

1 0

[fireball] 15675: Added WS_VSCROLL to a language selection combobox (thx to unC0Rr)
by fireball＠svn.reactos.com 29 May '05

29 May '05

Added WS_VSCROLL to a language selection combobox (thx to unC0Rr) Modified: trunk/reactos/lib/cpl/intl/Sv.rc Modified: trunk/reactos/lib/cpl/intl/cz.rc Modified: trunk/reactos/lib/cpl/intl/de.rc Modified: trunk/reactos/lib/cpl/intl/en.rc _____ Modified: trunk/reactos/lib/cpl/intl/Sv.rc --- trunk/reactos/lib/cpl/intl/Sv.rc 2005-05-29 21:00:11 UTC (rev 15674) +++ trunk/reactos/lib/cpl/intl/Sv.rc 2005-05-29 21:16:29 UTC (rev 15675) @@ -56,7 +56,7 @@ GROUPBOX "Primõrt sprÕk", -1, 8, 11, 228, 74 ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON LTEXT "Võlj det sprÕk och den region du vill anvõnda:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END _____ Modified: trunk/reactos/lib/cpl/intl/cz.rc --- trunk/reactos/lib/cpl/intl/cz.rc 2005-05-29 21:00:11 UTC (rev 15674) +++ trunk/reactos/lib/cpl/intl/cz.rc 2005-05-29 21:16:29 UTC (rev 15675) @@ -73,7 +73,7 @@ GROUPBOX "V²chozÝ jazyk", -1, 8, 11, 228, 74 ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON LTEXT "Vyberte jazyk, ve kterÚm bude systÚm zobrazovat dialogy a hlßÜenÝ:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END _____ Modified: trunk/reactos/lib/cpl/intl/de.rc --- trunk/reactos/lib/cpl/intl/de.rc 2005-05-29 21:00:11 UTC (rev 15674) +++ trunk/reactos/lib/cpl/intl/de.rc 2005-05-29 21:16:29 UTC (rev 15675) @@ -73,7 +73,7 @@ GROUPBOX "Standardsprache", -1, 8, 11, 228, 74 ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON LTEXT "Wõhlen Sie eine Sprache und Region aus welche Sie benutzen wollen:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END _____ Modified: trunk/reactos/lib/cpl/intl/en.rc --- trunk/reactos/lib/cpl/intl/en.rc 2005-05-29 21:00:11 UTC (rev 15674) +++ trunk/reactos/lib/cpl/intl/en.rc 2005-05-29 21:16:29 UTC (rev 15675) @@ -73,7 +73,7 @@ GROUPBOX "Primary language", -1, 8, 11, 228, 74 ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON LTEXT "Select the primary language and region you want to use:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END

1 0

[greatlrd] 15674: remove old makefile add xml makefile
by greatlrd＠svn.reactos.com 29 May '05

29 May '05

remove old makefile add xml makefile Added: trunk/reactos/subsys/system/expand/expand.xml Deleted: trunk/reactos/subsys/system/expand/makefile _____ Added: trunk/reactos/subsys/system/expand/expand.xml --- trunk/reactos/subsys/system/expand/expand.xml 2005-05-29 20:58:38 UTC (rev 15673) +++ trunk/reactos/subsys/system/expand/expand.xml 2005-05-29 21:00:11 UTC (rev 15674) @@ -0,0 +1,10 @@ +<module name="expand" type="win32cui" installbase="system32" installname="expand.exe" usewrc="false"> + <include base="ReactOS">include/wine</include> + <include base="cmd">.</include> + <define name="__USE_W32API" /> + <define name="ANONYMOUSUNIONS" /> + <define name="_WIN32_WINNT">0x0501</define> + <library>lz32</library> + <file>expand.c</file> + <file>expand.rc</file> +</module> _____ Deleted: trunk/reactos/subsys/system/expand/makefile --- trunk/reactos/subsys/system/expand/makefile 2005-05-29 20:58:38 UTC (rev 15673) +++ trunk/reactos/subsys/system/expand/makefile 2005-05-29 21:00:11 UTC (rev 15674) @@ -1,23 +0,0 @@ -# - -PATH_TO_TOP = ../../.. - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = expand - -TARGET_INSTALLDIR = system32 - -TARGET_CFLAGS = -D__USE_W32API - -TARGET_SDKLIBS = lz32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF

1 0

[greatlrd] 15673: fix expand.exe compile and include on the bootcd
by greatlrd＠svn.reactos.com 29 May '05

29 May '05

fix expand.exe compile and include on the bootcd Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/subsys/system/directory.xml Modified: trunk/reactos/subsys/system/expand/expand.c _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-05-29 20:49:56 UTC (rev 15672) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-05-29 20:58:38 UTC (rev 15673) @@ -170,6 +170,7 @@ subsys\system\winefile\winefile.exe 1 subsys\system\dhcp\dhcp.exe 1 subsys\system\sm\sm.exe 1 +subsys\system\expand\expand.exe 1 services\eventlog\eventlog.exe 1 services\rpcss\rpcss.exe 1 services\umpnpmgr\umpnpmgr.exe 1 _____ Modified: trunk/reactos/subsys/system/directory.xml --- trunk/reactos/subsys/system/directory.xml 2005-05-29 20:49:56 UTC (rev 15672) +++ trunk/reactos/subsys/system/directory.xml 2005-05-29 20:58:38 UTC (rev 15673) @@ -10,6 +10,9 @@ <directory name="dhcp"> <xi:include href="dhcp/dhcp.xml" /> </directory> +<directory name="expand"> + <xi:include href="expand/expand.xml" /> +</directory> <directory name="explorer"> <xi:include href="explorer/explorer.xml" /> </directory> _____ Modified: trunk/reactos/subsys/system/expand/expand.c --- trunk/reactos/subsys/system/expand/expand.c 2005-05-29 20:49:56 UTC (rev 15672) +++ trunk/reactos/subsys/system/expand/expand.c 2005-05-29 20:58:38 UTC (rev 15673) @@ -26,7 +26,7 @@ #include "resource.h" -_tmain(int argc, TCHAR *argv[]) +int _tmain(int argc, TCHAR *argv[]) { OFSTRUCT SourceOpenStruct1, SourceOpenStruct2; LONG ret;

1 0

[ion] 15672: Fix function bug
by ion＠svn.reactos.com 29 May '05

29 May '05

Fix function bug Modified: trunk/irc/ArchBlackmann/func.txt _____ Modified: trunk/irc/ArchBlackmann/func.txt --- trunk/irc/ArchBlackmann/func.txt 2005-05-29 19:48:43 UTC (rev 15671) +++ trunk/irc/ArchBlackmann/func.txt 2005-05-29 20:49:56 UTC (rev 15672) @@ -1,4 +1,3 @@ -BOOLEAN CcCanIWrite CcCopyRead CcCopyWrite

1 0

[hpoussin] 15671: Read device instance IDs in registry instead of forcing 0000. This allows more than one instance for each device enumerated by Root bus.
by hpoussin＠svn.reactos.com 29 May '05

29 May '05

Read device instance IDs in registry instead of forcing 0000. This allows more than one instance for each device enumerated by Root bus. Be ready to have resource requirements for each device instance (not used ATM) Replace some ExAllocatePool/ExFreePool with ExAllocatePoolWithTag/ExFreePoolWithTag Modified: trunk/reactos/ntoskrnl/include/internal/tag.h Modified: trunk/reactos/ntoskrnl/io/pnproot.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/tag.h --- trunk/reactos/ntoskrnl/include/internal/tag.h 2005-05-29 19:41:24 UTC (rev 15670) +++ trunk/reactos/ntoskrnl/include/internal/tag.h 2005-05-29 19:48:43 UTC (rev 15671) @@ -70,6 +70,9 @@ /* formerly located in io/pnpnotify.c */ #define TAG_PNP_NOTIFY TAG('P', 'n', 'P', 'N') +/* for io/pnproot.c */ +#define TAG_PNP_ROOT TAG('P', 'n', 'P', 'R') + /* formerly located in io/resource.c */ #define TAG_IO_RESOURCE TAG('R', 'S', 'R', 'C') _____ Modified: trunk/reactos/ntoskrnl/io/pnproot.c --- trunk/reactos/ntoskrnl/io/pnproot.c 2005-05-29 19:41:24 UTC (rev 15670) +++ trunk/reactos/ntoskrnl/io/pnproot.c 2005-05-29 19:48:43 UTC (rev 15671) @@ -34,6 +34,8 @@ UNICODE_STRING InstanceID; // Device description UNICODE_STRING DeviceDescription; + // Resource requirement list + PIO_RESOURCE_REQUIREMENTS_LIST ResourceRequirementsList; } PNPROOT_DEVICE, *PPNPROOT_DEVICE; typedef enum @@ -70,6 +72,8 @@ UNICODE_STRING DeviceID; // Instance ID UNICODE_STRING InstanceID; + // Resource requirement list + PIO_RESOURCE_REQUIREMENTS_LIST ResourceRequirementsList; } PNPROOT_PDO_DEVICE_EXTENSION, *PPNPROOT_PDO_DEVICE_EXTENSION; @@ -119,7 +123,7 @@ DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)PnpRootDeviceObject->DeviceExtension; - Device = (PPNPROOT_DEVICE)ExAllocatePool(PagedPool, sizeof(PNPROOT_DEVICE)); + Device = (PPNPROOT_DEVICE)ExAllocatePoolWithTag(PagedPool, sizeof(PNPROOT_DEVICE), TAG_PNP_ROOT); if (!Device) return STATUS_INSUFFICIENT_RESOURCES; @@ -271,19 +275,43 @@ IN PIRP Irp, PIO_STACK_LOCATION IrpSp) { + PPNPROOT_PDO_DEVICE_EXTENSION DeviceExtension; PIO_RESOURCE_REQUIREMENTS_LIST ResourceList; ULONG ResourceListSize = FIELD_OFFSET(IO_RESOURCE_REQUIREMENTS_LIST, List); - ResourceList = ExAllocatePool(PagedPool, ResourceListSize); - if (ResourceList == NULL) - return STATUS_INSUFFICIENT_RESOURCES; + DPRINT("Called\n"); - RtlZeroMemory(ResourceList, ResourceListSize); - ResourceList->ListSize = ResourceListSize; + DeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (DeviceExtension->ResourceRequirementsList == NULL) + { + /* Create an empty resource list */ + ResourceList = ExAllocatePool(PagedPool, ResourceListSize); + if (ResourceList == NULL) + return STATUS_INSUFFICIENT_RESOURCES; - Irp->IoStatus.Information = (ULONG_PTR)ResourceList; + RtlZeroMemory(ResourceList, ResourceListSize); + ResourceList->ListSize = ResourceListSize; - return STATUS_SUCCESS; + Irp->IoStatus.Information = (ULONG_PTR)ResourceList; + + return STATUS_SUCCESS; + } + else + { + /* Copy existing resource requirement list */ + ResourceList = ExAllocatePool(PagedPool, DeviceExtension->ResourceRequirementsList->ListSize); + if (ResourceList == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlCopyMemory( + ResourceList, + DeviceExtension->ResourceRequirementsList, + DeviceExtension->ResourceRequirementsList->ListSize); + Irp->IoStatus.Information = (ULONG_PTR)ResourceList; + + return STATUS_NOT_IMPLEMENTED; + } } @@ -453,33 +481,35 @@ PDEVICE_OBJECT DeviceObject) { PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; - OBJECT_ATTRIBUTES ObjectAttributes; - PKEY_BASIC_INFORMATION KeyInfo; - UNICODE_STRING KeyName; + OBJECT_ATTRIBUTES ObjectAttributes, SubKeyAttributes; + PKEY_BASIC_INFORMATION KeyInfo, SubKeyInfo; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\En um\\" ENUM_NAME_ROOT); + UNICODE_STRING SubKeyName; PPNPROOT_DEVICE Device; WCHAR Buffer[MAX_PATH]; - HANDLE KeyHandle; + HANDLE KeyHandle, SubKeyHandle; ULONG BufferSize; ULONG ResultSize; NTSTATUS Status; - ULONG Index; + ULONG Index1, Index2; DPRINT("Called\n"); DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; BufferSize = sizeof(KEY_BASIC_INFORMATION) + (MAX_PATH+1) * sizeof(WCHAR); - KeyInfo = ExAllocatePool(PagedPool, BufferSize); + KeyInfo = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_PNP_ROOT); if (!KeyInfo) { return STATUS_INSUFFICIENT_RESOURCES; } + SubKeyInfo = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_PNP_ROOT); + if (!SubKeyInfo) + { + ExFreePoolWithTag(KeyInfo, TAG_PNP_ROOT); + return STATUS_INSUFFICIENT_RESOURCES; + } - RtlRosInitUnicodeStringFromLiteral( - &KeyName, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\" \ - ENUM_NAME_ROOT); - InitializeObjectAttributes( &ObjectAttributes, &KeyName, @@ -487,11 +517,12 @@ NULL, NULL); - Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes); + Status = ZwOpenKey(&KeyHandle, KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey() failed (Status %x)\n", Status); - ExFreePool(KeyInfo); + DPRINT("ZwOpenKey() failed (Status 0x%08lx)\n", Status); + ExFreePoolWithTag(KeyInfo, TAG_PNP_ROOT); + ExFreePoolWithTag(SubKeyInfo, TAG_PNP_ROOT); return Status; } @@ -500,82 +531,127 @@ drivers are passed on the command line */ // DeviceExtension->DeviceListCount = 0; - Index = 0; - do { + /* Devices are sub-sub-keys of 'KeyName'. KeyName is already opened as + * KeyHandle. We'll first do a first enumeration to have first level keys, + * and an inner one to have the real devices list. + */ + Index1 = 0; + + while (TRUE) + { Status = ZwEnumerateKey( KeyHandle, - Index, + Index1, KeyBasicInformation, KeyInfo, BufferSize, &ResultSize); if (!NT_SUCCESS(Status)) { - DPRINT("ZwEnumerateKey() (Status %x)\n", Status); + DPRINT("ZwEnumerateKey() (Status 0x%08lx)\n", Status); break; } /* Terminate the string */ KeyInfo->Name[KeyInfo->NameLength / sizeof(WCHAR)] = 0; - - Device = (PPNPROOT_DEVICE)ExAllocatePool(PagedPool, sizeof(PNPROOT_DEVICE)); - if (!Device) + + /* Open the key */ + RtlInitUnicodeString(&SubKeyName, KeyInfo->Name); + InitializeObjectAttributes( + &SubKeyAttributes, + &SubKeyName, + 0, /* Attributes */ + KeyHandle, + NULL); /* Security descriptor */ + Status = ZwOpenKey(&SubKeyHandle, KEY_ENUMERATE_SUB_KEYS, &SubKeyAttributes); + if (!NT_SUCCESS(Status)) { - /* FIXME: */ + DPRINT("ZwOpenKey() failed (Status 0x%08lx)\n", Status); break; } - - RtlZeroMemory(Device, sizeof(PNPROOT_DEVICE)); - - if (!IopCreateUnicodeString(&Device->ServiceName, KeyInfo->Name, PagedPool)) + + /* Enumerate the sub-keys */ + Index2 = 0; + while (TRUE) { - /* FIXME: */ - DPRINT("IopCreateUnicodeString() failed\n"); - } + Status = ZwEnumerateKey( + SubKeyHandle, + Index2, + KeyBasicInformation, + SubKeyInfo, + BufferSize, + &ResultSize); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwEnumerateKey() (Status 0x%08lx)\n", Status); + break; + } + + /* Terminate the string */ + SubKeyInfo->Name[SubKeyInfo->NameLength / sizeof(WCHAR)] = 0; + + Device = (PPNPROOT_DEVICE)ExAllocatePoolWithTag(PagedPool, sizeof(PNPROOT_DEVICE), TAG_PNP_ROOT); + if (!Device) + { + /* FIXME: */ + DPRINT("ExAllocatePoolWithTag() failed\n"); + break; + } - wcscpy(Buffer, ENUM_NAME_ROOT); - wcscat(Buffer, L"\\"); - wcscat(Buffer, KeyInfo->Name); + RtlZeroMemory(Device, sizeof(PNPROOT_DEVICE)); - if (!IopCreateUnicodeString(&Device->DeviceID, Buffer, PagedPool)) - { - /* FIXME: */ - DPRINT("IopCreateUnicodeString() failed\n"); - } + if (!IopCreateUnicodeString(&Device->ServiceName, KeyInfo->Name, PagedPool)) + { + /* FIXME: */ + DPRINT("IopCreateUnicodeString() failed\n"); + } - DPRINT("Got entry: %S\n", Device->DeviceID.Buffer); + wcscpy(Buffer, ENUM_NAME_ROOT); + wcscat(Buffer, L"\\"); + wcscat(Buffer, KeyInfo->Name); - if (!IopCreateUnicodeString( - &Device->InstanceID, - L"0000", - PagedPool)) - { - /* FIXME: */ - DPRINT("IopCreateUnicodeString() failed\n"); - } + if (!IopCreateUnicodeString(&Device->DeviceID, Buffer, PagedPool)) + { + /* FIXME: */ + DPRINT("IopCreateUnicodeString() failed\n"); + } - Status = PnpRootFdoReadDeviceInfo(Device); - if (!NT_SUCCESS(Status)) - { - DPRINT("PnpRootFdoReadDeviceInfo() failed with status %x\n", Status); - /* FIXME: */ - } + DPRINT("Got entry: %S\n", Device->DeviceID.Buffer); - ExInterlockedInsertTailList( - &DeviceExtension->DeviceListHead, - &Device->ListEntry, - &DeviceExtension->DeviceListLock); + if (!IopCreateUnicodeString( + &Device->InstanceID, + SubKeyInfo->Name, + PagedPool)) + { + /* FIXME: */ + DPRINT("IopCreateUnicodeString() failed\n"); + } - DeviceExtension->DeviceListCount++; + Status = PnpRootFdoReadDeviceInfo(Device); + if (!NT_SUCCESS(Status)) + { + /* FIXME */ + DPRINT("PnpRootFdoReadDeviceInfo() failed with status 0x%08lx\n", Status); + } - Index++; - } while (TRUE); + ExInterlockedInsertTailList( + &DeviceExtension->DeviceListHead, + &Device->ListEntry, + &DeviceExtension->DeviceListLock); - DPRINT("Entries found: %d\n", Index); + DeviceExtension->DeviceListCount++; + + Index2++; + } + + ZwClose(SubKeyHandle); + Index1++; + } ZwClose(KeyHandle); - ExFreePool(KeyInfo); + ExFreePoolWithTag(KeyInfo, TAG_PNP_ROOT); + ExFreePoolWithTag(SubKeyInfo, TAG_PNP_ROOT); return STATUS_SUCCESS; } @@ -687,6 +763,30 @@ DPRINT("InstanceID: %wZ PDO %p\n", &PdoDeviceExtension->InstanceID, Device->Pdo); + + if (Device->ResourceRequirementsList != NULL) + { + PdoDeviceExtension->ResourceRequirementsList = ExAllocatePoolWithTag( + PagedPool, + Device->ResourceRequirementsList->ListSize, + TAG_PNP_ROOT); + if (PdoDeviceExtension->ResourceRequirementsList) + { + RtlCopyMemory( + PdoDeviceExtension->ResourceRequirementsList, + Device->ResourceRequirementsList, + Device->ResourceRequirementsList->ListSize); + } + else + { + /* FIXME */ + DPRINT("ExAllocatePoolWithTag() failed\n"); + } + } + + DPRINT("ResourceRequirementsList: %p PDO %p\n", + &PdoDeviceExtension->ResourceRequirementsList, + Device->Pdo); } /* Reference the physical device object. The PnP manager

1 0

← Newer
1
2
3
4
5
6
7
...
82
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 May 2005