Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[gschneider] 47742: [WIN32K] - Tag even more pool allocations - Remove dead code, adjust comments
by gschneider＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: gschneider Date: Thu Jun 10 19:33:04 2010 New Revision: 47742 URL: http://svn.reactos.org/svn/reactos?rev=47742&view=rev Log: [WIN32K] - Tag even more pool allocations - Remove dead code, adjust comments Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/object.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Thu Jun 10 19:33:04 2010 @@ -337,7 +337,7 @@ if (Process->Win32Process == NULL) { /* FIXME - lock the process */ - Process->Win32Process = ExAllocatePool(NonPagedPool, sizeof(PROCESSINFO)); + Process->Win32Process = ExAllocatePoolWithTag(NonPagedPool, sizeof(PROCESSINFO), USERTAG_PROCESSINFO); if (Process->Win32Process == NULL) return STATUS_NO_MEMORY; @@ -350,7 +350,7 @@ if (Thread->Tcb.Win32Thread == NULL) { - Thread->Tcb.Win32Thread = ExAllocatePool (NonPagedPool, sizeof(THREADINFO)); + Thread->Tcb.Win32Thread = ExAllocatePoolWithTag(NonPagedPool, sizeof(THREADINFO), USERTAG_THREADINFO); if (Thread->Tcb.Win32Thread == NULL) return STATUS_NO_MEMORY; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Thu Jun 10 19:33:04 2010 @@ -1442,8 +1442,9 @@ } /* allocate a temporary buffer that can hold the unicode class name */ - szTemp = ExAllocatePool(PagedPool, - BufLen); + szTemp = ExAllocatePoolWithTag(PagedPool, + BufLen, + USERTAG_CLASS); if (szTemp == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Thu Jun 10 19:33:04 2010 @@ -742,7 +742,7 @@ OutPwszBuff = ExAllocatePoolWithTag(NonPagedPool,sizeof(WCHAR) * cchBuff, TAG_STRING); if( !OutPwszBuff ) { - DPRINT1( "ExAllocatePool(%d) failed\n", sizeof(WCHAR) * cchBuff); + DPRINT1( "ExAllocatePoolWithTag(%d) failed\n", sizeof(WCHAR) * cchBuff); RETURN(0); } RtlZeroMemory( OutPwszBuff, sizeof( WCHAR ) * cchBuff ); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] Thu Jun 10 19:33:04 2010 @@ -283,7 +283,6 @@ PVOID mem; //FIXME: dont alloc all at once! must be mapped into umode also... - //mem = ExAllocatePool(PagedPool, sizeof(USER_HANDLE_ENTRY) * 1024*2); mem = UserHeapAlloc(sizeof(USER_HANDLE_ENTRY) * 1024*2); if (!mem) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Thu Jun 10 19:33:04 2010 @@ -691,7 +691,7 @@ WindowLessTimersBitMapBuffer, BitmapBytes * 8); - /* yes we need this, since ExAllocatePool isn't supposed to zero out allocated memory */ + /* yes we need this, since ExAllocatePoolWithTag isn't supposed to zero out allocated memory */ RtlClearAllBits(&WindowLessTimersBitMap); return STATUS_SUCCESS; Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Thu Jun 10 19:33:04 2010 @@ -219,17 +219,17 @@ if (NT_SUCCESS(Status)) { - DirInfoBuffer = ExAllocatePool(PagedPool, 0x4000); + DirInfoBuffer = ExAllocatePoolWithTag(PagedPool, 0x4000, TAG_FONT); if (DirInfoBuffer == NULL) { ZwClose(hDirectory); return; } - FileName.Buffer = ExAllocatePool(PagedPool, MAX_PATH * sizeof(WCHAR)); + FileName.Buffer = ExAllocatePoolWithTag(PagedPool, MAX_PATH * sizeof(WCHAR), TAG_FONT); if (FileName.Buffer == NULL) { - ExFreePool(DirInfoBuffer); + ExFreePoolWithTag(DirInfoBuffer, TAG_FONT); ZwClose(hDirectory); return; } @@ -273,8 +273,8 @@ bRestartScan = FALSE; } - ExFreePool(FileName.Buffer); - ExFreePool(DirInfoBuffer); + ExFreePoolWithTag(FileName.Buffer, TAG_FONT); + ExFreePoolWithTag(DirInfoBuffer, TAG_FONT); ZwClose(hDirectory); } }

1 0

[gschneider] 47741: [WIN32K] Tag more pool allocations
by gschneider＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: gschneider Date: Thu Jun 10 19:20:57 2010 New Revision: 47741 URL: http://svn.reactos.org/svn/reactos?rev=47741&view=rev Log: [WIN32K] Tag more pool allocations Modified: trunk/reactos/subsystems/win32/win32k/ldr/loader.c trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ld… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ldr/loader.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ldr/loader.c [iso-8859-1] Thu Jun 10 19:20:57 2010 @@ -222,10 +222,10 @@ DPRINT1("ZwSetSystemInformation failed with Status 0x%lx\n", Status); } else { - DriverInfo = ExAllocatePool(PagedPool, sizeof(DRIVERS)); + DriverInfo = ExAllocatePoolWithTag(PagedPool, sizeof(DRIVERS), TAG_DRIVER); DriverInfo->DriverName.MaximumLength = GdiDriverInfo.DriverName.MaximumLength; DriverInfo->DriverName.Length = GdiDriverInfo.DriverName.Length; - DriverInfo->DriverName.Buffer = ExAllocatePool(PagedPool, GdiDriverInfo.DriverName.MaximumLength); + DriverInfo->DriverName.Buffer = ExAllocatePoolWithTag(PagedPool, GdiDriverInfo.DriverName.MaximumLength, TAG_DRIVER); RtlCopyUnicodeString(&DriverInfo->DriverName, &GdiDriverInfo.DriverName); DriverInfo->SectionPointer = GdiDriverInfo.SectionPointer; DriverInfo->BaseAddress = GdiDriverInfo.ImageAddress; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Thu Jun 10 19:20:57 2010 @@ -75,7 +75,7 @@ { wce = WindowsChain; - wce = ExAllocatePool(PagedPool, sizeof(CLIPBOARDCHAINELEMENT)); + wce = ExAllocatePoolWithTag(PagedPool, sizeof(CLIPBOARDCHAINELEMENT), USERTAG_CLIPBOARD); if (wce == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); @@ -167,7 +167,7 @@ { PCLIPBOARDELEMENT ce = NULL; - ce = ExAllocatePool(PagedPool, sizeof(CLIPBOARDELEMENT)); + ce = ExAllocatePoolWithTag(PagedPool, sizeof(CLIPBOARDELEMENT), USERTAG_CLIPBOARD); if (ce == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); @@ -889,7 +889,7 @@ if (!canSinthesize(uFormat)) { - hCBData = ExAllocatePool(PagedPool, size); + hCBData = ExAllocatePoolWithTag(PagedPool, size, USERTAG_CLIPBOARD); memcpy(hCBData, hMem, size); intAddFormatedData(uFormat, hCBData, size); DPRINT1("Data stored\n"); @@ -979,7 +979,7 @@ size = bi.bmiHeader.biSizeImage + sizeof(BITMAPINFOHEADER); - hCBData = ExAllocatePool(PagedPool, size); + hCBData = ExAllocatePoolWithTag(PagedPool, size, USERTAG_CLIPBOARD); memcpy(hCBData, &bi, sizeof(BITMAPINFOHEADER)); ret = NtGdiGetDIBitsInternal(hdc, hMem, 0, bm.bmHeight, (LPBYTE)hCBData + sizeof(BITMAPINFOHEADER), &bi, DIB_RGB_COLORS, 0, 0); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Thu Jun 10 19:20:57 2010 @@ -560,7 +560,7 @@ } if (monitorRectList != NULL && listSize != 0) { - safeRectList = ExAllocatePool(PagedPool, sizeof (RECT) * listSize); + safeRectList = ExAllocatePoolWithTag(PagedPool, sizeof (RECT) * listSize, USERTAG_MONITORRECTS); if (safeRectList == NULL) { ExFreePool(safeHMonitorList); @@ -845,7 +845,7 @@ /* FIXME: SetLastWin32Error? */ return (HMONITOR)NULL; } - rectList = ExAllocatePool(PagedPool, sizeof (RECT) * numMonitors); + rectList = ExAllocatePoolWithTag(PagedPool, sizeof (RECT) * numMonitors, USERTAG_MONITORRECTS); if (rectList == NULL) { ExFreePool(hMonitorList); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Thu Jun 10 19:20:57 2010 @@ -96,7 +96,7 @@ BOOL FASTCALL IntSetupClipboard(PWINSTATION_OBJECT WinStaObj) { - WinStaObj->Clipboard = ExAllocatePool(PagedPool, sizeof(CLIPBOARDSYSTEM)); + WinStaObj->Clipboard = ExAllocatePoolWithTag(PagedPool, sizeof(CLIPBOARDSYSTEM), TAG_WINSTA); if (WinStaObj->Clipboard) { RtlZeroMemory(WinStaObj->Clipboard, sizeof(CLIPBOARDSYSTEM));

1 0

[pschweitzer] 47740: [NETSHELL] Updated French translation [PAINT] Updated French translation [SHELL32] Updated French translation [SPIDER] Added French translation [SYSSETUP] Updated French translation
by pschweitzer＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: pschweitzer Date: Thu Jun 10 18:58:46 2010 New Revision: 47740 URL: http://svn.reactos.org/svn/reactos?rev=47740&view=rev Log: [NETSHELL] Updated French translation [PAINT] Updated French translation [SHELL32] Updated French translation [SPIDER] Added French translation [SYSSETUP] Updated French translation Added: trunk/reactos/base/applications/games/spider/lang/fr-FR.rc (with props) Modified: trunk/reactos/base/applications/games/spider/rsrc.rc trunk/reactos/base/applications/paint/lang/fr-FR.rc trunk/reactos/dll/win32/netshell/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Added: trunk/reactos/base/applications/games/spider/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/games/spider/lang/fr-FR.rc [iso-8859-1] Thu Jun 10 18:58:46 2010 @@ -1,0 +1,89 @@ +/* + * PROJECT: Spider Solitaire + * LICENSE: See COPYING in top level directory + * FILE: base/applications/games/spider/lang/fr-FR.rc + * PURPOSE: French Language File for Spider Solitaire + * TRANSLATOR: Pierre Schweitzer + */ + +#include "resource.h" + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + + +/* Dialogs */ + +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 +CAPTION "SÃ©lectionnez le tarot des cartes" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Annuler", IDCANCEL, 126, 84, 54, 13 +END + +IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 106, 80 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "DifficultÃ©" +FONT 8, "MS Shell Dlg" +BEGIN + AUTORADIOBUTTON "Facile : &une couleur", IDC_DIF_ONECOLOR, 8, 10, 80, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Moyenne : &deux couleurs", IDC_DIF_TWOCOLORS, 8, 23, 80, 10 + AUTORADIOBUTTON "Difficile : &quatre couleurs", IDC_DIF_FOURCOLORS, 8, 36, 80, 10 + + DEFPUSHBUTTON "OK", IDOK, 8, 58, 40, 14 + PUSHBUTTON "Annuler", IDCANCEL, 58, 58, 40, 14 +END + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_SPI_NAME "Spider" + IDS_SPI_ABOUT "Spider Solitaire par Gregor Schneider\n\nCardLib version 1.0" + IDS_SPI_QUIT "Quitter le jeu actuel ?" + IDS_SPI_WIN "FÃ©licitations, Vous avez gagnÃ© !" + IDS_SPI_DEAL "Redistribuer ?" +END + + +/* Menus */ + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "&Partie" + BEGIN + MENUITEM "&Donne\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "&Jeux...", IDM_GAME_DECK + MENUITEM SEPARATOR + MENUITEM "&Quitter", IDM_GAME_EXIT + END + POPUP "&Aide" + BEGIN + MENUITEM "&Sommaire\tF1", IDM_HELP_CONTENTS + MENUITEM "&Ã propos", IDM_HELP_ABOUT + END +END + + + +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END Propchange: trunk/reactos/base/applications/games/spider/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/spider/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/rsrc.rc [iso-8859-1] Thu Jun 10 18:58:46 2010 @@ -9,6 +9,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" Modified: trunk/reactos/base/applications/paint/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/fr-FR.rc [iso-8859-1] Thu Jun 10 18:58:46 2010 @@ -49,7 +49,7 @@ MENUITEM SEPARATOR POPUP "Zoom" BEGIN - POPUP "User defined" + POPUP "Défini par l'utilisateur" BEGIN MENUITEM "12,5%", IDM_VIEWZOOM125 MENUITEM "25%", IDM_VIEWZOOM25 @@ -60,8 +60,8 @@ MENUITEM "800%", IDM_VIEWZOOM800 END MENUITEM SEPARATOR - MENUITEM "Show grid", IDM_VIEWSHOWGRID - MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE + MENUITEM "Montrer la grille", IDM_VIEWSHOWGRID + MENUITEM "Montrer la miniature", IDM_VIEWSHOWMINIATURE END MENUITEM "Plein écran\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -200,6 +200,6 @@ IDS_TOOLTIP16, "Rectangle arrondi" IDS_OPENFILTER, "Bitmap (*.bmp;*.dib)\1*.bmp;*.dib\1Tous les fichiers (*.*)\1*.*\1" IDS_SAVEFILTER, "Bitmap 24 bit (*.bmp;*.dib)\1*.bmp;*.dib\1" - IDS_FILESIZE, "%d bytes" - IDS_PRINTRES, "%d x %d pixels per meter" -END + IDS_FILESIZE, "%d octets" + IDS_PRINTRES, "%d x %d pixels par mètre" +END Modified: trunk/reactos/dll/win32/netshell/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/fr-FR.rc [iso-8859-1] Thu Jun 10 18:58:46 2010 @@ -16,12 +16,12 @@ GROUPBOX "Description", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Description du composant...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP CHECKBOX "&Afficher l'icône dans la barre des tâches", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Me &notifier quand cette connexion n'a pas de connectivité ou une limitée", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP END IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Allgemein" +CAPTION "Général" FONT 8, "MS Shell Dlg" BEGIN END @@ -112,7 +112,7 @@ IDS_NET_REPAIR "Réparer" IDS_NET_CREATELINK "Créer un raccourci" IDS_NET_DELETE "Supprimer" - IDS_NET_RENAME "Rename" + IDS_NET_RENAME "Renommer" IDS_NET_PROPERTIES "Propriétés" IDS_FORMAT_BIT "%u Bit/s" Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Thu Jun 10 18:58:46 2010 @@ -669,8 +669,8 @@ IDS_RESTART_PROMPT "Voulez-vous redémarrer votre ordinateur ?" IDS_SHUTDOWN_TITLE "Arrêter" IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session ReactOS ?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" + IDS_LOGOFF_TITLE "Se déconnecter" + IDS_LOGOFF_PROMPT "Voulez-vous vous déconnecter ?" /* shell folder path default values */ IDS_PROGRAMS "Menu Démarrer\\Programmes" @@ -754,7 +754,7 @@ IDS_INSTALLNEWFONT "Installer une nouvelle police..." IDS_DEFAULT_CLUSTER_SIZE "Taille d'allocation par défaut" - IDS_COPY_OF "Copy of" + IDS_COPY_OF "Copie de" IDS_SHLEXEC_NOASSOC "Aucun programme Windows n'est configuré pour ouvrir ce type de fichier." END Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Thu Jun 10 18:58:46 2010 @@ -212,9 +212,9 @@ IDS_CMT_DEVMGMT "Lancer le gestionnaire de périphériques" IDS_CMT_SERVMAN "Lancer le gestionnaire de services" IDS_CMT_RDESKTOP "Lancer le bureau distant" - IDS_CMT_EVENTVIEW "Launch Event Viewer" - IDS_CMT_MSCONFIG "Launch System Configuration program" - IDS_CMT_PAINT "Launch Paint" + IDS_CMT_EVENTVIEW "Lancer la visionneuse des événements" + IDS_CMT_MSCONFIG "Lancer le programme de configuration système" + IDS_CMT_PAINT "Lancer Paint" END STRINGTABLE @@ -230,7 +230,7 @@ IDS_SYS_TOOLS "Outils système" IDS_CMT_CHARMAP "Table des Caractères" IDS_CMT_KBSWITCH "Sélecteur de configuration clavier" - IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" + IDS_CMT_DXDIAG "Lancer le prorgramme de diagnostic ReactX" END STRINGTABLE @@ -241,10 +241,10 @@ STRINGTABLE BEGIN - IDS_SYS_ENTERTAINMENT "Entertainment" - IDS_CMT_MPLAY32 "Launch Multimedia Player" - IDS_CMT_SNDVOL32 "Launch Volume Control" - IDS_CMT_SNDREC32 "Launch Sound Recorder" + IDS_SYS_ENTERTAINMENT "Divertissement" + IDS_CMT_MPLAY32 "Lancer le lecteur multimédia" + IDS_CMT_SNDVOL32 "Lancer le contrôleur de volume" + IDS_CMT_SNDREC32 "Lancer l'enregistreur de son" END STRINGTABLE @@ -279,11 +279,11 @@ IDS_SHORT_MAGNIFY "Loupe.lnk" IDS_SHORT_RDESKTOP "Bureau Distant.lnk" IDS_SHORT_KBSWITCH "Sélecteur de configuration clavier.lnk" - IDS_SHORT_EVENTVIEW "Event Viewer.lnk" - IDS_SHORT_MSCONFIG "System Configuration.lnk" - IDS_SHORT_SNDVOL32 "Volume Control.lnk" - IDS_SHORT_SNDREC32 "Audiorecorder.lnk" - IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" + IDS_SHORT_EVENTVIEW "Visionneuse des événements.lnk" + IDS_SHORT_MSCONFIG "Configuration système.lnk" + IDS_SHORT_SNDVOL32 "Contrôleur de volume.lnk" + IDS_SHORT_SNDREC32 "Enregistreur de son.lnk" + IDS_SHORT_DXDIAG "Diagnostic ReactX.lnk" IDS_SHORT_PAINT "Paint.lnk" IDS_SHORT_SPIDER "Spider Solitaire.lnk" END

1 0

[tkreuzer] 47739: reduce diff to trunk
by tkreuzer＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: tkreuzer Date: Thu Jun 10 18:19:48 2010 New Revision: 47739 URL: http://svn.reactos.org/svn/reactos?rev=47739&view=rev Log: reduce diff to trunk Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp [iso-8859-1] Thu Jun 10 18:19:48 2010 @@ -535,7 +535,6 @@ case MicrosoftC: return "msc"; default: assert ( false ); } - return ""; } std::string @@ -547,5 +546,4 @@ case MicrosoftLink: return "mslink"; default: assert ( false ); } - return ""; -} +}

1 0

[akhaldi] 47738: [USER32_WINETEST] - Re-enable generated.c tests. This commit (the previous one too) is a result of the header work reintegration.
by akhaldi＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: akhaldi Date: Thu Jun 10 16:06:10 2010 New Revision: 47738 URL: http://svn.reactos.org/svn/reactos?rev=47738&view=rev Log: [USER32_WINETEST] - Re-enable generated.c tests. This commit (the previous one too) is a result of the header work reintegration. Modified: trunk/rostests/winetests/user32/testlist.c trunk/rostests/winetests/user32/user32.rbuild Modified: trunk/rostests/winetests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/testlist… ============================================================================== --- trunk/rostests/winetests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/testlist.c [iso-8859-1] Thu Jun 10 16:06:10 2010 @@ -42,7 +42,7 @@ { "dde", func_dde }, { "dialog", func_dialog }, { "edit", func_edit }, -// { "generated", func_generated }, + { "generated", func_generated }, { "input", func_input }, { "listbox", func_listbox }, { "menu", func_menu }, Modified: trunk/rostests/winetests/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/user32.r… ============================================================================== --- trunk/rostests/winetests/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/user32.rbuild [iso-8859-1] Thu Jun 10 16:06:10 2010 @@ -17,7 +17,7 @@ <file>dde.c</file> <file>dialog.c</file> <file>edit.c</file> -  + <file>generated.c</file> <file>input.c</file> <file>listbox.c</file> <file>menu.c</file>

1 0

[akhaldi] 47737: [NTDLL_WINETEST] - Re-enable generated.c tests.
by akhaldi＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: akhaldi Date: Thu Jun 10 15:55:07 2010 New Revision: 47737 URL: http://svn.reactos.org/svn/reactos?rev=47737&view=rev Log: [NTDLL_WINETEST] - Re-enable generated.c tests. Modified: trunk/rostests/winetests/ntdll/ntdll.rbuild trunk/rostests/winetests/ntdll/testlist.c Modified: trunk/rostests/winetests/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/ntdll.rbu… ============================================================================== --- trunk/rostests/winetests/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/ntdll.rbuild [iso-8859-1] Thu Jun 10 15:55:07 2010 @@ -12,6 +12,7 @@ <file>error.c</file> <file>exception.c</file> <file>file.c</file> + <file>generated.c</file> <file>info.c</file> <file>large_int.c</file> <file>om.c</file> Modified: trunk/rostests/winetests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/testlist.… ============================================================================== --- trunk/rostests/winetests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/testlist.c [iso-8859-1] Thu Jun 10 15:55:07 2010 @@ -35,7 +35,7 @@ { "error", func_error }, { "exception", func_exception }, { "file", func_file }, - //{ "generated", func_generated }, + { "generated", func_generated }, { "info", func_info }, { "large_int", func_large_int }, { "om", func_om },

1 0

[akhaldi] 47736: [PSDK] - Deduplicate/improve architecture related definitions.
by akhaldi＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: akhaldi Date: Thu Jun 10 15:35:16 2010 New Revision: 47736 URL: http://svn.reactos.org/svn/reactos?rev=47736&view=rev Log: [PSDK] - Deduplicate/improve architecture related definitions. Modified: trunk/reactos/include/psdk/basetsd.h trunk/reactos/include/psdk/windows.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Thu Jun 10 15:35:16 2010 @@ -21,6 +21,29 @@ #ifdef _MAC #error Not supported. +#endif + +#if !defined(_X86_) && !defined(_AMD64) && !defined(_IA64_) && !defined(_ALPHA_) && \ + !defined(_ARM_) && !defined(_PPC_) && !defined(_MIPS_) && !defined(_68K_) + +#if defined(_M_IX86) +#define _X86_ +#elif defined(_M_AMD64) || defined(__x86_64__) +#define _AMD64_ +#elif defined(_M_IA64) || defined(__ia64__) +#define _IA64_ +#elif defined(_M_ALPHA) || defined(__alpha__) +#define _ALPHA_ +#elif defined(_M_ARM) || defined(__arm__) +#define _ARM_ +#elif defined(_M_PPC) || defined(__powerpc__) +#define _PPC_ +#elif defined(_M_MRX000) || defined(__mips__) +#define _MIPS_ +#elif defined(_M_M68K) || defined(__68k__) +#define _68K_ +#endif + #endif #if !defined(MIDL_PASS) && !defined(RC_INVOKED) Modified: trunk/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev… ============================================================================== --- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Thu Jun 10 15:35:16 2010 @@ -17,18 +17,27 @@ #include <msvctarget.h> #endif -#if defined(_M_IX86) && !defined(_X86_) +#if !defined(_X86_) && !defined(_AMD64) && !defined(_IA64_) && !defined(_ALPHA_) && \ + !defined(_ARM_) && !defined(_PPC_) && !defined(_MIPS_) && !defined(_68K_) + +#if defined(_M_IX86) #define _X86_ -#elif defined(_M_ALPHA) && !defined(_ALPHA_) +#elif defined(_M_AMD64) || defined(__x86_64__) +#define _AMD64_ +#elif defined(_M_IA64) || defined(__ia64__) +#define _IA64_ +#elif defined(_M_ALPHA) || defined(__alpha__) #define _ALPHA_ -#elif defined(_M_ARM) && !defined(_ARM_) +#elif defined(_M_ARM) || defined(__arm__) #define _ARM_ -#elif defined(_M_PPC) && !defined(_PPC_) +#elif defined(_M_PPC) || defined(__powerpc__) #define _PPC_ -#elif defined(_M_MRX000) && !defined(_MIPS_) +#elif defined(_M_MRX000) || defined(__mips__) #define _MIPS_ -#elif defined(_M_M68K) && !defined(_68K_) +#elif defined(_M_M68K) || defined(__68k__) #define _68K_ +#endif + #endif #ifdef RC_INVOKED Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Thu Jun 10 15:35:16 2010 @@ -9,20 +9,6 @@ #ifdef __GNUC__ #include <msvctarget.h> -#endif - -#if defined(_M_IX86) && !defined(_X86_) -#define _X86_ -#elif defined(_M_ALPHA) && !defined(_ALPHA_) -#define _ALPHA_ -#elif defined(_M_ARM) && !defined(_ARM_) -#define _ARM_ -#elif defined(_M_PPC) && !defined(_PPC_) -#define _PPC_ -#elif defined(_M_MRX000) && !defined(_MIPS_) -#define _MIPS_ -#elif defined(_M_M68K) && !defined(_68K_) -#define _68K_ #endif #ifndef DECLSPEC_ALIGN

1 0

[jgardou] 47735: [GDI32] - DIB data is not mandatory in CreateDIBitmap [WIN32K] - Simplify GreCreateDIBitmap - Surface data should be 16 bits aligned
by jgardou＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: jgardou Date: Thu Jun 10 14:32:05 2010 New Revision: 47735 URL: http://svn.reactos.org/svn/reactos?rev=47735&view=rev Log: [GDI32] - DIB data is not mandatory in CreateDIBitmap [WIN32K] - Simplify GreCreateDIBitmap - Surface data should be 16 bits aligned Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/gdi3… ============================================================================== --- branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Thu Jun 10 14:32:05 2010 @@ -461,8 +461,8 @@ LONG width, height, compr, dibsize; WORD planes, bpp; // PDC_ATTR pDc_Attr; - UINT InfoSize; - UINT cjBmpScanSize; + UINT InfoSize = 0; + UINT cjBmpScanSize = 0; HBITMAP hBmp; NTSTATUS Status = STATUS_SUCCESS; @@ -477,17 +477,20 @@ // For Icm support. // GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) - _SEH2_TRY - { - cjBmpScanSize = DIB_BitmapBitsSize(Data); - CalculateColorTableSize(&Data->bmiHeader, &ColorUse, &InfoSize); - InfoSize += Data->bmiHeader.biSize; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END + if(Data) + { + _SEH2_TRY + { + cjBmpScanSize = DIB_BitmapBitsSize(Data); + CalculateColorTableSize(&Data->bmiHeader, &ColorUse, &InfoSize); + InfoSize += Data->bmiHeader.biSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + } if(!NT_SUCCESS(Status)) { Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Thu Jun 10 14:32:05 2010 @@ -203,12 +203,12 @@ if (ulWidth) { /* Align the width (Windows compatibility) */ - ulWidth = ((((ulWidth << 3) / cBitsPixel) * cBitsPixel + 31) & ~31) >> 3; + ulWidth = ((((ulWidth << 3) / cBitsPixel) * cBitsPixel + 15) & ~15) >> 3; } else { /* Calculate width from the bitmap width in pixels */ - ulWidth = ((pso->sizlBitmap.cx * cBitsPixel + 31) & ~31) >> 3; + ulWidth = ((pso->sizlBitmap.cx * cBitsPixel + 15) & ~15) >> 3; } /* Calculate the bitmap size in bytes */ @@ -236,7 +236,7 @@ (fjBitmap & BMF_NOZEROINIT) ? 0 : FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); - + /* Free the section already, but keep the mapping */ if (pvBits) EngFreeSectionMem(pvSection, 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 Jun 10 14:32:05 2010 @@ -1177,68 +1177,39 @@ PDC Dc; HBITMAP Bmp; WORD bpp; - - if (!hDc) // CreateBitmap + HDC hdcDest; + + if (!hDc) /* 1bpp monochrome bitmap */ { // Should use System Bitmap DC hSystemBM, with CreateCompatibleDC for this. - hDc = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE); - if (!hDc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); + hdcDest = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE); + if(!hdcDest) + { return NULL; } - - Dc = DC_LockDc(hDc); - if (!Dc) - { - NtGdiDeleteObjectApp(hDc); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return NULL; - } - bpp = 1; - Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); - - DC_UnlockDc(Dc); - NtGdiDeleteObjectApp(hDc); - } - else // CreateCompatibleBitmap - { - Dc = DC_LockDc(hDc); - if (!Dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return NULL; - } - /* pbmi == null - First create an un-initialised bitmap. The depth of the bitmap - should match that of the hdc and not that supplied in bmih. - */ - if (pbmi) - bpp = pbmi->bmiHeader.bV5BitCount; - else - { - if (Dc->dctype != DC_TYPE_MEMORY) - bpp = Dc->ppdev->gdiinfo.cBitsPixel; - else - { - DIBSECTION dibs; - INT Count; - SURFACE *psurf = Dc->dclevel.pSurface; - Count = BITMAP_GetObject(psurf, sizeof(dibs), &dibs); - if (!Count) - bpp = 1; - else - { - if (Count == sizeof(BITMAP)) - /* A device-dependent bitmap is selected in the DC */ - bpp = dibs.dsBm.bmBitsPixel; - else - /* A DIB section is selected in the DC */ - bpp = dibs.dsBmih.biBitCount; - } - } - } - Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); - DC_UnlockDc(Dc); + } + else + { + hdcDest = hDc; + } + + Dc = DC_LockDc(hdcDest); + if (!Dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + /* It's OK to set bpp=0 here, as IntCreateDIBitmap will create a compatible Bitmap + * if bpp != 1 and ignore the real value that was passed */ + if (pbmi) + bpp = pbmi->bmiHeader.bV5BitCount; + else + bpp = 0; + Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); + DC_UnlockDc(Dc); + + if(!hDc) + { + NtGdiDeleteObjectApp(hdcDest); } return Bmp; }

1 0

[jgardou] 47734: [GDI32] - Protect CreateDIBitmap - Pass correct data size to NtGdiCreateDIBitmap
by jgardou＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: jgardou Date: Thu Jun 10 12:58:52 2010 New Revision: 47734 URL: http://svn.reactos.org/svn/reactos?rev=47734&view=rev Log: [GDI32] - Protect CreateDIBitmap - Pass correct data size to NtGdiCreateDIBitmap Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/gdi3… ============================================================================== --- branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Thu Jun 10 12:58:52 2010 @@ -461,9 +461,10 @@ LONG width, height, compr, dibsize; WORD planes, bpp; // PDC_ATTR pDc_Attr; - UINT ConvertedInfoSize; + UINT InfoSize; UINT cjBmpScanSize; HBITMAP hBmp; + NTSTATUS Status = STATUS_SUCCESS; if (!Header) return 0; @@ -476,9 +477,25 @@ // For Icm support. // GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) - /* Mmmh, this is not really safe */ - cjBmpScanSize = DIB_BitmapBitsSize(Data); - DPRINT("pBMI %x, Size bpp %d, dibsize %d, Conv %d, BSS %d\n", Data,bpp,dibsize,ConvertedInfoSize,cjBmpScanSize); + _SEH2_TRY + { + cjBmpScanSize = DIB_BitmapBitsSize(Data); + CalculateColorTableSize(&Data->bmiHeader, &ColorUse, &InfoSize); + InfoSize += Data->bmiHeader.biSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + if(!NT_SUCCESS(Status)) + { + GdiSetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + DPRINT("pBMI %x, Size bpp %d, dibsize %d, Conv %d, BSS %d\n", Data,bpp,dibsize,InfoSize,cjBmpScanSize); if ( !width || !height ) hBmp = GetStockObject(DEFAULT_BITMAP); @@ -491,7 +508,7 @@ (LPBYTE)Bits, (LPBITMAPINFO)Data, ColorUse, - ConvertedInfoSize, + InfoSize, cjBmpScanSize, 0, 0);

1 0

[jgardou] 47733: [WIN32K] - Split NtGdiCreateDIBitmapInternal with its Gre Counterpart - Set bV5ImageSize if it was not already set - Probe bits we're given in NtGdiSetDIBits - SEHize clipboard image data access
by jgardou＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: jgardou Date: Thu Jun 10 11:36:20 2010 New Revision: 47733 URL: http://svn.reactos.org/svn/reactos?rev=47733&view=rev Log: [WIN32K] - Split NtGdiCreateDIBitmapInternal with its Gre Counterpart - Set bV5ImageSize if it was not already set - Probe bits we're given in NtGdiSetDIBits - SEHize clipboard image data access Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h branches/reactos-yarotows/subsystems/win32/win32k/ntuser/clipboard.c 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 Jun 10 11:36:20 2010 @@ -36,3 +36,15 @@ IN ULONG cjBits, IN OPTIONAL PVOID pvBits); +HBITMAP +FASTCALL +GreCreateDIBitmapInternal( + IN HDC hDc, + IN INT cx, + IN INT cy, + IN DWORD fInit, + IN OPTIONAL LPBYTE pjInit, + IN OPTIONAL PBITMAPV5INFO pbmi, + IN DWORD iUsage, + IN FLONG fl, + IN HANDLE hcmXform); Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Thu Jun 10 11:36:20 2010 @@ -243,31 +243,45 @@ /*==============================================================*/ HANDLE FASTCALL -renderBITMAPfromDIB(LPBYTE hDIB) +renderBITMAPfromDIB(LPBYTE pDIB) { HDC hdc; HBITMAP hbitmap; unsigned int offset; - BITMAPINFOHEADER *ih; + BITMAPV5INFO bmi; + NTSTATUS Status ; //hdc = UserGetDCEx(NULL, NULL, DCX_USESTYLE); hdc = UserGetDCEx(ClipboardWindow, NULL, DCX_USESTYLE); - ih = (BITMAPINFOHEADER *)hDIB; - - offset = sizeof(BITMAPINFOHEADER) + ((ih->biBitCount <= 8) ? (sizeof(RGBQUAD) * (1 << ih->biBitCount)) : 0); - - hbitmap = NtGdiCreateDIBitmapInternal(hdc, - ih->biWidth, - ih->biHeight, - CBM_INIT, - (LPBYTE)ih+offset, - (LPBITMAPINFO)ih, - DIB_RGB_COLORS, - ih->biBitCount, - ih->biSizeImage, - 0, - 0); + /* Probe it */ + _SEH2_TRY + { + Status = ProbeAndConvertToBitmapV5Info(&bmi, (BITMAPINFO*)pDIB, DIB_RGB_COLORS, 0); + offset = DIB_BitmapInfoSize((BITMAPINFO*)pDIB, DIB_RGB_COLORS); + ProbeForRead(pDIB + offset, bmi.bmiHeader.bV5SizeImage, 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + if(!NT_SUCCESS(Status)) + { + UserReleaseDC(ClipboardWindow, hdc, FALSE); + return NULL; + } + + hbitmap = GreCreateDIBitmapInternal(hdc, + bmi.bmiHeader.bV5Width, + bmi.bmiHeader.bV5Height, + CBM_INIT, + pDIB+offset, + &bmi, + DIB_RGB_COLORS, + 0, + 0); //UserReleaseDC(NULL, hdc, FALSE); UserReleaseDC(ClipboardWindow, hdc, FALSE); 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 Jun 10 11:36:20 2010 @@ -355,7 +355,7 @@ _SEH2_TRY { Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, bmi, ColorUse, 0); - /* Don't check Bits and hope we won't die */ + ProbeForRead(Bits, bmiLocal.bmiHeader.bV5SizeImage, 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1130,28 +1130,53 @@ IN FLONG fl, IN HANDLE hcmXform) { + BITMAPV5INFO bmiLocal ; + NTSTATUS Status = STATUS_SUCCESS; + + _SEH2_TRY + { + if(pbmi) Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, pbmi, iUsage, cjMaxInitInfo); + if(pjInit && (fInit == CBM_INIT)) ProbeForRead(pjInit, cjMaxBits, 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return NULL; + } + + return GreCreateDIBitmapInternal(hDc, + cx, + cy, + fInit, + pjInit, + pbmi ? &bmiLocal : NULL, + iUsage, + fl, + hcmXform); +} + +HBITMAP +FASTCALL +GreCreateDIBitmapInternal( + IN HDC hDc, + IN INT cx, + IN INT cy, + IN DWORD fInit, + IN OPTIONAL LPBYTE pjInit, + IN OPTIONAL PBITMAPV5INFO pbmi, + IN DWORD iUsage, + IN FLONG fl, + IN HANDLE hcmXform) +{ PDC Dc; HBITMAP Bmp; - UINT bpp; - BITMAPV5INFO bmiLocal ; - NTSTATUS Status = STATUS_SUCCESS; - - _SEH2_TRY - { - if(pbmi) Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, pbmi, iUsage, cjMaxInitInfo); - if(pjInit && (fInit == CBM_INIT)) ProbeForRead(pjInit, cjMaxBits, 1); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return NULL; - } + WORD bpp; if (!hDc) // CreateBitmap { // Should use System Bitmap DC hSystemBM, with CreateCompatibleDC for this. @@ -1170,7 +1195,7 @@ return NULL; } bpp = 1; - Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi ? &bmiLocal : NULL, iUsage); + Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); DC_UnlockDc(Dc); NtGdiDeleteObjectApp(hDc); @@ -1188,7 +1213,7 @@ should match that of the hdc and not that supplied in bmih. */ if (pbmi) - bpp = bmiLocal.bmiHeader.bV5BitCount; + bpp = pbmi->bmiHeader.bV5BitCount; else { if (Dc->dctype != DC_TYPE_MEMORY) @@ -1212,7 +1237,7 @@ } } } - Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi ? &bmiLocal : NULL, iUsage); + Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); DC_UnlockDc(Dc); } return Bmp; @@ -1800,7 +1825,9 @@ /* Set some default values */ pbmhDst->bV5Compression = BI_RGB; - pbmhDst->bV5SizeImage = 0; + pbmhDst->bV5SizeImage = DIB_GetDIBImageBytes(pbch->bcWidth, + pbch->bcHeight, + pbch->bcPlanes*pbch->bcBitCount) ; pbmhDst->bV5XPelsPerMeter = 72; pbmhDst->bV5YPelsPerMeter = 72; pbmhDst->bV5ClrUsed = 0; @@ -1810,6 +1837,10 @@ { /* Copy valid fields */ memcpy(pbmiDst, pbmiUnsafe, dwSize); + if(!pbmhDst->bV5SizeImage) + pbmhDst->bV5SizeImage = DIB_GetDIBImageBytes(pbmhDst->bV5Width, + pbmhDst->bV5Height, + pbmhDst->bV5Planes*pbmhDst->bV5BitCount) ; if(dwSize < sizeof(BITMAPV5HEADER)) { @@ -1939,7 +1970,7 @@ else { /* Copy valid Fields, keep bmiHeader.biSize safe */ - RtlCopyMemory(&pbmiDst->bmiHeader.biWidth, + RtlCopyMemory(&pbmiDst->bmiHeader.biWidth, &pbmiSrc->bmiHeader.bV5Width, pbmiDst->bmiHeader.biSize - sizeof(DWORD)); } @@ -1957,7 +1988,7 @@ ULONG cColorsUsed; cColorsUsed = pbmiSrc->bmiHeader.bV5ClrUsed; - if (cColorsUsed == 0 && pbmiSrc->bmiHeader.bV5BitCount <= 8) + if (cColorsUsed == 0 && pbmiSrc->bmiHeader.bV5BitCount <= 8) cColorsUsed = (1 << pbmiSrc->bmiHeader.bV5BitCount); if(dwColorUse == DIB_PAL_COLORS)

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2010