Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 44498: [freeldr] Rework operating system menu, by storing each selection in a structure instead of distinct arrays. As a bonus, entries like LiveCD\reactos="ReactOS" /DEBUGPORT=COM1 /SOS /MININT now work
by hpoussin＠svn.reactos.org 10 Dec '09

10 Dec '09

Author: hpoussin Date: Wed Dec 9 23:03:39 2009 New Revision: 44498 URL: http://svn.reactos.org/svn/reactos?rev=44498&view=rev Log: [freeldr] Rework operating system menu, by storing each selection in a structure instead of distinct arrays. As a bonus, entries like LiveCD\reactos="ReactOS" /DEBUGPORT=COM1 /SOS /MININT now work Added: trunk/reactos/boot/freeldr/freeldr/include/arcemul.h (with props) Removed: trunk/reactos/boot/freeldr/freeldr/include/bootmgr.h Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/include/oslist.h trunk/reactos/boot/freeldr/freeldr/linuxboot.c trunk/reactos/boot/freeldr/freeldr/machine.c trunk/reactos/boot/freeldr/freeldr/oslist.c Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Wed Dec 9 23:03:39 2009 @@ -19,15 +19,95 @@ #include <freeldr.h> +ULONG GetDefaultOperatingSystem(OperatingSystemItem* OperatingSystemList, ULONG OperatingSystemCount) +{ + CHAR DefaultOSText[80]; + PCSTR DefaultOSName; + ULONG_PTR SectionId; + ULONG DefaultOS = 0; + ULONG Idx; + + if (!IniOpenSection("FreeLoader", &SectionId)) + { + return 0; + } + + DefaultOSName = CmdLineGetDefaultOS(); + if (NULL == DefaultOSName) + { + if (IniReadSettingByName(SectionId, "DefaultOS", DefaultOSText, sizeof(DefaultOSText))) + { + DefaultOSName = DefaultOSText; + } + } + + if (NULL != DefaultOSName) + { + for (Idx=0; Idx<OperatingSystemCount; Idx++) + { + if (_stricmp(DefaultOSName, OperatingSystemList[Idx].SystemPartition) == 0) + { + DefaultOS = Idx; + break; + } + } + } + + return DefaultOS; +} + +LONG GetTimeOut(VOID) +{ + CHAR TimeOutText[20]; + LONG TimeOut; + ULONG_PTR SectionId; + + TimeOut = CmdLineGetTimeOut(); + if (0 <= TimeOut) + { + return TimeOut; + } + + if (!IniOpenSection("FreeLoader", &SectionId)) + { + return -1; + } + + if (IniReadSettingByName(SectionId, "TimeOut", TimeOutText, sizeof(TimeOutText))) + { + TimeOut = atoi(TimeOutText); + } + else + { + TimeOut = -1; + } + + return TimeOut; +} + +BOOLEAN MainBootMenuKeyPressFilter(ULONG KeyPress) +{ + if (KeyPress == KEY_F8) + { + DoOptionsMenu(); + + return TRUE; + } + + // We didn't handle the key + return FALSE; +} + VOID RunLoader(VOID) { CHAR SettingValue[80]; CHAR BootType[80]; ULONG_PTR SectionId; ULONG OperatingSystemCount; - PCSTR *OperatingSystemSectionNames; + OperatingSystemItem* OperatingSystemList; PCSTR *OperatingSystemDisplayNames; PCSTR SectionName; + ULONG i; ULONG DefaultOperatingSystem; LONG TimeOut; ULONG SelectedOperatingSystem; @@ -58,10 +138,10 @@ return; } - - if (!InitOperatingSystemList(&OperatingSystemSectionNames, &OperatingSystemDisplayNames, &OperatingSystemCount)) - { - UiMessageBox("Press ENTER to reboot."); + OperatingSystemList = InitOperatingSystemList(&OperatingSystemCount); + if (!OperatingSystemList) + { + UiMessageBox("Unable to read operating systems section in freeldr.ini.\nPress ENTER to reboot."); goto reboot; } @@ -71,7 +151,20 @@ goto reboot; } - DefaultOperatingSystem = GetDefaultOperatingSystem(OperatingSystemSectionNames, OperatingSystemCount); + DefaultOperatingSystem = GetDefaultOperatingSystem(OperatingSystemList, OperatingSystemCount); + + // + // Create list of display names + // + OperatingSystemDisplayNames = MmHeapAlloc(sizeof(PCSTR) * OperatingSystemCount); + if (!OperatingSystemDisplayNames) + { + goto reboot; + } + for (i = 0; i < OperatingSystemCount; i++) + { + OperatingSystemDisplayNames[i] = OperatingSystemList[i].LoadIdentifier; + } // // Find all the message box settings and run them @@ -95,7 +188,7 @@ // Try to open the operating system section in the .ini file SettingValue[0] = ANSI_NULL; - SectionName = OperatingSystemSectionNames[SelectedOperatingSystem]; + SectionName = OperatingSystemList[SelectedOperatingSystem].SystemPartition; if (IniOpenSection(SectionName, &SectionId)) { // Try to read the boot type @@ -185,82 +278,3 @@ UiUnInitialize("Rebooting..."); return; } - -ULONG GetDefaultOperatingSystem(PCSTR OperatingSystemList[], ULONG OperatingSystemCount) -{ - CHAR DefaultOSText[80]; - PCSTR DefaultOSName; - ULONG_PTR SectionId; - ULONG DefaultOS = 0; - ULONG Idx; - - if (!IniOpenSection("FreeLoader", &SectionId)) - { - return 0; - } - - DefaultOSName = CmdLineGetDefaultOS(); - if (NULL == DefaultOSName) - { - if (IniReadSettingByName(SectionId, "DefaultOS", DefaultOSText, sizeof(DefaultOSText))) - { - DefaultOSName = DefaultOSText; - } - } - - if (NULL != DefaultOSName) - { - for (Idx=0; Idx<OperatingSystemCount; Idx++) - { - if (_stricmp(DefaultOSName, OperatingSystemList[Idx]) == 0) - { - DefaultOS = Idx; - break; - } - } - } - - return DefaultOS; -} - -LONG GetTimeOut(VOID) -{ - CHAR TimeOutText[20]; - LONG TimeOut; - ULONG_PTR SectionId; - - TimeOut = CmdLineGetTimeOut(); - if (0 <= TimeOut) - { - return TimeOut; - } - - if (!IniOpenSection("FreeLoader", &SectionId)) - { - return -1; - } - - if (IniReadSettingByName(SectionId, "TimeOut", TimeOutText, sizeof(TimeOutText))) - { - TimeOut = atoi(TimeOutText); - } - else - { - TimeOut = -1; - } - - return TimeOut; -} - -BOOLEAN MainBootMenuKeyPressFilter(ULONG KeyPress) -{ - if (KeyPress == KEY_F8) - { - DoOptionsMenu(); - - return TRUE; - } - - // We didn't handle the key - return FALSE; -} Added: trunk/reactos/boot/freeldr/freeldr/include/arcemul.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arcemul.h (added) +++ trunk/reactos/boot/freeldr/freeldr/include/arcemul.h [iso-8859-1] Wed Dec 9 23:03:39 2009 @@ -1,0 +1,43 @@ +/* + * FreeLoader + * Copyright (C) 2009 Hervé Poussineau <hpoussin(a)reactos.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/* component.c */ +CONFIGURATION_COMPONENT* ArcGetChild(CONFIGURATION_COMPONENT *Current); +CONFIGURATION_COMPONENT* ArcGetParent(CONFIGURATION_COMPONENT *Current); +CONFIGURATION_COMPONENT* ArcGetPeer(CONFIGURATION_COMPONENT *Current); +CONFIGURATION_COMPONENT* +ArcAddChild( + CONFIGURATION_COMPONENT *Current, + CONFIGURATION_COMPONENT *Template, + VOID *ConfigurationData); +LONG +ArcDeleteComponent( + CONFIGURATION_COMPONENT *ComponentToDelete); +LONG +ArcGetConfigurationData( + VOID* ConfigurationData, + CONFIGURATION_COMPONENT* Component); + +/* mm.c */ +MEMORY_DESCRIPTOR* +ArcGetMemoryDescriptor(MEMORY_DESCRIPTOR* Current); + +/* time.c */ +TIMEINFO* ArcGetTime(VOID); +ULONG ArcGetRelativeTime(VOID); Propchange: trunk/reactos/boot/freeldr/freeldr/include/arcemul.h ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/boot/freeldr/freeldr/include/bootmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/bootmgr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/bootmgr.h (removed) @@ -1,29 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef __BOOTMGR_H -#define __BOOTMGR_H - - -ULONG GetDefaultOperatingSystem(PCSTR OperatingSystemList[], ULONG OperatingSystemCount); -LONG GetTimeOut(VOID); -BOOLEAN MainBootMenuKeyPressFilter(ULONG KeyPress); - - -#endif // #defined __BOOTMGR_H Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Wed Dec 9 23:03:39 2009 @@ -43,6 +43,7 @@ #include <stdio.h> #include <ctype.h> #include <rosldr.h> +#include <arcemul.h> #include <arch.h> #include <rtl.h> #include <disk.h> @@ -97,7 +98,6 @@ #include <bget.h> #include <winerror.h> /* Needed by boot manager */ -#include <bootmgr.h> #include <oslist.h> #include <options.h> #include <linux.h> Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] Wed Dec 9 23:03:39 2009 @@ -100,9 +100,6 @@ BOOLEAN MachDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOLEAN MachDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry); ULONG MachDiskGetCacheableBlockCount(ULONG DriveNumber); -TIMEINFO* ArcGetTime(VOID); -ULONG ArcGetRelativeTime(VOID); -VOID MachHwDetect(VOID); VOID MachPrepareForReactOS(IN BOOLEAN Setup); #define MachConsPutChar(Ch) MachVtbl.ConsPutChar(Ch) Modified: trunk/reactos/boot/freeldr/freeldr/include/oslist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/oslist.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/oslist.h [iso-8859-1] Wed Dec 9 23:03:39 2009 @@ -20,9 +20,13 @@ #ifndef __OSLIST_H #define __OSLIST_H -BOOLEAN InitOperatingSystemList(PCSTR **SectionNamesPointer, PCSTR **DisplayNamesPointer, ULONG* OperatingSystemCountPointer); -ULONG CountOperatingSystems(ULONG SectionId); -BOOLEAN AllocateListMemory(PCHAR **SectionNamesPointer, PCHAR **DisplayNamesPointer, ULONG OperatingSystemCount); -BOOLEAN RemoveQuotes(PCHAR QuotedString); +typedef struct tagOperatingSystemItem +{ + PCSTR SystemPartition; + PCSTR LoadIdentifier; + PCSTR OsLoadOptions; +} OperatingSystemItem; + +OperatingSystemItem* InitOperatingSystemList(ULONG* OperatingSystemCountPointer); #endif // #defined __OSLIST_H Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/linux… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] Wed Dec 9 23:03:39 2009 @@ -41,6 +41,36 @@ CHAR LinuxBootDescription[80]; CHAR LinuxBootPath[260] = ""; +BOOLEAN RemoveQuotes(PCHAR QuotedString) +{ + CHAR TempString[200]; + PCHAR p; + PSTR Start; + + // + // Skip spaces up to " + // + p = QuotedString; + while (*p == ' ' || *p == '"') + p++; + Start = p; + + // + // Go up to next " + // + while (*p != '"' && *p != ANSI_NULL) + p++; + *p = ANSI_NULL; + + // + // Copy result + // + strcpy(TempString, Start); + strcpy(QuotedString, TempString); + + return TRUE; +} + VOID LoadAndBootLinux(PCSTR OperatingSystemName, PCSTR Description) { PFILE LinuxKernel = 0; Modified: trunk/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/machi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] Wed Dec 9 23:03:39 2009 @@ -41,7 +41,6 @@ #undef MachDiskReadLogicalSectors #undef MachDiskGetDriveGeometry #undef MachDiskGetCacheableBlockCount -#undef MachHwDetect MACHVTBL MachVtbl; @@ -177,10 +176,4 @@ return MachVtbl.DiskGetCacheableBlockCount(DriveNumber); } -VOID -MachHwDetect(VOID) -{ - MachVtbl.HwDetect(); -} - /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/oslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/oslis… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/oslist.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/oslist.c [iso-8859-1] Wed Dec 9 23:03:39 2009 @@ -19,179 +19,90 @@ #include <freeldr.h> -BOOLEAN InitOperatingSystemList(PCSTR **SectionNamesPointer, PCSTR **DisplayNamesPointer, ULONG* OperatingSystemCountPointer) +static PCSTR CopyString(PCSTR Source) { - ULONG Idx; - ULONG CurrentOperatingSystemIndex; - CHAR SettingName[260]; - CHAR SettingValue[260]; - ULONG OperatingSystemCount; - ULONG_PTR SectionId; - ULONG SectionSettingCount; - PCHAR *OperatingSystemSectionNames; - PCHAR *OperatingSystemDisplayNames; + PSTR Dest; + + if (!Source) + return NULL; + Dest = MmHeapAlloc(strlen(Source) + 1); + if (Dest) + { + strcpy(Dest, Source); + } + + return Dest; +} + +OperatingSystemItem* InitOperatingSystemList(ULONG* OperatingSystemCountPointer) +{ + ULONG Idx; + CHAR SettingName[260]; + CHAR SettingValue[260]; + ULONG_PTR SectionId; + PCHAR TitleStart, TitleEnd; + PCSTR OsLoadOptions; + ULONG Count; + OperatingSystemItem* Items; // // Open the [FreeLoader] section // if (!IniOpenSection("Operating Systems", &SectionId)) { - UiMessageBox("Section [Operating Systems] not found in freeldr.ini."); - return FALSE; + return NULL; } - SectionSettingCount = IniGetNumSectionItems(SectionId); - OperatingSystemCount = CountOperatingSystems(SectionId); + // + // Count number of operating systems in the section + // + Count = IniGetNumSectionItems(SectionId); // // Allocate memory to hold operating system lists // - if (!AllocateListMemory(&OperatingSystemSectionNames, &OperatingSystemDisplayNames, OperatingSystemCount)) + Items = MmHeapAlloc(Count * sizeof(OperatingSystemItem)); + if (!Items) { - return FALSE; + return NULL; } // // Now loop through and read the operating system section and display names // - CurrentOperatingSystemIndex = 0; - for (Idx=0; Idx<SectionSettingCount; Idx++) + for (Idx = 0; Idx < Count; Idx++) { IniReadSettingByNumber(SectionId, Idx, SettingName, sizeof(SettingName), SettingValue, sizeof(SettingValue)); - // Copy the section name - strcpy(OperatingSystemSectionNames[CurrentOperatingSystemIndex], SettingName); - - // Copy the display name - RemoveQuotes(SettingValue); - strcpy(OperatingSystemDisplayNames[CurrentOperatingSystemIndex], SettingValue); - - CurrentOperatingSystemIndex++; - } - - *OperatingSystemCountPointer = OperatingSystemCount; - *SectionNamesPointer = (PCSTR*)OperatingSystemSectionNames; - *DisplayNamesPointer = (PCSTR*)OperatingSystemDisplayNames; - - return TRUE; -} - -ULONG CountOperatingSystems(ULONG SectionId) -{ - return IniGetNumSectionItems(SectionId); -} - -BOOLEAN AllocateListMemory(PCHAR **SectionNamesPointer, PCHAR **DisplayNamesPointer, ULONG OperatingSystemCount) -{ - ULONG Idx; - PCHAR *OperatingSystemSectionNames = NULL; - PCHAR *OperatingSystemDisplayNames = NULL; - - // - // Allocate memory to hold operating system list arrays - // - OperatingSystemSectionNames = MmHeapAlloc( sizeof(PCHAR) * OperatingSystemCount); - OperatingSystemDisplayNames = MmHeapAlloc( sizeof(PCHAR) * OperatingSystemCount); - - // - // If either allocation failed then return FALSE - // - if ( (OperatingSystemSectionNames == NULL) || (OperatingSystemDisplayNames == NULL) ) - { - if (OperatingSystemSectionNames != NULL) + // + // Search start and end of the title + // + OsLoadOptions = NULL; + TitleStart = SettingValue; + while (*TitleStart == ' ' || *TitleStart == '"') + TitleStart++; + TitleEnd = TitleStart; + if (*TitleEnd != ANSI_NULL) + TitleEnd++; + while (*TitleEnd != ANSI_NULL && *TitleEnd != '"') + TitleEnd++; + if (*TitleEnd != ANSI_NULL) { - MmHeapFree(OperatingSystemSectionNames); + *TitleEnd = ANSI_NULL; + OsLoadOptions = TitleEnd + 1; } - if (OperatingSystemDisplayNames != NULL) - { - MmHeapFree(OperatingSystemDisplayNames); - } - - return FALSE; + // + // Copy the system partition, identifier and options + // + Items[Idx].SystemPartition = CopyString(SettingName); + Items[Idx].LoadIdentifier = CopyString(TitleStart); + Items[Idx].OsLoadOptions = CopyString(OsLoadOptions); } // - // Clear our newly allocated memory + // Return success // - memset(OperatingSystemSectionNames, 0, sizeof(PCHAR) * OperatingSystemCount); - memset(OperatingSystemDisplayNames, 0, sizeof(PCHAR) * OperatingSystemCount); - - // - // Loop through each array element and allocate it's string memory - // - for (Idx=0; Idx<OperatingSystemCount; Idx++) - { - OperatingSystemSectionNames[Idx] = MmHeapAlloc(80); - OperatingSystemDisplayNames[Idx] = MmHeapAlloc(80); - - // - // If it failed then jump to the cleanup code - // - if ( (OperatingSystemSectionNames[Idx] == NULL) || (OperatingSystemDisplayNames[Idx] == NULL)) - { - goto AllocateListMemoryFailed; - } - } - - *SectionNamesPointer = OperatingSystemSectionNames; - *DisplayNamesPointer = OperatingSystemDisplayNames; - - return TRUE; - -AllocateListMemoryFailed: - - // - // Loop through each array element and free it's string memory - // - for (Idx=0; Idx<OperatingSystemCount; Idx++) - { - if (OperatingSystemSectionNames[Idx] != NULL) - { - MmHeapFree(OperatingSystemSectionNames[Idx]); - } - - if (OperatingSystemDisplayNames[Idx] != NULL) - { - MmHeapFree(OperatingSystemDisplayNames[Idx]); - } - } - - // - // Free operating system list arrays - // - MmHeapFree(OperatingSystemSectionNames); - MmHeapFree(OperatingSystemDisplayNames); - - return FALSE; + *OperatingSystemCountPointer = Count; + return Items; } - -BOOLEAN RemoveQuotes(PCHAR QuotedString) -{ - CHAR TempString[200]; - PCHAR p; - PSTR Start; - - // - // Skip spaces up to " - // - p = QuotedString; - while (*p == ' ' || *p == '"') - p++; - Start = p; - - // - // Go up to next " - // - while (*p != '"' && *p != ANSI_NULL) - p++; - *p = ANSI_NULL; - - // - // Copy result - // - strcpy(TempString, Start); - strcpy(QuotedString, TempString); - - return TRUE; -}

1 0

[khornicek] 44497: - remove leftover
by khornicek＠svn.reactos.org 10 Dec '09

10 Dec '09

Author: khornicek Date: Wed Dec 9 22:53:49 2009 New Revision: 44497 URL: http://svn.reactos.org/svn/reactos?rev=44497&view=rev Log: - remove leftover Removed: trunk/reactos/base/applications/sndrec32/sndrec32.rc Removed: trunk/reactos/base/applications/sndrec32/sndrec32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/sndrec32.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/sndrec32.rc (removed) @@ -1,183 +1,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#ifndef APSTUDIO_INVOKED -#include "targetver.h" -#endif -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Italiano (Italia) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA) -#ifdef _WIN32 -LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_SNDREC32 ICON "reactOS_sndrec32.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -IDC_REACTOS_SNDREC32 ACCELERATORS -BEGIN - "?", IDM_ABOUT, ASCII, ALT - "/", IDM_ABOUT, ASCII, ALT -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Informazioni su reactOS_sndrec32" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 - LTEXT "reactOS_sndrec32, versione 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX - LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8 - DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_ABOUTBOX, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 189 - TOPMARGIN, 7 - BOTTOMMARGIN, 68 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#ifndef APSTUDIO_INVOKED\r\n" - "#include ""targetver.h""\r\n" - "#endif\r\n" - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP2_START BITMAP "but_start.bmp" -IDB_BITMAP2_END BITMAP "but_end.bmp" -IDB_BITMAP2_PLAY BITMAP "but_play.bmp" -IDB_BITMAP2_STOP BITMAP "but_stop.bmp" -IDB_BITMAP2_REC BITMAP "but_rec.bmp" -IDB_BITMAP2_END_DIS BITMAP "but_end_dis.bmp" -IDB_BITMAP2_PLAY_DIS BITMAP "but_play_dis.bmp" -IDB_BITMAP2_REC_DIS BITMAP "but_rec_dis.bmp" -IDB_BITMAP2_START_DIS BITMAP "but_start_dis.bmp" -IDB_BITMAP2_STOP_DIS BITMAP "but_stop_dis.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDR_MENU1 MENU -BEGIN - POPUP "File" - BEGIN - MENUITEM "New", ID_NEW - MENUITEM "Open...", ID_FILE_OPEN - MENUITEM "Save", ID_FILE_SAVE, GRAYED - MENUITEM "Save As...", ID_FILE_SAVEAS, GRAYED - MENUITEM SEPARATOR - MENUITEM "Exit", ID_EXIT - END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 - POPUP "?" - BEGIN - MENUITEM "About...", ID__ABOUT - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDS_APP_TITLE "reactOS_sndrec32" - IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" -END - -#endif // Italiano (Italia) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED -

1 0

[dgorbachev] 44496: Update log2lines to the latest version. Jan Roeloffzen, bug #4342.
by dgorbachev＠svn.reactos.org 10 Dec '09

10 Dec '09

Author: dgorbachev Date: Wed Dec 9 22:51:19 2009 New Revision: 44496 URL: http://svn.reactos.org/svn/reactos?rev=44496&view=rev Log: Update log2lines to the latest version. Jan Roeloffzen, bug #4342. Modified: trunk/reactos/tools/rsym/log2lines.c Modified: trunk/reactos/tools/rsym/log2lines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/log2lines.c?rev… ============================================================================== --- trunk/reactos/tools/rsym/log2lines.c [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/log2lines.c [iso-8859-1] Wed Dec 9 22:51:19 2009 @@ -10,8 +10,10 @@ #include "rsym.h" -#define LOG2LINES_VERSION "1.7" - +#define LOG2LINES_VERSION "1.8" + +/* Assume if an offset > ABS_TRESHOLD, then it must be absolute */ +#define ABS_TRESHOLD 0x00400000L #define INVALID_BASE 0xFFFFFFFFL #define DEF_OPT_DIR "output-i386" @@ -366,7 +368,7 @@ static size_t fixup_offset(size_t ImageBase, size_t offset) { - if (offset >= ImageBase) + if (offset > ABS_TRESHOLD) offset -= ImageBase; return offset; } @@ -953,11 +955,6 @@ int res = 0; char *path, *dpath; - /* First get the ImageBase of the File. If its smaller than the given - * Parameter, everything is ok, because it was already added onto the - * adress and can be given directly to process_file. If not, add it and - * give the result to process_file. - */ dpath = path = convert_path(cpath); if (!path) return 1; @@ -985,7 +982,6 @@ if (!res) { - offset = (base < offset) ? offset : base + offset; res = process_file(path, offset, toString); }

1 0

[gschneider] 44495: [kernel32] UnhandledExceptionFilter: - Print the exception address in the same style the stack frames are printed: module start offset and address separated - Print CPU registers before starting over with trace addresses
by gschneider＠svn.reactos.org 10 Dec '09

10 Dec '09

Author: gschneider Date: Wed Dec 9 22:48:09 2009 New Revision: 44495 URL: http://svn.reactos.org/svn/reactos?rev=44495&view=rev Log: [kernel32] UnhandledExceptionFilter: - Print the exception address in the same style the stack frames are printed: module start offset and address separated - Print CPU registers before starting over with trace addresses Modified: trunk/reactos/dll/win32/kernel32/except/except.c Modified: trunk/reactos/dll/win32/kernel32/except/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/except/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/except/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/except/except.c [iso-8859-1] Wed Dec 9 22:48:09 2009 @@ -205,7 +205,7 @@ } /* - * @unimplemented + * @implemented */ LONG WINAPI UnhandledExceptionFilter(struct _EXCEPTION_POINTERS *ExceptionInfo) @@ -274,10 +274,12 @@ { DbgPrint("Faulting Address: %8x\n", ExceptionInfo->ExceptionRecord->ExceptionInformation[1]); } - DbgPrint("Address: %8x %s\n", - ExceptionInfo->ExceptionRecord->ExceptionAddress, - _module_name_from_addr(ExceptionInfo->ExceptionRecord->ExceptionAddress, &StartAddr, szMod, sizeof(szMod))); _dump_context ( ExceptionInfo->ContextRecord ); + _module_name_from_addr(ExceptionInfo->ExceptionRecord->ExceptionAddress, &StartAddr, szMod, sizeof(szMod)); + DbgPrint("Address:\n %8x+%-8x %s\n", + (PVOID)StartAddr, (ULONG_PTR)ExceptionInfo->ExceptionRecord->ExceptionAddress - + (ULONG_PTR)StartAddr, szMod); + #ifdef _X86_ DbgPrint("Frames:\n"); _SEH2_TRY

1 0

[dreimer] 44494: Make the text box a bit bigger for languages which are less short than English :-P Add a German Translation by me and a Polish one by niski.
by dreimer＠svn.reactos.org 10 Dec '09

10 Dec '09

Author: dreimer Date: Wed Dec 9 22:30:05 2009 New Revision: 44494 URL: http://svn.reactos.org/svn/reactos?rev=44494&view=rev Log: Make the text box a bit bigger for languages which are less short than English :-P Add a German Translation by me and a Polish one by niski. Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -72,10 +72,10 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 - PUSHBUTTON "OK",IDOK,166,63,50,14 + GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -53,10 +53,10 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 - PUSHBUTTON "OK",IDOK,166,63,50,14 + GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -53,13 +53,13 @@ IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "System Settings" +CAPTION "System Einstellungen" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 - PUSHBUTTON "OK",IDOK,166,63,50,14 + GROUPBOX "Versions Info",IDC_STATIC,6,3,210,73 + CONTROL "Als Workstation identifizieren",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,110,10 + LTEXT "ReactOS ist als Server OS konzipiert und identifiziert sich auch als solches. Diese Einstellung ändert das Verhalten für Anwendungen.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -48,10 +48,10 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 - PUSHBUTTON "OK",IDOK,166,63,50,14 + GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -72,10 +72,10 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 - PUSHBUTTON "OK",IDOK,166,63,50,14 + GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -53,10 +53,10 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 - PUSHBUTTON "OK",IDOK,166,63,50,14 + GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -51,10 +51,10 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 - PUSHBUTTON "OK",IDOK,166,63,50,14 + GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -48,10 +48,10 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 - PUSHBUTTON "OK",IDOK,166,63,50,14 + GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -48,10 +48,10 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 - PUSHBUTTON "OK",IDOK,166,63,50,14 + GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -48,10 +48,10 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 - PUSHBUTTON "OK",IDOK,166,63,50,14 + GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 Modified: trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -49,10 +49,10 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 - PUSHBUTTON "OK",IDOK,166,63,50,14 + GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -69,6 +69,17 @@ PUSHBUTTON "Z&mienne rodowiskowe", IDC_ENVVAR, 84, 192, 80, 14 PUSHBUTTON "&Raportowanie b³êdów", IDC_ERRORREPORT, 170, 192, 80, 14 +END + +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "Ustawienia systemowe" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Informowanie o wersji",IDC_STATIC,6,3,210,73 + CONTROL "Zg³aszaj jako stacjê robocz¹",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,110,10 + LTEXT "ReactOS jest zbudowany w oparciu o wersjê serwerow¹. Zaznacz pole, aby ReactOS zg³asza³ siê aplikacjom jako stacja robocza.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -50,10 +50,10 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 - PUSHBUTTON "OK",IDOK,166,63,50,14 + GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -48,10 +48,10 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 - PUSHBUTTON "OK",IDOK,166,63,50,14 + GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -56,10 +56,10 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 - PUSHBUTTON "OK",IDOK,166,63,50,14 + GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 Modified: trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sv-SE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -50,10 +50,10 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 - PUSHBUTTON "OK",IDOK,166,63,50,14 + GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -56,10 +56,10 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 - PUSHBUTTON "OK",IDOK,166,63,50,14 + GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 Modified: trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] Wed Dec 9 22:30:05 2009 @@ -76,10 +76,10 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 - PUSHBUTTON "OK",IDOK,166,63,50,14 + GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END IDD_HARDWAREPROFILES DIALOGEX 6, 18, 254, 234

1 0

[tkreuzer] 44493: [SNDREC32] Make resources MUI ready.
by tkreuzer＠svn.reactos.org 10 Dec '09

10 Dec '09

Author: tkreuzer Date: Wed Dec 9 22:25:39 2009 New Revision: 44493 URL: http://svn.reactos.org/svn/reactos?rev=44493&view=rev Log: [SNDREC32] Make resources MUI ready. Added: trunk/reactos/base/applications/sndrec32/lang/ (with props) trunk/reactos/base/applications/sndrec32/lang/de-DE.rc - copied, changed from r44467, trunk/reactos/base/applications/sndrec32/sndrec32.rc trunk/reactos/base/applications/sndrec32/lang/en-US.rc - copied, changed from r44467, trunk/reactos/base/applications/sndrec32/sndrec32.rc trunk/reactos/base/applications/sndrec32/lang/it-IT.rc - copied, changed from r44467, trunk/reactos/base/applications/sndrec32/sndrec32.rc trunk/reactos/base/applications/sndrec32/resources/ (with props) trunk/reactos/base/applications/sndrec32/resources/bitmap1.bmp - copied unchanged from r44467, trunk/reactos/base/applications/sndrec32/bitmap1.bmp trunk/reactos/base/applications/sndrec32/resources/but_end.bmp - copied unchanged from r44467, trunk/reactos/base/applications/sndrec32/but_end.bmp trunk/reactos/base/applications/sndrec32/resources/but_end_dis.bmp - copied unchanged from r44467, trunk/reactos/base/applications/sndrec32/but_end_dis.bmp trunk/reactos/base/applications/sndrec32/resources/but_play.bmp - copied unchanged from r44467, trunk/reactos/base/applications/sndrec32/but_play.bmp trunk/reactos/base/applications/sndrec32/resources/but_play_dis.bmp - copied unchanged from r44467, trunk/reactos/base/applications/sndrec32/but_play_dis.bmp trunk/reactos/base/applications/sndrec32/resources/but_rec.bmp - copied unchanged from r44467, trunk/reactos/base/applications/sndrec32/but_rec.bmp trunk/reactos/base/applications/sndrec32/resources/but_rec_dis.bmp - copied unchanged from r44467, trunk/reactos/base/applications/sndrec32/but_rec_dis.bmp trunk/reactos/base/applications/sndrec32/resources/but_start.bmp - copied unchanged from r44467, trunk/reactos/base/applications/sndrec32/but_start.bmp trunk/reactos/base/applications/sndrec32/resources/but_start_dis.bmp - copied unchanged from r44467, trunk/reactos/base/applications/sndrec32/but_start_dis.bmp trunk/reactos/base/applications/sndrec32/resources/but_stop.bmp - copied unchanged from r44467, trunk/reactos/base/applications/sndrec32/but_stop.bmp trunk/reactos/base/applications/sndrec32/resources/but_stop_dis.bmp - copied unchanged from r44467, trunk/reactos/base/applications/sndrec32/but_stop_dis.bmp trunk/reactos/base/applications/sndrec32/resources/reactOS_sndrec32.ico (with props) trunk/reactos/base/applications/sndrec32/resources/small.ico (with props) trunk/reactos/base/applications/sndrec32/rsrc.rc (with props) Removed: trunk/reactos/base/applications/sndrec32/bitmap1.bmp trunk/reactos/base/applications/sndrec32/but_end.bmp trunk/reactos/base/applications/sndrec32/but_end_dis.bmp trunk/reactos/base/applications/sndrec32/but_play.bmp trunk/reactos/base/applications/sndrec32/but_play_dis.bmp trunk/reactos/base/applications/sndrec32/but_rec.bmp trunk/reactos/base/applications/sndrec32/but_rec_dis.bmp trunk/reactos/base/applications/sndrec32/but_start.bmp trunk/reactos/base/applications/sndrec32/but_start_dis.bmp trunk/reactos/base/applications/sndrec32/but_stop.bmp trunk/reactos/base/applications/sndrec32/but_stop_dis.bmp trunk/reactos/base/applications/sndrec32/reactOS_sndrec32.ico trunk/reactos/base/applications/sndrec32/small.ico Modified: trunk/reactos/base/applications/sndrec32/sndrec32.rbuild Removed: trunk/reactos/base/applications/sndrec32/bitmap1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== (empty) Removed: trunk/reactos/base/applications/sndrec32/but_end.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/sndrec32/but_end_dis.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/sndrec32/but_play.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/sndrec32/but_play_dis.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/sndrec32/but_rec.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/sndrec32/but_rec_dis.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/sndrec32/but_start.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/sndrec32/but_start_dis.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/sndrec32/but_stop.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/sndrec32/but_stop_dis.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/sndrec32/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Dec 9 22:25:39 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/sndrec32/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/sndrec32/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/sndrec32/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: trunk/reactos/base/applications/sndrec32/lang/de-DE.rc (from r44467, trunk/reactos/base/applications/sndrec32/sndrec32.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/sndrec32.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/de-DE.rc [iso-8859-1] Wed Dec 9 22:25:39 2009 @@ -1,44 +1,4 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#ifndef APSTUDIO_INVOKED -#include "targetver.h" -#endif -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Italiano (Italia) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA) -#ifdef _WIN32 -LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_SNDREC32 ICON "reactOS_sndrec32.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN IDC_REACTOS_SNDREC32 ACCELERATORS BEGIN @@ -46,138 +6,38 @@ "/", IDM_ABOUT, ASCII, ALT END - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Informazioni su reactOS_sndrec32" +CAPTION "Information zu reactOS_sndrec32" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 - LTEXT "reactOS_sndrec32, versione 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX + LTEXT "reactOS_sndrec32, Version 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8 DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_ABOUTBOX, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 189 - TOPMARGIN, 7 - BOTTOMMARGIN, 68 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#ifndef APSTUDIO_INVOKED\r\n" - "#include ""targetver.h""\r\n" - "#endif\r\n" - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP2_START BITMAP "but_start.bmp" -IDB_BITMAP2_END BITMAP "but_end.bmp" -IDB_BITMAP2_PLAY BITMAP "but_play.bmp" -IDB_BITMAP2_STOP BITMAP "but_stop.bmp" -IDB_BITMAP2_REC BITMAP "but_rec.bmp" -IDB_BITMAP2_END_DIS BITMAP "but_end_dis.bmp" -IDB_BITMAP2_PLAY_DIS BITMAP "but_play_dis.bmp" -IDB_BITMAP2_REC_DIS BITMAP "but_rec_dis.bmp" -IDB_BITMAP2_START_DIS BITMAP "but_start_dis.bmp" -IDB_BITMAP2_STOP_DIS BITMAP "but_stop_dis.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// IDR_MENU1 MENU BEGIN POPUP "File" BEGIN - MENUITEM "New", ID_NEW - MENUITEM "Open...", ID_FILE_OPEN - MENUITEM "Save", ID_FILE_SAVE, GRAYED - MENUITEM "Save As...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Neu", ID_NEW + MENUITEM "Öffnen...", ID_FILE_OPEN + MENUITEM "Speichern", ID_FILE_SAVE, GRAYED + MENUITEM "Speichern Unter...", ID_FILE_SAVEAS, GRAYED MENUITEM SEPARATOR - MENUITEM "Exit", ID_EXIT + MENUITEM "Beenden", ID_EXIT END MENUITEM "todo1", 0 MENUITEM "todo2", 0 POPUP "?" BEGIN - MENUITEM "About...", ID__ABOUT + MENUITEM "Über...", ID__ABOUT END END - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// STRINGTABLE BEGIN IDS_APP_TITLE "reactOS_sndrec32" IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" END - -#endif // Italiano (Italia) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - Copied: trunk/reactos/base/applications/sndrec32/lang/en-US.rc (from r44467, trunk/reactos/base/applications/sndrec32/sndrec32.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/sndrec32.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/en-US.rc [iso-8859-1] Wed Dec 9 22:25:39 2009 @@ -1,44 +1,4 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#ifndef APSTUDIO_INVOKED -#include "targetver.h" -#endif -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Italiano (Italia) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA) -#ifdef _WIN32 -LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_SNDREC32 ICON "reactOS_sndrec32.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDC_REACTOS_SNDREC32 ACCELERATORS BEGIN @@ -46,94 +6,16 @@ "/", IDM_ABOUT, ASCII, ALT END - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Informazioni su reactOS_sndrec32" +CAPTION "Information about reactOS_sndrec32" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 - LTEXT "reactOS_sndrec32, versione 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX + LTEXT "reactOS_sndrec32, version 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8 DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_ABOUTBOX, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 189 - TOPMARGIN, 7 - BOTTOMMARGIN, 68 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#ifndef APSTUDIO_INVOKED\r\n" - "#include ""targetver.h""\r\n" - "#endif\r\n" - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP2_START BITMAP "but_start.bmp" -IDB_BITMAP2_END BITMAP "but_end.bmp" -IDB_BITMAP2_PLAY BITMAP "but_play.bmp" -IDB_BITMAP2_STOP BITMAP "but_stop.bmp" -IDB_BITMAP2_REC BITMAP "but_rec.bmp" -IDB_BITMAP2_END_DIS BITMAP "but_end_dis.bmp" -IDB_BITMAP2_PLAY_DIS BITMAP "but_play_dis.bmp" -IDB_BITMAP2_REC_DIS BITMAP "but_rec_dis.bmp" -IDB_BITMAP2_START_DIS BITMAP "but_start_dis.bmp" -IDB_BITMAP2_STOP_DIS BITMAP "but_stop_dis.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// IDR_MENU1 MENU BEGIN @@ -154,30 +36,8 @@ END END - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - STRINGTABLE BEGIN IDS_APP_TITLE "reactOS_sndrec32" IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" END - -#endif // Italiano (Italia) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - Copied: trunk/reactos/base/applications/sndrec32/lang/it-IT.rc (from r44467, trunk/reactos/base/applications/sndrec32/sndrec32.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/sndrec32.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/it-IT.rc [iso-8859-1] Wed Dec 9 22:25:39 2009 @@ -1,56 +1,10 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#ifndef APSTUDIO_INVOKED -#include "targetver.h" -#endif -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Italiano (Italia) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA) -#ifdef _WIN32 LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_SNDREC32 ICON "reactOS_sndrec32.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// IDC_REACTOS_SNDREC32 ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -62,78 +16,6 @@ LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8 DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_ABOUTBOX, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 189 - TOPMARGIN, 7 - BOTTOMMARGIN, 68 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#ifndef APSTUDIO_INVOKED\r\n" - "#include ""targetver.h""\r\n" - "#endif\r\n" - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP2_START BITMAP "but_start.bmp" -IDB_BITMAP2_END BITMAP "but_end.bmp" -IDB_BITMAP2_PLAY BITMAP "but_play.bmp" -IDB_BITMAP2_STOP BITMAP "but_stop.bmp" -IDB_BITMAP2_REC BITMAP "but_rec.bmp" -IDB_BITMAP2_END_DIS BITMAP "but_end_dis.bmp" -IDB_BITMAP2_PLAY_DIS BITMAP "but_play_dis.bmp" -IDB_BITMAP2_REC_DIS BITMAP "but_rec_dis.bmp" -IDB_BITMAP2_START_DIS BITMAP "but_start_dis.bmp" -IDB_BITMAP2_STOP_DIS BITMAP "but_stop_dis.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// IDR_MENU1 MENU BEGIN @@ -154,30 +36,8 @@ END END - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - STRINGTABLE BEGIN IDS_APP_TITLE "reactOS_sndrec32" IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" END - -#endif // Italiano (Italia) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - Removed: trunk/reactos/base/applications/sndrec32/reactOS_sndrec32.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/sndrec32/resources/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Dec 9 22:25:39 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/sndrec32/resources/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/sndrec32/resources/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/sndrec32/resources/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/sndrec32/resources/reactOS_sndrec32.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/sndrec32/resources/reactOS_sndrec32.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/sndrec32/resources/small.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/sndrec32/resources/small.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/rsrc.rc (added) +++ trunk/reactos/base/applications/sndrec32/rsrc.rc [iso-8859-1] Wed Dec 9 22:25:39 2009 @@ -1,0 +1,21 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_SNDREC32 ICON "resources/reactOS_sndrec32.ico" + +IDB_BITMAP2_START BITMAP "resources/but_start.bmp" +IDB_BITMAP2_END BITMAP "resources/but_end.bmp" +IDB_BITMAP2_PLAY BITMAP "resources/but_play.bmp" +IDB_BITMAP2_STOP BITMAP "resources/but_stop.bmp" +IDB_BITMAP2_REC BITMAP "resources/but_rec.bmp" +IDB_BITMAP2_END_DIS BITMAP "resources/but_end_dis.bmp" +IDB_BITMAP2_PLAY_DIS BITMAP "resources/but_play_dis.bmp" +IDB_BITMAP2_REC_DIS BITMAP "resources/but_rec_dis.bmp" +IDB_BITMAP2_START_DIS BITMAP "resources/but_start_dis.bmp" +IDB_BITMAP2_STOP_DIS BITMAP "resources/but_stop_dis.bmp" + +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/it-IT.rc" Propchange: trunk/reactos/base/applications/sndrec32/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/base/applications/sndrec32/small.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Modified: trunk/reactos/base/applications/sndrec32/sndrec32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/sndrec32.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/sndrec32.rbuild [iso-8859-1] Wed Dec 9 22:25:39 2009 @@ -15,5 +15,5 @@ <file>audio_wavein.cpp</file> <file>audio_waveout.cpp</file> <file>sndrec32.cpp</file> - <file>sndrec32.rc</file> + <file>rsrc.rc</file> </module>

1 0

[tkreuzer] 44492: Add sndrec32 to build
by tkreuzer＠svn.reactos.org 10 Dec '09

10 Dec '09

Author: tkreuzer Date: Wed Dec 9 18:52:20 2009 New Revision: 44492 URL: http://svn.reactos.org/svn/reactos?rev=44492&view=rev Log: Add sndrec32 to build Modified: trunk/reactos/base/applications/applications.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Wed Dec 9 18:52:20 2009 @@ -79,6 +79,9 @@ <directory name="shutdown"> <xi:include href="shutdown/shutdown.rbuild" /> </directory> + <directory name="sndrec32"> + <xi:include href="sndrec32/sndrec32.rbuild" /> + </directory> <directory name="sndvol32"> <xi:include href="sndvol32/sndvol32.rbuild" /> </directory>

1 0

[tkreuzer] 44491: - add LIST_ENTRY32/64, STRING32/64 - change C_ASSERT in winnt.h, too
by tkreuzer＠svn.reactos.org 10 Dec '09

10 Dec '09

Author: tkreuzer Date: Wed Dec 9 18:48:56 2009 New Revision: 44491 URL: http://svn.reactos.org/svn/reactos?rev=44491&view=rev Log: - add LIST_ENTRY32/64, STRING32/64 - change C_ASSERT in winnt.h, too Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntdef.h branches/ros-amd64-bringup/reactos/include/ndk/umtypes.h branches/ros-amd64-bringup/reactos/include/psdk/winnt.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/ntdef.h [iso-8859-1] Wed Dec 9 18:48:56 2009 @@ -529,7 +529,21 @@ typedef STRING CANSI_STRING; typedef PSTRING PCANSI_STRING; - +typedef struct _STRING32 { + USHORT Length; + USHORT MaximumLength; + ULONG Buffer; +} STRING32, *PSTRING32, + UNICODE_STRING32, *PUNICODE_STRING32, + ANSI_STRING32, *PANSI_STRING32; + +typedef struct _STRING64 { + USHORT Length; + USHORT MaximumLength; + ULONGLONG Buffer; +} STRING64, *PSTRING64, + UNICODE_STRING64, *PUNICODE_STRING64, + ANSI_STRING64, *PANSI_STRING64; // // LangID and NLS Modified: branches/ros-amd64-bringup/reactos/include/ndk/umtypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/umtypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/umtypes.h [iso-8859-1] Wed Dec 9 18:48:56 2009 @@ -151,6 +151,22 @@ CONST CHAR *Buffer; } CSTRING, *PCSTRING; +typedef struct _STRING32 { + USHORT Length; + USHORT MaximumLength; + ULONG Buffer; +} STRING32, *PSTRING32, + UNICODE_STRING32, *PUNICODE_STRING32, + ANSI_STRING32, *PANSI_STRING32; + +typedef struct _STRING64 { + USHORT Length; + USHORT MaximumLength; + ULONGLONG Buffer; +} STRING64, *PSTRING64, + UNICODE_STRING64, *PUNICODE_STRING64, + ANSI_STRING64, *PANSI_STRING64; + #endif typedef struct _OBJECT_ATTRIBUTES Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] Wed Dec 9 18:48:56 2009 @@ -229,12 +229,8 @@ typedef WORD FSHORT; typedef DWORD FLONG; -#define __C_ASSERT_JOIN(X, Y) __C_ASSERT_DO_JOIN(X, Y) -#define __C_ASSERT_DO_JOIN(X, Y) __C_ASSERT_DO_JOIN2(X, Y) -#define __C_ASSERT_DO_JOIN2(X, Y) X##Y - -#define C_ASSERT(e) typedef char __C_ASSERT_JOIN(__C_ASSERT__, __LINE__)[(e) ? 1 : -1] - +#define C_ASSERT(exp) \ + extern char __c_assert__[exp ? 1 : -1]; #include "intrin.h" @@ -3238,6 +3234,15 @@ struct _LIST_ENTRY *Flink; struct _LIST_ENTRY *Blink; } LIST_ENTRY,*PLIST_ENTRY; +typedef struct _LIST_ENTRY32 { + DWORD Flink; + DWORD Blink; +} LIST_ENTRY32,*PLIST_ENTRY32; +typedef struct _LIST_ENTRY64 { + ULONGLONG Flink; + ULONGLONG Blink; +} LIST_ENTRY64,*PLIST_ENTRY64; + typedef struct _SINGLE_LIST_ENTRY { struct _SINGLE_LIST_ENTRY *Next; } SINGLE_LIST_ENTRY,*PSINGLE_LIST_ENTRY;

1 0

[tkreuzer] 44490: [WINEBUILD] Sync winebuild to Wine_1_1_34 Lots of reactos hacks are gone now. ARM is natively supported now. Windows headers are no longer included, winglue.h is gone, the code that was previously removed is back again, there is no point in removing unused features. still there: the fastcall and pedll modifications. Added a ros-diff.
by tkreuzer＠svn.reactos.org 10 Dec '09

10 Dec '09

Author: tkreuzer Date: Wed Dec 9 18:01:35 2009 New Revision: 44490 URL: http://svn.reactos.org/svn/reactos?rev=44490&view=rev Log: [WINEBUILD] Sync winebuild to Wine_1_1_34 Lots of reactos hacks are gone now. ARM is natively supported now. Windows headers are no longer included, winglue.h is gone, the code that was previously removed is back again, there is no point in removing unused features. still there: the fastcall and pedll modifications. Added a ros-diff. Added: trunk/reactos/tools/winebuild/ros_diff.patch (with props) Removed: trunk/reactos/tools/winebuild/winglue.h Modified: trunk/reactos/tools/winebuild/Makefile.in trunk/reactos/tools/winebuild/build.h trunk/reactos/tools/winebuild/import.c trunk/reactos/tools/winebuild/main.c trunk/reactos/tools/winebuild/parser.c trunk/reactos/tools/winebuild/relay.c trunk/reactos/tools/winebuild/res16.c trunk/reactos/tools/winebuild/res32.c trunk/reactos/tools/winebuild/spec16.c trunk/reactos/tools/winebuild/spec32.c trunk/reactos/tools/winebuild/utils.c trunk/reactos/tools/winebuild/winebuild.man.in trunk/reactos/tools/winebuild/winebuild.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/winebuild/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/Makefile.i… Modified: trunk/reactos/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/build.h?re… Modified: trunk/reactos/tools/winebuild/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/import.c?r… Modified: trunk/reactos/tools/winebuild/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/main.c?rev… Modified: trunk/reactos/tools/winebuild/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/parser.c?r… Modified: trunk/reactos/tools/winebuild/relay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/relay.c?re… Modified: trunk/reactos/tools/winebuild/res16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res16.c?re… Modified: trunk/reactos/tools/winebuild/res32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res32.c?re… Added: trunk/reactos/tools/winebuild/ros_diff.patch URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/ros_diff.p… Modified: trunk/reactos/tools/winebuild/spec16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec16.c?r… Modified: trunk/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec32.c?r… Modified: trunk/reactos/tools/winebuild/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/utils.c?re… Modified: trunk/reactos/tools/winebuild/winebuild.man.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.… Modified: trunk/reactos/tools/winebuild/winebuild.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.… Removed: trunk/reactos/tools/winebuild/winglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winglue.h?…

1 0

[gedmurphy] 44489: Missed resource cleanup. I'm clearly out of practice
by gedmurphy＠svn.reactos.org 09 Dec '09

09 Dec '09

Author: gedmurphy Date: Wed Dec 9 17:44:10 2009 New Revision: 44489 URL: http://svn.reactos.org/svn/reactos?rev=44489&view=rev Log: Missed resource cleanup. I'm clearly out of practice Modified: trunk/reactos/dll/cpl/sysdm/advanced.c Modified: trunk/reactos/dll/cpl/sysdm/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/advanced.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/advanced.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/advanced.c [iso-8859-1] Wed Dec 9 17:44:10 2009 @@ -42,6 +42,8 @@ REG_DWORD, (LPBYTE)&ReportAsWorkstation, sizeof(DWORD)); + + RegCloseKey(hKey); } } @@ -76,9 +78,9 @@ 0); } } + + RegCloseKey(hKey); } - - } INT_PTR CALLBACK

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