Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 55756: [USBHUB] - Check if the request is for a valid PDO
by janderwald＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: janderwald Date: Mon Feb 20 15:54:19 2012 New Revision: 55756 URL: http://svn.reactos.org/svn/reactos?rev=55756&view=rev Log: [USBHUB] - Check if the request is for a valid PDO Modified: trunk/reactos/drivers/usb/usbhub/pdo.c Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Mon Feb 20 15:54:19 2012 @@ -123,6 +123,33 @@ return STATUS_PENDING; } +BOOLEAN +IsValidPDO( + IN PDEVICE_OBJECT DeviceObject) +{ + ULONG Index; + PHUB_DEVICE_EXTENSION HubDeviceExtension; + PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; + + + ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(ChildDeviceExtension->Common.IsFDO == FALSE); + HubDeviceExtension = (PHUB_DEVICE_EXTENSION)ChildDeviceExtension->ParentDeviceObject->DeviceExtension; + + for(Index = 0; Index < USB_MAXCHILDREN; Index++) + { + if (HubDeviceExtension->ChildDeviceObject[Index] == DeviceObject) + { + /* PDO exists */ + return TRUE; + } + } + + /* invalid pdo */ + return FALSE; +} + + NTSTATUS USBHUB_PdoHandleInternalDeviceControl( IN PDEVICE_OBJECT DeviceObject, @@ -153,6 +180,15 @@ ASSERT(ChildDeviceExtension->Common.IsFDO == FALSE); HubDeviceExtension = (PHUB_DEVICE_EXTENSION)ChildDeviceExtension->ParentDeviceObject->DeviceExtension; RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; + + if(!IsValidPDO(DeviceObject)) + { + DPRINT1("[USBHUB] Request for removed device object %p\n", DeviceObject); + Irp->IoStatus.Status = STATUS_DEVICE_NOT_CONNECTED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_DEVICE_NOT_CONNECTED; + } switch (Stack->Parameters.DeviceIoControl.IoControlCode) {

1 0

[gadamopoulos] 55755: [win32k] - Do not store the PDEVOBJ and a fake name in MONITOR struct. Use MONITOR.HDEV instead (which is an opaque pointer to a PDEVOBJ)
by gadamopoulos＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: gadamopoulos Date: Mon Feb 20 13:23:32 2012 New Revision: 55755 URL: http://svn.reactos.org/svn/reactos?rev=55755&view=rev Log: [win32k] - Do not store the PDEVOBJ and a fake name in MONITOR struct. Use MONITOR.HDEV instead (which is an opaque pointer to a PDEVOBJ) Modified: trunk/reactos/subsystems/win32/win32k/include/monitor.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/display.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/objects/device.c Modified: trunk/reactos/subsystems/win32/win32k/include/monitor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/monitor.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/monitor.h [iso-8859-1] Mon Feb 20 13:23:32 2012 @@ -21,18 +21,13 @@ SHORT cFullScreen; SHORT cWndStack; HDEV hDev; - - // ReactOS specific fields: - UNICODE_STRING DeviceName; /* Name of the monitor */ - PDEVOBJ *GdiDevice; /* Pointer to the GDI device to - which this monitor is attached */ } MONITOR, *PMONITOR; -NTSTATUS IntAttachMonitor(PDEVOBJ *pGdiDevice, ULONG DisplayNumber); -NTSTATUS IntDetachMonitor(PDEVOBJ *pGdiDevice); -NTSTATUS IntUpdateMonitorSize(IN PDEVOBJ *pGdiDevice); -PMONITOR FASTCALL UserGetMonitorObject(IN HMONITOR); -PMONITOR FASTCALL IntGetPrimaryMonitor(VOID); -PMONITOR FASTCALL IntMonitorFromRect(PRECTL,DWORD); +NTSTATUS NTAPI UserAttachMonitor(IN HDEV hDev); +NTSTATUS NTAPI UserDetachMonitor(HDEV hDev); +NTSTATUS NTAPI UserUpdateMonitorSize(IN HDEV hDev); +PMONITOR NTAPI UserGetMonitorObject(IN HMONITOR); +PMONITOR NTAPI UserGetPrimaryMonitor(VOID); +PMONITOR NTAPI UserMonitorFromRect(PRECTL,DWORD); /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Mon Feb 20 13:23:32 2012 @@ -565,9 +565,8 @@ } else { - HDEV hDev; - hDev = (HDEV)pPrimarySurface; - DesktopHDC = IntGdiCreateDisplayDC(hDev, DcType, EmptyDC); + PMONITOR pMonitor = UserGetPrimaryMonitor(); + DesktopHDC = IntGdiCreateDisplayDC(pMonitor->hDev, DcType, EmptyDC); } return DesktopHDC; @@ -860,7 +859,7 @@ /* * Try to open already existing desktop */ - + TRACE("Trying to open desktop (%wZ)\n", &DesktopName); Status = ObOpenObjectByName( Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Mon Feb 20 13:23:32 2012 @@ -779,7 +779,7 @@ //IntvGetDeviceCaps(&PrimarySurface, &GdiHandleTable->DevCaps); /* Set new size of the monitor */ - IntUpdateMonitorSize(ppdev); + UserUpdateMonitorSize((HDEV)ppdev); /* Remove all cursor clipping */ UserClipCursor(NULL); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Mon Feb 20 13:23:32 2012 @@ -49,9 +49,6 @@ void IntDestroyMonitorObject(IN PMONITOR pMonitor) { - /* Free monitor name */ - RtlFreeUnicodeString(&pMonitor->DeviceName); - /* Remove monitor region */ if (pMonitor->hrgnMonitor) { @@ -73,7 +70,7 @@ * hMonitor * Handle of MONITOR object */ -PMONITOR FASTCALL +PMONITOR NTAPI UserGetMonitorObject(IN HMONITOR hMonitor) { PMONITOR pMonitor; @@ -94,16 +91,15 @@ return pMonitor; } -/* IntGetPrimaryMonitor +/* UserGetPrimaryMonitor * * Returns a PMONITOR for the primary monitor * * Return value * PMONITOR */ -PMONITOR -FASTCALL -IntGetPrimaryMonitor() +PMONITOR NTAPI +UserGetPrimaryMonitor() { PMONITOR pMonitor; @@ -117,7 +113,7 @@ return pMonitor; } -/* IntAttachMonitor +/* UserAttachMonitor * * Creates a new MONITOR and appends it to the list of monitors. * @@ -129,12 +125,10 @@ * Return value * Returns a NTSTATUS */ -NTSTATUS -IntAttachMonitor(IN PDEVOBJ *pGdiDevice, - IN ULONG DisplayNumber) +NTSTATUS NTAPI +UserAttachMonitor(IN HDEV hDev) { PMONITOR pMonitor; - WCHAR Buffer[CCHDEVICENAME]; TRACE("Attaching monitor...\n"); @@ -145,17 +139,8 @@ TRACE("Couldnt create monitor object\n"); return STATUS_INSUFFICIENT_RESOURCES; } - - _snwprintf(Buffer, CCHDEVICENAME, L"\\\\.\\DISPLAY%d", DisplayNumber + 1); - if (!RtlCreateUnicodeString(&pMonitor->DeviceName, Buffer)) - { - TRACE("Couldn't duplicate monitor name!\n"); - UserDereferenceObject(pMonitor); - UserDeleteObject(UserHMGetHandle(pMonitor), otMonitor); - return STATUS_INSUFFICIENT_RESOURCES; - } - - pMonitor->GdiDevice = pGdiDevice; + + pMonitor->hDev = hDev; pMonitor->cWndStack = 0; if (gMonitorList == NULL) @@ -174,12 +159,12 @@ pmonLast->pMonitorNext = pMonitor; } - IntUpdateMonitorSize(pGdiDevice); + UserUpdateMonitorSize(hDev); return STATUS_SUCCESS; } -/* IntDetachMonitor +/* UserDetachMonitor * * Deletes a MONITOR and removes it from the list of monitors. * @@ -190,15 +175,15 @@ * Return value * Returns a NTSTATUS */ -NTSTATUS -IntDetachMonitor(IN PDEVOBJ *pGdiDevice) +NTSTATUS NTAPI +UserDetachMonitor(IN HDEV hDev) { PMONITOR pMonitor = gMonitorList, *pLink = &gMonitorList; /* Find monitor attached to given device */ while (pMonitor != NULL) { - if (pMonitor->GdiDevice == pGdiDevice) + if (pMonitor->hDev == hDev) break; pLink = &pMonitor->pMonitorNext; @@ -224,7 +209,7 @@ return STATUS_SUCCESS; } -/* IntUpdateMonitorSize +/* UserUpdateMonitorSize * * Reset size of the monitor using atached device * @@ -236,15 +221,16 @@ * Return value * Returns a NTSTATUS */ -NTSTATUS -IntUpdateMonitorSize(IN PDEVOBJ *pGdiDevice) +NTSTATUS NTAPI +UserUpdateMonitorSize(IN HDEV hDev) { PMONITOR pMonitor; + SIZEL DeviceSize; /* Find monitor attached to given device */ for (pMonitor = gMonitorList; pMonitor != NULL; pMonitor = pMonitor->pMonitorNext) { - if (pMonitor->GdiDevice == pGdiDevice) + if (pMonitor->hDev == hDev) break; } @@ -253,12 +239,15 @@ /* No monitor has been found */ return STATUS_INVALID_PARAMETER; } + + /* Get the size of the hdev */ + PDEVOBJ_sizl((PPDEVOBJ)hDev, &DeviceSize); /* Update monitor size */ pMonitor->rcMonitor.left = 0; pMonitor->rcMonitor.top = 0; - pMonitor->rcMonitor.right = pMonitor->rcMonitor.left + pMonitor->GdiDevice->gdiinfo.ulHorzRes; - pMonitor->rcMonitor.bottom = pMonitor->rcMonitor.top + pMonitor->GdiDevice->gdiinfo.ulVertRes; + pMonitor->rcMonitor.right = pMonitor->rcMonitor.left + DeviceSize.cx; + pMonitor->rcMonitor.bottom = pMonitor->rcMonitor.top + DeviceSize.cy; pMonitor->rcWork = pMonitor->rcMonitor; /* Destroy monitor region... */ @@ -403,9 +392,8 @@ return cMonitors; } -PMONITOR -FASTCALL -IntMonitorFromRect( +PMONITOR NTAPI +UserMonitorFromRect( PRECTL pRect, DWORD dwFlags) { @@ -703,6 +691,7 @@ MONITORINFOEXW MonitorInfo; NTSTATUS Status; BOOL bRet = FALSE; + PWCHAR pwstrDeviceName; TRACE("Enter NtUserGetMonitorInfo\n"); UserEnterShared(); @@ -721,6 +710,8 @@ SetLastNtError(STATUS_INVALID_PARAMETER); goto cleanup; } + + pwstrDeviceName = ((PPDEVOBJ)(pMonitor->hDev))->pGraphicsDevice->szWinDeviceName; /* Get size of pMonitorInfoUnsafe */ Status = MmCopyFromCaller(&MonitorInfo.cbSize, &pMonitorInfoUnsafe->cbSize, sizeof(MonitorInfo.cbSize)); @@ -750,8 +741,8 @@ { RtlStringCbCopyNExW(MonitorInfo.szDevice, sizeof(MonitorInfo.szDevice), - pMonitor->DeviceName.Buffer, - pMonitor->DeviceName.Length, + pwstrDeviceName, + (wcslen(pwstrDeviceName)+1) * sizeof(WCHAR), NULL, NULL, STRSAFE_FILL_BEHIND_NULL); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Mon Feb 20 13:23:32 2012 @@ -947,7 +947,7 @@ case SPI_GETWORKAREA: { - PMONITOR pmonitor = IntGetPrimaryMonitor(); + PMONITOR pmonitor = UserGetPrimaryMonitor(); if(!pmonitor) return 0; @@ -959,7 +959,7 @@ { /* FIXME: We should set the work area of the monitor that contains the specified rectangle */ - PMONITOR pmonitor = IntGetPrimaryMonitor(); + PMONITOR pmonitor = UserGetPrimaryMonitor(); RECT rcWorkArea; if(!pmonitor) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Feb 20 13:23:32 2012 @@ -1463,7 +1463,7 @@ PMONITOR pMonitor; PRTL_USER_PROCESS_PARAMETERS ProcessParams; - pMonitor = IntGetPrimaryMonitor(); + pMonitor = UserGetPrimaryMonitor(); /* Check if we don't have a monitor attached yet */ if(pMonitor == NULL) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Mon Feb 20 13:23:32 2012 @@ -323,7 +323,7 @@ else { RECTL WorkArea; - PMONITOR pmonitor = IntMonitorFromRect(&Rect, MONITOR_DEFAULTTOPRIMARY ); + PMONITOR pmonitor = UserMonitorFromRect(&Rect, MONITOR_DEFAULTTOPRIMARY ); // FIXME: support DPI aware, rcWorkDPI/Real etc.. if (!(Wnd->style & WS_MAXIMIZEBOX) || (Wnd->state & WNDS_HASCAPTION) || pmonitor->cFullScreen) @@ -389,7 +389,7 @@ if ( Wnd->spwndParent == Wnd->head.rpdesk->pDeskInfo->spwnd && !(Wnd->ExStyle & WS_EX_TOOLWINDOW)) { - PMONITOR pmonitor = IntMonitorFromRect(&lpwndpl->rcNormalPosition, MONITOR_DEFAULTTOPRIMARY ); + PMONITOR pmonitor = UserMonitorFromRect(&lpwndpl->rcNormalPosition, MONITOR_DEFAULTTOPRIMARY ); // FIXME: support DPI aware, rcWorkDPI/Real etc.. if (Wnd->InternalPos.flags & WPF_MININIT) @@ -414,7 +414,7 @@ /* make sure the specified rect is visible on screen */ static void make_rect_onscreen( RECT *rect ) { - PMONITOR pmonitor = IntMonitorFromRect( rect, MONITOR_DEFAULTTONEAREST ); // Wine uses this. + PMONITOR pmonitor = UserMonitorFromRect( rect, MONITOR_DEFAULTTONEAREST ); // Wine uses this. // FIXME: support DPI aware, rcWorkDPI/Real etc.. if (!pmonitor) return; @@ -744,7 +744,7 @@ co_IntSendMessage(Window->head.h, WM_GETMINMAXINFO, 0, (LPARAM)&MinMax); /* if the app didn't change the values, adapt them for the current monitor */ - if ((monitor = IntGetPrimaryMonitor())) + if ((monitor = UserGetPrimaryMonitor())) { RECT rc_work; Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Mon Feb 20 13:23:32 2012 @@ -30,16 +30,9 @@ { SIZEL SurfSize; SURFOBJ *pso; - BOOL calledFromUser; - - calledFromUser = UserIsEntered(); // FIXME: Possibly upgrade a shared lock - if (!calledFromUser) - { - UserEnterExclusive(); - } /* Attach monitor */ - IntAttachMonitor(gppdevPrimary, 0); + UserAttachMonitor((HDEV)gppdevPrimary); DPRINT("IntCreatePrimarySurface, pPrimarySurface=%p, pPrimarySurface->pSurface = %p\n", pPrimarySurface, pPrimarySurface->pSurface); @@ -56,11 +49,6 @@ // Init Primary Displays Device Capabilities. PDEVOBJ_vGetDeviceCaps(pPrimarySurface, &GdiHandleTable->DevCaps); - - if (!calledFromUser) - { - UserLeave(); - } return TRUE; }

1 0

[khornicek] 55754: missed this one, sorry
by khornicek＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: khornicek Date: Mon Feb 20 12:21:43 2012 New Revision: 55754 URL: http://svn.reactos.org/svn/reactos?rev=55754&view=rev Log: missed this one, sorry Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.rc… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] Mon Feb 20 12:21:43 2012 @@ -31,7 +31,7 @@ #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" -#include "lang/pt-PT.rc" +#include "lang/pt-BR.rc" #include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/Sr.rc"

1 0

[khornicek] 55753: [TRANSLATION] Rename pt-pt to match the pt-br sublang.
by khornicek＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: khornicek Date: Mon Feb 20 12:20:42 2012 New Revision: 55753 URL: http://svn.reactos.org/svn/reactos?rev=55753&view=rev Log: [TRANSLATION] Rename pt-pt to match the pt-br sublang. Added: trunk/reactos/dll/cpl/inetcpl/lang/pt-BR.rc - copied unchanged from r55043, trunk/reactos/dll/cpl/inetcpl/lang/pt-PT.rc Removed: trunk/reactos/dll/cpl/inetcpl/lang/pt-PT.rc Removed: trunk/reactos/dll/cpl/inetcpl/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/pt-PT… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/pt-PT.rc (removed) @@ -1,76 +1,0 @@ -/* - * Portuguese resources for the Internet control panel applet - * - * Copyright 2010 Gustavo Henrique MilarÃ© - * - * 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 St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "inetcpl.h" - -#pragma code_page(65001) - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - -/* "General" propsheet */ -IDD_GENERAL DIALOG 0, 0, 320, 220 -STYLE WS_CAPTION | WS_CHILD | WS_DISABLED -FONT 8, "MS Shell Dlg" -CAPTION "Geral" -BEGIN - - GROUPBOX " PÃ¡gina inicial ", IDC_STATIC, 4, 4, 312, 52 - LTEXT "Escolha o endereÃ§o que serÃ¡ usado como pÃ¡gina inicial.", - IDC_STATIC, 58, 10, 252, 10 - EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL - PUSHBUTTON "PÃ¡gina &atual", IDC_HOME_CURRENT, 58, 36, 80, 14 - PUSHBUTTON "PÃ¡gina &padrÃ£o", IDC_HOME_DEFAULT, 144, 36, 80, 14 - PUSHBUTTON "PÃ¡gina em &branco", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", - IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 - -END - -/* "Content" propsheet */ -IDD_CONTENT DIALOG 0, 0, 320, 220 -STYLE WS_CAPTION | WS_CHILD | WS_DISABLED -FONT 8, "MS Shell Dlg" -CAPTION "ConteÃºdo" -BEGIN - - GROUPBOX " Certificados ", IDC_STATIC, 4, 4, 312, 50 - LTEXT "Certificados sÃ£o usados para sua identificaÃ§Ã£o pessoal e para identificar certificados de autoridades e editores.", - IDC_STATIC, 58, 14, 252, 18 - PUSHBUTTON "Certificados...", IDC_CERT, 146, 34, 80, 14 - PUSHBUTTON "Editores...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 - -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_CPL_NAME "Internet Settings" - IDS_CPL_INFO "Configure Wine Internet Browser and related settings" - IDS_SEC_SETTINGS "Security settings for zone: " - IDS_SEC_LEVEL0 "Custom" - IDS_SEC_LEVEL1 "Very Low" - IDS_SEC_LEVEL2 "Low" - IDS_SEC_LEVEL3 "Medium" - IDS_SEC_LEVEL4 "Increased" - IDS_SEC_LEVEL5 "High" -END

1 0

[cgutman] 55752: [KBDCLASS][MOUCLASS] - Demote an assertion into a warning
by cgutman＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: cgutman Date: Mon Feb 20 12:08:35 2012 New Revision: 55752 URL: http://svn.reactos.org/svn/reactos?rev=55752&view=rev Log: [KBDCLASS][MOUCLASS] - Demote an assertion into a warning Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Mon Feb 20 12:08:35 2012 @@ -749,8 +749,7 @@ } else { - /* Hm, this shouldn't happen */ - ASSERT(FALSE); + DPRINT1("Cancelled IRP is not pending. Race condition?\n"); } } Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] Mon Feb 20 12:08:35 2012 @@ -725,8 +725,7 @@ } else { - /* Hm, this shouldn't happen */ - ASSERT(FALSE); + DPRINT1("Cancelled IRP is not pending. Race condition?\n"); } }

1 0

[cgutman] 55751: [KBDCLASS] - Kill the rest of the input stack hack of doom
by cgutman＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: cgutman Date: Mon Feb 20 11:47:46 2012 New Revision: 55751 URL: http://svn.reactos.org/svn/reactos?rev=55751&view=rev Log: [KBDCLASS] - Kill the rest of the input stack hack of doom Removed: trunk/reactos/drivers/input/kbdclass/setup.c Modified: trunk/reactos/drivers/input/kbdclass/CMakeLists.txt trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/kbdclass/kbdclass.h trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild Modified: trunk/reactos/drivers/input/kbdclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/CMa… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] Mon Feb 20 11:47:46 2012 @@ -2,7 +2,6 @@ add_library(kbdclass SHARED kbdclass.c misc.c - setup.c kbdclass.rc) set_module_type(kbdclass kernelmodedriver) Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Mon Feb 20 11:47:46 2012 @@ -1009,10 +1009,6 @@ /* FIXME: Log the error */ WARN_(CLASS_NAME, "ClassAddDevice() failed with status 0x%08lx\n", Status); } - - /* A special hack for 1st stage setup: manually send start device to i8042prt */ - if (IsFirstStageSetup()) - Send8042StartDevice(DriverObject, PortDeviceObject); } cleanup: Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.h [iso-8859-1] Mon Feb 20 11:47:46 2012 @@ -81,13 +81,3 @@ IN ULONG Flags, IN PCUNICODE_STRING SourceString, OUT PUNICODE_STRING DestinationString); - -/* setup.c */ -BOOLEAN -IsFirstStageSetup( - VOID); - -VOID NTAPI -Send8042StartDevice( - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT Pdo); Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] Mon Feb 20 11:47:46 2012 @@ -7,7 +7,6 @@ <library>hal</library> <file>kbdclass.c</file> <file>misc.c</file> - <file>setup.c</file> <file>kbdclass.rc</file> <pch>kbdclass.h</pch> </module> Removed: trunk/reactos/drivers/input/kbdclass/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/set… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/setup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/setup.c (removed) @@ -1,161 +1,0 @@ -/* - * PROJECT: ReactOS Keyboard class driver - * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/input/kbdclass/setup.c - * PURPOSE: Create a legacy PDO during ReactOS installation - * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) - */ - -/* NOTE: - * All this file is a big hack and should be removed one day... - */ - -/* INCLUDES ******************************************************************/ - -#include "kbdclass.h" - -/* GLOBALS *******************************************************************/ - -#define KEYBOARD_DATA_PORT 0x60 -#define KEYBOARD_CONTROL_PORT 0x64 -#define KEYBOARD_IRQ 1 - -/* FUNCTIONS *****************************************************************/ - -BOOLEAN -IsFirstStageSetup( - VOID) -{ - UNICODE_STRING PathU = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\Setup"); - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hSetupKey = (HANDLE)NULL; - NTSTATUS Status; - BOOLEAN ret = TRUE; - - InitializeObjectAttributes(&ObjectAttributes, &PathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwOpenKey(&hSetupKey, KEY_QUERY_VALUE, &ObjectAttributes); - - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - ret = TRUE; - else - ret = FALSE; - - if (hSetupKey != (HANDLE)NULL) - ZwClose(hSetupKey); - INFO_(CLASS_NAME, "IsFirstStageSetup() returns %s\n", ret ? "YES" : "NO"); - return ret; -} - -VOID NTAPI -Send8042StartDevice( - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT Pdo) -{ - PCM_RESOURCE_LIST AllocatedResources = NULL; - PCM_RESOURCE_LIST AllocatedResourcesTranslated = NULL; - PDEVICE_OBJECT TopDeviceObject = NULL; - KEVENT Event; - IO_STATUS_BLOCK IoStatusBlock; - PIRP Irp; - PIO_STACK_LOCATION Stack; - ULONG ResourceListSize; - NTSTATUS Status; - - TRACE_(CLASS_NAME, "SendStartDevice(%p)\n", Pdo); - - /* Create default resource list */ - ResourceListSize = sizeof(CM_RESOURCE_LIST) + 3 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - AllocatedResources = ExAllocatePoolWithTag(PagedPool, ResourceListSize, CLASS_TAG); - if (!AllocatedResources) - { - WARN_(CLASS_NAME, "ExAllocatePoolWithTag() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - AllocatedResources->Count = 1; - AllocatedResources->List[0].PartialResourceList.Version = 1; - AllocatedResources->List[0].PartialResourceList.Revision = 1; - AllocatedResources->List[0].PartialResourceList.Count = 3; - /* Data port */ - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].Type = CmResourceTypePort; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].ShareDisposition = CmResourceShareDeviceExclusive; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].Flags = 0; /* FIXME */ - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].u.Port.Start.u.HighPart = 0; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].u.Port.Start.u.LowPart = KEYBOARD_DATA_PORT; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].u.Port.Length = 1; - /* Control port */ - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].Type = CmResourceTypePort; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].ShareDisposition = CmResourceShareDeviceExclusive; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].Flags = 0; /* FIXME */ - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].u.Port.Start.u.HighPart = 0; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].u.Port.Start.u.LowPart = KEYBOARD_CONTROL_PORT; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].u.Port.Length = 1; - /* Interrupt */ - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].Type = CmResourceTypeInterrupt; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].ShareDisposition = CmResourceShareDeviceExclusive; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].Flags = CM_RESOURCE_INTERRUPT_LATCHED; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Level = KEYBOARD_IRQ; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Vector = 0; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Affinity = (KAFFINITY)-1; - - /* Create default resource list translated */ - AllocatedResourcesTranslated = ExAllocatePoolWithTag(PagedPool, ResourceListSize, CLASS_TAG); - if (!AllocatedResourcesTranslated) - { - WARN_(CLASS_NAME, "ExAllocatePoolWithTag() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - RtlCopyMemory(AllocatedResourcesTranslated, AllocatedResources, ResourceListSize); - AllocatedResourcesTranslated->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Vector = HalGetInterruptVector( - Internal, 0, - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Level, - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Vector, - (PKIRQL)&AllocatedResourcesTranslated->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Level, - &AllocatedResourcesTranslated->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Affinity); - - /* Send IRP_MN_START_DEVICE */ - TopDeviceObject = IoGetAttachedDeviceReference(Pdo); - KeInitializeEvent( - &Event, - NotificationEvent, - FALSE); - Irp = IoBuildSynchronousFsdRequest( - IRP_MJ_PNP, - TopDeviceObject, - NULL, - 0, - NULL, - &Event, - &IoStatusBlock); - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - Stack = IoGetNextIrpStackLocation(Irp); - Stack->MinorFunction = IRP_MN_START_DEVICE; - Stack->Parameters.StartDevice.AllocatedResources = AllocatedResources; - Stack->Parameters.StartDevice.AllocatedResourcesTranslated = AllocatedResourcesTranslated; - Status = IoCallDriver(TopDeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject( - &Event, - Executive, - KernelMode, - FALSE, - NULL); - Status = IoStatusBlock.Status; - } - if (!NT_SUCCESS(Status)) - { - WARN_(CLASS_NAME, "IoCallDriver() failed with status 0x%08lx\n", Status); - goto cleanup; - } - -cleanup: - if (TopDeviceObject) - ObDereferenceObject(TopDeviceObject); - if (AllocatedResources) - ExFreePoolWithTag(AllocatedResources, CLASS_TAG); - if (AllocatedResourcesTranslated) - ExFreePoolWithTag(AllocatedResourcesTranslated, CLASS_TAG); -}

1 0

[gadamopoulos] 55749: [win32k] - There is no need to cache the current window station in SystemParametersInfo. Query it directly when needed
by gadamopoulos＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: gadamopoulos Date: Mon Feb 20 11:35:14 2012 New Revision: 55749 URL: http://svn.reactos.org/svn/reactos?rev=55749&view=rev Log: [win32k] - There is no need to cache the current window station in SystemParametersInfo. Query it directly when needed Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Mon Feb 20 11:35:14 2012 @@ -16,7 +16,6 @@ SPIVALUES gspv; BOOL gbSpiInitialized = FALSE; -PWINSTATION_OBJECT gpwinstaCurrent = NULL; BOOL g_PaintDesktopVersion = FALSE; // HACK! We initialize SPI before we have a proper surface to get this from. @@ -26,7 +25,7 @@ #define METRIC2REG(met) (-((((met) * 1440)- 0) / dpi)) #define REQ_INTERACTIVE_WINSTA(err) \ - if (gpwinstaCurrent != InputWindowStation) \ + if ( GetW32ProcessInfo()->prpwinsta != InputWindowStation) \ { \ ERR("NtUserSystemParametersInfo requires interactive window station\n"); \ EngSetLastError(err); \ @@ -592,6 +591,7 @@ HBITMAP hbmp, hOldBitmap; SURFACE *psurfBmp; ULONG ulTile, ulStyle; + PWINSTATION_OBJECT gpwinstaCurrent = GetW32ProcessInfo()->prpwinsta; REQ_INTERACTIVE_WINSTA(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION); @@ -1541,6 +1541,9 @@ UINT fWinIni) { ULONG_PTR ulResult; + PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); + + ASSERT(ppi); if (!gbSpiInitialized) { @@ -1550,9 +1553,7 @@ } /* Get a pointer to the current Windowstation */ - gpwinstaCurrent = IntGetWinStaObj(); - - if (!gpwinstaCurrent) + if (!ppi->prpwinsta) { ERR("UserSystemParametersInfo called without active windowstation.\n"); //ASSERT(FALSE); @@ -1584,14 +1585,7 @@ } ulResult = 1; } - - /* Dereference the windowstation */ - if (gpwinstaCurrent) - { - ObDereferenceObject(gpwinstaCurrent); - gpwinstaCurrent = NULL; - } - + return ulResult; }

1 0

[cgutman] 55748: - Fix copy paste error
by cgutman＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: cgutman Date: Mon Feb 20 11:33:11 2012 New Revision: 55748 URL: http://svn.reactos.org/svn/reactos?rev=55748&view=rev Log: - Fix copy paste error Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] Mon Feb 20 11:33:11 2012 @@ -467,25 +467,6 @@ if (NT_SUCCESS(Status)) NtClose(TreeHandle); } - /* Open the root key now */ - RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET\\ENUM"); - Status = IopOpenRegistryKeyEx(&EnumHandle, - NULL, - &KeyName, - KEY_ALL_ACCESS); - if (NT_SUCCESS(Status)) - { - /* Create the root dev node */ - RtlInitUnicodeString(&KeyName, REGSTR_VAL_ROOT_DEVNODE); - Status = IopCreateRegistryKeyEx(&TreeHandle, - EnumHandle, - &KeyName, - KEY_ALL_ACCESS, - REG_OPTION_NON_VOLATILE, - NULL); - NtClose(EnumHandle); - if (NT_SUCCESS(Status)) NtClose(TreeHandle); - } /* Create the root driver */ Status = IoCreateDriver(NULL, PnpRootDriverEntry); if (!NT_SUCCESS(Status))

1 0

[cgutman] 55747: [NTOSKRNL] - Create the DeviceClasses key necessary for device interfaces to be registered successfully in 1st stage - This may not be the correct place to do this so anyone is fre...
by cgutman＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: cgutman Date: Mon Feb 20 11:30:51 2012 New Revision: 55747 URL: http://svn.reactos.org/svn/reactos?rev=55747&view=rev Log: [NTOSKRNL] - Create the DeviceClasses key necessary for device interfaces to be registered successfully in 1st stage - This may not be the correct place to do this so anyone is free to move it Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] Mon Feb 20 11:30:51 2012 @@ -362,7 +362,7 @@ { NTSTATUS Status; ULONG Disposition; - HANDLE KeyHandle, EnumHandle, ParentHandle, TreeHandle; + HANDLE KeyHandle, EnumHandle, ParentHandle, TreeHandle, ControlHandle; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET"); PDEVICE_OBJECT Pdo; @@ -386,7 +386,37 @@ &KeyName, KEY_ALL_ACCESS); if (!NT_SUCCESS(Status)) return Status; - + + /* Create the control key */ + RtlInitUnicodeString(&KeyName, L"Control"); + Status = IopCreateRegistryKeyEx(&ControlHandle, + KeyHandle, + &KeyName, + KEY_ALL_ACCESS, + REG_OPTION_NON_VOLATILE, + &Disposition); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if it's a new key */ + if (Disposition == REG_CREATED_NEW_KEY) + { + HANDLE DeviceClassesHandle; + + /* Create the device classes key */ + RtlInitUnicodeString(&KeyName, L"DeviceClasses"); + Status = IopCreateRegistryKeyEx(&DeviceClassesHandle, + ControlHandle, + &KeyName, + KEY_ALL_ACCESS, + REG_OPTION_NON_VOLATILE, + &Disposition); + if (!NT_SUCCESS(Status)) return Status; + + ZwClose(DeviceClassesHandle); + } + + ZwClose(ControlHandle); + /* Create the enum key */ RtlInitUnicodeString(&KeyName, REGSTR_KEY_ENUM); Status = IopCreateRegistryKeyEx(&EnumHandle, @@ -436,7 +466,26 @@ NtClose(EnumHandle); if (NT_SUCCESS(Status)) NtClose(TreeHandle); } - + + /* Open the root key now */ + RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET\\ENUM"); + Status = IopOpenRegistryKeyEx(&EnumHandle, + NULL, + &KeyName, + KEY_ALL_ACCESS); + if (NT_SUCCESS(Status)) + { + /* Create the root dev node */ + RtlInitUnicodeString(&KeyName, REGSTR_VAL_ROOT_DEVNODE); + Status = IopCreateRegistryKeyEx(&TreeHandle, + EnumHandle, + &KeyName, + KEY_ALL_ACCESS, + REG_OPTION_NON_VOLATILE, + NULL); + NtClose(EnumHandle); + if (NT_SUCCESS(Status)) NtClose(TreeHandle); + } /* Create the root driver */ Status = IoCreateDriver(NULL, PnpRootDriverEntry); if (!NT_SUCCESS(Status))

1 0

[gadamopoulos] 55746: [win32k] - Create defaultDCstate when the first dc is created not when the first dce is created - Fix build
by gadamopoulos＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: gadamopoulos Date: Mon Feb 20 10:58:55 2012 New Revision: 55746 URL: http://svn.reactos.org/svn/reactos?rev=55746&view=rev Log: [win32k] - Create defaultDCstate when the first dc is created not when the first dce is created - Fix build Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dce.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dce.h [iso-8859-1] Mon Feb 20 10:58:55 2012 @@ -41,6 +41,7 @@ #define DCX_NORECOMPUTE 0x00100000 #define DCX_INDESTROY 0x00400000 +INIT_FUNCTION NTSTATUS NTAPI InitDCEImpl(VOID); PDCE FASTCALL DceAllocDCE(PWND Window, DCE_TYPE Type); HWND FASTCALL IntWindowFromDC(HDC hDc); PDCE FASTCALL DceFreeDCE(PDCE dce, BOOLEAN Force); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Mon Feb 20 10:58:55 2012 @@ -24,34 +24,26 @@ /* FUNCTIONS *****************************************************************/ +INIT_FUNCTION +NTSTATUS +NTAPI +InitDCEImpl(VOID) +{ + InitializeListHead(&LEDce); + return STATUS_SUCCESS; +} + // // This should be moved to dc.c or dcutil.c. // HDC FASTCALL DceCreateDisplayDC(VOID) { - HDC hDC; - UNICODE_STRING DriverName; - RtlInitUnicodeString(&DriverName, L"DISPLAY"); - hDC = IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); + UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"DISPLAY"); co_IntGraphicsCheck(TRUE); -// -// If NULL, first time through! Build the default window dc! -// - if (hDC && !defaultDCstate) // Ultra HAX! Dedicated to GvG! - { // This is a cheesy way to do this. - PDC dc = DC_LockDc ( hDC ); - ASSERT(dc); - defaultDCstate = ExAllocatePoolWithTag(PagedPool, sizeof(DC), TAG_DC); - RtlZeroMemory(defaultDCstate, sizeof(DC)); - defaultDCstate->pdcattr = &defaultDCstate->dcattr; - DC_vCopyState(dc, defaultDCstate, TRUE); - DC_UnlockDc( dc ); - InitializeListHead(&LEDce); - } - return hDC; + return IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); } static Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Mon Feb 20 10:58:55 2012 @@ -347,6 +347,13 @@ pdc->dcattr.iCS_CP = 0; pdc->pSurfInfo = NULL; + if (defaultDCstate == NULL) + { + defaultDCstate = ExAllocatePoolWithTag(PagedPool, sizeof(DC), TAG_DC); + RtlZeroMemory(defaultDCstate, sizeof(DC)); + defaultDCstate->pdcattr = &defaultDCstate->dcattr; + DC_vCopyState(pdc, defaultDCstate, TRUE); + } } BOOL

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