Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[weiden] 19562: add missing definitions

by weiden＠svn.reactos.com

add missing definitions Modified: trunk/reactos/w32api/include/devguid.h _____ Modified: trunk/reactos/w32api/include/devguid.h --- trunk/reactos/w32api/include/devguid.h 2005-11-25 17:02:18 UTC (rev 19561) +++ trunk/reactos/w32api/include/devguid.h 2005-11-25 17:02:43 UTC (rev 19562) @@ -16,4 +16,6 @@ */ DEFINE_GUID(GUID_DEVCLASS_CDROM, 0x4D36E965, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_KEYBOARD, 0x4D36E96B, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); DEFINE_GUID(GUID_DEVCLASS_MEDIA, 0x4D36E96C, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_MOUSE, 0x4D36E96F, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18);

18 years, 9 months

[weiden] 19561: display the hardware tab

by weiden＠svn.reactos.com

display the hardware tab Modified: trunk/reactos/lib/cpl/main/En.rc Modified: trunk/reactos/lib/cpl/main/keyboard.c Modified: trunk/reactos/lib/cpl/main/main.c Modified: trunk/reactos/lib/cpl/main/main.h Modified: trunk/reactos/lib/cpl/main/main.xml Modified: trunk/reactos/lib/cpl/main/mouse.c Modified: trunk/reactos/lib/cpl/main/resource.h _____ Modified: trunk/reactos/lib/cpl/main/En.rc --- trunk/reactos/lib/cpl/main/En.rc 2005-11-25 16:30:41 UTC (rev 19560) +++ trunk/reactos/lib/cpl/main/En.rc 2005-11-25 17:02:18 UTC (rev 19561) @@ -24,6 +24,21 @@ LTEXT "Property Page 3",-1,73,74,90,8 END +IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Speed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Keyboard Speed Page",-1,73,74,90,8 +END + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardware" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Mouse" _____ Modified: trunk/reactos/lib/cpl/main/keyboard.c --- trunk/reactos/lib/cpl/main/keyboard.c 2005-11-25 16:30:41 UTC (rev 19560) +++ trunk/reactos/lib/cpl/main/keyboard.c 2005-11-25 17:02:18 UTC (rev 19561) @@ -25,6 +25,7 @@ */ #include <windows.h> +#include <devguid.h> #include <commctrl.h> #include <prsht.h> #include <cpl.h> @@ -35,56 +36,53 @@ /* Property page dialog callback */ static INT_PTR CALLBACK -Page1Proc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +KeybSpeedProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - return FALSE; + switch(uMsg) + { + case WM_INITDIALOG: + break; + } + + return FALSE; } /* Property page dialog callback */ static INT_PTR CALLBACK -Page2Proc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +KeybHardwareProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - return FALSE; -} + switch(uMsg) + { + case WM_INITDIALOG: + { + GUID Guids[] = { + GUID_DEVCLASS_KEYBOARD + }; + /* create the hardware page */ + DeviceCreateHardwarePageEx(hwndDlg, + Guids, + sizeof(Guids) / sizeof(Guids[0]), + HWPD_STANDARDLIST); + break; + } + } -/* Property page dialog callback */ -static INT_PTR CALLBACK -Page3Proc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - return FALSE; + return FALSE; } LONG APIENTRY KeyboardApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) { - PROPSHEETPAGE psp[3]; + PROPSHEETPAGE psp[2]; PROPSHEETHEADER psh; TCHAR Caption[256]; @@ -101,9 +99,8 @@ psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_PROPPAGE1, Page1Proc); - InitPropSheetPage(&psp[1], IDD_PROPPAGE2, Page2Proc); - InitPropSheetPage(&psp[2], IDD_PROPPAGE3, Page3Proc); + InitPropSheetPage(&psp[0], IDD_KEYBSPEED, KeybSpeedProc); + InitPropSheetPage(&psp[1], IDD_HARDWARE, KeybHardwareProc); return (LONG)(PropertySheet(&psh) != -1); } _____ Modified: trunk/reactos/lib/cpl/main/main.c --- trunk/reactos/lib/cpl/main/main.c 2005-11-25 16:30:41 UTC (rev 19560) +++ trunk/reactos/lib/cpl/main/main.c 2005-11-25 17:02:18 UTC (rev 19561) @@ -26,6 +26,8 @@ * 05-01-2004 Created */ #include <windows.h> +#include <initguid.h> +#include <devguid.h> #include <commctrl.h> #include <cpl.h> _____ Modified: trunk/reactos/lib/cpl/main/main.h --- trunk/reactos/lib/cpl/main/main.h 2005-11-25 16:30:41 UTC (rev 19560) +++ trunk/reactos/lib/cpl/main/main.h 2005-11-25 17:02:18 UTC (rev 19561) @@ -1,6 +1,19 @@ #ifndef __CPL_MAIN_H #define __CPL_MAIN_H +typedef enum +{ + HWPD_STANDARDLIST = 0, + HWPD_LARGELIST, + HWPD_MAX = HWPD_LARGELIST +} HWPAGE_DISPLAYMODE, *PHWPAGE_DISPLAYMODE; + +HWND WINAPI +DeviceCreateHardwarePageEx(HWND hWndParent, + LPGUID lpGuids, + UINT uNumberOfGuids, + HWPAGE_DISPLAYMODE DisplayMode); + //typedef LONG (CALLBACK *APPLET_PROC)(VOID); typedef struct _APPLET _____ Modified: trunk/reactos/lib/cpl/main/main.xml --- trunk/reactos/lib/cpl/main/main.xml 2005-11-25 16:30:41 UTC (rev 19560) +++ trunk/reactos/lib/cpl/main/main.xml 2005-11-25 17:02:18 UTC (rev 19561) @@ -10,6 +10,7 @@ <library>kernel32</library> <library>user32</library> <library>comctl32</library> + <library>devmgr</library> <file>keyboard.c</file> <file>main.c</file> <file>mouse.c</file> _____ Modified: trunk/reactos/lib/cpl/main/mouse.c --- trunk/reactos/lib/cpl/main/mouse.c 2005-11-25 16:30:41 UTC (rev 19560) +++ trunk/reactos/lib/cpl/main/mouse.c 2005-11-25 17:02:18 UTC (rev 19561) @@ -25,6 +25,7 @@ */ #include <windows.h> +#include <devguid.h> #include <commctrl.h> #include <cpl.h> @@ -85,10 +86,38 @@ } +/* Property page dialog callback */ +static INT_PTR CALLBACK +MouseHardwareProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + switch(uMsg) + { + case WM_INITDIALOG: + { + GUID Guids[] = { + GUID_DEVCLASS_MOUSE + }; + + /* create the hardware page */ + DeviceCreateHardwarePageEx(hwndDlg, + Guids, + sizeof(Guids) / sizeof(Guids[0]), + HWPD_STANDARDLIST); + break; + } + } + + return FALSE; +} + + LONG APIENTRY MouseApplet(HWND hwnd, UINT uMsg, LONG lParam1, LONG lParam2) { - PROPSHEETPAGE psp[3]; + PROPSHEETPAGE psp[4]; PROPSHEETHEADER psh; TCHAR Caption[256]; @@ -108,6 +137,7 @@ InitPropSheetPage(&psp[0], IDD_PROPPAGE1, Page1Proc); InitPropSheetPage(&psp[1], IDD_PROPPAGE2, Page2Proc); InitPropSheetPage(&psp[2], IDD_PROPPAGE3, Page3Proc); + InitPropSheetPage(&psp[3], IDD_HARDWARE, MouseHardwareProc); return (LONG)(PropertySheet(&psh) != -1); } _____ Modified: trunk/reactos/lib/cpl/main/resource.h --- trunk/reactos/lib/cpl/main/resource.h 2005-11-25 16:30:41 UTC (rev 19560) +++ trunk/reactos/lib/cpl/main/resource.h 2005-11-25 17:02:18 UTC (rev 19561) @@ -8,6 +8,8 @@ #define IDD_PROPPAGE1 100 #define IDD_PROPPAGE2 101 #define IDD_PROPPAGE3 102 +#define IDD_KEYBSPEED 103 +#define IDD_HARDWARE 104 #define IDS_CPLNAME_1 1000 #define IDS_CPLDESCRIPTION_1 1001

18 years, 9 months

[weiden] 19560: fixed some resizing bugs

by weiden＠svn.reactos.com

fixed some resizing bugs Modified: trunk/reactos/lib/devmgr/hwpage.c _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-11-25 16:13:58 UTC (rev 19559) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-11-25 16:30:41 UTC (rev 19560) @@ -58,6 +58,7 @@ HWND hWnd; HWND hWndDevList; HINSTANCE hComCtl32; /* only save this to keep track of the references */ + INT DevListViewHeight; SP_CLASSIMAGELIST_DATA ClassImageListData; HWPAGE_DISPLAYMODE DisplayMode; @@ -188,8 +189,6 @@ if (HwNewDevInfo != NULL) { DevInfo->HwDevInfo = HwNewDevInfo; - DevInfo->HwDevInfo[DevInfo->ItemCount].ClassDevInfo = DevInfo; - DevInfo->HwDevInfo[DevInfo->ItemCount++].DevInfoData = DevInfoData; } else { @@ -203,18 +202,16 @@ DevInfo->HwDevInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(HWDEVINFO)); - if (DevInfo->HwDevInfo != NULL) + if (DevInfo->HwDevInfo == NULL) { - DevInfo->HwDevInfo[DevInfo->ItemCount].ClassDevInfo = DevInfo; - DevInfo->HwDevInfo[DevInfo->ItemCount++].DevInfoData = DevInfoData; - } - else - { DPRINT1("Unable to allocate memory for a SP_DEVINFO_DATA structures!\n"); break; } } + DevInfo->HwDevInfo[DevInfo->ItemCount].ClassDevInfo = DevInfo; + DevInfo->HwDevInfo[DevInfo->ItemCount++].DevInfoData = DevInfoData; + if ((SetupDiGetDeviceRegistryProperty(DevInfo->hDevInfo, &DevInfoData, SPDRP_FRIENDLYNAME, @@ -327,7 +324,7 @@ { HDWP dwp; HWND hControl, hButton; - INT Width, x, y, TopBias = 0; + INT Width, x, y; RECT rc, rcButton; POINT pt = {0}; POINT ptMargin = {0}; @@ -368,19 +365,14 @@ hpd->hWnd, &pt, 1); - if (hpd->DisplayMode == HWPD_LARGELIST) - { - /* increase the size of the list view control by 2/3 */ - TopBias = ((rc.bottom - rc.top) * 2) / 3; - } - y = pt.y + TopBias + rc.bottom - rc.top + ptMargin.y; + y = pt.y + hpd->DevListViewHeight + ptMargin.y; if (!(dwp = DeferWindowPos(dwp, hpd->hWndDevList, NULL, 0, 0, Width, - rc.bottom - rc.top + TopBias, + hpd->DevListViewHeight, SWP_NOMOVE | SWP_NOZORDER))) { return; @@ -572,9 +564,22 @@ SetupDiGetClassImageList(&hpd->ClassImageListData); + /* calculate the size of the devices list view control */ hpd->hWndDevList = GetDlgItem(hwndDlg, IDC_LV_DEVICES); + if (hpd->hWndDevList != NULL) + { + RECT rcClient; + GetClientRect(hpd->hWndDevList, + &rcClient); + hpd->DevListViewHeight = rcClient.bottom; + if (hpd->DisplayMode == HWPD_LARGELIST) + { + hpd->DevListViewHeight = (hpd->DevListViewHeight * 3) / 2; + } + } + /* subclass the parent window */ hWndParent = GetAncestor(hwndDlg, GA_PARENT); @@ -790,7 +795,6 @@ * NOTE * */ - HWND WINAPI DeviceCreateHardwarePage(IN HWND hWndParent,

18 years, 9 months

[weiden] 19559: - add a (very incomplete) devguid.h

by weiden＠svn.reactos.com

- add a (very incomplete) devguid.h - add mmsys.cpl to the build system and bootcd Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/lib/cpl/directory.xml Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/w32api/include/devguid.h _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-11-25 16:03:14 UTC (rev 19558) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-11-25 16:13:58 UTC (rev 19559) @@ -70,6 +70,7 @@ lib\cpl\desk\desk.cpl 1 lib\cpl\intl\intl.cpl 1 lib\cpl\main\main.cpl 1 +lib\cpl\mmsys\mmsys.cpl 1 lib\cpl\ncpa\ncpa.cpl 1 lib\cpl\sysdm\sysdm.cpl 1 lib\cpl\timedate\timedate.cpl 1 _____ Modified: trunk/reactos/lib/cpl/directory.xml --- trunk/reactos/lib/cpl/directory.xml 2005-11-25 16:03:14 UTC (rev 19558) +++ trunk/reactos/lib/cpl/directory.xml 2005-11-25 16:13:58 UTC (rev 19559) @@ -16,6 +16,9 @@ <directory name="main"> <xi:include href="main/main.xml" /> </directory> +<directory name="mmsys"> + <xi:include href="mmsys/mmsys.xml" /> +</directory> <directory name="ncpa"> <xi:include href="ncpa/ncpa.xml" /> </directory> _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-11-25 16:03:14 UTC (rev 19558) +++ trunk/reactos/lib/directory.xml 2005-11-25 16:13:58 UTC (rev 19559) @@ -59,6 +59,9 @@ <directory name="devenum"> <xi:include href="devenum/devenum.xml" /> </directory> +<directory name="devmgr"> + <xi:include href="devmgr/devmgr.xml" /> +</directory> <directory name="dhcpcapi"> <xi:include href="dhcpcapi/dhcpcapi.xml" /> </directory> _____ Added: trunk/reactos/w32api/include/devguid.h --- trunk/reactos/w32api/include/devguid.h 2005-11-25 16:03:14 UTC (rev 19558) +++ trunk/reactos/w32api/include/devguid.h 2005-11-25 16:13:58 UTC (rev 19559) @@ -0,0 +1,19 @@ +/* + * devguid.h + * + * PnP Device Class GUIDs + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + +DEFINE_GUID(GUID_DEVCLASS_CDROM, 0x4D36E965, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_MEDIA, 0x4D36E96C, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); Property changes on: trunk/reactos/w32api/include/devguid.h ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native

18 years, 9 months

[weiden] 19558: fixed an error check

by weiden＠svn.reactos.com

fixed an error check Modified: trunk/reactos/lib/rtl/bootdata.c _____ Modified: trunk/reactos/lib/rtl/bootdata.c --- trunk/reactos/lib/rtl/bootdata.c 2005-11-25 15:57:47 UTC (rev 19557) +++ trunk/reactos/lib/rtl/bootdata.c 2005-11-25 16:03:14 UTC (rev 19558) @@ -367,7 +367,7 @@ Status = RtlAbsoluteToSelfRelativeSD(AbsSD, NewRelSD, &RelSDSize); - if (Status != STATUS_BUFFER_TOO_SMALL) + if (Status == STATUS_BUFFER_TOO_SMALL) { goto Cleanup; }

18 years, 9 months

[weiden] 19557: add missing error check

by weiden＠svn.reactos.com

add missing error check Modified: trunk/reactos/lib/rtl/bootdata.c _____ Modified: trunk/reactos/lib/rtl/bootdata.c --- trunk/reactos/lib/rtl/bootdata.c 2005-11-25 15:36:14 UTC (rev 19556) +++ trunk/reactos/lib/rtl/bootdata.c 2005-11-25 15:57:47 UTC (rev 19557) @@ -230,6 +230,10 @@ 0, 0, &LocalSystemSid); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } /* check if the Administrators are the owner and at least a not-NULL DACL is present */

18 years, 9 months

[weiden] 19556: move the hardware page dialog into it's own file

by weiden＠svn.reactos.com

move the hardware page dialog into it's own file Deleted: trunk/reactos/lib/devmgr/devmgr.c Modified: trunk/reactos/lib/devmgr/devmgr.xml Added: trunk/reactos/lib/devmgr/hwpage.c Modified: trunk/reactos/lib/devmgr/misc.c _____ Deleted: trunk/reactos/lib/devmgr/devmgr.c --- trunk/reactos/lib/devmgr/devmgr.c 2005-11-25 14:40:28 UTC (rev 19555) +++ trunk/reactos/lib/devmgr/devmgr.c 2005-11-25 15:36:14 UTC (rev 19556) @@ -1,827 +0,0 @@ -/* - * ReactOS Device Manager Applet - * Copyright (C) 2004 - 2005 ReactOS Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -/* $Id$ - * - * PROJECT: ReactOS devmgr.dll - * FILE: lib/devmgr/devmgr.c - * PURPOSE: ReactOS Device Manager - * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> - * UPDATE HISTORY: - * 04-04-2004 Created - */ -#include <precomp.h> - -#define NDEBUG -#include <debug.h> - -HINSTANCE hDllInstance = NULL; - -typedef VOID (WINAPI *PINITCOMMONCONTROLS)(VOID); - -typedef enum -{ - HWPD_STANDARDLIST = 0, - HWPD_LARGELIST, - HWPD_MAX = HWPD_LARGELIST -} HWPAGE_DISPLAYMODE, *PHWPAGE_DISPLAYMODE; - -typedef struct _HWDEVINFO -{ - struct _HWCLASSDEVINFO *ClassDevInfo; - SP_DEVINFO_DATA DevInfoData; -} HWDEVINFO, *PHWDEVINFO; - -typedef struct _HWCLASSDEVINFO -{ - GUID Guid; - HDEVINFO hDevInfo; - INT ItemCount; - PHWDEVINFO HwDevInfo; -} HWCLASSDEVINFO, *PHWCLASSDEVINFO; - -typedef struct _HARDWARE_PAGE_DATA -{ - HWND hWnd; - HWND hWndDevList; - HINSTANCE hComCtl32; /* only save this to keep track of the references */ - SP_CLASSIMAGELIST_DATA ClassImageListData; - HWPAGE_DISPLAYMODE DisplayMode; - - /* parent window subclass info */ - WNDPROC ParentOldWndProc; - HWND hWndParent; - - UINT NumberOfGuids; - HWCLASSDEVINFO ClassDevInfo[1]; - /* struct may be dynamically expanded here! */ -} HARDWARE_PAGE_DATA, *PHARDWARE_PAGE_DATA; - -#define CX_TYPECOLUMN_WIDTH 80 - -static VOID -InitializeDevicesList(IN PHARDWARE_PAGE_DATA hpd) -{ - LVCOLUMN lvc; - RECT rcClient; - WCHAR szColName[255]; - int iCol = 0; - - /* set the list view style */ - ListView_SetExtendedListViewStyle(hpd->hWndDevList, - LVS_EX_FULLROWSELECT); - - /* set the list view image list */ - if (hpd->ClassImageListData.ImageList != NULL) - { - ListView_SetImageList(hpd->hWndDevList, - hpd->ClassImageListData.ImageList, - LVSIL_SMALL); - } - - GetClientRect(hpd->hWndDevList, - &rcClient); - - /* add the list view columns */ - lvc.mask = LVCF_TEXT | LVCF_WIDTH; - lvc.fmt = LVCFMT_LEFT; - lvc.pszText = szColName; - - if (LoadString(hDllInstance, - IDS_NAME, - szColName, - sizeof(szColName) / sizeof(szColName[0]))) - { - lvc.cx = rcClient.right - CX_TYPECOLUMN_WIDTH - - GetSystemMetrics(SM_CXVSCROLL); - ListView_InsertColumn(hpd->hWndDevList, - iCol++, - &lvc); - } - if (LoadString(hDllInstance, - IDS_TYPE, - szColName, - sizeof(szColName) / sizeof(szColName[0]))) - { - lvc.cx = CX_TYPECOLUMN_WIDTH; - ListView_InsertColumn(hpd->hWndDevList, - iCol++, - &lvc); - } -} - - -static VOID -UpdateControlStates(IN PHARDWARE_PAGE_DATA hpd) -{ - PHWDEVINFO HwDevInfo; - - HwDevInfo = (PHWDEVINFO)ListViewGetSelectedItemData(hpd->hWndDevList); - if (HwDevInfo != NULL) - { - /* FIXME - update static controls and enable buttons */ - } - else - { - /* FIXME - clear static controls and disable buttons */ - } -} - - -static VOID -FillDevicesList(IN PHARDWARE_PAGE_DATA hpd) -{ - PHWCLASSDEVINFO DevInfo, LastDevInfo; - SP_DEVINFO_DATA DevInfoData; - WCHAR szBuffer[255]; - INT ItemCount = 0; - - DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); - - DevInfo = hpd->ClassDevInfo; - LastDevInfo = DevInfo + hpd->NumberOfGuids; - - while (DevInfo != LastDevInfo) - { - INT ImageIndex = -1; - - DevInfo->hDevInfo = SetupDiGetClassDevs(&DevInfo->Guid, - NULL, - hpd->hWnd, - DIGCF_PRESENT); - if (DevInfo->hDevInfo != INVALID_HANDLE_VALUE) - { - LVITEM li; - DWORD MemberIndex = 0; - - SetupDiGetClassImageIndex(&hpd->ClassImageListData, - &DevInfo->Guid, - &ImageIndex); - - while (SetupDiEnumDeviceInfo(DevInfo->hDevInfo, - MemberIndex++, - &DevInfoData)) - { - DWORD RegDataType; - INT iItem; - - if (DevInfo->HwDevInfo != NULL) - { - PHWDEVINFO HwNewDevInfo = HeapReAlloc(GetProcessHeap(), - 0, - DevInfo->HwDevInfo, - (DevInfo->ItemCount + 1) * - sizeof(HWDEVINFO)); - if (HwNewDevInfo != NULL) - { - DevInfo->HwDevInfo = HwNewDevInfo; - DevInfo->HwDevInfo[DevInfo->ItemCount].ClassDevInfo = DevInfo; - DevInfo->HwDevInfo[DevInfo->ItemCount++].DevInfoData = DevInfoData; - } - else - { - DPRINT1("Unable to allocate memory for %d SP_DEVINFO_DATA structures!\n", - DevInfo->ItemCount + 1); - break; - } - } - else - { - DevInfo->HwDevInfo = HeapAlloc(GetProcessHeap(), - 0, - sizeof(HWDEVINFO)); - if (DevInfo->HwDevInfo != NULL) - { - DevInfo->HwDevInfo[DevInfo->ItemCount].ClassDevInfo = DevInfo; - DevInfo->HwDevInfo[DevInfo->ItemCount++].DevInfoData = DevInfoData; - } - else - { - DPRINT1("Unable to allocate memory for a SP_DEVINFO_DATA structures!\n"); - break; - } - } - - if ((SetupDiGetDeviceRegistryProperty(DevInfo->hDevInfo, - &DevInfoData, - SPDRP_FRIENDLYNAME, - &RegDataType, - (PBYTE)szBuffer, - sizeof(szBuffer), - NULL) || - SetupDiGetDeviceRegistryProperty(DevInfo->hDevInfo, - &DevInfoData, - SPDRP_DEVICEDESC, - &RegDataType, - (PBYTE)szBuffer, - sizeof(szBuffer), - NULL)) && - RegDataType == REG_SZ) - { - /* FIXME - check string for NULL termination! */ - - li.mask = LVIF_PARAM | LVIF_STATE | LVIF_TEXT | LVIF_IMAGE; - li.iItem = ItemCount; - li.iSubItem = 0; - li.state = (ItemCount == 0 ? LVIS_SELECTED : 0); - li.stateMask = LVIS_SELECTED; - li.pszText = szBuffer; - li.iImage = ImageIndex; - li.lParam = (LPARAM)&DevInfo->HwDevInfo[DevInfo->ItemCount - 1]; - - iItem = ListView_InsertItem(hpd->hWndDevList, - &li); - if (iItem != -1) - { - ItemCount++; - - if (SetupDiGetClassDescription(&DevInfo->Guid, - szBuffer, - sizeof(szBuffer) / sizeof(szBuffer[0]), - NULL)) - { - li.mask = LVIF_TEXT; - li.iItem = iItem; - li.iSubItem = 1; - - ListView_SetItem(hpd->hWndDevList, - &li); - } - } - } - } - } - - DevInfo++; - } - - /* update the controls */ - UpdateControlStates(hpd); -} - - -static LRESULT -CALLBACK -ParentSubWndProc(IN HWND hwnd, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) -{ - PHARDWARE_PAGE_DATA hpd; - - hpd = (PHARDWARE_PAGE_DATA)GetProp(hwnd, - L"DevMgrSubClassInfo"); - if (hpd != NULL) - { - if (uMsg == WM_SIZE) - { - /* resize the hardware page */ - SetWindowPos(hpd->hWnd, - NULL, - 0, - 0, - LOWORD(lParam), - HIWORD(lParam), - SWP_NOZORDER); - } - - /* pass the message the the old window proc */ - return CallWindowProc(hpd->ParentOldWndProc, - hwnd, - uMsg, - wParam, - lParam); - } - else - { - /* this is not a good idea if the subclassed window was an ansi - window, but we failed finding out the previous window proc - so we can't use CallWindowProc. This should rarely - if ever - - happen. */ - - return DefWindowProc(hwnd, - uMsg, - wParam, - lParam); - } -} - - -static VOID -HardwareDlgResize(IN PHARDWARE_PAGE_DATA hpd, - IN INT cx, - IN INT cy) -{ - HDWP dwp; - HWND hControl, hButton; - INT Width, x, y, TopBias = 0; - RECT rc, rcButton; - POINT pt = {0}; - POINT ptMargin = {0}; - POINT ptMarginGroup = {0}; - - /* use left margin of the IDC_DEVICES label as the right - margin of all controls outside the group box */ - hControl = GetDlgItem(hpd->hWnd, - IDC_DEVICES); - GetWindowRect(hControl, - &rc); - MapWindowPoints(hControl, - hpd->hWnd, - &ptMargin, - 1); - - Width = cx - (2 * ptMargin.x); - - if ((dwp = BeginDeferWindowPos(8))) - { - /* rc already has the window rect of IDC_DEVICES! */ - if (!(dwp = DeferWindowPos(dwp, - hControl, - NULL, - 0, - 0, - Width, - rc.bottom - rc.top, - SWP_NOMOVE | SWP_NOZORDER))) - { - return; - } - - /* resize the devices list view control */ - GetWindowRect(hpd->hWndDevList, - &rc); - MapWindowPoints(hpd->hWndDevList, - hpd->hWnd, - &pt, - 1); - if (hpd->DisplayMode == HWPD_LARGELIST) - { - /* increase the size of the list view control by 2/3 */ - TopBias = ((rc.bottom - rc.top) * 2) / 3; - } - y = pt.y + TopBias + rc.bottom - rc.top + ptMargin.y; - if (!(dwp = DeferWindowPos(dwp, - hpd->hWndDevList, - NULL, - 0, - 0, - Width, - rc.bottom - rc.top + TopBias, - SWP_NOMOVE | SWP_NOZORDER))) - { - return; - } - - /* resize the group box control */ - hControl = GetDlgItem(hpd->hWnd, - IDC_PROPERTIESGROUP); - GetWindowRect(hControl, - &rc); - if (!(dwp = DeferWindowPos(dwp, - hControl, - NULL, - ptMargin.x, - y, - Width, - cy - y - ptMargin.y, - SWP_NOZORDER))) - { - return; - } - - /* use left margin of the IDC_MANUFACTURER label as the right - margin of all controls inside the group box */ - hControl = GetDlgItem(hpd->hWnd, - IDC_MANUFACTURER); - GetWindowRect(hControl, - &rc); - MapWindowPoints(hControl, - hpd->hWnd, - &ptMarginGroup, - 1); - - ptMarginGroup.y = ptMargin.y * 2; - Width = cx - (2 * ptMarginGroup.x); - y += ptMarginGroup.y; - if (!(dwp = DeferWindowPos(dwp, - hControl, - NULL, - ptMarginGroup.x, - y, - Width, - rc.bottom - rc.top, - SWP_NOZORDER))) - { - return; - } - y += rc.bottom - rc.top + ptMargin.y; - - /* resize the IDC_LOCATION label */ - hControl = GetDlgItem(hpd->hWnd, - IDC_LOCATION); - GetWindowRect(hControl, - &rc); - if (!(dwp = DeferWindowPos(dwp, - hControl, - NULL, - ptMarginGroup.x, - y, - Width, - rc.bottom - rc.top, - SWP_NOZORDER))) - { - return; - } - y += rc.bottom - rc.top + ptMargin.y; - - /* measure the size of the buttons */ - hButton = GetDlgItem(hpd->hWnd, - IDC_PROPERTIES); - GetWindowRect(hButton, - &rcButton); - - /* resize the IDC_STATUS label */ - hControl = GetDlgItem(hpd->hWnd, - IDC_STATUS); - GetWindowRect(hControl, - &rc); - if (!(dwp = DeferWindowPos(dwp, - hControl, - NULL, - ptMarginGroup.x, - y, - Width, - cy - y - (3 * ptMargin.y) - - (rcButton.bottom - rcButton.top), - SWP_NOZORDER))) - { - return; - } - - /* move the IDC_PROPERTIES button */ - y = cy - (2 * ptMargin.y) - (rcButton.bottom - rcButton.top); - x = cx - ptMarginGroup.x - (rcButton.right - rcButton.left); - if (!(dwp = DeferWindowPos(dwp, - hButton, - NULL, - x, - y, - 0, - 0, - SWP_NOSIZE | SWP_NOZORDER))) - { - return; - } - - /* move the IDC_TROUBLESHOOT button */ - hButton = GetDlgItem(hpd->hWnd, - IDC_TROUBLESHOOT); - GetWindowRect(hButton, - &rcButton); - x -= ptMargin.x + (rcButton.right - rcButton.left); - if (!(dwp = DeferWindowPos(dwp, - hButton, - NULL, - x, - y, - 0, - 0, - SWP_NOSIZE | SWP_NOZORDER))) - { - return; - } - - EndDeferWindowPos(dwp); - } -} - - -static INT_PTR -CALLBACK -HardwareDlgProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) -{ - PHARDWARE_PAGE_DATA hpd; - - hpd = (PHARDWARE_PAGE_DATA)GetWindowLongPtr(hwndDlg, - DWL_USER); - - if (hpd != NULL || uMsg == WM_INITDIALOG) - { - switch (uMsg) - { - case WM_NOTIFY: - { - NMHDR *pnmh = (NMHDR*)lParam; - if (pnmh->hwndFrom == hpd->hWndDevList) - { - switch (pnmh->code) - { - case LVN_ITEMCHANGED: - { - LPNMLISTVIEW pnmv = (LPNMLISTVIEW)lParam; - - if ((pnmv->uChanged & LVIF_STATE) && - ((pnmv->uOldState & (LVIS_FOCUSED | LVIS_SELECTED)) || - (pnmv->uNewState & (LVIS_FOCUSED | LVIS_SELECTED)))) - { - UpdateControlStates(hpd); - } - break; - } - } - } - break; - } - - case WM_SIZE: - HardwareDlgResize(hpd, - (INT)LOWORD(lParam), - (INT)HIWORD(lParam)); - break; - - case WM_INITDIALOG: - { - hpd = (PHARDWARE_PAGE_DATA)lParam; - if (hpd != NULL) - { - HWND hWndParent; - - hpd->hWnd = hwndDlg; - SetWindowLongPtr(hwndDlg, - DWL_USER, - (DWORD_PTR)hpd); - - hpd->ClassImageListData.cbSize = sizeof(SP_CLASSIMAGELIST_DATA); - - SetupDiGetClassImageList(&hpd->ClassImageListData); - - hpd->hWndDevList = GetDlgItem(hwndDlg, - IDC_LV_DEVICES); - - /* subclass the parent window */ - hWndParent = GetAncestor(hwndDlg, - GA_PARENT); - if (hWndParent != NULL) - { - RECT rcClient; - - if (GetClientRect(hWndParent, - &rcClient) && - SetWindowPos(hwndDlg, - NULL, - 0, - 0, - rcClient.right, - rcClient.bottom, - SWP_NOZORDER)) - { - /* subclass the parent window. This is not safe - if the parent window belongs to another thread! */ - hpd->ParentOldWndProc = (WNDPROC)SetWindowLongPtr(hWndParent, - GWLP_WNDPROC, - (LONG_PTR)ParentSubWndProc); - - if (hpd->ParentOldWndProc != NULL && - SetProp(hWndParent, - L"DevMgrSubClassInfo", - (HANDLE)hpd)) - { - hpd->hWndParent = hWndParent; - } - } - } - - /* initialize the devices list view control */ - InitializeDevicesList(hpd); - - /* fill the devices list view control */ - FillDevicesList(hpd); - } - break; - } - - case WM_DESTROY: - { - UINT i; - - /* free the device info set handles */ - for (i = 0; - i < hpd->NumberOfGuids; - i++) - { - SetupDiDestroyDeviceInfoList(hpd->ClassDevInfo[i].hDevInfo); - if (hpd->ClassDevInfo[i].HwDevInfo != NULL) - { - HeapFree(GetProcessHeap(), - 0, - hpd->ClassDevInfo[i].HwDevInfo); - } - } - - /* restore the old window proc of the subclassed parent window */ - if (hpd->hWndParent != NULL && hpd->ParentOldWndProc != NULL) - { - SetWindowLongPtr(hpd->hWndParent, - GWLP_WNDPROC, - (LONG_PTR)hpd->ParentOldWndProc); - } - - if (hpd->ClassImageListData.ImageList != NULL) - { - SetupDiDestroyClassImageList(&hpd->ClassImageListData); - } - - /* free the reference to comctl32 */ - FreeLibrary(hpd->hComCtl32); - hpd->hComCtl32 = NULL; - - /* free the allocated resources */ - HeapFree(GetProcessHeap(), - 0, - hpd); - break; - } - } - } - - return FALSE; -} - - -/********************************************************************** ***** - * NAME EXPORTED - * DeviceCreateHardwarePageEx - * - * DESCRIPTION - * Creates a hardware page - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * lpGuids: An array of guids of devices that are to be listed - * uNumberOfGuids: Numbers of guids in the Guids array - * Unknown: Unknown parameter, see NOTEs - * - * RETURN VALUE - * Returns the handle of the hardware page window that has been created or - * NULL if it failed. - * - * REVISIONS - * 13-05-2005 first working version (Sebastian Gasiorek <zebasoftis(a)gmail.com>) - * - * NOTE - * uUnknown seems to be some kind of flag how the entries should be displayed, - * in Win it seems to be always 0x00000001 - * - * TODO - * missing: device icon in list view, Troubleshoot button, device properties, - * status description, - * devices should be visible afer PSN_SETACTIVE message - * - */ -HWND -WINAPI -DeviceCreateHardwarePageEx(IN HWND hWndParent, - IN LPGUID lpGuids, - IN UINT uNumberOfGuids, - IN HWPAGE_DISPLAYMODE DisplayMode) -{ - PHARDWARE_PAGE_DATA hpd; - PINITCOMMONCONTROLS pInitCommonControls; - - /* allocate the HARDWARE_PAGE_DATA structure. Make sure it is - zeroed because the initialization code assumes that in - failure cases! */ - hpd = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - FIELD_OFFSET(HARDWARE_PAGE_DATA, - ClassDevInfo) + - (uNumberOfGuids * sizeof(HWCLASSDEVINFO))); - if (hpd != NULL) - { - HWND hWnd; - UINT i; - - hpd->DisplayMode = ((DisplayMode > HWPD_MAX) ? HWPD_STANDARDLIST : DisplayMode); - - /* initialize the HARDWARE_PAGE_DATA structure */ - hpd->NumberOfGuids = uNumberOfGuids; - for (i = 0; - i < uNumberOfGuids; - i++) - { - hpd->ClassDevInfo[i].Guid = lpGuids[i]; - } - - /* load comctl32.dll dynamically */ - hpd->hComCtl32 = LoadLibrary(TEXT("comctl32.dll")); - if (hpd->hComCtl32 == NULL) - { - goto Cleanup; - } - - /* initialize the common controls */ - pInitCommonControls = (PINITCOMMONCONTROLS)GetProcAddress(hpd->hComCtl32, - "InitCommonControls"); - if (pInitCommonControls == NULL) - { - goto Cleanup; - } - pInitCommonControls(); - - /* create the dialog */ - hWnd = CreateDialogParam(hDllInstance, - MAKEINTRESOURCE(IDD_HARDWARE), - hWndParent, - HardwareDlgProc, - (LPARAM)hpd); - if (hWnd != NULL) - { - return hWnd; - } - else - { -Cleanup: - /* oops, something went wrong... */ - if (hpd->hComCtl32 != NULL) - { - FreeLibrary(hpd->hComCtl32); - } - - HeapFree(GetProcessHeap(), - 0, - hpd); - } - } - - return NULL; -} - - -/********************************************************************** ***** - * NAME EXPORTED - * DeviceCreateHardwarePage - * - * DESCRIPTION - * Creates a hardware page - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * lpGuid: Guid of the device - * - * RETURN VALUE - * Returns the handle of the hardware page window that has been created or - * NULL if it failed. - * - * REVISIONS - * - * NOTE - * - */ - -HWND -WINAPI -DeviceCreateHardwarePage(IN HWND hWndParent, - IN LPGUID lpGuid) -{ - return DeviceCreateHardwarePageEx(hWndParent, - lpGuid, - 1, - HWPD_LARGELIST); -} - - -BOOL -STDCALL -DllMain(IN HINSTANCE hinstDLL, - IN DWORD dwReason, - IN LPVOID lpvReserved) -{ - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - hDllInstance = hinstDLL; - break; - } - - return TRUE; -} _____ Modified: trunk/reactos/lib/devmgr/devmgr.xml --- trunk/reactos/lib/devmgr/devmgr.xml 2005-11-25 14:40:28 UTC (rev 19555) +++ trunk/reactos/lib/devmgr/devmgr.xml 2005-11-25 15:36:14 UTC (rev 19556) @@ -13,7 +13,7 @@ <library>setupapi</library> <library>user32</library> <file>devmgr.rc</file> - <file>devmgr.c</file> + <file>hwpage.c</file> <file>misc.c</file> <file>stubs.c</file> <pch>precomp.h</pch> _____ Copied: trunk/reactos/lib/devmgr/hwpage.c (from rev 19555, trunk/reactos/lib/devmgr/devmgr.c) --- trunk/reactos/lib/devmgr/devmgr.c 2005-11-25 14:40:28 UTC (rev 19555) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-11-25 15:36:14 UTC (rev 19556) @@ -0,0 +1,803 @@ +/* + * ReactOS Device Manager Applet + * Copyright (C) 2004 - 2005 ReactOS Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/* $Id$ + * + * PROJECT: ReactOS devmgr.dll + * FILE: lib/devmgr/hwpage.c + * PURPOSE: ReactOS Device Manager + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + * UPDATE HISTORY: + * 04-04-2004 Created + */ +#include <precomp.h> + +#define NDEBUG +#include <debug.h> + +typedef VOID (WINAPI *PINITCOMMONCONTROLS)(VOID); + +typedef enum +{ + HWPD_STANDARDLIST = 0, + HWPD_LARGELIST, + HWPD_MAX = HWPD_LARGELIST +} HWPAGE_DISPLAYMODE, *PHWPAGE_DISPLAYMODE; + +typedef struct _HWDEVINFO +{ + struct _HWCLASSDEVINFO *ClassDevInfo; + SP_DEVINFO_DATA DevInfoData; +} HWDEVINFO, *PHWDEVINFO; + +typedef struct _HWCLASSDEVINFO +{ + GUID Guid; + HDEVINFO hDevInfo; + INT ItemCount; + PHWDEVINFO HwDevInfo; +} HWCLASSDEVINFO, *PHWCLASSDEVINFO; + +typedef struct _HARDWARE_PAGE_DATA +{ + HWND hWnd; + HWND hWndDevList; + HINSTANCE hComCtl32; /* only save this to keep track of the references */ + SP_CLASSIMAGELIST_DATA ClassImageListData; + HWPAGE_DISPLAYMODE DisplayMode; + + /* parent window subclass info */ + WNDPROC ParentOldWndProc; + HWND hWndParent; + + UINT NumberOfGuids; + HWCLASSDEVINFO ClassDevInfo[1]; + /* struct may be dynamically expanded here! */ +} HARDWARE_PAGE_DATA, *PHARDWARE_PAGE_DATA; + +#define CX_TYPECOLUMN_WIDTH 80 + +static VOID +InitializeDevicesList(IN PHARDWARE_PAGE_DATA hpd) +{ + LVCOLUMN lvc; + RECT rcClient; + WCHAR szColName[255]; + int iCol = 0; + + /* set the list view style */ + ListView_SetExtendedListViewStyle(hpd->hWndDevList, + LVS_EX_FULLROWSELECT); + + /* set the list view image list */ + if (hpd->ClassImageListData.ImageList != NULL) + { + ListView_SetImageList(hpd->hWndDevList, + hpd->ClassImageListData.ImageList, + LVSIL_SMALL); + } + + GetClientRect(hpd->hWndDevList, + &rcClient); + + /* add the list view columns */ + lvc.mask = LVCF_TEXT | LVCF_WIDTH; + lvc.fmt = LVCFMT_LEFT; + lvc.pszText = szColName; + + if (LoadString(hDllInstance, + IDS_NAME, + szColName, + sizeof(szColName) / sizeof(szColName[0]))) + { + lvc.cx = rcClient.right - CX_TYPECOLUMN_WIDTH - + GetSystemMetrics(SM_CXVSCROLL); + ListView_InsertColumn(hpd->hWndDevList, + iCol++, + &lvc); + } + if (LoadString(hDllInstance, + IDS_TYPE, + szColName, + sizeof(szColName) / sizeof(szColName[0]))) + { + lvc.cx = CX_TYPECOLUMN_WIDTH; + ListView_InsertColumn(hpd->hWndDevList, + iCol++, + &lvc); + } +} + + +static VOID +UpdateControlStates(IN PHARDWARE_PAGE_DATA hpd) +{ + PHWDEVINFO HwDevInfo; + + HwDevInfo = (PHWDEVINFO)ListViewGetSelectedItemData(hpd->hWndDevList); + if (HwDevInfo != NULL) + { + /* FIXME - update static controls and enable buttons */ + } + else + { + /* FIXME - clear static controls and disable buttons */ + } +} + + +static VOID +FillDevicesList(IN PHARDWARE_PAGE_DATA hpd) +{ + PHWCLASSDEVINFO DevInfo, LastDevInfo; + SP_DEVINFO_DATA DevInfoData; + WCHAR szBuffer[255]; + INT ItemCount = 0; [truncated at 1000 lines; 687 more skipped]

18 years, 9 months

[chorns] 19555: Merge duplicate definitions

by chorns＠svn.reactos.com

Merge duplicate definitions Modified: trunk/reactos/ntoskrnl/ex/resource.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/io/arcname.c Modified: trunk/reactos/ntoskrnl/io/disk.c _____ Modified: trunk/reactos/ntoskrnl/ex/resource.c --- trunk/reactos/ntoskrnl/ex/resource.c 2005-11-25 14:38:59 UTC (rev 19554) +++ trunk/reactos/ntoskrnl/ex/resource.c 2005-11-25 14:40:28 UTC (rev 19555) @@ -32,7 +32,6 @@ * */ -#define ResourceOwnedExclusive 0x80 #define ResourceDisableBoost 0x08 /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/include/internal/io.h --- trunk/reactos/ntoskrnl/include/internal/io.h 2005-11-25 14:38:59 UTC (rev 19554) +++ trunk/reactos/ntoskrnl/include/internal/io.h 2005-11-25 14:40:28 UTC (rev 19555) @@ -3,6 +3,46 @@ #include <ddk/ntdddisk.h> +/* STRUCTURES ***************************************************************/ + +typedef struct _DISKENTRY +{ + LIST_ENTRY ListEntry; + ULONG DiskNumber; + ULONG Signature; + ULONG Checksum; + PDEVICE_OBJECT DeviceObject; +} DISKENTRY, *PDISKENTRY; + +#define PARTITION_TBL_SIZE 4 + +#include <pshpack1.h> + +typedef struct _PARTITION +{ + unsigned char BootFlags; /* bootable? 0=no, 128=yes */ + unsigned char StartingHead; /* beginning head number */ + unsigned char StartingSector; /* beginning sector number */ + unsigned char StartingCylinder; /* 10 bit nmbr, with high 2 bits put in begsect */ + unsigned char PartitionType; /* Operating System type indicator code */ + unsigned char EndingHead; /* ending head number */ + unsigned char EndingSector; /* ending sector number */ + unsigned char EndingCylinder; /* also a 10 bit nmbr, with same high 2 bit trick */ + unsigned int StartingBlock; /* first sector relative to start of disk */ + unsigned int SectorCount; /* number of sectors in partition */ +} PARTITION, *PPARTITION; + +typedef struct _PARTITION_SECTOR +{ + UCHAR BootCode[440]; /* 0x000 */ + ULONG Signature; /* 0x1B8 */ + UCHAR Reserved[2]; /* 0x1BC */ + PARTITION Partition[PARTITION_TBL_SIZE]; /* 0x1BE */ + USHORT Magic; /* 0x1FE */ +} PARTITION_SECTOR, *PPARTITION_SECTOR; + +#include <poppack.h> + #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) extern POBJECT_TYPE IoCompletionType; _____ Modified: trunk/reactos/ntoskrnl/io/arcname.c --- trunk/reactos/ntoskrnl/io/arcname.c 2005-11-25 14:38:59 UTC (rev 19554) +++ trunk/reactos/ntoskrnl/io/arcname.c 2005-11-25 14:40:28 UTC (rev 19555) @@ -19,46 +19,6 @@ #define FS_VOLUME_BUFFER_SIZE (MAX_PATH + sizeof(FILE_FS_VOLUME_INFORMATION)) -/* STRUCTURES ***************************************************************/ - -typedef struct _DISKENTRY -{ - LIST_ENTRY ListEntry; - ULONG DiskNumber; - ULONG Signature; - ULONG Checksum; - PDEVICE_OBJECT DeviceObject; -} DISKENTRY, *PDISKENTRY; - -#define PARTITION_TBL_SIZE 4 - -#include <pshpack1.h> - -typedef struct _PARTITION -{ - unsigned char BootFlags; /* bootable? 0=no, 128=yes */ - unsigned char StartingHead; /* beginning head number */ - unsigned char StartingSector; /* beginning sector number */ - unsigned char StartingCylinder; /* 10 bit nmbr, with high 2 bits put in begsect */ - unsigned char PartitionType; /* Operating System type indicator code */ - unsigned char EndingHead; /* ending head number */ - unsigned char EndingSector; /* ending sector number */ - unsigned char EndingCylinder; /* also a 10 bit nmbr, with same high 2 bit trick */ - unsigned int StartingBlock; /* first sector relative to start of disk */ - unsigned int SectorCount; /* number of sectors in partition */ -} PARTITION, *PPARTITION; - -typedef struct _PARTITION_SECTOR -{ - UCHAR BootCode[440]; /* 0x000 */ - ULONG Signature; /* 0x1B8 */ - UCHAR Reserved[2]; /* 0x1BC */ - PARTITION Partition[PARTITION_TBL_SIZE]; /* 0x1BE */ - USHORT Magic; /* 0x1FE */ -} PARTITION_SECTOR, *PPARTITION_SECTOR; - -#include <poppack.h> - /* FUNCTIONS ****************************************************************/ STATIC _____ Modified: trunk/reactos/ntoskrnl/io/disk.c --- trunk/reactos/ntoskrnl/io/disk.c 2005-11-25 14:38:59 UTC (rev 19554) +++ trunk/reactos/ntoskrnl/io/disk.c 2005-11-25 14:40:28 UTC (rev 19555) @@ -16,38 +16,12 @@ /* LOCAL MACROS and TYPES ***************************************************/ -#define AUTO_DRIVE ((ULONG)-1) +#define AUTO_DRIVE ((ULONG)-1) -#define PARTITION_MAGIC 0xaa55 +#define PARTITION_MAGIC 0xaa55 -#define PARTITION_TBL_SIZE 4 - #include <pshpack1.h> -typedef struct _PARTITION -{ - unsigned char BootFlags; /* bootable? 0=no, 128=yes */ - unsigned char StartingHead; /* beginning head number */ - unsigned char StartingSector; /* beginning sector number */ - unsigned char StartingCylinder; /* 10 bit nmbr, with high 2 bits put in begsect */ - unsigned char PartitionType; /* Operating System type indicator code */ - unsigned char EndingHead; /* ending head number */ - unsigned char EndingSector; /* ending sector number */ - unsigned char EndingCylinder; /* also a 10 bit nmbr, with same high 2 bit trick */ - unsigned int StartingBlock; /* first sector relative to start of disk */ - unsigned int SectorCount; /* number of sectors in partition */ -} PARTITION, *PPARTITION; - - -typedef struct _PARTITION_SECTOR -{ - UCHAR BootCode[440]; /* 0x000 */ - ULONG Signature; /* 0x1B8 */ - UCHAR Reserved[2]; /* 0x1BC */ - PARTITION Partition[PARTITION_TBL_SIZE]; /* 0x1BE */ - USHORT Magic; /* 0x1FE */ -} PARTITION_SECTOR, *PPARTITION_SECTOR; - typedef struct _REG_DISK_MOUNT_INFO { ULONG Signature; @@ -56,7 +30,6 @@ #include <poppack.h> - typedef enum _DISK_MANAGER { NoDiskManager,

18 years, 9 months

[chorns] 19554: Don't include files from outside a compilation unit

by chorns＠svn.reactos.com

Don't include files from outside a compilation unit Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp Modified: trunk/reactos/tools/rbuild/tests/data/compilationunit.xml _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-11-25 14:31:45 UTC (rev 19553) +++ trunk/reactos/tools/rbuild/module.cpp 2005-11-25 14:38:59 UTC (rev 19554) @@ -448,6 +448,7 @@ ParseContext& parseContext ) { If* pOldIf = parseContext.ifData; + CompilationUnit* pOldCompilationUnit = parseContext.compilationUnit; bool subs_invalid = false; string subpath ( path ); if ( e.name == "file" && e.value.size () > 0 ) @@ -654,6 +655,7 @@ for ( size_t i = 0; i < e.subElements.size (); i++ ) ProcessXMLSubElement ( *e.subElements[i], subpath, parseContext ); parseContext.ifData = pOldIf; + parseContext.compilationUnit = pOldCompilationUnit; } ModuleType _____ Modified: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp --- trunk/reactos/tools/rbuild/tests/compilationunittest.cpp 2005-11-25 14:31:45 UTC (rev 19553) +++ trunk/reactos/tools/rbuild/tests/compilationunittest.cpp 2005-11-25 14:38:59 UTC (rev 19554) @@ -29,15 +29,21 @@ Module& module1 = *project.modules[0]; IS_TRUE ( module1.type == BuildTool ); - ARE_EQUAL ( 2, module1.non_if_data.files.size()); + ARE_EQUAL ( 3, module1.non_if_data.files.size()); ARE_EQUAL ( "dir1" SSEP "file1.c", module1.non_if_data.files[0]->name ); ARE_EQUAL ( "dir1" SSEP "file2.c", module1.non_if_data.files[1]->name ); + ARE_EQUAL ( "dir1" SSEP "file3.c", module1.non_if_data.files[2]->name ); - ARE_EQUAL ( 1, module1.non_if_data.compilationUnits.size () ); + ARE_EQUAL ( 2, module1.non_if_data.compilationUnits.size () ); CompilationUnit& compilationUnit1 = *module1.non_if_data.compilationUnits[0]; ARE_EQUAL ( 2, compilationUnit1.files.size () ); ARE_EQUAL ( "dir1" SSEP "file1.c", compilationUnit1.files[0]->name ); ARE_EQUAL ( "dir1" SSEP "file2.c", compilationUnit1.files[1]->name ); + + CompilationUnit& compilationUnit2 = *module1.non_if_data.compilationUnits[1]; + ARE_EQUAL ( 1, compilationUnit2.files.size () ); + + ARE_EQUAL ( "dir1" SSEP "file3.c", compilationUnit2.files[0]->name ); } _____ Modified: trunk/reactos/tools/rbuild/tests/data/compilationunit.xml --- trunk/reactos/tools/rbuild/tests/data/compilationunit.xml 2005-11-25 14:31:45 UTC (rev 19553) +++ trunk/reactos/tools/rbuild/tests/data/compilationunit.xml 2005-11-25 14:38:59 UTC (rev 19554) @@ -6,6 +6,7 @@ <file>file1.c</file> <file>file2.c</file> </compilationunit> + <file>file3.c</file> </module> </directory> </project>

18 years, 9 months

[weiden] 19553: add devmgr.dll to the bootcd

by weiden＠svn.reactos.com

add devmgr.dll to the bootcd Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-11-25 14:19:42 UTC (rev 19552) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-11-25 14:31:45 UTC (rev 19553) @@ -81,6 +81,7 @@ lib\dbghelp\dbghelp.dll 1 lib\ddraw\ddraw.dll 1 lib\devenum\devenum.dll 1 +lib\devmgr\devmgr.dll 1 lib\dhcpcapi\dhcpcapi.dll 1 lib\dinput\dinput.dll 1 lib\dinput8\dinput8.dll 1

18 years, 9 months

← Newer
1
...
21
22
23
24
25
26
27
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005