Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 06:22:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- More proper fix for the QEMU/Abiword regression. Remove kernel32 hack. Thanks to Filip and The Munger.

Browse source 
svn path=/trunk/; revision=20556
This commit is contained in:
Alex Ionescu 2006-01-03 22:36:36 +00:00
parent ce5adef908
commit 53ee440af8
2 changed files with 5 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
reactos/lib/kernel32/misc/atom.c
View file

@ -72,7 +72,6 @@ InternalAddAtom(BOOLEAN Local,
/* Check if we can abuse the TEB */ /* Check if we can abuse the TEB */
if (AnsiString.MaximumLength > 260) if (AnsiString.MaximumLength > 260)
{ {
RosHack:
/* We can't, allocate a new string */ /* We can't, allocate a new string */
AtomNameString = &UnicodeString; AtomNameString = &UnicodeString;
Status = RtlAnsiStringToUnicodeString(AtomNameString, Status = RtlAnsiStringToUnicodeString(AtomNameString,
@ -84,14 +83,6 @@ RosHack:
/* We can! Get the TEB String */ /* We can! Get the TEB String */
AtomNameString = &NtCurrentTeb()->StaticUnicodeString; AtomNameString = &NtCurrentTeb()->StaticUnicodeString;
/* FIXME: HACK! */
if (!AtomNameString->MaximumLength)
{
DPRINT1("Hit the ROS TEB Static Unicode String Bug\n",
"Please try to fix the underlying problem!!!\n");
goto RosHack;
}
/* Convert it into the TEB */ /* Convert it into the TEB */
Status = RtlAnsiStringToUnicodeString(AtomNameString, Status = RtlAnsiStringToUnicodeString(AtomNameString,
&AnsiString, &AnsiString,
@ -182,7 +173,6 @@ InternalFindAtom(BOOLEAN Local,
/* Check if we can abuse the TEB */ /* Check if we can abuse the TEB */
if (AnsiString.MaximumLength > 260) if (AnsiString.MaximumLength > 260)
{ {
RosHack:
/* We can't, allocate a new string */ /* We can't, allocate a new string */
AtomNameString = &UnicodeString; AtomNameString = &UnicodeString;
Status = RtlAnsiStringToUnicodeString(AtomNameString, Status = RtlAnsiStringToUnicodeString(AtomNameString,
@ -194,14 +184,6 @@ RosHack:
/* We can! Get the TEB String */ /* We can! Get the TEB String */
AtomNameString = &NtCurrentTeb()->StaticUnicodeString; AtomNameString = &NtCurrentTeb()->StaticUnicodeString;
/* FIXME: HACK! */
if (!AtomNameString->MaximumLength)
{
DPRINT1("Hit the ROS TEB Static Unicode String Bug\n",
"Please try to fix the underlying problem!!!\n");
goto RosHack;
}
/* Convert it into the TEB */ /* Convert it into the TEB */
Status = RtlAnsiStringToUnicodeString(AtomNameString, Status = RtlAnsiStringToUnicodeString(AtomNameString,
&AnsiString, &AnsiString,

5
reactos/lib/ntdll/ldr/startup.c
View file

@ -377,6 +377,11 @@ LdrpInit(PCONTEXT Context,
/* Load execution options */ /* Load execution options */
LoadImageFileExecutionOptions(Peb); LoadImageFileExecutionOptions(Peb);
/* Initialize the static teb string */
NtCurrentTeb()->StaticUnicodeString.Length = 0;
NtCurrentTeb()->StaticUnicodeString.MaximumLength = sizeof(NtCurrentTeb()->StaticUnicodeBuffer);
NtCurrentTeb()->StaticUnicodeString.Buffer = NtCurrentTeb()->StaticUnicodeBuffer;
/* build full ntdll path */ /* build full ntdll path */
wcscpy (FullNtDllPath, SharedUserData->NtSystemRoot); wcscpy (FullNtDllPath, SharedUserData->NtSystemRoot);
wcscat (FullNtDllPath, L"\\system32\\ntdll.dll"); wcscat (FullNtDllPath, L"\\system32\\ntdll.dll");