Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 30157: - Fixed typo - Code cleanup - Changed color name to match with good names
by pschweitzer＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: pschweitzer Date: Mon Nov 5 13:23:42 2007 New Revision: 30157 URL: http://svn.reactos.org/svn/reactos?rev=30157&view=rev Log: - Fixed typo - Code cleanup - Changed color name to match with good names Modified: trunk/tools/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE-Windows/Tools/config/options.h trunk/tools/RosBE-Windows/Tools/config/resources.h Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Mon Nov 5 13:23:42 2007 @@ -2,25 +2,13 @@ * PROJECT: RosBE Options Dialog * LICENSE: GPL - See LICENSE.txt in the top level directory. * FILE: Tools/config/options.c - * PURPOSE: COnfiguring RosBE + * PURPOSE: Configuring RosBE * COPYRIGHT: Copyright 2007 Maarten Bosma * Copyright 2007 Pierre Schweitzer * */ #include "options.h" - -// note: do not change the order - theses are the color under winxp they might differ in another OSes -WCHAR *Colors[] = { L"black", L"dark blue", L"dark green", L"turquoise", L"dark red", L"purple", - L"ochar", L"light grey", L"dark grey", L"light blue", L"light green", - L"cyan", L"light red", L"magenta", L"yellow", L"white" -}; - -// note: do not change the order - it matches to previous order -COLORREF ColorsRGB[] = { 0x00000000, 0x00800000, 0x00008000, 0x00808000, 0x00000080, 0x00800080, - 0x00008080, 0x00c0c0c0, 0x00808080, 0x00ff0000, 0x0000ff00, - 0x00ffff00, 0x000000ff, 0x00ff00ff, 0x0000ffff, 0x00ffffff -}; HINSTANCE hInstance; @@ -47,20 +35,17 @@ GetDlgItemTextW(hwnd, ID_OBJDIR, objdir, MAX_PATH); GetDlgItemTextW(hwnd, ID_OUTDIR, outdir, MAX_PATH); - if (writelog) - { - if (logdir[0] != 0) - { - DWORD ret = GetCurrentDirectoryW(MAX_PATH, checklog); - if (ret != 0 && ret < MAX_PATH) - { - if (!SetCurrentDirectoryW(logdir)) - { - SetCurrentDirectoryW(checklog); - if (LoadStringW(hInstance, MSG_DIREFAILED, msgerror, 256)) - MessageBoxW(NULL, msgerror, NULL, MB_ICONERROR); - return FALSE; - } + if (writelog && (logdir[0] != 0)) + { + DWORD ret = GetCurrentDirectoryW(MAX_PATH, checklog); + if (ret != 0 && ret < MAX_PATH) + { + if (!SetCurrentDirectoryW(logdir)) + { + SetCurrentDirectoryW(checklog); + if (LoadStringW(hInstance, MSG_DIREFAILED, msgerror, 256)) + MessageBoxW(NULL, msgerror, NULL, MB_ICONERROR); + return FALSE; } } } @@ -92,10 +77,10 @@ fprintf(pFile, "set _ROSBE_USECCACHE=%d\n", useccache); fprintf(pFile, "set _ROSBE_STRIP=%d\n", strip); fprintf(pFile, "set _ROSBE_WRITELOG=%d\n", writelog); - if (wcslen(logdir) > 0) fprintf(pFile, "set _ROSBE_LOGDIR=%S\n", logdir); - if (wcslen(mingwpath) > 0) fprintf(pFile, "set _ROSBE_MINGWPATH=%S\n", mingwpath); - if ((wcslen(objdir) > 0) && objstate) fprintf(pFile, "set _ROSBE_OBJPATH=%S\n", objdir); - if ((wcslen(outdir) > 0) && outstate) fprintf(pFile, "set _ROSBE_OUTPATH=%S\n", outdir); + if (logdir[0] != 0) fprintf(pFile, "set _ROSBE_LOGDIR=%S\n", logdir); + if (mingwpath[0] != 0) fprintf(pFile, "set _ROSBE_MINGWPATH=%S\n", mingwpath); + if ((objdir[0] != 0) && objstate) fprintf(pFile, "set _ROSBE_OBJPATH=%S\n", objdir); + if ((outdir[0] != 0) && outstate) fprintf(pFile, "set _ROSBE_OUTPATH=%S\n", outdir); fclose(pFile); return TRUE; } @@ -199,7 +184,7 @@ SetDlgItemText(hwnd, ID_MGWDIR, LoadedSettings->mingwpath); SetDlgItemText(hwnd, ID_LOGDIR, LoadedSettings->logdir); SetDlgItemText(hwnd, ID_OBJDIR, LoadedSettings->objdir); - if (wcslen(LoadedSettings->objdir) > 0) + if (LoadedSettings->objdir[0] != 0) { LoadedSettings->objstate = 1; SendDlgItemMessage(hwnd, ID_OTHEROBJ, BM_SETCHECK, BST_CHECKED, 0); @@ -207,7 +192,7 @@ EnableWindow(GetDlgItem(hwnd, ID_OBJDIR), TRUE); } SetDlgItemText(hwnd, ID_OUTDIR, LoadedSettings->outdir); - if (wcslen(LoadedSettings->outdir) > 0) + if (LoadedSettings->outdir[0] != 0) { LoadedSettings->outstate = 1; SendDlgItemMessage(hwnd, ID_OTHEROUT, BM_SETCHECK, BST_CHECKED, 0); @@ -274,6 +259,11 @@ case WM_INITDIALOG: { LOGFONT lf; + // note: do not change the order - theses are the color under winxp they might differ in another OSes + WCHAR *Colors[] = { L"Black", L"Blue", L"Green", L"Aqua", L"Red", L"Purple", + L"Yellow", L"White", L"Gray", L"Light Blue", L"Light Green", + L"Light Aqua", L"Light Red", L"Light Purple", L"Light Yellow", L"Bright White" + }; hIcon = LoadImage( hInstance, MAKEINTRESOURCE(ID_OPTICON), @@ -401,6 +391,12 @@ case WM_CTLCOLORSTATIC: { HFONT hFontOld; + // note: do not change the order - it matches to previous order + COLORREF ColorsRGB[] = { 0x00000000, 0x00800000, 0x00008000, 0x00808000, 0x00000080, 0x00800080, + 0x00008080, 0x00c0c0c0, 0x00808080, 0x00ff0000, 0x0000ff00, + 0x00ffff00, 0x000000ff, 0x00ff00ff, 0x0000ffff, 0x00ffffff + }; + if((HWND)lParam == GetDlgItem(Dlg, ID_EXAMPLE)) { hFontOld = SelectObject((HDC)wParam, hFont); Modified: trunk/tools/RosBE-Windows/Tools/config/options.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.h (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.h Mon Nov 5 13:23:42 2007 @@ -2,7 +2,7 @@ * PROJECT: RosBE Options Dialog * LICENSE: GPL - See LICENSE.txt in the top level directory. * FILE: Tools/config/options.h - * PURPOSE: COnfiguring RosBE + * PURPOSE: Configuring RosBE * COPYRIGHT: Copyright 2007 Maarten Bosma * Copyright 2007 Pierre Schweitzer * Modified: trunk/tools/RosBE-Windows/Tools/config/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/r… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/resources.h (original) +++ trunk/tools/RosBE-Windows/Tools/config/resources.h Mon Nov 5 13:23:42 2007 @@ -2,7 +2,7 @@ * PROJECT: RosBE Options Dialog * LICENSE: GPL - See LICENSE.txt in the top level directory. * FILE: Tools/config/resources.h - * PURPOSE: COnfiguring RosBE + * PURPOSE: Configuring RosBE * COPYRIGHT: Copyright 2007 Maarten Bosma * Copyright 2007 Pierre Schweitzer *

1 0

[janderwald] 30156: - call SHEmptyRecycleBinW on request - store first cmdindex of first shell extension - empty bitbucket should now work, although it gives back an error - thnx to hpoussin
by janderwald＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: janderwald Date: Mon Nov 5 12:57:30 2007 New Revision: 30156 URL: http://svn.reactos.org/svn/reactos?rev=30156&view=rev Log: - call SHEmptyRecycleBinW on request - store first cmdindex of first shell extension - empty bitbucket should now work, although it gives back an error - thnx to hpoussin Modified: trunk/reactos/dll/win32/shell32/recyclebin.c trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c Mon Nov 5 12:57:30 2007 @@ -726,7 +726,15 @@ TRACE("%p %p verb %p\n", This, lpici, lpici->lpVerb); - if ( lpici->lpVerb == MAKEINTRESOURCEA(This->iIdProperties)) + if ( LOWORD(lpici->lpVerb) == MAKEINTRESOURCEA(This->iIdEmpty)) + { + // FIXME + // path & flags + return SHEmptyRecycleBinW(lpici->hwnd, L"C:\\", 0); + } + + + if ( LOWORD(lpici->lpVerb) == MAKEINTRESOURCEA(This->iIdProperties)) { WCHAR szDrive = 'C'; SH_ShowRecycleBinProperties(szDrive); Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Mon Nov 5 12:57:30 2007 @@ -361,6 +361,7 @@ } curEntry = This->dhead; + This->iIdSHEFirst = idCmdFirst; do {

1 0

[hpoussin] 30155: Fix build
by hpoussin＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: hpoussin Date: Mon Nov 5 12:56:45 2007 New Revision: 30155 URL: http://svn.reactos.org/svn/reactos?rev=30155&view=rev Log: Fix build Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Nov 5 12:56:45 2007 @@ -644,8 +644,11 @@ parameters += "$(QT)"; parameters += "-D"; parameters += define.name; - parameters += "="; - parameters += define.value; + if (define.value.length () > 0) + { + parameters += "="; + parameters += define.value; + } if (define.name.find('(') != string::npos) parameters += "$(QT)"; used_defs.insert(used_defs.begin(),define.name); @@ -841,10 +844,11 @@ fMakefile, " -D%s", define.name.c_str() ); - fprintf ( - fMakefile, - "=%s", - define.value.c_str() ); + if (define.value.length () > 0) + fprintf ( + fMakefile, + "=%s", + define.value.c_str() ); if ( used_defs ) used_defs->insert( used_defs->begin (), &define ); }

1 0

[arty] 30154: Initialize DesiredAccess. Cygwin is a little closer.
by arty＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: arty Date: Mon Nov 5 12:43:08 2007 New Revision: 30154 URL: http://svn.reactos.org/svn/reactos?rev=30154&view=rev Log: Initialize DesiredAccess. Cygwin is a little closer. Modified: trunk/reactos/ntoskrnl/ob/obsecure.c Modified: trunk/reactos/ntoskrnl/ob/obsecure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsecure.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsecure.c (original) +++ trunk/reactos/ntoskrnl/ob/obsecure.c Mon Nov 5 12:43:08 2007 @@ -714,7 +714,7 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PVOID Object; SECURITY_DESCRIPTOR_RELATIVE *CapturedDescriptor; - ACCESS_MASK DesiredAccess; + ACCESS_MASK DesiredAccess = 0; NTSTATUS Status; PAGED_CODE();

1 0

[pschweitzer] 30153: French translation for appwiz. Avoid deleting it now.
by pschweitzer＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: pschweitzer Date: Mon Nov 5 12:41:23 2007 New Revision: 30153 URL: http://svn.reactos.org/svn/reactos?rev=30153&view=rev Log: French translation for appwiz. Avoid deleting it now. Added: trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc (with props) Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc Added: trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc (added) +++ trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc Mon Nov 5 12:41:23 2007 @@ -1,0 +1,169 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Modifier/Supp&rimer",ID_APP_MODIFYREMOVE + MENUITEM "&Informations", ID_APP_INFORMATION + END +END + +IDR_POPUP_UPD MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Supp&rimer", ID_UPD_REMOVE + MENUITEM "&Informations", ID_UPD_INFORMATION + END +END + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Changer ou Supprimer des programmes" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,6,16,16 + LTEXT "Les logiciels suivants peuvent être automatiquement supprimés. Pour supprimer un programme ou modifier ses éléments installés, sélectionnez-le dans la liste et cliquez sur Modifier/Supprimer.",-1,36,7,PROPSHEETWIDTH-48,22 + LTEXT "Chercher:",-1,PROPSHEETPADDING,33,30,8 + EDITTEXT IDC_FIND_EDIT, PROPSHEETPADDING+30, 30, 180, 14, WS_VISIBLE | WS_TABSTOP + LTEXT "Affichage:",-1,250,33,30,8 + COMBOBOX IDC_VIEW_COMBO, 280, 30, 94, 80, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + CONTROL "", IDC_SOFTWARELIST, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL, PROPSHEETPADDING, 50, PROPSHEETWIDTH-12, 155, WS_EX_CLIENTEDGE + PUSHBUTTON "Modifier/Supp&rimer", IDC_ADDREMOVE, PROPSHEETPADDING, 210, 80, 14, WS_DISABLED + PUSHBUTTON "&Informations", IDC_INFO_BUTTON, PROPSHEETPADDING+85, 210, 80, 14, WS_DISABLED +END + +IDD_PROPPAGEUPDATES DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Supprimer des mises-à-jour" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_UPDATES,-1,PROPSHEETPADDING,6,16,16 + LTEXT "Les mises-à-jour suivantes peuvent être automatiquement supprimées. Pour supprimer une mises-à-jour, sélectionnez-la dans la liste et cliquez sur Supprimer.",-1,36,7,PROPSHEETWIDTH-48,22 + LTEXT "Chercher:",-1,PROPSHEETPADDING,33,30,8 + EDITTEXT IDC_UPD_FIND_EDIT, PROPSHEETPADDING+30, 30, 180, 14, WS_VISIBLE | WS_TABSTOP + LTEXT "Affichage:",-1,250,33,30,8 + COMBOBOX IDC_UPD_VIEW_COMBO, 280, 30, 94, 80, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + CONTROL "", IDC_UPDATESLIST, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL, PROPSHEETPADDING, 50, PROPSHEETWIDTH-12, 155, WS_EX_CLIENTEDGE + PUSHBUTTON "Supp&rimer", IDC_UPD_REMOVE, PROPSHEETPADDING, 210, 80, 14, WS_DISABLED + PUSHBUTTON "&Informations", IDC_UPD_INFO_BUTTON, PROPSHEETPADDING+85, 210, 80, 14, WS_DISABLED +END + +IDD_PROPPAGEADD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ajouter de nouveaux programmes" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,10,32,32 + LTEXT "Pour installer un nouveau programme, cliquez sur ""Installer"".",-1,36,11,PROPSHEETWIDTH-48,8 + PUSHBUTTON "&Installer...", IDC_INSTALL, PROPSHEETWIDTH-(90), 46, 80, 14 + LTEXT "", -1, PROPSHEETPADDING, 70, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + ICON IDI_DOWNLOADICO,-1,PROPSHEETPADDING,80,32,32 + LTEXT "Pour télécharger et installer de nouvelles applications, cliquez sur ""Download !"".",-1,36,83,PROPSHEETWIDTH-48,17 + PUSHBUTTON "&Download !", IDC_ADD_DOWNLOAD_BUTTON, PROPSHEETWIDTH-(90), 125, 80, 14, WS_DISABLED + LTEXT "", -1, PROPSHEETPADDING, 150, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + ICON IDI_APPINETICO,-1,PROPSHEETPADDING,160,32,32 + LTEXT "Cliquez sur le bouton ""Chercher sur l'Internet"" pour rechercher de nouvelles applications disponibles via une connexion Internet.",-1,36,161,PROPSHEETWIDTH-48,17 + PUSHBUTTON "&Propriétés...", IDC_ADD_PROP_BUTTON, PROPSHEETWIDTH-(175), 205, 80, 14, WS_DISABLED + PUSHBUTTON "Chercher sur l'Internet", IDC_ADD_FIND_BUTTON, PROPSHEETWIDTH-(90), 205, 80, 14, WS_DISABLED +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Installation de ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_REACTOS,-1,PROPSHEETPADDING,6,16,16 + LTEXT "",-1,36,7,PROPSHEETWIDTH-48,22 +END + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Créer un lien" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Texte1", -1, 115, 15, 160, 24 + LTEXT "Texte2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Créer un lien" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Texte1",-1,10,0,225,40 + LTEXT "Texte2",-1,10,40,120,20 + LTEXT "Texte3",-1,10,55,120,20 +END + +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Créer un raccourci" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Cet assistant vous aider à créer des raccourcis vers des programmes, des fichiers, des dossiers, des ordinateurs,\nou des adresses Internet locaux ou sur le réseau.", -1, 120, 15, 200, 30 + LTEXT "Entrez la localisation de l'élément:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Parcourir...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Cliquez sur Suivant pour continuer.", -1, 120, 100, 90, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Sélectionnez un titre pour le programme" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "En&trez un nom pour ce raccourci:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Cliquez sur Terminer pour créer le raccourci.", -1, 120, 50, 150, 10 +END + +IDD_INFORMATION DIALOG 5, 100, 269, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Informations" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDS_INFO_DISPNAME, PROPSHEETPADDING, 6, 258, 15, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Propriétaire enregistré:", -1, PROPSHEETPADDING, 27, 97, 8 + EDITTEXT IDS_INFO_REGOWNER, PROPSHEETPADDING+97, 25, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ID du produit:", -1, PROPSHEETPADDING, 44, 97, 8 + EDITTEXT IDS_INFO_PRODUCTID, PROPSHEETPADDING+97, 42, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Éditeur:", -1, PROPSHEETPADDING, 61, 97, 8 + EDITTEXT IDS_INFO_PUBLISHER, PROPSHEETPADDING+97, 59, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Version:", -1, PROPSHEETPADDING, 78, 97, 8 + EDITTEXT IDS_INFO_VERSION, PROPSHEETPADDING+97, 76, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Contact:", -1, PROPSHEETPADDING, 95, 97, 8 + EDITTEXT IDS_INFO_CONTACT, PROPSHEETPADDING+97, 93, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Informations sur le support:", -1, PROPSHEETPADDING, 112, 97, 8 + EDITTEXT IDS_INFO_SUPPORTINFO, PROPSHEETPADDING+97, 110, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Support téléphonique:", -1, PROPSHEETPADDING, 129, 97, 8 + EDITTEXT IDS_INFO_SUPPORTPHONE, PROPSHEETPADDING+97, 127, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Mises-à-jour du produit:", -1, PROPSHEETPADDING, 146, 97, 8 + EDITTEXT IDS_INFO_PRODUCT_UPDATES, PROPSHEETPADDING+97, 144, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Lisez-moi:", -1, PROPSHEETPADDING, 163, 97, 8 + EDITTEXT IDS_INFO_README, PROPSHEETPADDING+97, 161, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Commentaires:", -1, PROPSHEETPADDING, 180, 97, 8 + EDITTEXT IDS_INFO_COMMENTS, PROPSHEETPADDING+97, 178, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "Fermer", IDCANCEL, 212, 198, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Ajouter/Supprimer des Programmes" + IDS_CPLSYSTEMDESCRIPTION "Installe des programmes et créé des raccourcis." + IDS_ERROR "Erreur" + IDS_UNABLEREAD_UNINSTSTR "Impossible de lire UninstallString. Cette entrée est invalide ou a été créée par un installateur MSI." + IDS_UNABLEOPEN_UNINSTKEY "Impossible d'ouvrir la clé de désinstallation" + IDS_APPLIST "Programmes actuellement installés" + IDS_UPDATESLIST "Mises-à-jour actuellement installées" + IDS_LARGEICONS "Grandes icônes" + IDS_LIST "Liste" + IDS_DETAILS "Détails" + IDS_CREATE_SHORTCUT "Créer un raccourci" + IDS_ERROR_NOT_FOUND "Le fichier %s n'a pas été trouvé." + IDS_UNABLEREAD_INFORMATION "Impossible d'ouvrir les clés d'informations" + IDS_NO_INFORMATION "Aucune information" + IDS_NONE_APP "Il n'y a pas d'application installée." + IDS_NONE_UPD "Il n'y a pas de mise-à-jour installée." +END Propchange: trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/rsrc.rc (original) +++ trunk/reactos/dll/cpl/appwiz/rsrc.rc Mon Nov 5 12:41:23 2007 @@ -2,3 +2,4 @@ #include <windows.h> #include "lang/en-US.rc" +#include "lang/fr-FR.rc"

1 0

[janderwald] 30152: - implement IShellExtInit interface for recycle bin - fix a bug in SH_LoadDynamicContextMenuHandlers
by janderwald＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: janderwald Date: Mon Nov 5 12:37:09 2007 New Revision: 30152 URL: http://svn.reactos.org/svn/reactos?rev=30152&view=rev Log: - implement IShellExtInit interface for recycle bin - fix a bug in SH_LoadDynamicContextMenuHandlers Modified: trunk/reactos/dll/win32/shell32/recyclebin.c trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c Mon Nov 5 12:37:09 2007 @@ -106,6 +106,7 @@ const IShellFolder2Vtbl *lpVtbl; const IPersistFolder2Vtbl *lpPersistFolderVtbl; const IContextMenuVtbl *lpCmt; + const IShellExtInitVtbl *lpSEI; LONG refCount; INT iIdOpen; @@ -118,6 +119,7 @@ static const IContextMenuVtbl recycleBincmVtbl; static const IShellFolder2Vtbl recycleBinVtbl; static const IPersistFolder2Vtbl recycleBinPersistVtbl; +static const IShellExtInitVtbl eivt; static RecycleBin *impl_from_IContextMenu(IContextMenu *iface) { @@ -127,6 +129,11 @@ static RecycleBin *impl_from_IPersistFolder(IPersistFolder2 *iface) { return (RecycleBin *)((char *)iface - FIELD_OFFSET(RecycleBin, lpPersistFolderVtbl)); +} + +static inline RecycleBin *impl_from_IShellExtInit( IShellExtInit *iface ) +{ + return (RecycleBin *)((char*)iface - FIELD_OFFSET(RecycleBin, lpSEI)); } static void RecycleBin_Destructor(RecycleBin *This); @@ -143,6 +150,7 @@ return E_OUTOFMEMORY; ZeroMemory(obj, sizeof(RecycleBin)); obj->lpVtbl = &recycleBinVtbl; + obj->lpSEI = &eivt; obj->lpPersistFolderVtbl = &recycleBinPersistVtbl; obj->lpCmt = &recycleBincmVtbl; if (FAILED(ret = IUnknown_QueryInterface((IUnknown *)obj, riid, ppOutput))) @@ -177,6 +185,11 @@ if (IsEqualIID(riid, &IID_IContextMenu)) *ppvObject = &This->lpCmt; + + if(IsEqualIID(riid, &IID_IShellExtInit)) + { + *ppvObject = &(This->lpSEI); + } if (*ppvObject != NULL) { @@ -588,6 +601,47 @@ FIXME("stub\n"); return S_OK; } +/************************************************************************* + * BitBucket IShellExtInit interface + */ + +static HRESULT WINAPI +RecycleBin_ExtInit_QueryInterface( IShellExtInit* iface, REFIID riid, void** ppvObject ) +{ + return RecycleBin_QueryInterface((IShellFolder2 *)impl_from_IShellExtInit(iface), riid, ppvObject); +} + +static ULONG WINAPI +RecycleBin_ExtInit_AddRef( IShellExtInit* iface ) +{ + return RecycleBin_AddRef((IShellFolder2 *)impl_from_IShellExtInit(iface)); +} + +static ULONG WINAPI +RecycleBin_ExtInit_Release( IShellExtInit* iface ) +{ + return RecycleBin_Release((IShellFolder2 *)impl_from_IShellExtInit(iface)); +} + +static HRESULT WINAPI +RecycleBin_ExtInit_Initialize( IShellExtInit* iface, LPCITEMIDLIST pidlFolder, + IDataObject *pdtobj, HKEY hkeyProgID ) +{ + RecycleBin *This = impl_from_IShellExtInit(iface); + + TRACE("%p %p %p %p\n", This, pidlFolder, pdtobj, hkeyProgID ); + return S_OK; +} + + +static const IShellExtInitVtbl eivt = +{ + RecycleBin_ExtInit_QueryInterface, + RecycleBin_ExtInit_AddRef, + RecycleBin_ExtInit_Release, + RecycleBin_ExtInit_Initialize +}; + /************************************************************************* * BitBucket context menu Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Mon Nov 5 12:37:09 2007 @@ -338,7 +338,8 @@ hr = StringFromCLSID(guid, &pwszCLSID); if (hr == S_OK) { - memcpy(&buffer[6], pwszCLSID, 38 * sizeof(WCHAR)); + wcscpy(&buffer[6], pwszCLSID); + TRACE("buffer %s\n", debugstr_w(buffer)); SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj, bGroupPolicyActive); } }

1 0

[fireball] 30151: Dmitry Chapyshev <lentind@yandex.ru> - Fix russian translation of winemine.
by fireball＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: fireball Date: Mon Nov 5 12:36:35 2007 New Revision: 30151 URL: http://svn.reactos.org/svn/reactos?rev=30151&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Fix russian translation of winemine. Modified: trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc Modified: trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc Mon Nov 5 12:36:35 2007 @@ -4,9 +4,9 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -STRINGTABLE { - IDS_APPNAME, "Ñàïåð" - +STRINGTABLE +{ + IDS_APPNAME, "Ñàïåð" } MENU_WINEMINE MENU DISCARDABLE @@ -44,7 +44,7 @@ LTEXT "", IDC_NAME1, 94, 20, 55, 8 LTEXT "", IDC_NAME2, 94, 30, 55, 8 LTEXT "", IDC_NAME3, 94, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 + DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -53,8 +53,8 @@ FONT 8, "MS Shell Dlg" { LTEXT "Ïîæàëóéñòâà ââåäèòå âàøå èìÿ", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 } DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 @@ -62,12 +62,12 @@ CAPTION "Îñîáàÿ èãðà" FONT 8, "MS Shell Dlg" { - LTEXT "Âûñîòà", IDNONE, 5, 5, 30, 10 - LTEXT "Øèðèíà", IDNONE, 5, 35, 30, 10 - LTEXT "×èñëî ìèí", IDNONE, 5, 65, 36, 10 - EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER - EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER - EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + LTEXT "Âûñîòà", IDNONE, 5, 5, 30, 10 + LTEXT "Øèðèíà", IDNONE, 5, 35, 30, 10 + LTEXT "×èñëî ìèí", IDNONE, 5, 65, 36, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER DEFPUSHBUTTON "OK", IDOK, 45, 30, 50, 15 PUSHBUTTON "Îòìåíà", IDCANCEL, 45, 50, 50, 15 } @@ -77,9 +77,9 @@ CAPTION "Î ïðîãðàììå" FONT 8, "MS Shell Dlg" { - LTEXT "Ñàïåð", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 - LTEXT "ïîä ëèöåíçèåé Wine", IDNONE, 35, 35, 100, 10 - ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 + LTEXT "Ñàïåð", IDNONE, 10, 10, 35, 10 + LTEXT "Àâòîðñêèå ïðàâà (ñ) 2000,\nÄæîøóà Ñåéëåí.", IDNONE, 35, 25, 110, 17 + LTEXT "ïîä ëèöåíçèåé Wine", IDNONE, 35, 42, 100, 10 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 }

1 0

[fireball] 30150: Dmitry Chapyshev <lentind@yandex.ru> - Russian language fixes for Taskmgr. - 'more' cmd util translation by me and towerr.
by fireball＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: fireball Date: Mon Nov 5 12:27:52 2007 New Revision: 30150 URL: http://svn.reactos.org/svn/reactos?rev=30150&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Russian language fixes for Taskmgr. - 'more' cmd util translation by me and towerr. Added: trunk/reactos/base/applications/cmdutils/more/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc Added: trunk/reactos/base/applications/cmdutils/more/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/cmdutils/more/lang/ru-RU.rc Mon Nov 5 12:27:52 2007 @@ -1,0 +1,17 @@ +// Russian language resource file (towerr & Lentin, 2007-10-17) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_USAGE, "?????????? ?????????? ??????????? ?????? ?????????????.\n\n\ + MORE < [????:][????]??? ?????\n\ + Command | MORE \n\ + MORE [????:][????]??? ?????\n\n\ + [????:][????]??? ????? ?????????? ???????? ????? ???????????.\n\ + Command\t\t ???????, ?????????? ??????? ????????????.\n\n\ + ??? ?????? ""-- ?????????? --"" ??? ????????? ????????? ???????? ??????? ????? ???????.\n" + + IDS_CONTINUE, " -- ?????????? (100%) -- " + IDS_FILE_ACCESS, "??? ??????? ? ????? %s." +} Propchange: trunk/reactos/base/applications/cmdutils/more/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/rsrc.rc Mon Nov 5 12:27:52 2007 @@ -9,3 +9,4 @@ #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" #include "lang/uk-UA.rc" +#include "lang/ru-RU.rc" Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc Mon Nov 5 12:27:52 2007 @@ -165,7 +165,7 @@ CAPTION "Î ïðîãðàììå Äèñïåò÷åð çàäà÷" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Äèñïåò÷åð çàäà÷ v1.0\nCopyright (C) 1999 - 2001\nîò Brian Palmer (brianp(a)reactos.org)", + CONTROL "Äèñïåò÷åð çàäà÷ v1.0\nÀâòîðñêèå ïðàâà (C) 1999 - 2001\nÁðèàí Ïàëìåð (brianp(a)reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, 122,26 DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP @@ -367,7 +367,7 @@ CONTROL "PID (èäåíòè&ô. ïðîöåññà)",IDC_PID,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,39,95,10 CONTROL "&Çàãðóçêà ÖÏ",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,50,53,10 + WS_TABSTOP,7,50,55,10 CONTROL "&Âðåìÿ ÖÏ",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,48,10 CONTROL "&Ïàìÿòü - èñïîëüçîâàíèå",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | @@ -379,7 +379,7 @@ CONTROL "&Îøèáîê ñòðàíèöû",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,105,90,10 CONTROL "Îá&úåêòû USER",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,116,62,10 + WS_TABSTOP,7,116,65,10 CONTROL "×èñëî ÷òåíèé",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,127,60,10 CONTROL "Ïðî÷èòàíî áàéò",IDC_IOREADBYTES,"Button", @@ -401,9 +401,9 @@ CONTROL "Ñ÷åò÷èê &äèñêðèïòîðîâ",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,83,90,10 CONTROL "Ñ&÷åò÷èê ïîòîêîâ",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,94,67,10 + WS_TABSTOP,107,94,69,10 CONTROL "Îáú&åêòû GDI",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,105,55,10 + WS_TABSTOP,107,105,58,10 CONTROL "×èñëî çàïèñåé",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,116,65,10 CONTROL "Çàïèñàíî áàéò",IDC_IOWRITEBYTES,"Button", @@ -611,7 +611,7 @@ IDS_TAB_PROCESSES "Ïðîöåññû" IDS_TAB_PERFORMANCE "Ïðîèçâîäèòåëüíîñòü" IDS_TAB_TASK "Çàäà÷à" - IDS_TAB_STATUS "Ñòàòóò" + IDS_TAB_STATUS "Ñòàòóñ" IDS_TAB_IMAGENAME "Èìÿ îáðàçà" IDS_TAB_PID "PID" IDS_TAB_USERNAME "Èìÿ ïîëüçîâàòåëÿ" @@ -684,3 +684,4 @@ #endif // not APSTUDIO_INVOKED +

1 0

[hpoussin] 30149: Better error reporting in case of define override Support empty defines
by hpoussin＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: hpoussin Date: Mon Nov 5 11:57:04 2007 New Revision: 30149 URL: http://svn.reactos.org/svn/reactos?rev=30149&view=rev Log: Better error reporting in case of define override Support empty defines Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Nov 5 11:57:04 2007 @@ -644,11 +644,8 @@ parameters += "$(QT)"; parameters += "-D"; parameters += define.name; - if (define.value.length () > 0) - { - parameters += "="; - parameters += define.value; - } + parameters += "="; + parameters += define.value; if (define.name.find('(') != string::npos) parameters += "$(QT)"; used_defs.insert(used_defs.begin(),define.name); @@ -766,7 +763,7 @@ const char* assignmentOperation, const string& macro, const IfableData& data, - set<string> *used_defs, + set<const Define *> *used_defs, bool generatingCompilerMacro ) { size_t i; @@ -814,32 +811,42 @@ for ( i = 0; i < data.defines.size(); i++ ) { const Define& define = *data.defines[i]; - if ( used_defs && used_defs->find ( define.name ) != used_defs->end () ) + if ( used_defs ) { - if ( !define.overridable ) + set<const Define *>::const_iterator last_define; + for (last_define = used_defs->begin (); + last_define != used_defs->end (); + last_define++) { - throw InvalidOperationException ( __FILE__, - __LINE__, - "Invalid override of define '%s' in module '%s'", - define.name.c_str (), - module.name.c_str () ); + if ( (*last_define)->name != define.name ) + continue; + if ( !define.overridable ) + { + throw InvalidOperationException ( define.node->location.c_str (), + 0, + "Invalid override of define '%s', already defined at %s", + define.name.c_str (), + (*last_define)->node->location.c_str () ); + } + if ( backend->configuration.Verbose ) + printf("%s: Overriding '%s' already defined at %s\n", + (*last_define)->node->location.c_str (), define.name.c_str (), + define.node->location.c_str () ); + break; } - if ( backend->configuration.Verbose ) - printf("Define '%s' overridden in module '%s'\n", - define.name.c_str (), module.name.c_str () ); - continue; + if ( last_define != used_defs->end () ) + continue; } fprintf ( fMakefile, " -D%s", define.name.c_str() ); - if ( define.value.size() ) - fprintf ( - fMakefile, - "=%s", - define.value.c_str() ); + fprintf ( + fMakefile, + "=%s", + define.value.c_str() ); if ( used_defs ) - used_defs->insert(used_defs->begin(), define.name); + used_defs->insert( used_defs->begin (), &define ); } if ( generateAssignment ) { @@ -852,7 +859,7 @@ const char* assignmentOperation, const IfableData& data, const vector<LinkerFlag*>* linkerFlags, - set<string>& used_defs ) + set<const Define *>& used_defs ) { size_t i; @@ -2050,7 +2057,7 @@ void MingwModuleHandler::GenerateOtherMacros () { - set<string> used_defs; + set<const Define *> used_defs; cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ()); nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ()); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Mon Nov 5 11:57:04 2007 @@ -137,12 +137,12 @@ void GenerateMacro ( const char* assignmentOperation, const std::string& macro, const IfableData& data, - std::set<std::string>* used_defs, + std::set<const Define *>* used_defs, bool generatingCompilerMacro ); void GenerateMacros ( const char* op, const IfableData& data, const std::vector<LinkerFlag*>* linkerFlags, - std::set<std::string>& used_defs ); + std::set<const Define *>& used_defs ); void GenerateSourceMacros ( const char* assignmentOperation, const IfableData& data ); void GenerateObjectMacros ( const char* assignmentOperation,

1 0

[greatlrd] 30148: add 6 more guids for ksguid.a
by greatlrd＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: greatlrd Date: Mon Nov 5 09:58:52 2007 New Revision: 30148 URL: http://svn.reactos.org/svn/reactos?rev=30148&view=rev Log: add 6 more guids for ksguid.a Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/ksguid/k… ============================================================================== --- branches/reactx/reactos/lib/sdk/ksguid/ksguid.c (original) +++ branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Mon Nov 5 09:58:52 2007 @@ -14,6 +14,12 @@ #include <basetyps.h> #include <guiddef.h> +DEFINE_GUID(KSDEGRADESETID_Standard, 0x9F564180, 0x704C, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSEVENTSETID_Connection, 0x7F4BCBE0, 0x9EA5, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSEVENTSETID_Clock, 0x364D8E20, 0x62C7, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Clock, 0xDF12A4C0, 0xAC17, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Stream, 0x65AABA60, 0x98AE, 0x11CF, 0xA1, 0x0D, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSPROPSETID_StreamInterface, 0x1FDD8EE1, 0x9CD3, 0x11D0, 0x82, 0xAA, 0x00, 0x00, 0xF8, 0x22, 0xFE, 0x8A); DEFINE_GUID(KSPROPSETID_StreamAllocator, 0xCF6E4342, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); DEFINE_GUID(KSMETHODSETID_StreamAllocator, 0xCF6E4341, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); DEFINE_GUID(KSEVENTSETID_StreamAllocator, 0x75D95571, 0x073C, 0x11D0, 0xA1, 0x61, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4);

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