Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[navaraf] 16919: Fix NULL-terminating of symbol image names.
by navaraf＠svn.reactos.com 31 Jul '05

31 Jul '05

Fix NULL-terminating of symbol image names. Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-07-31 10:22:29 UTC (rev 16918) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-07-31 11:06:50 UTC (rev 16919) @@ -55,6 +55,7 @@ PEPROCESS CurrentProcess; PPEB Peb = NULL; INT Count = 0; + INT Length; CurrentProcess = PsGetCurrentProcess(); if (CurrentProcess != NULL) @@ -73,15 +74,12 @@ current_entry != NULL) { current = CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); - + Length = min(current->BaseDllName.Length / sizeof(WCHAR), 255); if ((Address != NULL && (Address >= (PVOID)current->DllBase && Address < (PVOID)((char *)current->DllBase + current->SizeOfImage))) || - (Name != NULL && _wcsicmp(current->BaseDllName.Buffer, Name) == 0) || + (Name != NULL && _wcsnicmp(current->BaseDllName.Buffer, Name, Length) == 0) || (Index >= 0 && Count++ == Index)) { - INT Length = current->BaseDllName.Length; - if (Length > 255) - Length = 255; wcsncpy(pInfo->Name, current->BaseDllName.Buffer, Length); pInfo->Name[Length] = L'\0'; pInfo->Base = (ULONG_PTR)current->DllBase; @@ -111,6 +109,7 @@ PLDR_DATA_TABLE_ENTRY current; extern LIST_ENTRY ModuleListHead; INT Count = 0; + INT Length; current_entry = ModuleListHead.Flink; @@ -118,15 +117,14 @@ { current = CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + Length = min(current->BaseDllName.Length / sizeof(WCHAR), 255); if ((Address != NULL && (Address >= (PVOID)current->DllBase && Address < (PVOID)((ULONG_PTR)current->DllBase + current->SizeOfImage))) || - (Name != NULL && _wcsnicmp(current->BaseDllName.Buffer, Name, - current->BaseDllName.Length / sizeof(WCHAR)) == 0) || + (Name != NULL && _wcsnicmp(current->BaseDllName.Buffer, Name, Length) == 0) || (Index >= 0 && Count++ == Index)) { - wcsncpy(pInfo->Name, current->BaseDllName.Buffer, - min(255, current->BaseDllName.Length / sizeof(WCHAR))); - pInfo->Name[255] = L'\0'; + wcsncpy(pInfo->Name, current->BaseDllName.Buffer, Length); + pInfo->Name[Length] = L'\0'; pInfo->Base = (ULONG_PTR)current->DllBase; pInfo->Size = current->SizeOfImage; pInfo->RosSymInfo = current->RosSymInfo;

1 0

[navaraf] 16918: Implement the magic flag in RtlImageDirectoryEntryToData and make the Size parameter non-optional.
by navaraf＠svn.reactos.com 31 Jul '05

31 Jul '05

Implement the magic flag in RtlImageDirectoryEntryToData and make the Size parameter non-optional. Modified: trunk/reactos/lib/ntdll/ldr/utils.c Modified: trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/ntoskrnl/ldr/loader.c _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2005-07-31 09:48:12 UTC (rev 16917) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-07-31 10:22:29 UTC (rev 16918) @@ -237,6 +237,7 @@ PLDR_DATA_TABLE_ENTRY Module; PIMAGE_TLS_DIRECTORY TlsDirectory; PTLS_DATA TlsData; + ULONG Size; DPRINT("LdrpInitializeTlsForProccess() called for %wZ\n", &ExeModule->BaseDllName); @@ -263,7 +264,7 @@ RtlImageDirectoryEntryToData(Module->DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_TLS, - NULL); + &Size); ASSERT(Module->TlsIndex < LdrpTlsCount); TlsData = &LdrpTlsArray[Module->TlsIndex]; TlsData->StartAddressOfRawData = (PVOID)TlsDirectory->StartAddressOfRawData; @@ -1476,6 +1477,7 @@ NTSTATUS Status; PIMAGE_IMPORT_DESCRIPTOR ImportModuleDirectory; PCHAR Name; + ULONG Size; DPRINT("LdrpProcessImportDirectory(%x '%wZ', '%s')\n", Module, &Module->BaseDllName, ImportedName); @@ -1485,7 +1487,7 @@ RtlImageDirectoryEntryToData(Module->DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, - NULL); + &Size); if (ImportModuleDirectory == NULL) { return STATUS_UNSUCCESSFUL; @@ -1529,6 +1531,7 @@ ULONG IATSize; PIMAGE_NT_HEADERS NTHeaders; PCHAR Name; + ULONG Size; DPRINT("LdrpAdjustImportDirectory(Module %x '%wZ', %x '%wZ', %x '%s')\n", Module, &Module->BaseDllName, ImportedModule, &ImportedModule->BaseDllName, ImportedName); @@ -1537,7 +1540,7 @@ RtlImageDirectoryEntryToData(Module->DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, - NULL); + &Size); if (ImportModuleDirectory == NULL) { return STATUS_UNSUCCESSFUL; @@ -1647,6 +1650,7 @@ NTSTATUS Status; PLDR_DATA_TABLE_ENTRY ImportedModule; PCHAR ImportedName; + ULONG Size; DPRINT("LdrFixupImports(SearchPath %x, Module %x)\n", SearchPath, Module); @@ -1655,7 +1659,7 @@ RtlImageDirectoryEntryToData(Module->DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_TLS, - NULL); + &Size); if (TlsDirectory) { TlsSize = TlsDirectory->EndAddressOfRawData @@ -1676,13 +1680,13 @@ RtlImageDirectoryEntryToData(Module->DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, - NULL); + &Size); BoundImportDescriptor = (PIMAGE_BOUND_IMPORT_DESCRIPTOR) RtlImageDirectoryEntryToData(Module->DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT, - NULL); + &Size); if (BoundImportDescriptor != NULL && ImportModuleDirectory == NULL) { @@ -2142,8 +2146,8 @@ PLDR_DATA_TABLE_ENTRY ImportedModule; NTSTATUS Status; LONG LoadCount; + ULONG Size; - if (Unload) { RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock); @@ -2163,7 +2167,7 @@ RtlImageDirectoryEntryToData(Module->DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT, - NULL); + &Size); if (BoundImportDescriptor) { /* dereferencing all imported modules, use the bound import descriptor */ @@ -2197,7 +2201,7 @@ RtlImageDirectoryEntryToData(Module->DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, - NULL); + &Size); if (ImportModuleDirectory) { /* dereferencing all imported modules, use the import descriptor */ _____ Modified: trunk/reactos/lib/rtl/image.c --- trunk/reactos/lib/rtl/image.c 2005-07-31 09:48:12 UTC (rev 16917) +++ trunk/reactos/lib/rtl/image.c 2005-07-31 10:22:29 UTC (rev 16918) @@ -49,7 +49,7 @@ STDCALL RtlImageDirectoryEntryToData ( PVOID BaseAddress, - BOOLEAN bFlag, + BOOLEAN bMappedAsImage, ULONG Directory, PULONG Size ) @@ -59,8 +59,12 @@ /* Magic flag for non-mapped images. */ if ((ULONG_PTR)BaseAddress & 1) - BaseAddress = (PVOID)((ULONG_PTR)BaseAddress & ~1); + { + BaseAddress = (PVOID)((ULONG_PTR)BaseAddress & ~1); + bMappedAsImage = FALSE; + } + NtHeader = RtlImageNtHeader (BaseAddress); if (NtHeader == NULL) return NULL; @@ -72,10 +76,9 @@ if (Va == 0) return NULL; - if (Size) - *Size = NtHeader->OptionalHeader.DataDirectory[Directory].Size; + *Size = NtHeader->OptionalHeader.DataDirectory[Directory].Size; - if (bFlag) + if (bMappedAsImage || Va < NtHeader->OptionalHeader.SizeOfHeaders) return (PVOID)((ULONG_PTR)BaseAddress + Va); /* image mapped as ordinary file, we must find raw pointer */ _____ Modified: trunk/reactos/ntoskrnl/ldr/loader.c --- trunk/reactos/ntoskrnl/ldr/loader.c 2005-07-31 09:48:12 UTC (rev 16917) +++ trunk/reactos/ntoskrnl/ldr/loader.c 2005-07-31 10:22:29 UTC (rev 16918) @@ -161,8 +161,8 @@ if (ModuleBase) *ModuleBase = ModuleObject->DllBase; - //if (SectionPointer) - // *SectionPointer = ModuleObject-> + if (SectionPointer) + *SectionPointer = ModuleObject; if (EntryPoint) *EntryPoint = ModuleObject->EntryPoint; @@ -204,7 +204,7 @@ DriverEntry = (PDRIVER_INITIALIZE)ModuleObject->EntryPoint; RtlZeroMemory(&DriverObject, sizeof(DriverObject)); - DriverObject.DriverStart = ModuleObject->DllBase; +// DriverObject.DriverStart = ModuleObject->DllBase; Status = DriverEntry(&DriverObject, NULL); if (!NT_SUCCESS(Status)) @@ -768,6 +768,7 @@ } RtlCopyUnicodeString(&CreatedModuleObject->FullDllName, FileName); + CreatedModuleObject->FullDllName.Buffer[FileName->Length / sizeof(WCHAR)] = 0; LdrpBuildModuleBaseName(&CreatedModuleObject->BaseDllName, &CreatedModuleObject->FullDllName); @@ -1482,13 +1483,14 @@ PCHAR ImportedName; PLDR_DATA_TABLE_ENTRY ImportedModule; NTSTATUS Status; + ULONG Size; /* Process each import module */ ImportModuleDirectory = (PIMAGE_IMPORT_DESCRIPTOR) RtlImageDirectoryEntryToData(Module->DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, - NULL); + &Size); DPRINT("Processeing import directory at %p\n", ImportModuleDirectory); while (ImportModuleDirectory->Name) {

1 0

[navaraf] 16917: Revert #16904 and clarify the comment about the race condition.
by navaraf＠svn.reactos.com 31 Jul '05

31 Jul '05

Revert #16904 and clarify the comment about the race condition. Modified: trunk/reactos/ntoskrnl/ke/clock.c _____ Modified: trunk/reactos/ntoskrnl/ke/clock.c --- trunk/reactos/ntoskrnl/ke/clock.c 2005-07-31 08:33:39 UTC (rev 16916) +++ trunk/reactos/ntoskrnl/ke/clock.c 2005-07-31 09:48:12 UTC (rev 16917) @@ -305,17 +305,15 @@ /* FIXME: Do DPC rate adjustments */ - /* - * RACE CONDITION WARNING. If one stays at DISPATCH_LEVEL for a long - * time the DPC routine which checks for quantum end will not be executed - * and decrementing the quantum here would result in overflow. - */ - if (CurrentThread->Quantum < 0) - return; - /* * If we're at end of quantum request software interrupt. The rest * is handled in KiDispatchInterrupt. + * + * NOTE: If one stays at DISPATCH_LEVEL for a long time the DPC routine + * which checks for quantum end will not be executed and decrementing + * the quantum here can result in overflow. This is not a problem since + * we don't care about the quantum value anymore after the QuantumEnd + * flag is set. */ if ((CurrentThread->Quantum -= 3) <= 0) {

1 0

[mf] 16916: set eol-style for all remaining XML files
by mf＠svn.reactos.com 31 Jul '05

31 Jul '05

set eol-style for all remaining XML files Modified: trunk/reactos/apps/utils/net/finger/finger.xml Modified: trunk/reactos/apps/utils/net/whois/whois.xml Modified: trunk/reactos/drivers/usb/miniport/usbehci/usbehci.xml Modified: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml Modified: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml Modified: trunk/reactos/drivers/usb/usbd/usbd.xml Modified: trunk/reactos/drivers/usb/usbport/usbport.xml Modified: trunk/reactos/lib/shell32/shell32.xml _____ Modified: trunk/reactos/apps/utils/net/finger/finger.xml --- trunk/reactos/apps/utils/net/finger/finger.xml 2005-07-31 07:08:15 UTC (rev 16915) +++ trunk/reactos/apps/utils/net/finger/finger.xml 2005-07-31 08:33:39 UTC (rev 16916) @@ -1,12 +1,12 @@ -<module name="finger" type="win32cui" installbase="system32" installname="finger.exe"> - <include base="finger">.</include> +<module name="finger" type="win32cui" installbase="system32" installname="finger.exe"> + <include base="finger">.</include> <define name="__USE_W32API" /> - <define name="__USE_W32_SOCKETS" /> - <library>kernel32</library> - <library>ws2_32</library> - <file>finger.c</file> - <file>err.c</file> - <file>getopt.c</file> - <file>net.c</file> - <file>finger.rc</file> -</module> + <define name="__USE_W32_SOCKETS" /> + <library>kernel32</library> + <library>ws2_32</library> + <file>finger.c</file> + <file>err.c</file> + <file>getopt.c</file> + <file>net.c</file> + <file>finger.rc</file> +</module> Property changes on: trunk/reactos/apps/utils/net/finger/finger.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/utils/net/whois/whois.xml --- trunk/reactos/apps/utils/net/whois/whois.xml 2005-07-31 07:08:15 UTC (rev 16915) +++ trunk/reactos/apps/utils/net/whois/whois.xml 2005-07-31 08:33:39 UTC (rev 16916) @@ -1,8 +1,8 @@ -<module name="whois" type="win32cui" installbase="system32" installname="whois.exe"> +<module name="whois" type="win32cui" installbase="system32" installname="whois.exe"> <define name="__USE_W32API" /> - <include base="whois">.</include> - <library>kernel32</library> - <library>ws2_32</library> - <file>whois.c</file> - <file>whois.rc</file> -</module> + <include base="whois">.</include> + <library>kernel32</library> + <library>ws2_32</library> + <file>whois.c</file> + <file>whois.rc</file> +</module> Property changes on: trunk/reactos/apps/utils/net/whois/whois.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/drivers/usb/miniport/usbehci/usbehci.xml --- trunk/reactos/drivers/usb/miniport/usbehci/usbehci.xml 2005-07-31 07:08:15 UTC (rev 16915) +++ trunk/reactos/drivers/usb/miniport/usbehci/usbehci.xml 2005-07-31 08:33:39 UTC (rev 16916) @@ -1,9 +1,9 @@ -<module name="usbehci" type="kernelmodedriver" installbase="system32/drivers" installname="usbehci.sys"> +<module name="usbehci" type="kernelmodedriver" installbase="system32/drivers" installname="usbehci.sys"> <define name="__USE_W32API" /> - <include base="ntoskrnl">include</include> - <library>ntoskrnl</library> + <include base="ntoskrnl">include</include> + <library>ntoskrnl</library> <library>hal</library> - <library>usbport</library> - <file>usbehci.c</file> - <file>usbehci.rc</file> -</module> + <library>usbport</library> + <file>usbehci.c</file> + <file>usbehci.rc</file> +</module> Property changes on: trunk/reactos/drivers/usb/miniport/usbehci/usbehci.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml --- trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml 2005-07-31 07:08:15 UTC (rev 16915) +++ trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml 2005-07-31 08:33:39 UTC (rev 16916) @@ -1,9 +1,9 @@ -<module name="usbohci" type="kernelmodedriver" installbase="system32/drivers" installname="usbohci.sys"> - <define name="__USE_W32API" /> +<module name="usbohci" type="kernelmodedriver" installbase="system32/drivers" installname="usbohci.sys"> + <define name="__USE_W32API" /> <include base="ntoskrnl">include</include> - <library>ntoskrnl</library> + <library>ntoskrnl</library> <library>hal</library> - <library>usbport</library> - <file>usbohci.c</file> - <file>usbohci.rc</file> -</module> + <library>usbport</library> + <file>usbohci.c</file> + <file>usbohci.rc</file> +</module> Property changes on: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml --- trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml 2005-07-31 07:08:15 UTC (rev 16915) +++ trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml 2005-07-31 08:33:39 UTC (rev 16916) @@ -1,9 +1,9 @@ -<module name="usbuhci" type="kernelmodedriver" installbase="system32/drivers" installname="usbuhci.sys"> +<module name="usbuhci" type="kernelmodedriver" installbase="system32/drivers" installname="usbuhci.sys"> <define name="__USE_W32API" /> - <include base="ntoskrnl">include</include> - <library>ntoskrnl</library> + <include base="ntoskrnl">include</include> + <library>ntoskrnl</library> <library>hal</library> - <library>usbport</library> - <file>usbuhci.c</file> - <file>usbuhci.rc</file> -</module> + <library>usbport</library> + <file>usbuhci.c</file> + <file>usbuhci.rc</file> +</module> Property changes on: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/drivers/usb/usbd/usbd.xml --- trunk/reactos/drivers/usb/usbd/usbd.xml 2005-07-31 07:08:15 UTC (rev 16915) +++ trunk/reactos/drivers/usb/usbd/usbd.xml 2005-07-31 08:33:39 UTC (rev 16916) @@ -1,8 +1,8 @@ -<module name="usbd" type="kernelmodedriver" installbase="system32/drivers" installname="usbd.sys"> +<module name="usbd" type="kernelmodedriver" installbase="system32/drivers" installname="usbd.sys"> <importlibrary definition="usbd.def" /> - <define name="__USE_W32API" /> - <library>ntoskrnl</library> - <library>hal</library> - <file>usbd.c</file> - <file>usbd.rc</file> -</module> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <file>usbd.c</file> + <file>usbd.rc</file> +</module> Property changes on: trunk/reactos/drivers/usb/usbd/usbd.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/drivers/usb/usbport/usbport.xml --- trunk/reactos/drivers/usb/usbport/usbport.xml 2005-07-31 07:08:15 UTC (rev 16915) +++ trunk/reactos/drivers/usb/usbport/usbport.xml 2005-07-31 08:33:39 UTC (rev 16916) @@ -1,9 +1,9 @@ -<module name="usbport" type="kernelmodedriver" installbase="system32/drivers" installname="usbport.sys"> +<module name="usbport" type="kernelmodedriver" installbase="system32/drivers" installname="usbport.sys"> <importlibrary definition="usbport.def" /> <define name="__USE_W32API" /> <include base="ntoskrnl">include</include> - <library>ntoskrnl</library> - <library>hal</library> - <file>usbport.c</file> - <file>usbport.rc</file> -</module> + <library>ntoskrnl</library> + <library>hal</library> + <file>usbport.c</file> + <file>usbport.rc</file> +</module> Property changes on: trunk/reactos/drivers/usb/usbport/usbport.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shell32/shell32.xml --- trunk/reactos/lib/shell32/shell32.xml 2005-07-31 07:08:15 UTC (rev 16915) +++ trunk/reactos/lib/shell32/shell32.xml 2005-07-31 08:33:39 UTC (rev 16916) @@ -1,62 +1,62 @@ -<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" warnings="true"> - <importlibrary definition="shell32.spec.def" /> - <include base="shell32">.</include> - <include base="ReactOS">include/wine</include> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <define name="_SHELL32_" /> - <define name="COM_NO_WINDOWS_H" /> - <library>wine</library> - <library>uuid</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>gdi32</library> - <library>user32</library> - <library>comctl32</library> - <library>shlwapi</library> - <library>ole32</library> - <file>authors.c</file> - <file>autocomplete.c</file> - <file>brsfolder.c</file> - <file>changenotify.c</file> - <file>classes.c</file> - <file>clipboard.c</file> - <file>control.c</file> - <file>cpanelfolder.c</file> - <file>dataobject.c</file> - <file>debughlp.c</file> - <file>dialogs.c</file> - <file>dragdrophelper.c</file> - <file>enumidlist.c</file> - <file>folders.c</file> - <file>iconcache.c</file> - <file>memorystream.c</file> - <file>pidl.c</file> - <file>regsvr.c</file> - <file>shell32_main.c</file> - <file>shelllink.c</file> - <file>shellole.c</file> - <file>shellord.c</file> - <file>shellpath.c</file> - <file>shellreg.c</file> - <file>shellstring.c</file> - <file>shfldr_desktop.c</file> - <file>shfldr_fs.c</file> - <file>shfldr_mycomp.c</file> - <file>shlexec.c</file> - <file>shlfileop.c</file> - <file>shlfolder.c</file> - <file>shlfsbind.c</file> - <file>shlmenu.c</file> - <file>shlview.c</file> - <file>shpolicy.c</file> - <file>shv_bg_cmenu.c</file> - <file>shv_item_cmenu.c</file> - <file>ros-systray.c</file> - <file>shres.rc</file> - <file>shell32.spec</file> -</module> +<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" warnings="true"> + <importlibrary definition="shell32.spec.def" /> + <include base="shell32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_SHELL32_" /> + <define name="COM_NO_WINDOWS_H" /> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>gdi32</library> + <library>user32</library> + <library>comctl32</library> + <library>shlwapi</library> + <library>ole32</library> + <file>authors.c</file> + <file>autocomplete.c</file> + <file>brsfolder.c</file> + <file>changenotify.c</file> + <file>classes.c</file> + <file>clipboard.c</file> + <file>control.c</file> + <file>cpanelfolder.c</file> + <file>dataobject.c</file> + <file>debughlp.c</file> + <file>dialogs.c</file> + <file>dragdrophelper.c</file> + <file>enumidlist.c</file> + <file>folders.c</file> + <file>iconcache.c</file> + <file>memorystream.c</file> + <file>pidl.c</file> + <file>regsvr.c</file> + <file>shell32_main.c</file> + <file>shelllink.c</file> + <file>shellole.c</file> + <file>shellord.c</file> + <file>shellpath.c</file> + <file>shellreg.c</file> + <file>shellstring.c</file> + <file>shfldr_desktop.c</file> + <file>shfldr_fs.c</file> + <file>shfldr_mycomp.c</file> + <file>shlexec.c</file> + <file>shlfileop.c</file> + <file>shlfolder.c</file> + <file>shlfsbind.c</file> + <file>shlmenu.c</file> + <file>shlview.c</file> + <file>shpolicy.c</file> + <file>shv_bg_cmenu.c</file> + <file>shv_item_cmenu.c</file> + <file>ros-systray.c</file> + <file>shres.rc</file> + <file>shell32.spec</file> +</module> Property changes on: trunk/reactos/lib/shell32/shell32.xml ___________________________________________________________________ Name: svn:eol-style + native

1 0

[ea] 16915: Document pch and linkerflag elements.
by ea＠svn.reactos.com 31 Jul '05

31 Jul '05

Document pch and linkerflag elements. Rename Elements sections into Children. Add Parents sections for some elements. Make link work (tested with DBK=>HTML). Modified: trunk/reactos/tools/rbuild/doc/rbuild.dbk _____ Modified: trunk/reactos/tools/rbuild/doc/rbuild.dbk --- trunk/reactos/tools/rbuild/doc/rbuild.dbk 2005-07-31 07:07:26 UTC (rev 16914) +++ trunk/reactos/tools/rbuild/doc/rbuild.dbk 2005-07-31 07:08:15 UTC (rev 16915) @@ -83,100 +83,31 @@ <module name="bootcd" type="iso"> </module> </project></programlisting></para> + </section> - <section> - <title>XInclude</title> + <section> + <title>XInclude</title> - <para>XML files used by <command>rbuild</command> are modular and use - XInclude to include other chunks of XML in the top-level ReactOS.xml - file. The namespace used by XInclude is <literal>xi</literal>.</para> + <para>XML files used by <command>rbuild</command> are modular and use + XInclude to include other chunks of XML in the top-level + <filename>ReactOS.xml</filename> file. The namespace used by XInclude is + <literal>xi</literal>.</para> - <section> - <title>xi:include</title> + <section id="element.xi.include"> + <title>xi:include</title> - <para>It is possible to split an XML build file over several files. - The include element in the <literal>xi</literal> namespace is used - to accomplish this.</para> + <para>It is possible to split an XML build file over several files. + The include element in the <literal>xi</literal> namespace is used to + accomplish this.</para> - <section> - <title>Syntax</title> - - <programlisting> <xi:include href="config.xml"> - <xi:fallback> - <xi:include href="config.template.xml" /> - </xi:fallback> - </xi:include></programlisting> - </section> - - <section> - <title>Attributes</title> - - <para><variablelist> - <varlistentry> - <term>href</term> - - <listitem> - <para>Name of XML build file to include. The filename is - relative to the location of the current XML build - file.</para> - </listitem> - </varlistentry> - </variablelist></para> - </section> - - <section> - <title>Value</title> - - <para>None.</para> - </section> - - <section> - <title>Elements</title> - - <para>xi:fallback</para> - </section> - </section> - <section> - <title>xi:fallback</title> - - <para>This element is used to provide the name of an alternate file - that is to be included if the first include file did not - exists.</para> - - <section> - <title>Attributes</title> - - <para>None.</para> - </section> - - <section> - <title>Value</title> - - <para>None.</para> - </section> - - <section> - <title>Elements</title> - - <para>xi:include</para> - </section> - </section> - </section> - - <section> - <title xreflabel="element_project">Project element</title> - - <para>There can be one <sgmltag class="element">project</sgmltag> per - top-level XML build file. A project can only be defined in a top-level - XML build file.</para> - - <section> <title>Syntax</title> - <para><programlisting><project name="ReactOS" makefile="Makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> - ... -</project></programlisting></para> + <programlisting><xi:include href="<replaceable>config.xml</replaceable>"> + <xi:fallback> + <xi:include href="<replaceable>config.template.xml</replaceable>" /> + </xi:fallback> +</xi:include></programlisting> </section> <section> @@ -184,21 +115,14 @@ <para><variablelist> <varlistentry> - <term>name</term> + <term>href</term> <listitem> - <para>Name of the project.</para> + <para>Name of XML build file to include. The filename is + relative to the location of the current XML build + file.</para> </listitem> </varlistentry> - - <varlistentry> - <term>makefile</term> - - <listitem> - <para>Filename of the GNU makefile that is to be - created.</para> - </listitem> - </varlistentry> </variablelist></para> </section> @@ -209,447 +133,31 @@ </section> <section> - <title>Elements</title> + <title>Children</title> - <para><link linkend="element_define">define</link>, <link - linkend="element_directory">directory</link>, <link - linkend="element_if">if</link>, <link - linkend="element_include">include</link>, <link - linkend="element_module">module</link>, <link - linkend="element_property">property</link>.</para> + <para><link linkend="???">xi:fallback</link>.</para> </section> </section> - <section> - <title xreflabel="element_module">Module element</title> + <section id="element.xi.fallback"> + <title>xi:fallback</title> - <para>There can be zero or more <sgmltag - class="element">module</sgmltag>s per XML build file.</para> + <para>This element is used to provide the name of an alternate file + that is to be included if the first include file did not + exists.</para> <section> <title>Syntax</title> - <para><programlisting><module if="${MP}" ifnot="${MP}" name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" usewrc="false" warnings="true" aliasof="module1"> - ... -</module></programlisting></para> + <programlisting><xi:fallback> + <xi:include href="<replaceable>config.template.xml</replaceable>" /> +</xi:fallback></programlisting> </section> <section> <title>Attributes</title> - <para><variablelist> - <varlistentry> - <term>if</term> - - <listitem> - <para>If the value is 1, then the module is enabled, - otherwise it is disabled. A disabled module is not - processed.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>ifnot</term> - - <listitem> - <para>If the value is 1, then the module is disabled, - otherwise it is enabled. A disabled module is not - processed.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>name</term> - - <listitem> - <para>Name of the module. Also the base name of the - generated file if such file is generated for the particular - module type.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>type</term> - - <listitem> - <para>Type of module. See below for an explanation of module - types. <emphasis><emphasis>The module type determines the - actions that is to be carried out to process the module. The - defined module types are seen - below:</emphasis></emphasis></para> - - <table> - <title>Module Types</title> - - <tgroup cols="6"> - <thead> - <row> - <entry>Value</entry> - - <entry>Output name suffix</entry> - - <entry>Entrypoint</entry> - - <entry>Baseaddress</entry> - - <entry>Mangledsymbols</entry> - - <entry>Description</entry> - </row> - </thead> - - <tbody> - <row> - <entry>buildtool</entry> - - <entrytbl cols="2"> - <tbody> - <row> - <entry><filename>.exe</filename> (Windows)</entry> - - <entry>none (Linux)</entry> - </row> - </tbody> - </entrytbl> - - <entry>-</entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>Builds a tool that can be run (invoked) when - building ReactOS.</entry> - </row> - - <row> - <entry>staticlibrary</entry> - - <entry><filename>.a</filename></entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>Builds a static library containing object - files that can be linked together with other - modules.</entry> - </row> - - <row> - <entry>objectlibrary</entry> - - <entry><filename>.o</filename></entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>Builds object files that can be linked - together with other modules.</entry> - </row> - - <row> - <entry>kernel</entry> - - <entry><filename>.exe</filename></entry> - - <entry><function>_NtProcessStartup</function></entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>Builds - <filename>ntoskrnl.exe</filename>.</entry> - </row> - - <row> - <entry>kernelmodedll</entry> - - <entry><filename>.dll</filename></entry> - - <entry><function>_DriverEntry@8</function></entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>Builds a kernel-mode DLL.</entry> - </row> - - <row> - <entry>kernelmodedriver</entry> - - <entry><filename>.sys</filename></entry> - - <entry><function>_DriverEntry@8</function></entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>Builds a kernel-mode driver.</entry> - </row> - - <row> - <entry>nativedll</entry> - - <entry><filename>.dll</filename></entry> - - <entry><function>_DllMainCRTStartup@12</function></entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>Builds a native DLL.</entry> - </row> - - <row> - <entry>win32dll</entry> - - <entry><filename>.dll</filename></entry> - - <entry><function>_DllMain@12</function></entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>Builds a Win32 DLL.</entry> - </row> - - <row> - <entry>win32cui</entry> - - <entry><filename>.exe</filename></entry> - - <entry><function>_mainCRTStartup</function></entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>Builds a Win32 console executable.</entry> - </row> - - <row> - <entry>win32gui</entry> - - <entry><filename>.exe</filename></entry> - - <entry><function>_WinMainCRTStartup</function></entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>Builds a Win32 GUI executable.</entry> - </row> - - <row> - <entry>bootloader</entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>Builds a bootloader.</entry> - </row> - - <row> - <entry>bootsector</entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>Builds one or more bootsector binaries. The - entrypoint, baseaddress, and mangledsymbols module - attributes are not applicable for this module - type.</entry> - </row> - - <row> - <entry>iso</entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>-.</entry> - - <entry>Builds a bootable CD.</entry> - </row> - - <row> - <entry>test</entry> - - <entry>.exe</entry> - - <entry>_mainCRTStartup</entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>Builds a testsuite.</entry> - </row> - - <row> - <entry>rpcserver</entry> - - <entry><filename>.o</filename></entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>Generates and builds server code for an RPC - interface.</entry> - </row> - - <row> - <entry>rpcclient</entry> - - <entry><filename>.o</filename></entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>Generates and builds client code for an RPC - interface.</entry> - </row> - - <row> - <entry>alias</entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>-</entry> - - <entry>Module is an alias for another module. This - module type is the only module type for which the - aliasof attribute is applicable. Only the module - install functionality is aliased.</entry> - </row> - </tbody> - </tgroup> - </table> - </listitem> - </varlistentry> - - <varlistentry> - <term>extension</term> - - <listitem> - <para>Extension of the generated file if such file is - generated for the particular module type.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>entrypoint</term> - - <listitem> - <para>Entrypoint symbol of the generated file if such file - is generated for the particular module type.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>baseaddress</term> - - <listitem> - <para>Base address of the generated file if such file is - generated for the particular module type.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>mangledsymbols</term> - - <listitem> - <para>Controls wether or not to pass --kill-at to dlltool. - If this attribute has the value false then --kill-at is - passed to dlltool. If the value is true, then --kill-at is - not passed to dlltool. If the generated file exports C++ - classes then this need to be true.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>installbase</term> - - <listitem> - <para>Base directory of the generated file in the - installation directory. This attribute is optional.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>installname</term> - - <listitem> - <para>Name of generated file in the installation directory. - This attribute is optional, but if not specified, the - generated file is not copied to the installation - directory.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>usewrc</term> - - <listitem> - <para>Use WRC to compile resources if true. If false, - windres is used. This attribute is optional. If not - specified, WRC will be used.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>warnings</term> - - <listitem> - <para>Error out if false and at least one warning is emitted - during building of this module. This attribute is optional. - If not specified, it is assumed to be false.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>aliasof</term> - - <listitem> - <para>Name of module that is aliased.</para> - </listitem> - </varlistentry> - </variablelist></para> + <para>None.</para> </section> <section> @@ -659,26 +167,25 @@ </section> <section> - <title>Elements</title> + <title>Parents</title> - <para><link linkend="element_bootstrap">bootstrap</link>, <link - linkend="element_component">component</link>, <link - linkend="element_define">define</link>, <link - linkend="element_dependency">dependency</link>, <link - linkend="element_directory">directory</link>, <link - linkend="element_file">file</link>, <link - linkend="element_if">if</link>, <link - linkend="element_importlibrary">importlibrary</link>, <link - linkend="element_include">include</link>, <link - linkend="element_invoke">invoke</link>, <link - linkend="element_library">library</link>, <link - linkend="element_property">property</link>.</para> + <para><link linkend="element.xi.include">xi:include</link>.</para> </section> + + <section> + <title>Children</title> + + <para><link linkend="element.xi.include">xi:include</link>.</para> + </section> </section> + </section> - <section> - <title xreflabel="element_bootstrap">Bootstrap element</title> + <section> + <title>Element reference</title> + <section id="element.bootstrap"> + <title>Bootstrap element</title> + <para>A bootstrap element specifies that the generated file should be put on the bootable CD as a bootstrap file.</para> @@ -696,7 +203,7 @@ <term>base</term> <listitem> - <para> Put file in this directory on the bootable CD. This + <para>Put file in this directory on the bootable CD. This attribute is optional.</para> </listitem> </varlistentry> @@ -705,7 +212,7 @@ <term>nameoncd</term> <listitem> - <para> Name of file on the bootable CD. This attribute is + <para>Name of file on the bootable CD. This attribute is optional.</para> </listitem> </varlistentry> @@ -719,14 +226,14 @@ </section> <section> - <title>Elements</title> + <title>Children</title> <para>None.</para> </section> </section> - <section> - <title xreflabel="element_cdfile">CDFile element</title> + <section id="element.cdfile"> + <title>CDFile element</title> <para>A cdfile element specifies the name of a file that is to be put on the bootable CD.</para> @@ -745,7 +252,7 @@ <term>base</term> <listitem> - <para> Put file in this directory on the bootable CD. This + <para>Put file in this directory on the bootable CD. This attribute is optional.</para> </listitem> </varlistentry> @@ -768,14 +275,14 @@ </section> <section> - <title>Elements</title> + <title>Children</title> <para>None.</para> </section> </section> - <section> - <title xreflabel="element_component">Component element</title> + <section id="element.component"> + <title>Component element</title> <para>A component element specifies that imports from a library are to be stubbed so tests can be run without actually calling the functions @@ -811,62 +318,22 @@ </section> <section> - <title>Elements</title> + <title>Children</title> - <para><link linkend="element_symbol">symbol</link>.</para> + <para><link linkend="element.symbol">symbol</link>.</para> </section> </section> - <section> - <title xreflabel="element_symbol">Symbol element</title> + <section id="element.define"> + <title>Define element</title> - <para>A symbol element specifies an imported function from a library - that is to be stubbed so tests can be run without actually calling the - function in the library.</para> - - <section> - <title>Syntax</title> - - <para><programlisting><symbol newname="RtlAllocateHeap">HeapAlloc@12</symbol></programlisting ></para> - </section> - - <section> - <title>Attributes</title> - - <para><variablelist> - <varlistentry> - <term>newname</term> - - <listitem> - <para>New name of symbol. This attribute is optional.</para> - </listitem> - </varlistentry> - </variablelist></para> - </section> - - <section> - <title>Value</title> - - <para>Name of symbol.</para> - </section> - - <section> - <title>Elements</title> - - <para>None.</para> - </section> - </section> - - <section> - <title xreflabel="element_define">Define element</title> - <para>A define element specifies the name and (optionally) value of a define for the C/C++ compiler and resource compiler.</para> <section> <title>Syntax</title> - <para><programlisting><define name="WINVER">0x501</define></programlisting></para> + <para><programlisting><define name="<replaceable>WINVER</replaceable>"><replaceable>0x501</replacea ble></define></programlisting></para> </section> <section> @@ -877,7 +344,7 @@ <term>name</term> <listitem> - <para> Name of define.</para> + <para>Name of define.</para> </listitem> </varlistentry> </variablelist></para> @@ -890,14 +357,14 @@ </section> <section> - <title>Elements</title> + <title>Children</title> <para>None.</para> </section> </section> - <section> - <title xreflabel="element_dependency">Dependency element</title> + <section id="element.dependency"> + <title>Dependency element</title> <para>A dependency element specifies the name of a module (usually of type buildtool) that is to be processed before the current @@ -906,7 +373,7 @@ <section> <title>Syntax</title> - <para><programlisting><dependency>OtherModule</dependency></ programlisting></para> + <para><programlisting><dependency><replaceable>OtherModule</replac eable></dependency></programlisting></para> </section> <section> @@ -922,14 +389,14 @@ </section> <section> - <title>Elements</title> + <title>Children</title> <para>None.</para> </section> </section> - <section> - <title xreflabel="element_directory">Directory element</title> + <section id="element.directory"> + <title>Directory element</title> <para>A directory element specifies the name of a subdirectory.</para> @@ -962,18 +429,19 @@ </section> <section> - <title>Elements</title> + <title>Children</title> - <para><link linkend="element_cdfile">cdfile</link>, <link - linkend="element_directory">directory</link>, <link - linkend="element_file">file</link>, <link - linkend="element_if">if</link>, <link - linkend="element_property">property</link>.</para> + <para><link linkend="element.cdfile">cdfile</link>, <link + linkend="element.directory">directory</link>, <link + linkend="element.file">file</link>, <link + linkend="element.if">if</link>, <link + linkend="element.pch">pch</link>, <link + linkend="element.property">property</link>.</para> </section> </section> - <section> - <title xreflabel="element_file">File element</title> + <section id="element.file"> + <title>File element</title> <para>A file element specifies the name of a file that is to be processed.</para> @@ -997,14 +465,14 @@ </section> <section> - <title>Elements</title> + <title>Children</title> <para>None.</para> </section> </section> - <section> - <title xreflabel="element_if">If element</title> + <section id="element.if"> + <title>If element</title> <para>An if element allows for conditional processing of other elements.</para> @@ -1012,7 +480,7 @@ <section> <title>Syntax</title> - <para><programlisting><if property="DBG" value="1"> + <para><programlisting><if property="<replaceable>DBG</replaceable>" value="<replaceable>1</replaceable>"> ... </if></programlisting></para> </section> @@ -1048,20 +516,20 @@ </section> <section> - <title>Elements</title> + <title>Children</title> - <para><link linkend="element_compilerflag">compilerflag</link>, - <link linkend="element_define">define</link>, <link - linkend="element_directory">directory</link>, <link - linkend="element_file">file</link>, <link - linkend="element_if">if</link>, <link - linkend="element_include">include</link>, <link - linkend="element_property">property</link>.</para> + <para><link linkend="element.compilerflag">compilerflag</link>, + <link linkend="element.define">define</link>, <link + linkend="element.directory">directory</link>, <link + linkend="element.file">file</link>, <link + linkend="element.if">if</link>, <link + linkend="element.include">include</link>, <link + linkend="element.property">property</link>.</para> </section> </section> - <section> - <title xreflabel="element_importlibrary">Importlibrary element</title> + <section id="element.importlibrary"> + <title>Importlibrary element</title> <para>An importlibrary element specifies that an import library should be generated which other modules can use to link with the current @@ -1097,14 +565,14 @@ </section> <section> - <title>Elements</title> + <title>Children</title> <para>None.</para> </section> </section> - <section> - <title xreflabel="element_include">Include element</title> + <section id="element.include"> + <title>Include element</title> <para>An include element specifies an include directory for the C/C++ compiler and resource compiler.</para> @@ -1126,7 +594,7 @@ <para>Module or project which the value of this element is relative to. This attribute is optional. If left out, the include directory is relative to the position of the - top-level xml build file.</para> + top-level XML build file.</para> </listitem> </varlistentry> </variablelist></para> @@ -1139,15 +607,102 @@ </section> <section> - <title>Elements</title> + <title>Children</title> <para>None.</para> </section> </section> - <section> - <title xreflabel="element_installfile">Installfile element</title> + <section id="element.input"> + <title>Input element</title> + <para>An input element specifies a group of filenames that is to be + passed as parameters to a build tool. Input filename parameters are + located after output filename parameters on the command line.</para> + + <section> + <title>Syntax</title> + + <para><programlisting><input> + ... +</input></programlisting></para> + </section> + + <section> + <title>Attributes</title> + + <para>None.</para> + </section> + + <section> + <title>Value</title> + + <para>None.</para> + </section> + + <section> + <title>Parents</title> + + <para><link linkend="element.invoke">invoke</link>.</para> + </section> + + <section> + <title>Children</title> + + <para><link linkend="element.inputfile">inputfile</link>.</para> + </section> + </section> + + <section id="element.inputfile"> [truncated at 1000 lines; 952 more skipped]

1 0

[ea] 16914: Turn NTDLL.DLL a SUBSYSTEM_WINDOWS_CUI PE image (Casper Hornstrup suggested to use -nostartfiles, for the compilation to succeed).
by ea＠svn.reactos.com 31 Jul '05

31 Jul '05

Turn NTDLL.DLL a SUBSYSTEM_WINDOWS_CUI PE image (Casper Hornstrup suggested to use -nostartfiles, for the compilation to succeed). Modified: trunk/reactos/lib/ntdll/ntdll.xml _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-07-31 06:22:05 UTC (rev 16913) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-07-31 07:07:26 UTC (rev 16914) @@ -1,4 +1,4 @@ -<module name="ntdll" type="nativedll" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll"> +<module name="ntdll" type="win32dll" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll"> <bootstrap base="reactos/system32" /> <importlibrary definition="def/ntdll.def" /> <include base="ntdll">inc</include> @@ -11,6 +11,7 @@ <library>intrlck</library> <library>string</library> <linkerflag>-lgcc</linkerflag> + <linkerflag>-nostartfiles</linkerflag> <directory name="csr"> <file>capture.c</file> <file>lpc.c</file>

1 0

[ion] 16913: - Silence some debug messages
by ion＠svn.reactos.com 31 Jul '05

31 Jul '05

- Silence some debug messages - Modify base address of iphlpapi so it doesn't get relocated - Implemented SetTaskmanWindow and SetProgmanWindow Modified: trunk/reactos/baseaddress.xml Modified: trunk/reactos/lib/user32/windows/window.c Modified: trunk/reactos/subsys/csrss/win32csr/conio.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-07-31 05:46:42 UTC (rev 16912) +++ trunk/reactos/baseaddress.xml 2005-07-31 06:22:05 UTC (rev 16913) @@ -61,8 +61,8 @@ <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> <property name="BASEADDRESS_FMIFS" value="0x76df0000" /> <property name="BASEADDRESS_SHELL32" value="0x77260000" /> -<property name="BASEADDRESS_IPHLPAPI" value="0x77300000" /> -<property name="BASEADDRESS_MMDRV" value="0x77500000" /> +<property name="BASEADDRESS_IPHLPAPI" value="0x77400000" /> +<property name="BASEADDRESS_MMDRV" value="0x77530000" /> <property name="BASEADDRESS_CRTDLL" value="0x77630000" /> <property name="BASEADDRESS_CFGMGR32" value="0x77700000" /> <property name="BASEADDRESS_MSAFD" value="0x777a0000" /> _____ Modified: trunk/reactos/lib/user32/windows/window.c --- trunk/reactos/lib/user32/windows/window.c 2005-07-31 05:46:42 UTC (rev 16912) +++ trunk/reactos/lib/user32/windows/window.c 2005-07-31 06:22:05 UTC (rev 16913) @@ -1467,25 +1467,23 @@ } /* - * @unimplemented + * @implemented */ HWND STDCALL -SetTaskmanWindow(HWND x) +SetTaskmanWindow(HWND hWnd) { - UNIMPLEMENTED; - return FALSE; + return NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETTASKMANWINDOW); } /* - * @unimplemented + * @implemented */ HWND STDCALL -SetProgmanWindow(HWND x) +SetProgmanWindow(HWND hWnd) { - UNIMPLEMENTED; - return FALSE; + return NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETTASKMANWINDOW); } /* _____ Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-07-31 05:46:42 UTC (rev 16912) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-07-31 06:22:05 UTC (rev 16913) @@ -226,7 +226,7 @@ PCSRSS_CONSOLE Console; NTSTATUS Status; - DPRINT1("CsrAllocConsole\n"); + DPRINT("CsrAllocConsole\n"); Request->Header.MessageSize = sizeof(CSR_API_MESSAGE); Request->Header.DataSize = sizeof(CSR_API_MESSAGE) - LPC_MESSAGE_BASE_SIZE; @@ -250,7 +250,7 @@ /* If we don't need a console, then get out of here */ if (!Request->Data.AllocConsoleRequest.ConsoleNeeded) { - DPRINT1("No console needed\n"); + DPRINT("No console needed\n"); return STATUS_SUCCESS; } @@ -336,7 +336,7 @@ /* Set the Ctrl Dispatcher */ ProcessData->CtrlDispatcher = Request->Data.AllocConsoleRequest.CtrlDispatcher; - DPRINT1("CSRSS:CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher); + DPRINT("CSRSS:CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher); /* Insert into the list */ InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ProcessEntry); _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-07-31 05:46:42 UTC (rev 16912) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-07-31 06:22:05 UTC (rev 16913) @@ -11,7 +11,7 @@ #include <w32k.h> -#define DEBUG +#define NDEBUG #include <debug.h> /* registered Logon process */ @@ -716,6 +716,9 @@ return Ret; } +/* + * @unimplemented + */ HWND STDCALL NtUserCallHwndOpt( @@ -725,15 +728,23 @@ switch (Routine) { case HWNDOPT_ROUTINE_SETPROGMANWINDOW: - /* FIXME */ + /* + * FIXME + * Nothing too hard...validate the hWnd and save it in the Desktop Info + */ + DPRINT1("HWNDOPT_ROUTINE_SETPROGMANWINDOW UNIMPLEMENTED\n"); break; case HWNDOPT_ROUTINE_SETTASKMANWINDOW: - /* FIXME */ + /* + * FIXME + * Nothing too hard...validate the hWnd and save it in the Desktop Info + */ + DPRINT1("HWNDOPT_ROUTINE_SETTASKMANWINDOW UNIMPLEMENTED\n"); break; } - return 0; + return Param; } /*

1 0

[ion] 16912: Define NDEBUG
by ion＠svn.reactos.com 31 Jul '05

31 Jul '05

Define NDEBUG Modified: trunk/reactos/subsys/system/dhcp/util.c _____ Modified: trunk/reactos/subsys/system/dhcp/util.c --- trunk/reactos/subsys/system/dhcp/util.c 2005-07-31 05:43:10 UTC (rev 16911) +++ trunk/reactos/subsys/system/dhcp/util.c 2005-07-31 05:46:42 UTC (rev 16912) @@ -1,7 +1,9 @@ #include <stdarg.h> -#include <reactos/debug.h> #include "rosdhcp.h" +#define NDEBUG +#include <reactos/debug.h> + char *piaddr( struct iaddr addr ) { struct sockaddr_in sa; memcpy(&sa.sin_addr,addr.iabuf,sizeof(sa.sin_addr));

1 0

[ion] 16911: Silence debug messages
by ion＠svn.reactos.com 31 Jul '05

31 Jul '05

Silence debug messages Modified: trunk/reactos/lib/kernel32/misc/dllmain.c Modified: trunk/reactos/lib/kernel32/process/create.c _____ Modified: trunk/reactos/lib/kernel32/misc/dllmain.c --- trunk/reactos/lib/kernel32/misc/dllmain.c 2005-07-31 03:27:04 UTC (rev 16910) +++ trunk/reactos/lib/kernel32/misc/dllmain.c 2005-07-31 05:43:10 UTC (rev 16911) @@ -94,16 +94,16 @@ WCHAR lpTest[MAX_PATH]; GetModuleFileNameW(NULL, lpTest, MAX_PATH); - DPRINT1("BasepInitConsole for : %S\n", lpTest); - DPRINT1("Our current console handles are: %lx, %lx, %lx %lx\n", - Parameters->ConsoleHandle, Parameters->StandardInput, - Parameters->StandardOutput, Parameters->StandardError); + DPRINT("BasepInitConsole for : %S\n", lpTest); + DPRINT("Our current console handles are: %lx, %lx, %lx %lx\n", + Parameters->ConsoleHandle, Parameters->StandardInput, + Parameters->StandardOutput, Parameters->StandardError); /* We have nothing to do if this isn't a console app... */ if (RtlImageNtHeader(GetModuleHandle(NULL))->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_WINDOWS_CUI) { - DPRINT1("Image is not a console application\n"); + DPRINT("Image is not a console application\n"); Parameters->ConsoleHandle = NULL; return TRUE; } @@ -115,14 +115,14 @@ if (Parameters->ConsoleHandle == HANDLE_DETACHED_PROCESS) { /* No console to create */ - DPRINT1("No console to create\n"); + DPRINT("No console to create\n"); Parameters->ConsoleHandle = NULL; Request.Data.AllocConsoleRequest.ConsoleNeeded = FALSE; } else if (Parameters->ConsoleHandle == HANDLE_CREATE_NEW_CONSOLE) { /* We'll get the real one soon */ - DPRINT1("Creating new console\n"); + DPRINT("Creating new console\n"); Parameters->ConsoleHandle = NULL; } else if (Parameters->ConsoleHandle == HANDLE_CREATE_NO_WINDOW) @@ -133,7 +133,7 @@ } else { - DPRINT1("Using existing console: %x\n", Parameters->ConsoleHandle); + DPRINT("Using existing console: %x\n", Parameters->ConsoleHandle); } /* Initialize Console Ctrl Handler */ @@ -183,7 +183,7 @@ } } - DPRINT1("Console setup: %lx, %lx, %lx, %lx\n", + DPRINT("Console setup: %lx, %lx, %lx, %lx\n", Parameters->ConsoleHandle, Parameters->StandardInput, Parameters->StandardOutput, _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-07-31 03:27:04 UTC (rev 16910) +++ trunk/reactos/lib/kernel32/process/create.c 2005-07-31 05:43:10 UTC (rev 16911) @@ -86,7 +86,7 @@ CSR_API_MESSAGE CsrRequest; NTSTATUS Status; - DPRINT1("BasepNotifyCsrOfCreation: Process: %lx, Flags %lx\n", + DPRINT("BasepNotifyCsrOfCreation: Process: %lx, Flags %lx\n", ProcessId, dwCreationFlags); /* Fill out the request */ @@ -308,13 +308,12 @@ IN PRTL_USER_PROCESS_PARAMETERS PebParams, IN BOOL InheritHandles) { - DPRINT1("BasepCopyHandles %p %p, %d\n", Params, PebParams, InheritHandles); + DPRINT("BasepCopyHandles %p %p, %d\n", Params, PebParams, InheritHandles); /* Copy the handle if we are inheriting or if it's a console handle */ if (InheritHandles || IsConsoleHandle(PebParams->StandardInput)) { Params->StandardInput = PebParams->StandardInput; - DPRINT1("Standard Input: %x\n", Params->StandardInput); } if (InheritHandles || IsConsoleHandle(PebParams->StandardOutput)) { @@ -352,7 +351,7 @@ UNICODE_STRING Desktop, Shell, Runtime, Title; PPEB OurPeb = NtCurrentPeb(); - DPRINT1("BasepInitializeEnvironment\n"); + DPRINT("BasepInitializeEnvironment\n"); /* Get the full path name */ RetVal = GetFullPathNameW(ApplicationPathName, @@ -481,7 +480,7 @@ /* Write the handles only if we have to */ if (StartupInfo->dwFlags & STARTF_USESTDHANDLES) { - DPRINT1("Using Standard Handles\n"); + DPRINT("Using Standard Handles\n"); ProcessParameters->StandardInput = StartupInfo->hStdInput; ProcessParameters->StandardOutput = StartupInfo->hStdOutput; ProcessParameters->StandardError = StartupInfo->hStdError; @@ -510,7 +509,7 @@ (STARTF_USESTDHANDLES | STARTF_USEHOTKEY | STARTF_SHELLPRIVATE))) { /* Use handles from PEB, if inheriting or they are console */ - DPRINT1("Copying handles from parent\n"); + DPRINT("Copying handles from parent\n"); BasepCopyHandles(ProcessParameters, OurPeb->ProcessParameters, InheritHandles);

1 0

[ion] 16910: Fix error handle output.
by ion＠svn.reactos.com 31 Jul '05

31 Jul '05

Fix error handle output. Modified: trunk/reactos/lib/kernel32/misc/dllmain.c _____ Modified: trunk/reactos/lib/kernel32/misc/dllmain.c --- trunk/reactos/lib/kernel32/misc/dllmain.c 2005-07-31 00:17:57 UTC (rev 16909) +++ trunk/reactos/lib/kernel32/misc/dllmain.c 2005-07-31 03:27:04 UTC (rev 16910) @@ -95,9 +95,9 @@ WCHAR lpTest[MAX_PATH]; GetModuleFileNameW(NULL, lpTest, MAX_PATH); DPRINT1("BasepInitConsole for : %S\n", lpTest); - DPRINT1("Our current console handles are: %lx, %lx, %lx\n", + DPRINT1("Our current console handles are: %lx, %lx, %lx %lx\n", Parameters->ConsoleHandle, Parameters->StandardInput, - Parameters->StandardOutput); + Parameters->StandardOutput, Parameters->StandardError); /* We have nothing to do if this isn't a console app... */ if (RtlImageNtHeader(GetModuleHandle(NULL))->OptionalHeader.Subsystem != @@ -166,29 +166,28 @@ } /* We got the handles, let's set them */ - Parameters->ConsoleHandle = Request.Data.AllocConsoleRequest.Console; - - /* If we already had some, don't use the new ones */ - if (!Parameters->StandardInput) + if ((Parameters->ConsoleHandle = Request.Data.AllocConsoleRequest.Console)) { - Parameters->StandardInput = Request.Data.AllocConsoleRequest.InputHandle; + /* If we already had some, don't use the new ones */ + if (!Parameters->StandardInput) + { + Parameters->StandardInput = Request.Data.AllocConsoleRequest.InputHandle; + } + if (!Parameters->StandardOutput) + { + Parameters->StandardOutput = Request.Data.AllocConsoleRequest.OutputHandle; + } + if (!Parameters->StandardError) + { + Parameters->StandardError = Request.Data.AllocConsoleRequest.OutputHandle; + } } - if (!Parameters->StandardOutput) - { - Parameters->StandardOutput = Request.Data.AllocConsoleRequest.OutputHandle; - } - if (!Parameters->StandardError) - { - Parameters->StandardError = DuplicateConsoleHandle(Request.Data.AllocConsoleRequest.OutputHandle, - 0, - TRUE, - DUPLICATE_SAME_ACCESS); - } - DPRINT1("Console setup: %lx, %lx, %lx\n", + DPRINT1("Console setup: %lx, %lx, %lx, %lx\n", Parameters->ConsoleHandle, Parameters->StandardInput, - Parameters->StandardOutput); + Parameters->StandardOutput, + Parameters->StandardError); return TRUE; }

1 0

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 July 2005