Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[tkreuzer] 48368: [NTOS] Move more code out of the platform specific file.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jul 29 21:09:04 2010 New Revision: 48368 URL: http://svn.reactos.org/svn/reactos?rev=48368&view=rev Log: [NTOS] Move more code out of the platform specific file. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Thu Jul 29 21:09:04 2010 @@ -150,8 +150,6 @@ PMMPTE StartPde, EndPde, PointerPte, LastPte; MMPTE TempPde, TempPte; PVOID NonPagedPoolExpansionVa; - ULONG OldCount; - KIRQL OldIrql; /* Check for global bit */ #if 0 @@ -329,6 +327,12 @@ MmNonPagedPoolExpansionStart = NonPagedPoolExpansionVa; // + // Sanity check: make sure we have properly defined the system PTE space + // + ASSERT(MiAddressToPte(MmNonPagedSystemStart) < + MiAddressToPte(MmNonPagedPoolExpansionStart)); + + // // Last step is to actually map the nonpaged pool // PointerPte = MiAddressToPte(MmNonPagedPoolStart); @@ -344,83 +348,30 @@ } // - // Sanity check: make sure we have properly defined the system PTE space - // - ASSERT(MiAddressToPte(MmNonPagedSystemStart) < - MiAddressToPte(MmNonPagedPoolExpansionStart)); - - /* Now go ahead and initialize the nonpaged pool */ - MiInitializeNonPagedPool(); - MiInitializeNonPagedPoolThresholds(); - - /* Build the PFN Database */ - MiInitializePfnDatabase(LoaderBlock); - MmInitializeBalancer(MmAvailablePages, 0); - - // - // Initialize the nonpaged pool - // - InitializePool(NonPagedPool, 0); - - // // We PDE-aligned the nonpaged system start VA, so haul some extra PTEs! // PointerPte = MiAddressToPte(MmNonPagedSystemStart); - OldCount = MmNumberOfSystemPtes; MmNumberOfSystemPtes = MiAddressToPte(MmNonPagedPoolExpansionStart) - PointerPte; MmNumberOfSystemPtes--; DPRINT("Final System PTE count: %d (%d bytes)\n", MmNumberOfSystemPtes, MmNumberOfSystemPtes * PAGE_SIZE); - // - // Create the system PTE space - // - MiInitializeSystemPtes(PointerPte, MmNumberOfSystemPtes, SystemPteSpace); - /* Get the PDE For hyperspace */ StartPde = MiAddressToPde(HYPER_SPACE); - /* Lock PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - /* Allocate a page for hyperspace and create it */ - PageFrameIndex = MiRemoveAnyPage(0); - TempPde.u.Hard.PageFrameNumber = PageFrameIndex; + TempPde.u.Hard.PageFrameNumber = MiEarlyAllocPages(1); TempPde.u.Hard.Global = FALSE; // Hyperspace is local! MI_WRITE_VALID_PTE(StartPde, TempPde); /* Flush the TLB */ KeFlushCurrentTb(); - /* Release the lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - - // - // Zero out the page table now - // + /* Zero out the page table now */ PointerPte = MiAddressToPte(HYPER_SPACE); RtlZeroMemory(PointerPte, PAGE_SIZE); - - // - // Setup the mapping PTEs - // - MmFirstReservedMappingPte = MiAddressToPte(MI_MAPPING_RANGE_START); - MmLastReservedMappingPte = MiAddressToPte(MI_MAPPING_RANGE_END); - MmFirstReservedMappingPte->u.Hard.PageFrameNumber = MI_HYPERSPACE_PTES; - - // - // Reserve system PTEs for zeroing PTEs and clear them - // - MiFirstReservedZeroingPte = MiReserveSystemPtes(MI_ZERO_PTES, - SystemPteSpace); - RtlZeroMemory(MiFirstReservedZeroingPte, MI_ZERO_PTES * sizeof(MMPTE)); - - // - // Set the counter to maximum to boot with - // - MiFirstReservedZeroingPte->u.Hard.PageFrameNumber = MI_ZERO_PTES - 1; - + return STATUS_SUCCESS; } Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Thu Jul 29 21:09:04 2010 @@ -1887,7 +1887,36 @@ /* Initialize the platform-specific parts */ MiInitMachineDependent(LoaderBlock); - + + /* Now go ahead and initialize the nonpaged pool */ + MiInitializeNonPagedPool(); + MiInitializeNonPagedPoolThresholds(); + + /* Build the PFN Database */ + MiInitializePfnDatabase(LoaderBlock); + MmInitializeBalancer(MmAvailablePages, 0); + + /* Initialize the nonpaged pool */ + InitializePool(NonPagedPool, 0); + + /* Create the system PTE space */ + MiInitializeSystemPtes(MiAddressToPte(MmNonPagedSystemStart), + MmNumberOfSystemPtes, + SystemPteSpace); + + /* Setup the mapping PTEs */ + MmFirstReservedMappingPte = MiAddressToPte(MI_MAPPING_RANGE_START); + MmLastReservedMappingPte = MiAddressToPte(MI_MAPPING_RANGE_END); + MmFirstReservedMappingPte->u.Hard.PageFrameNumber = MI_HYPERSPACE_PTES; + + /* Reserve system PTEs for zeroing PTEs and clear them */ + MiFirstReservedZeroingPte = MiReserveSystemPtes(MI_ZERO_PTES, + SystemPteSpace); + RtlZeroMemory(MiFirstReservedZeroingPte, MI_ZERO_PTES * sizeof(MMPTE)); + + /* Set the counter to maximum to boot with */ + MiFirstReservedZeroingPte->u.Hard.PageFrameNumber = MI_ZERO_PTES - 1; + // // Sync us up with ReactOS Mm //

14 years, 1 month

[ilardig] 48367: [TASKMGR] - Make the caption the same as the app title so that bring to focus can work as expected in Slovak and other languages as well. Add a note for translators. See issue #5533 for more details.

by ilardig＠svn.reactos.org

Author: ilardig Date: Thu Jul 29 20:17:09 2010 New Revision: 48367 URL: http://svn.reactos.org/svn/reactos?rev=48367&view=rev Log: [TASKMGR] - Make the caption the same as the app title so that bring to focus can work as expected in Slovak and other languages as well. Add a note for translators. See issue #5533 for more details. Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc trunk/reactos/base/applications/taskmgr/lang/da-DK.rc trunk/reactos/base/applications/taskmgr/lang/de-DE.rc trunk/reactos/base/applications/taskmgr/lang/el-GR.rc trunk/reactos/base/applications/taskmgr/lang/es-ES.rc trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc trunk/reactos/base/applications/taskmgr/lang/id-ID.rc trunk/reactos/base/applications/taskmgr/lang/it-IT.rc trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc trunk/reactos/base/applications/taskmgr/lang/no-NO.rc trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -160,6 +160,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -160,6 +160,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/taskmgr/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -159,6 +159,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/taskmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -160,6 +160,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/taskmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/el-GR.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -160,6 +160,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/taskmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -45,67 +45,54 @@ END MENUITEM SEPARATOR - MENUITEM "Iconos &Grandes", ID_VIEW_LARGE - MENUITEM "Iconos &Pequeños", ID_VIEW_SMALL - MENUITEM "&Detalles", ID_VIEW_DETAILS, -CHECKED - MENUITEM "&Seleccionar Columnas...", -ID_VIEW_SELECTCOLUMNS + MENUITEM "Iconos &Grandes", ID_VIEW_LARGE + MENUITEM "Iconos &Pequeños", ID_VIEW_SMALL + MENUITEM "&Detalles", ID_VIEW_DETAILS, CHECKED + MENUITEM "&Seleccionar Columnas...", ID_VIEW_SELECTCOLUMNS POPUP "Historial de la &CPU" BEGIN - MENUITEM "&Una Gráfica, Todas las CPUs", -ID_VIEW_CPUHISTORY_ONEGRAPHALL - - MENUITEM "Una Gráfica, &Por CPU", -ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU - , CHECKED + MENUITEM "&Una Gráfica, Todas las CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL + + MENUITEM "Una Gráfica, &Por CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Mostrar tiempos del Núcleo", -ID_VIEW_SHOWKERNELTIMES + MENUITEM "&Mostrar tiempos del Núcleo", ID_VIEW_SHOWKERNELTIMES END POPUP "&Ventanas" BEGIN - MENUITEM "Mosaico &Horizontal", -ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "Mosaico &Vertical", -ID_WINDOWS_TILEVERTICALLY - MENUITEM "&Minimizar", ID_WINDOWS_MINIMIZE - MENUITEM "Ma&ximizar", ID_WINDOWS_MAXIMIZE - MENUITEM "&Cascada", ID_WINDOWS_CASCADE - MENUITEM "&Traer al Frente", -ID_WINDOWS_BRINGTOFRONT + MENUITEM "Mosaico &Horizontal", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Mosaico &Vertical", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Minimizar", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ximizar", ID_WINDOWS_MAXIMIZE + MENUITEM "&Cascada", ID_WINDOWS_CASCADE + MENUITEM "&Traer al Frente", ID_WINDOWS_BRINGTOFRONT END POPUP "A&yuda" BEGIN - MENUITEM "&Temas de Ayuda del Administrador de Tareas", -ID_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "&Acerca del Administrador de Tareas", -ID_HELP_ABOUT + MENUITEM "&Temas de Ayuda del Administrador de Tareas", ID_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&Acerca del Administrador de Tareas", ID_HELP_ABOUT END END IDR_WINDOWSMENU MENU DISCARDABLE BEGIN - MENUITEM "Mosaico &Horizontal", -ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "Mosaico &Vertical", ID_WINDOWS_TILEVERTICALLY - MENUITEM "&Minimizar", ID_WINDOWS_MINIMIZE - MENUITEM "Ma&ximizar", ID_WINDOWS_MAXIMIZE + MENUITEM "Mosaico &Horizontal", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Mosaico &Vertical", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Minimizar", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ximizar", ID_WINDOWS_MAXIMIZE MENUITEM "&Cascada", ID_WINDOWS_CASCADE - MENUITEM "&Traer al Frente", ID_WINDOWS_BRINGTOFRONT + MENUITEM "&Traer al Frente", ID_WINDOWS_BRINGTOFRONT END IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE BEGIN POPUP "DUMMY" BEGIN - MENUITEM "&Nueva Tarea (Ejecutar...)", ID_FILE_NEW - MENUITEM SEPARATOR - MENUITEM "Iconos &Grandes", ID_VIEW_LARGE - MENUITEM "Iconos &Pequeños", ID_VIEW_SMALL - MENUITEM "&Detalles", ID_VIEW_DETAILS, -CHECKED + MENUITEM "&Nueva Tarea (Ejecutar...)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "Iconos &Grandes", ID_VIEW_LARGE + MENUITEM "Iconos &Pequeños", ID_VIEW_SMALL + MENUITEM "&Detalles", ID_VIEW_DETAILS, CHECKED END END @@ -113,21 +100,17 @@ BEGIN POPUP "DUMMY" BEGIN - MENUITEM "&Cambiar A", -ID_APPLICATION_PAGE_SWITCHTO - MENUITEM "&Traer al Frente", -ID_WINDOWS_BRINGTOFRONT - MENUITEM SEPARATOR - MENUITEM "Mosaico &Horizontal", -ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "Mosaico &Vertical", -ID_WINDOWS_TILEVERTICALLY - MENUITEM "&Minimizar", ID_WINDOWS_MINIMIZE - MENUITEM "Ma&ximizar", ID_WINDOWS_MAXIMIZE - MENUITEM "Ca&scada", ID_WINDOWS_CASCADE - MENUITEM SEPARATOR - MENUITEM "&Finalizar Tarea", ID_APPLICATION_PAGE_ENDTASK - MENUITEM "&Ir al Proceso", ID_APPLICATION_PAGE_GOTOPROCESS + MENUITEM "&Cambiar A", ID_APPLICATION_PAGE_SWITCHTO + MENUITEM "&Traer al Frente", ID_WINDOWS_BRINGTOFRONT + MENUITEM SEPARATOR + MENUITEM "Mosaico &Horizontal", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Mosaico &Vertical", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Minimizar", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ximizar", ID_WINDOWS_MAXIMIZE + MENUITEM "Ca&scada", ID_WINDOWS_CASCADE + MENUITEM SEPARATOR + MENUITEM "&Finalizar Tarea", ID_APPLICATION_PAGE_ENDTASK + MENUITEM "&Ir al Proceso", ID_APPLICATION_PAGE_GOTOPROCESS END END @@ -136,10 +119,10 @@ BEGIN POPUP "DUMMY" BEGIN - MENUITEM "&Restaurar", ID_RESTORE - MENUITEM "&Cerrar", ID_FILE_EXIT - MENUITEM SEPARATOR - MENUITEM "&Siempre Visible", ID_OPTIONS_ALWAYSONTOP + MENUITEM "&Restaurar", ID_RESTORE + MENUITEM "&Cerrar", ID_FILE_EXIT + MENUITEM SEPARATOR + MENUITEM "&Siempre Visible", ID_OPTIONS_ALWAYSONTOP END END @@ -147,27 +130,27 @@ BEGIN POPUP "DUMMY" BEGIN - MENUITEM "&Finalizar Proceso", ID_PROCESS_PAGE_ENDPROCESS - MENUITEM "Finalizar &Árbol de Procesos", ID_PROCESS_PAGE_ENDPROCESSTREE + MENUITEM "&Finalizar Proceso", ID_PROCESS_PAGE_ENDPROCESS + MENUITEM "Finalizar &Árbol de Procesos", ID_PROCESS_PAGE_ENDPROCESSTREE MENUITEM "&Depurador", ID_PROCESS_PAGE_DEBUG MENUITEM SEPARATOR POPUP "Establecer &Prioridad" BEGIN - MENUITEM "Tiempo-&Real", ID_PROCESS_PAGE_SETPRIORITY_REALTIME + MENUITEM "Tiempo-&Real", ID_PROCESS_PAGE_SETPRIORITY_REALTIME MENUITEM "&Alta", ID_PROCESS_PAGE_SETPRIORITY_HIGH - MENUITEM "Arr&iba de lo Normal", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + MENUITEM "Arr&iba de lo Normal", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL MENUITEM "&Normal", ID_PROCESS_PAGE_SETPRIORITY_NORMAL - MENUITEM "&Debajo de lo Normal", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL - - MENUITEM "&Baja", ID_PROCESS_PAGE_SETPRIORITY_LOW + MENUITEM "&Debajo de lo Normal", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + + MENUITEM "&Baja", ID_PROCESS_PAGE_SETPRIORITY_LOW END - MENUITEM "Establecer &Afinidad...", ID_PROCESS_PAGE_SETAFFINITY + MENUITEM "Establecer &Afinidad...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM "Editar &Canales de Depuración...", ID_PROCESS_PAGE_DEBUGCHANNELS END END @@ -177,6 +160,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | @@ -186,8 +170,7 @@ MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL -"Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END IDD_APPLICATION_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 @@ -195,8 +178,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | - LVS_SHOWSELALWAYS | WS_BORDER | -WS_TABSTOP,7,7,233,177 + LVS_SHOWSELALWAYS | WS_BORDER |WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Nueva Tarea...",IDC_NEWTASK,187,189,53,14 PUSHBUTTON "&Cambiar A",IDC_SWITCHTO,131,189,53,14,WS_DISABLED PUSHBUTTON "&Finalizar Tarea",IDC_ENDTASK,75,189,53,14,WS_DISABLED @@ -206,8 +188,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT -| + CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Finalizar Proceso",IDC_ENDPROCESS,171,189,69,14 @@ -251,8 +232,7 @@ ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT -IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Total",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 LTEXT "Paginado",IDS_KERNEL_MEMORY_PAGED,137,184,30,8 @@ -265,10 +245,8 @@ ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Historial de uso de la CPU",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT GROUPBOX "Historial de uso de la Memoria",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT - PUSHBUTTON "Display de uso de la CPU",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP, - WS_EX_CLIENTEDGE - PUSHBUTTON "Display de uso de la Memoria",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP, - WS_EX_CLIENTEDGE + PUSHBUTTON "Display de uso de la CPU",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "Display de uso de la Memoria",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE PUSHBUTTON "Historial de uso de la CPU",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, 153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE PUSHBUTTON "Historial de uso de la Memoria",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, @@ -281,8 +259,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | -WS_TABSTOP | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING,7,7,233,177 PUSHBUTTON "Cerrar",IDOK,171,189,69,14 END @@ -389,8 +366,7 @@ WS_TABSTOP,7,105,80,10 //53 CONTROL "O&bjetos de USUARIO",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,116,80,10 //62 - CONTROL "Lecturas E/S",IDC_IOREADS,"Button",BS_AUTOCHECKBOX -| + CONTROL "Lecturas E/S",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,127,60,10 //49 CONTROL "Bytes E/S Leidos",IDC_IOREADBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 @@ -610,7 +586,6 @@ ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Establece el proceso en prioridad ABAJO DE LO NORMAL" ID_PROCESS_PAGE_SETPRIORITY_LOW "Establece el proceso en prioridad BAJA" - END // Spanish (SPAIN) resources by Carlos Garcia Gomez Modified: trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -160,6 +160,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -161,6 +161,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/taskmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/id-ID.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -159,6 +159,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/taskmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/it-IT.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -160,6 +160,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -160,6 +160,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -163,6 +163,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -160,6 +160,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/taskmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/no-NO.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -160,12 +160,13 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "Oppgavebehandler" +CAPTION "Oppgavebehandling" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -165,6 +165,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -160,6 +160,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -160,6 +160,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | @@ -520,8 +521,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_APP_TITLE "Gestionar de activitÄÈi" - IDC_TASKMGR "Gestoinar de activitÄÈi" + IDS_APP_TITLE "Gestionarul de activitÄÈi" + IDC_TASKMGR "Gestionarul de activitÄÈi" IDS_IDLE_PROCESS "Proces sistem inactiv" END Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -159,6 +159,7 @@ // // Äèàëîãè // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -159,6 +159,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | @@ -521,8 +522,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_APP_TITLE "Správca úloh" - IDC_TASKMGR "Správca úloh" + IDS_APP_TITLE "Správca úloh systému" + IDC_TASKMGR "Správca úloh systému" IDS_IDLE_PROCESS "Procesy systémovej neèinnosti" END Modified: trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -177,6 +177,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -160,6 +160,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] Thu Jul 29 20:17:09 2010 @@ -168,6 +168,7 @@ // // Dialog // +// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

14 years, 1 month

[tkreuzer] 48366: [NTOS] The MADs from the bootloader should already know whether a page is in use or not. So it's not useful to scan the entire pagetable for mapped pfns to keep them out of the free list. Free descriptors should not be in use and if they are mapped, they should rather be unmapped than arbitrarily assuming a KSEG0 mapping later. This allows us to shuffle the order in which the PFN database is created: The MADs are parsed first, doing it in one loop with mapping the database in M

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jul 29 19:03:57 2010 New Revision: 48366 URL: http://svn.reactos.org/svn/reactos?rev=48366&view=rev Log: [NTOS] The MADs from the bootloader should already know whether a page is in use or not. So it's not useful to scan the entire pagetable for mapped pfns to keep them out of the free list. Free descriptors should not be in use and if they are mapped, they should rather be unmapped than arbitrarily assuming a KSEG0 mapping later. This allows us to shuffle the order in which the PFN database is created: The MADs are parsed first, doing it in one loop with mapping the database in MiMapPfnDatabase. Only handling the free descriptor, which is in use while running this loop, will be delayed until after the loop. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Thu Jul 29 19:03:57 2010 @@ -1,4 +1,4 @@ -/* +ï»¿/* * PROJECT: ReactOS Kernel * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/mm/ARM3/mminit.c @@ -669,28 +669,29 @@ NTAPI MiMapPfnDatabase(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - ULONG BasePage, PageCount; + ULONG BasePage, PageCount, PageFrameIndex; PLIST_ENTRY NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; PMMPTE PointerPte, LastPte; MMPTE TempPte = ValidKernelPte; - + PMMPFN Pfn1; + KIRQL OldIrql; + + /* Lock the PFN Database */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + /* Loop the memory descriptors */ - NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) + for (NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; + NextEntry != &LoaderBlock->MemoryDescriptorListHead; + NextEntry = MdBlock->ListEntry.Flink) { /* Get the descriptor */ MdBlock = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - if ((MdBlock->MemoryType == LoaderFirmwarePermanent) || - (MdBlock->MemoryType == LoaderBBTMemory) || - (MdBlock->MemoryType == LoaderSpecialMemory)) - { - /* These pages are not part of the PFN database */ - NextEntry = MdBlock->ListEntry.Flink; - continue; - } + + /* Skip descriptors that are not part of the database */ + if (!MiIsMemoryTypeInDatabase(MdBlock->MemoryType)) continue; /* Use the descriptor's numbers */ BasePage = MdBlock->BasePage; @@ -721,9 +722,95 @@ PointerPte++; } + /* Skip the free descriptor, we'll handle it later */ + if (MdBlock == MxFreeDescriptor) continue; + + if (MdBlock->MemoryType == LoaderBad) + { + DPRINT1("You have damaged RAM modules. Stopping boot\n"); + ASSERT(FALSE); + } + + /* Now check the descriptor type */ + if (MiIsMemoryTypeFree(MdBlock->MemoryType)) + { + /* Get the last page of this descriptor. Note we loop backwards */ + PageFrameIndex = MdBlock->BasePage + PageCount - 1; + Pfn1 = MiGetPfnEntry(PageFrameIndex); + + /* */ + while (PageCount--) + { + /* Add it to the free list */ + Pfn1->u3.e1.CacheAttribute = MiNonCached; + MiInsertPageInFreeList(PageFrameIndex); + + /* Go to the next page */ + Pfn1--; + PageFrameIndex--; + } + } + else if (MdBlock->MemoryType == LoaderXIPRom) + { + Pfn1 = MiGetPfnEntry(MdBlock->BasePage); + while (PageCount--) + { + /* Make it a pseudo-I/O ROM mapping */ + Pfn1->PteAddress = 0; + Pfn1->u1.Flink = 0; + Pfn1->u2.ShareCount = 0; + Pfn1->u3.e1.PageLocation = 0; + Pfn1->u3.e1.CacheAttribute = MiNonCached; + Pfn1->u3.e1.Rom = 1; + Pfn1->u3.e1.PrototypePte = 1; + Pfn1->u3.e2.ReferenceCount = 0; + Pfn1->u4.InPageError = 0; + Pfn1->u4.PteFrame = 0; + + /* Advance page structures */ + Pfn1++; + } + } + else + { + Pfn1 = MiGetPfnEntry(MdBlock->BasePage); + while (PageCount--) + { + /* Mark it as being in-use */ + Pfn1->u4.PteFrame = 0; + Pfn1->PteAddress = 0; + Pfn1->u2.ShareCount++; + Pfn1->u3.e2.ReferenceCount = 1; + Pfn1->u3.e1.PageLocation = ActiveAndValid; + Pfn1->u3.e1.CacheAttribute = MiNonCached; + + /* Advance page structures */ + Pfn1++; + } + } + /* Do the next address range */ NextEntry = MdBlock->ListEntry.Flink; } + + /* Now handle the remaininng pages from the free descriptor */ + PageFrameIndex = MiEarlyAllocBase + MiEarlyAllocCount - 1; + Pfn1 = MiGetPfnEntry(PageFrameIndex); + PageCount = MiEarlyAllocCount; + + while (PageCount--) + { + /* Add it to the free list */ + Pfn1->u3.e1.CacheAttribute = MiNonCached; + MiInsertPageInFreeList(PageFrameIndex); + + /* Go to the next page */ + Pfn1--; + PageFrameIndex--; + } + + /* Release PFN database */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } VOID @@ -850,129 +937,6 @@ VOID NTAPI -MiBuildPfnDatabaseFromLoaderBlock(IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PLIST_ENTRY NextEntry; - PFN_NUMBER PageCount = 0; - PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; - PFN_NUMBER PageFrameIndex; - PMMPFN Pfn1; - PMMPTE PointerPte; - PMMPDE PointerPde; - KIRQL OldIrql; - - /* Now loop through the descriptors */ - NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) - { - /* Get the current descriptor */ - MdBlock = CONTAINING_RECORD(NextEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - - /* Read its data */ - PageCount = MdBlock->PageCount; - PageFrameIndex = MdBlock->BasePage; - - /* Now check the descriptor type */ - switch (MdBlock->MemoryType) - { - /* Check for bad RAM */ - case LoaderBad: - - DPRINT1("You have damaged RAM modules. Stopping boot\n"); - while (TRUE); - break; - - /* Check for free RAM */ - case LoaderFree: - case LoaderLoadedProgram: - case LoaderFirmwareTemporary: - case LoaderOsloaderStack: - - /* Get the last page of this descriptor. Note we loop backwards */ - PageFrameIndex += PageCount - 1; - Pfn1 = MiGetPfnEntry(PageFrameIndex); - - /* Lock the PFN Database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - while (PageCount--) - { - /* If the page really has no references, mark it as free */ - if (!Pfn1->u3.e2.ReferenceCount) - { - /* Add it to the free list */ - Pfn1->u3.e1.CacheAttribute = MiNonCached; - MiInsertPageInFreeList(PageFrameIndex); - } - - /* Go to the next page */ - Pfn1--; - PageFrameIndex--; - } - - /* Release PFN database */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - - /* Done with this block */ - break; - - /* Check for pages that are invisible to us */ - case LoaderFirmwarePermanent: - case LoaderSpecialMemory: - case LoaderBBTMemory: - - /* And skip them */ - break; - - default: - - /* Map these pages with the KSEG0 mapping that adds 0x80000000 */ - PointerPte = MiAddressToPte(KSEG0_BASE + (PageFrameIndex << PAGE_SHIFT)); - Pfn1 = MiGetPfnEntry(PageFrameIndex); - while (PageCount--) - { - /* Check if the page is really unused */ - PointerPde = MiAddressToPde(KSEG0_BASE + (PageFrameIndex << PAGE_SHIFT)); - if (!Pfn1->u3.e2.ReferenceCount) - { - /* Mark it as being in-use */ - Pfn1->u4.PteFrame = PFN_FROM_PTE(PointerPde); - Pfn1->PteAddress = PointerPte; - Pfn1->u2.ShareCount++; - Pfn1->u3.e2.ReferenceCount = 1; - Pfn1->u3.e1.PageLocation = ActiveAndValid; - Pfn1->u3.e1.CacheAttribute = MiNonCached; - - /* Check for RAM disk page */ - if (MdBlock->MemoryType == LoaderXIPRom) - { - /* Make it a pseudo-I/O ROM mapping */ - Pfn1->u1.Flink = 0; - Pfn1->u2.ShareCount = 0; - Pfn1->u3.e2.ReferenceCount = 0; - Pfn1->u3.e1.PageLocation = 0; - Pfn1->u3.e1.Rom = 1; - Pfn1->u4.InPageError = 0; - Pfn1->u3.e1.PrototypePte = 1; - } - } - - /* Advance page structures */ - Pfn1++; - PageFrameIndex++; - PointerPte++; - } - break; - } - - /* Next descriptor entry */ - NextEntry = MdBlock->ListEntry.Flink; - } -} - -VOID -NTAPI MiBuildPfnDatabaseSelf(VOID) { PMMPTE PointerPte, LastPte; @@ -1007,22 +971,12 @@ /* Initialize the color tables */ MiInitializeColorTables(); - /* Hide the pages, that we already used from the descriptor */ - MxFreeDescriptor->BasePage = MiEarlyAllocBase; - MxFreeDescriptor->PageCount = MiEarlyAllocCount; - /* Scan memory and start setting up PFN entries */ MiBuildPfnDatabaseFromPages(LoaderBlock); /* Add the zero page */ MiBuildPfnDatabaseZeroPage(); - /* Scan the loader block and build the rest of the PFN database */ - MiBuildPfnDatabaseFromLoaderBlock(LoaderBlock); - - /* Reset the descriptor back so we can create the correct memory blocks */ - *MxFreeDescriptor = MxOldFreeDescriptor; - /* Finally add the pages for the PFN database itself */ MiBuildPfnDatabaseSelf(); }

14 years, 1 month

[dreimer] 48365: Problem fixed thx to the Great Omnipotent Jaykul from #powershell

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jul 29 18:08:54 2010 New Revision: 48365 URL: http://svn.reactos.org/svn/reactos?rev=48365&view=rev Log: Problem fixed thx to the Great Omnipotent Jaykul from #powershell Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/CBuild.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/CBuild.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/CBuild.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/CBuild.ps1 [iso-8859-1] Thu Jul 29 18:08:54 2010 @@ -43,7 +43,7 @@ } cd build -&{IEX "&'cmake.exe' -G ""MinGW Makefiles"" ..\"} +&{IEX "&'cmake.exe' -G 'MinGW Makefiles' ..\"} if ($_ROSBE_WRITELOG -eq 1) { &{IEX "&'mingw32-make.exe' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file1 @@ -59,7 +59,7 @@ } cd build-ros -&{IEX "&'cmake.exe' -G ""MinGW Makefiles"" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake ..\"} +&{IEX "&'cmake.exe' -G 'MinGW Makefiles' '-DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake' ..\"} if ($_ROSBE_WRITELOG -eq 1) { &{IEX "&'mingw32-make.exe' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file2

14 years, 1 month

[jgardou] 48364: [WIN32K] - rewrite UserLoadImage so that it uses information from the BITMAPFILEHEADER and probes the right buffer.

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Jul 29 18:01:14 2010 New Revision: 48364 URL: http://svn.reactos.org/svn/reactos?rev=48364&view=rev Log: [WIN32K] - rewrite UserLoadImage so that it uses information from the BITMAPFILEHEADER and probes the right buffer. Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h [iso-8859-1] Thu Jul 29 18:01:14 2010 @@ -18,3 +18,6 @@ HPALETTE FASTCALL BuildDIBPalette (CONST BITMAPINFO *bmi, PINT paletteType); + +BITMAPINFO* FASTCALL DIB_ConvertBitmapInfo(CONST BITMAPINFO* bmi, DWORD Usage); +VOID FASTCALL DIB_FreeConvertedBitmapInfo(BITMAPINFO* converted, BITMAPINFO* orig); Modified: branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c [iso-8859-1] Thu Jul 29 18:01:14 2010 @@ -157,14 +157,12 @@ NTAPI UserLoadImage(PCWSTR pwszName) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; HANDLE hFile, hSection; BITMAPFILEHEADER *pbmfh; LPBITMAPINFO pbmi; - ULONG cjInfoSize; PVOID pvBits; HBITMAP hbmp = 0; - BITMAPV5INFO bmiLocal; DPRINT("Enter UserLoadImage(%ls)\n", pwszName); @@ -194,40 +192,58 @@ /* Get a pointer to the BITMAPINFO */ pbmi = (LPBITMAPINFO)(pbmfh + 1); - /* Create a normalized local BITMAPINFO */ - _SEH2_TRY - { - Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, - pbmi, - DIB_RGB_COLORS, - 0); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - - if (NT_SUCCESS(Status)) - { - cjInfoSize = bmiLocal.bmiHeader.bV5Size + - bmiLocal.bmiHeader.bV5ClrUsed * sizeof(RGBQUAD); - pvBits = (PVOID)((PCHAR)pbmi + cjInfoSize); + _SEH2_TRY + { + ProbeForRead(&pbmfh->bfSize, sizeof(DWORD), 1); + ProbeForRead(pbmfh, pbmfh->bfSize, 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + if(!NT_SUCCESS(Status)) + { + DPRINT1("Bad File?\n"); + goto leave; + } + + if (pbmfh->bfType == 0x4D42 /* 'BM' */) + { + /* Could be BITMAPCOREINFO */ + BITMAPINFO* pConvertedInfo; + + pvBits = (PVOID)((PCHAR)pbmi + pbmfh->bfOffBits); + + pConvertedInfo = DIB_ConvertBitmapInfo(pbmi, DIB_RGB_COLORS); + if(!pConvertedInfo) + { + DPRINT1("Unable to convert the bitmap Info\n"); + goto leave; + } // FIXME: use Gre... so that the BITMAPINFO doesn't get probed hbmp = NtGdiCreateDIBitmapInternal(NULL, - bmiLocal.bmiHeader.bV5Width, - bmiLocal.bmiHeader.bV5Height, + pConvertedInfo->bmiHeader.biWidth, + pConvertedInfo->bmiHeader.biHeight, CBM_INIT, pvBits, pbmi, DIB_RGB_COLORS, - bmiLocal.bmiHeader.bV5Size, - bmiLocal.bmiHeader.bV5SizeImage, + pConvertedInfo->bmiHeader.biSize, + pConvertedInfo->bmiHeader.biSizeImage, 0, 0); - } - + + DIB_FreeConvertedBitmapInfo(pConvertedInfo, pbmi); + } + else + { + DPRINT1("Unknown file type!\n"); + } + +leave: /* Unmap our section, we don't need it anymore */ ZwUnmapViewOfSection(NtCurrentProcess(), pbmfh); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu Jul 29 18:01:14 2010 @@ -674,18 +674,12 @@ /* We need a BITMAPINFO to create a DIB, but we have to fill * the BITMAPCOREINFO we're provided */ pbmci = (BITMAPCOREINFO*)Info; - Info = ExAllocatePoolWithTag(PagedPool, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD), TAG_DIB); + Info = DIB_ConvertBitmapInfo((BITMAPINFO*)pbmci, Usage); if(Info == NULL) { - DPRINT1("Error, could not allocate another BITMAPINFO!\n"); + DPRINT1("Error, could not convert the BITMAPCOREINFO!\n"); return 0; } - RtlZeroMemory(Info, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - Info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - Info->bmiHeader.biBitCount = pbmci->bmciHeader.bcBitCount; - Info->bmiHeader.biPlanes = pbmci->bmciHeader.bcPlanes; - Info->bmiHeader.biWidth = pbmci->bmciHeader.bcWidth; - Info->bmiHeader.biHeight = pbmci->bmciHeader.bcHeight; rgbQuads = Info->bmiColors; } @@ -1050,7 +1044,7 @@ if(pDC) DC_UnlockDc(pDC); if(psurf) SURFACE_UnlockSurface(psurf); - if(pbmci) ExFreePoolWithTag(Info, TAG_DIB); + if(pbmci) DIB_FreeConvertedBitmapInfo(Info, (BITMAPINFO*)pbmci); return ScanLines; } @@ -2077,4 +2071,82 @@ return STATUS_SUCCESS; } +/* Converts a BITMAPCOREINFO to a BITMAPINFO structure, + * or does nothing if it's already a BITMAPINFO (or V4 or V5) */ +BITMAPINFO* +FASTCALL +DIB_ConvertBitmapInfo (CONST BITMAPINFO* pbmi, DWORD Usage) +{ + CONST BITMAPCOREINFO* pbmci = (BITMAPCOREINFO*)pbmi; + BITMAPINFO* pNewBmi ; + UINT numColors = 0, ColorsSize = 0; + + if(pbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) return (BITMAPINFO*)pbmi; + if(pbmi->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) return NULL; + + if(pbmci->bmciHeader.bcBitCount <= 8) + { + numColors = 1 << pbmci->bmciHeader.bcBitCount; + if(Usage == DIB_PAL_COLORS) + { + ColorsSize = numColors * sizeof(WORD); + } + else + { + ColorsSize = numColors * sizeof(RGBQUAD); + } + } + else if (Usage == DIB_PAL_COLORS) + { + /* Invalid at high Res */ + return NULL; + } + + pNewBmi = ExAllocatePoolWithTag(PagedPool, sizeof(BITMAPINFOHEADER) + ColorsSize, TAG_DIB); + if(!pNewBmi) return NULL; + + RtlZeroMemory(pNewBmi, sizeof(BITMAPINFOHEADER) + ColorsSize); + + pNewBmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pNewBmi->bmiHeader.biBitCount = pbmci->bmciHeader.bcBitCount; + pNewBmi->bmiHeader.biWidth = pbmci->bmciHeader.bcWidth; + pNewBmi->bmiHeader.biHeight = pbmci->bmciHeader.bcHeight; + pNewBmi->bmiHeader.biPlanes = pbmci->bmciHeader.bcPlanes; + pNewBmi->bmiHeader.biCompression = BI_RGB ; + pNewBmi->bmiHeader.biSizeImage = DIB_GetDIBImageBytes(pNewBmi->bmiHeader.biWidth, + pNewBmi->bmiHeader.biHeight, + pNewBmi->bmiHeader.biBitCount); + + if(Usage == DIB_PAL_COLORS) + { + RtlCopyMemory(pNewBmi->bmiColors, pbmci->bmciColors, ColorsSize); + } + else + { + UINT i; + for(i=0; i<numColors; i++) + { + pNewBmi->bmiColors[i].rgbRed = pbmci->bmciColors[i].rgbtRed; + pNewBmi->bmiColors[i].rgbGreen = pbmci->bmciColors[i].rgbtGreen; + pNewBmi->bmiColors[i].rgbBlue = pbmci->bmciColors[i].rgbtBlue; + } + } + + return pNewBmi ; +} + +/* Frees a BITMAPINFO created with DIB_ConvertBitmapInfo */ +VOID +FASTCALL +DIB_FreeConvertedBitmapInfo(BITMAPINFO* converted, BITMAPINFO* orig) +{ + if(converted != orig) + ExFreePoolWithTag(converted, TAG_DIB); +} + + + + + + /* EOF */

14 years, 1 month

[dreimer] 48363: Revert moving the cmake build folders into output-%arch% Add PS Version of CMake support which does half the job and then does not find the toolchain-mingw32.cmake because it looks for a toolchain-mingw32 file O_o

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jul 29 17:58:22 2010 New Revision: 48363 URL: http://svn.reactos.org/svn/reactos?rev=48363&view=rev Log: Revert moving the cmake build folders into output-%arch% Add PS Version of CMake support which does half the job and then does not find the toolchain-mingw32.cmake because it looks for a toolchain-mingw32 file O_o Added: trunk/tools/RosBE/RosBE-Windows/Powershell/CBuild.ps1 (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/CMake-Shared.cmd Added: trunk/tools/RosBE/RosBE-Windows/Powershell/CBuild.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/CBuild.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/CBuild.ps1 [iso-8859-1] Thu Jul 29 17:58:22 2010 @@ -1,0 +1,90 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/CBuild.ps1 +# PURPOSE: Perform the CMake build of ReactOS. +# COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> +# + +if ($_ROSBE_WRITELOG -eq 1) { + if (!(Test-Path "$_ROSBE_LOGDIR")) { + New-Item -path "$_ROSBE_LOGDIR" -type directory + } + $file1 = "$_ROSBE_LOGDIR\BuildToolLog-$ENV:ROS_ARCH-$DATENAME-$TIMENAME.txt" + $file2 = "$_ROSBE_LOGDIR\BuildROSLog-$ENV:ROS_ARCH-$DATENAME-$TIMENAME.txt" +} + +# Get the current date and time for use in in our build log's file name. +$TIMERAW = get-date -f t +$DATENAME = get-date -f dMMyyyy +$TIMENAME = get-date -f Hms + +# Check whether we were called as "makex" or "make" +if ("$($args[0])" -eq "multi") { + $args.setvalue($null, 0) + $MAKE_JOBS = "$_ROSBE_MAKEX_JOBS" + $TITLE_COMMAND = "makex $($args)" +} else { + $MAKE_JOBS = 1 + $TITLE_COMMAND = "make $($args)" +} + +$host.ui.RawUI.WindowTitle = "'$TITLE_COMMAND' cmake build started: $TIMERAW ($ENV:ROS_ARCH)" + +# Do the actual building +if ($_ROSBE_SHOWTIME -eq 1) { + [System.Diagnostics.Stopwatch] $sw; + $sw = New-Object System.Diagnostics.StopWatch + $sw.Start() +} + +if (!(Test-Path "build")) { + New-Item -path "build" -type directory + } + +cd build +&{IEX "&'cmake.exe' -G ""MinGW Makefiles"" ..\"} + +if ($_ROSBE_WRITELOG -eq 1) { + &{IEX "&'mingw32-make.exe' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file1 +} else { + &{IEX "&'mingw32-make.exe' -j $MAKE_JOBS $($args)"} $($args) +} + +cd.. +"" + +if (!(Test-Path "build-ros")) { + New-Item -path "build-ros" -type directory + } + +cd build-ros +&{IEX "&'cmake.exe' -G ""MinGW Makefiles"" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake ..\"} + +if ($_ROSBE_WRITELOG -eq 1) { + &{IEX "&'mingw32-make.exe' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file2 +} else { + &{IEX "&'mingw32-make.exe' -j $MAKE_JOBS $($args)"} $($args) +} + +cd.. + +if ($_ROSBE_SHOWTIME -eq 1) { + $sw.Stop() + write-host "Total Build Time:" $sw.Elapsed.ToString() +} + +# Highlight the fact that building has ended. +FlashWindow (ps -id $pid).MainWIndowHandle $true + +$sound = new-Object System.Media.SoundPlayer; + +if ($LASTEXITCODE -ne 0) { + $sound.SoundLocation="$_ROSBE_BASEDIR\samples\error.wav"; +} else { + $sound.SoundLocation="$_ROSBE_BASEDIR\samples\notification.wav"; +} + +$sound.Play(); + +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/CBuild.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Thu Jul 29 17:58:22 2010 @@ -64,10 +64,10 @@ $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH" $global:_BUILDBOT_SVNSKIPMAINTRUNK = "0" -if ("$ENV:_ROSBE_SYSPATH" -eq "1") { +if ("$ENV:_ROSBE_NOSYSPATH" -eq "1") { + $global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:SystemRoot\system32;$ENV:SystemRoot;$ENV:SystemRoot\System32\Wbem;$ENV:SYSTEMROOT\System32\WindowsPowerShell\v1.0\" +} else { $global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:PATH" -} else { - $global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:SystemRoot\system32;$ENV:SystemRoot;$ENV:SystemRoot\System32\Wbem;$ENV:SYSTEMROOT\System32\WindowsPowerShell\v1.0\" } # Fix Bison package path (just in case RosBE is installed in a path which contains spaces) Modified: trunk/tools/RosBE/RosBE-Windows/Root/CMake-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/CMa… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/CMake-Shared.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/CMake-Shared.cmd [iso-8859-1] Thu Jul 29 17:58:22 2010 @@ -18,12 +18,6 @@ ) ) -if not exist "output-%ROS_ARCH%\." ( - mkdir "output-%ROS_ARCH%" 1> NUL 2> NUL -) - -cd "output-%ROS_ARCH%" - :: Get the current date and time for use in in our build log's file name. call "%_ROSBE_BASEDIR%\TimeDate.cmd" @@ -40,19 +34,20 @@ mkdir "build" 1> NUL 2> NUL ) cd build -cmake.exe -G "MinGW Makefiles" ..\..\ +cmake.exe -G "MinGW Makefiles" ..\ if %_ROSBE_WRITELOG% == 1 ( %BUILDTIME_COMMAND% mingw32-make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe "%_ROSBE_LOGDIR%\BuildToolLog-%ROS_ARCH%-%datename%-%timename%.txt" ) else ( %BUILDTIME_COMMAND% mingw32-make.exe -j %MAKE_JOBS% %* ) cd.. +echo. if not exist "build-ros\." ( mkdir "build-ros" 1> NUL 2> NUL ) cd build-ros -cmake.exe -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake ..\..\ +cmake.exe -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake ..\ if %_ROSBE_WRITELOG% == 1 ( %BUILDTIME_COMMAND% mingw32-make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe "%_ROSBE_LOGDIR%\BuildROSLog-%ROS_ARCH%-%datename%-%timename%.txt" ) else ( @@ -60,7 +55,6 @@ ) cd.. -cd.. :EOC :: Highlight the fact that building has ended.

14 years, 1 month

[akhaldi] 48362: [CMAKE] - Prepare for porting base modules. - Add kernel_napi, subsystem_napi and kernel_zw to build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jul 29 16:45:01 2010 New Revision: 48362 URL: http://svn.reactos.org/svn/reactos?rev=48362&view=rev Log: [CMAKE] - Prepare for porting base modules. - Add kernel_napi, subsystem_napi and kernel_zw to build. Added: branches/cmake-bringup/base/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/CMakeLists.txt (with props) branches/cmake-bringup/base/services/CMakeLists.txt (with props) branches/cmake-bringup/base/setup/CMakeLists.txt (with props) branches/cmake-bringup/base/shell/CMakeLists.txt (with props) branches/cmake-bringup/base/system/CMakeLists.txt (with props) Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Thu Jul 29 16:45:01 2010 @@ -68,6 +68,7 @@ add_subdirectory(include/dxsdk) add_subdirectory(include/reactos/mc) +add_subdirectory(base) add_subdirectory(dll) add_subdirectory(lib) @@ -105,6 +106,9 @@ ADD_CUSTOM_TARGET(ntdll_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S) ADD_CUSTOM_TARGET(win32k_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) ADD_CUSTOM_TARGET(ntsys_pspec ALL DEPENDS ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec) +ADD_CUSTOM_TARGET(kernel_napi ALL DEPENDS ${REACTOS_BINARY_DIR}/ntoskrnl/include/internal/napi.h) +ADD_CUSTOM_TARGET(subsystem_napi ALL DEPENDS ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/include/napi.h) +ADD_CUSTOM_TARGET(kernel_zw ALL DEPENDS ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S) endif() Added: branches/cmake-bringup/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/base/CMakeLists.txt (added) +++ branches/cmake-bringup/base/CMakeLists.txt [iso-8859-1] Thu Jul 29 16:45:01 2010 @@ -1,0 +1,6 @@ + +#add_subdirectory(applications) +#add_subdirectory(services) +#add_subdirectory(setup) +#add_subdirectory(shell) +#add_subdirectory(system) Propchange: branches/cmake-bringup/base/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] Thu Jul 29 16:45:01 2010 @@ -1,0 +1,36 @@ + +#add_subdirectory(cacls) +#add_subdirectory(calc) +#add_subdirectory(charmap) +#add_subdirectory(cmdutils) +#add_subdirectory(control) +#add_subdirectory(dxdiag) +#add_subdirectory(extrac32) +#add_subdirectory(fontview) +#add_subdirectory(games) +#add_subdirectory(hh) +#add_subdirectory(iexplore) +#add_subdirectory(kbswitch) +#add_subdirectory(logoff) +#add_subdirectory(magnify) +#add_subdirectory(mmc) +#add_subdirectory(mplay32) +#add_subdirectory(msconfig) +#add_subdirectory(mscutils) +#add_subdirectory(mstsc) +#add_subdirectory(network) +#add_subdirectory(notepad) +#add_subdirectory(paint) +#add_subdirectory(rapps) +#add_subdirectory(regedit) +#add_subdirectory(regedt32) +#add_subdirectory(sc) +#add_subdirectory(screensavers) +#add_subdirectory(shutdown) +#add_subdirectory(sndrec32) +#add_subdirectory(sndvol32) +#add_subdirectory(taskmgr) +#add_subdirectory(winhlp32) +#add_subdirectory(winver) +#add_subdirectory(wordpad) +#add_subdirectory(write) Propchange: branches/cmake-bringup/base/applications/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/CMa… ============================================================================== --- branches/cmake-bringup/base/services/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/CMakeLists.txt [iso-8859-1] Thu Jul 29 16:45:01 2010 @@ -1,0 +1,11 @@ + +#add_subdirectory(audiosrv) +#add_subdirectory(eventlog) +#add_subdirectory(rpcss) +#add_subdirectory(spoolsv) +#add_subdirectory(svchost) +#add_subdirectory(tcpsvcs) +#add_subdirectory(telnetd) +#add_subdirectory(tftpd) +#add_subdirectory(umpnpmgr) +#add_subdirectory(wlansvc) Propchange: branches/cmake-bringup/base/services/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/setup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/CMakeL… ============================================================================== --- branches/cmake-bringup/base/setup/CMakeLists.txt (added) +++ branches/cmake-bringup/base/setup/CMakeLists.txt [iso-8859-1] Thu Jul 29 16:45:01 2010 @@ -1,0 +1,6 @@ + +#add_subdirectory(reactos) +#add_subdirectory(setup) +#add_subdirectory(usetup) +#add_subdirectory(vmwinst) +#add_subdirectory(welcome) Propchange: branches/cmake-bringup/base/setup/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/CMakeL… ============================================================================== --- branches/cmake-bringup/base/shell/CMakeLists.txt (added) +++ branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] Thu Jul 29 16:45:01 2010 @@ -1,0 +1,4 @@ + +#add_subdirectory(cmd) +#add_subdirectory(explorer) +#add_subdirectory(explorer_new) Propchange: branches/cmake-bringup/base/shell/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/system/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/CMake… ============================================================================== --- branches/cmake-bringup/base/system/CMakeLists.txt (added) +++ branches/cmake-bringup/base/system/CMakeLists.txt [iso-8859-1] Thu Jul 29 16:45:01 2010 @@ -1,0 +1,14 @@ + +#add_subdirectory(autochk) +#add_subdirectory(bootok) +#add_subdirectory(expand) +#add_subdirectory(format) +#add_subdirectory(lsass) +#add_subdirectory(msiexec) +#add_subdirectory(regsvr32) +#add_subdirectory(rundll32) +#add_subdirectory(runonce) +#add_subdirectory(services) +#add_subdirectory(smss) +#add_subdirectory(userinit) +#add_subdirectory(winlogon) Propchange: branches/cmake-bringup/base/system/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 1 month

[akhaldi] 48361: [DXSDK] - Define STATIC_KSMETHODSETID_BdaChangeSync without braces. [PSDK] - _ANONYMOUS_UNION/_ANONYMOUS_STRUCT -> __MINGW_EXTENSION - usbuser.h : Add missing #endif

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jul 29 16:42:00 2010 New Revision: 48361 URL: http://svn.reactos.org/svn/reactos?rev=48361&view=rev Log: [DXSDK] - Define STATIC_KSMETHODSETID_BdaChangeSync without braces. [PSDK] - _ANONYMOUS_UNION/_ANONYMOUS_STRUCT -> __MINGW_EXTENSION - usbuser.h : Add missing #endif Modified: trunk/reactos/include/dxsdk/bdamedia.h trunk/reactos/include/psdk/ntddmou.h trunk/reactos/include/psdk/ntddstor.h trunk/reactos/include/psdk/usbuser.h Modified: trunk/reactos/include/dxsdk/bdamedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdamedia.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] Thu Jul 29 16:42:00 2010 @@ -217,7 +217,7 @@ */ #define STATIC_KSMETHODSETID_BdaChangeSync \ - 0xfd0a5af3, 0xb41d, 0x11d2, {0x9c, 0x95, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0} + 0xfd0a5af3, 0xb41d, 0x11d2, 0x9c, 0x95, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 DEFINE_GUIDSTRUCT("FD0A5AF3-B41D-11d2-9C95-00C04F7971E0", KSMETHODSETID_BdaChangeSync); Modified: trunk/reactos/include/psdk/ntddmou.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddmou.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ntddmou.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddmou.h [iso-8859-1] Thu Jul 29 16:42:00 2010 @@ -76,9 +76,9 @@ typedef struct _MOUSE_INPUT_DATA { USHORT UnitId; USHORT Flags; - _ANONYMOUS_UNION union { + __MINGW_EXTENSION union { ULONG Buttons; - _ANONYMOUS_STRUCT struct { + __MINGW_EXTENSION struct { USHORT ButtonFlags; USHORT ButtonData; } DUMMYSTRUCTNAME; Modified: trunk/reactos/include/psdk/ntddstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddstor.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddstor.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddstor.h [iso-8859-1] Thu Jul 29 16:42:00 2010 @@ -628,7 +628,7 @@ typedef struct _PERSISTENT_RESERVE_COMMAND { ULONG Version; ULONG Size; - _ANONYMOUS_UNION union { + __MINGW_EXTENSION union { struct { UCHAR ServiceAction:5; UCHAR Reserved1:3; Modified: trunk/reactos/include/psdk/usbuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/usbuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usbuser.h [iso-8859-1] Thu Jul 29 16:42:00 2010 @@ -342,6 +342,8 @@ #include <poppack.h> +#endif /* _WIN32_WINNT >= 0x0501 */ + #ifdef __cplusplus } #endif

14 years, 1 month

[jgardou] 48360: [WIN32K] - Get rid of GetBMIFromBitmapV5Info

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Jul 29 16:21:02 2010 New Revision: 48360 URL: http://svn.reactos.org/svn/reactos?rev=48360&view=rev Log: [WIN32K] - Get rid of GetBMIFromBitmapV5Info Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Thu Jul 29 16:21:02 2010 @@ -14,7 +14,6 @@ UINT FASTCALL BITMAP_GetRealBitsPixel(UINT nBitsPixel); INT FASTCALL BITMAP_GetWidthBytes (INT bmWidth, INT bpp); NTSTATUS FASTCALL ProbeAndConvertToBitmapV5Info( OUT PBITMAPV5INFO pbmiDst, IN CONST BITMAPINFO* pbmiUnsafe, IN DWORD dwUse, UINT MaxSize); -VOID FASTCALL GetBMIFromBitmapV5Info(IN PBITMAPV5INFO pbmiSrc, OUT PBITMAPINFO pbmiDst, IN DWORD dwUse); HBITMAP APIENTRY Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu Jul 29 16:21:02 2010 @@ -1907,23 +1907,6 @@ return dwRet; } -FORCEINLINE -VOID -SetBMIColor(CONST BITMAPINFO* pbmi, DWORD* color, INT i) -{ - PVOID pvColors = ((PBYTE)pbmi + pbmi->bmiHeader.biSize); - if(pbmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) - { - RGBTRIPLE *pColor = pvColors; - pColor[i] = *(RGBTRIPLE*)color; - } - else - { - RGBQUAD *pColor = pvColors; - pColor[i] = *(RGBQUAD*)color; - } -} - NTSTATUS FASTCALL ProbeAndConvertToBitmapV5Info( @@ -2094,59 +2077,4 @@ return STATUS_SUCCESS; } -VOID -FASTCALL -GetBMIFromBitmapV5Info(IN PBITMAPV5INFO pbmiSrc, - OUT PBITMAPINFO pbmiDst, - IN DWORD dwColorUse) -{ - if(pbmiDst->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) - { - /* Manually set value */ - BITMAPCOREHEADER* pbmhCore = (BITMAPCOREHEADER*)&pbmiDst->bmiHeader; - pbmhCore->bcWidth = pbmiSrc->bmiHeader.bV5Width; - pbmhCore->bcHeight = pbmiSrc->bmiHeader.bV5Height; - pbmhCore->bcPlanes = pbmiSrc->bmiHeader.bV5Planes; - pbmhCore->bcBitCount = pbmiSrc->bmiHeader.bV5BitCount; - } - else - { - /* Copy valid Fields, keep bmiHeader.biSize safe */ - RtlCopyMemory(&pbmiDst->bmiHeader.biWidth, - &pbmiSrc->bmiHeader.bV5Width, - pbmiDst->bmiHeader.biSize - sizeof(DWORD)); - } - if((pbmiDst->bmiHeader.biSize < sizeof(BITMAPV4HEADER)) && - (pbmiSrc->bmiHeader.bV5Compression == BI_BITFIELDS)) - { - /* Masks are already set in V4 and V5 headers */ - SetBMIColor(pbmiDst, &pbmiSrc->bmiHeader.bV5RedMask, 0); - SetBMIColor(pbmiDst, &pbmiSrc->bmiHeader.bV5GreenMask, 1); - SetBMIColor(pbmiDst, &pbmiSrc->bmiHeader.bV5BlueMask, 2); - } - else - { - INT i; - ULONG cColorsUsed; - - cColorsUsed = pbmiSrc->bmiHeader.bV5ClrUsed; - if (cColorsUsed == 0 && pbmiSrc->bmiHeader.bV5BitCount <= 8) - cColorsUsed = (1 << pbmiSrc->bmiHeader.bV5BitCount); - - if(dwColorUse == DIB_PAL_COLORS) - { - RtlCopyMemory(pbmiDst->bmiColors, - pbmiSrc->bmiColors, - cColorsUsed * sizeof(WORD)); - } - else - { - for(i = 0; i < cColorsUsed; i++) - { - SetBMIColor(pbmiDst, (DWORD*)pbmiSrc->bmiColors + i, i); - } - } - } -} - /* EOF */

14 years, 1 month

[jgardou] 48359: [WIN32K] - Rewrite NtGdiGetDIBitsInternal, with WINE as a reference. - Get back DIB Section creation to classic BITMAPINFO. This si the beginnig of the end for all this BITMAPV5INFO stuff. It is horrible, BITMAPCOREINFO->BITMAPINFO is already made in user mode, and V4 and V5 features are not used so often.

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Jul 29 16:12:43 2010 New Revision: 48359 URL: http://svn.reactos.org/svn/reactos?rev=48359&view=rev Log: [WIN32K] - Rewrite NtGdiGetDIBitsInternal, with WINE as a reference. - Get back DIB Section creation to classic BITMAPINFO. This si the beginnig of the end for all this BITMAPV5INFO stuff. It is horrible, BITMAPCOREINFO->BITMAPINFO is already made in user mode, and V4 and V5 features are not used so often. Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h [iso-8859-1] Thu Jul 29 16:12:43 2010 @@ -5,15 +5,16 @@ INT FASTCALL DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse); HBITMAP APIENTRY -DIB_CreateDIBSection (PDC dc, CONST BITMAPV5INFO *bmi, UINT usage, LPVOID *bits, HANDLE section, DWORD offset, DWORD ovr_pitch); -INT APIENTRY -DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, PLONG width, PLONG height, PWORD planes, PWORD bpp, PLONG compr, PLONG size ); +DIB_CreateDIBSection (PDC dc, CONST BITMAPINFO *bmi, UINT usage, LPVOID *bits, HANDLE section, DWORD offset, DWORD ovr_pitch); +int FASTCALL +DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, + LONG *height, WORD *planes, WORD *bpp, DWORD *compr, DWORD *size ); INT APIENTRY DIB_GetDIBImageBytes (INT width, INT height, INT depth); INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth); RGBQUAD * FASTCALL -DIB_MapPaletteColors(PDC dc, CONST BITMAPV5INFO* lpbmi); +DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi); HPALETTE FASTCALL BuildDIBPalette (CONST BITMAPINFO *bmi, PINT paletteType); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Thu Jul 29 16:12:43 2010 @@ -309,30 +309,28 @@ else { /* A DIB section is selected in the DC */ - BITMAPV5INFO bi; + BYTE buf[sizeof(BITMAPINFOHEADER) + 256*sizeof(RGBQUAD)] = {0}; PVOID Bits; - - RtlZeroMemory(&bi.bmiHeader, sizeof(bi.bmiHeader)); - bi.bmiHeader.bV5Size = sizeof(bi.bmiHeader); - bi.bmiHeader.bV5Width = Width; - bi.bmiHeader.bV5Height = Height; - bi.bmiHeader.bV5Planes = dibs.dsBmih.biPlanes; - bi.bmiHeader.bV5BitCount = dibs.dsBmih.biBitCount; - bi.bmiHeader.bV5Compression = dibs.dsBmih.biCompression; - bi.bmiHeader.bV5SizeImage = 0; - bi.bmiHeader.bV5XPelsPerMeter = dibs.dsBmih.biXPelsPerMeter; - bi.bmiHeader.bV5YPelsPerMeter = dibs.dsBmih.biYPelsPerMeter; - bi.bmiHeader.bV5ClrUsed = dibs.dsBmih.biClrUsed; - bi.bmiHeader.bV5ClrImportant = dibs.dsBmih.biClrImportant; - - if (bi.bmiHeader.bV5Compression == BI_BITFIELDS) + BITMAPINFO* bi = (BITMAPINFO*)buf; + + bi->bmiHeader.biSize = sizeof(bi->bmiHeader); + bi->bmiHeader.biWidth = Width; + bi->bmiHeader.biHeight = Height; + bi->bmiHeader.biPlanes = dibs.dsBmih.biPlanes; + bi->bmiHeader.biBitCount = dibs.dsBmih.biBitCount; + bi->bmiHeader.biCompression = dibs.dsBmih.biCompression; + bi->bmiHeader.biSizeImage = 0; + bi->bmiHeader.biXPelsPerMeter = dibs.dsBmih.biXPelsPerMeter; + bi->bmiHeader.biYPelsPerMeter = dibs.dsBmih.biYPelsPerMeter; + bi->bmiHeader.biClrUsed = dibs.dsBmih.biClrUsed; + bi->bmiHeader.biClrImportant = dibs.dsBmih.biClrImportant; + + if (bi->bmiHeader.biCompression == BI_BITFIELDS) { /* Copy the color masks */ - bi.bmiHeader.bV5RedMask = dibs.dsBitfields[0]; - bi.bmiHeader.bV5GreenMask = dibs.dsBitfields[1]; - bi.bmiHeader.bV5BlueMask = dibs.dsBitfields[2]; + RtlCopyMemory(bi->bmiColors, dibs.dsBitfields, 3*sizeof(RGBQUAD)); } - else if (bi.bmiHeader.bV5BitCount <= 8) + else if (bi->bmiHeader.biBitCount <= 8) { /* Copy the color table */ UINT Index; @@ -350,15 +348,15 @@ Index < 256 && Index < PalGDI->NumColors; Index++) { - bi.bmiColors[Index].rgbRed = PalGDI->IndexedColors[Index].peRed; - bi.bmiColors[Index].rgbGreen = PalGDI->IndexedColors[Index].peGreen; - bi.bmiColors[Index].rgbBlue = PalGDI->IndexedColors[Index].peBlue; - bi.bmiColors[Index].rgbReserved = 0; + bi->bmiColors[Index].rgbRed = PalGDI->IndexedColors[Index].peRed; + bi->bmiColors[Index].rgbGreen = PalGDI->IndexedColors[Index].peGreen; + bi->bmiColors[Index].rgbBlue = PalGDI->IndexedColors[Index].peBlue; + bi->bmiColors[Index].rgbReserved = 0; } PALETTE_UnlockPalette(PalGDI); Bmp = DIB_CreateDIBSection(Dc, - &bi, + bi, DIB_RGB_COLORS, &Bits, NULL, Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu Jul 29 16:12:43 2010 @@ -40,6 +40,26 @@ { 0xff, 0x00, 0xff, 0x00 }, { 0xff, 0xff, 0x00, 0x00 }, { 0xff, 0xff, 0xff, 0x00 } +}; + +static const RGBTRIPLE EGAColorsTriples[16] = { +/* rgbBlue, rgbGreen, rgbRed */ + { 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0x80 }, + { 0x00, 0x80, 0x00 }, + { 0x00, 0x80, 0x80 }, + { 0x80, 0x00, 0x00 }, + { 0x80, 0x00, 0x80 }, + { 0x80, 0x80, 0x00 }, + { 0x80, 0x80, 0x80 }, + { 0xc0, 0xc0, 0xc0 }, + { 0x00, 0x00, 0xff }, + { 0x00, 0xff, 0x00 }, + { 0x00, 0xff, 0xff }, + { 0xff, 0x00, 0x00 }, + { 0xff, 0x00, 0xff }, + { 0xff, 0xff, 0x00 }, + { 0xff, 0xff, 0xff } }; static const RGBQUAD DefLogPaletteQuads[20] = { /* Copy of Default Logical Palette */ @@ -64,6 +84,30 @@ { 0xff, 0x00, 0xff, 0x00 }, { 0xff, 0xff, 0x00, 0x00 }, { 0xff, 0xff, 0xff, 0x00 } +}; + +static const RGBQUAD DefLogPaletteTriples[20] = { /* Copy of Default Logical Palette */ +/* rgbBlue, rgbGreen, rgbRed, rgbReserved */ + { 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0x80 }, + { 0x00, 0x80, 0x00 }, + { 0x00, 0x80, 0x80 }, + { 0x80, 0x00, 0x00 }, + { 0x80, 0x00, 0x80 }, + { 0x80, 0x80, 0x00 }, + { 0xc0, 0xc0, 0xc0 }, + { 0xc0, 0xdc, 0xc0 }, + { 0xf0, 0xca, 0xa6 }, + { 0xf0, 0xfb, 0xff }, + { 0xa4, 0xa0, 0xa0 }, + { 0x80, 0x80, 0x80 }, + { 0x00, 0x00, 0xf0 }, + { 0x00, 0xff, 0x00 }, + { 0x00, 0xff, 0xff }, + { 0xff, 0x00, 0x00 }, + { 0xff, 0x00, 0xff }, + { 0xff, 0xff, 0x00 }, + { 0xff, 0xff, 0xff } }; @@ -573,32 +617,29 @@ UINT MaxBits, UINT MaxInfo) { - PDC Dc; - SURFACE *psurf = NULL; - HBITMAP hDestBitmap = NULL; - HPALETTE hDestPalette = NULL; - BITMAPV5INFO bmiLocal ; - PPALETTE ppalDst = NULL; - NTSTATUS Status = STATUS_SUCCESS; - ULONG Result = 0; - BOOL bPaletteMatch = FALSE; - PBYTE ChkBits = Bits; - ULONG DestPaletteType; - ULONG Index; + BITMAPCOREINFO* pbmci = NULL; + PSURFACE psurf = NULL; + PDC pDC; + LONG width, height; + WORD planes, bpp; + DWORD compr, size ; + int i, bitmap_type; + RGBTRIPLE* rgbTriples; + RGBQUAD* rgbQuads; + VOID* colorPtr; + NTSTATUS Status = STATUS_SUCCESS; DPRINT("Entered NtGdiGetDIBitsInternal()\n"); if ((Usage && Usage != DIB_PAL_COLORS) || !Info || !hBitmap) return 0; - // if ScanLines == 0, no need to copy Bits. - if (!ScanLines) - ChkBits = NULL; - _SEH2_TRY { - Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, Info, Usage, MaxInfo); - if (ChkBits) ProbeForWrite(ChkBits, MaxBits, 1); + /* Probe for read and write */ + ProbeForRead(Info, MaxInfo, 1); + ProbeForWrite(Info, MaxInfo, 1); + if (Bits) ProbeForWrite(Bits, MaxBits, 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -611,314 +652,409 @@ return 0; } - Dc = DC_LockDc(hDC); - if (Dc == NULL) return 0; - if (Dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(Dc); - return 0; + colorPtr = (LPBYTE)Info + Info->bmiHeader.biSize; + rgbTriples = colorPtr; + rgbQuads = colorPtr; + + bitmap_type = DIB_GetBitmapInfo(&Info->bmiHeader, + &width, + &height, + &planes, + &bpp, + &compr, + &size); + if(bitmap_type == -1) + { + DPRINT("Wrong bitmap format\n"); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } + else if(bitmap_type == 0) + { + /* We need a BITMAPINFO to create a DIB, but we have to fill + * the BITMAPCOREINFO we're provided */ + pbmci = (BITMAPCOREINFO*)Info; + Info = ExAllocatePoolWithTag(PagedPool, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD), TAG_DIB); + if(Info == NULL) + { + DPRINT1("Error, could not allocate another BITMAPINFO!\n"); + return 0; + } + RtlZeroMemory(Info, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + Info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + Info->bmiHeader.biBitCount = pbmci->bmciHeader.bcBitCount; + Info->bmiHeader.biPlanes = pbmci->bmciHeader.bcPlanes; + Info->bmiHeader.biWidth = pbmci->bmciHeader.bcWidth; + Info->bmiHeader.biHeight = pbmci->bmciHeader.bcHeight; + rgbQuads = Info->bmiColors; + } + + pDC = DC_LockDc(hDC); + if (pDC == NULL || pDC->dctype == DC_TYPE_INFO) + { + ScanLines = 0; + goto done; } /* Get a pointer to the source bitmap object */ psurf = SURFACE_LockSurface(hBitmap); if (psurf == NULL) { - DC_UnlockDc(Dc); - return 0; - } - - ASSERT(psurf->ppal); - - DC_UnlockDc(Dc); - - /* Copy palette information - * Always create a palette for 15 & 16 bit. */ - if ((bmiLocal.bmiHeader.bV5BitCount == BitsPerFormat(psurf->SurfObj.iBitmapFormat) && - bmiLocal.bmiHeader.bV5BitCount != 15 && bmiLocal.bmiHeader.bV5BitCount != 16) || - !ChkBits) - { - ppalDst = psurf->ppal; - bPaletteMatch = TRUE; - } - else - { - hDestPalette = BuildDIBPalette((PBITMAPINFO)&bmiLocal, (PINT)&DestPaletteType); - ppalDst = PALETTE_LockPalette(hDestPalette); - } - - DPRINT("ppalDst : %p\n", ppalDst); - ASSERT(ppalDst); - - /* Copy palette. */ - switch (bmiLocal.bmiHeader.bV5BitCount) - { - case 1: - case 4: - case 8: - bmiLocal.bmiHeader.bV5ClrUsed = 0; - if (psurf->hSecure && - BitsPerFormat(psurf->SurfObj.iBitmapFormat) == bmiLocal.bmiHeader.bV5BitCount) - { - if (Usage == DIB_RGB_COLORS) - { - if (ppalDst->NumColors != 1 << bmiLocal.bmiHeader.bV5BitCount) - bmiLocal.bmiHeader.bV5ClrUsed = ppalDst->NumColors; - for (Index = 0; - Index < (1 << bmiLocal.bmiHeader.bV5BitCount) && Index < ppalDst->NumColors; - Index++) + ScanLines = 0; + goto done; + } + /* Must not be selected */ + if(psurf->hdc != NULL) + { + ScanLines = 0; + SetLastWin32Error(ERROR_INVALID_PARAMETER); + goto done; + } + +get_info: + /* Fill in the structure */ + switch(bpp) + { + case 0: /* Only info */ + if(pbmci) + { + pbmci->bmciHeader.bcWidth = psurf->SurfObj.sizlBitmap.cx; + pbmci->bmciHeader.bcHeight = (psurf->SurfObj.fjBitmap & BMF_TOPDOWN) ? + -psurf->SurfObj.sizlBitmap.cy : + psurf->SurfObj.sizlBitmap.cy; + pbmci->bmciHeader.bcPlanes = 1; + pbmci->bmciHeader.bcBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); + } + Info->bmiHeader.biWidth = psurf->SurfObj.sizlBitmap.cx; + Info->bmiHeader.biHeight = (psurf->SurfObj.fjBitmap & BMF_TOPDOWN) ? + -psurf->SurfObj.sizlBitmap.cy : + psurf->SurfObj.sizlBitmap.cy;; + Info->bmiHeader.biPlanes = 1; + Info->bmiHeader.biBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); + Info->bmiHeader.biSizeImage = DIB_GetDIBImageBytes( Info->bmiHeader.biWidth, + Info->bmiHeader.biHeight, + Info->bmiHeader.biBitCount); + if(psurf->hSecure) + { + switch(Info->bmiHeader.biBitCount) + { + case 16: + case 32: + Info->bmiHeader.biCompression = BI_BITFIELDS; + break; + default: + Info->bmiHeader.biCompression = BI_RGB; + break; + } + } + else if(Info->bmiHeader.biBitCount > 8) + { + Info->bmiHeader.biCompression = BI_BITFIELDS; + } + else + { + Info->bmiHeader.biCompression = BI_RGB; + } + Info->bmiHeader.biXPelsPerMeter = 0; + Info->bmiHeader.biYPelsPerMeter = 0; + Info->bmiHeader.biClrUsed = 0; + Info->bmiHeader.biClrImportant = 0; + ScanLines = psurf->SurfObj.sizlBitmap.cy; + /* Get Complete info now */ + bpp = Info->bmiHeader.biBitCount ; + goto get_info; + + case 1: + case 4: + case 8: + Info->bmiHeader.biClrUsed = 0; + + /* If the bitmap if a DIB section and has the same format than what + * we're asked, go ahead! */ + if((psurf->hSecure) && + (BitsPerFormat(psurf->SurfObj.iBitmapFormat) == bpp)) + { + if(Usage == DIB_RGB_COLORS) + { + unsigned int colors = min(psurf->ppal->NumColors, 1 << bpp); + + if(pbmci) + { + for(i=0; i < colors; i++) + { + rgbTriples[i].rgbtRed = psurf->ppal->IndexedColors[i].peRed; + rgbTriples[i].rgbtGreen = psurf->ppal->IndexedColors[i].peGreen; + rgbTriples[i].rgbtBlue = psurf->ppal->IndexedColors[i].peBlue; + } + } + if(colors != 1 << bpp) Info->bmiHeader.biClrUsed = colors; + RtlCopyMemory(rgbQuads, psurf->ppal->IndexedColors, colors * sizeof(RGBQUAD)); + } + else + { + for(i=0; i < 1 << bpp; i++) + { + if(pbmci) ((WORD*)rgbTriples)[i] = i; + ((WORD*)rgbQuads)[i] = i; + } + } + } + else + { + if(Usage == DIB_PAL_COLORS) + { + for(i=0; i < 1 << bpp; i++) + { + if(pbmci) ((WORD*)rgbTriples)[i] = i; + ((WORD*)rgbQuads)[i] = i; + } + } + else if(bpp > 1 && bpp == BitsPerFormat(psurf->SurfObj.iBitmapFormat)) { + /* For color DDBs in native depth (mono DDBs always have + a black/white palette): + Generate the color map from the selected palette */ + PPALETTE pDcPal = PALETTE_LockPalette(pDC->dclevel.hpal); + if(!pDcPal) + { + ScanLines = 0 ; + goto done ; + } + for (i = 0; i < pDcPal->NumColors; i++) { + if (pbmci) { - bmiLocal.bmiColors[Index].rgbRed = ppalDst->IndexedColors[Index].peRed; - bmiLocal.bmiColors[Index].rgbGreen = ppalDst->IndexedColors[Index].peGreen; - bmiLocal.bmiColors[Index].rgbBlue = ppalDst->IndexedColors[Index].peBlue; - bmiLocal.bmiColors[Index].rgbReserved = 0; + rgbTriples[i].rgbtRed = pDcPal->IndexedColors[i].peRed; + rgbTriples[i].rgbtGreen = pDcPal->IndexedColors[i].peGreen; + rgbTriples[i].rgbtBlue = pDcPal->IndexedColors[i].peBlue; } - } - else - { - for (Index = 0; - Index < (1 << bmiLocal.bmiHeader.bV5BitCount); - Index++) + + rgbQuads[i].rgbRed = pDcPal->IndexedColors[i].peRed; + rgbQuads[i].rgbGreen = pDcPal->IndexedColors[i].peGreen; + rgbQuads[i].rgbBlue = pDcPal->IndexedColors[i].peBlue; + rgbQuads[i].rgbReserved = 0; + } + PALETTE_UnlockPalette(pDcPal); + } else { + switch (bpp) { + case 1: + if (pbmci) { - ((WORD*)bmiLocal.bmiColors)[Index] = Index; + rgbTriples[0].rgbtRed = rgbTriples[0].rgbtGreen = + rgbTriples[0].rgbtBlue = 0; + rgbTriples[1].rgbtRed = rgbTriples[1].rgbtGreen = + rgbTriples[1].rgbtBlue = 0xff; + } + rgbQuads[0].rgbRed = rgbQuads[0].rgbGreen = + rgbQuads[0].rgbBlue = 0; + rgbQuads[0].rgbReserved = 0; + rgbQuads[1].rgbRed = rgbQuads[1].rgbGreen = + rgbQuads[1].rgbBlue = 0xff; + rgbQuads[1].rgbReserved = 0; + break; + + case 4: + if (pbmci) + RtlCopyMemory(rgbTriples, EGAColorsTriples, sizeof(EGAColorsTriples)); + RtlCopyMemory(rgbQuads, EGAColorsQuads, sizeof(EGAColorsQuads)); + + break; + + case 8: + { + INT r, g, b; + RGBQUAD *color; + if (pbmci) + { + RGBTRIPLE *colorTriple; + + RtlCopyMemory(rgbTriples, DefLogPaletteTriples, + 10 * sizeof(RGBTRIPLE)); + RtlCopyMemory(rgbTriples + 246, DefLogPaletteTriples + 10, + 10 * sizeof(RGBTRIPLE)); + colorTriple = rgbTriples + 10; + for(r = 0; r <= 5; r++) /* FIXME */ + { + for(g = 0; g <= 5; g++) + { + for(b = 0; b <= 5; b++) + { + colorTriple->rgbtRed = (r * 0xff) / 5; + colorTriple->rgbtGreen = (g * 0xff) / 5; + colorTriple->rgbtBlue = (b * 0xff) / 5; + color++; + } + } + } + } + memcpy(rgbQuads, DefLogPaletteQuads, + 10 * sizeof(RGBQUAD)); + memcpy(rgbQuads + 246, DefLogPaletteQuads + 10, + 10 * sizeof(RGBQUAD)); + color = rgbQuads + 10; + for(r = 0; r <= 5; r++) /* FIXME */ + { + for(g = 0; g <= 5; g++) + { + for(b = 0; b <= 5; b++) + { + color->rgbRed = (r * 0xff) / 5; + color->rgbGreen = (g * 0xff) / 5; + color->rgbBlue = (b * 0xff) / 5; + color->rgbReserved = 0; + color++; + } + } + } } } } + } + break; + + case 15: + if (Info->bmiHeader.biCompression == BI_BITFIELDS) + { + ((PDWORD)Info->bmiColors)[0] = 0x7c00; + ((PDWORD)Info->bmiColors)[1] = 0x03e0; + ((PDWORD)Info->bmiColors)[2] = 0x001f; + } + break; + + case 16: + if (Info->bmiHeader.biCompression == BI_BITFIELDS) + { + if (psurf->hSecure) RtlCopyMemory( Info->bmiColors, psurf->dsBitfields, 3 * sizeof(DWORD) ); else { - if (Usage == DIB_PAL_COLORS) - { - for (Index = 0; - Index < (1 << bmiLocal.bmiHeader.bV5BitCount); - Index++) - { - ((WORD*)bmiLocal.bmiColors)[Index] = (WORD)Index; - } - } - else if (bmiLocal.bmiHeader.bV5BitCount > 1 && bPaletteMatch) - { - for (Index = 0; - Index < (1 << bmiLocal.bmiHeader.bV5BitCount) && Index < ppalDst->NumColors; - Index++) - { - bmiLocal.bmiColors[Index].rgbRed = ppalDst->IndexedColors[Index].peRed; - bmiLocal.bmiColors[Index].rgbGreen = ppalDst->IndexedColors[Index].peGreen; - bmiLocal.bmiColors[Index].rgbBlue = ppalDst->IndexedColors[Index].peBlue; - bmiLocal.bmiColors[Index].rgbReserved = 0; - } - } - else - { - switch (bmiLocal.bmiHeader.bV5BitCount) - { - case 1: - bmiLocal.bmiColors[0].rgbRed =0 ; - bmiLocal.bmiColors[0].rgbGreen = 0; - bmiLocal.bmiColors[0].rgbBlue = 0; - bmiLocal.bmiColors[0].rgbReserved = 0; - bmiLocal.bmiColors[1].rgbRed =0xFF ; - bmiLocal.bmiColors[1].rgbGreen = 0xFF; - bmiLocal.bmiColors[1].rgbBlue = 0xFF; - bmiLocal.bmiColors[1].rgbReserved = 0; - break; - case 4: - RtlCopyMemory(bmiLocal.bmiColors, EGAColorsQuads, sizeof(EGAColorsQuads)); - break; - case 8: - { - INT r, g, b; - RGBQUAD *color; - - RtlCopyMemory(bmiLocal.bmiColors, DefLogPaletteQuads, 10 * sizeof(RGBQUAD)); - RtlCopyMemory(bmiLocal.bmiColors + 246, DefLogPaletteQuads + 10, 10 * sizeof(RGBQUAD)); - color = bmiLocal.bmiColors + 10; - for (r = 0; r <= 5; r++) /* FIXME */ - for (g = 0; g <= 5; g++) - for (b = 0; b <= 5; b++) - { - color->rgbRed = (r * 0xff) / 5; - color->rgbGreen = (g * 0xff) / 5; - color->rgbBlue = (b * 0xff) / 5; - color->rgbReserved = 0; - color++; - } - } - break; - } - } + ((PDWORD)Info->bmiColors)[0] = 0xf800; + ((PDWORD)Info->bmiColors)[1] = 0x07e0; + ((PDWORD)Info->bmiColors)[2] = 0x001f; } - - case 15: - if (bmiLocal.bmiHeader.bV5Compression == BI_BITFIELDS) + } + break; + + case 24: + case 32: + if (Info->bmiHeader.biCompression == BI_BITFIELDS) + { + if (psurf->hSecure) RtlCopyMemory( Info->bmiColors, psurf->dsBitfields, 3 * sizeof(DWORD) ); + else { - bmiLocal.bmiHeader.bV5RedMask = 0x7c00; - bmiLocal.bmiHeader.bV5GreenMask = 0x03e0; - bmiLocal.bmiHeader.bV5BlueMask = 0x001f; + ((PDWORD)Info->bmiColors)[0] = 0xff0000; + ((PDWORD)Info->bmiColors)[1] = 0x00ff00; + ((PDWORD)Info->bmiColors)[2] = 0x0000ff; } - break; - - case 16: - if (bmiLocal.bmiHeader.bV5Compression == BI_BITFIELDS) - { - bmiLocal.bmiHeader.bV5RedMask = 0xf800; - bmiLocal.bmiHeader.bV5GreenMask = 0x07e0; - bmiLocal.bmiHeader.bV5BlueMask = 0x001f; - } - break; - - case 24: - case 32: - if (bmiLocal.bmiHeader.bV5Compression == BI_BITFIELDS) - { - bmiLocal.bmiHeader.bV5RedMask = 0xff0000; - bmiLocal.bmiHeader.bV5GreenMask = 0x00ff00; - bmiLocal.bmiHeader.bV5BlueMask = 0x0000ff; - } - break; - } - - /* fill out the BITMAPINFO struct */ - if (!ChkBits) - { - bmiLocal.bmiHeader.bV5Width = psurf->SurfObj.sizlBitmap.cx; - /* Report negative height for top-down bitmaps. */ - if (psurf->SurfObj.fjBitmap & BMF_TOPDOWN) - bmiLocal.bmiHeader.bV5Height = - psurf->SurfObj.sizlBitmap.cy; + } + break; + } + + if(Bits && ScanLines) + { + /* Create a DIBSECTION, blt it, profit */ + PVOID pDIBits ; + HBITMAP hBmpDest, hOldDest = NULL, hOldSrc = NULL; + HDC hdcDest, hdcSrc; + BOOL ret ; + + if (StartScan > psurf->SurfObj.sizlBitmap.cy) + { + ScanLines = 0; + goto done; + } else - bmiLocal.bmiHeader.bV5Height = psurf->SurfObj.sizlBitmap.cy; - bmiLocal.bmiHeader.bV5Planes = 1; - bmiLocal.bmiHeader.bV5BitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); - switch (psurf->SurfObj.iBitmapFormat) - { - /* FIXME: What about BI_BITFIELDS? */ - case BMF_1BPP: - case BMF_4BPP: - case BMF_8BPP: - case BMF_16BPP: - case BMF_24BPP: - case BMF_32BPP: - bmiLocal.bmiHeader.bV5Compression = BI_RGB; - break; - case BMF_4RLE: - bmiLocal.bmiHeader.bV5Compression = BI_RLE4; - break; - case BMF_8RLE: - bmiLocal.bmiHeader.bV5Compression = BI_RLE8; - break; - case BMF_JPEG: - bmiLocal.bmiHeader.bV5Compression = BI_JPEG; - break; - case BMF_PNG: - bmiLocal.bmiHeader.bV5Compression = BI_PNG; - break; - } - - bmiLocal.bmiHeader.bV5SizeImage = psurf->SurfObj.cjBits; - bmiLocal.bmiHeader.bV5XPelsPerMeter = psurf->sizlDim.cx; /* FIXME */ - bmiLocal.bmiHeader.bV5YPelsPerMeter = psurf->sizlDim.cy; /* FIXME */ - bmiLocal.bmiHeader.bV5ClrUsed = 0; - bmiLocal.bmiHeader.bV5ClrImportant = 1 << bmiLocal.bmiHeader.bV5BitCount; /* FIXME */ - Result = psurf->SurfObj.sizlBitmap.cy; - } - else - { - SIZEL DestSize; - POINTL SourcePoint; - -// -// If we have a good dib pointer, why not just copy bits from there w/o XLATE'ing them. -// - /* Create the destination bitmap too for the copy operation */ - if (StartScan > psurf->SurfObj.sizlBitmap.cy) - { - goto cleanup; - } - else { ScanLines = min(ScanLines, psurf->SurfObj.sizlBitmap.cy - StartScan); - DestSize.cx = psurf->SurfObj.sizlBitmap.cx; - DestSize.cy = ScanLines; - - hDestBitmap = NULL; - - bmiLocal.bmiHeader.bV5SizeImage = DIB_GetDIBWidthBytes(DestSize.cx, - bmiLocal.bmiHeader.bV5BitCount) * DestSize.cy; - - hDestBitmap = EngCreateBitmap(DestSize, - DIB_GetDIBWidthBytes(DestSize.cx, - bmiLocal.bmiHeader.bV5BitCount), - BitmapFormat(bmiLocal.bmiHeader.bV5BitCount, - bmiLocal.bmiHeader.bV5Compression), - bmiLocal.bmiHeader.bV5Height > 0 ? 0 : BMF_TOPDOWN, - Bits); - - if (hDestBitmap == NULL) - goto cleanup; - } - - if (NT_SUCCESS(Status)) - { - EXLATEOBJ exlo; - SURFOBJ *DestSurfObj; - RECTL DestRect; - - EXLATEOBJ_vInitialize(&exlo, psurf->ppal, ppalDst, 0, 0, 0); - - SourcePoint.x = 0; - SourcePoint.y = psurf->SurfObj.sizlBitmap.cy - (StartScan + ScanLines); - - /* Determine destination rectangle */ - DestRect.top = 0; - DestRect.left = 0; - DestRect.right = DestSize.cx; - DestRect.bottom = DestSize.cy; - - DestSurfObj = EngLockSurface((HSURF)hDestBitmap); - - if (IntEngCopyBits(DestSurfObj, - &psurf->SurfObj, - NULL, - &exlo.xlo, - &DestRect, - &SourcePoint)) - { - DPRINT("GetDIBits %d \n",abs(bmiLocal.bmiHeader.bV5Height) - StartScan); - Result = ScanLines; - } - - EXLATEOBJ_vCleanup(&exlo); - EngUnlockSurface(DestSurfObj); - } - } - - /* Now that everything is over, get back the information to caller */ - _SEH2_TRY - { - /* Note : Info has already been probed */ - GetBMIFromBitmapV5Info(&bmiLocal, Info, Usage); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* FIXME: fail or something */ - } - _SEH2_END - -cleanup: - - if (hDestBitmap != NULL) - EngDeleteSurface((HSURF)hDestBitmap); - - if (hDestPalette != NULL && !bPaletteMatch) - { - PALETTE_UnlockPalette(ppalDst); - PALETTE_FreePaletteByHandle(hDestPalette); - } - - SURFACE_UnlockSurface(psurf); - - DPRINT("leaving NtGdiGetDIBitsInternal\n"); - - return Result; + } + + hBmpDest = DIB_CreateDIBSection(pDC, Info, Usage, &pDIBits, NULL, 0, 0); + + if(!hBmpDest) + { + DPRINT1("Unable to create a DIB Section!\n"); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + ScanLines = 0; + goto done ; + } + + hdcDest = NtGdiCreateCompatibleDC(0); + hdcSrc = NtGdiCreateCompatibleDC(0); + + if(!(hdcSrc && hdcDest)) + { + DPRINT1("Error: could not create HDCs!\n"); + ScanLines = 0; + goto cleanup_blt; + } + + hOldDest = NtGdiSelectBitmap(hdcDest, hBmpDest); + hOldSrc = NtGdiSelectBitmap(hdcSrc, hBitmap); + + if(!(hOldDest && hOldSrc)) + { + DPRINT1("Error : Could not Select bitmaps\n"); + goto cleanup_blt; + } + + ret = GreStretchBltMask(hdcDest, + 0, + 0, + width, + height, + hdcSrc, + 0, + StartScan, + psurf->SurfObj.sizlBitmap.cx, + ScanLines, + SRCCOPY, + 0, + NULL, + 0, + 0); + + if(!ret) + ScanLines = 0; + else + { + Status = STATUS_SUCCESS; + _SEH2_TRY + { + RtlCopyMemory(Bits, pDIBits, DIB_GetDIBImageBytes (width, height, bpp)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + if(!NT_SUCCESS(Status)) + { + DPRINT1("Unable to copy bits to the user provided pointer\n"); + ScanLines = 0; + } + } + + cleanup_blt: + if(hdcSrc) + { + if(hOldSrc) NtGdiSelectBitmap(hdcSrc, hOldSrc); + NtGdiDeleteObjectApp(hdcSrc); + } + if(hdcSrc) + { + if(hOldDest) NtGdiSelectBitmap(hdcDest, hOldDest); + NtGdiDeleteObjectApp(hdcDest); + } + GreDeleteObject(hBmpDest); + } + +done: + + if(pDC) DC_UnlockDc(pDC); + if(psurf) SURFACE_UnlockSurface(psurf); + if(pbmci) ExFreePoolWithTag(Info, TAG_DIB); + + return ScanLines; } + INT APIENTRY @@ -1221,7 +1357,7 @@ IN HDC hDC, IN OPTIONAL HANDLE hSection, IN DWORD dwOffset, - IN LPBITMAPINFO bmi, + IN BITMAPINFO* bmi, IN DWORD Usage, IN UINT cjHeader, IN FLONG fl, @@ -1231,14 +1367,15 @@ HBITMAP hbitmap = 0; DC *dc; BOOL bDesktopDC = FALSE; - BITMAPV5INFO bmiLocal; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; if (!bmi) return hbitmap; // Make sure. _SEH2_TRY { - Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, bmi, Usage, 0); + ProbeForRead(&bmi->bmiHeader.biSize, sizeof(DWORD), 1); + ProbeForRead(bmi, bmi->bmiHeader.biSize, 1); + ProbeForRead(bmi, DIB_BitmapInfoSize(bmi, Usage), 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1262,7 +1399,7 @@ if ((dc = DC_LockDc(hDC))) { hbitmap = DIB_CreateDIBSection(dc, - &bmiLocal, + bmi, Usage, Bits, hSection, @@ -1285,7 +1422,7 @@ APIENTRY DIB_CreateDIBSection( PDC dc, - CONST BITMAPV5INFO *bmi, + CONST BITMAPINFO *bmi, UINT usage, LPVOID *bits, HANDLE section, @@ -1299,7 +1436,7 @@ ULONG palMode = PAL_INDEXED; // Fill BITMAP32 structure with DIB data - CONST BITMAPV5HEADER *bi = &bmi->bmiHeader; + CONST BITMAPINFOHEADER *bi = &bmi->bmiHeader; INT effHeight; ULONG totalSize; BITMAP bm; @@ -1310,29 +1447,29 @@ ULONG ColorCount; DPRINT("format (%ld,%ld), planes %d, bpp %d, size %ld, colors %ld (%s)\n", - bi->bV5Width, bi->bV5Height, bi->bV5Planes, bi->bV5BitCount, - bi->bV5SizeImage, bi->bV5ClrUsed, usage == DIB_PAL_COLORS? "PAL" : "RGB"); + bi->biWidth, bi->biHeight, bi->biPlanes, bi->biBitCount, + bi->biSizeImage, bi->biClrUsed, usage == DIB_PAL_COLORS? "PAL" : "RGB"); /* CreateDIBSection should fail for compressed formats */ - if (bi->bV5Compression == BI_RLE4 || bi->bV5Compression == BI_RLE8) + if (bi->biCompression == BI_RLE4 || bi->biCompression == BI_RLE8) { return (HBITMAP)NULL; } - effHeight = bi->bV5Height >= 0 ? bi->bV5Height : -bi->bV5Height; + effHeight = bi->biHeight >= 0 ? bi->biHeight : -bi->biHeight; bm.bmType = 0; - bm.bmWidth = bi->bV5Width; + bm.bmWidth = bi->biWidth; bm.bmHeight = effHeight; - bm.bmWidthBytes = ovr_pitch ? ovr_pitch : (ULONG) DIB_GetDIBWidthBytes(bm.bmWidth, bi->bV5BitCount); - - bm.bmPlanes = bi->bV5Planes; - bm.bmBitsPixel = bi->bV5BitCount; + bm.bmWidthBytes = ovr_pitch ? ovr_pitch : (ULONG) DIB_GetDIBWidthBytes(bm.bmWidth, bi->biBitCount); + + bm.bmPlanes = bi->biPlanes; + bm.bmBitsPixel = bi->biBitCount; bm.bmBits = NULL; // Get storage location for DIB bits. Only use biSizeImage if it's valid and // we're dealing with a compressed bitmap. Otherwise, use width * height. - totalSize = bi->bV5SizeImage && bi->bV5Compression != BI_RGB - ? bi->bV5SizeImage : (ULONG)(bm.bmWidthBytes * effHeight); + totalSize = bi->biSizeImage && bi->biCompression != BI_RGB + ? bi->biSizeImage : (ULONG)(bm.bmWidthBytes * effHeight); if (section) { @@ -1352,7 +1489,7 @@ } mapOffset = offset - (offset % Sbi.AllocationGranularity); - mapSize = bi->bV5SizeImage + (offset - mapOffset); + mapSize = bi->biSizeImage + (offset - mapOffset); SectionOffset.LowPart = mapOffset; SectionOffset.HighPart = 0; @@ -1390,16 +1527,16 @@ if (usage == DIB_PAL_COLORS) { lpRGB = DIB_MapPaletteColors(dc, bmi); - ColorCount = bi->bV5ClrUsed; + ColorCount = bi->biClrUsed; if (ColorCount == 0) { - ColorCount = max(1 << bi->bV5BitCount, 256); - } - } - else if(bi->bV5BitCount <= 8) + ColorCount = max(1 << bi->biBitCount, 256); + } + } + else if(bi->biBitCount <= 8) { lpRGB = bmi->bmiColors; - ColorCount = 1 << bi->bV5BitCount; + ColorCount = 1 << bi->biBitCount; } else { @@ -1408,15 +1545,15 @@ } /* Set dsBitfields values */ - if (usage == DIB_PAL_COLORS || bi->bV5BitCount <= 8) + if (usage == DIB_PAL_COLORS || bi->biBitCount <= 8) { dsBitfields[0] = dsBitfields[1] = dsBitfields[2] = 0; palMode = PAL_INDEXED; } - else if (bi->bV5Compression == BI_RGB) + else if (bi->biCompression == BI_RGB) { dsBitfields[0] = dsBitfields[1] = dsBitfields[2] = 0; - switch (bi->bV5BitCount) + switch (bi->biBitCount) { case 15: palMode = PAL_RGB16_555; @@ -1434,9 +1571,7 @@ } else { - dsBitfields[0] = bi->bV5RedMask; - dsBitfields[1] = bi->bV5GreenMask; - dsBitfields[2] = bi->bV5BlueMask; + RtlCopyMemory(dsBitfields, bmi->bmiColors, sizeof(dsBitfields)); palMode = PAL_BITFIELDS; } @@ -1446,10 +1581,10 @@ res = GreCreateBitmapEx(bm.bmWidth, abs(bm.bmHeight), bm.bmWidthBytes, - BitmapFormat(bi->bV5BitCount * bi->bV5Planes, bi->bV5Compression), + BitmapFormat(bi->biBitCount * bi->biPlanes, bi->biCompression), BMF_DONTCACHE | BMF_USERMEM | BMF_NOZEROINIT | - (bi->bV5Height < 0 ? BMF_TOPDOWN : 0), - bi->bV5SizeImage, + (bi->biHeight < 0 ? BMF_TOPDOWN : 0), + bi->biSizeImage, bm.bmBits); if (!res) { @@ -1475,7 +1610,7 @@ bmp->dsBitfields[1] = dsBitfields[1]; bmp->dsBitfields[2] = dsBitfields[2]; bmp->biClrUsed = ColorCount; - bmp->biClrImportant = bi->bV5ClrImportant; + bmp->biClrImportant = bi->biClrImportant; hpal = PALETTE_AllocPalette(palMode, ColorCount, (ULONG*)lpRGB, dsBitfields[0], @@ -1531,6 +1666,42 @@ } return res; +} + +/*********************************************************************** + * DIB_GetBitmapInfo + * + * Get the info from a bitmap header. + * Return 0 for COREHEADER, 1 for INFOHEADER, -1 for error. + */ +int +FASTCALL +DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, + LONG *height, WORD *planes, WORD *bpp, DWORD *compr, DWORD *size ) +{ + if (header->biSize == sizeof(BITMAPCOREHEADER)) + { + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header; + *width = core->bcWidth; + *height = core->bcHeight; + *planes = core->bcPlanes; + *bpp = core->bcBitCount; + *compr = 0; + *size = 0; + return 0; + } + if (header->biSize >= sizeof(BITMAPINFOHEADER)) /* assume BITMAPINFOHEADER */ + { + *width = header->biWidth; + *height = header->biHeight; + *planes = header->biPlanes; + *bpp = header->biBitCount; + *compr = header->biCompression; + *size = header->biSizeImage; + return 1; + } + DPRINT1("(%d): unknown/wrong size for header\n", header->biSize ); + return -1; } /*********************************************************************** @@ -1566,25 +1737,30 @@ INT FASTCALL DIB_BitmapInfoSize(const BITMAPINFO * info, WORD coloruse) { - int colors; + unsigned int colors, size, masks = 0; if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { - BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)info; + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)info; colors = (core->bcBitCount <= 8) ? 1 << core->bcBitCount : 0; - return sizeof(BITMAPCOREHEADER) + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBTRIPLE) : sizeof(WORD)); + return sizeof(BITMAPCOREHEADER) + colors * + ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBTRIPLE) : sizeof(WORD)); } else /* assume BITMAPINFOHEADER */ { colors = info->bmiHeader.biClrUsed; - if (!colors && (info->bmiHeader.biBitCount <= 8)) colors = 1 << info->bmiHeader.biBitCount; - return info->bmiHeader.biSize + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); + if (colors > 256) colors = 256; + if (!colors && (info->bmiHeader.biBitCount <= 8)) + colors = 1 << info->bmiHeader.biBitCount; + if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; + size = max( info->bmiHeader.biSize, sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) ); + return size + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); } } RGBQUAD * FASTCALL -DIB_MapPaletteColors(PDC dc, CONST BITMAPV5INFO* lpbmi) +DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi) { RGBQUAD *lpRGB; ULONG nNumColors,i; @@ -1604,10 +1780,10 @@ return NULL; } - nNumColors = 1 << lpbmi->bmiHeader.bV5BitCount; - if (lpbmi->bmiHeader.bV5ClrUsed) - { - nNumColors = min(nNumColors, lpbmi->bmiHeader.bV5ClrUsed); + nNumColors = 1 << lpbmi->bmiHeader.biBitCount; + if (lpbmi->bmiHeader.biClrUsed) + { + nNumColors = min(nNumColors, lpbmi->bmiHeader.biClrUsed); } lpRGB = (RGBQUAD *)ExAllocatePoolWithTag(PagedPool, sizeof(RGBQUAD) * nNumColors, TAG_COLORMAP);

14 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2010