Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[gedmurphy] 28858: preset in case of failure
by gedmurphy＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: gedmurphy Date: Wed Sep 5 00:28:44 2007 New Revision: 28858 URL: http://svn.reactos.org/svn/reactos?rev=28858&view=rev Log: preset in case of failure Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Wed Sep 5 00:28:44 2007 @@ -2787,7 +2787,9 @@ goto cleanup; } + ClassGUID = GUID_NULL; dwSize = MAX_GUID_STRING_LEN * sizeof(WCHAR); + if (RegQueryValueExW(hKey, REGSTR_VAL_CLASSGUID, NULL, @@ -2798,8 +2800,7 @@ szClassGuid[MAX_GUID_STRING_LEN - 2] = UNICODE_NULL; /* Convert a string to a ClassGuid */ - if (UuidFromStringW(&szClassGuid[1], &ClassGUID) != RPC_S_OK) - ClassGUID = GUID_NULL; + UuidFromStringW(&szClassGuid[1], &ClassGUID); } if (!CreateDeviceInfoElement(list, DeviceInstanceId, &ClassGUID, &deviceInfo))

1 0

[janderwald] 28857: - finish immediately on unattended second stage install
by janderwald＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: janderwald Date: Wed Sep 5 00:26:02 2007 New Revision: 28857 URL: http://svn.reactos.org/svn/reactos?rev=28857&view=rev Log: - finish immediately on unattended second stage install Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Wed Sep 5 00:26:02 2007 @@ -1926,6 +1926,12 @@ WM_SETFONT, (WPARAM)SetupData->hTitleFont, (LPARAM)TRUE); + if (SetupData->UnattendSetup) + { + KillTimer(hwndDlg, 1); + SetupIsActive(0); + PostQuitMessage(0); + } } break;

1 0

[cwittich] 28856: fix some of the linux build issues
by cwittich＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: cwittich Date: Wed Sep 5 00:19:57 2007 New Revision: 28856 URL: http://svn.reactos.org/svn/reactos?rev=28856&view=rev Log: fix some of the linux build issues Modified: trunk/reactos/tools/sysreg/sysreg.mak trunk/reactos/tools/sysreg/user_types.h 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 00:19:57 2007 @@ -18,19 +18,6 @@ SYSREGBUILD_TARGET = \ $(EXEPREFIX)$(SYSREGBUILD_OUT_)sysreg$(EXEPOSTFIX) -ifeq ($(HOST),mingw32-linux) -SYSREGBUILD_SOURCES = $(addprefix $(SYSREGBUILD_BASE_),\ - conf_parser.cpp \ - env_var.cpp \ - pipe_reader.cpp \ - rosboot_test.cpp \ - sysreg.cpp \ - file_reader.cpp \ - os_support.cpp \ - unicode.cpp \ - ) - -else SYSREGBUILD_SOURCES = $(addprefix $(SYSREGBUILD_BASE_),\ conf_parser.cpp \ env_var.cpp \ @@ -41,7 +28,6 @@ os_support.cpp \ unicode.cpp \ ) -endif SYSREGBUILD_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(SYSREGBUILD_SOURCES:.cpp=.o)) @@ -75,11 +61,9 @@ $(ECHO_CC) ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ -ifneq ($(HOST),mingw32-linux) $(SYSREGBUILD_INT_)namedpipe_reader.o: $(SYSREGBUILD_BASE_)namedpipe_reader.cpp | $(SYSREGBUILD_INT) $(ECHO_CC) ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ -endif $(SYSREGBUILD_INT_)rosboot_test.o: $(SYSREGBUILD_BASE_)rosboot_test.cpp | $(SYSREGBUILD_INT) $(ECHO_CC) 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 00:19:57 2007 @@ -18,6 +18,7 @@ #else #define TCHAR char #define tstrcpy strcpy + #define _tcschr strchr #define _tcscat strcat #define _tcscpy(str1, str2) strcpy(str1, str2) #define _tcslen(str1) strlen(str1)

1 0

[gedmurphy] 28855: - read ClassGUID from the registry instead of sending GUID_NULL - fixes part of SetupDiOpenDeviceInfo which now allows loading of icons in the devmgr.dll property sheets
by gedmurphy＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: gedmurphy Date: Wed Sep 5 00:18:39 2007 New Revision: 28855 URL: http://svn.reactos.org/svn/reactos?rev=28855&view=rev Log: - read ClassGUID from the registry instead of sending GUID_NULL - fixes part of SetupDiOpenDeviceInfo which now allows loading of icons in the devmgr.dll property sheets Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Wed Sep 5 00:18:39 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,24 @@ goto cleanup; } - /* FIXME: try to get ClassGUID from registry, instead of - * sending GUID_NULL to CreateDeviceInfoElement - */ - if (!CreateDeviceInfoElement(list, DeviceInstanceId, &GUID_NULL, &deviceInfo)) + 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 */ + if (UuidFromStringW(&szClassGuid[1], &ClassGUID) != RPC_S_OK) + ClassGUID = GUID_NULL; + } + + if (!CreateDeviceInfoElement(list, DeviceInstanceId, &ClassGUID, &deviceInfo)) goto cleanup; + InsertTailList(&list->ListHead, &deviceInfo->ListEntry); ret = TRUE;

1 0

[janderwald] 28854: - readd named pipe support for linux by Christoph_vW - simplify named pipe code - only allocate buffer for reading once - dont format default hdd if it exists - delay read at right position - fix ROS_DELAY_READ option in config file - value is expected to be in seconds not milliseconds
by janderwald＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: janderwald Date: Tue Sep 4 23:53:49 2007 New Revision: 28854 URL: http://svn.reactos.org/svn/reactos?rev=28854&view=rev Log: - readd named pipe support for linux by Christoph_vW - simplify named pipe code - only allocate buffer for reading once - dont format default hdd if it exists - delay read at right position - fix ROS_DELAY_READ option in config file - value is expected to be in seconds not milliseconds Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp trunk/reactos/tools/sysreg/namedpipe_reader.h trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h 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 Tue Sep 4 23:53:49 2007 @@ -20,15 +20,22 @@ using std::vector; //--------------------------------------------------------------------------------------- - NamedPipeReader::NamedPipeReader() : DataSource(), h_Pipe(NULLVAL) - { - + NamedPipeReader::NamedPipeReader() : DataSource(), h_Pipe(NULLVAL), m_Buffer(0) + { +#ifdef UNICODE + m_WBuffer = 0; +#endif } //--------------------------------------------------------------------------------------- NamedPipeReader::~NamedPipeReader() { - + if (m_Buffer) + free(m_Buffer); +#ifdef UNICODE + if (m_WBuffer) + free(m_WBuffer); +#endif } bool NamedPipeReader::isSourceOpen() @@ -45,15 +52,15 @@ cerr << "NamedPipeReader::openPipe> pipe already open" << endl; return false; } - +#ifndef __LINUX__ h_Pipe = CreateFile("\\\\.\\pipe\\qemu", //PipeCmd.c_str(), - GENERIC_WRITE | GENERIC_READ, - 0, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - (HANDLE) - NULL); + GENERIC_WRITE | GENERIC_READ, + 0, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + (HANDLE) + NULL); if(INVALID_HANDLE_VALUE == h_Pipe) { cerr << "NamedPipeReader::openPipe> failed to open pipe " << PipeCmd << " Error:" << GetLastError() << endl; @@ -63,26 +70,46 @@ else { cout << "NamedPipeReader::openPipe> successfully opened pipe" << endl; + m_BufferLength = 100; + m_Buffer = (char*)malloc(sizeof(char) * m_BufferLength); +#ifdef UNICODE + m_WBuffer = (WCHAR*)malloc(sizeof(WCHAR) * m_BufferLength); +#endif + ConnectNamedPipe(h_Pipe, + 0); + return true; + } +#else + h_Pipe = open("PipeCmd.c_str()", O_RDONLY); + + if(INVALID_HANDLE_VALUE == h_Pipe) { + cerr << "NamedPipeReader::openPipe> failed to open pipe " << PipeCmd << endl; + h_Pipe = NULLVAL; + return false; + } + else + { + cout << "NamedPipeReader::openPipe> successfully opened pipe" << endl; return true; } - - ConnectNamedPipe( - h_Pipe, - 0); +#endif } //--------------------------------------------------------------------------------------- bool NamedPipeReader::closeSource() { - if (h_Pipe == INVALID_HANDLE_VALUE) + if (h_Pipe == NULLVAL) { cerr << "NamedPipeReader::closePipe> pipe is not open" << endl; return false; } +#ifdef __LINUX__ + close(h_Pipe); +#else DisconnectNamedPipe(h_Pipe); CloseHandle(h_Pipe); - +#endif h_Pipe = NULLVAL; return true; } @@ -173,70 +200,75 @@ append_line = false; } } - +//--------------------------------------------------------------------------------------- + bool NamedPipeReader::readPipe(char * buffer, int bufferlength, long & read) + { + +#ifdef __LINUX__ + long cbRead = read(h_Pipe, + buffer, + (bufferlength-1) * sizeof(char)); +#else + DWORD cbRead = 0; + BOOL fSuccess = ReadFile(h_Pipe, + buffer, + (bufferlength-1) * sizeof(char), + &cbRead, + NULL); + + if (!fSuccess && GetLastError() != ERROR_MORE_DATA) + return false; +#endif + + read = cbRead; + return true; + } //--------------------------------------------------------------------------------------- bool NamedPipeReader::readSource(vector<string> & vect) { - char * localbuf; - DWORD localsize = 100; size_t lines = vect.size (); - BOOL fSuccess; - localbuf = (char*) HeapAlloc(GetProcessHeap(), 0, localsize * sizeof(char)); -#ifdef UNICODE - wchar_t * wbuf = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, localsize * sizeof(wchar_t)); -#endif /* UNICODE */ - if (localbuf != NULL) - { - bool append_line = false; - do - { - DWORD cbRead; - do - { - ZeroMemory(localbuf, localsize * sizeof(char)); -#ifdef UNICODE - ZeroMemory(wbuf, localsize * sizeof(wchar_t)); -#endif /* UNICODE */ - - fSuccess = ReadFile( - h_Pipe, - localbuf, - (localsize-1) * sizeof(char), - &cbRead, - NULL); - - if (! fSuccess && GetLastError() != ERROR_MORE_DATA) - break; - -#ifdef UNICODE - if (UnicodeConverter::ansi2Unicode(localbuf, wbuf, cbRead)) - { - extractLines(wbuf, vect, append_line, cbRead); - } -#else /* UNICODE */ - extractLines(localbuf, vect, append_line, cbRead); -#endif /* UNICODE */ - - } while (!fSuccess); // repeat loop if ERROR_MORE_DATA - } while (append_line); - - if (!fSuccess) - return 0; - - HeapFree(GetProcessHeap(), 0, localbuf); -#ifdef UNICODE - HeapFree(GetProcessHeap(), 0, wbuf); -#endif /* UNICODE */ - } - else - { - return 0; - } - - return (vect.size () - lines); - } + if (h_Pipe == NULLVAL) + { + cerr << "Error: pipe is not open" << endl; + return false; + } + + if (!m_Buffer) + { + cerr << "Error: no memory" << endl; + } + +#ifdef UNICODE + if (!m_WBuffer) + { + cerr << "Error: no memory" << endl; + } +#endif + + bool append_line = false; + do + { + memset(m_Buffer, 0x0, m_BufferLength * sizeof(char)); + long cbRead = 0; + + if (!readPipe(m_Buffer, 100, cbRead)) + break; + +#ifdef UNICODE + memset(m_WBuffer, 0x0, m_BufferLength * sizeof(WCHAR)); + if (!UnicodeConverter::ansi2Unicode(m_Buffer, m_WBuffer, cbRead)) + break; + extractLines(m_WBuffer, vect, append_line, cbRead); +#endif + extractLines(m_Buffer, vect, append_line, cbRead); + + + }while (append_line); + + return (vect.size () - lines); +} } // end of namespace System_ Modified: trunk/reactos/tools/sysreg/namedpipe_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.h (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.h Tue Sep 4 23:53:49 2007 @@ -120,8 +120,15 @@ void extractLines(TCHAR * buffer, std::vector<string> & vect, bool & append_line, unsigned long cbRead); + bool readPipe(char * buffer, int bufferlength, long & read); + HANDLE h_Pipe; + char * m_Buffer; + int m_BufferLength; +#ifdef UNICODE + WCHAR * m_WBuffer; +#endif }; // end of class NamedPipeReader 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 Tue Sep 4 23:53:49 2007 @@ -247,12 +247,14 @@ } #ifdef __LINUX__ - pipe = _T("stdio"); - m_Src = _T(""); + pipe = _T("pipe:/tmp/qemu"); + m_Src = _T("/tmp/qemu"); qemudir = _T("/usr/share/qemu"); + m_DebugPort = _T("pipe"); #else pipe = _T("pipe:qemu"); m_Src = _T("\\\\.\\pipe\\qemu"); + m_DebugPort = _T("pipe"); if (!getQemuDir(qemudir)) { return false; @@ -322,29 +324,26 @@ pos = pipe.find(_T("pipe:")); if (pos == 0) { -#ifdef __LINUX__ - cerr << "Error: reading from pipes is not supported with linux hosts - use stdio" << endl; - return false; - } -#else pipe = pipe.substr(pos + 5, pipe.size() - pos - 5); pos = pipe.find(_T(" ")); if (pos != string::npos) { - m_Src = _T("\\\\.\\pipe\\") + pipe.substr(0, pos); - } - else - { - m_Src = _T("\\\\.\\pipe\\") + pipe; - } + pipe = pipe.substr(0, pos); + } +#ifdef __LINUX__ + m_Src = pipe; +#else + m_Src = _T("\\\\.\\pipe\\") + pipe.substr(0, pos); +#endif + m_DebugPort = _T("pipe"); return true; } -#endif pos = pipe.find(_T("stdio")); if (pos == 0) { #ifdef __LINUX__ m_Src = m_BootCmd; + m_DebugPort = _T("stdio"); return true; #else cerr << "Error: reading from stdio is not supported for windows hosts - use pipes" << endl; @@ -387,6 +386,11 @@ } getDefaultHDDImage(m_HDDImage); + if (isFileExisting(m_HDDImage)) + { + cerr << "Falling back to default hdd image " << m_HDDImage << endl; + return true; + } return createHDDImage(m_HDDImage); } /* @@ -552,19 +556,20 @@ } cerr << "Opening Data Source:" << m_BootCmd << endl; - +/* #ifdef __LINUX__ _tremove(m_PidFile.c_str ()); m_DataSource = new PipeReader(); m_Src = m_BootCmd; #else +*/ m_DataSource = new NamedPipeReader(); if (!executeBootCmd()) { cerr << "Error: failed to launch emulator with: " << m_BootCmd << endl; return false; } -#endif +//#endif return true; } @@ -659,23 +664,19 @@ return false; } #endif -#ifndef __LINUX__ - OsSupport::delayExecution(1); -#endif - - assert(m_DataSource != 0); + + if (m_DelayRead) + { + cerr << "Delaying read for " << m_DelayRead << " seconds" << endl; + OsSupport::delayExecution(m_DelayRead); + } + if (!m_DataSource->openSource(m_Src)) { cerr << "Error: failed to open data source with " << m_Src << endl; cleanup(); return false; } - - if (m_DelayRead) - { - OsSupport::delayExecution(m_DelayRead); - } - #ifdef __LINUX__ /* * For linux systems we can only Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Tue Sep 4 23:53:49 2007 @@ -157,6 +157,7 @@ string m_MaxMem; string m_BootCmd; string m_Src; + string m_DebugPort; string m_PidFile; DataSource * m_DataSource; 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 Tue Sep 4 23:53:49 2007 @@ -60,7 +60,7 @@ ; ; Note: set this value if you have problems with timeouts or cutoff debugging data ; -ROS_DELAY_READ=4000 +ROS_DELAY_READ=4 ; ROS_CHECK_POINT ;

1 0

[janderwald] 28853: - fix a bug
by janderwald＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: janderwald Date: Tue Sep 4 23:41:58 2007 New Revision: 28853 URL: http://svn.reactos.org/svn/reactos?rev=28853&view=rev Log: - fix a bug Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Tue Sep 4 23:41:58 2007 @@ -2197,9 +2197,9 @@ szPath[length] = '\\'; length++; } - strcpy(&szPath[length], "system32\\dbgprint.exe SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE\n"); + strcpy(&szPath[length], "dbgprint.exe SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE\n"); fwrite(szPath, 1, strlen(szPath) + 1, file); - strcpy(&szPath[length], "system32\\shutdown.exe -s"); + strcpy(&szPath[length], "shutdown.exe -s"); fwrite(szPath, 1, strlen(szPath) + 1, file); } fclose(file);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs