Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 30951: Add palette mode flags.
by jimtabor＠svn.reactos.org 02 Dec '07

02 Dec '07

Author: jimtabor Date: Sun Dec 2 06:08:00 2007 New Revision: 30951 URL: http://svn.reactos.org/svn/reactos?rev=30951&view=rev Log: Add palette mode flags. Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/palette.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/palette.h Sun Dec 2 06:08:00 2007 @@ -8,6 +8,28 @@ #define PALETTE_PRIVATE 0x1000 /* private colormap, identity mapping */ #define PALETTE_WHITESET 0x2000 + +// Palette mode flags +#if 0 // Defined in ddk/winddi.h +#define PAL_INDEXED 0x00000001 +#define PAL_BITFIELDS 0x00000002 +#define PAL_RGB 0x00000004 +#define PAL_BGR 0x00000008 +#define PAL_CMYK 0x00000010 +#endif +#define PAL_DC 0x00000100 +#define PAL_FIXED 0x00000200 +#define PAL_FREE 0x00000400 +#define PAL_MANAGED 0x00000800 +#define PAL_NOSTATIC 0x00001000 +#define PAL_MONOCHROME 0x00002000 +#define PAL_BRUSHHACK 0x00004000 +#define PAL_DIBSECTION 0x00008000 +#define PAL_NOSTATIC256 0x00010000 +#define PAL_HT 0x00100000 +#define PAL_RGB16_555 0x00200000 +#define PAL_RGB16_565 0x00400000 +#define PAL_GAMMACORRECTION 0x00800000 typedef struct { int shift;

1 0

[jimtabor] 30950: Add GdiDevice flags.
by jimtabor＠svn.reactos.org 02 Dec '07

02 Dec '07

Author: jimtabor Date: Sun Dec 2 03:42:31 2007 New Revision: 30950 URL: http://svn.reactos.org/svn/reactos?rev=30950&view=rev Log: Add GdiDevice flags. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Sun Dec 2 03:42:31 2007 @@ -12,7 +12,23 @@ #define GDI_DC_TYPE (1) - +// GDIDEVICE flags +#define PDEV_DISPLAY 0x00000001 // Display device +#define PDEV_HARDWARE_POINTER 0x00000002 // Supports hardware cursor +#define PDEV_SOFTWARE_POINTER 0x00000004 +#define PDEV_GOTFONTS 0x00000040 // Has font driver +#define PDEV_PRINTER 0x00000080 +#define PDEV_ALLOCATEDBRUSHES 0x00000100 +#define PDEV_HTPAL_IS_DEVPAL 0x00000200 +#define PDEV_DISABLED 0x00000400 +#define PDEV_SYNCHRONIZE_ENABLED 0x00000800 +#define PDEV_FONTDRIVER 0x00002000 // Font device +#define PDEV_GAMMARAMP_TABLE 0x00004000 +#define PDEV_UMPD 0x00008000 +#define PDEV_SHARED_DEVLOCK 0x00010000 +#define PDEV_META_DEVICE 0x00020000 +#define PDEV_DRIVER_PUNTED_CALL 0x00040000 // Driver calls back to GDI engine +#define PDEV_CLONE_DEVICE 0x00080000 typedef struct _GDIPOINTER /* should stay private to ENG */ { @@ -40,6 +56,7 @@ ULONG lucExcLock; ULONG Tid; + FLONG flFlags; PERESOURCE hsemDevLock; PVOID pvGammaRamp;

1 0

[peterw] 30949: - Change the MinGW prompt's 'makex' use cpucount.exe as well.
by peterw＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: peterw Date: Sun Dec 2 02:47:02 2007 New Revision: 30949 URL: http://svn.reactos.org/svn/reactos?rev=30949&view=rev Log: - Change the MinGW prompt's 'makex' use cpucount.exe as well. Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Sun Dec 2 02:47:02 2007 @@ -29,7 +29,16 @@ echo. echo. +:: +:: Get the number of CPUs in the system so we know how many jobs to execute. +:: To modify the number used alter the options used with cpucount: +:: No Option - Number of CPUs. +:: -x1 - Number of CPUs, plus 1. +:: -x2 - Number of CPUs, doubled. +:: +for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i + doskey MAKE = "%_ROSBE_MINGWMAKE%" $* -doskey MAKEX = "%_ROSBE_MINGWMAKE%" -j %NUMBER_OF_PROCESSORS% $* +doskey MAKEX = "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% $* :EOC

1 0

[peterw] 30948: - Bump NASM to 2.00 final.
by peterw＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: peterw Date: Sun Dec 2 02:15:45 2007 New Revision: 30948 URL: http://svn.reactos.org/svn/reactos?rev=30948&view=rev Log: - Bump NASM to 2.00 final. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Sun Dec 2 02:15:45 2007 @@ -1,6 +1,6 @@ *** XXX XXth, 200X - RosBE 1.1 Released -- Updated: NASM to 2.00rc1 (Peter Ward) +- Updated: NASM to 2.00 (Peter Ward) - Updated: GDB to 6.7.5.20071121 (Peter Ward) - Updated RosBE Configuration Tool. (Pierre Schweitzer) Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available.

1 0

[jimtabor] 30947: Imp NtGdiMirrorWindowOrg, GetDeviceWidth and finish SetLayout.
by jimtabor＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: jimtabor Date: Sun Dec 2 00:47:27 2007 New Revision: 30947 URL: http://svn.reactos.org/svn/reactos?rev=30947&view=rev Log: Imp NtGdiMirrorWindowOrg, GetDeviceWidth and finish SetLayout. Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c Sun Dec 2 00:47:27 2007 @@ -218,28 +218,6 @@ return TRUE; } -int -STDCALL -NtGdiGetGraphicsMode ( HDC hDC ) -{ - PDC dc; - PDC_ATTR Dc_Attr; - int GraphicsMode; // default to failure - - dc = DC_LockDc ( hDC ); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - GraphicsMode = Dc_Attr->iGraphicsMode; - - DC_UnlockDc(dc); - return GraphicsMode; -} - BOOL STDCALL NtGdiGetTransform(HDC hDC, @@ -605,43 +583,6 @@ int STDCALL -NtGdiSetGraphicsMode(HDC hDC, - int Mode) -{ - INT ret; - PDC dc; - PDC_ATTR Dc_Attr; - - dc = DC_LockDc (hDC); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - /* One would think that setting the graphics mode to GM_COMPATIBLE - * would also reset the world transformation matrix to the unity - * matrix. However, in Windows, this is not the case. This doesn't - * make a lot of sense to me, but that's the way it is. - */ - - if ((Mode != GM_COMPATIBLE) && (Mode != GM_ADVANCED)) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return 0; - } - - ret = Dc_Attr->iGraphicsMode; - Dc_Attr->iGraphicsMode = Mode; - DC_UnlockDc(dc); - return ret; -} - -int -STDCALL IntGdiSetMapMode(PDC dc, int MapMode) { @@ -959,8 +900,44 @@ return TRUE; } - /* - * @unimplemented +// +// Mirror Window function. +// +VOID +FASTCALL +IntMirrorWindowOrg(PDC dc) +{ + PDC_ATTR Dc_Attr; + LONG X; + + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + if (!(Dc_Attr->dwLayout & LAYOUT_RTL)) + { + Dc_Attr->ptlWindowOrg.x = Dc_Attr->lWindowOrgx; // Flip it back. + return; + } + if (!Dc_Attr->szlViewportExt.cx) return; + // + // WOrgx = wox - (Width - 1) * WExtx / VExtx + // + X = (dc->erclWindow.right - dc->erclWindow.left) - 1; // Get device width - 1 + + X = ( X * Dc_Attr->szlWindowExt.cx) / Dc_Attr->szlViewportExt.cx; + + Dc_Attr->ptlWindowOrg.x = Dc_Attr->lWindowOrgx - X; // Now set the inverted win origion. + + return; +} + +// NtGdiSetLayout +// +// The default is left to right. This function changes it to right to left, which +// is the standard in Arabic and Hebrew cultures. +// +/* + * @implemented */ DWORD APIENTRY @@ -990,12 +967,70 @@ DC_UnlockDc(dc); return oLayout; } - + + if (dwLayout & LAYOUT_RTL) Dc_Attr->iMapMode = MM_ANISOTROPIC; + + Dc_Attr->szlWindowExt.cy = -Dc_Attr->szlWindowExt.cy; + Dc_Attr->ptlWindowOrg.x = -Dc_Attr->ptlWindowOrg.x; + + if (wox == -1) + IntMirrorWindowOrg(dc); + else + Dc_Attr->ptlWindowOrg.x = wox - Dc_Attr->ptlWindowOrg.x; + + if (!(Dc_Attr->flTextAlign & TA_CENTER)) Dc_Attr->flTextAlign |= TA_RIGHT; + + if (dc->w.ArcDirection == AD_CLOCKWISE) + dc->w.ArcDirection = AD_COUNTERCLOCKWISE; + else + dc->w.ArcDirection = AD_CLOCKWISE; + + Dc_Attr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); + // DC_UpdateXforms(dc); DC_UnlockDc(dc); - - UNIMPLEMENTED; - return GDI_ERROR; + return oLayout; +} + +/* + * @implemented + */ +LONG +APIENTRY +NtGdiGetDeviceWidth( + IN HDC hdc) +{ + PDC dc; + LONG Ret; + dc = DC_LockDc(hdc); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + Ret = dc->erclWindow.right - dc->erclWindow.left; + DC_UnlockDc(dc); + return Ret; +} + +/* + * @implemented + */ +BOOL +APIENTRY +NtGdiMirrorWindowOrg( + IN HDC hdc) +{ + PDC dc; + dc = DC_LockDc(hdc); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + IntMirrorWindowOrg(dc); + DC_UnlockDc(dc); + return TRUE; } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Sun Dec 2 00:47:27 2007 @@ -3096,30 +3096,6 @@ /* * @unimplemented */ -LONG -APIENTRY -NtGdiGetDeviceWidth( - IN HDC hdc) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiMirrorWindowOrg( - IN HDC hdc) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ INT APIENTRY NtGdiStretchDIBitsInternal(

1 0

[jimtabor] 30946: Complete driver function table. This is the best we can do for now.
by jimtabor＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: jimtabor Date: Sun Dec 2 00:39:28 2007 New Revision: 30946 URL: http://svn.reactos.org/svn/reactos?rev=30946&view=rev Log: Complete driver function table. This is the best we can do for now. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Sun Dec 2 00:39:28 2007 @@ -381,6 +381,7 @@ PGD_OFFSET Offset; PGD_RESETPDEV ResetPDEV; PGD_DISABLEDRIVER DisableDriver; + PVOID Unknown0; PGD_CREATEDEVICEBITMAP CreateDeviceBitmap; PGD_DELETEDEVICEBITMAP DeleteDeviceBitmap; PGD_REALIZEBRUSH RealizeBrush; @@ -392,9 +393,10 @@ PGD_BITBLT BitBlt; PGD_COPYBITS CopyBits; PGD_STRETCHBLT StretchBlt; - PGD_SETPALETTE SetPalette; + PVOID Unknown1; + PGD_SETPALETTE SetPalette; PGD_TEXTOUT TextOut; - PGD_ESCAPE Escape; + PGD_ESCAPE Escape; PGD_DRAWESCAPE DrawEscape; PGD_QUERYFONT QueryFont; PGD_QUERYFONTTREE QueryFontTree; @@ -406,8 +408,10 @@ PGD_STARTPAGE StartPage; PGD_ENDDOC EndDoc; PGD_STARTDOC StartDoc; + PVOID Unknown2; PGD_GETGLYPHMODE GetGlyphMode; PGD_SYNCHRONIZE Synchronize; + PVOID Unknown3; PGD_SAVESCREENBITS SaveScreenBits; PGD_GETMODES GetModes; PGD_FREE Free; @@ -431,6 +435,7 @@ PGD_ENABLEDIRECTDRAW EnableDirectDraw; PGD_DISABLEDIRECTDRAW DisableDirectDraw; PGD_QUERYSPOOLTYPE QuerySpoolType; + PVOID Unknown4; PFN_DrvIcmCreateColorTransform IcmCreateColorTransform; PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform; PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits; @@ -440,9 +445,9 @@ PFN_DrvPlgBlt PlgBlt; PGD_ALPHABLEND AlphaBlend; // PFN_DrvSynthesizeFont SynthesizeFont; - PVOID Unknown1; + PVOID Unknown5; // PFN_DrvGetSynthesizedFontFiles GetSynthesizedFontFiles; - PVOID Unknown2; + PVOID Unknown6; PGD_TRANSPARENTBLT TransparentBlt; PFN_DrvQueryPerBandInfo QueryPerBandInfo; PFN_DrvQueryDeviceSupport QueryDeviceSupport;

1 0

[pschweitzer] 30945: Updated French translation
by pschweitzer＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: pschweitzer Date: Sat Dec 1 23:58:21 2007 New Revision: 30945 URL: http://svn.reactos.org/svn/reactos?rev=30945&view=rev Log: Updated French translation Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc Sat Dec 1 23:58:21 2007 @@ -5,7 +5,7 @@ CAPTION "Paramètres de l'Environnement de Compilation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Chemin vers le compilateur GCC", 0x0, 10, 107, 110, 15 + LTEXT "Chemin vers MinGW/GCC", 0x0, 10, 107, 110, 15 LTEXT "Couleur d'arrière plan", 0x0, 10, 10, 75, 12 COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Couleur de la police", 0x0, 10, 35, 75, 12 @@ -48,25 +48,25 @@ CLR13, "Violet Clair" CLR14, "Jaune Clair" CLR15, "Blanc Brillant" - MSG_NOGCCFOUND, "Impossible de trouver le compilateur GCC ! Veuillez vérifier votre répertoire." + MSG_NOGCCFOUND, "Impossible de trouver MinGW/GCC ! Veuillez vérifier votre répertoire." MSG_FILEFAILED, "Impossible de créer rosbe-options.cmd !" MSG_DIREFAILED, "Impossible de créer le répertoire pour le journal !" - MSG_SETLOADSUC, "Paramètres précédents chargés avec succès" + MSG_SETLOADSUC, "Paramètres précédents chargés avec succès." MSG_FINDLOGDIR, "Veuillez choisir le répertoire où seront stockés les journaux :" - MSG_FINDMGWDIR, "Veuillez sélectionner le répertoire où se situe MingW :" + MSG_FINDMGWDIR, "Veuillez sélectionner le répertoire où se situe MingW/GCC :" MSG_FINDOBJDIR, "Veuillez choisir le répertoire où vous désirez sauver les fichiers OBJ :" MSG_FINDOUTDIR, "Veuillez choisir le répertoire où vous désirez sauver les fichiers OUT :" /* Help Strings */ - HLP_BACKCOLORC, "Choisissez la couleur de fond pour les fenêtres DOS du RosBE" - HLP_FONTCOLORC, "Choisissez la couleur du texte pour les fenêtres DOS du RosBE" - HLP_SBUILDTIME, "Vous permet d'afficher à la fin de la compilation le temps qu'elle a pris" - HLP_CCACHEUSED, "Cochez si vous désirez utiliser le cache de compilation" - HLP_STRIPEDEXE, "Cochez si vous désirez produire des exécutables optimisés" - HLP_FINDMGWDIR, "Ce paramètre vous permet de définir le repertoire où se situe MingW" - HLP_FINDLOGDIR, "Ce paramètre vous permet de choisir où seront stockés les journaux de compilation" - HLP_FINDOBJDIR, "Ce paramètre vous permet de choisir où seront stockés les fichiers OBJ" - HLP_FINDOUTDIR, "Ce paramètre vous permet de choisir où seront stockés les fichiers OUT" - HLP_SAVEBUTTON, "Activé en cas de changement de paramètres, permet de quitter en sauvant" - HLP_QUITBUTTON, "Ce bouton vous permet de quitter la configuration sans sauvegarder" - HLP_DEFAULTMSG, "Passez sur un contrôle pour avoir de l'aide" + HLP_BACKCOLORC, "Choisissez la couleur de fond pour les fenêtres DOS du RosBE." + HLP_FONTCOLORC, "Choisissez la couleur du texte pour les fenêtres DOS du RosBE." + HLP_SBUILDTIME, "Vous permet d'afficher à la fin de la compilation le temps qu'elle a pris." + HLP_CCACHEUSED, "Cochez si vous désirez utiliser le cache de compilation." + HLP_STRIPEDEXE, "Cochez si vous désirez produire des exécutables optimisés." + HLP_FINDMGWDIR, "Ce paramètre vous permet de définir le repertoire où se situe MingW/GCC." + HLP_FINDLOGDIR, "Ce paramètre vous permet de choisir où seront stockés les journaux de compilation." + HLP_FINDOBJDIR, "Ce paramètre vous permet de choisir où seront stockés les fichiers OBJ." + HLP_FINDOUTDIR, "Ce paramètre vous permet de choisir où seront stockés les fichiers OUT." + HLP_SAVEBUTTON, "Activé quand un paramètre est changé, permet de quitter en sauvant." + HLP_QUITBUTTON, "Ce bouton vous permet de quitter la configuration sans sauvegarder." + HLP_DEFAULTMSG, "Passez sur un contrôle pour avoir de l'aide." END

1 0

[pschweitzer] 30944: Updated French translation
by pschweitzer＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: pschweitzer Date: Sat Dec 1 23:21:50 2007 New Revision: 30944 URL: http://svn.reactos.org/svn/reactos?rev=30944&view=rev Log: Updated French translation Modified: trunk/rosapps/applications/screensavers/blankscr/lang/fr-FR.rc Modified: trunk/rosapps/applications/screensavers/blankscr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/fr-FR.rc (original) +++ trunk/rosapps/applications/screensavers/blankscr/lang/fr-FR.rc Sat Dec 1 23:21:50 2007 @@ -2,7 +2,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Blank" + IDS_DESCRIPTION "Vide" IDS_TITLE "À propos de" IDS_TEXT "Il n'y a aucune option à définir." END

1 0

[pschweitzer] 30943: Updated French translations
by pschweitzer＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: pschweitzer Date: Sat Dec 1 23:14:16 2007 New Revision: 30943 URL: http://svn.reactos.org/svn/reactos?rev=30943&view=rev Log: Updated French translations Modified: trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Modified: trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/fr-F… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc Sat Dec 1 23:14:16 2007 @@ -159,8 +159,8 @@ IDS_TIMEOUT15 "Après 5 heures" IDS_TIMEOUT16 "Jamais" - IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?" - IDS_DEL_SCHEME_TITLE "Delete Scheme" + IDS_DEL_SCHEME "Êtes-vous sûr de vouloir supprimer le profil d'alimentation ?" + IDS_DEL_SCHEME_TITLE "Supprimer le profil" END 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Sat Dec 1 23:14:16 2007 @@ -342,18 +342,18 @@ OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Open With" +CAPTION "Ouvrir avec" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 - LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "File: ", 14001, 44, 25, 188, 10 - GROUPBOX "&Programs", -1, 7, 42, 249, 187 + LTEXT "Choisissez le programme que vous désirez utiliser pour ouvrir ce fichier :", -1, 44, 12, 211, 10 + LTEXT "Fichier : ", 14001, 44, 25, 188, 10 + GROUPBOX "&Programmes", -1, 7, 42, 249, 187 CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 16, 57, 230, 130 - AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "Toujours utiliser le progr&amme sélectionné pour ouvrir ce type de fichier", 14003, 20, 193, 225, 10 + PUSHBUTTON "Parcourir...", 14004, 198, 207, 50, 14 PUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 + PUSHBUTTON "Annuler", 14006, 206, 236, 50, 14 END STRINGTABLE DISCARDABLE @@ -377,7 +377,7 @@ IDS_DESKTOP "Bureau" IDS_MYCOMPUTER "Poste de travail" IDS_RECYCLEBIN_FOLDER_NAME "Corbeille" - IDS_CONTROLPANEL "Control Panel" + IDS_CONTROLPANEL "Panneau de contrôle" /* context menus */ IDS_VIEW_LARGE "&Grandes icônes"

1 0

[greatlrd] 30942: Fixed regress for lock and unlock in ddraw. now dxsdk example font works again with reactos ddraw.dll in windows
by greatlrd＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: greatlrd Date: Sat Dec 1 22:45:17 2007 New Revision: 30942 URL: http://svn.reactos.org/svn/reactos?rev=30942&view=rev Log: Fixed regress for lock and unlock in ddraw. now dxsdk example font works again with reactos ddraw.dll in windows Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Sat Dec 1 22:45:17 2007 @@ -186,17 +186,25 @@ } -HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7 iface, LPRECT prect, - LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE events) -{ - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; - DDHAL_LOCKDATA mdLock; - - DX_WINDBG_trace(); - - /* FIXME add a check see if lock suport or not */ - - if (prect!=NULL) +HRESULT WINAPI +Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7 iface, LPRECT prect, + LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE events) +{ + LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; + DDHAL_LOCKDATA mdLock; + + DX_WINDBG_trace(); + + DX_WINDBG_trace_res( This->lpLcl->lpGbl->wWidth, This->lpLcl->lpGbl->wHeight, This->lpLcl->lpGbl->lPitch, 0); + + if (events != NULL) + { + return DDERR_INVALIDPARAMS; + } + + /* FIXME add a check see if lock suport or not */ + + if (prect!=NULL) { mdLock.bHasRect = TRUE; memcpy(&mdLock.rArea,prect,sizeof(RECTL)); @@ -206,17 +214,17 @@ mdLock.bHasRect = FALSE; } - //This->lpLcl->lpSurfMore->slist[0]->hDC = This->lpLcl->lpSurfMore->lpDD_lcl->hDC; + //FIXME check if it primary or not and use primary or pixelformat data, at moment it is hardcode to primary mdLock.ddRVal = DDERR_NOTPALETTIZED; mdLock.Lock = This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->HALDDSurface.Lock; mdLock.dwFlags = flags; - mdLock.lpDDSurface = This->lpLcl->lpSurfMore->slist[0]; - mdLock.lpDD = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; + mdLock.lpDDSurface = This->lpLcl->lpSurfMore->slist[0]; + mdLock.lpDD = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; mdLock.lpSurfData = NULL; - if (!DdResetVisrgn(This->lpLcl->lpSurfMore->slist[0], NULL)) + if (!DdResetVisrgn(This->lpLcl->lpSurfMore->slist[0], NULL)) { DX_STUB_str("Here DdResetVisrgn lock"); return DDERR_UNSUPPORTED; @@ -233,8 +241,8 @@ if (pDDSD != NULL) { - ZeroMemory(pDDSD,sizeof(DDSURFACEDESC2)); - pDDSD->dwSize = sizeof(DDSURFACEDESC2); + ZeroMemory(pDDSD,sizeof(DDSURFACEDESC2)); + pDDSD->dwSize = sizeof(DDSURFACEDESC2); //if (pDDSD->dwSize == sizeof(DDSURFACEDESC2)) //{ @@ -253,16 +261,12 @@ pDDSD->lpSurface = (LPVOID) mdLock.lpSurfData; - pDDSD->dwHeight =This->lpLcl->lpGbl->wHeight; - pDDSD->dwWidth = This->lpLcl->lpGbl->wWidth; - - - - - pDDSD->ddpfPixelFormat.dwRGBBitCount = This->lpLcl->lpGbl->lPitch/ 8; - pDDSD->lPitch = This->lpLcl->lpGbl->lPitch; - pDDSD->dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; - + pDDSD->dwHeight =This->lpLcl->lpGbl->wHeight; + pDDSD->dwWidth = This->lpLcl->lpGbl->wWidth; + + pDDSD->ddpfPixelFormat.dwRGBBitCount = This->lpLcl->lpGbl->lpDD->lpModeInfo->dwBPP;// .lpModeInfo->dwBPP; //This->lpLcl->lpGbl->lPitch/ 8; + pDDSD->lPitch = This->lpLcl->lpGbl->lPitch; + pDDSD->dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; } return mdLock.ddRVal;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs