Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 61019: [BASESRV][SVCHOST] - Fix callback calling conventions
by tfaber＠svn.reactos.org 17 Nov '13

17 Nov '13

Author: tfaber Date: Sun Nov 17 19:14:24 2013 New Revision: 61019 URL: http://svn.reactos.org/svn/reactos?rev=61019&view=rev Log: [BASESRV][SVCHOST] - Fix callback calling conventions Modified: trunk/reactos/base/services/svchost/svchost.h trunk/reactos/subsystems/win/basesrv/basesrv.h Modified: trunk/reactos/base/services/svchost/svchost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] Sun Nov 17 19:14:24 2013 @@ -37,7 +37,7 @@ // FIXME: GLOBAL HEADER // typedef VOID - (*CALLBACK PSVCHOST_STOP_CALLBACK) ( + (CALLBACK *PSVCHOST_STOP_CALLBACK) ( _In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWaitFired ); Modified: trunk/reactos/subsystems/win/basesrv/basesrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/bas… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/basesrv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/basesrv.h [iso-8859-1] Sun Nov 17 19:14:24 2013 @@ -39,22 +39,22 @@ } BASESRV_KERNEL_IMPORTS, *PBASESRV_KERNEL_IMPORTS; /* FIXME: BASENLS.H */ -typedef NTSTATUS(*WINAPI POPEN_DATA_FILE)(HANDLE hFile, +typedef NTSTATUS(WINAPI *POPEN_DATA_FILE)(HANDLE hFile, PWCHAR FileName); -typedef BOOL(*WINAPI PGET_CP_FILE_NAME_FROM_REGISTRY)(UINT CodePage, +typedef BOOL(WINAPI *PGET_CP_FILE_NAME_FROM_REGISTRY)(UINT CodePage, LPWSTR FileName, ULONG FileNameSize); -typedef BOOL(*WINAPI PGET_NLS_SECTION_NAME)(UINT CodePage, +typedef BOOL(WINAPI *PGET_NLS_SECTION_NAME)(UINT CodePage, UINT Base, ULONG Unknown, LPWSTR BaseName, LPWSTR Result, ULONG ResultSize); -typedef BOOL(*WINAPI PVALIDATE_LOCALE)(IN ULONG LocaleId); -typedef NTSTATUS(*WINAPI PCREATE_NLS_SECURTY_DESCRIPTOR)(IN PVOID Buffer, +typedef BOOL(WINAPI *PVALIDATE_LOCALE)(IN ULONG LocaleId); +typedef NTSTATUS(WINAPI *PCREATE_NLS_SECURTY_DESCRIPTOR)(IN PVOID Buffer, IN ULONG BufferSize, IN ULONG AceType);

1 0

[janderwald] 61018: [DEVMGR] - Implement device resource page
by janderwald＠svn.reactos.org 17 Nov '13

17 Nov '13

Author: janderwald Date: Sun Nov 17 19:14:08 2013 New Revision: 61018 URL: http://svn.reactos.org/svn/reactos?rev=61018&view=rev Log: [DEVMGR] - Implement device resource page Added: trunk/reactos/dll/win32/devmgr/hwresource.c (with props) Modified: trunk/reactos/dll/win32/devmgr/CMakeLists.txt trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc trunk/reactos/dll/win32/devmgr/lang/de-DE.rc trunk/reactos/dll/win32/devmgr/lang/el-GR.rc trunk/reactos/dll/win32/devmgr/lang/en-US.rc trunk/reactos/dll/win32/devmgr/lang/es-ES.rc trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc trunk/reactos/dll/win32/devmgr/lang/he-IL.rc trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc trunk/reactos/dll/win32/devmgr/lang/id-ID.rc trunk/reactos/dll/win32/devmgr/lang/it-IT.rc trunk/reactos/dll/win32/devmgr/lang/no-NO.rc trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc trunk/reactos/dll/win32/devmgr/precomp.h trunk/reactos/dll/win32/devmgr/resource.h Modified: trunk/reactos/dll/win32/devmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/devmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/CMakeLists.txt [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -6,6 +6,7 @@ advprop.c devprblm.c hwpage.c + hwresource.c misc.c stubs.c ${CMAKE_CURRENT_BINARY_DIR}/devmgr_stubs.c Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -30,70 +30,6 @@ #define NDEBUG #include <debug.h> - -typedef INT_PTR (WINAPI *PPROPERTYSHEETW)(LPCPROPSHEETHEADERW); -typedef HPROPSHEETPAGE (WINAPI *PCREATEPROPERTYSHEETPAGEW)(LPCPROPSHEETPAGEW); -typedef BOOL (WINAPI *PDESTROYPROPERTYSHEETPAGE)(HPROPSHEETPAGE); - -typedef struct _DEVADVPROP_INFO -{ - HWND hWndGeneralPage; - HWND hWndParent; - WNDPROC ParentOldWndProc; - HICON hDevIcon; - - HDEVINFO DeviceInfoSet; - SP_DEVINFO_DATA DeviceInfoData; - HDEVINFO CurrentDeviceInfoSet; - SP_DEVINFO_DATA CurrentDeviceInfoData; - DEVINST ParentDevInst; - HMACHINE hMachine; - LPCWSTR lpMachineName; - - HINSTANCE hComCtl32; - PCREATEPROPERTYSHEETPAGEW pCreatePropertySheetPageW; - PDESTROYPROPERTYSHEETPAGE pDestroyPropertySheetPage; - - DWORD PropertySheetType; - DWORD nDevPropSheets; - HPROPSHEETPAGE *DevPropSheets; - - union - { - UINT Flags; - struct - { - UINT Extended : 1; - UINT FreeDevPropSheets : 1; - UINT CanDisable : 1; - UINT DeviceStarted : 1; - UINT DeviceUsageChanged : 1; - UINT CloseDevInst : 1; - UINT IsAdmin : 1; - UINT DoDefaultDevAction : 1; - UINT PageInitialized : 1; - UINT ShowRemotePages : 1; - UINT HasDriverPage : 1; - UINT HasResourcePage : 1; - UINT HasPowerPage : 1; - }; - }; - - WCHAR szDevName[255]; - WCHAR szTemp[255]; - WCHAR szDeviceID[1]; - /* struct may be dynamically expanded here! */ -} DEVADVPROP_INFO, *PDEVADVPROP_INFO; - - -typedef struct _ENUMDRIVERFILES_CONTEXT -{ - HWND hDriversListView; - UINT nCount; -} ENUMDRIVERFILES_CONTEXT, *PENUMDRIVERFILES_CONTEXT; - -#define PM_INITIALIZE (WM_APP + 0x101) - static UINT WINAPI EnumDeviceDriverFilesCallback(IN PVOID Context, @@ -2070,6 +2006,9 @@ if (dap->Extended) dap->nDevPropSheets++; + if (dap->HasResourcePage) + dap->nDevPropSheets++; + /* add the device property sheets */ if (dap->nDevPropSheets != 0) { @@ -2167,10 +2106,33 @@ dap->DevPropSheets[iPage] = NULL; } } - - /* FIXME: Add the resources page */ - } - + } + + if (dap->HasResourcePage) + { + PROPSHEETPAGE pspDriver = {0}; + pspDriver.dwSize = sizeof(PROPSHEETPAGE); + pspDriver.dwFlags = PSP_DEFAULT; + pspDriver.hInstance = hDllInstance; + pspDriver.pszTemplate = (LPCWSTR)MAKEINTRESOURCE(IDD_DEVICERESOURCES); + pspDriver.pfnDlgProc = ResourcesProcDriverDlgProc; + pspDriver.lParam = (LPARAM)dap; + dap->DevPropSheets[iPage] = dap->pCreatePropertySheetPageW(&pspDriver); + if (dap->DevPropSheets[iPage] != NULL) + { + if (PropSheet_AddPage(hPropSheetDlg, + dap->DevPropSheets[iPage])) + { + iPage++; + RecalcPages = TRUE; + } + else + { + dap->pDestroyPropertySheetPage(dap->DevPropSheets[iPage]); + dap->DevPropSheets[iPage] = NULL; + } + } + } /* FIXME: Add the power page */ } else Added: trunk/reactos/dll/win32/devmgr/hwresource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/hwresourc… ============================================================================== --- trunk/reactos/dll/win32/devmgr/hwresource.c (added) +++ trunk/reactos/dll/win32/devmgr/hwresource.c [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -0,0 +1,385 @@ +/* + * PROJECT: ReactOS devmgr.dll + * FILE: dll/win32/devmgr/hwresource.c + * PURPOSE: ReactOS Device Manager + * PROGRAMMER: Johannes Anderwald <johannes.anderwald(a)reactos.org> + * UPDATE HISTORY: + * 2005/11/24 Created + */ +#include "precomp.h" + + +#define NDEBUG +#include <debug.h> + +typedef struct +{ + HWND hWnd; + HWND hWndDevList; + + +}HARDWARE_RESOURCE_DATA, *PHARDWARE_RESOURCE_DATA; + +/* Physical Addresses are always treated as 64-bit wide */ +typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS; + +#include <pshpack4.h> +typedef struct _CM_PARTIAL_RESOURCE_DESCRIPTOR { + UCHAR Type; + UCHAR ShareDisposition; + USHORT Flags; + union { + struct { + PHYSICAL_ADDRESS Start; + ULONG Length; + } Generic; + struct { + PHYSICAL_ADDRESS Start; + ULONG Length; + } Port; + struct { +#if defined(NT_PROCESSOR_GROUPS) + USHORT Level; + USHORT Group; +#else + ULONG Level; +#endif + ULONG Vector; + KAFFINITY Affinity; + } Interrupt; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + struct { + _ANONYMOUS_UNION union { + struct { +#if defined(NT_PROCESSOR_GROUPS) + USHORT Group; +#else + USHORT Reserved; +#endif + USHORT MessageCount; + ULONG Vector; + KAFFINITY Affinity; + } Raw; + struct { +#if defined(NT_PROCESSOR_GROUPS) + USHORT Level; + USHORT Group; +#else + ULONG Level; +#endif + ULONG Vector; + KAFFINITY Affinity; + } Translated; + } DUMMYUNIONNAME; + } MessageInterrupt; +#endif + struct { + PHYSICAL_ADDRESS Start; + ULONG Length; + } Memory; + struct { + ULONG Channel; + ULONG Port; + ULONG Reserved1; + } Dma; + struct { + ULONG Data[3]; + } DevicePrivate; + struct { + ULONG Start; + ULONG Length; + ULONG Reserved; + } BusNumber; + struct { + ULONG DataSize; + ULONG Reserved1; + ULONG Reserved2; + } DeviceSpecificData; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + struct { + PHYSICAL_ADDRESS Start; + ULONG Length40; + } Memory40; + struct { + PHYSICAL_ADDRESS Start; + ULONG Length48; + } Memory48; + struct { + PHYSICAL_ADDRESS Start; + ULONG Length64; + } Memory64; +#endif + } u; +} CM_PARTIAL_RESOURCE_DESCRIPTOR, *PCM_PARTIAL_RESOURCE_DESCRIPTOR; +#include <poppack.h> +typedef struct _CM_PARTIAL_RESOURCE_LIST { + USHORT Version; + USHORT Revision; + ULONG Count; + CM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptors[1]; +} CM_PARTIAL_RESOURCE_LIST, *PCM_PARTIAL_RESOURCE_LIST; + +#define CmResourceTypeNull 0 +#define CmResourceTypePort 1 +#define CmResourceTypeInterrupt 2 +#define CmResourceTypeMemory 3 +#define CmResourceTypeDma 4 +#define CmResourceTypeDeviceSpecific 5 +#define CmResourceTypeBusNumber 6 +#define CmResourceTypeNonArbitrated 128 +#define CmResourceTypeConfigData 128 +#define CmResourceTypeDevicePrivate 129 +#define CmResourceTypePcCardConfig 130 +#define CmResourceTypeMfCardConfig 131 + +typedef enum _INTERFACE_TYPE { + InterfaceTypeUndefined = -1, + Internal, + Isa, + Eisa, + MicroChannel, + TurboChannel, + PCIBus, + VMEBus, + NuBus, + PCMCIABus, + CBus, + MPIBus, + MPSABus, + ProcessorInternal, + InternalPowerBus, + PNPISABus, + PNPBus, + Vmcs, + MaximumInterfaceType +} INTERFACE_TYPE, *PINTERFACE_TYPE; + +typedef struct _CM_FULL_RESOURCE_DESCRIPTOR { + INTERFACE_TYPE InterfaceType; + ULONG BusNumber; + CM_PARTIAL_RESOURCE_LIST PartialResourceList; +} CM_FULL_RESOURCE_DESCRIPTOR, *PCM_FULL_RESOURCE_DESCRIPTOR; + +typedef struct _CM_RESOURCE_LIST { + ULONG Count; + CM_FULL_RESOURCE_DESCRIPTOR List[1]; +} CM_RESOURCE_LIST, *PCM_RESOURCE_LIST; + + +#define CX_TYPECOLUMN_WIDTH 120 + +static VOID +InitializeDevicesList( + IN HWND hWndDevList) +{ + LVCOLUMN lvc; + RECT rcClient; + WCHAR szColName[255]; + int iCol = 0; + + /* set the list view style */ + (void)ListView_SetExtendedListViewStyle(hWndDevList, + LVS_EX_FULLROWSELECT); + + GetClientRect(hWndDevList, + &rcClient); + + /* add the list view columns */ + lvc.mask = LVCF_TEXT | LVCF_WIDTH; + lvc.fmt = LVCFMT_LEFT; + lvc.pszText = szColName; + + if (LoadString(hDllInstance, + IDS_RESOURCE_COLUMN, + szColName, + sizeof(szColName) / sizeof(szColName[0]))) + { + lvc.cx = CX_TYPECOLUMN_WIDTH; + (void)ListView_InsertColumn(hWndDevList, + iCol++, + &lvc); + } + if (LoadString(hDllInstance, + IDS_SETTING_COLUMN, + szColName, + sizeof(szColName) / sizeof(szColName[0]))) + { + lvc.cx = rcClient.right - CX_TYPECOLUMN_WIDTH - + GetSystemMetrics(SM_CXVSCROLL); + + (void)ListView_InsertColumn(hWndDevList, + iCol++, + &lvc); + } +} + +VOID +InsertListItem( + IN HWND hWndDevList, + IN INT ItemCount, + IN LPWSTR ResourceType, + IN LPWSTR ResourceDescription) +{ + INT iItem; + LVITEM li = {0}; + + li.mask = LVIF_STATE | LVIF_TEXT; + li.iItem = ItemCount; + li.pszText = ResourceType; + //li.iImage = ClassDevInfo->ImageIndex; + iItem = ListView_InsertItem(hWndDevList, &li); + + if (iItem != -1) + { + li.mask = LVIF_TEXT; + li.iItem = iItem; + li.iSubItem = 1; + li.pszText = ResourceDescription; + (void)ListView_SetItem(hWndDevList, &li); + } +} + +VOID +AddResourceItems( + IN PDEVADVPROP_INFO dap, + IN HWND hWndDevList) +{ + HKEY hKey; + WCHAR szBuffer[100]; + WCHAR szDetail[100]; + BYTE szData[512]; + DWORD dwSize; + PCM_RESOURCE_LIST ResourceList; + LONG Result; + INT ItemCount = 0, Index = 0; + + wsprintf(szBuffer, L"SYSTEM\\CurrentControlSet\\Enum\\%s\\LogConf", dap->szDeviceID); + Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, KEY_READ, &hKey); + if (Result != ERROR_SUCCESS) + { + /* failed to open device instance log conf dir */ + return; + } + + dwSize = sizeof(szData); + Result = RegQueryValueExW(hKey, L"BootConfig", NULL, NULL, szData, &dwSize); + + RegCloseKey(hKey); + if (Result != ERROR_SUCCESS) + { + /* failed to query resources */ + return; + } + + ResourceList = (PCM_RESOURCE_LIST)szData; + + do + { + PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor = (PCM_PARTIAL_RESOURCE_DESCRIPTOR)&ResourceList->List[0].PartialResourceList.PartialDescriptors[ItemCount]; + if (Descriptor->Type == CmResourceTypeInterrupt) + { + if (LoadString(hDllInstance, IDS_RESOURCE_INTERRUPT, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]))) + { + wsprintf(szDetail, L"0x%08x(%d)", Descriptor->u.Interrupt.Level, Descriptor->u.Interrupt.Vector); + InsertListItem(hWndDevList, ItemCount, szBuffer, szDetail); + ItemCount++; + } + } + else if (Descriptor->Type == CmResourceTypePort) + { + if (LoadString(hDllInstance, IDS_RESOURCE_PORT, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]))) + { + wsprintf(szDetail, L"%08lx - %08lx", Descriptor->u.Port.Start.LowPart, Descriptor->u.Port.Start.LowPart + Descriptor->u.Port.Length - 1); + InsertListItem(hWndDevList, ItemCount, szBuffer, szDetail); + ItemCount++; + } + } + else if (Descriptor->Type == CmResourceTypeMemory) + { + if (LoadString(hDllInstance, IDS_RESOURCE_MEMORY_RANGE, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]))) + { + wsprintf(szDetail, L"%08lx - %08lx", Descriptor->u.Memory.Start, Descriptor->u.Memory.Start.LowPart + Descriptor->u.Memory.Length - 1); + InsertListItem(hWndDevList, ItemCount, szBuffer, szDetail); + ItemCount++; + } + } + else if (Descriptor->Type == CmResourceTypeDma) + { + if (LoadString(hDllInstance, IDS_RESOURCE_DMA, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]))) + { + wsprintf(szDetail, L"%08ld", Descriptor->u.Dma.Channel); + InsertListItem(hWndDevList, ItemCount, szBuffer, szDetail); + ItemCount++; + } + } + + Index++; + }while(Index <= ResourceList->List[0].PartialResourceList.Count); +} + + +static VOID +UpdateDriverResourceDlg(IN HWND hwndDlg, + IN PDEVADVPROP_INFO dap) +{ + /* set the device image */ + SendDlgItemMessage(hwndDlg, + IDC_DEVICON, + STM_SETICON, + (WPARAM)dap->hDevIcon, + 0); + + /* set the device name edit control text */ + SetDlgItemText(hwndDlg, + IDC_DEVNAME, + dap->szDevName); +} + +INT_PTR +CALLBACK +ResourcesProcDriverDlgProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PDEVADVPROP_INFO hpd; + HWND hWndDevList; + INT_PTR Ret = FALSE; + + hpd = (PDEVADVPROP_INFO)GetWindowLongPtr(hwndDlg, + DWL_USER); + + if (hpd != NULL || uMsg == WM_INITDIALOG) + { + switch (uMsg) + { + case WM_INITDIALOG: + { + /* init list */ + hWndDevList = GetDlgItem(hwndDlg, IDC_DRIVERRESOURCES); + InitializeDevicesList(hWndDevList); + + hpd = (PDEVADVPROP_INFO)((LPPROPSHEETPAGE)lParam)->lParam; + if (hpd != NULL) + { + SetWindowLongPtr(hwndDlg, + DWL_USER, + (DWORD_PTR)hpd); + + SetWindowLongPtr(hwndDlg, + DWL_USER, + (DWORD_PTR)hpd); + + UpdateDriverResourceDlg(hwndDlg, hpd); + AddResourceItems(hpd, hWndDevList); + } + + Ret = TRUE; + break; + } + } + } + + return Ret; +} + Propchange: trunk/reactos/dll/win32/devmgr/hwresource.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -27,6 +27,12 @@ IDS_NOTAVAILABLE "ÐÐµÐ½Ð°Ð»Ð¸ÑÐ½Ð¾" IDS_NOTDIGITALLYSIGNED "ÐÐµÐ· ÑÐ¸ÑÑÐ¾Ð² Ð¿Ð¾Ð´Ð¿Ð¸Ñ" IDS_NODRIVERS "ÐÐµ ÑÐ° Ð½ÑÐ¶Ð½Ð¸ Ð¸Ð»Ð¸ Ð½Ðµ ÑÐ° Ð·Ð°ÑÐµÐ´ÐµÐ½Ð¸ Ð²Ð¾Ð´Ð°ÑÐ¸ Ð·Ð° ÑÐ¾Ð²Ð° ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -216,11 +222,15 @@ IDD_DEVICERESOURCES DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Ð ÐµÑÑÑÑÐ¸" -FONT 8, "MS Shell Dlg" -BEGIN - ICON "", IDC_DEVICON, 7, 7, 20, 20 - LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -1,4 +1,4 @@ -/* FILE: dll/win32/devmgr/lang/cs-CZ.rc +ï»¿/* FILE: dll/win32/devmgr/lang/cs-CZ.rc * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) * UPDATED: 2013-06-01 */ @@ -30,6 +30,12 @@ IDS_NOTAVAILABLE "NenÃ dostupnÃ©" IDS_NOTDIGITALLYSIGNED "NenÃ digitÃ¡lnÄ podepsÃ¡no" IDS_NODRIVERS "Pro toto zaÅÃzenÃ nejsou vyÅ¾adovÃ¡ny nebo nebyly naÄteny Å¾Ã¡dnÃ© soubory ovladaÄÅ¯." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END /* puvodni anglicke error messages prevzaty z: http://www.z123.org/techsupport/medm.htm */ @@ -217,11 +223,15 @@ IDD_DEVICERESOURCES DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "ProstÅedky" -FONT 8, "MS Shell Dlg" -BEGIN - ICON "", IDC_DEVICON, 7, 7, 20, 20 - LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/de-DE.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -28,6 +28,12 @@ IDS_NOTAVAILABLE "Nicht verfÃ¼gbar" IDS_NOTDIGITALLYSIGNED "Nicht digital signiert" IDS_NODRIVERS "Es werden keine Treiber fÃ¼r dieses GerÃ¤t benÃ¶tigt oder es wurden keine Treiber geladen." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -215,11 +221,15 @@ IDD_DEVICERESOURCES DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Ressourcen" -FONT 8, "MS Shell Dlg" -BEGIN - ICON "", IDC_DEVICON, 7, 7, 20, 20 - LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/el-G… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -27,6 +27,12 @@ IDS_NOTAVAILABLE "ÎÎ· Î´Î¹Î±Î¸ÎÏÎ¹Î¼Î¿" IDS_NOTDIGITALLYSIGNED "Not digitally signed" IDS_NODRIVERS "No driver files are required or have been loaded for this device." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -219,6 +225,10 @@ BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -1,4 +1,5 @@ // English language resource file (Sebastian Gasiorek, 2005-11-13) + LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -27,6 +28,12 @@ IDS_NOTAVAILABLE "Not available" IDS_NOTDIGITALLYSIGNED "Not digitally signed" IDS_NODRIVERS "No driver files are required or have been loaded for this device." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -220,6 +227,10 @@ BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/es-ES.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -28,6 +28,12 @@ IDS_NOTAVAILABLE "No disponible" IDS_NOTDIGITALLYSIGNED "Sin Firma Digital" IDS_NODRIVERS "Los controladores para este dispositivo o no son necesarios o ya han sido cargados." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -215,11 +221,15 @@ IDD_DEVICERESOURCES DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Recursos" -FONT 8, "MS Shell Dlg" -BEGIN - ICON "", IDC_DEVICON, 7, 7, 20, 20 - LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -27,6 +27,12 @@ IDS_NOTAVAILABLE "Non disponible" IDS_NOTDIGITALLYSIGNED "Non signÃ© numÃ©riquement" IDS_NODRIVERS "Aucun fichier n'est requis ou n'a Ã©tÃ© chargÃ© pour ce matÃ©riel." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END STRINGTABLE @@ -218,6 +224,10 @@ BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/he-IL.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -1,4 +1,4 @@ -// Hebrew language resource file by Baruch Rutman +ï»¿// Hebrew language resource file by Baruch Rutman LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT @@ -27,6 +27,12 @@ IDS_NOTAVAILABLE "×× ××××" IDS_NOTDIGITALLYSIGNED "×× ××ª×× ××××××××ª" IDS_NODRIVERS "×§××¦× ×× ×× ×××ª×§× ×¢×××¨ ××ª×§× ×× ××× × ××¨××©×× ××× × ××¢× ×." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -215,13 +221,16 @@ IDD_DEVICERESOURCES DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "××©××××" -FONT 8, "MS Shell Dlg" -BEGIN - ICON "", IDC_DEVICON, 7, 7, 20, 20 - LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX -END - +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 +END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "×¦×¨×××ª ××©××" Modified: trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/hu-H… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -27,6 +27,12 @@ IDS_NOTAVAILABLE "Not available" IDS_NOTDIGITALLYSIGNED "Not digitally signed" IDS_NODRIVERS "No driver files are required or have been loaded for this device." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END STRINGTABLE @@ -218,6 +224,10 @@ BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/id-ID.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -27,6 +27,12 @@ IDS_NOTAVAILABLE "Tidak tersedia" IDS_NOTDIGITALLYSIGNED "Tidak ditandatangan secara digital" IDS_NODRIVERS "File driver tidak diperlukan atau sudah diambil untuk device ini." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -219,6 +225,10 @@ BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -1,4 +1,4 @@ -// Italian language resource file (Paolo Devoti, devotip(a)tiscali.it, 2007-01-10) +ï»¿// Italian language resource file (Paolo Devoti, devotip(a)tiscali.it, 2007-01-10) LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL @@ -27,6 +27,12 @@ IDS_NOTAVAILABLE "Non disponibile" IDS_NOTDIGITALLYSIGNED "Manca la firma digitale" IDS_NODRIVERS "Nessun driver Ã¨ necessario o Ã¨ stato caricato per questo dispositivo." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -214,11 +220,15 @@ IDD_DEVICERESOURCES DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Risorse" -FONT 8, "MS Shell Dlg" -BEGIN - ICON "", IDC_DEVICON, 7, 7, 20, 20 - LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -27,6 +27,12 @@ IDS_NOTAVAILABLE "Ikke tilgjengelig" IDS_NOTDIGITALLYSIGNED "ikke digital signert" IDS_NODRIVERS " Ingen driver filer trengs eller har blitt lastet for denne enheten." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -219,6 +225,10 @@ BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -35,6 +35,12 @@ IDS_NOTAVAILABLE "NiedostÄpne" IDS_NOTDIGITALLYSIGNED "Niepodpisany cyfrowo" IDS_NODRIVERS "Å»adne pliki sterownika nie sÄ potrzebne albo nie zostaÅy zaÅadowane dla tego urzÄdzenia." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -222,11 +228,15 @@ IDD_DEVICERESOURCES DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Zasoby" -FONT 8, "MS Shell Dlg" -BEGIN - ICON "", IDC_DEVICON, 7, 7, 20, 20 - LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pt-B… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -27,6 +27,12 @@ IDS_NOTAVAILABLE "NÃ£o disponÃvel" IDS_NOTDIGITALLYSIGNED "Sem assinatura digital" IDS_NODRIVERS "Nenhum arquivo de driver Ã© necessÃ¡rio ou foi carregado para este dispositivo." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -219,6 +225,10 @@ BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -28,6 +28,12 @@ IDS_NOTAVAILABLE "Indisponibil" IDS_NOTDIGITALLYSIGNED "Nesemnat digital" IDS_NODRIVERS "Fie nu sunt necesare module pilot, fie nu a fost Ã®ncÄrcat niciunul." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -215,18 +221,22 @@ IDD_DEVICERESOURCES DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Resurse" +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 +END + +IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Alimentare" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END - -IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Alimentare" -FONT 8, "MS Shell Dlg" -BEGIN - ICON "", IDC_DEVICON, 7, 7, 20, 20 - LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX -END Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -25,6 +25,12 @@ IDS_NOTAVAILABLE "ÐÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¾" IDS_NOTDIGITALLYSIGNED "ÐÐµÑ ÑÐ¸ÑÑÐ¾Ð²Ð¾Ð¹ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸" IDS_NODRIVERS "Ð¤Ð°Ð¹Ð»Ñ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ¾Ð² Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð½Ðµ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ Ð¸Ð»Ð¸ Ð½Ðµ Ð±ÑÐ»Ð¸ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ñ." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -212,11 +218,15 @@ IDD_DEVICERESOURCES DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Ð ÐµÑÑÑÑÑ" -FONT 8, "MS Shell Dlg" -BEGIN - ICON "", IDC_DEVICON, 7, 7, 20, 20 - LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -30,6 +30,12 @@ IDS_NOTAVAILABLE "Nie je k dispozÃcii" //Not available IDS_NOTDIGITALLYSIGNED "DigitÃ¡lne nepodpÃsanÃ½" IDS_NODRIVERS "No driver files are required or have been loaded for this device." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -222,6 +228,10 @@ BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -33,6 +33,12 @@ IDS_NOTAVAILABLE "ÐÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¾" IDS_NOTDIGITALLYSIGNED "ÐÐµÐ¼Ð°Ñ ÑÐ¸ÑÑÐ¾Ð²Ð¾Ð³Ð¾ Ð¿ÑÐ´Ð¿Ð¸ÑÑ" IDS_NODRIVERS "Ð¤Ð°Ð¹Ð»Ð¸ Ð´ÑÐ°Ð¹Ð²ÐµÑÑÐ² Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¸ÑÑÑÐ¾Ñ Ð½Ðµ Ð¿Ð¾ÑÑÑÐ±Ð½Ñ Ð°Ð±Ð¾ Ð½Ðµ Ð±ÑÐ»Ð¸ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ñ." + IDS_RESOURCE_COLUMN "Resource type" + IDS_SETTING_COLUMN "Setting" + IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "E/A range" END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -220,11 +226,15 @@ IDD_DEVICERESOURCES DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Ð ÐµÑÑÑÑÐ¸" -FONT 8, "MS Shell Dlg" -BEGIN - ICON "", IDC_DEVICON, 7, 7, 20, 20 - LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Resource settings:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -19,6 +19,80 @@ ULONG DbgPrint(PCCH Format,...); +typedef INT_PTR (WINAPI *PPROPERTYSHEETW)(LPCPROPSHEETHEADERW); +typedef HPROPSHEETPAGE (WINAPI *PCREATEPROPERTYSHEETPAGEW)(LPCPROPSHEETPAGEW); +typedef BOOL (WINAPI *PDESTROYPROPERTYSHEETPAGE)(HPROPSHEETPAGE); + +typedef struct _DEVADVPROP_INFO +{ + HWND hWndGeneralPage; + HWND hWndParent; + WNDPROC ParentOldWndProc; + HICON hDevIcon; + + HDEVINFO DeviceInfoSet; + SP_DEVINFO_DATA DeviceInfoData; + HDEVINFO CurrentDeviceInfoSet; + SP_DEVINFO_DATA CurrentDeviceInfoData; + DEVINST ParentDevInst; + HMACHINE hMachine; + LPCWSTR lpMachineName; + + HINSTANCE hComCtl32; + PCREATEPROPERTYSHEETPAGEW pCreatePropertySheetPageW; + PDESTROYPROPERTYSHEETPAGE pDestroyPropertySheetPage; + + DWORD PropertySheetType; + DWORD nDevPropSheets; + HPROPSHEETPAGE *DevPropSheets; + + union + { + UINT Flags; + struct + { + UINT Extended : 1; + UINT FreeDevPropSheets : 1; + UINT CanDisable : 1; + UINT DeviceStarted : 1; + UINT DeviceUsageChanged : 1; + UINT CloseDevInst : 1; + UINT IsAdmin : 1; + UINT DoDefaultDevAction : 1; + UINT PageInitialized : 1; + UINT ShowRemotePages : 1; + UINT HasDriverPage : 1; + UINT HasResourcePage : 1; + UINT HasPowerPage : 1; + }; + }; + + WCHAR szDevName[255]; + WCHAR szTemp[255]; + WCHAR szDeviceID[1]; + /* struct may be dynamically expanded here! */ +} DEVADVPROP_INFO, *PDEVADVPROP_INFO; + + +typedef struct _ENUMDRIVERFILES_CONTEXT +{ + HWND hDriversListView; + UINT nCount; +} ENUMDRIVERFILES_CONTEXT, *PENUMDRIVERFILES_CONTEXT; + +#define PM_INITIALIZE (WM_APP + 0x101) + + + +/* HWRESOURCE.C */ + +INT_PTR +CALLBACK +ResourcesProcDriverDlgProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam); + /* ADVPROP.C */ INT_PTR Modified: trunk/reactos/dll/win32/devmgr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/resource.… ============================================================================== --- trunk/reactos/dll/win32/devmgr/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/resource.h [iso-8859-1] Sun Nov 17 19:14:08 2013 @@ -41,6 +41,7 @@ #define IDC_DETAILSPROPNAME 0x596 #define IDC_DETAILSPROPVALUE 0x597 #define IDC_UPDATEDRIVER 0x598 +#define IDC_DRIVERRESOURCES 0x599 #define IDS_NAME 0x100 #define IDS_TYPE 0x101 @@ -65,6 +66,12 @@ #define IDS_NOTAVAILABLE 0x114 #define IDS_NOTDIGITALLYSIGNED 0x115 #define IDS_NODRIVERS 0x116 +#define IDS_RESOURCE_COLUMN 0x117 +#define IDS_SETTING_COLUMN 0x118 +#define IDS_RESOURCE_MEMORY_RANGE 0x119 +#define IDS_RESOURCE_INTERRUPT 0x11A +#define IDS_RESOURCE_DMA 0x11B +#define IDS_RESOURCE_PORT 0x11C #define IDS_DEV_NO_PROBLEM 0x200 #define IDS_DEV_NOT_CONFIGURED 0x201

1 0

[janderwald] 61017: - stop enumeration of mixer controls when there is more than one item - fixes vmware audio driver hangs - needs more work - patch by David Quintana CORE-7488 #resolve #comment t...
by janderwald＠svn.reactos.org 17 Nov '13

17 Nov '13

Author: janderwald Date: Sun Nov 17 14:51:06 2013 New Revision: 61017 URL: http://svn.reactos.org/svn/reactos?rev=61017&view=rev Log: - stop enumeration of mixer controls when there is more than one item - fixes vmware audio driver hangs - needs more work - patch by David Quintana CORE-7488 #resolve #comment thanks for the patch Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Sun Nov 17 14:51:06 2013 @@ -513,8 +513,12 @@ /* get next nodes upstream */ MMixerGetNextNodesFromNodeIndex(MixerContext, Topology, NodeIndex, bUpStream, &NodesCount, Nodes); - /* assume there is a node connected */ - ASSERT(NodesCount != 0); + if (NodesCount != 1) + { + DPRINT("PinId %lu bInputMixer %lu bUpStream %lu NodeIndex %lu is not connected", PinId, bInputMixer, bUpStream, NodeIndex); + break; + } + ASSERT(NodesCount == 1); /* use first index */

1 0

[spetreolle] 61016: [OOPS] Arch, when you fix a DPRINT, don't turn it into DPRINT1.
by spetreolle＠svn.reactos.org 17 Nov '13

17 Nov '13

Author: spetreolle Date: Sun Nov 17 14:21:08 2013 New Revision: 61016 URL: http://svn.reactos.org/svn/reactos?rev=61016&view=rev Log: [OOPS] Arch, when you fix a DPRINT, don't turn it into DPRINT1. Modified: trunk/reactos/lib/rtl/res.c Modified: trunk/reactos/lib/rtl/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/res.c?rev=61016&r1… ============================================================================== --- trunk/reactos/lib/rtl/res.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/res.c [iso-8859-1] Sun Nov 17 14:21:08 2013 @@ -218,7 +218,7 @@ { if (ResourceInfo) { - DPRINT1( "module %p type %lx name %lx lang %04lx level %lu\n", + DPRINT( "module %p type %lx name %lx lang %04lx level %lu\n", BaseAddress, ResourceInfo->Type, Level > 1 ? ResourceInfo->Name : 0, Level > 2 ? ResourceInfo->Language : 0, Level );

1 0

[spetreolle] 61015: [RTL] Fix crashing DPRINT into LdrFindResource_U. Thanks to ThFabba for the tip.
by spetreolle＠svn.reactos.org 17 Nov '13

17 Nov '13

Author: spetreolle Date: Sun Nov 17 14:11:08 2013 New Revision: 61015 URL: http://svn.reactos.org/svn/reactos?rev=61015&view=rev Log: [RTL] Fix crashing DPRINT into LdrFindResource_U. Thanks to ThFabba for the tip. Modified: trunk/reactos/lib/rtl/res.c Modified: trunk/reactos/lib/rtl/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/res.c?rev=61015&r1… ============================================================================== --- trunk/reactos/lib/rtl/res.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/res.c [iso-8859-1] Sun Nov 17 14:11:08 2013 @@ -218,9 +218,9 @@ { if (ResourceInfo) { - DPRINT( "module %p type %ws name %ws lang %04lx level %lu\n", - BaseAddress, (LPCWSTR)ResourceInfo->Type, - Level > 1 ? (LPCWSTR)ResourceInfo->Name : L"", + DPRINT1( "module %p type %lx name %lx lang %04lx level %lu\n", + BaseAddress, ResourceInfo->Type, + Level > 1 ? ResourceInfo->Name : 0, Level > 2 ? ResourceInfo->Language : 0, Level ); }

1 0

[hbelusca] 61014: [NTVDM] - Use MAX/MINSHORT instead of CRT macros. - Include only the relevant headers.
by hbelusca＠svn.reactos.org 16 Nov '13

16 Nov '13

Author: hbelusca Date: Sat Nov 16 23:11:54 2013 New Revision: 61014 URL: http://svn.reactos.org/svn/reactos?rev=61014&view=rev Log: [NTVDM] - Use MAX/MINSHORT instead of CRT macros. - Include only the relevant headers. Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Sat Nov 16 23:11:54 2013 @@ -16,7 +16,12 @@ #include <conio.h> #define WIN32_NO_STATUS -#include <windows.h> +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <wincon.h> +#include <winnls.h> +#include <winuser.h> #include <debug.h> Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Sat Nov 16 23:11:54 2013 @@ -132,17 +132,17 @@ if (VgaCrtcRegisters[VGA_CRTC_UNDERLINE_REG] & VGA_CRTC_UNDERLINE_DWORD) { /* Double-word addressing */ - return 4; + return 4; // sizeof(DWORD) } if (VgaCrtcRegisters[VGA_CRTC_MODE_CONTROL_REG] & VGA_CRTC_MODE_CONTROL_BYTE) { /* Byte addressing */ - return 1; + return 1; // sizeof(BYTE) } /* Word addressing */ - return 2; + return 2; // sizeof(WORD) } static inline DWORD VgaTranslateReadAddress(DWORD Address) @@ -265,8 +265,8 @@ /* Check if this is the first time the rectangle is updated */ if (!NeedsUpdate) { - UpdateRectangle.Left = UpdateRectangle.Top = SHRT_MAX; - UpdateRectangle.Right = UpdateRectangle.Bottom = SHRT_MIN; + UpdateRectangle.Left = UpdateRectangle.Top = MAXSHORT; + UpdateRectangle.Right = UpdateRectangle.Bottom = MINSHORT; } /* Expand the rectangle to include the point */

1 0

[tkreuzer] 61013: [VIDEOPRT/WINSERV] Move mapping the BIOS memory from winsrv to videoprt, where it belongs. [VIDEOPRT] Implement some registry support routines to create new style (XP+) registry k...
by tkreuzer＠svn.reactos.org 16 Nov '13

16 Nov '13

Author: tkreuzer Date: Sat Nov 16 18:40:24 2013 New Revision: 61013 URL: http://svn.reactos.org/svn/reactos?rev=61013&view=rev Log: [VIDEOPRT/WINSERV] Move mapping the BIOS memory from winsrv to videoprt, where it belongs. [VIDEOPRT] Implement some registry support routines to create new style (XP+) registry keys. Handle IOCTL_VIDEO_INIT_WIN32K_CALLBACKS in videoprt, reorganize the code to dispatch ioctls. Simplify failure path in IntVideoPortFindAdapter Added: trunk/reactos/win32ss/drivers/videoprt/registry.c (with props) Modified: trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt trunk/reactos/win32ss/drivers/videoprt/dispatch.c trunk/reactos/win32ss/drivers/videoprt/int10.c trunk/reactos/win32ss/drivers/videoprt/videoprt.c trunk/reactos/win32ss/drivers/videoprt/videoprt.h trunk/reactos/win32ss/user/winsrv/usersrv/init.c Modified: trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/C… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt [iso-8859-1] Sat Nov 16 18:40:24 2013 @@ -15,6 +15,7 @@ funclist.c int10.c interrupt.c + registry.c resource.c services.c spinlock.c Modified: trunk/reactos/win32ss/drivers/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/d… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/dispatch.c [iso-8859-1] Sat Nov 16 18:40:24 2013 @@ -24,6 +24,7 @@ /* GLOBAL VARIABLES ***********************************************************/ PVIDEO_PORT_DEVICE_EXTENSION ResetDisplayParametersDeviceExtension = NULL; +PVIDEO_WIN32K_CALLOUT Win32kCallout; /* PRIVATE FUNCTIONS **********************************************************/ @@ -110,12 +111,9 @@ Csrss = (PKPROCESS)PsGetCurrentProcess(); INFO_(VIDEOPRT, "Csrss %p\n", Csrss); + IntInitializeVideoAddressSpace(); + CsrssInitialized = TRUE; - - Irp->IoStatus.Information = FILE_OPENED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return STATUS_SUCCESS; } DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -171,6 +169,206 @@ return STATUS_SUCCESS; } +PSTR +IoctlName(ULONG Ioctl) +{ + switch(Ioctl) + { + case IOCTL_VIDEO_ENABLE_VDM: + return "IOCTL_VIDEO_ENABLE_VDM"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x00, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_DISABLE_VDM: + return "IOCTL_VIDEO_DISABLE_VDM"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x01, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_REGISTER_VDM: + return "IOCTL_VIDEO_REGISTER_VDM"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x02, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_SET_OUTPUT_DEVICE_POWER_STATE: + return "IOCTL_VIDEO_SET_OUTPUT_DEVICE_POWER_STATE"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x03, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_GET_OUTPUT_DEVICE_POWER_STATE: + return "IOCTL_VIDEO_GET_OUTPUT_DEVICE_POWER_STATE"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x04, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_MONITOR_DEVICE: + return "IOCTL_VIDEO_MONITOR_DEVICE"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x05, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_ENUM_MONITOR_PDO: + return "IOCTL_VIDEO_ENUM_MONITOR_PDO"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x06, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_INIT_WIN32K_CALLBACKS: + return "IOCTL_VIDEO_INIT_WIN32K_CALLBACKS"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x07, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_HANDLE_VIDEOPARAMETERS: + return "IOCTL_VIDEO_HANDLE_VIDEOPARAMETERS"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x08, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_IS_VGA_DEVICE: + return "IOCTL_VIDEO_IS_VGA_DEVICE"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x09, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_USE_DEVICE_IN_SESSION: + return "IOCTL_VIDEO_USE_DEVICE_IN_SESSION"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x0a, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_PREPARE_FOR_EARECOVERY: + return "IOCTL_VIDEO_PREPARE_FOR_EARECOVERY"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x0b, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_SAVE_HARDWARE_STATE: + return "IOCTL_VIDEO_SAVE_HARDWARE_STATE"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x80, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_RESTORE_HARDWARE_STATE: + return "IOCTL_VIDEO_RESTORE_HARDWARE_STATE"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x81, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_QUERY_AVAIL_MODES: + return "IOCTL_VIDEO_QUERY_AVAIL_MODES"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x100, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_QUERY_NUM_AVAIL_MODES: + return "IOCTL_VIDEO_QUERY_NUM_AVAIL_MODES"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x101, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_QUERY_CURRENT_MODE: + return "IOCTL_VIDEO_QUERY_CURRENT_MODE"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x102, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_SET_CURRENT_MODE: + return "IOCTL_VIDEO_SET_CURRENT_MODE"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x103, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_RESET_DEVICE: + return "IOCTL_VIDEO_RESET_DEVICE"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x104, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_LOAD_AND_SET_FONT: + return "IOCTL_VIDEO_LOAD_AND_SET_FONT"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x105, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_SET_PALETTE_REGISTERS: + return "IOCTL_VIDEO_SET_PALETTE_REGISTERS"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x106, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_SET_COLOR_REGISTERS: + return "IOCTL_VIDEO_SET_COLOR_REGISTERS"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x107, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_ENABLE_CURSOR: + return "IOCTL_VIDEO_ENABLE_CURSOR"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x108, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_DISABLE_CURSOR: + return "IOCTL_VIDEO_DISABLE_CURSOR"; // CTL_CODE (FILE_DEVICE_VIDEO, 0x109, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_SET_CURSOR_ATTR: + return "IOCTL_VIDEO_SET_CURSOR_ATTR"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x10a, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_QUERY_CURSOR_ATTR: + return "IOCTL_VIDEO_QUERY_CURSOR_ATTR"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x10b, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_SET_CURSOR_POSITION: + return "IOCTL_VIDEO_SET_CURSOR_POSITION"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x10c, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_QUERY_CURSOR_POSITION: + return "IOCTL_VIDEO_QUERY_CURSOR_POSITION"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x10d, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_ENABLE_POINTER: + return "IOCTL_VIDEO_ENABLE_POINTER"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x10e, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_DISABLE_POINTER: + return "IOCTL_VIDEO_DISABLE_POINTER"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x10f, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_SET_POINTER_ATTR: + return "IOCTL_VIDEO_SET_POINTER_ATTR"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x110, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_QUERY_POINTER_ATTR: + return "IOCTL_VIDEO_QUERY_POINTER_ATTR"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x111, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_SET_POINTER_POSITION: + return "IOCTL_VIDEO_SET_POINTER_POSITION"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x112, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_QUERY_POINTER_POSITION: + return "IOCTL_VIDEO_QUERY_POINTER_POSITION"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x113, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_QUERY_POINTER_CAPABILITIES: + return "IOCTL_VIDEO_QUERY_POINTER_CAPABILITIES"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x114, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_GET_BANK_SELECT_CODE: + return "IOCTL_VIDEO_GET_BANK_SELECT_CODE"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x115, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_MAP_VIDEO_MEMORY: + return "IOCTL_VIDEO_MAP_VIDEO_MEMORY"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x116, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_UNMAP_VIDEO_MEMORY: + return "IOCTL_VIDEO_UNMAP_VIDEO_MEMORY"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x117, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_QUERY_PUBLIC_ACCESS_RANGES: + return "IOCTL_VIDEO_QUERY_PUBLIC_ACCESS_RANGES"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x118, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_FREE_PUBLIC_ACCESS_RANGES: + return "IOCTL_VIDEO_FREE_PUBLIC_ACCESS_RANGES"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x119, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_QUERY_COLOR_CAPABILITIES: + return "IOCTL_VIDEO_QUERY_COLOR_CAPABILITIES"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x11a, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_SET_POWER_MANAGEMENT: + return "IOCTL_VIDEO_SET_POWER_MANAGEMENT"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x11b, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_GET_POWER_MANAGEMENT: + return "IOCTL_VIDEO_GET_POWER_MANAGEMENT"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x11c, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_SHARE_VIDEO_MEMORY: + return "IOCTL_VIDEO_SHARE_VIDEO_MEMORY"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x11d, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_UNSHARE_VIDEO_MEMORY: + return "IOCTL_VIDEO_UNSHARE_VIDEO_MEMORY"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x11e, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_SET_COLOR_LUT_DATA: + return "IOCTL_VIDEO_SET_COLOR_LUT_DATA"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x11f, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_GET_CHILD_STATE: + return "IOCTL_VIDEO_GET_CHILD_STATE"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x120, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_VALIDATE_CHILD_STATE_CONFIGURATION: + return "IOCTL_VIDEO_VALIDATE_CHILD_STATE_CONFIGURATION"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x121, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_SET_CHILD_STATE_CONFIGURATION: + return "IOCTL_VIDEO_SET_CHILD_STATE_CONFIGURATION"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x122, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_SWITCH_DUALVIEW: + return "IOCTL_VIDEO_SWITCH_DUALVIEW"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x123, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_SET_BANK_POSITION: + return "IOCTL_VIDEO_SET_BANK_POSITION"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x124, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_QUERY_SUPPORTED_BRIGHTNESS: + return "IOCTL_VIDEO_QUERY_SUPPORTED_BRIGHTNESS"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x125, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_QUERY_DISPLAY_BRIGHTNESS: + return "IOCTL_VIDEO_QUERY_DISPLAY_BRIGHTNESS"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x126, METHOD_BUFFERED, FILE_ANY_ACCESS) + case IOCTL_VIDEO_SET_DISPLAY_BRIGHTNESS: + return "IOCTL_VIDEO_SET_DISPLAY_BRIGHTNESS"; // CTL_CODE(FILE_DEVICE_VIDEO, 0x127, METHOD_BUFFERED, FILE_ANY_ACCESS) + } + + return "<unknown ioctl code"; +} + +static +NTSTATUS +VideoPortInitWin32kCallbacks( + IN PDEVICE_OBJECT DeviceObject, + PVIDEO_WIN32K_CALLBACKS Win32kCallbacks, + ULONG BufferLength) +{ + if (BufferLength < sizeof(VIDEO_WIN32K_CALLBACKS)) + { + return STATUS_BUFFER_TOO_SMALL; + } + + /* Save the callout function globally */ + Win32kCallout = Win32kCallbacks->Callout; + + /* Return reasonable values to win32k */ + Win32kCallbacks->bACPI = FALSE; + Win32kCallbacks->pPhysDeviceObject = DeviceObject; + Win32kCallbacks->DualviewFlags = 0; + + return STATUS_SUCCESS; +} + +static +NTSTATUS +VideoPortForwardDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IrpStack; + PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; + VIDEO_REQUEST_PACKET vrp; + + TRACE_(VIDEOPRT, "VideoPortForwardDeviceControl\n"); + + IrpStack = IoGetCurrentIrpStackLocation(Irp); + DeviceExtension = DeviceObject->DeviceExtension; + DriverExtension = DeviceExtension->DriverExtension; + + /* Translate the IRP to a VRP */ + vrp.StatusBlock = (PSTATUS_BLOCK)&Irp->IoStatus; + vrp.IoControlCode = IrpStack->Parameters.DeviceIoControl.IoControlCode; + + INFO_(VIDEOPRT, "- IoControlCode: %x\n", vrp.IoControlCode); + + /* We're assuming METHOD_BUFFERED */ + vrp.InputBuffer = Irp->AssociatedIrp.SystemBuffer; + vrp.InputBufferLength = IrpStack->Parameters.DeviceIoControl.InputBufferLength; + vrp.OutputBuffer = Irp->AssociatedIrp.SystemBuffer; + vrp.OutputBufferLength = IrpStack->Parameters.DeviceIoControl.OutputBufferLength; + + /* Call the Miniport Driver with the VRP */ + DriverExtension->InitializationData.HwStartIO(&DeviceExtension->MiniPortDeviceExtension, + &vrp); + + INFO_(VIDEOPRT, "- Returned status: %x\n", Irp->IoStatus.Status); + + /* Map from win32 error codes to NT status values. */ + switch (Irp->IoStatus.Status) + { + case NO_ERROR: + return STATUS_SUCCESS; + case ERROR_NOT_ENOUGH_MEMORY: + return STATUS_INSUFFICIENT_RESOURCES; + case ERROR_MORE_DATA: + return STATUS_BUFFER_OVERFLOW; + case ERROR_INVALID_FUNCTION: + return STATUS_NOT_IMPLEMENTED; + case ERROR_INVALID_PARAMETER: + return STATUS_INVALID_PARAMETER; + case ERROR_INSUFFICIENT_BUFFER: + return STATUS_BUFFER_TOO_SMALL; + case ERROR_DEV_NOT_EXIST: + return STATUS_DEVICE_DOES_NOT_EXIST; + case ERROR_IO_PENDING: + return STATUS_PENDING; + default: + return STATUS_UNSUCCESSFUL; + } +} + /* * IntVideoPortDispatchDeviceControl * @@ -186,76 +384,35 @@ IN PIRP Irp) { PIO_STACK_LOCATION IrpStack; - PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; - PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; - PVIDEO_REQUEST_PACKET vrp; NTSTATUS Status; + ULONG IoControlCode; TRACE_(VIDEOPRT, "IntVideoPortDispatchDeviceControl\n"); IrpStack = IoGetCurrentIrpStackLocation(Irp); - DeviceExtension = DeviceObject->DeviceExtension; - DriverExtension = DeviceExtension->DriverExtension; - - /* Translate the IRP to a VRP */ - vrp = ExAllocatePoolWithTag(NonPagedPool, - sizeof(VIDEO_REQUEST_PACKET), - TAG_REQUEST_PACKET); - if (vrp == NULL) - { - return STATUS_NO_MEMORY; - } - - vrp->StatusBlock = (PSTATUS_BLOCK) & (Irp->IoStatus); - vrp->IoControlCode = IrpStack->Parameters.DeviceIoControl.IoControlCode; - - INFO_(VIDEOPRT, "- IoControlCode: %x\n", vrp->IoControlCode); - - /* We're assuming METHOD_BUFFERED */ - vrp->InputBuffer = Irp->AssociatedIrp.SystemBuffer; - vrp->InputBufferLength = IrpStack->Parameters.DeviceIoControl.InputBufferLength; - vrp->OutputBuffer = Irp->AssociatedIrp.SystemBuffer; - vrp->OutputBufferLength = IrpStack->Parameters.DeviceIoControl.OutputBufferLength; - - /* Call the Miniport Driver with the VRP */ - DriverExtension->InitializationData.HwStartIO( - &DeviceExtension->MiniPortDeviceExtension, - vrp); - - /* Free the VRP */ - ExFreePoolWithTag(vrp, TAG_REQUEST_PACKET); + + IoControlCode = IrpStack->Parameters.DeviceIoControl.IoControlCode; + + INFO_(VIDEOPRT, "- IoControlCode: %x: %s\n", IoControlCode, IoctlName(IoControlCode)); + + switch(IoControlCode) + { + case IOCTL_VIDEO_INIT_WIN32K_CALLBACKS: + INFO_(VIDEOPRT, "- IOCTL_VIDEO_INIT_WIN32K_CALLBACKS\n"); + Status = VideoPortInitWin32kCallbacks(DeviceObject, + Irp->AssociatedIrp.SystemBuffer, + IrpStack->Parameters.DeviceIoControl.InputBufferLength); + break; + + default: + /* Forward to the Miniport Driver */ + Status = VideoPortForwardDeviceControl(DeviceObject, Irp); + break; + } INFO_(VIDEOPRT, "- Returned status: %x\n", Irp->IoStatus.Status); - if (Irp->IoStatus.Status != STATUS_SUCCESS) - { - switch (Irp->IoStatus.Status) - { - case ERROR_NOT_ENOUGH_MEMORY: - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - break; - case ERROR_MORE_DATA: - Irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; - break; - case ERROR_INVALID_FUNCTION: - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - break; - case ERROR_INVALID_PARAMETER: - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - break; - case ERROR_INSUFFICIENT_BUFFER: - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - break; - case ERROR_DEV_NOT_EXIST: - Irp->IoStatus.Status = STATUS_DEVICE_DOES_NOT_EXIST; - break; - case ERROR_IO_PENDING: - Irp->IoStatus.Status = STATUS_PENDING; - break; - } - } - - Status = Irp->IoStatus.Status; + Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; @@ -278,7 +435,6 @@ * Run Level * PASSIVE_LEVEL */ - NTSTATUS NTAPI IntVideoPortDispatchWrite( Modified: trunk/reactos/win32ss/drivers/videoprt/int10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/i… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/int10.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/int10.c [iso-8859-1] Sat Nov 16 18:40:24 2013 @@ -22,6 +22,115 @@ #include "videoprt.h" /* PRIVATE FUNCTIONS **********************************************************/ + +#if defined(_M_IX86) || defined(_M_AMD64) +NTSTATUS +NTAPI +IntInitializeVideoAddressSpace(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING PhysMemName = RTL_CONSTANT_STRING(L"\\Device\\PhysicalMemory"); + NTSTATUS Status; + HANDLE PhysMemHandle; + PVOID BaseAddress; + LARGE_INTEGER Offset; + SIZE_T ViewSize; + CHAR IVTAndBda[1024+256]; + + /* Free the 1MB pre-reserved region. In reality, ReactOS should simply support us mapping the view into the reserved area, but it doesn't. */ + BaseAddress = 0; + ViewSize = 1024 * 1024; + Status = ZwFreeVirtualMemory(NtCurrentProcess(), + &BaseAddress, + &ViewSize, + MEM_RELEASE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't unmap reserved memory (%x)\n", Status); + return 0; + } + + /* Open the physical memory section */ + InitializeObjectAttributes(&ObjectAttributes, + &PhysMemName, + 0, + NULL, + NULL); + Status = ZwOpenSection(&PhysMemHandle, + SECTION_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't open \\Device\\PhysicalMemory\n"); + return Status; + } + + /* Map the BIOS and device registers into the address space */ + Offset.QuadPart = 0xa0000; + ViewSize = 0x100000 - 0xa0000; + BaseAddress = (PVOID)0xa0000; + Status = ZwMapViewOfSection(PhysMemHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + ViewSize, + &Offset, + &ViewSize, + ViewUnmap, + 0, + PAGE_EXECUTE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't map physical memory (%x)\n", Status); + ZwClose(PhysMemHandle); + return Status; + } + + /* Close physical memory section handle */ + ZwClose(PhysMemHandle); + + if (BaseAddress != (PVOID)0xa0000) + { + DPRINT1("Couldn't map physical memory at the right address (was %x)\n", + BaseAddress); + return STATUS_UNSUCCESSFUL; + } + + /* Allocate some low memory to use for the non-BIOS + * parts of the v86 mode address space + */ + BaseAddress = (PVOID)0x1; + ViewSize = 0xa0000 - 0x1000; + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &ViewSize, + MEM_RESERVE | MEM_COMMIT, + PAGE_EXECUTE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to allocate virtual memory (Status %x)\n", Status); + return Status; + } + if (BaseAddress != (PVOID)0x0) + { + DPRINT1("Failed to allocate virtual memory at right address (was %x)\n", + BaseAddress); + return 0; + } + + /* Get the real mode IVT and BDA from the kernel */ + Status = NtVdmControl(VdmInitialize, IVTAndBda); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtVdmControl failed (status %x)\n", Status); + return Status; + } + + /* Return success */ + return STATUS_SUCCESS; +} +#endif #if defined(_M_IX86) VP_STATUS NTAPI Added: trunk/reactos/win32ss/drivers/videoprt/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/r… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/registry.c (added) +++ trunk/reactos/win32ss/drivers/videoprt/registry.c [iso-8859-1] Sat Nov 16 18:40:24 2013 @@ -0,0 +1,636 @@ +/* + * VideoPort driver + * + * Copyright (C) 2002-2004, 2007 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#include "videoprt.h" + +NTSTATUS +NTAPI +IntCopyRegistryKey( + _In_ HANDLE SourceKeyHandle, + _In_ HANDLE DestKeyHandle) +{ + PVOID InfoBuffer; + PKEY_BASIC_INFORMATION KeyInformation; + PKEY_VALUE_FULL_INFORMATION KeyValueInformation; + OBJECT_ATTRIBUTES ObjectAttributes; + ULONG Index, InformationLength, RequiredLength; + UNICODE_STRING NameString; + NTSTATUS Status; + HANDLE SourceSubKeyHandle, DestSubKeyHandle; + + /* Start with no buffer, set initial size */ + InfoBuffer = NULL; + InformationLength = 256; + + /* Start looping with key index 0 */ + Index = 0; + while (TRUE) + { + /* Check if we have no buffer */ + if (InfoBuffer == NULL) + { + /* Allocate a new buffer */ + InfoBuffer = ExAllocatePoolWithTag(PagedPool, + InformationLength, + TAG_VIDEO_PORT_BUFFER); + if (InfoBuffer == NULL) + { + ERR_(VIDEOPRT, "Could not allocate buffer for key info\n"); + return Status; + } + } + + /* Enumerate the next sub-key */ + KeyInformation = InfoBuffer; + Status = ZwEnumerateKey(SourceKeyHandle, + Index, + KeyBasicInformation, + KeyInformation, + InformationLength, + &RequiredLength); + if ((Status == STATUS_BUFFER_OVERFLOW) || + (Status == STATUS_BUFFER_TOO_SMALL)) + { + /* Free the buffer and remember the required size */ + ExFreePoolWithTag(InfoBuffer, TAG_VIDEO_PORT_BUFFER); + InfoBuffer = NULL; + InformationLength = RequiredLength; + + /* Try again */ + continue; + } + else if (Status == STATUS_NO_MORE_ENTRIES) + { + /* We are done with the sub-keys */ + break; + } + else if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "ZwEnumerateKey failed, status 0x%lx\n", Status); + goto Cleanup; + } + + /* Initialize a unicode string from the key name */ + NameString.Buffer = KeyInformation->Name; + NameString.Length = (USHORT)KeyInformation->NameLength; + NameString.MaximumLength = NameString.Length; + + /* Initialize object attributes and open the source sub-key */ + InitializeObjectAttributes(&ObjectAttributes, + &NameString, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + SourceKeyHandle, + NULL); + Status = ZwOpenKey(&SourceSubKeyHandle, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "failed to open the source key.\n"); + goto Cleanup; + } + + /* Initialize object attributes and create the dest sub-key */ + InitializeObjectAttributes(&ObjectAttributes, + &NameString, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + DestKeyHandle, + NULL); + Status = ZwCreateKey(&DestSubKeyHandle, + KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "failed to create the destination key.\n"); + ObCloseHandle(SourceSubKeyHandle, KernelMode); + goto Cleanup; + } + + /* Recursively copy the sub-key */ + Status = IntCopyRegistryKey(SourceSubKeyHandle, DestSubKeyHandle); + if (!NT_SUCCESS(Status)) + { + /* Just warn, but continue with the remaining sub-keys */ + WARN_(VIDEOPRT, "failed to copy subkey '%wZ'.\n", &NameString); + } + + /* Close the sub-key handles */ + ObCloseHandle(SourceSubKeyHandle, KernelMode); + ObCloseHandle(DestSubKeyHandle, KernelMode); + + /* Next sub-key */ + Index++; + } + + /* Start looping with value index 0 */ + Index = 0; + while (TRUE) + { + /* Check if we have no buffer */ + if (InfoBuffer == NULL) + { + /* Allocate a new buffer */ + InfoBuffer = ExAllocatePoolWithTag(PagedPool, + InformationLength, + TAG_VIDEO_PORT_BUFFER); + if (InfoBuffer == NULL) + { + ERR_(VIDEOPRT, "Could not allocate buffer for key values\n"); + return Status; + } + } + + /* Enumerate the next value */ + KeyValueInformation = InfoBuffer; + Status = ZwEnumerateValueKey(SourceKeyHandle, + Index, + KeyValueFullInformation, + KeyValueInformation, + InformationLength, + &RequiredLength); + if ((Status == STATUS_BUFFER_OVERFLOW) || + (Status == STATUS_BUFFER_TOO_SMALL)) + { + /* Free the buffer and remember the required size */ + ExFreePoolWithTag(InfoBuffer, TAG_VIDEO_PORT_BUFFER); + InfoBuffer = NULL; + InformationLength = RequiredLength; + + /* Try again */ + continue; + } + else if (Status == STATUS_NO_MORE_ENTRIES) + { + /* We are done with the values */ + Status = STATUS_SUCCESS; + break; + } + else if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "ZwEnumerateValueKey failed, status 0x%lx\n", Status); + goto Cleanup; + } + + /* Initialize a unicode string from the value name */ + NameString.Buffer = KeyValueInformation->Name; + NameString.Length = (USHORT)KeyValueInformation->NameLength; + NameString.MaximumLength = NameString.Length; + + /* Create the key value in the destination key */ + Status = ZwSetValueKey(DestKeyHandle, + &NameString, + KeyValueInformation->TitleIndex, + KeyValueInformation->Type, + (PUCHAR)KeyValueInformation + KeyValueInformation->DataOffset, + KeyValueInformation->DataLength); + if (!NT_SUCCESS(Status)) + { + /* Just warn, but continue with the remaining sub-keys */ + WARN_(VIDEOPRT, "failed to set value '%wZ'.\n", NameString); + } + + /* Next subkey */ + Index++; + } + +Cleanup: + /* Free the buffer and return the failure code */ + if (InfoBuffer != NULL) + ExFreePoolWithTag(InfoBuffer, TAG_VIDEO_PORT_BUFFER); + return Status; +} + +NTSTATUS +NTAPI +IntCopyRegistryValue( + HANDLE SourceKeyHandle, + HANDLE DestKeyHandle, + PWSTR ValueName) +{ + PKEY_VALUE_PARTIAL_INFORMATION ValueInformation; + UNICODE_STRING ValueNameString; + ULONG Length; + NTSTATUS Status; + + RtlInitUnicodeString(&ValueNameString, ValueName); + + /* Query the value length */ + Status = ZwQueryValueKey(SourceKeyHandle, + &ValueNameString, + KeyValuePartialInformation, + NULL, + 0, + &Length); + if ((Status != STATUS_BUFFER_OVERFLOW) && + (Status != STATUS_BUFFER_TOO_SMALL)) + { + /* The key seems not present */ + NT_ASSERT(!NT_SUCCESS(Status)); + return Status; + } + + /* Allocate a buffer */ + ValueInformation = ExAllocatePoolWithTag(PagedPool, Length, TAG_VIDEO_PORT_BUFFER); + if (ValueInformation == NULL) + { + return Status; + } + + /* Query the value */ + Status = ZwQueryValueKey(SourceKeyHandle, + &ValueNameString, + KeyValuePartialInformation, + ValueInformation, + Length, + &Length); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(ValueInformation, TAG_VIDEO_PORT_BUFFER); + return Status; + } + + /* Write the registry value */ + Status = ZwSetValueKey(DestKeyHandle, + &ValueNameString, + ValueInformation->TitleIndex, + ValueInformation->Type, + ValueInformation->Data, + ValueInformation->DataLength); + + ExFreePoolWithTag(ValueInformation, TAG_VIDEO_PORT_BUFFER); + + if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "ZwSetValueKey failed: status 0x%lx\n", Status); + } + + return Status; +} + +NTSTATUS +NTAPI +IntSetupDeviceSettingsKey( + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension) +{ + static UNICODE_STRING SettingsKeyName = RTL_CONSTANT_STRING(L"Settings"); + HANDLE DevInstRegKey, SourceKeyHandle, DestKeyHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + + /* Open the software key: HKLM\System\CurrentControlSet\Control\Class\<ClassGUID>\<n> */ + Status = IoOpenDeviceRegistryKey(DeviceExtension->PhysicalDeviceObject, + PLUGPLAY_REGKEY_DRIVER, + KEY_ALL_ACCESS, + &DevInstRegKey); + if (Status != STATUS_SUCCESS) + { + ERR_(VIDEOPRT, "Failed to open device software key. Status 0x%lx", Status); + return Status; + } + + /* Open the 'Settings' sub-key */ + InitializeObjectAttributes(&ObjectAttributes, + &SettingsKeyName, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + DevInstRegKey, + NULL); + Status = ZwOpenKey(&DestKeyHandle, KEY_WRITE, &ObjectAttributes); + + /* Close the device software key */ + ObCloseHandle(DevInstRegKey, KernelMode); + + if (Status != STATUS_SUCCESS) + { + ERR_(VIDEOPRT, "Failed to open settings key. Status 0x%lx", Status); + return Status; + } + + /* Open the device profile key */ + InitializeObjectAttributes(&ObjectAttributes, + &DeviceExtension->RegistryPath, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(&SourceKeyHandle, KEY_WRITE, &ObjectAttributes); + if (Status != STATUS_SUCCESS) + { + ERR_(VIDEOPRT, "ZwOpenKey failed for settings key: status 0x%lx", Status); + ObCloseHandle(DestKeyHandle, KernelMode); + return Status; + } + + IntCopyRegistryValue(SourceKeyHandle, DestKeyHandle, L"InstalledDisplayDrivers"); + IntCopyRegistryValue(SourceKeyHandle, DestKeyHandle, L"Attach.ToDesktop"); + + ObCloseHandle(SourceKeyHandle, KernelMode); + ObCloseHandle(DestKeyHandle, KernelMode); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +IntCreateNewRegistryPath( + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension) +{ + static UNICODE_STRING VideoIdValueName = RTL_CONSTANT_STRING(L"VideoId"); + static UNICODE_STRING ControlVideoPathName = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Video\\"); + HANDLE DevInstRegKey, SettingsKey, NewKey; + UCHAR VideoIdBuffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + GUID_STRING_LENGTH]; + UNICODE_STRING VideoIdString; + UUID VideoId; + PKEY_VALUE_PARTIAL_INFORMATION ValueInformation ; + NTSTATUS Status; + ULONG ResultLength; + USHORT KeyMaxLength; + OBJECT_ATTRIBUTES ObjectAttributes; + + /* Open the hardware key: HKLM\System\CurrentControlSet\Enum\... */ + Status = IoOpenDeviceRegistryKey(DeviceExtension->PhysicalDeviceObject, + PLUGPLAY_REGKEY_DEVICE, + KEY_ALL_ACCESS, + &DevInstRegKey); + if (Status != STATUS_SUCCESS) + { + ERR_(VIDEOPRT, "IoOpenDeviceRegistryKey failed: status 0x%lx\n", Status); + return Status; + } + + /* Query the VideoId value */ + ValueInformation = (PKEY_VALUE_PARTIAL_INFORMATION)VideoIdBuffer; + Status = ZwQueryValueKey(DevInstRegKey, + &VideoIdValueName, + KeyValuePartialInformation, + ValueInformation, + sizeof(VideoIdBuffer), + &ResultLength); + if (!NT_SUCCESS(Status)) + { + /* Create a new video Id */ + Status = ExUuidCreate(&VideoId); + if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "ExUuidCreate failed: status 0x%lx\n", Status); + ObCloseHandle(DevInstRegKey, KernelMode); + return Status; + } + + /* Convert the GUID into a string */ + Status = RtlStringFromGUID(&VideoId, &VideoIdString); + if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "RtlStringFromGUID failed: status 0x%lx\n", Status); + ObCloseHandle(DevInstRegKey, KernelMode); + return Status; + } + + /* Copy the GUID String to our buffer */ + ValueInformation->DataLength = min(VideoIdString.Length, GUID_STRING_LENGTH); + RtlCopyMemory(ValueInformation->Data, + VideoIdString.Buffer, + ValueInformation->DataLength); + + /* Free the GUID string */ + RtlFreeUnicodeString(&VideoIdString); + + /* Write the VideoId registry value */ + Status = ZwSetValueKey(DevInstRegKey, + &VideoIdValueName, + 0, + REG_SZ, + ValueInformation->Data, + ValueInformation->DataLength); + if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "ZwSetValueKey failed: status 0x%lx\n", Status); + ObCloseHandle(DevInstRegKey, KernelMode); + return Status; + } + } + + /* Initialize the VideoId string from the registry data */ + VideoIdString.Buffer = (PWCHAR)ValueInformation->Data; + VideoIdString.Length = (USHORT)ValueInformation->DataLength; + VideoIdString.MaximumLength = VideoIdString.Length; + + /* Close the hardware key */ + ObCloseHandle(DevInstRegKey, KernelMode); + + /* Calculate the size needed for the new registry path name */ + KeyMaxLength = ControlVideoPathName.Length + + VideoIdString.Length + + sizeof(L"\\0000"); + + /* Allocate the path name buffer */ + DeviceExtension->NewRegistryPath.Length = 0; + DeviceExtension->NewRegistryPath.MaximumLength = KeyMaxLength; + DeviceExtension->NewRegistryPath.Buffer = ExAllocatePoolWithTag(PagedPool, + KeyMaxLength, + TAG_VIDEO_PORT); + if (DeviceExtension->NewRegistryPath.Buffer == NULL) + { + ERR_(VIDEOPRT, "Failed to allocate key name buffer.\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Copy the root key name and append the VideoId string */ + RtlCopyUnicodeString(&DeviceExtension->NewRegistryPath, + &ControlVideoPathName); + RtlAppendUnicodeStringToString(&DeviceExtension->NewRegistryPath, + &VideoIdString); + + /* Check if we have the key already */ + Status = RtlCheckRegistryKey(RTL_REGISTRY_ABSOLUTE, + DeviceExtension->NewRegistryPath.Buffer); + if (Status != STATUS_SUCCESS) + { + /* Try to create the new key */ + Status = RtlCreateRegistryKey(RTL_REGISTRY_ABSOLUTE, + DeviceExtension->NewRegistryPath.Buffer); + } + + /* Append a the instance path */ /// \todo HACK + RtlAppendUnicodeToString(&DeviceExtension->NewRegistryPath, L"\\"); + RtlAppendUnicodeToString(&DeviceExtension->NewRegistryPath, L"0000"); + + /* Check this key again */ + Status = RtlCheckRegistryKey(RTL_REGISTRY_ABSOLUTE, + DeviceExtension->NewRegistryPath.Buffer); + if (Status != STATUS_SUCCESS) + { + /* Try to create the new key */ + Status = RtlCreateRegistryKey(RTL_REGISTRY_ABSOLUTE, + DeviceExtension->NewRegistryPath.Buffer); + if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "Failed create key '%wZ'\n", &DeviceExtension->NewRegistryPath); + return Status; + } + + /* Open the new key */ + InitializeObjectAttributes(&ObjectAttributes, + &DeviceExtension->NewRegistryPath, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(&NewKey, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "Failed to open settings key. Status 0x%lx\n", Status); + return Status; + } + + /* Open the device profile key */ + InitializeObjectAttributes(&ObjectAttributes, + &DeviceExtension->RegistryPath, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(&SettingsKey, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "Failed to open settings key. Status 0x%lx\n", Status); + ObCloseHandle(NewKey, KernelMode); + return Status; + } + + /* Copy the registry data from the legacy key */ + Status = IntCopyRegistryKey(SettingsKey, NewKey); + } + + + return Status; +} + +NTSTATUS +NTAPI +IntCreateRegistryPath( + IN PCUNICODE_STRING DriverRegistryPath, + OUT PUNICODE_STRING DeviceRegistryPath) +{ + static WCHAR RegistryMachineSystem[] = L"\\REGISTRY\\MACHINE\\SYSTEM\\"; + static WCHAR CurrentControlSet[] = L"CURRENTCONTROLSET\\"; + static WCHAR ControlSet[] = L"CONTROLSET"; + static WCHAR Insert1[] = L"Hardware Profiles\\Current\\System\\CurrentControlSet\\"; + static WCHAR Insert2[] = L"\\Device0"; + BOOLEAN Valid; + UNICODE_STRING AfterControlSet; + + AfterControlSet = *DriverRegistryPath; + + /* Check if path begins with \\REGISTRY\\MACHINE\\SYSTEM\\ */ + Valid = (DriverRegistryPath->Length > sizeof(RegistryMachineSystem) && + 0 == _wcsnicmp(DriverRegistryPath->Buffer, RegistryMachineSystem, + wcslen(RegistryMachineSystem))); + if (Valid) + { + AfterControlSet.Buffer += wcslen(RegistryMachineSystem); + AfterControlSet.Length -= sizeof(RegistryMachineSystem) - sizeof(UNICODE_NULL); + + /* Check if path contains CURRENTCONTROLSET */ + if (AfterControlSet.Length > sizeof(CurrentControlSet) && + 0 == _wcsnicmp(AfterControlSet.Buffer, CurrentControlSet, wcslen(CurrentControlSet))) + { + AfterControlSet.Buffer += wcslen(CurrentControlSet); + AfterControlSet.Length -= sizeof(CurrentControlSet) - sizeof(UNICODE_NULL); + } + /* Check if path contains CONTROLSETnum */ + else if (AfterControlSet.Length > sizeof(ControlSet) && + 0 == _wcsnicmp(AfterControlSet.Buffer, ControlSet, wcslen(ControlSet))) + { + AfterControlSet.Buffer += wcslen(ControlSet); + AfterControlSet.Length -= sizeof(ControlSet) - sizeof(UNICODE_NULL); + while (AfterControlSet.Length > 0 && + *AfterControlSet.Buffer >= L'0' && + *AfterControlSet.Buffer <= L'9') + { + AfterControlSet.Buffer++; + AfterControlSet.Length -= sizeof(WCHAR); + } + + Valid = (AfterControlSet.Length > 0 && L'\\' == *AfterControlSet.Buffer); + AfterControlSet.Buffer++; + AfterControlSet.Length -= sizeof(WCHAR); + AfterControlSet.MaximumLength = AfterControlSet.Length; + } + else + { + Valid = FALSE; + } + } + + if (Valid) + { + DeviceRegistryPath->MaximumLength = DriverRegistryPath->Length + sizeof(Insert1) + sizeof(Insert2); + DeviceRegistryPath->Buffer = ExAllocatePoolWithTag(PagedPool, + DeviceRegistryPath->MaximumLength, + TAG_VIDEO_PORT); + if (DeviceRegistryPath->Buffer != NULL) + { + /* Build device path */ + wcsncpy(DeviceRegistryPath->Buffer, + DriverRegistryPath->Buffer, + AfterControlSet.Buffer - DriverRegistryPath->Buffer); + DeviceRegistryPath->Length = (AfterControlSet.Buffer - DriverRegistryPath->Buffer) * sizeof(WCHAR); + RtlAppendUnicodeToString(DeviceRegistryPath, Insert1); + RtlAppendUnicodeStringToString(DeviceRegistryPath, &AfterControlSet); + RtlAppendUnicodeToString(DeviceRegistryPath, Insert2); + + /* Check if registry key exists */ + Valid = NT_SUCCESS(RtlCheckRegistryKey(RTL_REGISTRY_ABSOLUTE, DeviceRegistryPath->Buffer)); + + if (!Valid) + ExFreePoolWithTag(DeviceRegistryPath->Buffer, TAG_VIDEO_PORT); + } + else + { + Valid = FALSE; + } + } + else + { + WARN_(VIDEOPRT, "Unparsable registry path %wZ", DriverRegistryPath); + } + + /* If path doesn't point to *ControlSet*, use DriverRegistryPath directly */ + if (!Valid) + { + DeviceRegistryPath->MaximumLength = DriverRegistryPath->Length + sizeof(Insert2); + DeviceRegistryPath->Buffer = ExAllocatePoolWithTag(NonPagedPool, + DeviceRegistryPath->MaximumLength, + TAG_VIDEO_PORT); + + if (!DeviceRegistryPath->Buffer) + return STATUS_NO_MEMORY; + + RtlCopyUnicodeString(DeviceRegistryPath, DriverRegistryPath); + RtlAppendUnicodeToString(DeviceRegistryPath, Insert2); + } + + DbgPrint("Formatted registry key '%wZ' -> '%wZ'\n", + DriverRegistryPath, DeviceRegistryPath); + + return STATUS_SUCCESS; +} + Propchange: trunk/reactos/win32ss/drivers/videoprt/registry.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/drivers/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/v… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/videoprt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/videoprt.c [iso-8859-1] Sat Nov 16 18:40:24 2013 @@ -75,114 +75,6 @@ ((PMINIPORT_DPC_ROUTINE)SystemArgument1)(HwDeviceExtension, SystemArgument2); } -static -NTSTATUS -IntCreateRegistryPath( - IN PCUNICODE_STRING DriverRegistryPath, - OUT PUNICODE_STRING DeviceRegistryPath) -{ - static WCHAR RegistryMachineSystem[] = L"\\REGISTRY\\MACHINE\\SYSTEM\\"; - static WCHAR CurrentControlSet[] = L"CURRENTCONTROLSET\\"; - static WCHAR ControlSet[] = L"CONTROLSET"; - static WCHAR Insert1[] = L"Hardware Profiles\\Current\\System\\CurrentControlSet\\"; - static WCHAR Insert2[] = L"\\Device0"; - BOOLEAN Valid; - UNICODE_STRING AfterControlSet; - - AfterControlSet = *DriverRegistryPath; - - /* Check if path begins with \\REGISTRY\\MACHINE\\SYSTEM\\ */ - Valid = (DriverRegistryPath->Length > sizeof(RegistryMachineSystem) && - 0 == _wcsnicmp(DriverRegistryPath->Buffer, RegistryMachineSystem, - wcslen(RegistryMachineSystem))); - if (Valid) - { - AfterControlSet.Buffer += wcslen(RegistryMachineSystem); - AfterControlSet.Length -= sizeof(RegistryMachineSystem) - sizeof(UNICODE_NULL); - - /* Check if path contains CURRENTCONTROLSET */ - if (AfterControlSet.Length > sizeof(CurrentControlSet) && - 0 == _wcsnicmp(AfterControlSet.Buffer, CurrentControlSet, wcslen(CurrentControlSet))) - { - AfterControlSet.Buffer += wcslen(CurrentControlSet); - AfterControlSet.Length -= sizeof(CurrentControlSet) - sizeof(UNICODE_NULL); - } - /* Check if path contains CONTROLSETnum */ - else if (AfterControlSet.Length > sizeof(ControlSet) && - 0 == _wcsnicmp(AfterControlSet.Buffer, ControlSet, wcslen(ControlSet))) - { - AfterControlSet.Buffer += wcslen(ControlSet); - AfterControlSet.Length -= sizeof(ControlSet) - sizeof(UNICODE_NULL); - while (AfterControlSet.Length > 0 && - *AfterControlSet.Buffer >= L'0' && - *AfterControlSet.Buffer <= L'9') - { - AfterControlSet.Buffer++; - AfterControlSet.Length -= sizeof(WCHAR); - } - - Valid = (AfterControlSet.Length > 0 && L'\\' == *AfterControlSet.Buffer); - AfterControlSet.Buffer++; - AfterControlSet.Length -= sizeof(WCHAR); - AfterControlSet.MaximumLength = AfterControlSet.Length; - } - else - { - Valid = FALSE; - } - } - - if (Valid) - { - DeviceRegistryPath->MaximumLength = DriverRegistryPath->Length + sizeof(Insert1) + sizeof(Insert2); - DeviceRegistryPath->Buffer = ExAllocatePoolWithTag(PagedPool, - DeviceRegistryPath->MaximumLength, - TAG_VIDEO_PORT); - if (DeviceRegistryPath->Buffer != NULL) - { - /* Build device path */ - wcsncpy(DeviceRegistryPath->Buffer, - DriverRegistryPath->Buffer, - AfterControlSet.Buffer - DriverRegistryPath->Buffer); - DeviceRegistryPath->Length = (AfterControlSet.Buffer - DriverRegistryPath->Buffer) * sizeof(WCHAR); - RtlAppendUnicodeToString(DeviceRegistryPath, Insert1); - RtlAppendUnicodeStringToString(DeviceRegistryPath, &AfterControlSet); - RtlAppendUnicodeToString(DeviceRegistryPath, Insert2); - - /* Check if registry key exists */ - Valid = NT_SUCCESS(RtlCheckRegistryKey(RTL_REGISTRY_ABSOLUTE, DeviceRegistryPath->Buffer)); - - if (!Valid) - ExFreePoolWithTag(DeviceRegistryPath->Buffer, TAG_VIDEO_PORT); - } - else - { - Valid = FALSE; - } - } - else - { - WARN_(VIDEOPRT, "Unparsable registry path %wZ", DriverRegistryPath); - } - - /* If path doesn't point to *ControlSet*, use DriverRegistryPath directly */ - if (!Valid) - { - DeviceRegistryPath->MaximumLength = DriverRegistryPath->Length + sizeof(Insert2); - DeviceRegistryPath->Buffer = ExAllocatePoolWithTag(NonPagedPool, - DeviceRegistryPath->MaximumLength, - TAG_VIDEO_PORT); - - if (!DeviceRegistryPath->Buffer) - return STATUS_NO_MEMORY; - - RtlCopyUnicodeString(DeviceRegistryPath, DriverRegistryPath); - RtlAppendUnicodeToString(DeviceRegistryPath, Insert2); - } - - return STATUS_SUCCESS; -} - NTSTATUS NTAPI IntVideoPortCreateAdapterDeviceObject( @@ -227,15 +119,15 @@ DriverExtension->InitializationData.HwDeviceExtensionSize); /* Create the device object. */ - Status = IoCreateDevice( - DriverObject, - sizeof(VIDEO_PORT_DEVICE_EXTENSION) + - DriverExtension->InitializationData.HwDeviceExtensionSize, - &DeviceName, - FILE_DEVICE_VIDEO, - 0, - TRUE, - DeviceObject); + Size = sizeof(VIDEO_PORT_DEVICE_EXTENSION) + + DriverExtension->InitializationData.HwDeviceExtensionSize; + Status = IoCreateDevice(DriverObject, + Size, + &DeviceName, + FILE_DEVICE_VIDEO, + 0, + TRUE, + DeviceObject); if (!NT_SUCCESS(Status)) { @@ -261,7 +153,7 @@ InitializeListHead(&DeviceExtension->ChildDeviceList); - /* Get the registry path associated with this driver. */ + /* Get the registry path associated with this device. */ Status = IntCreateRegistryPath(&DriverExtension->RegistryPath, &DeviceExtension->RegistryPath); if (!NT_SUCCESS(Status)) @@ -276,12 +168,11 @@ { /* Get bus number from the upper level bus driver. */ Size = sizeof(ULONG); - Status = IoGetDeviceProperty( - PhysicalDeviceObject, - DevicePropertyBusNumber, - Size, - &DeviceExtension->SystemIoBusNumber, - &Size); + Status = IoGetDeviceProperty(PhysicalDeviceObject, + DevicePropertyBusNumber, + Size, + &DeviceExtension->SystemIoBusNumber, + &Size); if (!NT_SUCCESS(Status)) { WARN_(VIDEOPRT, "Couldn't get an information from bus driver. We will try to\n" @@ -333,6 +224,9 @@ DeviceExtension->NextDeviceObject = IoAttachDeviceToDeviceStack( *DeviceObject, PhysicalDeviceObject); + + IntCreateNewRegistryPath(DeviceExtension); + IntSetupDeviceSettingsKey(DeviceExtension); /* Remove the initailizing flag */ (*DeviceObject)->Flags &= ~DO_DEVICE_INITIALIZING; @@ -434,12 +328,7 @@ else { ERR_(VIDEOPRT, "HwFindAdapter call failed with error 0x%X\n", Status); - RtlFreeUnicodeString(&DeviceExtension->RegistryPath); - if (DeviceExtension->NextDeviceObject) - IoDetachDevice(DeviceExtension->NextDeviceObject); - IoDeleteDevice(DeviceObject); - - return Status; + goto Failure; } } } @@ -457,11 +346,7 @@ if (Status != NO_ERROR) { ERR_(VIDEOPRT, "HwFindAdapter call failed with error 0x%X\n", Status); - RtlFreeUnicodeString(&DeviceExtension->RegistryPath); - if (DeviceExtension->NextDeviceObject) - IoDetachDevice(DeviceExtension->NextDeviceObject); - IoDeleteDevice(DeviceObject); - return Status; + goto Failure; } /* @@ -501,27 +386,18 @@ /* Allocate interrupt for device. */ if (!IntVideoPortSetupInterrupt(DeviceObject, DriverExtension, &ConfigInfo)) { - RtlFreeUnicodeString(&DeviceExtension->RegistryPath); - if (DeviceExtension->NextDeviceObject) - IoDetachDevice(DeviceExtension->NextDeviceObject); - IoDeleteDevice(DeviceObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* - * Allocate timer for device. - */ - + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Failure; + } + + /* Allocate timer for device. */ if (!IntVideoPortSetupTimer(DeviceObject, DriverExtension)) { if (DeviceExtension->InterruptObject != NULL) IoDisconnectInterrupt(DeviceExtension->InterruptObject); - if (DeviceExtension->NextDeviceObject) - IoDetachDevice(DeviceExtension->NextDeviceObject); - RtlFreeUnicodeString(&DeviceExtension->RegistryPath); - IoDeleteDevice(DeviceObject); ERR_(VIDEOPRT, "IntVideoPortSetupTimer failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Failure; } /* Query children of the device. */ @@ -529,12 +405,19 @@ INFO_(VIDEOPRT, "STATUS_SUCCESS\n"); return STATUS_SUCCESS; + +Failure: + RtlFreeUnicodeString(&DeviceExtension->RegistryPath); + if (DeviceExtension->NextDeviceObject) + IoDetachDevice(DeviceExtension->NextDeviceObject); + IoDeleteDevice(DeviceObject); + return Status; } VOID FASTCALL IntAttachToCSRSS( - PKPROCESS *CallingProcess, + PKPROCESS *CallingProcess, PKAPC_STATE ApcState) { *CallingProcess = (PKPROCESS)PsGetCurrentProcess(); @@ -584,9 +467,9 @@ return STATUS_REVISION_MISMATCH; } - if (HwInitializationData->HwFindAdapter == NULL || - HwInitializationData->HwInitialize == NULL || - HwInitializationData->HwStartIO == NULL) + if ((HwInitializationData->HwFindAdapter == NULL) || + (HwInitializationData->HwInitialize == NULL) || + (HwInitializationData->HwStartIO == NULL)) { ERR_(VIDEOPRT, "Invalid HwInitializationData\n"); return STATUS_INVALID_PARAMETER; @@ -628,10 +511,10 @@ /* Determine type of the miniport driver */ if ((HwInitializationData->HwInitDataSize >= - FIELD_OFFSET(VIDEO_HW_INITIALIZATION_DATA, HwQueryInterface)) - && HwInitializationData->HwSetPowerState - && HwInitializationData->HwGetPowerState - && HwInitializationData->HwGetVideoChildDescriptor) + FIELD_OFFSET(VIDEO_HW_INITIALIZATION_DATA, HwQueryInterface)) && + (HwInitializationData->HwSetPowerState != NULL) && + (HwInitializationData->HwGetPowerState != NULL) && + (HwInitializationData->HwGetVideoChildDescriptor != NULL)) { INFO_(VIDEOPRT, "The miniport is a PnP miniport driver\n"); PnpDriver = TRUE; @@ -658,12 +541,10 @@ DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); if (DriverExtension == NULL) { - Status = IoAllocateDriverObjectExtension( - DriverObject, - DriverObject, - sizeof(VIDEO_PORT_DRIVER_EXTENSION), - (PVOID *)&DriverExtension); - + Status = IoAllocateDriverObjectExtension(DriverObject, + DriverObject, + sizeof(VIDEO_PORT_DRIVER_EXTENSION), + (PVOID *)&DriverExtension); if (!NT_SUCCESS(Status)) { ERR_(VIDEOPRT, "IoAllocateDriverObjectExtension failed 0x%x\n", Status); @@ -699,9 +580,7 @@ } } - /* - * Copy the correct miniport initialization data to the device extension. - */ + /* Copy the correct miniport initialization data to the device extension. */ RtlCopyMemory(&DriverExtension->InitializationData, HwInitializationData, HwInitializationData->HwInitDataSize); @@ -728,6 +607,7 @@ /* power management */ DriverObject->MajorFunction[IRP_MJ_POWER] = IntVideoPortDispatchPower; } + Status = IntVideoPortCreateAdapterDeviceObject(DriverObject, DriverExtension, NULL, Modified: trunk/reactos/win32ss/drivers/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/v… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/videoprt.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/videoprt.h [iso-8859-1] Sat Nov 16 18:40:24 2013 @@ -30,6 +30,7 @@ #include <ndk/inbvfuncs.h> #include <ndk/kefuncs.h> #include <ndk/rtlfuncs.h> +#include <ndk/obfuncs.h> #define __BROKEN__ #include <miniport.h> @@ -46,6 +47,8 @@ #define TAG_VIDEO_PORT_BUFFER '\0mpV' #define TAG_REQUEST_PACKET 'qRpV' +#define GUID_STRING_LENGTH 38 * sizeof(WCHAR) + typedef struct _VIDEO_PORT_ADDRESS_MAPPING { LIST_ENTRY List; @@ -93,6 +96,7 @@ PDEVICE_OBJECT FunctionalDeviceObject; PDEVICE_OBJECT NextDeviceObject; UNICODE_STRING RegistryPath; + UNICODE_STRING NewRegistryPath; PKINTERRUPT InterruptObject; KSPIN_LOCK InterruptSpinLock; PCM_RESOURCE_LIST AllocatedResources; @@ -280,6 +284,10 @@ /* int10.c */ +NTSTATUS +NTAPI +IntInitializeVideoAddressSpace(VOID); + VP_STATUS NTAPI IntInt10AllocateBuffer( IN PVOID Context, @@ -314,4 +322,36 @@ IN PVOID Context, IN OUT PINT10_BIOS_ARGUMENTS BiosArguments); +/* registry.c */ + +NTSTATUS +NTAPI +IntCopyRegistryKey( + _In_ HANDLE SourceKeyHandle, + _In_ HANDLE DestKeyHandle); + +NTSTATUS +NTAPI +IntCopyRegistryValue( + HANDLE SourceKeyHandle, + HANDLE DestKeyHandle, + PWSTR ValueName); + +NTSTATUS +NTAPI +IntSetupDeviceSettingsKey( + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension); + +NTSTATUS +NTAPI +IntCreateNewRegistryPath( + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension); + +NTSTATUS +NTAPI +IntCreateRegistryPath( + IN PCUNICODE_STRING DriverRegistryPath, + OUT PUNICODE_STRING DeviceRegistryPath); + + #endif /* VIDEOPRT_H */ Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] Sat Nov 16 18:40:24 2013 @@ -89,150 +89,6 @@ return TRUE; } -ULONG -InitializeVideoAddressSpace(VOID) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING PhysMemName = RTL_CONSTANT_STRING(L"\\Device\\PhysicalMemory"); - NTSTATUS Status; - HANDLE PhysMemHandle; - PVOID BaseAddress; - LARGE_INTEGER Offset; - SIZE_T ViewSize; - CHAR IVTAndBda[1024+256]; - - /* Free the 1MB pre-reserved region. In reality, ReactOS should simply support us mapping the view into the reserved area, but it doesn't. */ - BaseAddress = 0; - ViewSize = 1024 * 1024; - Status = ZwFreeVirtualMemory(NtCurrentProcess(), - &BaseAddress, - &ViewSize, - MEM_RELEASE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Couldn't unmap reserved memory (%x)\n", Status); - return 0; - } - - /* Open the physical memory section */ - InitializeObjectAttributes(&ObjectAttributes, - &PhysMemName, - 0, - NULL, - NULL); - Status = ZwOpenSection(&PhysMemHandle, - SECTION_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Couldn't open \\Device\\PhysicalMemory\n"); - return 0; - } - - /* Map the BIOS and device registers into the address space */ - Offset.QuadPart = 0xa0000; - ViewSize = 0x100000 - 0xa0000; - BaseAddress = (PVOID)0xa0000; - Status = ZwMapViewOfSection(PhysMemHandle, - NtCurrentProcess(), - &BaseAddress, - 0, - ViewSize, - &Offset, - &ViewSize, - ViewUnmap, - 0, - PAGE_EXECUTE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Couldn't map physical memory (%x)\n", Status); - ZwClose(PhysMemHandle); - return 0; - } - - /* Close physical memory section handle */ - ZwClose(PhysMemHandle); - - if (BaseAddress != (PVOID)0xa0000) - { - DPRINT1("Couldn't map physical memory at the right address (was %x)\n", - BaseAddress); - return 0; - } - - /* Allocate some low memory to use for the non-BIOS - * parts of the v86 mode address space - */ - BaseAddress = (PVOID)0x1; - ViewSize = 0xa0000 - 0x1000; - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - &BaseAddress, - 0, - &ViewSize, - MEM_RESERVE | MEM_COMMIT, - PAGE_EXECUTE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to allocate virtual memory (Status %x)\n", Status); - return 0; - } - if (BaseAddress != (PVOID)0x0) - { - DPRINT1("Failed to allocate virtual memory at right address (was %x)\n", - BaseAddress); - return 0; - } - - /* Get the real mode IVT and BDA from the kernel */ - Status = NtVdmControl(VdmInitialize, IVTAndBda); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtVdmControl failed (status %x)\n", Status); - return 0; - } - - /* Return success */ - return 1; -} - -/********************************************************************** - * UserpInitVideo - * - * TODO: we need a virtual device for sessions other than - * TODO: the console one - */ -NTSTATUS -UserpInitVideo(VOID) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\??\\DISPLAY1"); - IO_STATUS_BLOCK Iosb; - HANDLE VideoHandle = (HANDLE) 0; - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - InitializeVideoAddressSpace(); - - InitializeObjectAttributes(&ObjectAttributes, - &DeviceName, - 0, - NULL, - NULL); - Status = NtOpenFile(&VideoHandle, - FILE_ALL_ACCESS, - &ObjectAttributes, - &Iosb, - 0, - 0); - if (NT_SUCCESS(Status)) - { - NtClose(VideoHandle); - } - - return Status; -} - // From win32ss/user/win32csr/dllmain.c VOID WINAPI @@ -287,8 +143,7 @@ UserServerHeap = RtlGetProcessHeap(); /* Initialize the video */ - UserpInitVideo(); - NtUserInitialize(0, NULL, NULL); + NtUserInitialize(0, NULL, NULL); // PrivateCsrssManualGuiCheck(0); /* Setup the DLL Object */

1 0

[tkreuzer] 61012: [DXG] Add all function stubs. (win32k from windows 2k3 is nasty and indexes the function table directly instead of looking up the entries...)
by tkreuzer＠svn.reactos.org 16 Nov '13

16 Nov '13

Author: tkreuzer Date: Sat Nov 16 18:31:44 2013 New Revision: 61012 URL: http://svn.reactos.org/svn/reactos?rev=61012&view=rev Log: [DXG] Add all function stubs. (win32k from windows 2k3 is nasty and indexes the function table directly instead of looking up the entries...) Modified: trunk/reactos/win32ss/reactx/dxg/dxg_driver.h trunk/reactos/win32ss/reactx/dxg/dxg_int.h trunk/reactos/win32ss/reactx/dxg/eng.c Modified: trunk/reactos/win32ss/reactx/dxg/dxg_driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/dxg_dri… ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/dxg_driver.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/dxg_driver.h [iso-8859-1] Sat Nov 16 18:31:44 2013 @@ -1,97 +1,987 @@ + +#define TRACE() \ + DbgPrint("DXG: %s\n", __FUNCTION__) + +DWORD +NTAPI +DxD3dContextCreate( + PVOID p1, + PVOID p2, + PVOID p3, + PVOID p4) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxD3dContextDestroy( + PVOID p1) +{ + TRACE(); + return 0; +} + + +DWORD +NTAPI +DxD3dContextDestroyAll( + PVOID p1) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxD3dValidateTextureStageState( + PVOID p1) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxD3dDrawPrimitives2( + PVOID p1, + PVOID p2, + PVOID p3, + PVOID p4, + PVOID p5, + PVOID p6, + PVOID p7) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdGetDriverState( + PVOID p1) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdAddAttachedSurface( + PVOID p1, + PVOID p2, + PVOID p3) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdAlphaBlt( + PVOID p1, + PVOID p2, + PVOID p3) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdAttachSurface( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdBeginMoCompFrame( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdBlt( + PVOID p1, + PVOID p2, + PVOID p3) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdCanCreateSurface( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdCanCreateD3DBuffer( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdColorControl( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdCreateDirectDrawObject( + PVOID p1) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdCreateD3DBuffer( + PVOID p1, + PVOID p2, + PVOID p3, + PVOID p4, + PVOID p5, + PVOID p6, + PVOID p7, + PVOID p8) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdCreateMoComp( + PVOID p1, + PVOID p2) +{ + return 0; +} + +DWORD +NTAPI +DxDdCreateSurfaceObject( + PVOID p1, + PVOID p2, + PVOID p3, + PVOID p4, + PVOID p5, + PVOID p6) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdDeleteDirectDrawObject( + PVOID p1) +{ + return 0; +} + +DWORD +NTAPI +DxDdDeleteSurfaceObject( + PVOID p1) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdDestroyMoComp( + PVOID p1, + PVOID p2) +{ + return 0; +} + +DWORD +NTAPI +DxDdDestroySurface( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdDestroyD3DBuffer( + PVOID p1) +{ + return 0; +} + +DWORD +NTAPI +DxDdEndMoCompFrame( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdFlip( + PVOID p1, + PVOID p2, + PVOID p3, + PVOID p4, + PVOID p5) +{ + return 0; +} + +DWORD +NTAPI +DxDdFlipToGDISurface( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdGetAvailDriverMemory( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdGetBltStatus( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdGetDC( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdGetDriverInfo( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdGetDxHandle( + PVOID p1, + PVOID p2, + PVOID p3) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdGetFlipStatus( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdGetInternalMoCompInfo( + PVOID p1, + PVOID p2) +{ + return 0; +} + +DWORD +NTAPI +DxDdGetMoCompBuffInfo( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdGetMoCompGuids( + PVOID p1, + PVOID p2) +{ + return 0; +} + +DWORD +NTAPI +DxDdGetMoCompFormats( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdGetScanLine( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdLock( + PVOID p1) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdLockD3D( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdQueryDirectDrawObject( + PVOID p1, + PVOID p2, + PVOID p3, + PVOID p4, + PVOID p5, + PVOID p6, + PVOID p7, + PVOID p8, + PVOID p9, + PVOID p10, + PVOID p11) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdQueryMoCompStatus( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdReenableDirectDrawObject( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdReleaseDC( + PVOID p1) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdRenderMoComp( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdResetVisrgn( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdSetColorKey( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdSetExclusiveMode( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdSetGammaRamp( + PVOID p1, + PVOID p2, + PVOID p3) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdCreateSurfaceEx( + PVOID p1, + PVOID p2, + PVOID p3) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdSetOverlayPosition( + PVOID p1, + PVOID p2, + PVOID p3) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdUnattachSurface( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdUnlock( + PVOID p1) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdUnlockD3D( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdUpdateOverlay( + PVOID p1, + PVOID p2, + PVOID p3) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdWaitForVerticalBlank( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDvpCanCreateVideoPort( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDvpColorControl( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDvpCreateVideoPort( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDvpDestroyVideoPort( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDvpFlipVideoPort( + PVOID p1, + PVOID p2, + PVOID p3, + PVOID p4) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDvpGetVideoPortBandwidth( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDvpGetVideoPortField( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDvpGetVideoPortFlipStatus( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDvpGetVideoPortInputFormats( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDvpGetVideoPortLine( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDvpGetVideoPortOutputFormats( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDvpGetVideoPortConnectInfo( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDvpGetVideoSignalStatus( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDvpUpdateVideoPort( + PVOID p1, + PVOID p2, + PVOID p3, + PVOID p4) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDvpWaitForVideoPortSync( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDvpAcquireNotification( + PVOID p1, + PVOID p2, + PVOID p3) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDvpReleaseNotification( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdHeapVidMemAllocAligned( + PVOID p1, + PVOID p2, + PVOID p3, + PVOID p4, + PVOID p5) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdHeapVidMemFree( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdDisableDirectDraw( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdSuspendDirectDraw( + PVOID p1) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdResumeDirectDraw( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdDynamicModeChange( + PVOID p1, + PVOID p2, + PVOID p3) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdCloseProcess( + PVOID p1) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdGetDirectDrawBound( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdEnableDirectDrawRedirection( + PVOID p1, + PVOID p2) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdAllocPrivateUserMem( + PVOID p1, + PVOID p2, + PVOID p3) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdFreePrivateUserMem( + PVOID p1, + PVOID p2) +{ + return 0; +} + +DWORD +NTAPI +DxDdSetAccelLevel( + PVOID p1, + PVOID p2, + PVOID p3) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdGetSurfaceLock( + PVOID p1) +{ + TRACE(); + return 0; +} + +DWORD +NTAPI +DxDdEnumLockedSurfaceRect( + PVOID p1, + PVOID p2, + PVOID p3) +{ + TRACE(); + return 0; +} DRVFN gaDxgFuncs [] = { {DXG_INDEX_DxDxgGenericThunk, (PFN)DxDxgGenericThunk}, - //{DXG_INDEX_DxD3dContextCreate, (PFN)DxD3dContextCreate}, - //{DXG_INDEX_DxD3dContextDestroy, (PFN)DxD3dContextDestroy}, - //{DXG_INDEX_DxD3dContextDestroyAll, (PFN)DxD3dContextDestroyAll}, - //{DXG_INDEX_DxD3dValidateTextureStageState, (PFN)DxD3dValidateTextureStageState}, - //{DXG_INDEX_DxD3dDrawPrimitives2, (PFN)DxD3dDrawPrimitives2}, - //{DXG_INDEX_DxDdGetDriverState, (PFN)DxDdGetDriverState}, - //{DXG_INDEX_DxDdAddAttachedSurface, (PFN)DxDdAddAttachedSurface}, - //{DXG_INDEX_DxDdAlphaBlt, (PFN)DxDdAlphaBlt}, - //{DXG_INDEX_DxDdAttachSurface, (PFN)DxDdAttachSurface}, - //{DXG_INDEX_DxDdBeginMoCompFrame, (PFN)DxDdBeginMoCompFrame}, - //{DXG_INDEX_DxDdBlt, (PFN)DxDdBlt}, - //{DXG_INDEX_DxDdCanCreateSurface, (PFN)DxDdCanCreateSurface}, - //{DXG_INDEX_DxDdCanCreateD3DBuffer, (PFN)DxDdCanCreateD3DBuffer}, - //{DXG_INDEX_DxDdColorControl, (PFN)DxDdColorControl}, - //{DXG_INDEX_DxDdCreateDirectDrawObject, (PFN)DxDdCreateDirectDrawObject}, - //{DXG_INDEX_DxDdCreateSurface, (PFN)DxDdCreateD3DBuffer}, - //{DXG_INDEX_DxDdCreateD3DBuffer, (PFN)DxDdCreateD3DBuffer}, - //{DXG_INDEX_DxDdCreateMoComp, (PFN)DxDdCreateMoComp}, - //{DXG_INDEX_DxDdCreateSurfaceObject, (PFN)DxDdCreateSurfaceObject}, - //{DXG_INDEX_DxDdDeleteDirectDrawObject, (PFN)DxDdDeleteDirectDrawObject}, - //{DXG_INDEX_DxDdDeleteSurfaceObject, (PFN)DxDdDeleteSurfaceObject}, - //{DXG_INDEX_DxDdDestroyMoComp, (PFN)DxDdDestroyMoComp}, - //{DXG_INDEX_DxDdDestroySurface, (PFN)DxDdDestroySurface}, - //{DXG_INDEX_DxDdDestroyD3DBuffer, (PFN)DxDdDestroyD3DBuffer}, - //{DXG_INDEX_DxDdEndMoCompFrame, (PFN)DxDdEndMoCompFrame}, - //{DXG_INDEX_DxDdFlip, (PFN)DxDdFlip}, - //{DXG_INDEX_DxDdFlipToGDISurface, (PFN)DxDdFlipToGDISurface}, - //{DXG_INDEX_DxDdGetAvailDriverMemory, (PFN)DxDdGetAvailDriverMemory}, - //{DXG_INDEX_DxDdGetBltStatus, (PFN)DxDdGetBltStatus}, - //{DXG_INDEX_DxDdGetDC, (PFN)DxDdGetDC}, - //{DXG_INDEX_DxDdGetDriverInfo, (PFN)DxDdGetDriverInfo}, - //{DXG_INDEX_DxDdGetDxHandle, (PFN)DxDdGetDxHandle}, - //{DXG_INDEX_DxDdGetFlipStatus, (PFN)DxDdGetFlipStatus}, - //{DXG_INDEX_DxDdGetInternalMoCompInfo, (PFN)DxDdGetInternalMoCompInfo}, - //{DXG_INDEX_DxDdGetMoCompBuffInfo, (PFN)DxDdGetMoCompBuffInfo}, - //{DXG_INDEX_DxDdGetMoCompGuids, (PFN)DxDdGetMoCompGuids}, - //{DXG_INDEX_DxDdGetMoCompFormats, (PFN)DxDdGetMoCompFormats}, - //{DXG_INDEX_DxDdGetScanLine, (PFN)DxDdGetScanLine}, - //{DXG_INDEX_DxDdLock, (PFN)DxDdLock}, - //{DXG_INDEX_DxDdLockD3D, (PFN)DxDdLockD3D}, - //{DXG_INDEX_DxDdQueryDirectDrawObject, (PFN)DxDdQueryDirectDrawObject}, - //{DXG_INDEX_DxDdQueryMoCompStatus, (PFN)DxDdQueryMoCompStatus}, - //{DXG_INDEX_DxDdReenableDirectDrawObject, (PFN)DxDdReenableDirectDrawObject}, - //{DXG_INDEX_DxDdReleaseDC, (PFN)DxDdReleaseDC}, - //{DXG_INDEX_DxDdRenderMoComp, (PFN)DxDdRenderMoComp}, - //{DXG_INDEX_DxDdResetVisrgn, (PFN)DxDdResetVisrgn}, - //{DXG_INDEX_DxDdSetColorKey, (PFN)DxDdSetColorKey}, - //{DXG_INDEX_DxDdSetExclusiveMode, (PFN)DxDdSetExclusiveMode}, - //{DXG_INDEX_DxDdSetGammaRamp, (PFN)DxDdSetGammaRamp}, - //{DXG_INDEX_DxDdCreateSurfaceEx, (PFN)DxDdCreateSurfaceEx}, - //{DXG_INDEX_DxDdSetOverlayPosition, (PFN)DxDdSetOverlayPosition}, - //{DXG_INDEX_DxDdUnattachSurface, (PFN)DxDdUnattachSurface}, - //{DXG_INDEX_DxDdUnlock, (PFN)DxDdUnlock}, - //{DXG_INDEX_DxDdUnlockD3D2, (PFN)DxDdUnlockD3D}, - //{DXG_INDEX_DxDdUpdateOverlay, (PFN)DxDdUpdateOverlay}, - //{DXG_INDEX_DxDdWaitForVerticalBlank, (PFN)DxDdWaitForVerticalBlank}, - //{DXG_INDEX_DxDvpCanCreateVideoPort, (PFN)DxDvpCanCreateVideoPort}, - //{DXG_INDEX_DxDvpColorControl, (PFN)DxDvpColorControl}, - //{DXG_INDEX_DxDvpCreateVideoPort, (PFN)DxDvpCreateVideoPort}, - //{DXG_INDEX_DxDvpDestroyVideoPort, (PFN)DxDvpDestroyVideoPort}, - //{DXG_INDEX_DxDvpFlipVideoPort, (PFN)DxDvpFlipVideoPort}, - //{DXG_INDEX_DxDvpGetVideoPortBandwidth, (PFN)DxDvpGetVideoPortBandwidth}, - //{DXG_INDEX_DxDvpGetVideoPortField, (PFN)DxDvpGetVideoPortField}, - //{DXG_INDEX_DxDvpGetVideoPortFlipStatus, (PFN)DxDvpGetVideoPortFlipStatus}, - //{DXG_INDEX_DxDvpGetVideoPortInputFormats, (PFN)DxDvpGetVideoPortInputFormats}, - //{DXG_INDEX_DxDvpGetVideoPortLine, (PFN)DxDvpGetVideoPortLine}, - //{DXG_INDEX_DxDvpGetVideoPortOutputFormats, (PFN)DxDvpGetVideoPortOutputFormats}, - //{DXG_INDEX_DxDvpGetVideoPortConnectInfo, (PFN)DxDvpGetVideoPortConnectInfo}, - //{DXG_INDEX_DxDvpGetVideoSignalStatus, (PFN)DxDvpGetVideoSignalStatus}, - //{DXG_INDEX_DxDvpUpdateVideoPort, (PFN)DxDvpUpdateVideoPort}, - //{DXG_INDEX_DxDvpWaitForVideoPortSync, (PFN)DxDvpWaitForVideoPortSync}, - //{DXG_INDEX_DxDvpAcquireNotification, (PFN)DxDvpAcquireNotification}, - //{DXG_INDEX_DxDvpReleaseNotification, (PFN)DxDvpReleaseNotification}, - //{DXG_INDEX_DxDdHeapVidMemAllocAligned, (PFN)DxDdHeapVidMemAllocAligned}, - //{DXG_INDEX_DxDdHeapVidMemFree, (PFN)DxDdHeapVidMemFree}, - //{DXG_INDEX_DxDdEnableDirectDraw, (PFN)DxDdEnableDirectDraw}, - //{DXG_INDEX_DxDdDisableDirectDraw, (PFN)DxDdDisableDirectDraw}, - //{DXG_INDEX_DxDdSuspendDirectDraw, (PFN)DxDdSuspendDirectDraw}, - //{DXG_INDEX_DxDdResumeDirectDraw, (PFN)DxDdResumeDirectDraw}, - //{DXG_INDEX_DxDdDynamicModeChange, (PFN)DxDdDynamicModeChange}, - //{DXG_INDEX_DxDdCloseProcess, (PFN)DxDdCloseProcess}, - //{DXG_INDEX_DxDdGetDirectDrawBound, (PFN)DxDdGetDirectDrawBound}, - //{DXG_INDEX_DxDdEnableDirectDrawRedirection, (PFN)DxDdEnableDirectDrawRedirection}, - //{DXG_INDEX_DxDdAllocPrivateUserMem, (PFN)DxDdAllocPrivateUserMem}, - //{DXG_INDEX_DxDdFreePrivateUserMem, (PFN)DxDdFreePrivateUserMem}, + {DXG_INDEX_DxD3dContextCreate, (PFN)DxD3dContextCreate}, + {DXG_INDEX_DxD3dContextDestroy, (PFN)DxD3dContextDestroy}, + {DXG_INDEX_DxD3dContextDestroyAll, (PFN)DxD3dContextDestroyAll}, + {DXG_INDEX_DxD3dValidateTextureStageState, (PFN)DxD3dValidateTextureStageState}, + {DXG_INDEX_DxD3dDrawPrimitives2, (PFN)DxD3dDrawPrimitives2}, + {DXG_INDEX_DxDdGetDriverState, (PFN)DxDdGetDriverState}, + {DXG_INDEX_DxDdAddAttachedSurface, (PFN)DxDdAddAttachedSurface}, + {DXG_INDEX_DxDdAlphaBlt, (PFN)DxDdAlphaBlt}, + {DXG_INDEX_DxDdAttachSurface, (PFN)DxDdAttachSurface}, + {DXG_INDEX_DxDdBeginMoCompFrame, (PFN)DxDdBeginMoCompFrame}, + {DXG_INDEX_DxDdBlt, (PFN)DxDdBlt}, + {DXG_INDEX_DxDdCanCreateSurface, (PFN)DxDdCanCreateSurface}, + {DXG_INDEX_DxDdCanCreateD3DBuffer, (PFN)DxDdCanCreateD3DBuffer}, + {DXG_INDEX_DxDdColorControl, (PFN)DxDdColorControl}, + {DXG_INDEX_DxDdCreateDirectDrawObject, (PFN)DxDdCreateDirectDrawObject}, + {DXG_INDEX_DxDdCreateSurface, (PFN)DxDdCreateD3DBuffer}, + {DXG_INDEX_DxDdCreateD3DBuffer, (PFN)DxDdCreateD3DBuffer}, + {DXG_INDEX_DxDdCreateMoComp, (PFN)DxDdCreateMoComp}, + {DXG_INDEX_DxDdCreateSurfaceObject, (PFN)DxDdCreateSurfaceObject}, + {DXG_INDEX_DxDdDeleteDirectDrawObject, (PFN)DxDdDeleteDirectDrawObject}, + {DXG_INDEX_DxDdDeleteSurfaceObject, (PFN)DxDdDeleteSurfaceObject}, + {DXG_INDEX_DxDdDestroyMoComp, (PFN)DxDdDestroyMoComp}, + {DXG_INDEX_DxDdDestroySurface, (PFN)DxDdDestroySurface}, + {DXG_INDEX_DxDdDestroyD3DBuffer, (PFN)DxDdDestroyD3DBuffer}, + {DXG_INDEX_DxDdEndMoCompFrame, (PFN)DxDdEndMoCompFrame}, + {DXG_INDEX_DxDdFlip, (PFN)DxDdFlip}, + {DXG_INDEX_DxDdFlipToGDISurface, (PFN)DxDdFlipToGDISurface}, + {DXG_INDEX_DxDdGetAvailDriverMemory, (PFN)DxDdGetAvailDriverMemory}, + {DXG_INDEX_DxDdGetBltStatus, (PFN)DxDdGetBltStatus}, + {DXG_INDEX_DxDdGetDC, (PFN)DxDdGetDC}, + {DXG_INDEX_DxDdGetDriverInfo, (PFN)DxDdGetDriverInfo}, + {DXG_INDEX_DxDdGetDxHandle, (PFN)DxDdGetDxHandle}, + {DXG_INDEX_DxDdGetFlipStatus, (PFN)DxDdGetFlipStatus}, + {DXG_INDEX_DxDdGetInternalMoCompInfo, (PFN)DxDdGetInternalMoCompInfo}, + {DXG_INDEX_DxDdGetMoCompBuffInfo, (PFN)DxDdGetMoCompBuffInfo}, + {DXG_INDEX_DxDdGetMoCompGuids, (PFN)DxDdGetMoCompGuids}, + {DXG_INDEX_DxDdGetMoCompFormats, (PFN)DxDdGetMoCompFormats}, + {DXG_INDEX_DxDdGetScanLine, (PFN)DxDdGetScanLine}, + {DXG_INDEX_DxDdLock, (PFN)DxDdLock}, + {DXG_INDEX_DxDdLockD3D, (PFN)DxDdLockD3D}, + {DXG_INDEX_DxDdQueryDirectDrawObject, (PFN)DxDdQueryDirectDrawObject}, + {DXG_INDEX_DxDdQueryMoCompStatus, (PFN)DxDdQueryMoCompStatus}, + {DXG_INDEX_DxDdReenableDirectDrawObject, (PFN)DxDdReenableDirectDrawObject}, + {DXG_INDEX_DxDdReleaseDC, (PFN)DxDdReleaseDC}, + {DXG_INDEX_DxDdRenderMoComp, (PFN)DxDdRenderMoComp}, + {DXG_INDEX_DxDdResetVisrgn, (PFN)DxDdResetVisrgn}, + {DXG_INDEX_DxDdSetColorKey, (PFN)DxDdSetColorKey}, + {DXG_INDEX_DxDdSetExclusiveMode, (PFN)DxDdSetExclusiveMode}, + {DXG_INDEX_DxDdSetGammaRamp, (PFN)DxDdSetGammaRamp}, + {DXG_INDEX_DxDdCreateSurfaceEx, (PFN)DxDdCreateSurfaceEx}, + {DXG_INDEX_DxDdSetOverlayPosition, (PFN)DxDdSetOverlayPosition}, + {DXG_INDEX_DxDdUnattachSurface, (PFN)DxDdUnattachSurface}, + {DXG_INDEX_DxDdUnlock, (PFN)DxDdUnlock}, + {DXG_INDEX_DxDdUnlockD3D, (PFN)DxDdUnlockD3D}, + {DXG_INDEX_DxDdUpdateOverlay, (PFN)DxDdUpdateOverlay}, + {DXG_INDEX_DxDdWaitForVerticalBlank, (PFN)DxDdWaitForVerticalBlank}, + {DXG_INDEX_DxDvpCanCreateVideoPort, (PFN)DxDvpCanCreateVideoPort}, + {DXG_INDEX_DxDvpColorControl, (PFN)DxDvpColorControl}, + {DXG_INDEX_DxDvpCreateVideoPort, (PFN)DxDvpCreateVideoPort}, + {DXG_INDEX_DxDvpDestroyVideoPort, (PFN)DxDvpDestroyVideoPort}, + {DXG_INDEX_DxDvpFlipVideoPort, (PFN)DxDvpFlipVideoPort}, + {DXG_INDEX_DxDvpGetVideoPortBandwidth, (PFN)DxDvpGetVideoPortBandwidth}, + {DXG_INDEX_DxDvpGetVideoPortField, (PFN)DxDvpGetVideoPortField}, + {DXG_INDEX_DxDvpGetVideoPortFlipStatus, (PFN)DxDvpGetVideoPortFlipStatus}, + {DXG_INDEX_DxDvpGetVideoPortInputFormats, (PFN)DxDvpGetVideoPortInputFormats}, + {DXG_INDEX_DxDvpGetVideoPortLine, (PFN)DxDvpGetVideoPortLine}, + {DXG_INDEX_DxDvpGetVideoPortOutputFormats, (PFN)DxDvpGetVideoPortOutputFormats}, + {DXG_INDEX_DxDvpGetVideoPortConnectInfo, (PFN)DxDvpGetVideoPortConnectInfo}, + {DXG_INDEX_DxDvpGetVideoSignalStatus, (PFN)DxDvpGetVideoSignalStatus}, + {DXG_INDEX_DxDvpUpdateVideoPort, (PFN)DxDvpUpdateVideoPort}, + {DXG_INDEX_DxDvpWaitForVideoPortSync, (PFN)DxDvpWaitForVideoPortSync}, + {DXG_INDEX_DxDvpAcquireNotification, (PFN)DxDvpAcquireNotification}, + {DXG_INDEX_DxDvpReleaseNotification, (PFN)DxDvpReleaseNotification}, + {DXG_INDEX_DxDdHeapVidMemAllocAligned, (PFN)DxDdHeapVidMemAllocAligned}, + {DXG_INDEX_DxDdHeapVidMemFree, (PFN)DxDdHeapVidMemFree}, + {DXG_INDEX_DxDdEnableDirectDraw, (PFN)DxDdEnableDirectDraw}, + {DXG_INDEX_DxDdDisableDirectDraw, (PFN)DxDdDisableDirectDraw}, + {DXG_INDEX_DxDdSuspendDirectDraw, (PFN)DxDdSuspendDirectDraw}, + {DXG_INDEX_DxDdResumeDirectDraw, (PFN)DxDdResumeDirectDraw}, + {DXG_INDEX_DxDdDynamicModeChange, (PFN)DxDdDynamicModeChange}, + {DXG_INDEX_DxDdCloseProcess, (PFN)DxDdCloseProcess}, + {DXG_INDEX_DxDdGetDirectDrawBound, (PFN)DxDdGetDirectDrawBound}, + {DXG_INDEX_DxDdEnableDirectDrawRedirection, (PFN)DxDdEnableDirectDrawRedirection}, + {DXG_INDEX_DxDdAllocPrivateUserMem, (PFN)DxDdAllocPrivateUserMem}, + {DXG_INDEX_DxDdFreePrivateUserMem, (PFN)DxDdFreePrivateUserMem}, {DXG_INDEX_DxDdLockDirectDrawSurface, (PFN)DxDdLockDirectDrawSurface}, {DXG_INDEX_DxDdUnlockDirectDrawSurface, (PFN)DxDdUnlockDirectDrawSurface}, - //{DXG_INDEX_DxDdSetAccelLevel, (PFN)DxDdSetAccelLevel}, - //{DXG_INDEX_DxDdGetSurfaceLock, (PFN)DxDdGetSurfaceLock}, - //{DXG_INDEX_DxDdEnumLockedSurfaceRect, (PFN)DxDdEnumLockedSurfaceRect}, + {DXG_INDEX_DxDdSetAccelLevel, (PFN)DxDdSetAccelLevel}, + {DXG_INDEX_DxDdGetSurfaceLock, (PFN)DxDdGetSurfaceLock}, + {DXG_INDEX_DxDdEnumLockedSurfaceRect, (PFN)DxDdEnumLockedSurfaceRect}, {DXG_INDEX_DxDdIoctl, (PFN)DxDdIoctl} - }; Modified: trunk/reactos/win32ss/reactx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/dxg_int… ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/dxg_int.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/dxg_int.h [iso-8859-1] Sat Nov 16 18:31:44 2013 @@ -68,6 +68,7 @@ NTSTATUS NTAPI DriverEntry(IN PVOID Context1, IN PVOID Context2); NTSTATUS NTAPI GsDriverEntry(IN PVOID Context1, IN PVOID Context2); NTSTATUS APIENTRY DxDdCleanupDxGraphics(VOID); +BOOL NTAPI DxDdEnableDirectDraw(PVOID arg1, BOOL arg2); /* Global pointers */ extern ULONG gcSizeDdHmgr; Modified: trunk/reactos/win32ss/reactx/dxg/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/eng.c?r… ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/eng.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/eng.c [iso-8859-1] Sat Nov 16 18:31:44 2013 @@ -42,3 +42,18 @@ return retVal; } + +BOOL +NTAPI +DxDdEnableDirectDraw(PVOID arg1, BOOL arg2/*What for?*/) +{ + // taken from CORE-4490 + //PDEV_WIN32K pdev = (PDEV_WIN32K) arg1 ; + //return pdev->DriverFunctions.EnableDirectDraw(pdev->dhpdev, + // &pdev->EDDgpl.ddCallbacks, + // &pdev->EDDgpl.ddSurfaceCallbacks, + // &pdev->EDDgpl.ddPaletteCallbacks) ; + + return TRUE; +} +

1 0

[tkreuzer] 61011: [RTL] Fix RtlWriteRegistryValue, it closed the handle passed to it instead of checking for RTL_REGISTRY_HANDLE flag. [NTOSKRNL] Fix PnpRootCreateDevice, which was relying on the b...
by tkreuzer＠svn.reactos.org 16 Nov '13

16 Nov '13

Author: tkreuzer Date: Sat Nov 16 18:27:26 2013 New Revision: 61011 URL: http://svn.reactos.org/svn/reactos?rev=61011&view=rev Log: [RTL] Fix RtlWriteRegistryValue, it closed the handle passed to it instead of checking for RTL_REGISTRY_HANDLE flag. [NTOSKRNL] Fix PnpRootCreateDevice, which was relying on the broken RtlWriteRegistryValue by aborting, when it *succeeded* to create a registry key, instead of when it failed. Also use kernel handles and ObCloseHandle. Modified: trunk/reactos/lib/rtl/registry.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=610… ============================================================================== --- trunk/reactos/lib/rtl/registry.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/registry.c [iso-8859-1] Sat Nov 16 18:27:26 2013 @@ -661,8 +661,13 @@ ValueData, ValueLength); - /* All went well, close the handle and return status */ - ZwClose(KeyHandle); + /* Did the caller pass a key handle? */ + if (!(RelativeTo & RTL_REGISTRY_HANDLE)) + { + /* We opened the key in RtlpGetRegistryHandle, so close it now */ + ZwClose(KeyHandle); + } + return Status; } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Sat Nov 16 18:27:26 2013 @@ -227,9 +227,13 @@ Status = IopOpenRegistryKeyEx(&EnumHandle, NULL, &EnumKeyName, KEY_READ); if (NT_SUCCESS(Status)) { - InitializeObjectAttributes(&ObjectAttributes, &Device->DeviceID, OBJ_CASE_INSENSITIVE, EnumHandle, NULL); + InitializeObjectAttributes(&ObjectAttributes, + &Device->DeviceID, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + EnumHandle, + NULL); Status = ZwCreateKey(&DeviceKeyHandle, KEY_SET_VALUE, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); - ZwClose(EnumHandle); + ObCloseHandle(EnumHandle, KernelMode); } if (!NT_SUCCESS(Status)) @@ -298,16 +302,20 @@ } /* Finish creating the instance path in the registry */ - InitializeObjectAttributes(&ObjectAttributes, &Device->InstanceID, OBJ_CASE_INSENSITIVE, DeviceKeyHandle, NULL); + InitializeObjectAttributes(&ObjectAttributes, + &Device->InstanceID, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + DeviceKeyHandle, + NULL); Status = ZwCreateKey(&InstanceKeyHandle, KEY_QUERY_VALUE, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); - if (NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create instance path (0x%x)\n", Status); goto cleanup; } /* Just close the handle */ - ZwClose(InstanceKeyHandle); + ObCloseHandle(InstanceKeyHandle, KernelMode); if (FullInstancePath) { @@ -370,7 +378,7 @@ ExFreePoolWithTag(Device, TAG_PNP_ROOT); } if (DeviceKeyHandle != INVALID_HANDLE_VALUE) - ZwClose(DeviceKeyHandle); + ObCloseHandle(DeviceKeyHandle, KernelMode); return Status; }

1 0

[spetreolle] 61010: [NEWDEV] tabs -> spaces
by spetreolle＠svn.reactos.org 16 Nov '13

16 Nov '13

Author: spetreolle Date: Sat Nov 16 17:19:18 2013 New Revision: 61010 URL: http://svn.reactos.org/svn/reactos?rev=61010&view=rev Log: [NEWDEV] tabs -> spaces Modified: trunk/reactos/dll/win32/newdev/newdev.c trunk/reactos/dll/win32/newdev/stubs.c trunk/reactos/dll/win32/newdev/wizard.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?… Modified: trunk/reactos/dll/win32/newdev/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/stubs.c?r… Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?…

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