Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 31432: - Initialize FlusherLock as a pushlock, not as an Ex-resource (it's used as a pushlock in the code now).
by fireball＠svn.reactos.org 25 Dec '07

25 Dec '07

Author: fireball Date: Tue Dec 25 16:15:52 2007 New Revision: 31432 URL: http://svn.reactos.org/svn/reactos?rev=31432&view=rev Log: - Initialize FlusherLock as a pushlock, not as an Ex-resource (it's used as a pushlock in the code now). Modified: trunk/reactos/ntoskrnl/config/cminit.c Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c (original) +++ trunk/reactos/ntoskrnl/config/cminit.c Tue Dec 25 16:15:52 2007 @@ -119,10 +119,12 @@ if (!Hive->ViewLock) return STATUS_INSUFFICIENT_RESOURCES; /* Allocate the flush lock */ +#if 0 Hive->FlusherLock = ExAllocatePoolWithTag(NonPagedPool, sizeof(ERESOURCE), TAG_CM); if (!Hive->FlusherLock) return STATUS_INSUFFICIENT_RESOURCES; +#endif /* Setup the handles */ Hive->FileHandles[HFILE_TYPE_PRIMARY] = Primary; @@ -134,7 +136,7 @@ Hive->ViewLockOwner = NULL; /* Initialize the flush lock */ - ExInitializeResourceLite(Hive->FlusherLock); + ExInitializePushLock((PULONG_PTR)&Hive->FlusherLock); /* Setup hive locks */ ExInitializePushLock((PULONG_PTR)&Hive->HiveLock); @@ -187,7 +189,9 @@ { /* Clear allocations and fail */ ExFreePool(Hive->ViewLock); +#if 0 ExFreePool(Hive->FlusherLock); +#endif ExFreePool(Hive); return Status; } @@ -203,7 +207,9 @@ { /* Free all alocations */ ExFreePool(Hive->ViewLock); +#if 0 ExFreePool(Hive->FlusherLock); +#endif ExFreePool(Hive); return STATUS_REGISTRY_CORRUPT; }

1 0

[fireball] 31431: I wonder, if Eric actually compiles before committing (AKA "merry christmas" commit :) ).
by fireball＠svn.reactos.org 25 Dec '07

25 Dec '07

Author: fireball Date: Tue Dec 25 15:56:11 2007 New Revision: 31431 URL: http://svn.reactos.org/svn/reactos?rev=31431&view=rev Log: I wonder, if Eric actually compiles before committing (AKA "merry christmas" commit :) ). Modified: trunk/reactos/dll/cpl/usrmgr/groups.c Modified: trunk/reactos/dll/cpl/usrmgr/groups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groups.c?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groups.c (original) +++ trunk/reactos/dll/cpl/usrmgr/groups.c Tue Dec 25 15:56:11 2007 @@ -101,7 +101,7 @@ /* Create the image list */ hImgList = ImageList_Create(16,16,ILC_COLOR8 | ILC_MASK,5,5); hIcon = LoadImage(hApplet,MAKEINTRESOURCE(IDI_GROUP),IMAGE_ICON,16,16,LR_DEFAULTCOLOR); - Index[0] = ImageList_AddIcon(hImgList,hIcon); + ImageList_AddIcon(hImgList,hIcon); DestroyIcon(hIcon); hwndListView = GetDlgItem(hwndDlg, IDC_GROUPS_LIST);

1 0

[fireball] 31430: - Do CmpShutdownWorkers only when the registry was actually initialized. - Guard HvSyncHive with a flusher lock in CmpDoFlushAll. - Misc typo fixes / spaces cleanup in cmlazy.c.
by fireball＠svn.reactos.org 25 Dec '07

25 Dec '07

Author: fireball Date: Tue Dec 25 15:35:15 2007 New Revision: 31430 URL: http://svn.reactos.org/svn/reactos?rev=31430&view=rev Log: - Do CmpShutdownWorkers only when the registry was actually initialized. - Guard HvSyncHive with a flusher lock in CmpDoFlushAll. - Misc typo fixes / spaces cleanup in cmlazy.c. Modified: trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmlazy.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Tue Dec 25 15:35:15 2007 @@ -38,9 +38,15 @@ Hive = CONTAINING_RECORD(NextEntry, CMHIVE, HiveList); if (!(Hive->Hive.HiveFlags & HIVE_NOLAZYFLUSH)) { + /* Acquire the flusher lock */ + ExAcquirePushLockExclusive((PVOID)&Hive->FlusherLock); + /* Do the sync */ Status = HvSyncHive(&Hive->Hive); if (!NT_SUCCESS(Status)) Result = FALSE; + + /* Release the flusher lock */ + ExReleasePushLock((PVOID)&Hive->FlusherLock); } /* Try the next entry */ Modified: trunk/reactos/ntoskrnl/config/cmlazy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmlazy.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmlazy.c (original) +++ trunk/reactos/ntoskrnl/config/cmlazy.c Tue Dec 25 15:35:15 2007 @@ -187,7 +187,7 @@ } /* Flush the next hive */ - MoreWork = CmpDoFlushNextHive(ForceFlush, &Result, &DirtyCount); + MoreWork = CmpDoFlushNextHive(ForceFlush, &Result, &DirtyCount); if (!MoreWork) { /* We're done */ @@ -232,7 +232,7 @@ KeSetTimer(&CmpEnableLazyFlushTimer, DueTime, &CmpEnableLazyFlushDpc); /* Setup flush variables */ - CmpNoWrite = CmpMiniNTBoot; + CmpNoWrite = CmpMiniNTBoot; CmpWasSetupBoot = SetupBoot; /* Testing: Force Lazy Flushing */ @@ -260,7 +260,7 @@ 0, NewHive, Allocate, - CheckFlags); + CheckFlags); if (((Status == STATUS_ACCESS_DENIED) || (Status == STATUS_NO_SUCH_USER) || (Status == STATUS_WRONG_PASSWORD) || @@ -278,8 +278,8 @@ 0, NewHive, Allocate, - CheckFlags); - + CheckFlags); + /* Restore impersonation token */ PsRevertToSelf(); } Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Tue Dec 25 15:35:15 2007 @@ -29,6 +29,8 @@ BOOLEAN CmpNoWrite; BOOLEAN CmpForceForceFlush; BOOLEAN CmpWasSetupBoot; + +extern BOOLEAN CmFirstTime; /* FUNCTIONS *****************************************************************/ @@ -1637,7 +1639,7 @@ { ASSERT((GET_HASH_ENTRY(CmpCacheTable, ConvKey1).Owner == KeGetCurrentThread()) || (CmpTestRegistryLockExclusive())); - CmpReleaseKcbLockByKey(ConvKey1); + CmpReleaseKcbLockByKey(ConvKey1); } CmpReleaseKcbLockByKey(ConvKey2); } @@ -1647,7 +1649,7 @@ NTAPI CmShutdownSystem(VOID) { - /* Kill the workers and fush all hives */ - CmpShutdownWorkers(); + /* Kill the workers and flush all hives */ + if (!CmFirstTime) CmpShutdownWorkers(); CmpDoFlushAll(TRUE); }

1 0

[ekohl] 31429: Create image lists for the groups and users list views and add images to the list view items.
by ekohl＠svn.reactos.org 25 Dec '07

25 Dec '07

Author: ekohl Date: Tue Dec 25 14:41:08 2007 New Revision: 31429 URL: http://svn.reactos.org/svn/reactos?rev=31429&view=rev Log: Create image lists for the groups and users list views and add images to the list view items. Modified: trunk/reactos/dll/cpl/usrmgr/groups.c trunk/reactos/dll/cpl/usrmgr/users.c Modified: trunk/reactos/dll/cpl/usrmgr/groups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groups.c?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groups.c (original) +++ trunk/reactos/dll/cpl/usrmgr/groups.c Tue Dec 25 14:41:08 2007 @@ -70,10 +70,11 @@ for (i = 0; i < entriesread; i++) { memset(&lvi, 0x00, sizeof(lvi)); - lvi.mask = LVIF_TEXT | LVIF_STATE; // | LVIF_PARAM; + lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_IMAGE; // | LVIF_PARAM; // lvi.lParam = (LPARAM)VarData; lvi.pszText = pBuffer[i].lgrpi1_name; lvi.state = 0; //(i == 0) ? LVIS_SELECTED : 0; + lvi.iImage = 0; iItem = ListView_InsertItem(hwndListView, &lvi); ListView_SetItemText(hwndListView, iItem, 1, @@ -94,8 +95,18 @@ OnInitDialog(HWND hwndDlg) { HWND hwndListView; + HIMAGELIST hImgList; + HICON hIcon; + + /* Create the image list */ + hImgList = ImageList_Create(16,16,ILC_COLOR8 | ILC_MASK,5,5); + hIcon = LoadImage(hApplet,MAKEINTRESOURCE(IDI_GROUP),IMAGE_ICON,16,16,LR_DEFAULTCOLOR); + Index[0] = ImageList_AddIcon(hImgList,hIcon); + DestroyIcon(hIcon); hwndListView = GetDlgItem(hwndDlg, IDC_GROUPS_LIST); + + (VOID)ListView_SetImageList(hwndListView, hImgList, LVSIL_SMALL); (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT); Modified: trunk/reactos/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/users.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/users.c (original) +++ trunk/reactos/dll/cpl/usrmgr/users.c Tue Dec 25 14:41:08 2007 @@ -141,10 +141,11 @@ for (i = 0; i < entriesread; i++) { memset(&lvi, 0x00, sizeof(lvi)); - lvi.mask = LVIF_TEXT | LVIF_STATE; // | LVIF_PARAM; + lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_IMAGE; // | LVIF_PARAM; // lvi.lParam = (LPARAM)VarData; lvi.pszText = pBuffer[i].usri20_name; lvi.state = 0; //(i == 0) ? LVIS_SELECTED : 0; + lvi.iImage = (pBuffer[i].usri20_flags & UF_ACCOUNTDISABLE) ? 1 : 0; iItem = ListView_InsertItem(hwndListView, &lvi); ListView_SetItemText(hwndListView, iItem, 1, @@ -168,9 +169,20 @@ OnInitDialog(HWND hwndDlg) { HWND hwndListView; - - /* Set user environment variables */ + HIMAGELIST hImgList; + HICON hIcon; + + /* Create the image list */ + hImgList = ImageList_Create(16, 16, ILC_COLOR8 | ILC_MASK, 5, 5); + hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_USER), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + ImageList_AddIcon(hImgList, hIcon); + hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_LOCKED_USER), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + ImageList_AddIcon(hImgList, hIcon); + DestroyIcon(hIcon); + hwndListView = GetDlgItem(hwndDlg, IDC_USERS_LIST); + + (VOID)ListView_SetImageList(hwndListView, hImgList, LVSIL_SMALL); (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT);

1 0

[fireball] 31428: - Fix incorrect NtSetDebugFilter behavior (Level below 32 should be converted into a mask). Now DbgPrintEx works as expected.
by fireball＠svn.reactos.org 25 Dec '07

25 Dec '07

Author: fireball Date: Tue Dec 25 13:45:14 2007 New Revision: 31428 URL: http://svn.reactos.org/svn/reactos?rev=31428&view=rev Log: - Fix incorrect NtSetDebugFilter behavior (Level below 32 should be converted into a mask). Now DbgPrintEx works as expected. Modified: trunk/reactos/ntoskrnl/kd/kdmain.c Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c Tue Dec 25 13:45:14 2007 @@ -337,6 +337,11 @@ KdComponentTable[i].ComponentId = ComponentId; KdComponentTable[i].Level = 0; } + + /* Convert level to mask, if needed */ + if (Level < 32) + Level = 1 << Level; + if ( State ) KdComponentTable[i].Level |= Level; else

1 0

[pschweitzer] 31427: en-US updated translation of intl.cpl atylmo <fat_gamer_176@yahoo.com> See issue #2917 for more details.
by pschweitzer＠svn.reactos.org 25 Dec '07

25 Dec '07

Author: pschweitzer Date: Tue Dec 25 03:40:32 2007 New Revision: 31427 URL: http://svn.reactos.org/svn/reactos?rev=31427&view=rev Log: en-US updated translation of intl.cpl atylmo <fat_gamer_176(a)yahoo.com> See issue #2917 for more details. Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/en-US.rc Tue Dec 25 03:40:32 2007 @@ -9,7 +9,7 @@ BEGIN GROUPBOX "Standarts and formats", -1, 5, 5, 234, 162 LTEXT "This option affects how some programs format numbers, currencies, dates, and time.", -1, 14, 17, 220, 25 - LTEXT "Select an item to match its proferences, or click Customize to choose your own formats:", -1, 14, 37, 220, 22 + LTEXT "Select an item to match its properties, or click Customize to choose your own formats:", -1, 14, 37, 220, 22 COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Customi&ze...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Samples", -1, 14, 73, 70, 10 @@ -24,7 +24,7 @@ EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 89, 131, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Geographic location", -1, 5, 172, 234, 55 - LTEXT "Set up your location that services could supply you with the local information, for example, news and reports of weather", -1, 14, 184, 210, 24 + LTEXT "Set up your location so that some services can supply you with local information; for example, news and weather reports.", -1, 14, 184, 210, 24 COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END

1 0

[dreimer] 31426: Fixed a bunch of errors in German USetup Variation
by dreimer＠svn.reactos.org 24 Dec '07

24 Dec '07

Author: dreimer Date: Tue Dec 25 02:21:41 2007 New Revision: 31426 URL: http://svn.reactos.org/svn/reactos?rev=31426&view=rev Log: Fixed a bunch of errors in German USetup Variation Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Tue Dec 25 02:21:41 2007 @@ -36,13 +36,13 @@ { 8, 19, - "\x07 Druecken Sie L, um die Lizenzabkommen von ReactOS zu lesen", + "\x07 Druecken Sie L, um die Lizenzabkommen von ReactOS zu lesen.", TEXT_NORMAL }, { 8, 21, - "\x07 Druecken Sie F3, um das Setup zu beenden ohne ReactOS zu installieren.", + "\x07 Druecken Sie F3, um das Setup zu beenden.", TEXT_NORMAL }, { @@ -438,7 +438,7 @@ { 8, 10, - "\x07 Druecken Sie die HOCH- oder RUNTER-Taste um den gewuenschten", + "\x07 Druecken Sie die HOCH- oder RUNTER-Taste, um den gewuenschten", TEXT_NORMAL }, { @@ -557,7 +557,7 @@ }, { 8, 10, - "\x07 Druecken Sie die HOCH- oder RUNTER-Taste um den gewuenschten", + "\x07 Druecken Sie die HOCH- oder RUNTER-Taste, um den gewuenschten", TEXT_NORMAL }, { @@ -637,7 +637,7 @@ { 6, 8, - "Das Setup kann das Betriebssystem-Ladeprogramm nicht auf der", + "Das Setup kann das Boot-Sektor nicht auf der", TEXT_NORMAL }, { @@ -690,25 +690,25 @@ { 8, 11, - "\x07 Druecken Sie die Pfeiltasten um eine Partition auszuwaehlen.", + "\x07 Druecken Sie die Pfeiltasten, um eine Partition auszuwaehlen.", TEXT_NORMAL }, { 8, 13, - "\x07 Druecken Sie die Eingabetaste um die Auswahl zu bestaetigen.", + "\x07 Druecken Sie die Eingabetaste, um die Auswahl zu bestaetigen.", TEXT_NORMAL }, { 8, 15, - "\x07 Druecken Sie C um eine neue Partition zu erstellen.", + "\x07 Druecken Sie C, um eine neue Partition zu erstellen.", TEXT_NORMAL }, { 8, 17, - "\x07 Druecken Sie D um eine vorhandene Partition zu loeschen.", + "\x07 Druecken Sie D, um eine vorhandene Partition zu loeschen.", TEXT_NORMAL }, { @@ -742,7 +742,7 @@ { 6, 11, - "Druecken Sie die Eingabetaste um fortzufahren.", + "Druecken Sie die Eingabetaste, um fortzufahren.", TEXT_NORMAL }, { @@ -764,25 +764,25 @@ { 6, 8, - "Setup installiert die ReactOS Installationsdateien in die ausgewaehlte ", + "Setup installiert die ReactOS Installationsdateien in die ausgewaehlte", TEXT_NORMAL }, { 6, 9, - "Partition. Waehlen Sie ein Installationsverzeichniss fuer ReactOS:", + "Partition. Waehlen Sie ein Installationsverzeichnis fuer ReactOS:", TEXT_NORMAL }, { 6, 14, - "Um den Vorschlag zu aendern druecken sie die 'Delete' Taste um", + "Um den Vorschlag zu aendern druecken sie die 'Entf' Taste um", TEXT_NORMAL }, { 6, 15, - "Zeichen zu loeschen und gegeben sie dann den Namen des Verzeichniss ein", + "Zeichen zu loeschen und gegeben sie dann den Namen des Verzeichnis ein", TEXT_NORMAL }, { @@ -808,13 +808,13 @@ TEXT_NORMAL }, { - 30, + 11, 13, - "in das Installationsverzeichniss kopiert.", - TEXT_NORMAL - }, - { - 20, + "in das Installationsverzeichnis kopiert.", + TEXT_NORMAL + }, + { + 11, 14, "Dieser Vorgang kann mehrere Minuten in Anspruch nehmen.", TEXT_NORMAL @@ -838,25 +838,25 @@ { 6, 8, - "Setup installiert nun das Betriebssystem-Ladeprogramm.", + "Setup installiert nun den Boot-Sektor.", TEXT_NORMAL }, { 8, 12, - "Betriebssystem-Ladeprogramm im MBR installieren", + "Boot-Sektor im MBR installieren.", TEXT_NORMAL }, { 8, 13, - "Betriebssystem-Ladeprogramm auf einer Diskette installieren", + "Boot-Sektor auf einer Diskette installieren.", TEXT_NORMAL }, { 8, 14, - "Betriebssystem-Ladeprogramm nicht installieren", + "Boot-Sektor nicht installieren.", TEXT_NORMAL }, { @@ -878,25 +878,31 @@ { 6, 8, - "Sie moechten den Tastaturtyp aendern.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Druecken Sie die Pfeiltasten um den gewuenschten Typ zu waehlen.", - TEXT_NORMAL - }, - { - 8, - 11, - "\x07 Druecken Sie zum Bestaetigen die Eingabetaste.", + "Sie wollen den Tastaturtyp aendern, der installiert wird.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Druecken Sie die HOCH- oder RUNTER-Taste, um den gewuenschten", + TEXT_NORMAL + }, + { + 8, + 11, + " Typ zu waehlen. Dann druecken Sie ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Druecken Sie ESC Taste um die Aenderungen zu verwerfen.", + "\x07 Druecken Sie ESC, um zur vorherigen Seite zurueckzukehren,", + TEXT_NORMAL + }, + { + 8, + 14, + " ohne den Tastaturtyp zu aendern.", TEXT_NORMAL }, { @@ -918,31 +924,31 @@ { 6, 8, - "Sie moechten das Tastaturlayout aendern.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Druecken Sie die Pfeiltasten um das gewuenschte Layout auszuwaehlen.", - TEXT_NORMAL - }, - { - 8, - 11, - "\x07 Druecken Sie zum Bestaetigen die Eingabetaste.", + "Sie wollen das Tastaturlayout aendern, der installiert wird.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Druecken Sie die HOCH- oder RUNTER-Taste, um den gewuenschten", + TEXT_NORMAL + }, + { + 8, + 11, + " Typ zu waehlen. Dann druecken Sie ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Druecken Sie ESC um die Auswahl zu beenden und zur vorherigen ", + "\x07 Druecken Sie ESC, um zur vorherigen Seite zurueckzukehren,", TEXT_NORMAL }, { 8, 14, - " Setupseite zurueckzukehren.", + " ohne das Tastaturlayout zu aendern.", TEXT_NORMAL }, { @@ -994,19 +1000,19 @@ { 8, 19, - "\x07 Druecken Sie die Pfeiltasten um das Dateisystem zu aendern.", + "\x07 Druecken Sie die Pfeiltasten, um das Dateisystem zu aendern.", 0 }, { 8, 21, - "\x07 Druecken Sie die Eingabetaste um die Partition zu formatieren.", + "\x07 Druecken Sie die Eingabetaste, um die Partition zu formatieren.", 0 }, { 8, 23, - "\x07 Druecken Sie ESC um eine andere Partition auszuwaehlen.", + "\x07 Druecken Sie ESC, um eine andere Partition auszuwaehlen.", 0 }, { @@ -1035,7 +1041,7 @@ { 8, 18, - "\x07 Druecken Sie D um die Partition zu loeschen.", + "\x07 Druecken Sie D, um die Partition zu loeschen.", TEXT_NORMAL }, { @@ -1139,8 +1145,8 @@ "\n" "Partitionen zu erstellen/loeschen kann die Partitionstabelle zerstoeren.\n" "\n" - " \x07 Druecken Sie F3 um das Setup zu beenden." - " \x07 Druecken Sie ENTER um das Setup Fortzusetzen.", + " \x07 Druecken Sie F3, um das Setup zu beenden." + " \x07 Druecken Sie ENTER, um das Setup Fortzusetzen.", "F3 = Beenden ENTER = Fortsetzen" }, { @@ -1210,7 +1216,7 @@ }, { //ERROR_CABINET_SCRIPT, - "Cabinet hat kein Setup Skript.\n", + "Cabinet enthält kein Setup Skript.\n", "ENTER = Computer neustarten" }, {

1 0

[pschweitzer] 31425: - If there's a slash at the end of the entered path, it's removed - Updated Changelog
by pschweitzer＠svn.reactos.org 24 Dec '07

24 Dec '07

Author: pschweitzer Date: Tue Dec 25 01:47:23 2007 New Revision: 31425 URL: http://svn.reactos.org/svn/reactos?rev=31425&view=rev Log: - If there's a slash at the end of the entered path, it's removed - Updated Changelog Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h 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 Tue Dec 25 01:47:23 2007 @@ -1,7 +1,11 @@ *** XXX XXth, 2008 - RosBE 1.2 Released - Updated RosBE Configuration Tool. (Pierre Schweitzer) - - Removed an used var. (Pierre Schweitzer) + - Removed an used var (Pierre Schweitzer) + - Removed magic value use (Pierre Schweitzer) + - Deactivated temporarily pidl work because of unwanted effects (Pierre Schweitzer) + - Fixed the a bug : user can now enter the path in browse dialog, and it will be used (if correct) (Pierre Schweitzer) + - If there's a slash at the end of the entered path, it's removed (Pierre Schweitzer) - Added a "all" switch to clean.cmd to do both jobs, deleting Compiler Output AND Logs in one process. (Daniel Reimer) - Add a macro file for the MinGW prompt and add SCUT to this macro file (Colin Finck) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Tue Dec 25 01:47:23 2007 @@ -261,11 +261,15 @@ { WCHAR BoxMsg[256], BoxTitle[128]; HWND hwndParent; + INT PathLen; hwndParent = GetWindow(Dlg, GW_OWNER); LoadString(hInstance, MSG_WARNINGBOX, BoxTitle, 128); LoadString(hInstance, MSG_INVALIDDIR, BoxMsg, 256); if (MessageBox(Dlg, BoxMsg, BoxTitle, MB_ICONWARNING | MB_YESNO) == IDYES) { + PathLen = wcslen((LPWSTR)wParam); + if (wcscmp((LPWSTR)wParam+PathLen, L"\\")) + wcsset((LPWSTR)wParam+(PathLen-1), '\0'); if (CreateDirectory((LPWSTR)wParam, NULL) == 0) { LoadString(hInstance, MSG_DIREFAILED, BoxMsg, 256); Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h Tue Dec 25 01:47:23 2007 @@ -36,3 +36,5 @@ BOOL outstate; } SETTINGS, *PSETTINGS; + +wchar_t *wcsset(wchar_t *string, wchar_t c);

1 0

[dreimer] 31424: Update Config App's German RC File
by dreimer＠svn.reactos.org 24 Dec '07

24 Dec '07

Author: dreimer Date: Tue Dec 25 00:26:39 2007 New Revision: 31424 URL: http://svn.reactos.org/svn/reactos?rev=31424&view=rev Log: Update Config App's German RC File Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc Tue Dec 25 00:26:39 2007 @@ -50,7 +50,7 @@ CLR15, "Weiß" MSG_NOGCCFOUND, "Kein MinGW/GCC Compiler gefunden! Bitte überprüfen sie ihren Pfad." MSG_FILEFAILED, "rosbe-options.cmd konnte nicht erstellt werden!" - MSG_DIREFAILED, "Directory konnte nicht erstellt werden!" + MSG_DIREFAILED, "Ordner konnte nicht erstellt werden!" MSG_SETLOADSUC, "Vorherige Einstellungen erfolgreich geladen." MSG_FINDLOGDIR, "Bitte wählen Sie einen Ordner, in dem die Logs gespeichert werden sollen:" MSG_FINDMGWDIR, "Bitte wählen Sie den Ordner, in dem MinGW/GCC liegt:" @@ -58,7 +58,7 @@ MSG_FINDOUTDIR, "Bitte wählen Sie den Ordner, in den Sie die OUT Daten speichern wollen:" MSG_WARNINGBOX, "Warnung" MSG_EXITCHANGE, "Sind Sie sicher, dass das Programm beenden wollen ohne zu speichern?" - MSG_INVALIDDIR, "The directory you entered doesn't exist. Do you want to create it?" + MSG_INVALIDDIR, "Der Ordner, den Sie eingegeben haben, existiert nicht. Wollen Sie ihn erstellen?" /* Help Strings */ HLP_BACKCOLORC, "Auswählen der Hintergrundfarbe des RosBE DOS Fensters." HLP_FONTCOLORC, "Auswählen der Schriftfarbe des RosBE DOS Fensters."

1 0

[pschweitzer] 31423: If entered directory doesn't exist, create it on user demand
by pschweitzer＠svn.reactos.org 24 Dec '07

24 Dec '07

Author: pschweitzer Date: Mon Dec 24 22:24:38 2007 New Revision: 31423 URL: http://svn.reactos.org/svn/reactos?rev=31423&view=rev Log: If entered directory doesn't exist, create it on user demand Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc Mon Dec 24 22:24:38 2007 @@ -50,7 +50,7 @@ CLR15, "Weiß" MSG_NOGCCFOUND, "Kein MinGW/GCC Compiler gefunden! Bitte überprüfen sie ihren Pfad." MSG_FILEFAILED, "rosbe-options.cmd konnte nicht erstellt werden!" - MSG_DIREFAILED, "Log directory konnte nicht erstellt werden!" + MSG_DIREFAILED, "Directory konnte nicht erstellt werden!" MSG_SETLOADSUC, "Vorherige Einstellungen erfolgreich geladen." MSG_FINDLOGDIR, "Bitte wählen Sie einen Ordner, in dem die Logs gespeichert werden sollen:" MSG_FINDMGWDIR, "Bitte wählen Sie den Ordner, in dem MinGW/GCC liegt:" @@ -58,6 +58,7 @@ MSG_FINDOUTDIR, "Bitte wählen Sie den Ordner, in den Sie die OUT Daten speichern wollen:" MSG_WARNINGBOX, "Warnung" MSG_EXITCHANGE, "Sind Sie sicher, dass das Programm beenden wollen ohne zu speichern?" + MSG_INVALIDDIR, "The directory you entered doesn't exist. Do you want to create it?" /* Help Strings */ HLP_BACKCOLORC, "Auswählen der Hintergrundfarbe des RosBE DOS Fensters." HLP_FONTCOLORC, "Auswählen der Schriftfarbe des RosBE DOS Fensters." Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc Mon Dec 24 22:24:38 2007 @@ -50,7 +50,7 @@ CLR15, "Bright White" MSG_NOGCCFOUND, "No MinGW/GCC found! Please check your directory." MSG_FILEFAILED, "Failed to create rosbe-options.cmd!" - MSG_DIREFAILED, "Failed to create log directory!" + MSG_DIREFAILED, "Failed to create directory!" MSG_SETLOADSUC, "Previous settings loaded successfully." MSG_FINDLOGDIR, "Please choose a directory where the the logs should be stored:" MSG_FINDMGWDIR, "Please choose the directory where MinGW/GCC is located:" @@ -58,6 +58,7 @@ MSG_FINDOUTDIR, "Please choose the directory where you want to save OUT Files to:" MSG_WARNINGBOX, "Warning" MSG_EXITCHANGE, "Are you sure you want to exit without saving?" + MSG_INVALIDDIR, "The directory you entered doesn't exist. Do you want to create it?" /* Help Strings */ HLP_BACKCOLORC, "Choose background color for RosBE DOS windows." HLP_FONTCOLORC, "Choose font color for RosBE DOS windows." 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 Mon Dec 24 22:24:38 2007 @@ -50,7 +50,7 @@ CLR15, "Blanc Brillant" 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_DIREFAILED, "Impossible de créer le répertoire !" 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/GCC :" @@ -58,6 +58,7 @@ MSG_FINDOUTDIR, "Veuillez choisir le répertoire où vous désirez sauver les fichiers OUT :" MSG_WARNINGBOX, "Attention" MSG_EXITCHANGE, "Êtes-vous sûr de vouloir quitter sans sauvegarder ?" + MSG_INVALIDDIR, "The directory you entered doesn't exist. Do you want to create it?" /* 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." Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc Mon Dec 24 22:24:38 2007 @@ -52,7 +52,7 @@ CLR15, "ßðêî-áåëûé" MSG_NOGCCFOUND, "Êîìïèëÿòîð GCC íå íàéäåí! Ïðîâåðüòå ïðàâèëüíîñòü óñòàíîâêè." MSG_FILEFAILED, "Íåâîçìîæíî ñîçäàòü ôàéë rosbe-options.cmd" - MSG_DIREFAILED, "Íåâîçìîæíî ñîçäàòü ïàïêó äëÿ ëîãîâ!" + MSG_DIREFAILED, "Failed to create directory!" MSG_SETLOADSUC, "Ðàíåå ñîõðàíåííûå íàñòðîéêè çàãðóæåíû." MSG_FINDLOGDIR, "Óêàæèòå êàòàëîã ñîõðàíåíèÿ ëîã-ôàéëîâ:" MSG_FINDMGWDIR, "Óêàæèòå êàòàëîã ðàñïîëîæåíèÿ êîìïèëÿòîðà MinGW:" @@ -60,6 +60,7 @@ MSG_FINDOUTDIR, "Óêàæèòå êàòàëîã ñîõðàíåíèÿ êîìïèëèðîâàííûõ ôàéëîâ:" MSG_WARNINGBOX, "Âíèìàíèå!" MSG_EXITCHANGE, "Âû çàêðûâàåòå ïðîãðàììó íå ñîõðàíèâ íàñòðîéêè?" + MSG_INVALIDDIR, "The directory you entered doesn't exist. Do you want to create it?" /* Help Strings */ HLP_BACKCOLORC, "Âûáåðèòå öâåò ôîíà â îêíå êîíñîëè RosBE" HLP_FONTCOLORC, "Âûáåðèòå öâåò øðèôòà â îêíå êîíñîëè RosBE" Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Mon Dec 24 22:24:38 2007 @@ -37,7 +37,7 @@ if (writelog && (logdir[0] != 0)) if (0 > (LONG)GetFileAttributes(logdir)) - if (CreateDirectoryW(logdir, NULL) == 0) + if (CreateDirectory(logdir, NULL) == 0) { LoadString(hInstance, MSG_DIREFAILED, msgerror, 256); MessageBox(hwnd, msgerror, NULL, MB_ICONERROR); @@ -257,6 +257,26 @@ INT CALLBACK BrowseProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) { + if ((Msg == BFFM_VALIDATEFAILED) && (lParam != ID_MGWDIR)) + { + WCHAR BoxMsg[256], BoxTitle[128]; + HWND hwndParent; + hwndParent = GetWindow(Dlg, GW_OWNER); + LoadString(hInstance, MSG_WARNINGBOX, BoxTitle, 128); + LoadString(hInstance, MSG_INVALIDDIR, BoxMsg, 256); + if (MessageBox(Dlg, BoxMsg, BoxTitle, MB_ICONWARNING | MB_YESNO) == IDYES) + { + if (CreateDirectory((LPWSTR)wParam, NULL) == 0) + { + LoadString(hInstance, MSG_DIREFAILED, BoxMsg, 256); + MessageBox(Dlg, BoxMsg, NULL, MB_ICONERROR); + } + else + { + SetDlgItemText(hwndParent, lParam, (LPWSTR)wParam); + } + } + } return FALSE; } @@ -348,6 +368,7 @@ PathInfo.hwndOwner = Dlg; PathInfo.ulFlags = BIF_EDITBOX | BIF_VALIDATE; PathInfo.lpfn = (BFFCALLBACK)BrowseProc; + PathInfo.lParam = ID_LOGDIR; #if 0 SHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidl); PathInfo.pidlRoot = pidl; @@ -370,6 +391,7 @@ Control = ID_OUTDIR; IDText = MSG_FINDOUTDIR; } + PathInfo.lParam = Control; #if 0 hDLL = LoadLibrary(L"shell32.dll"); if (hDLL) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h Mon Dec 24 22:24:38 2007 @@ -61,18 +61,19 @@ #define MSG_FINDOUTDIR 0x2e #define MSG_WARNINGBOX 0x2f #define MSG_EXITCHANGE 0x30 +#define MSG_INVALIDDIR 0x31 /* Help Strings */ -#define HLP_BACKCOLORC 0x31 -#define HLP_FONTCOLORC 0x32 -#define HLP_SBUILDTIME 0x33 -#define HLP_CCACHEUSED 0x34 -#define HLP_STRIPEDEXE 0x35 -#define HLP_FINDMGWDIR 0x36 -#define HLP_FINDLOGDIR 0x37 -#define HLP_FINDOBJDIR 0x38 -#define HLP_FINDOUTDIR 0x39 -#define HLP_SAVEBUTTON 0x3a -#define HLP_QUITBUTTON 0x3b -#define HLP_DEFAULTMSG 0x3c +#define HLP_BACKCOLORC 0x32 +#define HLP_FONTCOLORC 0x33 +#define HLP_SBUILDTIME 0x34 +#define HLP_CCACHEUSED 0x35 +#define HLP_STRIPEDEXE 0x36 +#define HLP_FINDMGWDIR 0x37 +#define HLP_FINDLOGDIR 0x38 +#define HLP_FINDOBJDIR 0x39 +#define HLP_FINDOUTDIR 0x3a +#define HLP_SAVEBUTTON 0x3b +#define HLP_QUITBUTTON 0x3c +#define HLP_DEFAULTMSG 0x3d

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