Author: mkupfer
Date: Wed Feb 4 08:28:27 2009
New Revision: 39388
URL: http://svn.reactos.org/svn/reactos?rev=39388&view=rev
Log:
- Apply minor fix to German translation.
- Create Administrator account after default settings have been set.
- Solves issue #4214 and partly #3448 (GeoID still not set per default, but all changes apply to installed system now).
- See booth issues for more details.
Modified:
trunk/reactos/dll/win32/syssetup/install.c
trunk/reactos/dll/win32/syssetup/lang/de-DE.rc
Modified: trunk/reactos/dll/win32/syssetup/install.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Wed Feb 4 08:28:27 2009
@@ -881,6 +881,21 @@
/* Append the Admin-RID */
AppendRidToSid(&AdminSid, DomainSid, DOMAIN_USER_RID_ADMIN);
+ CreateTempDir(L"TEMP");
+ CreateTempDir(L"TMP");
+
+ if (GetWindowsDirectory(szBuffer, sizeof(szBuffer) / sizeof(TCHAR)))
+ {
+ PathAddBackslash(szBuffer);
+ _tcscat(szBuffer, _T("system"));
+ CreateDirectory(szBuffer, NULL);
+ }
+
+ if (!CommonInstall())
+ return 0;
+
+ InstallWizard();
+
/* Create the Administrator account */
if (!SamCreateUser(L"Administrator", L"", AdminSid))
{
@@ -932,21 +947,6 @@
}
/* END OF ROS HACK */
- CreateTempDir(L"TEMP");
- CreateTempDir(L"TMP");
-
- if (GetWindowsDirectory(szBuffer, sizeof(szBuffer) / sizeof(TCHAR)))
- {
- PathAddBackslash(szBuffer);
- _tcscat(szBuffer, _T("system"));
- CreateDirectory(szBuffer, NULL);
- }
-
- if (!CommonInstall())
- return 0;
-
- InstallWizard();
-
SetupCloseInfFile(hSysSetupInf);
SetSetupType(0);
Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Wed Feb 4 08:28:27 2009
@@ -272,7 +272,7 @@
IDS_WZD_SETCOMPUTERNAME "Setup konnte den Computernamen nicht setzen."
IDS_WZD_COMPUTERNAME "Setup kann erst fortgesetzt werden kann, wenn ein Computername eingegeben wurde."
IDS_WZD_PASSWORDEMPTY "Sie müssen ein Passwort setzen!"
- IDS_WZD_PASSWORDMATCH "Die Passwörter sind nicht gleich. Bitte setzen Sie die Passwöter erneut."
+ IDS_WZD_PASSWORDMATCH "Die Passwörter sind nicht gleich. Bitte setzen Sie die Passwörter erneut."
IDS_WZD_PASSWORDCHAR "Das Passwort das sie setzten enthält ungültige Zeichen. Bitte setzen Sie ein gültiges Passwort."
IDS_WZD_LOCALTIME "Setup konnte die lokale Zeit nicht setzen."
END
Author: cfinck
Date: Wed Feb 4 07:13:21 2009
New Revision: 39387
URL: http://svn.reactos.org/svn/reactos?rev=39387&view=rev
Log:
- Change "pollchar" to also empty the keyboard buffer after polling the character and rename it to "pollchar_and_empty" accordingly.
This fixes a bug revealed by silverblade's FOSDEM CD: If you boot FreeLoader with a boot menu from CD and press a key after that "Press any key to boot from CD" message, that keypress was forwarded to FreeLoader as well.
- Remove the already unused and now unsynchronized "pollchar" from the regression testing boot sector.
Modified:
trunk/reactos/boot/freeldr/bootsect/isoboot.asm
trunk/reactos/boot/freeldr/bootsect/isobtrt.asm
Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.asm
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob…
==============================================================================
--- trunk/reactos/boot/freeldr/bootsect/isoboot.asm [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/bootsect/isoboot.asm [iso-8859-1] Wed Feb 4 07:13:21 2009
@@ -132,12 +132,7 @@
; Make sure the keyboard buffer is empty
%ifdef WAIT_FOR_KEY
-.kbd_buffer_test:
- call pollchar
- jz .kbd_buffer_empty
- call getchar
- jmp .kbd_buffer_test
-.kbd_buffer_empty:
+ call pollchar_and_empty
; Check for MBR on harddisk
pusha
@@ -166,7 +161,7 @@
add eax, 19 ;
.poll_again:
- call pollchar
+ call pollchar_and_empty
jnz .boot_cdrom
mov ebx, [BIOS_timer]
@@ -921,12 +916,24 @@
;
-; pollchar: check if we have an input character pending (ZF = 0)
-;
-pollchar:
+; pollchar_and_empty: check if we have an input character pending (ZF = 0) and empty the input buffer afterwards
+;
+pollchar_and_empty:
pushad
- mov ah,1 ; Poll keyboard
+ mov ah, 1 ; Poll keyboard
int 16h
+ jz .end
+.empty_buffer:
+ mov ah, 0 ; Read from keyboard
+ int 16h
+
+ mov ah, 1 ; Poll keyboard again
+ int 16h
+ jz .buffer_emptied
+ jmp .empty_buffer
+.buffer_emptied:
+ and ax, ax ; ZF = 0
+.end:
popad
ret
Modified: trunk/reactos/boot/freeldr/bootsect/isobtrt.asm
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob…
==============================================================================
--- trunk/reactos/boot/freeldr/bootsect/isobtrt.asm [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/bootsect/isobtrt.asm [iso-8859-1] Wed Feb 4 07:13:21 2009
@@ -887,18 +887,6 @@
ret
-;
-; pollchar: check if we have an input character pending (ZF = 0)
-;
-pollchar:
- pushad
- mov ah,1 ; Poll keyboard
- int 16h
- popad
- ret
-
-
-
isolinux_banner db CR, LF, 'Loading IsoBoot...', CR, LF, 0
copyright_str db ' Copyright (C) 1994-2002 H. Peter Anvin', CR, LF, 0
presskey_msg db 'Press any key to boot from CD', 0