Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[ekohl] 47764: [FORMATTING] Fix indentation. No code changes.
by ekohl＠svn.reactos.org 12 Jun '10

12 Jun '10

Author: ekohl Date: Sat Jun 12 10:25:18 2010 New Revision: 47764 URL: http://svn.reactos.org/svn/reactos?rev=47764&view=rev Log: [FORMATTING] Fix indentation. No code changes. Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.c trunk/reactos/lib/fslib/ntfslib/ntfslib.c trunk/reactos/lib/fslib/vfatlib/fat12.c trunk/reactos/lib/fslib/vfatlib/fat16.c trunk/reactos/lib/fslib/vfatlib/fat32.c trunk/reactos/lib/fslib/vfatlib/vfatlib.c trunk/reactos/lib/fslib/vfatlib/vfatlib.h trunk/reactos/lib/fslib/vfatxlib/fatx.c trunk/reactos/lib/fslib/vfatxlib/vfatxlib.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Mke2fs.c… Modified: trunk/reactos/lib/fslib/ntfslib/ntfslib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ntfslib/ntfslib.… Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat12.c?… Modified: trunk/reactos/lib/fslib/vfatlib/fat16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat16.c?… Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat32.c?… Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… Modified: trunk/reactos/lib/fslib/vfatxlib/fatx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatxlib/fatx.c?… Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatxlib/vfatxli…

1 0

[janderwald] 47763: [WDMAUD_KERNEL] - Fix possible buffer overflow [MMIXER] - Add sanity checks
by janderwald＠svn.reactos.org 12 Jun '10

12 Jun '10

Author: janderwald Date: Sat Jun 12 10:21:03 2010 New Revision: 47763 URL: http://svn.reactos.org/svn/reactos?rev=47763&view=rev Log: [WDMAUD_KERNEL] - Fix possible buffer overflow [MMIXER] - Add sanity checks Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/deviface.c trunk/reactos/lib/drivers/sound/mmixer/controls.c trunk/reactos/lib/drivers/sound/mmixer/filter.c trunk/reactos/lib/drivers/sound/mmixer/mixer.c trunk/reactos/lib/drivers/sound/mmixer/priv.h trunk/reactos/lib/drivers/sound/mmixer/sup.c trunk/reactos/lib/drivers/sound/mmixer/wave.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/deviface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/deviface.c [iso-8859-1] Sat Jun 12 10:21:03 2010 @@ -122,18 +122,32 @@ } else { + Entry = (SYSAUDIO_ENTRY*)AllocateItem(NonPagedPool, sizeof(SYSAUDIO_ENTRY)); + if (!Entry) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + Length = wcslen(DeviceName.Buffer) + 1; - Entry = (SYSAUDIO_ENTRY*)AllocateItem(NonPagedPool, sizeof(SYSAUDIO_ENTRY) + Length * sizeof(WCHAR)); - if (!Entry) - { + Entry->SymbolicLink.Length = 0; + Entry->SymbolicLink.MaximumLength = Length * sizeof(WCHAR); + Entry->SymbolicLink.Buffer = AllocateItem(NonPagedPool, Entry->SymbolicLink.MaximumLength); + + if (!Entry->SymbolicLink.Buffer) + { + FreeItem(Entry); return STATUS_INSUFFICIENT_RESOURCES; } - Entry->SymbolicLink.Length = Entry->SymbolicLink.MaximumLength = Length * sizeof(WCHAR); - Entry->SymbolicLink.MaximumLength += sizeof(WCHAR); - Entry->SymbolicLink.Buffer = (LPWSTR) (Entry + 1); - - wcscpy(Entry->SymbolicLink.Buffer, DeviceName.Buffer); + Status = RtlAppendUnicodeStringToString(&Entry->SymbolicLink, &DeviceName); + + if (!NT_SUCCESS(Status)) + { + FreeItem(Entry->SymbolicLink.Buffer); + FreeItem(Entry); + return Status; + } InsertTailList(&DeviceExtension->SysAudioDeviceList, &Entry->Entry); DeviceExtension->NumSysAudioDevices++; Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Sat Jun 12 10:21:03 2010 @@ -15,6 +15,7 @@ IN PKSMULTIPLE_ITEM NodeTypes, IN ULONG bUpDirection, IN ULONG NodeConnectionIndex, + IN ULONG PinCount, OUT PULONG Pins) { PKSTOPOLOGY_CONNECTION Connection; @@ -41,6 +42,9 @@ //DPRINT("GetTargetPinsByNodeIndex FOUND Target Pin %u Parsed %u\n", PinId, Pins[PinId]); + // sanity check + ASSERT(PinId < PinCount); + /* mark pin index as a target pin */ Pins[PinId] = TRUE; return MM_STATUS_SUCCESS; @@ -61,7 +65,7 @@ for(Index = 0; Index < NodeConnectionCount; Index++) { // iterate recursively into the nodes - Status = MMixerGetTargetPinsByNodeConnectionIndex(MixerContext, NodeConnections, NodeTypes, bUpDirection, NodeConnection[Index], Pins); + Status = MMixerGetTargetPinsByNodeConnectionIndex(MixerContext, NodeConnections, NodeTypes, bUpDirection, NodeConnection[Index], PinCount, Pins); ASSERT(Status == MM_STATUS_SUCCESS); } // free node connection indexes @@ -597,6 +601,8 @@ DestinationLine->Line.Target.wMid = MixerInfo->MixCaps.wMid; DestinationLine->Line.Target.wPid = MixerInfo->MixCaps.wPid; DestinationLine->Line.Target.vDriverVersion = MixerInfo->MixCaps.vDriverVersion; + + ASSERT(MixerInfo->MixCaps.szPname[MAXPNAMELEN-1] == 0); wcscpy(DestinationLine->Line.Target.szPname, MixerInfo->MixCaps.szPname); // initialize extra line @@ -736,11 +742,11 @@ return Status; } - /* there should be no split in the bride pin */ + /* there should be no split in the bridge pin */ ASSERT(PinConnectionIndexCount == 1); /* find all target pins of this connection */ - Status = MMixerGetTargetPinsByNodeConnectionIndex(MixerContext, NodeConnections, NodeTypes, FALSE, PinConnectionIndex[0], PinsRef); + Status = MMixerGetTargetPinsByNodeConnectionIndex(MixerContext, NodeConnections, NodeTypes, FALSE, PinConnectionIndex[0], PinsRefCount, PinsRef); if (Status != MM_STATUS_SUCCESS) { MixerContext->Free(PinsRef); @@ -779,7 +785,7 @@ } // now get all connected source pins - Status = MMixerGetTargetPinsByNodeConnectionIndex(MixerContext, NodeConnections, NodeTypes, TRUE, MixerControls[0], PinsSrcRef); + Status = MMixerGetTargetPinsByNodeConnectionIndex(MixerContext, NodeConnections, NodeTypes, TRUE, MixerControls[0], PinsRefCount, PinsSrcRef); if (Status != MM_STATUS_SUCCESS) { // failed */ @@ -857,6 +863,9 @@ InitializeListHead(&MixerInfo->LineList); InitializeListHead(&MixerInfo->EventList); + // sanity check + ASSERT(PinCount); + // now allocate an array which will receive the indices of the pin // which has a ADC / DAC nodetype in its path Pins = (PULONG)MixerContext->Alloc(PinCount * sizeof(ULONG)); Modified: trunk/reactos/lib/drivers/sound/mmixer/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/f… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/filter.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/filter.c [iso-8859-1] Sat Jun 12 10:21:03 2010 @@ -57,6 +57,9 @@ if (Status != MM_STATUS_MORE_ENTRIES) return Status; + //sanity check + ASSERT(BytesReturned); + // allocate an result buffer MultipleItem = (PKSMULTIPLE_ITEM)MixerContext->Alloc(BytesReturned); Modified: trunk/reactos/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] Sat Jun 12 10:21:03 2010 @@ -65,6 +65,8 @@ MixerCaps->vDriverVersion = MixerInfo->MixCaps.vDriverVersion; MixerCaps->fdwSupport = MixerInfo->MixCaps.fdwSupport; MixerCaps->cDestinations = MixerInfo->MixCaps.cDestinations; + + ASSERT(MixerInfo->MixCaps.szPname[MAXPNAMELEN-1] == 0); wcscpy(MixerCaps->szPname, MixerInfo->MixCaps.szPname); return MM_STATUS_SUCCESS; Modified: trunk/reactos/lib/drivers/sound/mmixer/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/p… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] Sat Jun 12 10:21:03 2010 @@ -178,6 +178,7 @@ IN PKSMULTIPLE_ITEM NodeTypes, IN ULONG bUpDirection, IN ULONG NodeConnectionIndex, + IN ULONG PinCount, OUT PULONG Pins); MIXER_STATUS Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/s… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Sat Jun 12 10:21:03 2010 @@ -358,7 +358,7 @@ { for(Index = 0; Index < NodeConnectionCount; Index++) { - Status = MMixerGetTargetPinsByNodeConnectionIndex(MixerContext, NodeConnections, NodeTypes, bUpDirection, NodeConnection[Index], Pins); + Status = MMixerGetTargetPinsByNodeConnectionIndex(MixerContext, NodeConnections, NodeTypes, bUpDirection, NodeConnection[Index], PinCount, Pins); ASSERT(Status == STATUS_SUCCESS); } MixerContext->Free((PVOID)NodeConnection); @@ -638,6 +638,7 @@ Status = MixerContext->QueryKeyValue(hKey, L"FriendlyName", (PVOID*)&Name, &Length, &Type); if (Status == MM_STATUS_SUCCESS) { + ASSERT(Length < MAXPNAMELEN); wcscpy(MixerInfo->MixCaps.szPname, Name); MixerContext->Free(Name); return Status; @@ -650,6 +651,7 @@ Status = MixerContext->QueryKeyValue(hKey, L"FriendlyName", (PVOID*)&Name, &Length, &Type); if (Status == MM_STATUS_SUCCESS) { + ASSERT(Length < MAXPNAMELEN); wcscpy(MixerInfo->MixCaps.szPname, Name); MixerContext->Free(Name); } Modified: trunk/reactos/lib/drivers/sound/mmixer/wave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/w… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/wave.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/wave.c [iso-8859-1] Sat Jun 12 10:21:03 2010 @@ -360,6 +360,8 @@ WaveInfo->DeviceId = MixerData->DeviceId; WaveInfo->PinId = PinId; + // sanity check + ASSERT(wcslen(DeviceName) < MAXPNAMELEN); /* copy device name */ if (bWaveIn) @@ -419,9 +421,6 @@ /* free dataranges buffer */ MixerContext->Free(MultipleItem); - - - if (bWaveIn) {

1 0

[dreimer] 47762: Bug 5457: updated slovak translations by Mario Kacmar.
by dreimer＠svn.reactos.org 12 Jun '10

12 Jun '10

Author: dreimer Date: Sat Jun 12 09:58:22 2010 New Revision: 47762 URL: http://svn.reactos.org/svn/reactos?rev=47762&view=rev Log: Bug 5457: updated slovak translations by Mario Kacmar. Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/dll/cpl/intl/lang/sk-SK.rc trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc trunk/reactos/dll/win32/netshell/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] Sat Jun 12 09:58:22 2010 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 30-01-2008 - * LAST CHANGE: 04-09-2009 + * LAST CHANGE: 31-05-2010 * --------------------------------------- * TODO: * pridanie navigaèných znaèiek "&" ? @@ -647,7 +647,7 @@ BEGIN IDS_TIME_DAYS "Dni" IDS_TIME_HOURS "Hodiny" - IDS_TIME_NANOSECONDS "Nanoseconds" + IDS_TIME_NANOSECONDS "Nanosekundy" IDS_TIME_MICROSECONDS "Mikrosekundy" IDS_TIME_MILLISECONDS "Milisekundy" IDS_TIME_MINUTES "Minúty" Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sat Jun 12 09:58:22 2010 @@ -1,7 +1,7 @@ /* TRANSLATOR: M rio Kam r /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR: 22-01-2008 * Encoding : Latin II (852) - * LastChange: 01-11-2009 + * LastChange: 31-05-2010 */ #pragma once @@ -1489,8 +1489,8 @@ }, { //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" - " * Press any key to continue.", + "Na zvolenej part¡cii nie je dostatok vonho miesta.\n" + " * Pokraujte stlaen¡m ubovonho kl vesu.", NULL }, { Modified: trunk/reactos/dll/cpl/intl/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/sk-SK.rc [iso-8859-1] Sat Jun 12 09:58:22 2010 @@ -1,6 +1,6 @@ /* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR: 28-04-2008 - * LastChange: 21-06-2009 + * LastChange: 31-05-2010 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -194,8 +194,8 @@ BEGIN IDS_CUSTOMIZE_TITLE "Prispôsobi miestne nastavenia" IDS_SPAIN "Spanish (Spain)" - IDS_METRIC "Metric" - IDS_IMPERIAL "Imperial" + IDS_METRIC "Metrický" + IDS_IMPERIAL "Imperiálny" END STRINGTABLE Modified: trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] Sat Jun 12 09:58:22 2010 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 30-05-2008 - * LAST CHANGE: 30-07-2008 + * LAST CHANGE: 31-05-2010 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -166,7 +166,7 @@ BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "Sprostredkovate¾:", -1, 34, 39, 60, 8, SS_NOPREFIX + LTEXT "Poskytovate¾ ovládaèa:", -1, 34, 39, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Dátum ovládaèa:", -1, 34, 53, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY @@ -189,7 +189,7 @@ CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 - LTEXT "Sprostredkovate¾:", -1, 14, 134, 66, 8 + LTEXT "Poskytovate¾:", -1, 14, 134, 66, 8 EDITTEXT IDC_FILEPROVIDER, 80, 134, 137, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Verzia súboru:", -1, 14, 150, 66, 8 EDITTEXT IDC_FILEVERSION, 80, 150, 137, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY @@ -202,7 +202,7 @@ IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Details" +CAPTION "Detaily" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 Modified: trunk/reactos/dll/win32/netshell/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/sk-SK.rc [iso-8859-1] Sat Jun 12 09:58:22 2010 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 31-08-2008 - * LAST CHANGE: 18-04-2009 + * LAST CHANGE: 02-05-2010 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -32,7 +32,7 @@ END IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200, 180 -STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Veobecné" FONT 8, "MS Shell Dlg" BEGIN @@ -42,7 +42,7 @@ LTEXT "Rýchlos:", -1, 19, 48, 60, 8 GROUPBOX "Èinnos", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Odoslané", -1, 26, 90, 60, 8 - ICON "", IDC_NETSTAT, 110, 85, 18, 20 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "Prijaté", -1, 149, 90, 37, 8 LTEXT "Bajty:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Sat Jun 12 09:58:22 2010 @@ -1,7 +1,7 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * NOTE : partially translated * TRANSLATED : 26-12-2007 - * LAST CHANGE: 20-09-2009 + * LAST CHANGE: 31-05-2010 */ /* @@ -671,8 +671,8 @@ IDS_RESTART_PROMPT "Naozaj chcete retartova systém?" IDS_SHUTDOWN_TITLE "Vypnú" IDS_SHUTDOWN_PROMPT "Naozaj chcete vypnú poèítaè?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" + IDS_LOGOFF_TITLE "Odhlási" + IDS_LOGOFF_PROMPT "Naozaj sa chcete odhlási?" /* shell folder path default values */ IDS_PROGRAMS "Ponuka tart\\Programy" @@ -758,5 +758,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Predvolená alokaèná ve¾kos" //Default allocation size IDS_COPY_OF "Kópia" //Copy of - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + // There is no Windows program configured to open this type of file. + IDS_SHLEXEC_NOASSOC "Neexistuje iadny program nakonfigurovaný tak, aby otváral tento typ súborov." + // Na otváranie tohto typu súboru nie je nakonfigurovaný iadny program systému Windows. +END Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Sat Jun 12 09:58:22 2010 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 09-02-2008 - * LAST CHANGE: 13-10-2009 + * LAST CHANGE: 15-12-2009 * THANKS TO : Filip Navara and Kamil Hornicek and all good people ;-) */ @@ -230,7 +230,7 @@ IDS_SYS_ENTERTAINMENT "Zábava" //Entertainment IDS_CMT_MPLAY32 "Spusti Multimediálny prehrávaè" IDS_CMT_SNDVOL32 "Spusti Ovládanie hlasitosti" - IDS_CMT_SNDREC32 "Launch Sound Recorder" + IDS_CMT_SNDREC32 "Spusti Nahrávanie zvuku" END STRINGTABLE @@ -268,7 +268,7 @@ IDS_SHORT_EVENTVIEW "Zobrazovaè udalostí.lnk" IDS_SHORT_MSCONFIG "Program na konfiguráciu systému.lnk" IDS_SHORT_SNDVOL32 "Ovládanie hlasitosti.lnk" //Volume Control - IDS_SHORT_SNDREC32 "Audiorecorder.lnk" + IDS_SHORT_SNDREC32 "Audiorekordér.lnk" IDS_SHORT_DXDIAG "Diagnostika ReactX.lnk" IDS_SHORT_PAINT "Skicár.lnk" IDS_SHORT_SPIDER "Pavúèí solitér.lnk"

1 0

[cgutman] 47761: [FBTUSB] - Import the FreeBT USB generic bluetooth driver (abandoned) - Some slight modifications to make it build - WMI is currently commented out because our WMI headers are lacking (particularly wmistr.h) - Not building by default for now
by cgutman＠svn.reactos.org 12 Jun '10

12 Jun '10

Author: cgutman Date: Sat Jun 12 00:29:09 2010 New Revision: 47761 URL: http://svn.reactos.org/svn/reactos?rev=47761&view=rev Log: [FBTUSB] - Import the FreeBT USB generic bluetooth driver (abandoned) - Some slight modifications to make it build - WMI is currently commented out because our WMI headers are lacking (particularly wmistr.h) - Not building by default for now Added: trunk/reactos/drivers/bluetooth/ trunk/reactos/drivers/bluetooth/directory.rbuild (with props) trunk/reactos/drivers/bluetooth/fbtusb/ trunk/reactos/drivers/bluetooth/fbtusb/fbtdev.c (with props) trunk/reactos/drivers/bluetooth/fbtusb/fbtpnp.c (with props) trunk/reactos/drivers/bluetooth/fbtusb/fbtpwr.c (with props) trunk/reactos/drivers/bluetooth/fbtusb/fbtrwr.c (with props) trunk/reactos/drivers/bluetooth/fbtusb/fbtusb.c (with props) trunk/reactos/drivers/bluetooth/fbtusb/fbtusb.rbuild (with props) trunk/reactos/drivers/bluetooth/fbtusb/fbtusb.rc (with props) trunk/reactos/drivers/bluetooth/fbtusb/fbtwmi.c (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/ trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciCmdStructs.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciCmds.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciDefs.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciErrors.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciEventStructs.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciEvents.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciLocal.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciOpCodes.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciParms.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciRoundTrip.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciSizes.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtSeXcpt.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtdev.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbthci.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbthw.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtlog.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtpnp.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtpwr.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtreg.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtrwr.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtusb.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtusr.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtutil.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtwmi.h (with props) trunk/reactos/drivers/bluetooth/fbtusb/include/fbtxcpt.h (with props) Modified: trunk/reactos/drivers/drivers.rbuild trunk/reactos/drivers/usb/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/drivers/bluetooth/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/director… Added: trunk/reactos/drivers/bluetooth/fbtusb/fbtdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… Added: trunk/reactos/drivers/bluetooth/fbtusb/fbtpnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… Added: trunk/reactos/drivers/bluetooth/fbtusb/fbtpwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… Added: trunk/reactos/drivers/bluetooth/fbtusb/fbtrwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… Added: trunk/reactos/drivers/bluetooth/fbtusb/fbtusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… Added: trunk/reactos/drivers/bluetooth/fbtusb/fbtusb.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… Added: trunk/reactos/drivers/bluetooth/fbtusb/fbtusb.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… Added: trunk/reactos/drivers/bluetooth/fbtusb/fbtwmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciCmdStructs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciCmds.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciDefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciErrors.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciEventStructs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciEvents.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciLocal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciOpCodes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciParms.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciRoundTrip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciSizes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtSeXcpt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtdev.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbthci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbthw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtpnp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtpwr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtrwr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtusb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtusr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtwmi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Added: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtxcpt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… Modified: trunk/reactos/drivers/drivers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/drivers.rbuild?rev… Modified: trunk/reactos/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/directory.rbui…

1 0

[cgutman] 47760: [USBD] - Fix the spec file - Fixes usbd build
by cgutman＠svn.reactos.org 12 Jun '10

12 Jun '10

Author: cgutman Date: Sat Jun 12 00:23:18 2010 New Revision: 47760 URL: http://svn.reactos.org/svn/reactos?rev=47760&view=rev Log: [USBD] - Fix the spec file - Fixes usbd build Modified: trunk/reactos/drivers/usb/usbd/usbd.spec Modified: trunk/reactos/drivers/usb/usbd/usbd.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/usbd.spec… ============================================================================== --- trunk/reactos/drivers/usb/usbd/usbd.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbd/usbd.spec [iso-8859-1] Sat Jun 12 00:23:18 2010 @@ -1,9 +1,9 @@ -USBD_Debug_GetHeap(long long long long) -USBD_Debug_RetHeap(ptr long long) -USBD_CalculateUsbBandwidth(long long long) -USBD_CreateConfigurationRequestEx(ptr ptr) -USBD_CreateConfigurationRequest(ptr ptr) -USBD_GetInterfaceLength(ptr ptr) -USBD_ParseConfigurationDescriptorEx(ptr ptr long long long long long) -USBD_ParseDescriptors(ptr long ptr long) +@ stdcall USBD_Debug_GetHeap(long long long long) +@ stdcall USBD_Debug_RetHeap(ptr long long) +@ stdcall USBD_CalculateUsbBandwidth(long long long) +@ stdcall USBD_CreateConfigurationRequestEx(ptr ptr) +@ stdcall USBD_CreateConfigurationRequest(ptr ptr) +@ stdcall USBD_GetInterfaceLength(ptr ptr) +@ stdcall USBD_ParseConfigurationDescriptorEx(ptr ptr long long long long long) +@ stdcall USBD_ParseDescriptors(ptr long ptr long) ;USBD_GetPdoRegistryParameters

1 0

[tkreuzer] 47759: [PSDK] Fix a typo (_AMD64 -> _AMD64_)
by tkreuzer＠svn.reactos.org 11 Jun '10

11 Jun '10

Author: tkreuzer Date: Fri Jun 11 21:48:13 2010 New Revision: 47759 URL: http://svn.reactos.org/svn/reactos?rev=47759&view=rev Log: [PSDK] Fix a typo (_AMD64 -> _AMD64_) Modified: trunk/reactos/include/psdk/basetsd.h trunk/reactos/include/psdk/windows.h Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Fri Jun 11 21:48:13 2010 @@ -23,7 +23,7 @@ #error Not supported. #endif -#if !defined(_X86_) && !defined(_AMD64) && !defined(_IA64_) && !defined(_ALPHA_) && \ +#if !defined(_X86_) && !defined(_AMD64_) && !defined(_IA64_) && !defined(_ALPHA_) && \ !defined(_ARM_) && !defined(_PPC_) && !defined(_MIPS_) && !defined(_68K_) #if defined(_M_AMD64) || defined(__x86_64__) Modified: trunk/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev… ============================================================================== --- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Fri Jun 11 21:48:13 2010 @@ -17,7 +17,7 @@ #include <msvctarget.h> #endif -#if !defined(_X86_) && !defined(_AMD64) && !defined(_IA64_) && !defined(_ALPHA_) && \ +#if !defined(_X86_) && !defined(_AMD64_) && !defined(_IA64_) && !defined(_ALPHA_) && \ !defined(_ARM_) && !defined(_PPC_) && !defined(_MIPS_) && !defined(_68K_) #if defined(_M_AMD64) || defined(__x86_64__)

1 0

[ekohl] 47758: [FORMATTING] Fix indentation. No code changes.
by ekohl＠svn.reactos.org 11 Jun '10

11 Jun '10

Author: ekohl Date: Fri Jun 11 21:21:27 2010 New Revision: 47758 URL: http://svn.reactos.org/svn/reactos?rev=47758&view=rev Log: [FORMATTING] Fix indentation. No code changes. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Fri Jun 11 21:21:27 2010 @@ -106,11 +106,10 @@ static VOID -DrawBox( - IN SHORT xLeft, - IN SHORT yTop, - IN SHORT Width, - IN SHORT Height) +DrawBox(IN SHORT xLeft, + IN SHORT yTop, + IN SHORT Width, + IN SHORT Height) { COORD coPos; DWORD Written; @@ -118,97 +117,89 @@ /* draw upper left corner */ coPos.X = xLeft; coPos.Y = yTop; - FillConsoleOutputCharacterA( - StdOutput, - 0xDA, // '+', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xDA, // '+', + 1, + coPos, + &Written); /* draw upper edge */ coPos.X = xLeft + 1; coPos.Y = yTop; - FillConsoleOutputCharacterA( - StdOutput, - 0xC4, // '-', - Width - 2, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xC4, // '-', + Width - 2, + coPos, + &Written); /* draw upper right corner */ coPos.X = xLeft + Width - 1; coPos.Y = yTop; - FillConsoleOutputCharacterA( - StdOutput, - 0xBF, // '+', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xBF, // '+', + 1, + coPos, + &Written); /* Draw right edge, inner space and left edge */ for (coPos.Y = yTop + 1; coPos.Y < yTop + Height - 1; coPos.Y++) { coPos.X = xLeft; - FillConsoleOutputCharacterA( - StdOutput, - 0xB3, // '|', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xB3, // '|', + 1, + coPos, + &Written); coPos.X = xLeft + 1; - FillConsoleOutputCharacterA( - StdOutput, - ' ', - Width - 2, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + ' ', + Width - 2, + coPos, + &Written); coPos.X = xLeft + Width - 1; - FillConsoleOutputCharacterA( - StdOutput, - 0xB3, // '|', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xB3, // '|', + 1, + coPos, + &Written); } /* draw lower left corner */ coPos.X = xLeft; coPos.Y = yTop + Height - 1; - FillConsoleOutputCharacterA( - StdOutput, - 0xC0, // '+', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xC0, // '+', + 1, + coPos, + &Written); /* draw lower edge */ coPos.X = xLeft + 1; coPos.Y = yTop + Height - 1; - FillConsoleOutputCharacterA( - StdOutput, - 0xC4, // '-', - Width - 2, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xC4, // '-', + Width - 2, + coPos, + &Written); /* draw lower right corner */ coPos.X = xLeft + Width - 1; coPos.Y = yTop + Height - 1; - FillConsoleOutputCharacterA( - StdOutput, - 0xD9, // '+', - 1, - coPos, - &Written); -} + FillConsoleOutputCharacterA(StdOutput, + 0xD9, // '+', + 1, + coPos, + &Written); +} + VOID PopupError(PCCH Text, - PCCH Status, - PINPUT_RECORD Ir, - ULONG WaitEvent) + PCCH Status, + PINPUT_RECORD Ir, + ULONG WaitEvent) { SHORT yTop; SHORT xLeft; @@ -383,7 +374,7 @@ BOOL Result = FALSE; MUIDisplayError(ERROR_NOT_INSTALLED, NULL, POPUP_WAIT_NONE); - while(TRUE) + while (TRUE) { CONSOLE_ConInKey(Ir); @@ -562,18 +553,21 @@ } } - /* search for LocaleID in the 'Unattend' section*/ - if (SetupFindFirstLineW (UnattendInf, L"Unattend", L"LocaleID", &Context)){ - if (INF_GetData (&Context, NULL, &Value)){ - LONG Id = wcstol(Value, NULL, 16); - swprintf(LocaleID,L"%08lx", Id); - } - } - - SetupCloseInfFile(UnattendInf); - + /* search for LocaleID in the 'Unattend' section*/ + if (SetupFindFirstLineW (UnattendInf, L"Unattend", L"LocaleID", &Context)) + { + if (INF_GetData (&Context, NULL, &Value)) + { + LONG Id = wcstol(Value, NULL, 16); + swprintf(LocaleID,L"%08lx", Id); + } + } + + SetupCloseInfFile(UnattendInf); + DPRINT("Running unattended setup\n"); } + VOID UpdateKBLayout(VOID) @@ -610,6 +604,7 @@ } } } + static PAGE_NUMBER LanguagePage(PINPUT_RECORD Ir) @@ -636,7 +631,7 @@ MUIDisplayPage(LANGUAGE_PAGE); - while(TRUE) + while (TRUE) { CONSOLE_ConInKey(Ir); @@ -662,17 +657,17 @@ MUIDisplayPage(LANGUAGE_PAGE); #endif - ScrollUpGenericList (LanguageList); + ScrollUpGenericList(LanguageList); } if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_NEXT)) /* PAGE DOWN */ { - ScrollPageDownGenericList (LanguageList); + ScrollPageDownGenericList(LanguageList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_PRIOR)) /* PAGE UP */ { - ScrollPageUpGenericList (LanguageList); + ScrollPageUpGenericList(LanguageList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -729,12 +724,12 @@ /* Check whether a harddisk is available */ - Status = NtQuerySystemInformation (SystemDeviceInformation, - &Sdi, - sizeof(SYSTEM_DEVICE_INFORMATION), - &ReturnSize); - - if (!NT_SUCCESS (Status)) + Status = NtQuerySystemInformation(SystemDeviceInformation, + &Sdi, + sizeof(SYSTEM_DEVICE_INFORMATION), + &ReturnSize); + + if (!NT_SUCCESS(Status)) { CONSOLE_PrintTextXY(6, 15, "NtQuerySystemInformation() failed (Status 0x%08lx)", Status); MUIDisplayError(ERROR_DRIVE_INFORMATION, Ir, POPUP_WAIT_ENTER); @@ -784,14 +779,14 @@ } /* Open 'Version' section */ - if (!SetupFindFirstLineW (SetupInf, L"Version", L"Signature", &Context)) + if (!SetupFindFirstLineW(SetupInf, L"Version", L"Signature", &Context)) { MUIDisplayError(ERROR_CORRUPT_TXTSETUPSIF, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } /* Get pointer 'Signature' key */ - if (!INF_GetData (&Context, NULL, &Value)) + if (!INF_GetData(&Context, NULL, &Value)) { MUIDisplayError(ERROR_CORRUPT_TXTSETUPSIF, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; @@ -838,43 +833,43 @@ KeyboardList = CreateKeyboardDriverList(SetupInf); LayoutList = CreateKeyboardLayoutList(SetupInf, DefaultKBLayout); LanguageList = CreateLanguageList(SetupInf, DefaultLanguage); - - /* new part */ - - wcscpy(SelectedLanguageId,LocaleID); - - - /* first we hack LanguageList */ - ListEntry = GetFirstListEntry(LanguageList); - - while (ListEntry != NULL) - { - if (!wcsicmp(LocaleID, GetListEntryUserData(ListEntry))) - { - DPRINT("found %S in LanguageList\n",GetListEntryUserData(ListEntry)); - SetCurrentListEntry(LanguageList, ListEntry); - break; - } - - ListEntry = GetNextListEntry(ListEntry); - } - /* now LayoutList */ - ListEntry = GetFirstListEntry(LayoutList); - - while (ListEntry != NULL) - { - if (!wcsicmp(LocaleID, GetListEntryUserData(ListEntry))) - { - DPRINT("found %S in LayoutList\n",GetListEntryUserData(ListEntry)); - SetCurrentListEntry(LayoutList, ListEntry); - break; - } - - ListEntry = GetNextListEntry(ListEntry); - } - SetConsoleCodePage(); - - return INSTALL_INTRO_PAGE; + + /* new part */ + wcscpy(SelectedLanguageId,LocaleID); + + /* first we hack LanguageList */ + ListEntry = GetFirstListEntry(LanguageList); + + while (ListEntry != NULL) + { + if (!wcsicmp(LocaleID, GetListEntryUserData(ListEntry))) + { + DPRINT("found %S in LanguageList\n",GetListEntryUserData(ListEntry)); + SetCurrentListEntry(LanguageList, ListEntry); + break; + } + + ListEntry = GetNextListEntry(ListEntry); + } + + /* now LayoutList */ + ListEntry = GetFirstListEntry(LayoutList); + + while (ListEntry != NULL) + { + if (!wcsicmp(LocaleID, GetListEntryUserData(ListEntry))) + { + DPRINT("found %S in LayoutList\n",GetListEntryUserData(ListEntry)); + SetCurrentListEntry(LayoutList, ListEntry); + break; + } + + ListEntry = GetNextListEntry(ListEntry); + } + + SetConsoleCodePage(); + + return INSTALL_INTRO_PAGE; } return LANGUAGE_PAGE; @@ -923,6 +918,7 @@ return INTRO_PAGE; } + /* * License Page * RETURNS @@ -947,6 +943,7 @@ return LICENSE_PAGE; } + static PAGE_NUMBER RepairIntroPage(PINPUT_RECORD Ir) { @@ -996,7 +993,7 @@ return SELECT_PARTITION_PAGE; } - while(TRUE) + while (TRUE) { CONSOLE_ConInKey(Ir); @@ -1033,7 +1030,7 @@ SetStatusText(" ENTER = Continue F3 = Quit"); - while(TRUE) + while (TRUE) { ConInKey(Ir); @@ -1122,7 +1119,7 @@ return SELECT_PARTITION_PAGE; } - while(TRUE) + while (TRUE) { CONSOLE_ConInKey(Ir); @@ -1194,19 +1191,19 @@ SaveGenericListState(ComputerList); - while(TRUE) + while (TRUE) { CONSOLE_ConInKey(Ir); if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { - ScrollDownGenericList (ComputerList); + ScrollDownGenericList(ComputerList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { - ScrollUpGenericList (ComputerList); + ScrollUpGenericList(ComputerList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -1245,19 +1242,19 @@ SaveGenericListState(DisplayList); - while(TRUE) + while (TRUE) { CONSOLE_ConInKey(Ir); if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { - ScrollDownGenericList (DisplayList); + ScrollDownGenericList(DisplayList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { - ScrollUpGenericList (DisplayList); + ScrollUpGenericList(DisplayList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -1298,19 +1295,19 @@ SaveGenericListState(KeyboardList); - while(TRUE) + while (TRUE) { CONSOLE_ConInKey(Ir); if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { - ScrollDownGenericList (KeyboardList); + ScrollDownGenericList(KeyboardList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { - ScrollUpGenericList (KeyboardList); + ScrollUpGenericList(KeyboardList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -1349,29 +1346,29 @@ SaveGenericListState(LayoutList); - while(TRUE) + while (TRUE) { CONSOLE_ConInKey(Ir); if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { - ScrollDownGenericList (LayoutList); + ScrollDownGenericList(LayoutList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { - ScrollUpGenericList (LayoutList); + ScrollUpGenericList(LayoutList); } if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_NEXT)) /* PAGE DOWN */ { - ScrollPageDownGenericList (LayoutList); + ScrollPageDownGenericList(LayoutList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_PRIOR)) /* PAGE UP */ { - ScrollPageUpGenericList (LayoutList); + ScrollPageUpGenericList(LayoutList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -1394,16 +1391,19 @@ else if ((Ir->Event.KeyEvent.uChar.AsciiChar > 0x60) && (Ir->Event.KeyEvent.uChar.AsciiChar < 0x7b)) { /* a-z */ - GenericListKeyPress (LayoutList , Ir->Event.KeyEvent.uChar.AsciiChar); + GenericListKeyPress(LayoutList , Ir->Event.KeyEvent.uChar.AsciiChar); } } return DISPLAY_SETTINGS_PAGE; } -static BOOL IsDiskSizeValid(PPARTENTRY PartEntry) + +static BOOL +IsDiskSizeValid(PPARTENTRY PartEntry) { ULONGLONG m; + /* check for unpartitioned space */ m = PartEntry->UnpartitionedLength; m = (m + (1 << 19)) >> 20; /* in MBytes (rounded) */ @@ -1411,11 +1411,11 @@ { return TRUE; } - - // check for partitioned space + + /* check for partitioned space */ m = PartEntry->PartInfo[0].PartitionLength.QuadPart; m = (m + (1 << 19)) >> 20; /* in MBytes (rounded) */ - if( m < RequiredPartitionDiskSpace) + if (m < RequiredPartitionDiskSpace) { /* partition is too small so ask for another partion */ DPRINT1("Partition is too small, required disk space is %lu MB\n", RequiredPartitionDiskSpace); @@ -1427,6 +1427,7 @@ } } + static PAGE_NUMBER SelectPartitionPage(PINPUT_RECORD Ir) { @@ -1434,11 +1435,10 @@ if (PartitionList == NULL) { - PartitionList = CreatePartitionList (2, - 19, - xScreen - 3, - yScreen - 3); - + PartitionList = CreatePartitionList(2, + 19, + xScreen - 3, + yScreen - 3); if (PartitionList == NULL) { /* FIXME: show an error dialog */ @@ -1446,9 +1446,9 @@ } } - CheckActiveBootPartition (PartitionList); - - DrawPartitionList (PartitionList); + CheckActiveBootPartition(PartitionList); + + DrawPartitionList(PartitionList); /* Warn about partitions created by Linux Fdisk */ if (WarnLinuxPartitions == TRUE && @@ -1486,11 +1486,12 @@ MUIDisplayError(ERROR_INSUFFICIENT_DISKSPACE, Ir, POPUP_WAIT_ANY_KEY); return SELECT_PARTITION_PAGE; /* let the user select another partition */ } + CreateNewPartition(PartitionList, MaxSize, TRUE); - return (SELECT_FILE_SYSTEM_PAGE); + return SELECT_FILE_SYSTEM_PAGE; } } else @@ -1500,11 +1501,12 @@ MUIDisplayError(ERROR_INSUFFICIENT_DISKSPACE, Ir, POPUP_WAIT_ANY_KEY); return SELECT_PARTITION_PAGE; /* let the user select another partition */ } - return(SELECT_FILE_SYSTEM_PAGE); - } - } - - while(TRUE) + + return SELECT_FILE_SYSTEM_PAGE; + } + } + + while (TRUE) { /* Update status text */ if (PartitionList->CurrentPartition == NULL || @@ -1524,7 +1526,7 @@ { if (ConfirmQuit(Ir) == TRUE) { - DestroyPartitionList (PartitionList); + DestroyPartitionList(PartitionList); PartitionList = NULL; return QUIT_PAGE; } @@ -1534,12 +1536,12 @@ else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { - ScrollDownPartitionList (PartitionList); + ScrollDownPartitionList(PartitionList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { - ScrollUpPartitionList (PartitionList); + ScrollUpPartitionList(PartitionList); } else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { @@ -1551,9 +1553,9 @@ if (PartitionList->CurrentPartition == NULL || PartitionList->CurrentPartition->Unpartitioned == TRUE) { - CreateNewPartition (PartitionList, - 0ULL, - TRUE); + CreateNewPartition(PartitionList, + 0ULL, + TRUE); } return SELECT_FILE_SYSTEM_PAGE; @@ -1586,9 +1588,9 @@ static VOID DrawInputField(ULONG FieldLength, - SHORT Left, - SHORT Top, - PCHAR FieldContent) + SHORT Left, + SHORT Top, + PCHAR FieldContent) { CHAR buf[100]; COORD coPos; @@ -1600,11 +1602,11 @@ buf[FieldLength - strlen(FieldContent)] = 0; strcat(buf, FieldContent); - WriteConsoleOutputCharacterA (StdOutput, - buf, - strlen (buf), - coPos, - &Written); + WriteConsoleOutputCharacterA(StdOutput, + buf, + strlen(buf), + coPos, + &Written); } @@ -1614,13 +1616,13 @@ static VOID ShowPartitionSizeInputBox(SHORT Left, - SHORT Top, - SHORT Right, - SHORT Bottom, - ULONG MaxSize, - PCHAR InputBuffer, - PBOOLEAN Quit, - PBOOLEAN Cancel) + SHORT Top, + SHORT Right, + SHORT Bottom, + ULONG MaxSize, + PCHAR InputBuffer, + PBOOLEAN Quit, + PBOOLEAN Cancel) { INPUT_RECORD Ir; COORD coPos; @@ -1642,8 +1644,8 @@ /* Print message */ coPos.X = Left + 2; coPos.Y = Top + 2; - strcpy (Buffer, MUIGetString(STRING_PARTITIONSIZE)); - iLeft = coPos.X + strlen (Buffer) + 1; + strcpy(Buffer, MUIGetString(STRING_PARTITIONSIZE)); + iLeft = coPos.X + strlen(Buffer) + 1; iTop = coPos.Y; WriteConsoleOutputCharacterA(StdOutput, @@ -1652,7 +1654,7 @@ coPos, &Written); - sprintf (Buffer, MUIGetString(STRING_MAXSIZE), MaxSize); + sprintf(Buffer, MUIGetString(STRING_MAXSIZE), MaxSize); coPos.X = iLeft + PARTITION_SIZE_INPUT_FIELD_LENGTH + 1; coPos.Y = iTop; WriteConsoleOutputCharacterA(StdOutput, @@ -1663,10 +1665,10 @@ sprintf(Buffer, "%lu", MaxSize); Index = strlen(Buffer); - DrawInputField (PARTITION_SIZE_INPUT_FIELD_LENGTH, - iLeft, - iTop, - Buffer); + DrawInputField(PARTITION_SIZE_INPUT_FIELD_LENGTH, + iLeft, + iTop, + Buffer); while (TRUE) { @@ -1699,10 +1701,10 @@ Index--; Buffer[Index] = 0; - DrawInputField (PARTITION_SIZE_INPUT_FIELD_LENGTH, - iLeft, - iTop, - Buffer); + DrawInputField(PARTITION_SIZE_INPUT_FIELD_LENGTH, + iLeft, + iTop, + Buffer); } else if ((Ir.Event.KeyEvent.uChar.AsciiChar != 0x00) && (Index < PARTITION_SIZE_INPUT_FIELD_LENGTH)) @@ -1715,20 +1717,20 @@ Index++; Buffer[Index] = 0; - DrawInputField (PARTITION_SIZE_INPUT_FIELD_LENGTH, - iLeft, - iTop, - Buffer); - } - } - } - - strcpy (InputBuffer, Buffer); + DrawInputField(PARTITION_SIZE_INPUT_FIELD_LENGTH, + iLeft, + iTop, + Buffer); + } + } + } + + strcpy(InputBuffer, Buffer); } static PAGE_NUMBER -CreatePartitionPage (PINPUT_RECORD Ir) +CreatePartitionPage(PINPUT_RECORD Ir) { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; @@ -1775,32 +1777,32 @@ if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDINFOPARTCREATE), - DiskSize, - Unit, - DiskEntry->DiskNumber, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - &DiskEntry->DriverName); + MUIGetString(STRING_HDINFOPARTCREATE), + DiskSize, + Unit, + DiskEntry->DiskNumber, + DiskEntry->Port, + DiskEntry->Bus, + DiskEntry->Id, + &DiskEntry->DriverName); } else { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDDINFOUNK1), - DiskSize, - Unit, - DiskEntry->DiskNumber, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id); + MUIGetString(STRING_HDDINFOUNK1), + DiskSize, + Unit, + DiskEntry->DiskNumber, + DiskEntry->Port, + DiskEntry->Bus, + DiskEntry->Id); } CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); #if 0 CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB", - PartitionList->CurrentPartition->UnpartitionedLength / (1024*1024)); + PartitionList->CurrentPartition->UnpartitionedLength / (1024*1024)); #endif CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); @@ -1812,8 +1814,8 @@ if (MaxSize > PARTITION_MAXSIZE) MaxSize = PARTITION_MAXSIZE; - ShowPartitionSizeInputBox (12, 14, xScreen - 12, 17, /* left, top, right, bottom */ - MaxSize, InputBuffer, &Quit, &Cancel); + ShowPartitionSizeInputBox(12, 14, xScreen - 12, 17, /* left, top, right, bottom */ + MaxSize, InputBuffer, &Quit, &Cancel); if (Quit == TRUE) { @@ -1861,9 +1863,9 @@ DPRINT ("Partition size: %I64u bytes\n", PartSize); - CreateNewPartition (PartitionList, - PartSize, - FALSE); + CreateNewPartition(PartitionList, + PartSize, + FALSE); return SELECT_PARTITION_PAGE; } @@ -1874,7 +1876,7 @@ static PAGE_NUMBER -DeletePartitionPage (PINPUT_RECORD Ir) +DeletePartitionPage(PINPUT_RECORD Ir) { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; @@ -1950,22 +1952,22 @@ if (PartType == NULL) { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDDINFOUNK2), - (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : PartEntry->DriveLetter[PartNumber], - (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : ':', - PartEntry->PartInfo[PartNumber].PartitionType, - PartSize, - Unit); + MUIGetString(STRING_HDDINFOUNK2), + (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : PartEntry->DriveLetter[PartNumber], + (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : ':', + PartEntry->PartInfo[PartNumber].PartitionType, + PartSize, + Unit); } else { CONSOLE_PrintTextXY(6, 10, - " %c%c %s %I64u %s", - (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : PartEntry->DriveLetter[PartNumber], - (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : ':', - PartType, - PartSize, - Unit); + " %c%c %s %I64u %s", + (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : PartEntry->DriveLetter[PartNumber], + (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : ':', + PartType, + PartSize, + Unit); } #if 0 @@ -1988,25 +1990,25 @@ if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 12, - MUIGetString(STRING_HDINFOPARTDELETE), - DiskSize, - Unit, - DiskEntry->DiskNumber, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - &DiskEntry->DriverName); + MUIGetString(STRING_HDINFOPARTDELETE), + DiskSize, + Unit, + DiskEntry->DiskNumber, + DiskEntry->Port, + DiskEntry->Bus, + DiskEntry->Id, + &DiskEntry->DriverName); } else { CONSOLE_PrintTextXY(6, 12, - MUIGetString(STRING_HDDINFOUNK3), - DiskSize, - Unit, - DiskEntry->DiskNumber, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id); + MUIGetString(STRING_HDDINFOUNK3), + DiskSize, + Unit, + DiskEntry->DiskNumber, + DiskEntry->Port, + DiskEntry->Bus, + DiskEntry->Id); } while (TRUE) @@ -2016,7 +2018,7 @@ if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { - if (ConfirmQuit (Ir) == TRUE) + if (ConfirmQuit(Ir) == TRUE) { return QUIT_PAGE; } @@ -2029,7 +2031,7 @@ } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */ { - DeleteCurrentPartition (PartitionList); + DeleteCurrentPartition(PartitionList); return SELECT_PARTITION_PAGE; } @@ -2040,7 +2042,7 @@ static PAGE_NUMBER -SelectFileSystemPage (PINPUT_RECORD Ir) +SelectFileSystemPage(PINPUT_RECORD Ir) { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; @@ -2155,17 +2157,17 @@ if (PartType == NULL) { CONSOLE_PrintTextXY(8, 10, - MUIGetString(STRING_HDDINFOUNK4), - (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : PartEntry->DriveLetter[PartNumber], - (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : ':', - PartEntry->PartInfo[PartNumber].PartitionType, - PartSize, - PartUnit); + MUIGetString(STRING_HDDINFOUNK4), + (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : PartEntry->DriveLetter[PartNumber], + (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : ':', + PartEntry->PartInfo[PartNumber].PartitionType, + PartSize, + PartUnit); } else { CONSOLE_PrintTextXY(8, 10, - "%c%c %s %I64u %s", + "%c%c %s %I64u %s", (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : PartEntry->DriveLetter[PartNumber], (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : ':', PartType, @@ -2187,7 +2189,7 @@ if (FileSystemList == NULL) { - FileSystemList = CreateFileSystemList (6, 26, PartEntry->New, L"FAT"); + FileSystemList = CreateFileSystemList(6, 26, PartEntry->New, L"FAT"); if (FileSystemList == NULL) { /* FIXME: show an error dialog */ @@ -2196,7 +2198,7 @@ /* FIXME: Add file systems to list */ } - DrawFileSystemList (FileSystemList); + DrawFileSystemList(FileSystemList); if (RepairUpdateFlag) { @@ -2211,7 +2213,7 @@ return FORMAT_PARTITION_PAGE; } - return(CHECK_FILE_SYSTEM_PAGE); + return CHECK_FILE_SYSTEM_PAGE; } while (TRUE) @@ -2221,7 +2223,7 @@ if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { - if (ConfirmQuit (Ir) == TRUE) + if (ConfirmQuit(Ir) == TRUE) { return QUIT_PAGE; } @@ -2236,12 +2238,12 @@ else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { - ScrollDownFileSystemList (FileSystemList); + ScrollDownFileSystemList(FileSystemList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { - ScrollUpFileSystemList (FileSystemList); + ScrollUpFileSystemList(FileSystemList); } else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { @@ -2261,7 +2263,7 @@ static ULONG -FormatPartitionPage (PINPUT_RECORD Ir) +FormatPartitionPage(PINPUT_RECORD Ir) { WCHAR PathBuffer[MAX_PATH]; PDISKENTRY DiskEntry; @@ -2289,7 +2291,7 @@ PartEntry = PartitionList->CurrentPartition; PartNum = PartitionList->CurrentPartitionNumber; - while(TRUE) + while (TRUE) { if (!IsUnattendedSetup) { @@ -2299,7 +2301,7 @@ if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { - if (ConfirmQuit (Ir) == TRUE) + if (ConfirmQuit(Ir) == TRUE) { return QUIT_PAGE; } @@ -2358,14 +2360,14 @@ else if (!FileSystemList->Selected->FormatFunc) return QUIT_PAGE; - CheckActiveBootPartition (PartitionList); + CheckActiveBootPartition(PartitionList); #ifndef NDEBUG CONSOLE_PrintTextXY(6, 12, - "Disk: %I64u Cylinder: %I64u Track: %I64u", - DiskEntry->DiskSize, - DiskEntry->CylinderSize, - DiskEntry->TrackSize); + "Disk: %I64u Cylinder: %I64u Track: %I64u", + DiskEntry->DiskSize, + DiskEntry->CylinderSize, + DiskEntry->TrackSize); Line = 13; DiskEntry = PartitionList->CurrentDisk; @@ -2380,14 +2382,14 @@ for (i = 0; i < 4; i++) { CONSOLE_PrintTextXY(6, Line, - "%2u: %2u %c %12I64u %12I64u %2u %c", - i, - PartEntry->PartInfo[i].PartitionNumber, - PartEntry->PartInfo[i].BootIndicator ? 'A' : '-', - PartEntry->PartInfo[i].StartingOffset.QuadPart, - PartEntry->PartInfo[i].PartitionLength.QuadPart, - PartEntry->PartInfo[i].PartitionType, - PartEntry->PartInfo[i].RewritePartition ? '*' : ' '); + "%2u: %2u %c %12I64u %12I64u %2u %c", + i, + PartEntry->PartInfo[i].PartitionNumber, + PartEntry->PartInfo[i].BootIndicator ? 'A' : '-', + PartEntry->PartInfo[i].StartingOffset.QuadPart, + PartEntry->PartInfo[i].PartitionLength.QuadPart, + PartEntry->PartInfo[i].PartitionType, + PartEntry->PartInfo[i].RewritePartition ? '*' : ' '); Line++; } @@ -2402,39 +2404,40 @@ PartEntry = PartitionList->CurrentPartition; #endif - if (WritePartitionsToDisk (PartitionList) == FALSE) - { - DPRINT ("WritePartitionsToDisk() failed\n"); + if (WritePartitionsToDisk(PartitionList) == FALSE) + { + DPRINT("WritePartitionsToDisk() failed\n"); MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } /* Set DestinationRootPath */ - RtlFreeUnicodeString (&DestinationRootPath); - swprintf (PathBuffer, - L"\\Device\\Harddisk%lu\\Partition%lu", - PartitionList->CurrentDisk->DiskNumber, - PartitionList->CurrentPartition->PartInfo[PartNum].PartitionNumber); - RtlCreateUnicodeString (&DestinationRootPath, - PathBuffer); - DPRINT ("DestinationRootPath: %wZ\n", &DestinationRootPath); + RtlFreeUnicodeString(&DestinationRootPath); + swprintf(PathBuffer, + L"\\Device\\Harddisk%lu\\Partition%lu", + PartitionList->CurrentDisk->DiskNumber, + PartitionList->CurrentPartition->PartInfo[PartNum].PartitionNumber); + RtlCreateUnicodeString(&DestinationRootPath, + PathBuffer); + DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath); /* Set SystemRootPath */ - RtlFreeUnicodeString (&SystemRootPath); - swprintf (PathBuffer, - L"\\Device\\Harddisk%lu\\Partition%lu", - PartitionList->ActiveBootDisk->DiskNumber, - PartitionList->ActiveBootPartition-> - PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionNumber); - RtlCreateUnicodeString (&SystemRootPath, - PathBuffer); - DPRINT ("SystemRootPath: %wZ\n", &SystemRootPath); + RtlFreeUnicodeString(&SystemRootPath); + swprintf(PathBuffer, + L"\\Device\\Harddisk%lu\\Partition%lu", + PartitionList->ActiveBootDisk->DiskNumber, + PartitionList->ActiveBootPartition-> + PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionNumber); + RtlCreateUnicodeString(&SystemRootPath, + PathBuffer); + DPRINT("SystemRootPath: %wZ\n", &SystemRootPath); if (FileSystemList->Selected->FormatFunc) { - Status = FormatPartition(&DestinationRootPath, FileSystemList->Selected); + Status = FormatPartition(&DestinationRootPath, + FileSystemList->Selected); if (!NT_SUCCESS(Status)) { DPRINT1("FormatPartition() failed with status 0x%08lx\n", Status); @@ -2455,14 +2458,15 @@ wcscat(PathBuffer, L"\\loader\\dosmbr.bin"); DPRINT("Install MBR bootcode: %S ==> %S\n", - PathBuffer, DestinationRootPath.Buffer); + PathBuffer, DestinationRootPath.Buffer); /* Install MBR bootcode */ - Status = InstallMbrBootCodeToDisk(PathBuffer, DestinationRootPath.Buffer); + Status = InstallMbrBootCodeToDisk(PathBuffer, + DestinationRootPath.Buffer); if (!NT_SUCCESS (Status)) { DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", - Status); + Status); return FALSE; } @@ -2479,10 +2483,10 @@ wcscat(PathBuffer, L"\\loader\\fat32.bin"); DPRINT("Install FAT32 bootcode: %S ==> %S\n", PathBuffer, - DestinationRootPath.Buffer); + DestinationRootPath.Buffer); + Status = InstallFat32BootCodeToDisk(PathBuffer, - DestinationRootPath.Buffer); - + DestinationRootPath.Buffer); if (!NT_SUCCESS(Status)) { DPRINT1("InstallFat32BootCodeToDisk() failed with status 0x%08lx\n", Status); @@ -2498,10 +2502,10 @@ wcscat(PathBuffer, L"\\loader\\fat.bin"); DPRINT("Install FAT bootcode: %S ==> %S\n", PathBuffer, - DestinationRootPath.Buffer); + DestinationRootPath.Buffer); + Status = InstallFat16BootCodeToDisk(PathBuffer, - DestinationRootPath.Buffer); - + DestinationRootPath.Buffer); if (!NT_SUCCESS(Status)) { DPRINT1("InstallFat16BootCodeToDisk() failed with status 0x%.08x\n", Status); @@ -2518,10 +2522,10 @@ wcscat(PathBuffer, L"\\loader\\ext2.bin"); DPRINT("Install EXT2 bootcode: %S ==> %S\n", PathBuffer, - DestinationRootPath.Buffer); + DestinationRootPath.Buffer); + Status = InstallFat32BootCodeToDisk(PathBuffer, - DestinationRootPath.Buffer); - + DestinationRootPath.Buffer); if (!NT_SUCCESS(Status)) { DPRINT1("InstallFat32BootCodeToDisk() failed with status 0x%08lx\n", Status); @@ -2601,7 +2605,7 @@ MUIGetString(STRING_QUITCONTINUE), NULL, POPUP_WAIT_NONE); - while(TRUE) + while (TRUE) { CONSOLE_ConInKey(Ir); @@ -2641,7 +2645,10 @@ static PAGE_NUMBER -InstallDirectoryPage1(PWCHAR InstallDir, PDISKENTRY DiskEntry, PPARTENTRY PartEntry, UCHAR PartNum) +InstallDirectoryPage1(PWCHAR InstallDir, + PDISKENTRY DiskEntry, + PPARTENTRY PartEntry, + UCHAR PartNum) { WCHAR PathBuffer[MAX_PATH]; @@ -2673,7 +2680,7 @@ wcscat(PathBuffer, InstallDir); RtlCreateUnicodeString(&DestinationArcPath, PathBuffer); - return(PREPARE_COPY_PAGE); + return PREPARE_COPY_PAGE; } @@ -2699,14 +2706,14 @@ PartEntry = PartitionList->CurrentPartition; /* Search for 'DefaultPath' in the 'SetupData' section */ - if (!SetupFindFirstLineW (SetupInf, L"SetupData", L"DefaultPath", &Context)) + if (!SetupFindFirstLineW(SetupInf, L"SetupData", L"DefaultPath", &Context)) { MUIDisplayError(ERROR_FIND_SETUPDATA, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } /* Read the 'DefaultPath' data */ - if (INF_GetData (&Context, NULL, &DefaultPath)) + if (INF_GetData(&Context, NULL, &DefaultPath)) { wcscpy(InstallDir, DefaultPath); } @@ -2721,10 +2728,13 @@ if (IsUnattendedSetup) { - return(InstallDirectoryPage1 (InstallDir, DiskEntry, PartEntry, PartitionList->CurrentPartitionNumber)); - } - - while(TRUE) + return InstallDirectoryPage1(InstallDir, + DiskEntry, + PartEntry, + PartitionList->CurrentPartitionNumber); + } + + while (TRUE) { CONSOLE_ConInKey(Ir); @@ -2732,13 +2742,16 @@ (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { if (ConfirmQuit(Ir) == TRUE) - return(QUIT_PAGE); + return QUIT_PAGE; break; } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - return (InstallDirectoryPage1 (InstallDir, DiskEntry, PartEntry, PartitionList->CurrentPartitionNumber)); + return InstallDirectoryPage1(InstallDir, + DiskEntry, + PartEntry, + PartitionList->CurrentPartitionNumber); } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x08) /* BACKSPACE */ { @@ -2761,15 +2774,16 @@ } } - return(INSTALL_DIRECTORY_PAGE); -} + return INSTALL_DIRECTORY_PAGE; +} + static BOOLEAN AddSectionToCopyQueueCab(HINF InfFile, - PWCHAR SectionName, - PWCHAR SourceCabinet, - PCUNICODE_STRING DestinationPath, - PINPUT_RECORD Ir) + PWCHAR SectionName, + PWCHAR SourceCabinet, + PCUNICODE_STRING DestinationPath, + PINPUT_RECORD Ir) { INFCONTEXT FilesContext; INFCONTEXT DirContext; @@ -2779,12 +2793,12 @@ PWCHAR TargetFileName; /* Search for the SectionName section */ - if (!SetupFindFirstLineW (InfFile, SectionName, NULL, &FilesContext)) + if (!SetupFindFirstLineW(InfFile, SectionName, NULL, &FilesContext)) { char Buffer[128]; sprintf(Buffer, MUIGetString(STRING_TXTSETUPFAILED), SectionName); PopupError(Buffer, MUIGetString(STRING_REBOOTCOMPUTER), Ir, POPUP_WAIT_ENTER); - return(FALSE); + return FALSE; } /* @@ -2794,7 +2808,7 @@ do { /* Get source file name and target directory id */ - if (!INF_GetData (&FilesContext, &FileKeyName, &FileKeyValue)) + if (!INF_GetData(&FilesContext, &FileKeyName, &FileKeyValue)) { /* FIXME: Handle error! */ DPRINT1("INF_GetData() failed\n"); @@ -2802,107 +2816,20 @@ } /* Get optional target file name */ - if (!INF_GetDataField (&FilesContext, 2, &TargetFileName)) + if (!INF_GetDataField(&FilesContext, 2, &TargetFileName)) TargetFileName = NULL; - DPRINT ("FileKeyName: '%S' FileKeyValue: '%S'\n", FileKeyName, FileKeyValue); + DPRINT("FileKeyName: '%S' FileKeyValue: '%S'\n", FileKeyName, FileKeyValue); /* Lookup target directory */ - if (!SetupFindFirstLineW (InfFile, L"Directories", FileKeyValue, &DirContext)) + if (!SetupFindFirstLineW(InfFile, L"Directories", FileKeyValue, &DirContext)) { /* FIXME: Handle error! */ DPRINT1("SetupFindFirstLine() failed\n"); break; } - if (!INF_GetData (&DirContext, NULL, &DirKeyValue)) - { - /* FIXME: Handle error! */ - DPRINT1("INF_GetData() failed\n"); - break; - } - - if (!SetupQueueCopy(SetupFileQueue, - SourceCabinet, - SourceRootPath.Buffer, - SourceRootDir.Buffer, - FileKeyName, - DirKeyValue, - TargetFileName)) - { - /* FIXME: Handle error! */ - DPRINT1("SetupQueueCopy() failed\n"); - } - } while (SetupFindNextLine(&FilesContext, &FilesContext)); - - return TRUE; -} - -static BOOLEAN -AddSectionToCopyQueue(HINF InfFile, - PWCHAR SectionName, - PWCHAR SourceCabinet, - PCUNICODE_STRING DestinationPath, - PINPUT_RECORD Ir) -{ - INFCONTEXT FilesContext; - INFCONTEXT DirContext; - PWCHAR FileKeyName; - PWCHAR FileKeyValue; - PWCHAR DirKeyValue; - PWCHAR TargetFileName; - - if (SourceCabinet) - return AddSectionToCopyQueueCab(InfFile, L"SourceFiles", SourceCabinet, DestinationPath, Ir); - - /* Search for the SectionName section */ - if (!SetupFindFirstLineW (InfFile, SectionName, NULL, &FilesContext)) - { - char Buffer[128]; - sprintf(Buffer, MUIGetString(STRING_TXTSETUPFAILED), SectionName); - PopupError(Buffer, MUIGetString(STRING_REBOOTCOMPUTER), Ir, POPUP_WAIT_ENTER); - return FALSE; - } - - /* - * Enumerate the files in the section - * and add them to the file queue. - */ - do - { - /* Get source file name and target directory id */ - if (!INF_GetData (&FilesContext, &FileKeyName, &FileKeyValue)) - { - /* FIXME: Handle error! */ - DPRINT1("INF_GetData() failed\n"); - break; - } - - /* Get target directory id */ - if (!INF_GetDataField (&FilesContext, 13, &FileKeyValue)) - { - /* FIXME: Handle error! */ - DPRINT1("INF_GetData() failed\n"); - break; - } - - /* Get optional target file name */ - if (!INF_GetDataField (&FilesContext, 11, &TargetFileName)) - TargetFileName = NULL; - else if (!*TargetFileName) - TargetFileName = NULL; - - DPRINT ("FileKeyName: '%S' FileKeyValue: '%S'\n", FileKeyName, FileKeyValue); - - /* Lookup target directory */ - if (!SetupFindFirstLineW (InfFile, L"Directories", FileKeyValue, &DirContext)) - { - /* FIXME: Handle error! */ - DPRINT1("SetupFindFirstLine() failed\n"); - break; - } - - if (!INF_GetData (&DirContext, NULL, &DirKeyValue)) + if (!INF_GetData(&DirContext, NULL, &DirKeyValue)) { /* FIXME: Handle error! */ DPRINT1("INF_GetData() failed\n"); @@ -2925,10 +2852,99 @@ return TRUE; } + +static BOOLEAN +AddSectionToCopyQueue(HINF InfFile, + PWCHAR SectionName, + PWCHAR SourceCabinet, + PCUNICODE_STRING DestinationPath, + PINPUT_RECORD Ir) +{ + INFCONTEXT FilesContext; + INFCONTEXT DirContext; + PWCHAR FileKeyName; + PWCHAR FileKeyValue; + PWCHAR DirKeyValue; + PWCHAR TargetFileName; + + if (SourceCabinet) + return AddSectionToCopyQueueCab(InfFile, L"SourceFiles", SourceCabinet, DestinationPath, Ir); + + /* Search for the SectionName section */ + if (!SetupFindFirstLineW(InfFile, SectionName, NULL, &FilesContext)) + { + char Buffer[128]; + sprintf(Buffer, MUIGetString(STRING_TXTSETUPFAILED), SectionName); + PopupError(Buffer, MUIGetString(STRING_REBOOTCOMPUTER), Ir, POPUP_WAIT_ENTER); + return FALSE; + } + + /* + * Enumerate the files in the section + * and add them to the file queue. + */ + do + { + /* Get source file name and target directory id */ + if (!INF_GetData(&FilesContext, &FileKeyName, &FileKeyValue)) + { + /* FIXME: Handle error! */ + DPRINT1("INF_GetData() failed\n"); + break; + } + + /* Get target directory id */ + if (!INF_GetDataField(&FilesContext, 13, &FileKeyValue)) + { + /* FIXME: Handle error! */ + DPRINT1("INF_GetData() failed\n"); + break; + } + + /* Get optional target file name */ + if (!INF_GetDataField(&FilesContext, 11, &TargetFileName)) + TargetFileName = NULL; + else if (!*TargetFileName) + TargetFileName = NULL; + + DPRINT("FileKeyName: '%S' FileKeyValue: '%S'\n", FileKeyName, FileKeyValue); + + /* Lookup target directory */ + if (!SetupFindFirstLineW(InfFile, L"Directories", FileKeyValue, &DirContext)) + { + /* FIXME: Handle error! */ + DPRINT1("SetupFindFirstLine() failed\n"); + break; + } + + if (!INF_GetData(&DirContext, NULL, &DirKeyValue)) + { + /* FIXME: Handle error! */ + DPRINT1("INF_GetData() failed\n"); + break; + } + + if (!SetupQueueCopy(SetupFileQueue, + SourceCabinet, + SourceRootPath.Buffer, + SourceRootDir.Buffer, + FileKeyName, + DirKeyValue, + TargetFileName)) + { + /* FIXME: Handle error! */ + DPRINT1("SetupQueueCopy() failed\n"); + } + } while (SetupFindNextLine(&FilesContext, &FilesContext)); + + return TRUE; +} + + static BOOLEAN PrepareCopyPageInfFile(HINF InfFile, - PWCHAR SourceCabinet, - PINPUT_RECORD Ir) + PWCHAR SourceCabinet, + PINPUT_RECORD Ir) { WCHAR PathBuffer[MAX_PATH]; INFCONTEXT DirContext; @@ -2998,7 +3014,7 @@ /* Enumerate the directory values and create the subdirectories */ do { - if (!INF_GetData (&DirContext, NULL, &KeyValue)) + if (!INF_GetData(&DirContext, NULL, &KeyValue)) { DPRINT1("break\n"); break; @@ -3034,6 +3050,7 @@ return TRUE; } + static PAGE_NUMBER PrepareCopyPage(PINPUT_RECORD Ir) @@ -3062,18 +3079,18 @@ } /* Search for the 'Cabinets' section */ - if (!SetupFindFirstLineW (SetupInf, L"Cabinets", NULL, &CabinetsContext)) + if (!SetupFindFirstLineW(SetupInf, L"Cabinets", NULL, &CabinetsContext)) { return FILE_COPY_PAGE; } /* - * Enumerate the directory values in the 'Cabinets' - * section and parse their inf files. - */ + * Enumerate the directory values in the 'Cabinets' + * section and parse their inf files. + */ do { - if (!INF_GetData (&CabinetsContext, NULL, &KeyValue)) + if (!INF_GetData(&CabinetsContext, NULL, &KeyValue)) break; wcscpy(PathBuffer, SourcePath.Buffer); @@ -3123,15 +3140,16 @@ return QUIT_PAGE; } #endif - } while (SetupFindNextLine (&CabinetsContext, &CabinetsContext)); + } while (SetupFindNextLine(&CabinetsContext, &CabinetsContext)); return FILE_COPY_PAGE; } + VOID NTAPI SetupUpdateMemoryInfo(IN PCOPYCONTEXT CopyContext, - IN BOOLEAN First) + IN BOOLEAN First) { SYSTEM_PERFORMANCE_INFORMATION PerfInfo; @@ -3156,11 +3174,13 @@ ProgressSetStep(CopyContext->MemoryBars[2], PerfInfo.AvailablePages); } -static UINT CALLBACK + +static UINT +CALLBACK FileCopyCallback(PVOID Context, - UINT Notification, - UINT_PTR Param1, - UINT_PTR Param2) + UINT Notification, + UINT_PTR Param1, + UINT_PTR Param2) { PCOPYCONTEXT CopyContext; @@ -3190,6 +3210,7 @@ return 0; } + static PAGE_NUMBER @@ -3223,9 +3244,9 @@ /* Create the paged pool progress bar */ CopyContext.MemoryBars[0] = CreateProgressBar(13, 40, - 13 + mem_bar_width, + 13 + mem_bar_width, 43, - 13, + 13, 44, FALSE, "Kernel Pool"); @@ -3233,7 +3254,7 @@ /* Create the non paged pool progress bar */ CopyContext.MemoryBars[1] = CreateProgressBar((xScreen / 2)- (mem_bar_width / 2), 40, - (xScreen / 2) + (mem_bar_width / 2), + (xScreen / 2) + (mem_bar_width / 2), 43, (xScreen / 2)- (mem_bar_width / 2), 44, @@ -3243,9 +3264,9 @@ /* Create the global memory progress bar */ CopyContext.MemoryBars[2] = CreateProgressBar(xScreen - 13 - mem_bar_width, 40, - xScreen - 13, + xScreen - 13, 43, - xScreen - 13 - mem_bar_width, + xScreen - 13 - mem_bar_width, 44, FALSE, "Free Memory"); @@ -3267,6 +3288,7 @@ return REGISTRY_PAGE; } + static PAGE_NUMBER RegistryPage(PINPUT_RECORD Ir) { @@ -3322,7 +3344,8 @@ DPRINT("Action: %S File: %S Section %S\n", Action, File, Section); - if (Action == NULL) break; // Hackfix + if (Action == NULL) + break; // Hackfix if (!_wcsicmp (Action, L"AddReg")) { @@ -3346,7 +3369,7 @@ MUIDisplayError(ERROR_IMPORT_HIVE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } - } while (SetupFindNextLine (&InfContext, &InfContext)); + } while (SetupFindNextLine(&InfContext, &InfContext)); /* Update display registry settings */ CONSOLE_SetStatusText(MUIGetString(STRING_DISPLAYETTINGSUPDATE)); @@ -3380,16 +3403,17 @@ return QUIT_PAGE; } - if (!IsUnattendedSetup){ - - /* Update keyboard layout settings */ - CONSOLE_SetStatusText(MUIGetString(STRING_KEYBOARDSETTINGSUPDATE)); - if (!ProcessKeyboardLayoutRegistry(LayoutList)) - { - MUIDisplayError(ERROR_UPDATE_KBSETTINGS, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - } + if (!IsUnattendedSetup) + { + /* Update keyboard layout settings */ + CONSOLE_SetStatusText(MUIGetString(STRING_KEYBOARDSETTINGSUPDATE)); + if (!ProcessKeyboardLayoutRegistry(LayoutList)) + { + MUIDisplayError(ERROR_UPDATE_KBSETTINGS, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + } + /* Add codepage information to registry */ CONSOLE_SetStatusText(MUIGetString(STRING_CODEPAGEINFOUPDATE)); if (!AddCodePage()) @@ -3485,7 +3509,7 @@ MUIDisplayPage(BOOT_LOADER_PAGE); CONSOLE_InvertTextXY(8, Line, 60, 1); - while(TRUE) + while (TRUE) { CONSOLE_ConInKey(Ir); @@ -3495,8 +3519,11 @@ CONSOLE_NormalTextXY(8, Line, 60, 1); Line++; - if (Line<12) Line=14; - if (Line>14) Line=12; + if (Line<12) + Line=14; + + if (Line>14) + Line=12; CONSOLE_InvertTextXY(8, Line, 60, 1); } @@ -3506,8 +3533,11 @@ CONSOLE_NormalTextXY(8, Line, 60, 1); Line--; - if (Line<12) Line=14; - if (Line>14) Line=12; + if (Line<12) + Line=14; + + if (Line>14) + Line=12; CONSOLE_InvertTextXY(8, Line, 60, 1); } @@ -3551,7 +3581,7 @@ // SetStatusText(" Please wait..."); - while(TRUE) + while (TRUE) { CONSOLE_ConInKey(Ir); @@ -3678,7 +3708,7 @@ CONSOLE_SetStatusText(MUIGetString(STRING_REBOOTCOMPUTER2)); - while(TRUE) + while (TRUE) { CONSOLE_ConInKey(Ir); @@ -3700,7 +3730,7 @@ return FLUSH_PAGE; } - while(TRUE) + while (TRUE) { CONSOLE_ConInKey(Ir); @@ -3733,7 +3763,16 @@ NtQuerySystemTime(&Time); - Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, PnpEventThread, &SetupInf, &hPnpThread, NULL); + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, + TRUE, + 0, + 0, + 0, + PnpEventThread, + &SetupInf, + &hPnpThread, + NULL); if (!NT_SUCCESS(Status)) hPnpThread = INVALID_HANDLE_VALUE;

1 0

[fireball] 47757: - Merge in changes from Wine-1.1.44 related to supporting the ETO_PDY flag. Unregresses the text rendering in FF 3.5. Thanks to Jan Roeloffzen for help finding this problem and suggesting the right solution.
by fireball＠svn.reactos.org 11 Jun '10

11 Jun '10

Author: fireball Date: Fri Jun 11 20:18:59 2010 New Revision: 47757 URL: http://svn.reactos.org/svn/reactos?rev=47757&view=rev Log: - Merge in changes from Wine-1.1.44 related to supporting the ETO_PDY flag. Unregresses the text rendering in FF 3.5. Thanks to Jan Roeloffzen for help finding this problem and suggesting the right solution. Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] Fri Jun 11 20:18:59 2010 @@ -591,8 +591,6 @@ AA_Type aa_type = AA_None; //DIBSECTION bmp; unsigned int idx; - double cosEsc, sinEsc; - LOGFONTW lf; //enum drawable_depth_type depth_type = (physDev->depth == 1) ? mono_drawable : color_drawable; //Picture tile_pict = 0; @@ -645,16 +643,6 @@ { retv = TRUE; goto done_unlock; - } - - - GetObjectW(GetCurrentObject(physDev->hUserDC, OBJ_FONT), sizeof(lf), &lf); - if(lf.lfEscapement != 0) { - cosEsc = cos(lf.lfEscapement * M_PI / 1800); - sinEsc = sin(lf.lfEscapement * M_PI / 1800); - } else { - cosEsc = 1; - sinEsc = 0; } if (flags & ETO_CLIPPED) Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] Fri Jun 11 20:18:59 2010 @@ -135,10 +135,9 @@ const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx, gsCacheEntryFormat *formatEntry) { - INT offset = 0, xoff = 0, yoff = 0; + POINT offset = {0, 0}; AA_Type aa_type = AA_None; INT idx; - /*double*/ int cosEsc = 1, sinEsc = 0; BRUSHGDI *pTextPen; /* Create pen for text output */ @@ -154,22 +153,31 @@ //sharp_glyph_fn = SharpGlyphGray; for(idx = 0; idx < count; idx++) { - sharp_glyph_fn(pDC, pDC->rcDcRect.left + pDC->rcVport.left + x + xoff, - pDC->rcDcRect.top + pDC->rcVport.top + y + yoff, - formatEntry->bitmaps[wstr[idx]], - &formatEntry->gis[wstr[idx]], - pTextPen); - if(lpDx) { - offset += lpDx[idx]; - xoff = offset * cosEsc; - yoff = offset * -sinEsc; - } else { - xoff += formatEntry->gis[wstr[idx]].xOff; - yoff += formatEntry->gis[wstr[idx]].yOff; + sharp_glyph_fn(pDC, + pDC->rcDcRect.left + pDC->rcVport.left + x + offset.x, + pDC->rcDcRect.top + pDC->rcVport.top + y + offset.y, + formatEntry->bitmaps[wstr[idx]], + &formatEntry->gis[wstr[idx]], + pTextPen); + if(lpDx) + { + if(flags & ETO_PDY) + { + offset.x += lpDx[idx * 2]; + offset.y += lpDx[idx * 2 + 1]; + } + else + offset.x += lpDx[idx]; + } + else + { + offset.x += formatEntry->gis[wstr[idx]].xOff; + offset.y += formatEntry->gis[wstr[idx]].yOff; } } } else { #if 0 + OUTDATED (need to merge 47289 and higher) XImage *image; int image_x, image_y, image_off_x, image_off_y, image_w, image_h; RECT extents = {0, 0, 0, 0};

1 0

[akhaldi] 47756: [XDK/DDK] - Relax INTERLOCKED_RESULT inclusion guard.
by akhaldi＠svn.reactos.org 11 Jun '10

11 Jun '10

Author: akhaldi Date: Fri Jun 11 17:00:49 2010 New Revision: 47756 URL: http://svn.reactos.org/svn/reactos?rev=47756&view=rev Log: [XDK/DDK] - Relax INTERLOCKED_RESULT inclusion guard. Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/xdk/exfuncs.h Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=47… ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Fri Jun 11 17:00:49 2010 @@ -3411,13 +3411,11 @@ #define RESULT_POSITIVE 2 #endif -#if defined(_X86_) || defined(_IA64_) || defined(_M_AMD64) && !defined(RC_INVOKED) && !defined(MIDL_PASS) typedef enum _INTERLOCKED_RESULT { ResultNegative = RESULT_NEGATIVE, ResultZero = RESULT_ZERO, ResultPositive = RESULT_POSITIVE } INTERLOCKED_RESULT; -#endif #ifdef _X86_ Modified: trunk/reactos/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] Fri Jun 11 17:00:49 2010 @@ -305,13 +305,11 @@ #define RESULT_POSITIVE 2 #endif -#if defined(_X86_) || defined(_IA64_) || defined(_M_AMD64) && !defined(RC_INVOKED) && !defined(MIDL_PASS) typedef enum _INTERLOCKED_RESULT { ResultNegative = RESULT_NEGATIVE, ResultZero = RESULT_ZERO, ResultPositive = RESULT_POSITIVE } INTERLOCKED_RESULT; -#endif #ifdef _X86_

1 0

[akhaldi] 47755: [PSDK] - Add some missing file-headers.
by akhaldi＠svn.reactos.org 11 Jun '10

11 Jun '10

Author: akhaldi Date: Fri Jun 11 13:52:46 2010 New Revision: 47755 URL: http://svn.reactos.org/svn/reactos?rev=47755&view=rev Log: [PSDK] - Add some missing file-headers. Modified: trunk/reactos/include/psdk/compstui.h trunk/reactos/include/psdk/kcom.h trunk/reactos/include/psdk/ksdebug.h trunk/reactos/include/psdk/ksuuids.h trunk/reactos/include/psdk/lmon.h trunk/reactos/include/psdk/nettypes.h trunk/reactos/include/psdk/winsplp.h Modified: trunk/reactos/include/psdk/compstui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/compstui.h?re… ============================================================================== --- trunk/reactos/include/psdk/compstui.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/compstui.h [iso-8859-1] Fri Jun 11 13:52:46 2010 @@ -1,3 +1,23 @@ +/* + * compstui.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Amine Khaldi. + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #pragma once #ifdef __cplusplus Modified: trunk/reactos/include/psdk/kcom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/kcom.h?rev=47… ============================================================================== --- trunk/reactos/include/psdk/kcom.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/kcom.h [iso-8859-1] Fri Jun 11 13:52:46 2010 @@ -1,3 +1,23 @@ +/* + * kcom.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Andrew Greenwood. + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #if !defined(_KS_) #error KS.H must be included before KCOM.H #endif Modified: trunk/reactos/include/psdk/ksdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksdebug.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksdebug.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksdebug.h [iso-8859-1] Fri Jun 11 13:52:46 2010 @@ -1,3 +1,23 @@ +/* + * ksdebug.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Magnus Olsen. + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #include <evntrace.h> #if !defined(_KSDEBUG_) Modified: trunk/reactos/include/psdk/ksuuids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksuuids.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksuuids.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksuuids.h [iso-8859-1] Fri Jun 11 13:52:46 2010 @@ -1,3 +1,22 @@ +/* + * ksuuids.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Magnus Olsen. + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PACK, 0x36523B13, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A) OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PES, 0xE06D8020, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) Modified: trunk/reactos/include/psdk/lmon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/lmon.h?rev=47… ============================================================================== --- trunk/reactos/include/psdk/lmon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/lmon.h [iso-8859-1] Fri Jun 11 13:52:46 2010 @@ -1,3 +1,22 @@ +/* + * lmon.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Magnus Olsen. + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ #ifdef UNICODE #define PORT_INFO_FF PORT_INFO_FFW Modified: trunk/reactos/include/psdk/nettypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/nettypes.h?re… ============================================================================== --- trunk/reactos/include/psdk/nettypes.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/nettypes.h [iso-8859-1] Fri Jun 11 13:52:46 2010 @@ -1,3 +1,23 @@ +/* + * nettypes.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Magnus Olsen. + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #pragma once #define HARDWARE_ADDRESS_LENGTH 6 Modified: trunk/reactos/include/psdk/winsplp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsplp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winsplp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsplp.h [iso-8859-1] Fri Jun 11 13:52:46 2010 @@ -1,3 +1,23 @@ +/* + * winsplp.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Amine Khaldi. + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #pragma once #ifdef __cplusplus

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2010