Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[fireball] 28868: - Fix a typo in the code (thanks to "zimme" for spotting).
by fireball＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: fireball Date: Wed Sep 5 12:20:03 2007 New Revision: 28868 URL: http://svn.reactos.org/svn/reactos?rev=28868&view=rev Log: - Fix a typo in the code (thanks to "zimme" for spotting). Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Wed Sep 5 12:20:03 2007 @@ -457,12 +457,12 @@ /* * Page two is reserved for the KUSER_SHARED_DATA */ - MmPageArray[1].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[1].Flags.Consumer = MC_NPPOOL; - MmPageArray[1].Flags.Zero = 0; - MmPageArray[1].ReferenceCount = 0; + MmPageArray[2].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[2].Flags.Consumer = MC_NPPOOL; + MmPageArray[2].Flags.Zero = 0; + MmPageArray[2].ReferenceCount = 0; InsertTailList(&BiosPageListHead, - &MmPageArray[1].ListEntry); + &MmPageArray[2].ListEntry); MmStats.NrReservedPages++; } /* Protect the Page Directory. This will be changed in r3 */

1 0

[fireball] 28867: - Apply 28852 changes to setupldr.c (fixes bootcd).
by fireball＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: fireball Date: Wed Sep 5 12:10:41 2007 New Revision: 28867 URL: http://svn.reactos.org/svn/reactos?rev=28867&view=rev Log: - Apply 28852 changes to setupldr.c (fixes bootcd). Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Wed Sep 5 12:10:41 2007 @@ -22,6 +22,9 @@ #include <freeldr.h> #include <debug.h> +extern ULONG PageDirectoryStart; +extern ULONG PageDirectoryEnd; + ROS_LOADER_PARAMETER_BLOCK LoaderBlock; char reactos_kernel_cmdline[255]; // Command line passed to kernel LOADER_MODULE reactos_modules[64]; // Array to hold boot module info loaded for the kernel @@ -175,6 +178,8 @@ /* Setup multiboot information structure */ LoaderBlock.CommandLine = reactos_kernel_cmdline; + LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart; + LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; LoaderBlock.ModsCount = 0; LoaderBlock.ModsAddr = reactos_modules; LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t);

1 0

[janderwald] 28866: - no comment
by janderwald＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: janderwald Date: Wed Sep 5 03:47:16 2007 New Revision: 28866 URL: http://svn.reactos.org/svn/reactos?rev=28866&view=rev Log: - no comment Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp trunk/reactos/tools/sysreg/sysreg.mak trunk/reactos/tools/sysreg/txtmode.cfg Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Wed Sep 5 03:47:16 2007 @@ -80,7 +80,7 @@ return true; } #else - h_Pipe = open("PipeCmd.c_str()", O_RDONLY); + h_Pipe = open(PipeCmd.c_str(), O_RDONLY); if(INVALID_HANDLE_VALUE == h_Pipe) { cerr << "NamedPipeReader::openPipe> failed to open pipe " << PipeCmd << endl; Modified: trunk/reactos/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.mak?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.mak (original) +++ trunk/reactos/tools/sysreg/sysreg.mak Wed Sep 5 03:47:16 2007 @@ -34,9 +34,9 @@ ifeq ($(HOST),mingw32-linux) -SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__LINUX__ +SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__LINUX__ -Wall else -SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__USE_W32API -Iinclude -Iinclude/reactos -Iinclude/psdk -Iinclude$(SEP)crt -Iinclude/reactos/libs -I$(INTERMEDIATE_)$(SEP)include$(SEP)psdk +SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__USE_W32API -Iinclude -Iinclude/reactos -Iinclude/psdk -Iinclude$(SEP)crt -Iinclude/reactos/libs -I$(INTERMEDIATE_)$(SEP)include$(SEP)psdk -Wall endif SYSREGBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) Modified: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg Wed Sep 5 03:47:16 2007 @@ -10,8 +10,8 @@ ; ; This variable sets the path to the emulator ; -;ROS_EMU_PATH=E:\reactos\qemu\qemu.exe -ROS_EMU_PATH=/usr/bin/qemu +ROS_EMU_PATH=E:\reactos\qemu\qemu.exe +;ROS_EMU_PATH=/usr/bin/qemu ; ROS_HDD_IMAGE ;

1 0

[cwittich] 28865: fix linux build
by cwittich＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: cwittich Date: Wed Sep 5 02:51:21 2007 New Revision: 28865 URL: http://svn.reactos.org/svn/reactos?rev=28865&view=rev Log: fix linux build Modified: trunk/reactos/tools/sysreg/user_types.h Modified: trunk/reactos/tools/sysreg/user_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/user_types.h?… ============================================================================== --- trunk/reactos/tools/sysreg/user_types.h (original) +++ trunk/reactos/tools/sysreg/user_types.h Wed Sep 5 02:51:21 2007 @@ -18,6 +18,7 @@ #else #define TCHAR char #define tstrcpy strcpy + #define _tcstok strtok #define _tcschr strchr #define _tcscat strcat #define _tcscpy(str1, str2) strcpy(str1, str2)

1 0

[janderwald] 28864: - split boot cmd into tokens
by janderwald＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: janderwald Date: Wed Sep 5 02:44:01 2007 New Revision: 28864 URL: http://svn.reactos.org/svn/reactos?rev=28864&view=rev Log: - split boot cmd into tokens Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Wed Sep 5 02:44:01 2007 @@ -76,10 +76,34 @@ //--------------------------------------------------------------------------------------- bool RosBootTest::executeBootCmd() { - m_Pid = OsSupport::createProcess ((TCHAR*)m_BootCmd.c_str(), 0, NULL, false); + int numargs = 0; + char * args[128]; + char * pBuf; + char szBuffer[128]; + + pBuf = (char*)m_BootCmd.c_str (); + if (pBuf) + { + pBuf = strtok(pBuf, _T(" ")); + while(pBuf != NULL) + { + if (!numargs) + strcpy(szBuffer, pBuf); + + args[numargs] = pBuf; + numargs++; + pBuf = _tcstok(NULL, _T(" ")); + } + args[numargs++] = 0; + } + else + { + strcpy(szBuffer, pBuf); + } + m_Pid = OsSupport::createProcess (szBuffer, numargs-1, args, false); if (!m_Pid) { - cerr << "Error: failed to launch boot cmd" << m_BootCmd << endl; + cerr << "Error: failed to launch boot cmd " << m_BootCmd << endl; return false; }

1 0

[gedmurphy] 28863: remove 4bpp bitmaps, add 24bpps and clean them all up.
by gedmurphy＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: gedmurphy Date: Wed Sep 5 02:10:57 2007 New Revision: 28863 URL: http://svn.reactos.org/svn/reactos?rev=28863&view=rev Log: remove 4bpp bitmaps, add 24bpps and clean them all up. Modified: trunk/reactos/base/shell/explorer/res/restart.ico Modified: trunk/reactos/base/shell/explorer/res/restart.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/re… ============================================================================== Binary files - no diff available.

1 0

[gedmurphy] 28862: - merge all the setupapi changes between 28816 and 28860 - can someone test these, we're looking for correct devmgmt icons in both the treeview and the properties dialog
by gedmurphy＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: gedmurphy Date: Wed Sep 5 01:53:54 2007 New Revision: 28862 URL: http://svn.reactos.org/svn/reactos?rev=28862&view=rev Log: - merge all the setupapi changes between 28816 and 28860 - can someone test these, we're looking for correct devmgmt icons in both the treeview and the properties dialog Modified: branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/devclass.c branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/devinst.c branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/res/icons/20.ico branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/res/icons/23.ico branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/res/icons/9.ico branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/res/icons/Icon_Licence/Tango.txt Modified: branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/devclass.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/devclass.c Wed Sep 5 01:53:54 2007 @@ -1449,7 +1449,7 @@ /* Prepare a HIMAGELIST */ InitCommonControls(); - ClassImageListData->ImageList = ImageList_Create(16, 16, ILC_COLOR, 100, 10); + ClassImageListData->ImageList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 100, 10); if (!ClassImageListData->ImageList) goto cleanup; @@ -1459,14 +1459,25 @@ * and put their index in the image list in the IconIndexes array */ for (i = 0; i < list->NumberOfGuids; i++) { + INT miniIconIndex; + ret = SetupDiLoadClassIcon( &list->Guids[i], - &hIcon, - NULL); + NULL, + &miniIconIndex); if (ret) - list->IconIndexes[i] = ImageList_AddIcon(ClassImageListData->ImageList, hIcon); + { + hIcon = LoadImage(hInstance, MAKEINTRESOURCE(miniIconIndex), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + if (hIcon) + { + list->IconIndexes[i] = ImageList_AddIcon(ClassImageListData->ImageList, hIcon); + DestroyIcon(hIcon); + } + else + list->IconIndexes[i] = -1; + } else - list->IconIndexes[i] = -1; /* Special value to tell that icon is unavailable */ + list->IconIndexes[i] = -1; /* Special value to indicate that the icon is unavailable */ } ret = TRUE; @@ -1612,7 +1623,8 @@ TRACE("Icon index %d, dll name %s\n", iconIndex, debugstr_w(DllName)); if (LargeIcon) { - if (1 != ExtractIconEx(DllName, iconIndex, LargeIcon, NULL, 1)) + *LargeIcon = LoadImage(hInstance, MAKEINTRESOURCE(iconIndex), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); + if (!*LargeIcon) { SetLastError(ERROR_INVALID_INDEX); goto cleanup; Modified: branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/devinst.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/devinst.c Wed Sep 5 01:53:54 2007 @@ -2710,7 +2710,7 @@ { struct DeviceInfoSet *list; HKEY hEnumKey, hKey = NULL; - DWORD rc; + DWORD rc, dwSize; BOOL ret = FALSE; TRACE("%p %s %p %lx %p\n", @@ -2738,7 +2738,7 @@ struct DeviceInfoElement *deviceInfo = NULL; /* Search if device already exists in DeviceInfoSet. * If yes, return the existing element - * If no, create a new element using informations in registry + * If no, create a new element using information in registry */ PLIST_ENTRY ItemList = list->ListHead.Flink; while (ItemList != &list->ListHead) @@ -2757,6 +2757,9 @@ } else { + GUID ClassGUID; + WCHAR szClassGuid[MAX_GUID_STRING_LEN]; + /* Open supposed registry key */ rc = RegOpenKeyExW( list->HKLM, @@ -2784,11 +2787,25 @@ goto cleanup; } - /* FIXME: try to get ClassGUID from registry, instead of - * sending GUID_NULL to CreateDeviceInfoElement - */ - if (!CreateDeviceInfoElement(list, DeviceInstanceId, &GUID_NULL, &deviceInfo)) + ClassGUID = GUID_NULL; + dwSize = MAX_GUID_STRING_LEN * sizeof(WCHAR); + + if (RegQueryValueExW(hKey, + REGSTR_VAL_CLASSGUID, + NULL, + NULL, + (LPBYTE)szClassGuid, + &dwSize) == ERROR_SUCCESS) + { + szClassGuid[MAX_GUID_STRING_LEN - 2] = UNICODE_NULL; + + /* Convert a string to a ClassGuid */ + UuidFromStringW(&szClassGuid[1], &ClassGUID); + } + + if (!CreateDeviceInfoElement(list, DeviceInstanceId, &ClassGUID, &deviceInfo)) goto cleanup; + InsertTailList(&list->ListHead, &deviceInfo->ListEntry); ret = TRUE; Modified: branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/res/icons/20.ico URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/res/icons/23.ico URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/res/icons/9.ico URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/res/icons/Icon_Licence/Tango.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/res/icons/Icon_Licence/Tango.txt (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/res/icons/Icon_Licence/Tango.txt Wed Sep 5 01:53:54 2007 @@ -13,115 +13,35 @@ 9.ico 10.ico 11.ico -12.ico -13.ico -14.ico -15.ico -16.ico -17.ico 18.ico 19.ico -20.ico 21.ico 22.ico 23.ico 24.ico 25.ico 28.ico -29.ico -30.ico -32.ico -33.ico -35.ico -36.ico -37.ico -38.ico -39.ico +40.ico 41.ico -44.ico -45.ico -46.ico -47.ico -48.ico +42.ico +43.ico +50.ico +51.ico +52.ico +53.ico 54.ico -137.ico -138.ico -151.ico -152.ico -153.ico -154.ico -155.ico -156.ico -157.ico -160.ico +105.ico +159.ico 161.ico -172.ico -173.ico -191.ico -192.ico -210.ico -220.ico -221.ico -222.ico -224.ico -225.ico -226.ico -228.ico -233.ico -235.ico -236.ico -237.ico -238.ico -240.ico -245.ico -246.ico -248.ico -249.ico -250.ico -252.ico -254.ico -255.ico -263.ico -265.ico -268.ico -269.ico -270.ico -271.ico -277.ico -279.ico -289.ico -290.ico -291.ico -292.ico -293.ico -294.ico -295.ico -296.ico -297.ico -298.ico -299.ico -302.ico -304.ico -305.ico -309.ico -315.ico -317.ico -318.ico -319.ico -322.ico -323.ico -324.ico -325.ico -326.ico -327.ico -328.ico -329.ico -330.ico -1001.ico -1004.ico -8240.ico -16710.ico -16715.ico -16717.ico -16718.ico -16721.ico +500.ico +501.ico +502.ico +5012.ico + +The following icons are the property of the VMware, Inc and are +released under Creative Commons Attribution-ShareAlike 2.5 License. +(http://www.chipx86.com/blog/?p=206) +Please see COPYING for details + +20.ico +23.ico

1 0

[gedmurphy] 28861: add 24 and 8 bit bitmaps
by gedmurphy＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: gedmurphy Date: Wed Sep 5 01:32:35 2007 New Revision: 28861 URL: http://svn.reactos.org/svn/reactos?rev=28861&view=rev Log: add 24 and 8 bit bitmaps Modified: trunk/reactos/dll/win32/setupapi/res/icons/20.ico Modified: trunk/reactos/dll/win32/setupapi/res/icons/20.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available.

1 0

[gedmurphy] 28860: - fix SetupDiLoadClassIcon to load 32x22 for the large icon - fix SetupDiGetClassImageList to load 16x16 icons for the device image list. - devmgmt now loads up the correct sizes for both the treeview and the property page
by gedmurphy＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: gedmurphy Date: Wed Sep 5 01:30:22 2007 New Revision: 28860 URL: http://svn.reactos.org/svn/reactos?rev=28860&view=rev Log: - fix SetupDiLoadClassIcon to load 32x22 for the large icon - fix SetupDiGetClassImageList to load 16x16 icons for the device image list. - devmgmt now loads up the correct sizes for both the treeview and the property page Modified: trunk/reactos/dll/win32/setupapi/devclass.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c Wed Sep 5 01:30:22 2007 @@ -1459,17 +1459,25 @@ * and put their index in the image list in the IconIndexes array */ for (i = 0; i < list->NumberOfGuids; i++) { + INT miniIconIndex; + ret = SetupDiLoadClassIcon( &list->Guids[i], - &hIcon, - NULL); + NULL, + &miniIconIndex); if (ret) { - list->IconIndexes[i] = ImageList_AddIcon(ClassImageListData->ImageList, hIcon); - DestroyIcon(hIcon); + hIcon = LoadImage(hInstance, MAKEINTRESOURCE(miniIconIndex), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + if (hIcon) + { + list->IconIndexes[i] = ImageList_AddIcon(ClassImageListData->ImageList, hIcon); + DestroyIcon(hIcon); + } + else + list->IconIndexes[i] = -1; } else - list->IconIndexes[i] = -1; /* Special value to tell that icon is unavailable */ + list->IconIndexes[i] = -1; /* Special value to indicate that the icon is unavailable */ } ret = TRUE; @@ -1615,7 +1623,7 @@ TRACE("Icon index %d, dll name %s\n", iconIndex, debugstr_w(DllName)); if (LargeIcon) { - *LargeIcon = LoadImage(hInstance, MAKEINTRESOURCE(iconIndex), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + *LargeIcon = LoadImage(hInstance, MAKEINTRESOURCE(iconIndex), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); if (!*LargeIcon) { SetLastError(ERROR_INVALID_INDEX);

1 0

[cwittich] 28859: fix linux build
by cwittich＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: cwittich Date: Wed Sep 5 01:12:27 2007 New Revision: 28859 URL: http://svn.reactos.org/svn/reactos?rev=28859&view=rev Log: fix linux build Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Wed Sep 5 01:12:27 2007 @@ -201,7 +201,7 @@ } } //--------------------------------------------------------------------------------------- - bool NamedPipeReader::readPipe(char * buffer, int bufferlength, long & read) + bool NamedPipeReader::readPipe(char * buffer, int bufferlength, long & bytesread) { #ifdef __LINUX__ @@ -220,7 +220,7 @@ return false; #endif - read = cbRead; + bytesread = cbRead; return true; } //---------------------------------------------------------------------------------------

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
59
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2007