Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 30719: Also set the working directory for the "Options" shortcut correctly
by cfinck＠svn.reactos.org 24 Nov '07

24 Nov '07

Author: cfinck Date: Sat Nov 24 16:11:41 2007 New Revision: 30719 URL: http://svn.reactos.org/svn/reactos?rev=30719&view=rev Log: Also set the working directory for the "Options" shortcut correctly Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Sat Nov 24 16:11:41 2007 @@ -142,7 +142,7 @@ File /r Components\Tools\options.exe !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" - SetOutPath $REACTOS_SOURCE_DIRECTORY + SetOutPath $INSTDIR CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options.lnk" \ "$INSTDIR\Tools\options.exe" !insertmacro MUI_STARTMENU_WRITE_END

1 0

[peterw] 30718: - Add a pushd/popd to options.cmd so that options.exe pulls up a better default path for MinGW/GCC.
by peterw＠svn.reactos.org 24 Nov '07

24 Nov '07

Author: peterw Date: Sat Nov 24 16:02:02 2007 New Revision: 30718 URL: http://svn.reactos.org/svn/reactos?rev=30718&view=rev Log: - Add a pushd/popd to options.cmd so that options.exe pulls up a better default path for MinGW/GCC. Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd Sat Nov 24 16:02:02 2007 @@ -14,7 +14,9 @@ :: Run options.exe :: if exist "%_ROSBE_BASEDIR%\Tools\options.exe" ( + pushd "%_ROSBE_BASEDIR%" call "%_ROSBE_BASEDIR%\Tools\options.exe" + popd "%_ROSBE_BASEDIR%" if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( call "%APPDATA%\RosBE\rosbe-options.cmd" )

1 0

[greatlrd] 30717: Main_DirectDraw_EnumDisplayModes Forget Zero out two struct before they are being use
by greatlrd＠svn.reactos.org 24 Nov '07

24 Nov '07

Author: greatlrd Date: Sat Nov 24 15:57:26 2007 New Revision: 30717 URL: http://svn.reactos.org/svn/reactos?rev=30717&view=rev Log: Main_DirectDraw_EnumDisplayModes Forget Zero out two struct before they are being use Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Sat Nov 24 15:57:26 2007 @@ -24,6 +24,8 @@ DX_WINDBG_trace(); + ZeroMemory(&DevMode, sizeof(DEVMODE)); + _SEH_TRY { @@ -44,6 +46,8 @@ while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0) == TRUE) { DDSURFACEDESC2 SurfaceDesc; + + ZeroMemory(&SurfaceDesc, sizeof(DDSURFACEDESC2)); iMode++;

1 0

[pschweitzer] 30716: Updated French translation
by pschweitzer＠svn.reactos.org 24 Nov '07

24 Nov '07

Author: pschweitzer Date: Sat Nov 24 14:20:53 2007 New Revision: 30716 URL: http://svn.reactos.org/svn/reactos?rev=30716&view=rev Log: Updated French translation Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc 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 Nov 24 14:20:53 2007 @@ -328,16 +328,16 @@ BITBUCKET_PROPERTIES_DLG DIALOGEX 0, 0, 240, 190 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Recycle Bin Properties" +CAPTION "Proprétés de la corbeille" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 - GROUPBOX "Settings for selected location", -1, 10, 72, 220, 70 - RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10, WS_TABSTOP + GROUPBOX "Paramètres pour la localisation sélectionnée", -1, 10, 72, 220, 70 + RADIOBUTTON "Taille personnalisée :", 14001, 20, 90, 80, 10, WS_TABSTOP EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER - LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 - RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP + LTEXT "T&aille maximale (MO) :", -1, 20, 105, 70, 10 + RADIOBUTTON "Ne pas déplacer les fichie&rs vers la Corbeille. Effacer les fichiers immédiatement lors de la suppression.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP + RADIOBUTTON "Afficher une fenêtre de confirmation d'effacement", 14004, 20, 155, 140, 10, WS_TABSTOP END STRINGTABLE DISCARDABLE @@ -428,11 +428,11 @@ IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Disque réseau" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." - - IDS_SHELL_ABOUT_AUTHORS "&Authors" - IDS_SHELL_ABOUT_BACK "< &Back" + IDS_OPEN_WITH "Ouvrir avec" + IDS_OPEN_WITH_CHOOSE "Choisir le programme..." + + IDS_SHELL_ABOUT_AUTHORS "&Auteurs" + IDS_SHELL_ABOUT_BACK "< Précédent" FCIDM_SHVIEW_NEW "Nouveau" FCIDM_SHVIEW_NEWFOLDER "Nouveau d&ossier" FCIDM_SHVIEW_NEWLINK "Nouveau &lien"

1 0

[fireball] 30715: - Add crt headers from trunk 30714, so that the branch could be built with RosBE 1.0.
by fireball＠svn.reactos.org 24 Nov '07

24 Nov '07

Author: fireball Date: Sat Nov 24 13:34:29 2007 New Revision: 30715 URL: http://svn.reactos.org/svn/reactos?rev=30715&view=rev Log: - Add crt headers from trunk 30714, so that the branch could be built with RosBE 1.0. Added: branches/olpc/include/crt/_mingw.h (with props) branches/olpc/include/crt/assert.h (with props) branches/olpc/include/crt/complex.h (with props) branches/olpc/include/crt/conio.h (with props) branches/olpc/include/crt/ctype.h (with props) branches/olpc/include/crt/direct.h (with props) branches/olpc/include/crt/dirent.h (with props) branches/olpc/include/crt/dos.h (with props) branches/olpc/include/crt/errno.h (with props) branches/olpc/include/crt/fcntl.h (with props) branches/olpc/include/crt/fenv.h (with props) branches/olpc/include/crt/float.h (with props) branches/olpc/include/crt/getopt.h (with props) branches/olpc/include/crt/inttypes.h (with props) branches/olpc/include/crt/io.h (with props) branches/olpc/include/crt/libgen.h (with props) branches/olpc/include/crt/limits.h (with props) branches/olpc/include/crt/locale.h (with props) branches/olpc/include/crt/malloc.h (with props) branches/olpc/include/crt/math.h (with props) branches/olpc/include/crt/mbctype.h (with props) branches/olpc/include/crt/mbstring.h (with props) branches/olpc/include/crt/mem.h (with props) branches/olpc/include/crt/memory.h (with props) branches/olpc/include/crt/mingw32/ branches/olpc/include/crt/mingw32/float.h (with props) branches/olpc/include/crt/mingw32/stdarg.h (with props) branches/olpc/include/crt/mingw32/stdbool.h (with props) branches/olpc/include/crt/mingw32/stddef.h (with props) branches/olpc/include/crt/process.h (with props) branches/olpc/include/crt/search.h (with props) branches/olpc/include/crt/setjmp.h (with props) branches/olpc/include/crt/share.h (with props) branches/olpc/include/crt/signal.h (with props) branches/olpc/include/crt/stdint.h (with props) branches/olpc/include/crt/stdio.h (with props) branches/olpc/include/crt/stdlib.h (with props) branches/olpc/include/crt/string.h (with props) branches/olpc/include/crt/strings.h (with props) branches/olpc/include/crt/sys/ branches/olpc/include/crt/sys/fcntl.h (with props) branches/olpc/include/crt/sys/file.h (with props) branches/olpc/include/crt/sys/locking.h (with props) branches/olpc/include/crt/sys/param.h (with props) branches/olpc/include/crt/sys/stat.h (with props) branches/olpc/include/crt/sys/time.h (with props) branches/olpc/include/crt/sys/timeb.h (with props) branches/olpc/include/crt/sys/types.h (with props) branches/olpc/include/crt/sys/unistd.h (with props) branches/olpc/include/crt/sys/utime.h (with props) branches/olpc/include/crt/time.h (with props) branches/olpc/include/crt/unistd.h (with props) branches/olpc/include/crt/utime.h (with props) branches/olpc/include/crt/wchar.h (with props) branches/olpc/include/crt/wctype.h (with props) Modified: branches/olpc/include/crt/excpt.h [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/olpc/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/_mingw.h?rev=3… Added: branches/olpc/include/crt/assert.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/assert.h?rev=3… Added: branches/olpc/include/crt/complex.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/complex.h?rev=… Added: branches/olpc/include/crt/conio.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/conio.h?rev=30… Added: branches/olpc/include/crt/ctype.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/ctype.h?rev=30… Added: branches/olpc/include/crt/direct.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/direct.h?rev=3… Added: branches/olpc/include/crt/dirent.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/dirent.h?rev=3… Added: branches/olpc/include/crt/dos.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/dos.h?rev=3071… Added: branches/olpc/include/crt/errno.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/errno.h?rev=30… Modified: branches/olpc/include/crt/excpt.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/excpt.h?rev=30… Added: branches/olpc/include/crt/fcntl.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/fcntl.h?rev=30… Added: branches/olpc/include/crt/fenv.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/fenv.h?rev=307… Added: branches/olpc/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/float.h?rev=30… Added: branches/olpc/include/crt/getopt.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/getopt.h?rev=3… Added: branches/olpc/include/crt/inttypes.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/inttypes.h?rev… Added: branches/olpc/include/crt/io.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/io.h?rev=30715… Added: branches/olpc/include/crt/libgen.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/libgen.h?rev=3… Added: branches/olpc/include/crt/limits.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/limits.h?rev=3… Added: branches/olpc/include/crt/locale.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/locale.h?rev=3… Added: branches/olpc/include/crt/malloc.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/malloc.h?rev=3… Added: branches/olpc/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/math.h?rev=307… Added: branches/olpc/include/crt/mbctype.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/mbctype.h?rev=… Added: branches/olpc/include/crt/mbstring.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/mbstring.h?rev… Added: branches/olpc/include/crt/mem.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/mem.h?rev=3071… Added: branches/olpc/include/crt/memory.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/memory.h?rev=3… Added: branches/olpc/include/crt/mingw32/float.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/mingw32/float.… Added: branches/olpc/include/crt/mingw32/stdarg.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/mingw32/stdarg… Added: branches/olpc/include/crt/mingw32/stdbool.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/mingw32/stdboo… Added: branches/olpc/include/crt/mingw32/stddef.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/mingw32/stddef… Added: branches/olpc/include/crt/process.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/process.h?rev=… Added: branches/olpc/include/crt/search.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/search.h?rev=3… Added: branches/olpc/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/setjmp.h?rev=3… Added: branches/olpc/include/crt/share.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/share.h?rev=30… Added: branches/olpc/include/crt/signal.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/signal.h?rev=3… Added: branches/olpc/include/crt/stdint.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/stdint.h?rev=3… Added: branches/olpc/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/stdio.h?rev=30… Added: branches/olpc/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/stdlib.h?rev=3… Added: branches/olpc/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/string.h?rev=3… Added: branches/olpc/include/crt/strings.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/strings.h?rev=… Added: branches/olpc/include/crt/sys/fcntl.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/sys/fcntl.h?re… Added: branches/olpc/include/crt/sys/file.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/sys/file.h?rev… Added: branches/olpc/include/crt/sys/locking.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/sys/locking.h?… Added: branches/olpc/include/crt/sys/param.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/sys/param.h?re… Added: branches/olpc/include/crt/sys/stat.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/sys/stat.h?rev… Added: branches/olpc/include/crt/sys/time.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/sys/time.h?rev… Added: branches/olpc/include/crt/sys/timeb.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/sys/timeb.h?re… Added: branches/olpc/include/crt/sys/types.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/sys/types.h?re… Added: branches/olpc/include/crt/sys/unistd.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/sys/unistd.h?r… Added: branches/olpc/include/crt/sys/utime.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/sys/utime.h?re… Added: branches/olpc/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/time.h?rev=307… Added: branches/olpc/include/crt/unistd.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/unistd.h?rev=3… Added: branches/olpc/include/crt/utime.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/utime.h?rev=30… Added: branches/olpc/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/wchar.h?rev=30… Added: branches/olpc/include/crt/wctype.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/crt/wctype.h?rev=3…

1 0

[pschweitzer] 30714: - Fixed and enabled about dialog - Added French translation
by pschweitzer＠svn.reactos.org 24 Nov '07

24 Nov '07

Author: pschweitzer Date: Sat Nov 24 12:14:56 2007 New Revision: 30714 URL: http://svn.reactos.org/svn/reactos?rev=30714&view=rev Log: - Fixed and enabled about dialog - Added French translation Added: trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc (with props) Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.c trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild trunk/rosapps/applications/screensavers/butterflies/butterflies.rc Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.c (original) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.c Sat Nov 24 12:14:56 2007 @@ -232,20 +232,14 @@ } BOOL AboutProc(HWND hdlg, UINT msg, WPARAM wpm, LPARAM lpm){ - /* + switch(msg){ case WM_CTLCOLORSTATIC: - if(HWND(lpm) == GetDlgItem(hdlg, WEBPAGE1)) - { - SetTextColor(HDC(wpm), RGB(0,0,255)); - SetBkColor(HDC(wpm), COLORREF(GetSysColor(COLOR_3DFACE))); - return(int(GetSysColorBrush(COLOR_3DFACE))); - } - if(HWND(lpm) == GetDlgItem(hdlg, WEBPAGE2)) - { - SetTextColor(HDC(wpm), RGB(0,0,255)); - SetBkColor(HDC(wpm), COLORREF(GetSysColor(COLOR_3DFACE))); - return(int(GetSysColorBrush(COLOR_3DFACE))); + if(((HWND)lpm == GetDlgItem(hdlg, WEBPAGE1)) || ((HWND)lpm == GetDlgItem(hdlg, WEBPAGE2))) + { + SetTextColor((HDC)wpm, RGB(0,0,255)); + SetBkColor((HDC)wpm, (COLORREF)GetSysColor(COLOR_3DFACE)); + return((int)GetSysColorBrush(COLOR_3DFACE)); } break; case WM_COMMAND: @@ -260,7 +254,7 @@ ShellExecute(NULL, "open", "http://www.thaputer.com", NULL, NULL, SW_SHOWNORMAL); break; } - }*/ + } return FALSE; } @@ -321,7 +315,7 @@ EndDialog(hDlg, TRUE); break; case IDABOUT: - //DialogBox(hInstance, MAKEINTRESOURCE(IDD_DLG_ABOUT), hDlg, DLGPROC(AboutProc)); + DialogBox(hInstance, MAKEINTRESOURCE(IDD_DLG_ABOUT), hDlg, (DLGPROC)AboutProc); break; } } Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild (original) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild Sat Nov 24 12:14:56 2007 @@ -10,6 +10,7 @@ <library>opengl32</library> <library>glu32</library> <library>advapi32</library> + <library>shell32</library> <metadata description = "Butterflies screensaver" /> Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rc Sat Nov 24 12:14:56 2007 @@ -13,4 +13,5 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" #include "lang/uk-UA.rc" Added: trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc (added) +++ trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc Sat Nov 24 12:14:56 2007 @@ -1,0 +1,144 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// French resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_DLG_SCREEN DIALOG DISCARDABLE 0, 0, 172, 57 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Configuration de l'écran de veille de papillons" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,7,35,50,14 + PUSHBUTTON "Annuler",IDCANCEL,61,35,50,14 + CONTROL "Faire tourner les papillons",ROTATE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,35,15,91,8 + PUSHBUTTON "À propos de",IDABOUT,115,35,50,14 +END + +IDD_DLG_ABOUT DIALOG DISCARDABLE 0, 0, 149, 79 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "À propos de" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,48,58,56,14 + CTEXT "Écran de veille de papillons",IDC_STATIC,7,7,135,9 + CTEXT "Démo par : NeHe ",IDC_STATIC,7,20,135,8 + CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY | + NOT WS_GROUP + CTEXT "Écran de veille par : tHaPuTeR",IDC_STATIC,7,38,135,8,NOT + WS_GROUP + CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | + NOT WS_GROUP +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_DLG_SCREEN, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 165 + TOPMARGIN, 7 + BOTTOMMARGIN, 50 + END + + IDD_DLG_ABOUT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 142 + TOPMARGIN, 7 + BOTTOMMARGIN, 72 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_BUTTERFLY1 BITMAP DISCARDABLE "res/butterfly1.bmp" +IDB_BUTTERFLY2 BITMAP DISCARDABLE "res/butterfly2.bmp" +IDB_BUTTERFLY3 BITMAP DISCARDABLE "res/butterfly3.bmp" + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STR_DESCRIP "Papillons" +END + +#endif // French resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[peterw] 30713: - Update the changelog and remove an uneeded set.
by peterw＠svn.reactos.org 24 Nov '07

24 Nov '07

Author: peterw Date: Sat Nov 24 07:27:00 2007 New Revision: 30713 URL: http://svn.reactos.org/svn/reactos?rev=30713&view=rev Log: - Update the changelog and remove an uneeded set. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Sat Nov 24 07:27:00 2007 @@ -121,7 +121,6 @@ :: -x1 - Number of CPUs, plus 1. :: -x2 - Number of CPUs, doubled. :: -set CPUCOUNT= for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i if %_ROSBE_SHOWTIME% == 1 ( 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 Sat Nov 24 07:27:00 2007 @@ -1,4 +1,15 @@ -*** XXX XXth, 200X - RosBE 1.0 Released +*** XXX XXth, 200X - RosBE 1.1 Released + +- Updated: NASM to 2.00rc1 (Peter Ward) +- Updated: GDB to 6.7.5.20071121 (Peter Ward) +- Fix a bug in reladdr2line.cmd. (Peter Ward) +- Change the default ReactOS source directory from APPDATA\RosBE\Source to PROFILE\reactos. (Peter Ward) +- Remove the installation and APPDATA\RosBE directories on uninstall which weren't being removed. (Peter Ward) +- Set the ccache directory to APPDATA\RosBE\.ccache instead of PROFILE\.ccache. (Peter Ward) +- Switch default install directory back to PROGRAMFILES\RosBE. (Peter Ward) +- Add a "Standard MinGW Build Environment" and the associated MinGW.cmd + an icon. (Peter Ward) + +*** Nov 18th, 2007 - RosBE 1.0 Released - Updated: GCC 4.1.3 Build 20071015 with recent patches to get makex run under Vista. (Peter Ward, Mike Nordell) - Updated: Binutils 2.18.50 Build 20071015. (Peter Ward)

1 0

[peterw] 30712: - Fix a typo and add 'makex' to the MinGW prompt for convenience.
by peterw＠svn.reactos.org 24 Nov '07

24 Nov '07

Author: peterw Date: Sat Nov 24 04:20:57 2007 New Revision: 30712 URL: http://svn.reactos.org/svn/reactos?rev=30712&view=rev Log: - Fix a typo and add 'makex' to the MinGW prompt for convenience. 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 Sat Nov 24 04:20:57 2007 @@ -1,13 +1,19 @@ :: :: PROJECT: RosBE - ReactOS Build Environment for Windows :: LICENSE: GPL - See LICENSE.txt in the top level directory. -:: FILE: Root/RosBE.cmd +:: FILE: Root/MinGW.cmd :: PURPOSE: This script provides/sets up a standard MinGW build environment. :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: :: @echo off + +if not "%1" == "" ( + cls + echo Unknown parameter specified. Exiting. + goto :EOC +) color 0A set PATH=%SystemRoot%\system32;%SystemRoot% @@ -17,12 +23,6 @@ set _ROSBE_ORIGINALPATH=%PATH% set _ROSBE_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 -if not "%1" == "" ( - cls - echo Unknown parameter specified. Exiting. - goto :EOC -) - echo. echo. call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" @@ -30,5 +30,6 @@ echo. doskey MAKE = "%_ROSBE_MINGWMAKE%" $* +doskey MAKEX = "%_ROSBE_MINGWMAKE%" -j %NUMBER_OF_PROCESSORS% $* :EOC

1 0

[peterw] 30711: - Change the default ReactOS source directory from $APPDATA\RosBE\Source to $PROFILE\reactos. - Remove the $APPDATA\RosBE directory on uninstall which wasn't being removed.
by peterw＠svn.reactos.org 24 Nov '07

24 Nov '07

Author: peterw Date: Sat Nov 24 04:05:48 2007 New Revision: 30711 URL: http://svn.reactos.org/svn/reactos?rev=30711&view=rev Log: - Change the default ReactOS source directory from $APPDATA\RosBE\Source to $PROFILE\reactos. - Remove the $APPDATA\RosBE directory on uninstall which wasn't being removed. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosSourceDir.nsh Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Sat Nov 24 04:05:48 2007 @@ -290,6 +290,8 @@ RMDir /r /REBOOTOK "$INSTDIR\4.1.3" RMDir /r /REBOOTOK "$INSTDIR\Tools" RMDir /r /REBOOTOK "$SMPROGRAMS\$ICONS_GROUP" + IfFileExists "$APPDATA\RosBE\." 0 +2 + RMDir /r /REBOOTOK "$APPDATA\RosBE" Delete /REBOOTOK "$INSTDIR\Build.cmd" Delete /REBOOTOK "$INSTDIR\chdefdir.cmd" Delete /REBOOTOK "$INSTDIR\chdefgcc.cmd" Modified: trunk/tools/RosBE/RosBE-Windows/RosSourceDir.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosSourc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosSourceDir.nsh (original) +++ trunk/tools/RosBE/RosBE-Windows/RosSourceDir.nsh Sat Nov 24 04:05:48 2007 @@ -6,7 +6,7 @@ Function RosDir.show !insertmacro MUI_HEADER_TEXT "Select ReactOS Source Location" "Select the directory where the ReactOS sources are located or will be checked out to later." - !insertmacro INSTALLOPTIONS_WRITE "RosSourceDir.ini" "Field 2" "State" "$APPDATA\RosBE\Source" + !insertmacro INSTALLOPTIONS_WRITE "RosSourceDir.ini" "Field 2" "State" "$PROFILE\reactos" !insertmacro INSTALLOPTIONS_DISPLAY "RosSourceDir.ini" FunctionEnd

1 0

[peterw] 30710: - Set the ccache directory to APPDATA\RosBE\.ccache instead of PROFILE\.ccache.
by peterw＠svn.reactos.org 24 Nov '07

24 Nov '07

Author: peterw Date: Sat Nov 24 03:23:05 2007 New Revision: 30710 URL: http://svn.reactos.org/svn/reactos?rev=30710&view=rev Log: - Set the ccache directory to APPDATA\RosBE\.ccache instead of PROFILE\.ccache. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Sat Nov 24 03:23:05 2007 @@ -43,6 +43,7 @@ ) if defined _ROSBE_USECCACHE ( if %_ROSBE_USECCACHE% == 1 ( + set CCACHE_DIR=%APPDATA%\RosBE\.ccache set HOST_CC=ccache gcc set HOST_CPP=ccache g++ set TARGET_CC=ccache gcc @@ -157,3 +158,4 @@ set ROS_OUTPUT= set ROS_TEMPORARY= set CPUCOUNT= +set CCACHE_DIR=

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