Ros-diffs

ros-diffs@reactos.org

81390 discussions

[rharabien] 51126: [NTOSKRNL] Revert r51108. ProbeForRead doesn't check if memory is readable. Improve comments and replace trick raising exception with call to ExRaiseAccessViolation. [WIN32K] Rem...
by rharabien＠svn.reactos.org 23 Mar '11

23 Mar '11

Author: rharabien Date: Wed Mar 23 15:49:44 2011 New Revision: 51126 URL: http://svn.reactos.org/svn/reactos?rev=51126&view=rev Log: [NTOSKRNL] Revert r51108. ProbeForRead doesn't check if memory is readable. Improve comments and replace trick raising exception with call to ExRaiseAccessViolation. [WIN32K] Remove ASSERTs in IntSetSysColors: this function is only called in NtUserSetSysColors in SEH block. It shouldn't crash for NULL pointers. Modified: trunk/reactos/ntoskrnl/ex/exintrin.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/ntoskrnl/ex/exintrin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/exintrin.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/exintrin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/exintrin.c [iso-8859-1] Wed Mar 23 15:49:44 2011 @@ -104,7 +104,6 @@ IN ULONG Alignment) { ULONG_PTR Last, Current = (ULONG_PTR)Address; - CHAR Temp; PAGED_CODE(); /* Only probe if we have a valid length */ @@ -132,16 +131,7 @@ ExRaiseAccessViolation(); } - /* Round down to the last page */ - Last = PAGE_ROUND_DOWN(Last) + PAGE_SIZE; - do - { - /* Attempt a read */ - Temp = *(volatile CHAR*)Current; - - /* Go to the next address */ - Current = PAGE_ROUND_DOWN(Current) + PAGE_SIZE; - } while (Current != Last); + /* ProbeForRead doesn't check if memory pages are readable! */ } } Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Wed Mar 23 15:49:44 2011 @@ -221,9 +221,6 @@ { UINT i; - ASSERT(Elements); - ASSERT(Colors); - for (i = 0; i < nColors; i++) { if ((UINT)(*Elements) < NUM_SYSCOLORS)

1 0

[rharabien] 51125: [WIN32K] Check for failed allocations when creating window See issue #6021 for more details.
by rharabien＠svn.reactos.org 23 Mar '11

23 Mar '11

Author: rharabien Date: Wed Mar 23 15:33:13 2011 New Revision: 51125 URL: http://svn.reactos.org/svn/reactos?rev=51125&view=rev Log: [WIN32K] Check for failed allocations when creating window See issue #6021 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Mar 23 15:33:13 2011 @@ -1940,7 +1940,7 @@ DWORD dwShowMode = SW_SHOW; CREATESTRUCTW *pCsw = NULL; PVOID pszClass = NULL, pszName = NULL; - DECLARE_RETURN(PWND); + PWND ret = NULL; /* Get the current window station and reference it */ pti = GetW32ThreadInfo(); @@ -1960,7 +1960,7 @@ if(!Class) { DPRINT1("Failed to find class %wZ\n", ClassName); - RETURN(NULL); + goto cleanup; } /* Now find the parent and the owner window */ @@ -1982,7 +1982,7 @@ { DPRINT1("Cannot create a child window without a parrent!\n"); EngSetLastError(ERROR_TLW_WITH_WSCHILD); - RETURN(NULL); /* WS_CHILD needs a parent, but WS_POPUP doesn't */ + goto cleanup; /* WS_CHILD needs a parent, but WS_POPUP doesn't */ } ParentWindow = hWndParent ? UserGetWindowObject(hWndParent): NULL; @@ -2008,7 +2008,7 @@ if(!Window) { DPRINT1("IntCreateWindow failed!\n"); - RETURN(0); + goto cleanup; } hWnd = UserHMGetHandle(Window); @@ -2023,6 +2023,11 @@ // Allocate the calling structures Justin Case this goes Global. pCsw = ExAllocatePoolWithTag(NonPagedPool, sizeof(CREATESTRUCTW), TAG_HOOK); pCbtCreate = ExAllocatePoolWithTag(NonPagedPool, sizeof(CBT_CREATEWNDW), TAG_HOOK); + if (!pCsw || !pCbtCreate) + { + DPRINT1("UserHeapAlloc() failed!\n"); + goto cleanup; + } /* Fill the new CREATESTRUCTW */ RtlCopyMemory(pCsw, Cs, sizeof(CREATESTRUCTW)); @@ -2036,6 +2041,11 @@ ANSI_STRING AnsiString; AnsiString.MaximumLength = RtlUnicodeStringToAnsiSize(ClassName)+sizeof(CHAR); pszClass = UserHeapAlloc(AnsiString.MaximumLength); + if (!pszClass) + { + DPRINT1("UserHeapAlloc() failed!\n"); + goto cleanup; + } RtlZeroMemory(pszClass, AnsiString.MaximumLength); AnsiString.Buffer = (PCHAR)pszClass; RtlUnicodeStringToAnsiString(&AnsiString, ClassName, FALSE); @@ -2045,11 +2055,16 @@ UNICODE_STRING UnicodeString; UnicodeString.MaximumLength = ClassName->Length + sizeof(UNICODE_NULL); pszClass = UserHeapAlloc(UnicodeString.MaximumLength); + if (!pszClass) + { + DPRINT1("UserHeapAlloc() failed!\n"); + goto cleanup; + } RtlZeroMemory(pszClass, UnicodeString.MaximumLength); UnicodeString.Buffer = (PWSTR)pszClass; RtlCopyUnicodeString(&UnicodeString, ClassName); } - if (pszClass) pCsw->lpszClass = UserHeapAddressToUser(pszClass); + pCsw->lpszClass = UserHeapAddressToUser(pszClass); } if (WindowName->Length) { @@ -2061,8 +2076,13 @@ if (Window->state & WNDS_ANSICREATOR) { ANSI_STRING AnsiString; - AnsiString.MaximumLength = RtlUnicodeStringToAnsiSize(&Name)+sizeof(CHAR); + AnsiString.MaximumLength = RtlUnicodeStringToAnsiSize(&Name) + sizeof(CHAR); pszName = UserHeapAlloc(AnsiString.MaximumLength); + if (!pszName) + { + DPRINT1("UserHeapAlloc() failed!\n"); + goto cleanup; + } RtlZeroMemory(pszName, AnsiString.MaximumLength); AnsiString.Buffer = (PCHAR)pszName; RtlUnicodeStringToAnsiString(&AnsiString, &Name, FALSE); @@ -2072,11 +2092,16 @@ UNICODE_STRING UnicodeString; UnicodeString.MaximumLength = Name.Length + sizeof(UNICODE_NULL); pszName = UserHeapAlloc(UnicodeString.MaximumLength); + if (!pszName) + { + DPRINT1("UserHeapAlloc() failed!\n"); + goto cleanup; + } RtlZeroMemory(pszName, UnicodeString.MaximumLength); UnicodeString.Buffer = (PWSTR)pszName; RtlCopyUnicodeString(&UnicodeString, &Name); } - if (pszName) pCsw->lpszName = UserHeapAddressToUser(pszName); + pCsw->lpszName = UserHeapAddressToUser(pszName); } pCbtCreate->lpcs = pCsw; @@ -2087,7 +2112,7 @@ if (Result != 0) { DPRINT1("WH_CBT HCBT_CREATEWND hook failed! 0x%x\n", Result); - RETURN( (PWND) NULL); + goto cleanup; } // Write back changes. Cs->cx = pCsw->cx; @@ -2143,7 +2168,7 @@ if (!Result) { DPRINT1("co_UserCreateWindowEx(): NCCREATE message failed\n"); - RETURN((PWND)0); + goto cleanup; } /* Send the WM_NCCALCSIZE message */ @@ -2161,7 +2186,7 @@ if (Result == (LRESULT)-1) { DPRINT1("co_UserCreateWindowEx(): WM_CREATE message failed\n"); - RETURN((PWND)0); + goto cleanup; } /* Send the EVENT_OBJECT_CREATE event*/ @@ -2234,10 +2259,10 @@ } DPRINT("co_UserCreateWindowEx(): Created window %X\n", hWnd); - RETURN( Window); - -CLEANUP: - if (!_ret_) + ret = Window; + +cleanup: + if (!ret) { DPRINT("co_UserCreateWindowEx(): Error Created window!\n"); /* If the window was created, the class will be dereferenced by co_UserDestroyWindow */ @@ -2258,8 +2283,8 @@ UserDereferenceObject(Window); } if (ParentWindow) UserDerefObjectCo(ParentWindow); - - END_CLEANUP; + + return ret; } NTSTATUS

1 0

[ilardig] 51124: Jeisson Toscano: Some Spanish translation updates plus some corrections added by elhoir and me. Bugs: 5891, 5892 and 5897. See issue #5891 for more details.
by ilardig＠svn.reactos.org 23 Mar '11

23 Mar '11

Author: ilardig Date: Wed Mar 23 14:39:39 2011 New Revision: 51124 URL: http://svn.reactos.org/svn/reactos?rev=51124&view=rev Log: Jeisson Toscano: Some Spanish translation updates plus some corrections added by elhoir and me. Bugs: 5891, 5892 and 5897. See issue #5891 for more details. Added: trunk/reactos/base/applications/cacls/lang/es-ES.rc (with props) trunk/reactos/base/applications/network/ipconfig/lang/es-ES.rc (with props) trunk/reactos/base/applications/shutdown/lang/es-ES.rc (with props) Modified: trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/games/winmine/lang/es-ES.rc trunk/reactos/base/applications/network/ipconfig/ipconfig.rc trunk/reactos/base/applications/shutdown/rsrc.rc Added: trunk/reactos/base/applications/cacls/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/cacls/lang/es-ES.rc [iso-8859-1] Wed Mar 23 14:39:39 2011 @@ -1,0 +1,74 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_HELP, "Muestra o modifica la lista de control de accesos (ACLs) de los archivos\n\n\ +CACLS archivo [/T] [/E] [/C] [/G user:perm [...]] [/R usuario [...]]\n\ + [/P user:perm [...]] [/D usuario [...]]\n\ + archivo Mostrar ACLs.\n\ + /T Cambia ACLs de los archivos especificados en\n\ + el directorio actual y todos sus subdirectorios.\n\ + /E Edita la ACL en lugar de reemplazarla.\n\ + /C Continúa en caso de errores de acceso.\n\ + /G user:perm Da los derechos de acceso al usuario especificado.\n\ + Perm puede ser: R Lectura\n\ + W Escritura\n\ + C Modificación (Escritura)\n\ + F Control total\n\ + /R usuario Revoca los derechos de acceso al usuario especificado (unicamente válido con /E).\n\ + /P user:perm Reemplaza los derechos de acceso del usuario especificado.\n\ + Perm puede ser: N Nada\n\ + R Lectura\n\ + W Escritura\n\ + C Modificación (Escritura)\n\ + F Control total\n\ + /D usuario Revoca el acceso al usuario especificado.\n\ +Es posible usar comodines para especificar más de un archivo por comando.\n\ +Se puede especificar más de un usuario por comando.\n\n\ +Abreviaciones:\n\ + CI - Herencia del contenedor.\n\ + ACE será heredado a los directorios.\n\ + OI - Herencia del objeto.\n\ + ACE sera heredado a los archivos.\n\ + IO - Herencia sola.\n\ + ACE no se aplicará al archivo/directorio actual.\n" + +IDS_ABBR_CI, "(CI)" +IDS_ABBR_OI, "(OI)" +IDS_ABBR_IO, "(IO)" +IDS_ABBR_FULL, "F" +IDS_ABBR_READ, "R" +IDS_ABBR_WRITE, "W" +IDS_ABBR_CHANGE, "C" +IDS_ABBR_NONE, "N" +IDS_ALLOW, "" +IDS_DENY, "(DENEGA)" +IDS_SPECIAL_ACCESS, "(acceso especial:)" +IDS_GENERIC_READ, "GENERIC_READ" +IDS_GENERIC_WRITE, "GENERIC_WRITE" +IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE" +IDS_GENERIC_ALL, "GENERIC_ALL" +IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE" +IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ" +IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE" +IDS_FILE_READ_DATA, "FILE_READ_DATA" +IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA" +IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA" +IDS_FILE_READ_EA, "FILE_READ_EA" +IDS_FILE_WRITE_EA, "FILE_WRITE_EA" +IDS_FILE_EXECUTE, "FILE_EXECUTE" +IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD" +IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES" +IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES" +IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED" +IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY" +IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL" +IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED" +IDS_SYNCHRONIZE, "SYNCHRONIZE" +IDS_WRITE_OWNER, "WRITE_OWNER" +IDS_WRITE_DAC, "WRITE_DAC" +IDS_READ_CONTROL, "READ_CONTROL" +IDS_DELETE, "DELETE" +IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL" +END Propchange: trunk/reactos/base/applications/cacls/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… ============================================================================== --- trunk/reactos/base/applications/cacls/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/rsrc.rc [iso-8859-1] Wed Mar 23 14:39:39 2011 @@ -2,6 +2,7 @@ #include "resource.h" #include "lang/bg-BG.rc" +#include "lang/es-ES.rc" #include "lang/ca-ES.rc" #include "lang/cs-CZ.rc" #include "lang/da-DA.rc" Modified: trunk/reactos/base/applications/games/winmine/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/es-ES.rc [iso-8859-1] Wed Mar 23 14:39:39 2011 @@ -24,7 +24,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_APPNAME, "WineMine" + IDS_APPNAME, "WinMine" IDS_NOBODY, "Nadie" IDS_ABOUT, "Copyright 2000 Joshua Thielen" END Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.rc [iso-8859-1] Wed Mar 23 14:39:39 2011 @@ -11,6 +11,7 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" Added: trunk/reactos/base/applications/network/ipconfig/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/network/ipconfig/lang/es-ES.rc [iso-8859-1] Wed Mar 23 14:39:39 2011 @@ -1,0 +1,65 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BCAST "Broadcast" + IDS_P2P "Peer To Peer" + IDS_MIXED "Mixto" + IDS_HYBRID "Híbrido" + IDS_UNKNOWN "Deconocido" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_OTHER "Otro Tipo de Adaptador" + IDS_ETH "Adaptador Ethernet" + IDS_TOKEN "Adaptador Token Ring" + IDS_FDDI "Adaptador FDDI" + IDS_PPP "Adaptador PPP" + IDS_LOOP "Adaptador Loopback" + IDS_SLIP "Adaptador SLIP" +END + +STRINGTABLE DISCARDABLE +BEGIN +/* Please keep the spacing/formatting as per En.rc when translating */ + IDS_USAGE + "\nUSO:\n \ + ipconfig [/? | /all | /renew [adaptador] | /release [adaptador] |\n \ + /flushdns | /displaydns | /registerdns |\n \ + /showclassid adaptador |\n \ + /setclassid adaptador [classid] ]\n \ + \n \ + En la cual\n \ + adaptador Nombre de la conexión\n \ + (caracteres especiales * and ? autorizados, ver ejemplos)\n \ + \n \ + Optiones:\n \ + /? Muestra este mensaje de ayuda\n \ + /all Muestra todas las informaciones de configuración.\n \ + /release Libera la dirección IP para el adaptador especificado.\n \ + /renew Renueva la dirección IP para el adaptador especificado.\n \ + /flushdns Purga la cache de Resolución DNS.\n \ + /registerdns Actualiza todas las concesiones DHCP y registra de nuevo nombres DNS.\n \ + /displaydns Muestra el contenido del cache de Resolución DNS.\n \ + /showclassid Muestra todos los class IDs dhcp concedidos al adaptador.\n \ + /setclassid Modifica el class id dhcp.\n \ + \n \ + Generalmente se muestra solamente la dirección IP, la máscara de red y\n \ + la puerta de enlace predefinidas de cada adaptador relacionado a TCP/IP.\n \ + \n \ + Para los parámetros Release y Renew, si no se especifica un adaptador, entonces la(s) dirección(es)\n \ + IP asignada(s) para todos los adaptadores relacionados a TCP/IP serán liberadas o renovadas.\n \ + \n \ + Para Setclassid, si no se especifica algún ClassId, este será removido.\n \ + \n \ + Ejemplos:\n \ + > ipconfig ... Muestra informaciones.\n \ + > ipconfig /all ... Muestra informaciones detalladas\n \ + > ipconfig /renew ... Renueva todos los adaptadores\n \ + > ipconfig /renew EL* ... Renueva todas las direcciones IP de los adaptadores\n \ + cuyo nombre comienza con EL\n \ + > ipconfig /release *Con* ... Libera todas las conexiones concernidas,\n \ + ej. ""Conexión al area local 1"" o\n \ + ""Conexión al area local 2""\n" +END Propchange: trunk/reactos/base/applications/network/ipconfig/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/shutdown/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/shutdown/lang/es-ES.rc [iso-8859-1] Wed Mar 23 14:39:39 2011 @@ -1,0 +1,14 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "Utilización: shutdown [-?] [-l | -s | -r] [-f]\n\n\ + Ningún argumento o -?\tMuestra este mensaje\n\ + -l\t\t\tDesconectarse\n\ + -s\t\t\tApagar el equipo\n\ + -r\t\t\tApagar y reiniciar el equipo\n\ + -f\t\t\tObliga las aplicaciones en curso de ejecución a apagarse sin advertencias\n\ + \t\t\tSi no especifica algún otro parámetro, esta opción\n\ + \t\t\tprovocará también una desconexión" +END Propchange: trunk/reactos/base/applications/shutdown/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/shutdown/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/rsrc.rc [iso-8859-1] Wed Mar 23 14:39:39 2011 @@ -6,6 +6,7 @@ #include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/es-ES.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" #include "lang/ko-KR.rc"

1 0

[fireball] 51123: [NTDLL/LDR] - Fix a few bugs (wrong variable usage, wrong variable initialization) which led to incorrect snapping of import address table. - Wrap LdrpSnapThunk() invocations into...
by fireball＠svn.reactos.org 23 Mar '11

23 Mar '11

Author: fireball Date: Wed Mar 23 12:25:53 2011 New Revision: 51123 URL: http://svn.reactos.org/svn/reactos?rev=51123&view=rev Log: [NTDLL/LDR] - Fix a few bugs (wrong variable usage, wrong variable initialization) which led to incorrect snapping of import address table. - Wrap LdrpSnapThunk() invocations into SEH. Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrpe.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] Wed Mar 23 12:25:53 2011 @@ -44,13 +44,15 @@ ULONG IatSize; //PPEB Peb = NtCurrentPeb(); NTSTATUS Status; - PIMAGE_THUNK_DATA Thunk, OriginalThunk, FirstThunk; + PIMAGE_THUNK_DATA OriginalThunk, FirstThunk; LPSTR ImportName; ULONG ForwarderChain; PIMAGE_NT_HEADERS NtHeader; PIMAGE_SECTION_HEADER SectionHeader; ULONG i, Rva; ULONG OldProtect; + + DPRINT("LdrpSnapIAT(%wZ %wZ %p %d)\n", &ExportLdrEntry->BaseDllName, &ImportLdrEntry->BaseDllName, IatEntry, EntriesValid); /* Get export directory */ ExportDirectory = RtlImageDirectoryEntryToData(ExportLdrEntry->DllBase, @@ -101,13 +103,13 @@ { IatSize = SectionHeader->SizeOfRawData; } - + /* Found it, get out */ break; } /* No match, move to the next section */ - ++SectionHeader; + SectionHeader++; } } @@ -154,17 +156,24 @@ ForwarderChain = (ULONG)FirstThunk->u1.Ordinal; /* Snap the thunk */ - Status = LdrpSnapThunk(ExportLdrEntry->DllBase, - ImportLdrEntry->DllBase, - OriginalThunk, - FirstThunk, - ExportDirectory, - ExportSize, - TRUE, - ImportName); - - /* Move to the next thunk */ - FirstThunk++; + _SEH2_TRY + { + Status = LdrpSnapThunk(ExportLdrEntry->DllBase, + ImportLdrEntry->DllBase, + OriginalThunk, + FirstThunk, + ExportDirectory, + ExportSize, + TRUE, + ImportName); + + /* Move to the next thunk */ + FirstThunk++; + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Fail with the SEH error */ + Status = _SEH2_GetExceptionCode(); + } _SEH2_END; /* If we messed up, exit */ if (!NT_SUCCESS(Status)) break; @@ -184,7 +193,7 @@ if ((IatEntry->Characteristics < NtHeader->OptionalHeader.SizeOfHeaders) || (IatEntry->Characteristics >= NtHeader->OptionalHeader.SizeOfImage)) { - /* Reuse it, this is a strange linked file */ + /* Refuse it, this is a strange linked file */ OriginalThunk = FirstThunk; } else @@ -203,18 +212,25 @@ while (OriginalThunk->u1.AddressOfData) { /* Snap the Thunk */ - Status = LdrpSnapThunk(ExportLdrEntry->DllBase, - ImportLdrEntry->DllBase, - OriginalThunk, - FirstThunk, - ExportDirectory, - ExportSize, - TRUE, - ImportName); - - /* Next thunks */ - OriginalThunk++; - Thunk++; + _SEH2_TRY + { + Status = LdrpSnapThunk(ExportLdrEntry->DllBase, + ImportLdrEntry->DllBase, + OriginalThunk, + FirstThunk, + ExportDirectory, + ExportSize, + TRUE, + ImportName); + + /* Next thunks */ + OriginalThunk++; + FirstThunk++; + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Fail with the SEH error */ + Status = _SEH2_GetExceptionCode(); + } _SEH2_END; /* If we failed the snap, break out */ if (!NT_SUCCESS(Status)) break; @@ -498,7 +514,7 @@ //ULONG IatSize, i; LPSTR ImportName; NTSTATUS Status; - BOOLEAN AlreadyLoaded = FALSE, StaticEntriesValid = FALSE, SkipSnap = TRUE; + BOOLEAN AlreadyLoaded = FALSE, StaticEntriesValid = FALSE, SkipSnap = FALSE; PLDR_DATA_TABLE_ENTRY DllLdrEntry; PIMAGE_THUNK_DATA FirstThunk; PPEB Peb = NtCurrentPeb();

1 0

[ilardig] 51122: Paolo Devoti: Some Italian fixes. See issue #5847 for more details.
by ilardig＠svn.reactos.org 23 Mar '11

23 Mar '11

Author: ilardig Date: Wed Mar 23 11:56:35 2011 New Revision: 51122 URL: http://svn.reactos.org/svn/reactos?rev=51122&view=rev Log: Paolo Devoti: Some Italian fixes. See issue #5847 for more details. Modified: trunk/reactos/base/applications/games/winmine/lang/it-IT.rc trunk/reactos/base/applications/network/ping/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc Modified: trunk/reactos/base/applications/games/winmine/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/it-IT.rc [iso-8859-1] Wed Mar 23 11:56:35 2011 @@ -29,7 +29,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_APPNAME, "WineMine" + IDS_APPNAME, "WinMine" IDS_NOBODY, "Nessuno" IDS_ABOUT, "Copyright 2000 Joshua Thielen" END Modified: trunk/reactos/base/applications/network/ping/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/it-IT.rc [iso-8859-1] Wed Mar 23 11:56:35 2011 @@ -16,7 +16,7 @@ IDS_APPROXIMATE_ROUND_TRIP "Tempo approssimato di andata e ritorno in milli-secondi:\n\0" IDS_MIN_MAX_AVERAGE " Minimo = %1, Massimo = %2, Media = %3\n\0" IDS_NOT_ENOUGH_RESOURCES "Risorse disponibili insufficienti.\n\0" - IDS_UNKNOWN_HOST "Host sconosciuto%1.\n\0" + IDS_UNKNOWN_HOST "Host sconosciuto %1.\n\0" IDS_SETSOCKOPT_FAILED "setsockopt fallito (%1!d!).\n\0" IDS_COULD_NOT_CREATE_SOCKET "Impossibile creare il socket (#%1!d!).\n\0" IDS_COULD_NOT_INIT_WINSOCK "Impossibile inizializzare winsock dll.\n\0" @@ -24,7 +24,7 @@ IDS_BAD_PARAMETER "Parametro errato %1.\n\0" IDS_BAD_OPTION_FORMAT "Formato opzione errato %1.\n\0" IDS_BAD_OPTION "Opzione errata %1.\n\0" - IDS_BAD_VALUE_OPTION_L "Valore errato per il parametro -l, l'intervallo valido è tra 0 to %1!d!.\n\0" + IDS_BAD_VALUE_OPTION_L "Valore errato per il parametro -l, è valido un valore tra 0 to %1!d!.\n\0" IDS_REPLY_FROM "Risposta da %1: bytes=%2!d! time%3%4 TTL=%5!d!\n\0" IDS_DEST_UNREACHABLE "Host destinazione irraggiungibile.\n\0" IDS_COULD_NOT_TRANSMIT "Impossibile trasmettere dati (%1!d!).\n\0" Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] Wed Mar 23 11:56:35 2011 @@ -260,6 +260,6 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DISPLAY_SETTINGS "Impostazioni del monitor" - IDS_APPLY_FAILED "Impossibile applicare le uove impostazioni..." + IDS_APPLY_FAILED "Impossibile applicare le nuove impostazioni..." IDS_APPLY_NEEDS_RESTART "E' necessario riavviare il computer per applicare le modifiche." END

1 0

[ilardig] 51121: [NTOS/INBV] - Update boot screen copyright year.
by ilardig＠svn.reactos.org 23 Mar '11

23 Mar '11

Author: ilardig Date: Wed Mar 23 11:44:35 2011 New Revision: 51121 URL: http://svn.reactos.org/svn/reactos?rev=51121&view=rev Log: [NTOS/INBV] - Update boot screen copyright year. Modified: trunk/reactos/ntoskrnl/inbv/logo/1.bmp Modified: trunk/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/1.bmp?r… ============================================================================== Binary files - no diff available.

1 0

[fireball] 51120: [NTOS/KE] - Remove VirtualBox SYSENTER-hack added in r50991. - Bring back NT-compatible SYSENTER support detection changed in r50991.
by fireball＠svn.reactos.org 22 Mar '11

22 Mar '11

Author: fireball Date: Tue Mar 22 16:35:51 2011 New Revision: 51120 URL: http://svn.reactos.org/svn/reactos?rev=51120&view=rev Log: [NTOS/KE] - Remove VirtualBox SYSENTER-hack added in r50991. - Bring back NT-compatible SYSENTER support detection changed in r50991. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Tue Mar 22 16:35:51 2011 @@ -303,17 +303,10 @@ /* Remove support for correct PTE support. */ FeatureBits &= ~KF_WORKING_PTE; } - - /* Virtualbox claims to have no SYSENTER support, - * which is false for processors >= Pentium Pro */ - if(Prcb->CpuType >= 6) - { - Reg[3] |= 0x800; - } - - /* Check if the CPU is too old to support SYSENTER, - * See Intel CPUID instruction manual for details*/ - if ((Reg[0] & 0x0FFF3FFF) < 0x00000633) + + /* Check if the CPU is too old to support SYSENTER */ + if ((Prcb->CpuType < 6) || + ((Prcb->CpuType == 6) && (Prcb->CpuStep < 0x0303))) { /* Disable it */ Reg[3] &= ~0x800;

1 0

[fireball] 51119: [RTL/HEAP] - Thomas Faber: Use macro instead of manually removing item from the list. See issue #6016 for more details.
by fireball＠svn.reactos.org 22 Mar '11

22 Mar '11

Author: fireball Date: Tue Mar 22 16:27:41 2011 New Revision: 51119 URL: http://svn.reactos.org/svn/reactos?rev=51119&view=rev Log: [RTL/HEAP] - Thomas Faber: Use macro instead of manually removing item from the list. See issue #6016 for more details. Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=51119&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Tue Mar 22 16:27:41 2011 @@ -341,18 +341,9 @@ BOOLEAN NoFill) { SIZE_T Result, RealSize; - PLIST_ENTRY OldBlink, OldFlink; - - // FIXME: Maybe use RemoveEntryList? - - /* Remove the free block */ - OldFlink = FreeEntry->FreeList.Flink; - OldBlink = FreeEntry->FreeList.Blink; - OldBlink->Flink = OldFlink; - OldFlink->Blink = OldBlink; - - /* Update the freelists bitmap */ - if ((OldFlink == OldBlink) && + + /* Remove the free block and update the freelists bitmap */ + if (RemoveEntryList(&FreeEntry->FreeList) && (Dedicated || (!Dedicated && FreeEntry->Size < HEAP_FREELISTS))) { RtlpClearFreeListsBit(Heap, FreeEntry);

1 0

[cfinck] 51118: Create a branch for Neeraj Yadav's work on the Audio Mixer
by cfinck＠svn.reactos.org 22 Mar '11

22 Mar '11

Author: cfinck Date: Tue Mar 22 12:45:40 2011 New Revision: 51118 URL: http://svn.reactos.org/svn/reactos?rev=51118&view=rev Log: Create a branch for Neeraj Yadav's work on the Audio Mixer Added: branches/nyadav-audio-branch/ - copied from r51117, trunk/

1 0

[fireball] 51117: [NTDLL] - Implement LdrpInitializeProcess(). Currently unused. - Add a whole bunch of supportive PE related code. Used only by the new code, which is not enabled yet in trunk. - I...
by fireball＠svn.reactos.org 22 Mar '11

22 Mar '11

Author: fireball Date: Tue Mar 22 12:41:52 2011 New Revision: 51117 URL: http://svn.reactos.org/svn/reactos?rev=51117&view=rev Log: [NTDLL] - Implement LdrpInitializeProcess(). Currently unused. - Add a whole bunch of supportive PE related code. Used only by the new code, which is not enabled yet in trunk. - Implement LdrpCheckForLoadedDll(). - Move on to usage of various global vars defined in the new code, rename some of them to match. - Almost no changes for the codepath in trunk. Modified: trunk/reactos/dll/ntdll/include/ntdllp.h trunk/reactos/dll/ntdll/ldr/ldrinit.c trunk/reactos/dll/ntdll/ldr/ldrpe.c trunk/reactos/dll/ntdll/ldr/ldrutils.c trunk/reactos/dll/ntdll/ldr/startup.c trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/include/ntdllp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] Tue Mar 22 12:41:52 2011 @@ -26,6 +26,7 @@ extern BOOLEAN LdrpInLdrInit; extern LIST_ENTRY LdrpHashTable[LDR_HASH_TABLE_ENTRIES]; extern BOOLEAN ShowSnaps; +extern UNICODE_STRING LdrpDefaultPath; /* ldrinit.c */ NTSTATUS NTAPI LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL); Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Tue Mar 22 12:41:52 2011 @@ -19,31 +19,69 @@ HKEY Wow64ExecOptionsKey; UNICODE_STRING ImageExecOptionsString = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Image File Execution Options"); UNICODE_STRING Wow64OptionsString = RTL_CONSTANT_STRING(L""); +UNICODE_STRING NtDllString = RTL_CONSTANT_STRING(L"ntdll.dll"); BOOLEAN LdrpInLdrInit; LONG LdrpProcessInitialized; +BOOLEAN LdrpLoaderLockInit; +BOOLEAN LdrpLdrDatabaseIsSetup; + +BOOLEAN LdrpDllValidation; PLDR_DATA_TABLE_ENTRY LdrpImageEntry; PUNICODE_STRING LdrpTopLevelDllBeingLoaded; extern PTEB LdrpTopLevelDllBeingLoadedTeb; // defined in rtlsupp.c! PLDR_DATA_TABLE_ENTRY LdrpCurrentDllInitializer; - -//RTL_BITMAP TlsBitMap; -//RTL_BITMAP TlsExpansionBitMap; -//RTL_BITMAP FlsBitMap; +PLDR_DATA_TABLE_ENTRY LdrpNtDllDataTableEntry; + +RTL_BITMAP TlsBitMap; +RTL_BITMAP TlsExpansionBitMap; +RTL_BITMAP FlsBitMap; BOOLEAN LdrpImageHasTls; LIST_ENTRY LdrpTlsList; ULONG LdrpNumberOfTlsEntries; ULONG LdrpNumberOfProcessors; - -RTL_CRITICAL_SECTION LdrpLoaderLock; +PVOID NtDllBase; +LARGE_INTEGER RtlpTimeout; +BOOLEAN RtlpTimeoutDisable; +LIST_ENTRY LdrpHashTable[LDR_HASH_TABLE_ENTRIES]; +LIST_ENTRY LdrpDllNotificationList; +HANDLE LdrpKnownDllObjectDirectory; +UNICODE_STRING LdrpKnownDllPath; +WCHAR LdrpKnownDllPathBuffer[128]; +UNICODE_STRING LdrpDefaultPath; + +PEB_LDR_DATA PebLdr; + +RTL_CRITICAL_SECTION_DEBUG LdrpLoaderLockDebug; +RTL_CRITICAL_SECTION LdrpLoaderLock = +{ + &LdrpLoaderLockDebug, + -1, + 0, + 0, + 0, + 0 +}; +RTL_CRITICAL_SECTION FastPebLock; BOOLEAN ShowSnaps; ULONG LdrpFatalHardErrorCount; + +//extern LIST_ENTRY RtlCriticalSectionList; VOID RtlpInitializeVectoredExceptionHandling(VOID); VOID NTAPI RtlpInitDeferedCriticalSection(VOID); +VOID RtlInitializeHeapManager(VOID); +extern BOOLEAN RtlpPageHeapEnabled; +extern ULONG RtlpDphGlobalFlags; + +NTSTATUS LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders, PVOID ImageBase); +NTSTATUS NTAPI +LdrpInitializeProcess_(PCONTEXT Context, + PVOID SystemArgument1); + /* FUNCTIONS *****************************************************************/ @@ -455,12 +493,10 @@ /* Show debug message */ if (ShowSnaps) { - DPRINT1("[%x,%x] LDR: Real INIT LIST for Process %wZ pid %u %0x%x\n", + DPRINT1("[%x,%x] LDR: Real INIT LIST for Process %wZ\n", NtCurrentTeb()->RealClientId.UniqueThread, NtCurrentTeb()->RealClientId.UniqueProcess, - Peb->ProcessParameters->ImagePathName, - NtCurrentTeb()->RealClientId.UniqueThread, - NtCurrentTeb()->RealClientId.UniqueProcess); + &Peb->ProcessParameters->ImagePathName); } /* Loop in order */ @@ -838,6 +874,644 @@ TlsVector); } +NTSTATUS +NTAPI +LdrpInitializeExecutionOptions(PUNICODE_STRING ImagePathName, PPEB Peb, PULONG Options) +{ + UNIMPLEMENTED; + *Options = 0; + return STATUS_SUCCESS; +} + +VOID +NTAPI +LdrpValidateImageForMp(IN PLDR_DATA_TABLE_ENTRY LdrDataTableEntry) +{ + UNIMPLEMENTED; +} + +NTSTATUS +NTAPI +LdrpInitializeProcess(IN PCONTEXT Context, + IN PVOID SystemArgument1) +{ + RTL_HEAP_PARAMETERS HeapParameters; + ULONG ComSectionSize; + //ANSI_STRING FunctionName = RTL_CONSTANT_STRING("BaseQueryModuleData"); + PVOID OldShimData; + OBJECT_ATTRIBUTES ObjectAttributes; + //UNICODE_STRING LocalFileName, FullImageName; + HANDLE SymLinkHandle; + //ULONG DebugHeapOnly; + UNICODE_STRING CommandLine, NtSystemRoot, ImagePathName, FullPath, ImageFileName, KnownDllString; + PPEB Peb = NtCurrentPeb(); + BOOLEAN IsDotNetImage = FALSE; + BOOLEAN FreeCurDir = FALSE; + //HKEY CompatKey; + PRTL_USER_PROCESS_PARAMETERS ProcessParameters; + //LPWSTR ImagePathBuffer; + ULONG ConfigSize; + UNICODE_STRING CurrentDirectory; + ULONG ExecuteOptions; + ULONG HeapFlags; + PIMAGE_NT_HEADERS NtHeader; + LPWSTR NtDllName = NULL; + NTSTATUS Status; + NLSTABLEINFO NlsTable; + PIMAGE_LOAD_CONFIG_DIRECTORY LoadConfig; + PTEB Teb = NtCurrentTeb(); + PLIST_ENTRY ListHead; + PLIST_ENTRY NextEntry; + ULONG i; + PWSTR ImagePath; + ULONG DebugProcessHeapOnly = 0; + WCHAR FullNtDllPath[MAX_PATH]; + PLDR_DATA_TABLE_ENTRY NtLdrEntry; + PWCHAR Current; + + /* Set a NULL SEH Filter */ + RtlSetUnhandledExceptionFilter(NULL); + + /* Get the image path */ + ImagePath = Peb->ProcessParameters->ImagePathName.Buffer; + + /* Check if it's normalized */ + if (Peb->ProcessParameters->Flags & RTL_USER_PROCESS_PARAMETERS_NORMALIZED) + { + /* Normalize it*/ + ImagePath = (PWSTR)((ULONG_PTR)ImagePath + (ULONG_PTR)Peb->ProcessParameters); + } + + /* Create a unicode string for the Image Path */ + ImagePathName.Length = Peb->ProcessParameters->ImagePathName.Length; + ImagePathName.MaximumLength = ImagePathName.Length + sizeof(WCHAR); + ImagePathName.Buffer = ImagePath; + + /* Get the NT Headers */ + NtHeader = RtlImageNtHeader(Peb->ImageBaseAddress); + + /* Get the execution options */ + Status = LdrpInitializeExecutionOptions(&ImagePathName, Peb, &ExecuteOptions); + + /* Check if this is a .NET executable */ + if (RtlImageDirectoryEntryToData(Peb->ImageBaseAddress, + TRUE, + IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR, + &ComSectionSize)) + { + /* Remeber this for later */ + IsDotNetImage = TRUE; + } + + /* Save the NTDLL Base address */ + NtDllBase = SystemArgument1; + + /* If this is a Native Image */ + if (NtHeader->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_NATIVE) + { + /* Then do DLL Validation */ + LdrpDllValidation = TRUE; + } + + /* Save the old Shim Data */ + OldShimData = Peb->pShimData; + + /* Clear it */ + Peb->pShimData = NULL; + + /* Save the number of processors and CS Timeout */ + LdrpNumberOfProcessors = Peb->NumberOfProcessors; + RtlpTimeout = Peb->CriticalSectionTimeout; + + /* Normalize the parameters */ + ProcessParameters = RtlNormalizeProcessParams(Peb->ProcessParameters); + ProcessParameters = Peb->ProcessParameters; + if (ProcessParameters) + { + /* Save the Image and Command Line Names */ + ImageFileName = ProcessParameters->ImagePathName; + CommandLine = ProcessParameters->CommandLine; + } + else + { + /* It failed, initialize empty strings */ + RtlInitUnicodeString(&ImageFileName, NULL); + RtlInitUnicodeString(&CommandLine, NULL); + } + + /* Initialize NLS data */ + RtlInitNlsTables(Peb->AnsiCodePageData, + Peb->OemCodePageData, + Peb->UnicodeCaseTableData, + &NlsTable); + + /* Reset NLS Translations */ + RtlResetRtlTranslations(&NlsTable); + + /* Get the Image Config Directory */ + LoadConfig = RtlImageDirectoryEntryToData(Peb->ImageBaseAddress, + TRUE, + IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, + &ConfigSize); + + /* Setup the Heap Parameters */ + RtlZeroMemory(&HeapParameters, sizeof(RTL_HEAP_PARAMETERS)); + HeapFlags = HEAP_GROWABLE; + HeapParameters.Length = sizeof(RTL_HEAP_PARAMETERS); + + /* Check if we have Configuration Data */ + if ((LoadConfig) && (ConfigSize == sizeof(IMAGE_LOAD_CONFIG_DIRECTORY))) + { + /* FIXME: Custom heap settings and misc. */ + DPRINT1("We don't support LOAD_CONFIG data yet\n"); + } + + /* Check for custom affinity mask */ + if (Peb->ImageProcessAffinityMask) + { + /* Set it */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessAffinityMask, + &Peb->ImageProcessAffinityMask, + sizeof(Peb->ImageProcessAffinityMask)); + } + + /* Check if verbose debugging (ShowSnaps) was requested */ + ShowSnaps = TRUE;//Peb->NtGlobalFlag & FLG_SHOW_LDR_SNAPS; + + /* Start verbose debugging messages right now if they were requested */ + if (ShowSnaps) + { + DPRINT1("LDR: PID: 0x%x started - '%wZ'\n", + Teb->ClientId.UniqueProcess, + &CommandLine); + } + + /* If the timeout is too long */ + if (RtlpTimeout.QuadPart < Int32x32To64(3600, -10000000)) + { + /* Then disable CS Timeout */ + RtlpTimeoutDisable = TRUE; + } + + /* Initialize Critical Section Data */ + RtlpInitDeferedCriticalSection(); + + /* Initialize VEH Call lists */ + RtlpInitializeVectoredExceptionHandling(); + + /* Set TLS/FLS Bitmap data */ + Peb->FlsBitmap = &FlsBitMap; + Peb->TlsBitmap = &TlsBitMap; + Peb->TlsExpansionBitmap = &TlsExpansionBitMap; + + /* Initialize FLS Bitmap */ + RtlInitializeBitMap(&FlsBitMap, + Peb->FlsBitmapBits, + FLS_MAXIMUM_AVAILABLE); + RtlSetBit(&FlsBitMap, 0); + + /* Initialize TLS Bitmap */ + RtlInitializeBitMap(&TlsBitMap, + Peb->TlsBitmapBits, + TLS_MINIMUM_AVAILABLE); + RtlSetBit(&TlsBitMap, 0); + RtlInitializeBitMap(&TlsExpansionBitMap, + Peb->TlsExpansionBitmapBits, + TLS_EXPANSION_SLOTS); + RtlSetBit(&TlsExpansionBitMap, 0); + + /* Initialize the Hash Table */ + for (i = 0; i < LDR_HASH_TABLE_ENTRIES; i++) + { + InitializeListHead(&LdrpHashTable[i]); + } + + /* Initialize the Loader Lock */ + //InsertTailList(&RtlCriticalSectionList, &LdrpLoaderLock.DebugInfo->ProcessLocksList); + //LdrpLoaderLock.DebugInfo->CriticalSection = &LdrpLoaderLock; + UNIMPLEMENTED; + LdrpLoaderLockInit = TRUE; + + /* Check if User Stack Trace Database support was requested */ + if (Peb->NtGlobalFlag & FLG_USER_STACK_TRACE_DB) + { + DPRINT1("We don't support user stack trace databases yet\n"); + } + + /* Setup Fast PEB Lock */ + RtlInitializeCriticalSection(&FastPebLock); + Peb->FastPebLock = &FastPebLock; + //Peb->FastPebLockRoutine = (PPEBLOCKROUTINE)RtlEnterCriticalSection; + //Peb->FastPebUnlockRoutine = (PPEBLOCKROUTINE)RtlLeaveCriticalSection; + + /* Setup Callout Lock and Notification list */ + //RtlInitializeCriticalSection(&RtlpCalloutEntryLock); + InitializeListHead(&LdrpDllNotificationList); + + /* For old executables, use 16-byte aligned heap */ + if ((NtHeader->OptionalHeader.MajorSubsystemVersion <= 3) && + (NtHeader->OptionalHeader.MinorSubsystemVersion < 51)) + { + HeapFlags |= HEAP_CREATE_ALIGN_16; + } + + /* Setup the Heap */ + RtlInitializeHeapManager(); + Peb->ProcessHeap = RtlCreateHeap(HeapFlags, + NULL, + NtHeader->OptionalHeader.SizeOfHeapReserve, + NtHeader->OptionalHeader.SizeOfHeapCommit, + NULL, + &HeapParameters); + + if (!Peb->ProcessHeap) + { + DPRINT1("Failed to create process heap\n"); + return STATUS_NO_MEMORY; + } + + /* Allocate an Activation Context Stack */ + Status = RtlAllocateActivationContextStack((PVOID *)&Teb->ActivationContextStackPointer); + if (!NT_SUCCESS(Status)) return Status; + + // FIXME: Loader private heap is missing + DPRINT1("Loader private heap is missing\n"); + + /* Check for Debug Heap */ + DPRINT1("Check for a debug heap is missing\n"); + if (FALSE) + { + /* Query the setting */ + Status = LdrQueryImageFileKeyOption(NULL,//hKey + L"DebugProcessHeapOnly", + REG_DWORD, + &DebugProcessHeapOnly, + sizeof(ULONG), + NULL); + + if (NT_SUCCESS(Status)) + { + /* Reset DPH if requested */ + if (RtlpPageHeapEnabled && DebugProcessHeapOnly) + { + RtlpDphGlobalFlags &= ~0x40; + RtlpPageHeapEnabled = FALSE; + } + } + } + + /* Build the NTDLL Path */ + FullPath.Buffer = FullNtDllPath; + FullPath.Length = 0; + FullPath.MaximumLength = sizeof(FullNtDllPath); + RtlInitUnicodeString(&NtSystemRoot, SharedUserData->NtSystemRoot); + RtlAppendUnicodeStringToString(&FullPath, &NtSystemRoot); + RtlAppendUnicodeToString(&FullPath, L"\\System32\\"); + + /* Open the Known DLLs directory */ + RtlInitUnicodeString(&KnownDllString, L"\\KnownDlls"); + InitializeObjectAttributes(&ObjectAttributes, + &KnownDllString, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenDirectoryObject(&LdrpKnownDllObjectDirectory, + DIRECTORY_QUERY | DIRECTORY_TRAVERSE, + &ObjectAttributes); + + /* Check if it exists */ + if (!NT_SUCCESS(Status)) + { + /* It doesn't, so assume System32 */ + LdrpKnownDllObjectDirectory = NULL; + RtlInitUnicodeString(&LdrpKnownDllPath, FullPath.Buffer); + LdrpKnownDllPath.Length -= sizeof(WCHAR); + } + else + { + /* Open the Known DLLs Path */ + InitializeObjectAttributes(&ObjectAttributes, + &KnownDllString, + OBJ_CASE_INSENSITIVE, + LdrpKnownDllObjectDirectory, + NULL); + Status = NtOpenSymbolicLinkObject(&SymLinkHandle, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Query the path */ + LdrpKnownDllPath.Length = 0; + LdrpKnownDllPath.MaximumLength = sizeof(LdrpKnownDllPathBuffer); + LdrpKnownDllPath.Buffer = LdrpKnownDllPathBuffer; + Status = ZwQuerySymbolicLinkObject(SymLinkHandle, &LdrpKnownDllPath, NULL); + NtClose(SymLinkHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LDR: %s - failed call to ZwQuerySymbolicLinkObject with status %x\n", "", Status); + return Status; + } + } + } + + /* If we have process parameters, get the default path and current path */ + if (ProcessParameters) + { + /* Check if we have a Dll Path */ + if (ProcessParameters->DllPath.Length) + { + /* Get the path */ + LdrpDefaultPath = *(PUNICODE_STRING)&ProcessParameters->DllPath; + } + else + { + /* We need a valid path */ + LdrpInitFailure(STATUS_INVALID_PARAMETER); + } + + /* Set the current directory */ + CurrentDirectory = ProcessParameters->CurrentDirectory.DosPath; + + /* Check if it's empty or invalid */ + if ((!CurrentDirectory.Buffer) || + (CurrentDirectory.Buffer[0] == UNICODE_NULL) || + (!CurrentDirectory.Length)) + { + /* Allocate space for the buffer */ + CurrentDirectory.Buffer = RtlAllocateHeap(Peb->ProcessHeap, + 0, + 3 * sizeof(WCHAR) + + sizeof(UNICODE_NULL)); + + /* Copy the drive of the system root */ + RtlMoveMemory(CurrentDirectory.Buffer, + SharedUserData->NtSystemRoot, + 3 * sizeof(WCHAR)); + CurrentDirectory.Buffer[3] = UNICODE_NULL; + CurrentDirectory.Length = 3 * sizeof(WCHAR); + CurrentDirectory.MaximumLength = CurrentDirectory.Length + sizeof(WCHAR); + + FreeCurDir = TRUE; + } + else + { + /* Use the local buffer */ + CurrentDirectory.Length = NtSystemRoot.Length; + CurrentDirectory.Buffer = NtSystemRoot.Buffer; + } + } + + /* Setup Loader Data */ + Peb->Ldr = &PebLdr; + InitializeListHead(&PebLdr.InLoadOrderModuleList); + InitializeListHead(&PebLdr.InMemoryOrderModuleList); + InitializeListHead(&PebLdr.InInitializationOrderModuleList); + PebLdr.Length = sizeof(PEB_LDR_DATA); + PebLdr.Initialized = TRUE; + + /* Allocate a data entry for the Image */ + LdrpImageEntry = NtLdrEntry = LdrpAllocateDataTableEntry(Peb->ImageBaseAddress); + + /* Set it up */ + NtLdrEntry->EntryPoint = LdrpFetchAddressOfEntryPoint(NtLdrEntry->DllBase); + NtLdrEntry->LoadCount = -1; + NtLdrEntry->EntryPointActivationContext = 0; + NtLdrEntry->FullDllName.Length = ImageFileName.Length; + NtLdrEntry->FullDllName.Buffer = ImageFileName.Buffer; + if (IsDotNetImage) + NtLdrEntry->Flags = LDRP_COR_IMAGE; + else + NtLdrEntry->Flags = 0; + + /* Check if the name is empty */ + if (!ImageFileName.Buffer[0]) + { + /* Use the same Base name */ + NtLdrEntry->BaseDllName = NtLdrEntry->BaseDllName; + } + else + { + /* Find the last slash */ + Current = ImageFileName.Buffer; + while (*Current) + { + if (*Current++ == '\\') + { + /* Set this path */ + NtDllName = Current; + } + } + + /* Did we find anything? */ + if (!NtDllName) + { + /* Use the same Base name */ + NtLdrEntry->BaseDllName = NtLdrEntry->FullDllName; + } + else + { + /* Setup the name */ + NtLdrEntry->BaseDllName.Length = (USHORT)((ULONG_PTR)ImageFileName.Buffer + ImageFileName.Length - (ULONG_PTR)NtDllName); + NtLdrEntry->BaseDllName.MaximumLength = NtLdrEntry->BaseDllName.Length + sizeof(WCHAR); + NtLdrEntry->BaseDllName.Buffer = (PWSTR)((ULONG_PTR)ImageFileName.Buffer + + (ImageFileName.Length - NtLdrEntry->BaseDllName.Length)); + } + } + + /* Processing done, insert it */ + LdrpInsertMemoryTableEntry(NtLdrEntry); + NtLdrEntry->Flags |= LDRP_ENTRY_PROCESSED; + + /* Now add an entry for NTDLL */ + NtLdrEntry = LdrpAllocateDataTableEntry(SystemArgument1); + NtLdrEntry->Flags = LDRP_IMAGE_DLL; + NtLdrEntry->EntryPoint = LdrpFetchAddressOfEntryPoint(NtLdrEntry->DllBase); + NtLdrEntry->LoadCount = -1; + NtLdrEntry->EntryPointActivationContext = 0; + //NtLdrEntry->BaseDllName.Length = NtSystemRoot.Length; + //RtlAppendUnicodeStringToString(&NtSystemRoot, &NtDllString); + NtLdrEntry->BaseDllName.Length = NtDllString.Length; + NtLdrEntry->BaseDllName.MaximumLength = NtDllString.MaximumLength; + NtLdrEntry->BaseDllName.Buffer = NtDllString.Buffer; + + // FIXME: Full DLL name?! + + /* Processing done, insert it */ + LdrpNtDllDataTableEntry = NtLdrEntry; + LdrpInsertMemoryTableEntry(NtLdrEntry); + + /* Let the world know */ + if (ShowSnaps) + { + DPRINT1("LDR: NEW PROCESS\n"); + DPRINT1(" Image Path: %wZ (%wZ)\n", &LdrpImageEntry->FullDllName, &LdrpImageEntry->BaseDllName); + DPRINT1(" Current Directory: %wZ\n", &CurrentDirectory); + DPRINT1(" Search Path: %wZ\n", &LdrpDefaultPath); + } + + /* Link the Init Order List */ + InsertHeadList(&Peb->Ldr->InInitializationOrderModuleList, + &LdrpNtDllDataTableEntry->InInitializationOrderModuleList); + + /* Set the current directory */ + Status = RtlSetCurrentDirectory_U(&CurrentDirectory); + if (!NT_SUCCESS(Status)) + { + /* We failed, check if we should free it */ + if (FreeCurDir) RtlFreeUnicodeString(&CurrentDirectory); + + /* Set it to the NT Root */ + CurrentDirectory = NtSystemRoot; + RtlSetCurrentDirectory_U(&CurrentDirectory); + } + else + { + /* We're done with it, free it */ + if (FreeCurDir) RtlFreeUnicodeString(&CurrentDirectory); + } + + /* Check if we should look for a .local file */ + if (ProcessParameters->Flags & RTL_USER_PROCESS_PARAMETERS_LOCAL_DLL_PATH) + { + /* FIXME */ + DPRINT1("We don't support .local overrides yet\n"); + } + + /* Check if the Application Verifier was enabled */ + if (Peb->NtGlobalFlag & FLG_POOL_ENABLE_TAIL_CHECK) + { + /* FIXME */ + DPRINT1("We don't support Application Verifier yet\n"); + } + + if (IsDotNetImage) + { + /* FIXME */ + DPRINT1("We don't support .NET applications yet\n"); + } + + /* FIXME: Load support for Terminal Services */ + if (NtHeader->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) + { + /* Load kernel32 and call BasePostImportInit... */ + DPRINT1("Unimplemented codepath!\n"); + } + + /* Walk the IAT and load all the DLLs */ + LdrpWalkImportDescriptor(LdrpDefaultPath.Buffer, LdrpImageEntry); + + /* Check if relocation is needed */ + if (Peb->ImageBaseAddress != (PVOID)NtHeader->OptionalHeader.ImageBase) + { + DPRINT("LDR: Performing relocations\n"); + Status = LdrPerformRelocations(NtHeader, Peb->ImageBaseAddress); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LdrPerformRelocations() failed\n"); + return STATUS_INVALID_IMAGE_FORMAT; + } + } + + /* Lock the DLLs */ + ListHead = &Peb->Ldr->InLoadOrderModuleList; + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) + { + NtLdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + NtLdrEntry->LoadCount = -1; + NextEntry = NextEntry->Flink; + } + + /* Phase 0 is done */ + LdrpLdrDatabaseIsSetup = TRUE; + + /* Initialize TLS */ + Status = LdrpInitializeTls(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LDR: LdrpProcessInitialization failed to initialize TLS slots; status %x\n", + Status); + return Status; + } + + /* FIXME Mark the DLL Ranges for Stack Traces later */ + + /* Notify the debugger now */ + if (Peb->BeingDebugged) + { + /* Break */ + DbgBreakPoint(); + + /* Update show snaps again */ + ShowSnaps = Peb->NtGlobalFlag & FLG_SHOW_LDR_SNAPS; + } + + /* Validate the Image for MP Usage */ + if (LdrpNumberOfProcessors > 1) LdrpValidateImageForMp(LdrpImageEntry); + + /* Check NX Options */ + if (SharedUserData->NXSupportPolicy == 1) + { + ExecuteOptions = 0xD; + } + else if (!SharedUserData->NXSupportPolicy) + { + ExecuteOptions = 0xA; + } + + /* Let Mm know */ + ZwSetInformationProcess(NtCurrentProcess(), + ProcessExecuteFlags, + &ExecuteOptions, + sizeof(ULONG)); + + /* Check if we had Shim Data */ + if (OldShimData) + { + /* Load the Shim Engine */ + Peb->AppCompatInfo = NULL; + //LdrpLoadShimEngine(OldShimData, ImagePathName, OldShimData); + DPRINT1("We do not support shims yet\n"); + } + else + { + /* Check for Application Compatibility Goo */ + //LdrQueryApplicationCompatibilityGoo(hKey); + DPRINT1("Querying app compat hacks is missing!\n"); + } + + /* + * FIXME: Check for special images, SecuROM, SafeDisc and other NX- + * incompatible images. + */ + + /* Now call the Init Routines */ + Status = LdrpRunInitializeRoutines(Context); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LDR: LdrpProcessInitialization failed running initialization routines; status %x\n", + Status); + return Status; + } + + /* FIXME: Unload the Shim Engine if it was loaded */ + + /* Check if we have a user-defined Post Process Routine */ + if (NT_SUCCESS(Status) && Peb->PostProcessInitRoutine) + { + DPRINT1("CP\n"); + /* Call it */ + Peb->PostProcessInitRoutine(); + } + + ///* Close the key if we have one opened */ + //if (hKey) NtClose(hKey); +DbgBreakPoint(); + /* Return status */ + return Status; +} + VOID NTAPI LdrpInitFailure(NTSTATUS Status) @@ -915,17 +1589,11 @@ /* Let other code know we're initializing */ LdrpInLdrInit = TRUE; - /* Initialize Critical Section Data */ - RtlpInitDeferedCriticalSection(); - - /* Initialize VEH Call lists */ - RtlpInitializeVectoredExceptionHandling(); - /* Protect with SEH */ _SEH2_TRY { /* Initialize the Process */ - LoaderStatus = LdrpInitializeProcess(Context, + LoaderStatus = LdrpInitializeProcess_(Context, SystemArgument1); /* Check for success and if MinimumStackCommit was requested */ Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrpe.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] Tue Mar 22 12:41:52 2011 @@ -29,6 +29,595 @@ OUT PBOOLEAN Existing); /* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +LdrpSnapIAT(IN PLDR_DATA_TABLE_ENTRY ExportLdrEntry, + IN PLDR_DATA_TABLE_ENTRY ImportLdrEntry, + IN PIMAGE_IMPORT_DESCRIPTOR IatEntry, + IN BOOLEAN EntriesValid) +{ + PIMAGE_EXPORT_DIRECTORY ExportDirectory; + ULONG ExportSize; + PVOID Iat; + SIZE_T ImportSize; + ULONG IatSize; + //PPEB Peb = NtCurrentPeb(); + NTSTATUS Status; + PIMAGE_THUNK_DATA Thunk, OriginalThunk, FirstThunk; + LPSTR ImportName; + ULONG ForwarderChain; + PIMAGE_NT_HEADERS NtHeader; + PIMAGE_SECTION_HEADER SectionHeader; + ULONG i, Rva; + ULONG OldProtect; + + /* Get export directory */ + ExportDirectory = RtlImageDirectoryEntryToData(ExportLdrEntry->DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportSize); + + /* Make sure it has one */ + if (!ExportDirectory) return STATUS_INVALID_IMAGE_FORMAT; + + /* Get the IAT */ + Iat = RtlImageDirectoryEntryToData(ImportLdrEntry->DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_IAT, + &IatSize); + ImportSize = IatSize; + + /* Check if we don't have one */ + if (!Iat) + { + /* Get the NT Header and the first section */ + NtHeader = RtlImageNtHeader(ImportLdrEntry->DllBase); + SectionHeader = IMAGE_FIRST_SECTION(NtHeader); + + /* Get the RVA of the import directory */ + Rva = NtHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress; + + /* Make sure we got one */ + if (Rva) + { + /* Loop all the sections */ + for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) + { + /* Check if we are inside this section */ + if ((Rva >= SectionHeader->VirtualAddress) && + (Rva < (SectionHeader->VirtualAddress + + SectionHeader->SizeOfRawData))) + { + /* We are, so set the IAT here */ + Iat = (PVOID)((ULONG_PTR)(ImportLdrEntry->DllBase) + + SectionHeader->VirtualAddress); + + /* Set the size */ + IatSize = SectionHeader->Misc.VirtualSize; + + /* Deal with Watcom and other retarded compilers */ + if (!IatSize) + { + IatSize = SectionHeader->SizeOfRawData; + } + + /* Found it, get out */ + break; + } + + /* No match, move to the next section */ + ++SectionHeader; + } + } + + /* If we still don't have an IAT, that's bad */ + if (!Iat) return STATUS_INVALID_IMAGE_FORMAT; + + /* Set the right size */ + ImportSize = IatSize; + } + + /* Unprotect the IAT */ + Status = NtProtectVirtualMemory(NtCurrentProcess(), + &Iat, + &ImportSize, + PAGE_READWRITE, + &OldProtect); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if the Thunks are already valid */ + if (EntriesValid) + { + /* We'll only do forwarders. Get the import name */ + ImportName = (LPSTR)((ULONG_PTR)ImportLdrEntry->DllBase + IatEntry->Name); + + /* Get the list of forwaders */ + ForwarderChain = IatEntry->ForwarderChain; + + /* Loop them */ + while (ForwarderChain != -1) + { + /* Get the cached thunk VA*/ + OriginalThunk = (PIMAGE_THUNK_DATA) + ((ULONG_PTR)ImportLdrEntry->DllBase + + IatEntry->OriginalFirstThunk + + (ForwarderChain * sizeof(IMAGE_THUNK_DATA))); + + /* Get the first thunk */ + FirstThunk = (PIMAGE_THUNK_DATA) + ((ULONG_PTR)ImportLdrEntry->DllBase + + IatEntry->FirstThunk + + (ForwarderChain * sizeof(IMAGE_THUNK_DATA))); + + /* Get the Forwarder from the thunk */ + ForwarderChain = (ULONG)FirstThunk->u1.Ordinal; + + /* Snap the thunk */ + Status = LdrpSnapThunk(ExportLdrEntry->DllBase, + ImportLdrEntry->DllBase, + OriginalThunk, + FirstThunk, + ExportDirectory, + ExportSize, + TRUE, + ImportName); + + /* Move to the next thunk */ + FirstThunk++; + + /* If we messed up, exit */ + if (!NT_SUCCESS(Status)) break; + } + } + else if (IatEntry->FirstThunk) + { + /* Full snapping. Get the First thunk */ + FirstThunk = (PIMAGE_THUNK_DATA) + ((ULONG_PTR)ImportLdrEntry->DllBase + + IatEntry->FirstThunk); + + /* Get the NT Header */ + NtHeader = RtlImageNtHeader(ImportLdrEntry->DllBase); + + /* Get the Original thunk VA, watch out for weird images */ + if ((IatEntry->Characteristics < NtHeader->OptionalHeader.SizeOfHeaders) || + (IatEntry->Characteristics >= NtHeader->OptionalHeader.SizeOfImage)) + { + /* Reuse it, this is a strange linked file */ + OriginalThunk = FirstThunk; + } + else + { + /* Get the address from the field and convert to VA */ + OriginalThunk = (PIMAGE_THUNK_DATA) + ((ULONG_PTR)ImportLdrEntry->DllBase + + IatEntry->OriginalFirstThunk); + } + + /* Get the Import name VA */ + ImportName = (LPSTR)((ULONG_PTR)ImportLdrEntry->DllBase + + IatEntry->Name); + + /* Loop while it's valid */ + while (OriginalThunk->u1.AddressOfData) + { + /* Snap the Thunk */ + Status = LdrpSnapThunk(ExportLdrEntry->DllBase, + ImportLdrEntry->DllBase, + OriginalThunk, + FirstThunk, + ExportDirectory, + ExportSize, + TRUE, + ImportName); + + /* Next thunks */ + OriginalThunk++; + Thunk++; + + /* If we failed the snap, break out */ + if (!NT_SUCCESS(Status)) break; + } + } + + /* Protect the IAT again */ + NtProtectVirtualMemory(NtCurrentProcess(), + &Iat, + &ImportSize, + OldProtect, + &OldProtect); + + /* Also flush out the cache */ + NtFlushInstructionCache(NtCurrentProcess(), Iat, IatSize); + + /* Return to Caller */ + return Status; +} + +NTSTATUS +NTAPI +LdrpHandleOneNewFormatImportDescriptor(IN LPWSTR DllPath OPTIONAL, + IN PLDR_DATA_TABLE_ENTRY LdrEntry, + IN PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundEntry, + IN PIMAGE_BOUND_IMPORT_DESCRIPTOR FirstEntry) +{ + LPSTR ImportName = NULL, BoundImportName, ForwarderName; + NTSTATUS Status; + BOOLEAN AlreadyLoaded = FALSE, Stale; + PIMAGE_IMPORT_DESCRIPTOR ImportEntry; + PLDR_DATA_TABLE_ENTRY DllLdrEntry, ForwarderLdrEntry; + PIMAGE_BOUND_FORWARDER_REF ForwarderEntry; + PPEB Peb = NtCurrentPeb(); + ULONG i, IatSize; + + /* Get the name's VA */ + BoundImportName = (LPSTR)(BoundEntry + BoundEntry->OffsetModuleName); + + /* Show debug mesage */ + if (ShowSnaps) + { + DPRINT1("LDR: %wZ bound to %s\n", &LdrEntry->BaseDllName, BoundImportName); + } + + /* Load the module for this entry */ + Status = LdrpLoadImportModule(DllPath, + BoundImportName, + LdrEntry->DllBase, + &DllLdrEntry, + &AlreadyLoaded); + if (!NT_SUCCESS(Status)) + { + /* Show debug message */ + if (ShowSnaps) + { + DPRINT1("LDR: %wZ failed to load import module %s; status = %x\n", + &LdrEntry->BaseDllName, + BoundImportName, + Status); + } + goto Quickie; + } + + /* Check if it wasn't already loaded */ + if (!AlreadyLoaded) + { + /* Add it to our list */ + InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, + &DllLdrEntry->InInitializationOrderModuleList); + } + + /* Check if the Bound Entry is now invalid */ + if ((BoundEntry->TimeDateStamp != DllLdrEntry->TimeDateStamp) || + (DllLdrEntry->Flags & LDRP_IMAGE_NOT_AT_BASE)) + { + /* Show debug message */ + if (ShowSnaps) + { + DPRINT1("LDR: %wZ has stale binding to %s\n", + &DllLdrEntry->BaseDllName, + BoundImportName); + } + + /* Remember it's become stale */ + Stale = TRUE; + } + else + { + /* Show debug message */ + if (ShowSnaps) + { + DPRINT1("LDR: %wZ has correct binding to %s\n", + &DllLdrEntry->BaseDllName, + BoundImportName); + } + + /* Remember it's valid */ + Stale = FALSE; + } + + /* Get the forwarders */ + ForwarderEntry = (PIMAGE_BOUND_FORWARDER_REF)(BoundEntry + 1); + + /* Loop them */ + for (i = 0; i < BoundEntry->NumberOfModuleForwarderRefs; i++) + { + /* Get the name */ + ForwarderName = (LPSTR)(FirstEntry + ForwarderEntry->OffsetModuleName); + + /* Show debug message */ + if (ShowSnaps) + { + DPRINT1("LDR: %wZ bound to %s via forwarder(s) from %wZ\n", + &LdrEntry->BaseDllName, + ForwarderName, + &DllLdrEntry->BaseDllName); + } + + /* Load the module */ + Status = LdrpLoadImportModule(DllPath, + ForwarderName, + LdrEntry->DllBase, + &ForwarderLdrEntry, + &AlreadyLoaded); + if (NT_SUCCESS(Status)) + { + /* Loaded it, was it already loaded? */ + if (!AlreadyLoaded) + { + /* Add it to our list */ + InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, + &ForwarderLdrEntry->InInitializationOrderModuleList); + } + } + + /* Check if the Bound Entry is now invalid */ + if (!(NT_SUCCESS(Status)) || + (ForwarderEntry->TimeDateStamp != ForwarderLdrEntry->TimeDateStamp) || + (ForwarderLdrEntry->Flags & LDRP_IMAGE_NOT_AT_BASE)) + { + /* Show debug message */ + if (ShowSnaps) + { + DPRINT1("LDR: %wZ has stale binding to %s\n", + &ForwarderLdrEntry->BaseDllName, + ForwarderName); + } + + /* Remember it's become stale */ + Stale = TRUE; + } + else + { + /* Show debug message */ + if (ShowSnaps) + { + DPRINT1("LDR: %wZ has correct binding to %s\n", + &ForwarderLdrEntry->BaseDllName, + ForwarderName); + } + + /* Remember it's valid */ + Stale = FALSE; + } + + /* Move to the next one */ + ForwarderEntry++; + } + + /* Set the next bound entry to the forwarder */ + FirstEntry = (PIMAGE_BOUND_IMPORT_DESCRIPTOR)ForwarderEntry; + + /* Check if the binding was stale */ + if (Stale) + { + /* It was, so find the IAT entry for it */ + ImportEntry = RtlImageDirectoryEntryToData(LdrEntry->DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, + &IatSize); + + /* Make sure it has a name */ + while (ImportEntry->Name) + { + /* Get the name */ + ImportName = (LPSTR)((ULONG_PTR)LdrEntry->DllBase + ImportEntry->Name); + + /* Compare it */ + if (!_stricmp(ImportName, BoundImportName)) break; + + /* Move to next entry */ + ImportEntry += 1; + } + + /* If we didn't find a name, fail */ + if (!ImportEntry->Name) + { + /* Show debug message */ + if (ShowSnaps) + { + DPRINT1("LDR: LdrpWalkImportTable - failing with" + "STATUS_OBJECT_NAME_INVALID due to no import descriptor name\n"); + } + + /* Return error */ + Status = STATUS_OBJECT_NAME_INVALID; + goto Quickie; + } + + /* Show debug message */ + if (ShowSnaps) + { + DPRINT1("LDR: Stale Bind %s from %wZ\n", + ImportName, + &LdrEntry->BaseDllName); + } + + /* Snap the IAT Entry*/ + Status = LdrpSnapIAT(DllLdrEntry, + LdrEntry, + ImportEntry, + FALSE); + + /* Make sure we didn't fail */ + if (!NT_SUCCESS(Status)) + { + /* Show debug message */ + if (ShowSnaps) + { + DPRINT1("LDR: %wZ failed to load import module %s; status = %x\n", + &LdrEntry->BaseDllName, + BoundImportName, + Status); + } + + /* Return */ + goto Quickie; + } + } + + /* All done */ + Status = STATUS_SUCCESS; + +Quickie: + /* Write where we are now and return */ + *BoundEntry = *FirstEntry; + return Status; +} + +NTSTATUS +NTAPI +LdrpHandleNewFormatImportDescriptors(IN LPWSTR DllPath OPTIONAL, + IN PLDR_DATA_TABLE_ENTRY LdrEntry, + IN PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundEntry) +{ + PIMAGE_BOUND_IMPORT_DESCRIPTOR FirstEntry = BoundEntry; + NTSTATUS Status; + + /* Make sure we have a name */ + while (BoundEntry->OffsetModuleName) + { + /* Parse this descriptor */ + Status = LdrpHandleOneNewFormatImportDescriptor(DllPath, + LdrEntry, + BoundEntry, + FirstEntry); + if (!NT_SUCCESS(Status)) return Status; + } + + /* Done */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +LdrpHandleOneOldFormatImportDescriptor(IN LPWSTR DllPath OPTIONAL, + IN PLDR_DATA_TABLE_ENTRY LdrEntry, + IN PIMAGE_IMPORT_DESCRIPTOR ImportEntry) +{ + //ULONG IatSize, i; + LPSTR ImportName; + NTSTATUS Status; + BOOLEAN AlreadyLoaded = FALSE, StaticEntriesValid = FALSE, SkipSnap = TRUE; + PLDR_DATA_TABLE_ENTRY DllLdrEntry; + PIMAGE_THUNK_DATA FirstThunk; + PPEB Peb = NtCurrentPeb(); + + /* Get the import name's VA */ + ImportName = (LPSTR)((ULONG_PTR)LdrEntry->DllBase + ImportEntry->Name); + + /* Get the first thunk */ + FirstThunk = (PIMAGE_THUNK_DATA)((ULONG_PTR)LdrEntry->DllBase + + ImportEntry->FirstThunk); + + /* Make sure it's valid */ + if (!FirstThunk->u1.Function) goto SkipEntry; + + /* Show debug message */ + if (ShowSnaps) + { + DPRINT1("LDR: %s used by %wZ\n", + ImportName, + &LdrEntry->BaseDllName); + } + + /* Load the module associated to it */ + Status = LdrpLoadImportModule(DllPath, + ImportName, + LdrEntry->DllBase, + &DllLdrEntry, + &AlreadyLoaded); + if (!NT_SUCCESS(Status)) return Status; + + /* Show debug message */ + if (ShowSnaps) + { + DPRINT1("LDR: Snapping imports for %wZ from %s\n", + &LdrEntry->BaseDllName, + ImportName); + } + + /* Check if the image was bound when compiled */ + if (ImportEntry->OriginalFirstThunk) + { + /* It was, so check if the static IAT entries are still valid */ + if ((ImportEntry->TimeDateStamp) && + (ImportEntry->TimeDateStamp == DllLdrEntry->TimeDateStamp) && + (!(DllLdrEntry->Flags & LDRP_IMAGE_NOT_AT_BASE))) + { + /* Show debug message */ + if (ShowSnaps) + { + DPRINT1("LDR: Snap bypass %s from %wZ\n", + ImportName, + &LdrEntry->BaseDllName); + } + + /* + * They are still valid, so we can skip snapping them. + * Additionally, if we have no forwarders, we are totally + * done. + */ + if (ImportEntry->ForwarderChain == -1) + { + /* Totally skip LdrpSnapIAT */ + SkipSnap = TRUE; + } + else + { + /* Set this so LdrpSnapIAT will only do forwarders */ + StaticEntriesValid = TRUE; + } + } + } + + /* Check if it wasn't already loaded */ + if (!AlreadyLoaded) + { + /* Add the DLL to our list */ + InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, + &DllLdrEntry->InInitializationOrderModuleList); + } + + /* Check if we should snap at all */ + if (!SkipSnap) + { + /* Now snap the IAT Entry */ + Status = LdrpSnapIAT(DllLdrEntry, + LdrEntry, + ImportEntry, + StaticEntriesValid); + if (!NT_SUCCESS(Status)) return Status; + } + +SkipEntry: + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +LdrpHandleOldFormatImportDescriptors(IN LPWSTR DllPath OPTIONAL, + IN PLDR_DATA_TABLE_ENTRY LdrEntry, + IN PIMAGE_IMPORT_DESCRIPTOR ImportEntry) +{ + NTSTATUS Status; + + /* Check for Name and Thunk */ + while (ImportEntry->Name && ImportEntry->FirstThunk) + { + /* Parse this descriptor */ + Status = LdrpHandleOneOldFormatImportDescriptor(DllPath, + LdrEntry, + ImportEntry); + if (!NT_SUCCESS(Status)) return Status; + + /* Move to the next entry */ + ImportEntry++; + } + + /* Done */ + return STATUS_SUCCESS; +} USHORT NTAPI LdrpNameToOrdinal(LPSTR ImportName, @@ -41,6 +630,169 @@ return 0; } +NTSTATUS +NTAPI +LdrpWalkImportDescriptor(IN LPWSTR DllPath OPTIONAL, + IN PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED ActCtx; + PPEB Peb = NtCurrentPeb(); + NTSTATUS Status = STATUS_SUCCESS; + PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundEntry = NULL; + PIMAGE_IMPORT_DESCRIPTOR ImportEntry; + ULONG BoundSize, IatSize; +DPRINT1("LdrpWalkImportDescriptor('%S' %x)\n", DllPath, LdrEntry); + /* Set up the Act Ctx */ + ActCtx.Size = sizeof(ActCtx); + ActCtx.Frame.Flags = ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID; + RtlZeroMemory(&ActCtx, sizeof(ActCtx)); + + /* Check if we have a manifest prober routine */ + if (LdrpManifestProberRoutine) + { + DPRINT1("We don't support manifests yet, much less prober routines\n"); + } + + /* Check if we failed above */ + if (!NT_SUCCESS(Status)) return Status; + + /* Get the Active ActCtx */ + Status = RtlGetActiveActivationContext(&LdrEntry->EntryPointActivationContext); + if (!NT_SUCCESS(Status)) return Status; + + /* Activate the ActCtx */ + RtlActivateActivationContextUnsafeFast(&ActCtx, + LdrEntry->EntryPointActivationContext); + + /* Check if we were directed */ + if (!(LdrEntry->Flags & LDRP_REDIRECTED)) + { + /* Get the Bound IAT */ + BoundEntry = RtlImageDirectoryEntryToData(LdrEntry->DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT, + &BoundSize); + } + + /* Get the regular IAT, for fallback */ + ImportEntry = RtlImageDirectoryEntryToData(LdrEntry->DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, + &IatSize); + + /* Check if we got at least one */ + if (BoundEntry || ImportEntry) + { + /* Do we have a Bound IAT */ + if (BoundEntry) + { + /* Handle the descriptor */ + Status = LdrpHandleNewFormatImportDescriptors(DllPath, + LdrEntry, + BoundEntry); + } + else + { + /* Handle the descriptor */ + Status = LdrpHandleOldFormatImportDescriptors(DllPath, + LdrEntry, + ImportEntry); + } + + /* Check the status of the handlers */ + if (NT_SUCCESS(Status)) + { + /* Check for Per-DLL Heap Tagging */ + if (Peb->NtGlobalFlag & FLG_HEAP_ENABLE_TAG_BY_DLL) + { + /* FIXME */ + DPRINT1("We don't support Per-DLL Heap Tagging yet!\n"); + } + + /* Check if Page Heap was enabled */ + if (Peb->NtGlobalFlag & FLG_HEAP_PAGE_ALLOCS) + { + /* FIXME */ + DPRINT1("We don't support Page Heaps yet!\n"); + } + + /* Check if Application Verifier was enabled */ + if (Peb->NtGlobalFlag & FLG_HEAP_ENABLE_TAIL_CHECK) + { + /* FIXME */ + DPRINT1("We don't support Application Verifier yet!\n"); + } + + /* Just to be safe */ + Status = STATUS_SUCCESS; + } + } + + /* Release the activation context */ + RtlDeactivateActivationContextUnsafeFast(&ActCtx); + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +LdrpLoadImportModule(IN PWSTR DllPath OPTIONAL, + IN LPSTR ImportName, + IN PVOID DllBase, + OUT PLDR_DATA_TABLE_ENTRY *DataTableEntry, + OUT PBOOLEAN Existing) +{ + ANSI_STRING AnsiString; + PUNICODE_STRING ImpDescName; + NTSTATUS Status; + PPEB Peb = RtlGetCurrentPeb(); + PTEB Teb = NtCurrentTeb(); +DPRINT1("LdrpLoadImportModule('%S' '%s' %p %p %p)\n", DllPath, ImportName, DllBase, DataTableEntry, Existing); + /* Convert import descriptor name to unicode string */ + ImpDescName = &Teb->StaticUnicodeString; + RtlInitAnsiString(&AnsiString, ImportName); + Status = RtlAnsiStringToUnicodeString(ImpDescName, &AnsiString, FALSE); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if it's loaded */ + if (LdrpCheckForLoadedDll(DllPath, + ImpDescName, + TRUE, + FALSE, + DataTableEntry)) + { + /* It's already existing in the list */ + *Existing = TRUE; + return STATUS_SUCCESS; + } + + /* We're loading it for the first time */ + *Existing = FALSE; + + /* Map it */ + Status = LdrpMapDll(DllPath, + ImpDescName->Buffer, + NULL, + NULL, + TRUE, + FALSE, + DataTableEntry); + + if (!NT_SUCCESS(Status)) return Status; + + /* Walk its import descriptor table */ + Status = LdrpWalkImportDescriptor(DllPath, + *DataTableEntry); + if (!NT_SUCCESS(Status)) + { + /* Add it to the in-init-order list in case of failure */ + InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, + &(*DataTableEntry)->InInitializationOrderModuleList); + } + + return Status; +} NTSTATUS NTAPI Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Tue Mar 22 12:41:52 2011 @@ -16,7 +16,6 @@ /* GLOBALS *******************************************************************/ PLDR_DATA_TABLE_ENTRY LdrpLoadedDllHandleCache; -LIST_ENTRY LdrpHashTable[LDR_HASH_TABLE_ENTRIES]; #define LDR_GET_HASH_ENTRY(x) (RtlUpcaseUnicodeChar((x)) & (LDR_HASH_TABLE_ENTRIES - 1)) @@ -217,7 +216,261 @@ IN BOOLEAN RedirectedDll, OUT PLDR_DATA_TABLE_ENTRY *LdrEntry) { - UNIMPLEMENTED; + ULONG HashIndex; + PLIST_ENTRY ListHead, ListEntry; + PLDR_DATA_TABLE_ENTRY CurEntry; + BOOLEAN FullPath = FALSE; + PWCHAR wc; + WCHAR NameBuf[266]; + UNICODE_STRING FullDllName, NtPathName; + ULONG Length; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + HANDLE FileHandle, SectionHandle; + IO_STATUS_BLOCK Iosb; + PVOID ViewBase = NULL; + SIZE_T ViewSize = 0; + PIMAGE_NT_HEADERS NtHeader, NtHeader2; +DPRINT1("LdrpCheckForLoadedDll('%S' '%wZ' %d %d %p)\n", DllPath, DllName, Flag, RedirectedDll, LdrEntry); + /* Check if a dll name was provided */ + if (!DllName->Buffer || !DllName->Buffer[0]) return FALSE; + + /* Look in the hash table if flag was set */ +lookinhash: + if (Flag) + { + /* Get hash index */ + HashIndex = LDR_GET_HASH_ENTRY(DllName->Buffer[0]); + + /* Traverse that list */ + ListHead = &LdrpHashTable[HashIndex]; + ListEntry = ListHead->Flink; + while (ListEntry != ListHead) + { + /* Get the current entry */ + CurEntry = CONTAINING_RECORD(ListEntry, LDR_DATA_TABLE_ENTRY, HashLinks); + + /* Check base name of that module */ + if (RtlEqualUnicodeString(DllName, &CurEntry->BaseDllName, TRUE)) + { + /* It matches, return it */ + *LdrEntry = CurEntry; + return TRUE; + } + + /* Advance to the next entry */ + ListEntry = ListEntry->Flink; + } + + /* Module was not found, return failure */ + return FALSE; + } + + /* Check if there is a full path in this DLL */ + wc = DllName->Buffer; + while (*wc) + { + /* Check for a slash in the current position*/ + if (*wc == L'\\' || *wc == L'/') + { + /* Found the slash, so dll name contains path */ + FullPath = TRUE; + + /* Setup full dll name string */ + FullDllName.Buffer = NameBuf; + + Length = RtlDosSearchPath_U(DllPath ? DllPath : LdrpDefaultPath.Buffer, + DllName->Buffer, + NULL, + sizeof(NameBuf) - sizeof(UNICODE_NULL), + FullDllName.Buffer, + NULL); + + /* Check if that was successful */ + if (!Length || Length > sizeof(NameBuf) - sizeof(UNICODE_NULL)) + { + if (ShowSnaps) + { + DPRINT1("LDR: LdrpCheckForLoadedDll - Unable To Locate %ws: 0x%08x\n", + DllName->Buffer, Length); + } + + /* Return failure */ + return FALSE; + } + + /* Full dll name is found */ + FullDllName.Length = Length; + FullDllName.MaximumLength = FullDllName.Length + sizeof(UNICODE_NULL); + break; + } + + wc++; + } + + /* Go check the hash table */ + if (!FullPath) + { + Flag = TRUE; + goto lookinhash; + } + + /* Now go through the InLoadOrder module list */ + ListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; + ListEntry = ListHead->Flink; + + while (ListEntry != ListHead) + { + /* Get the containing record of the current entry and advance to the next one */ + CurEntry = CONTAINING_RECORD(ListEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + ListEntry = ListEntry->Flink; + + /* Check if it's already being unloaded */ + if (!CurEntry->InMemoryOrderModuleList.Flink) continue; + + /* Check if name matches */ + if (RtlEqualUnicodeString(&FullDllName, + &CurEntry->FullDllName, + TRUE)) + { + /* Found it */ + *LdrEntry = CurEntry; + + /* Find activation context */ + Status = RtlFindActivationContextSectionString(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, DllName, NULL); + if (!NT_SUCCESS(Status)) + return FALSE; + else + return TRUE; + } + } + + /* The DLL was not found in the load order modules list. Perform a complex check */ + + /* Convert given path to NT path */ + if (!RtlDosPathNameToNtPathName_U(FullDllName.Buffer, + &NtPathName, + NULL, + NULL)) + { + /* Fail if conversion failed */ + return FALSE; + } + + /* Initialize object attributes and open it */ + InitializeObjectAttributes(&ObjectAttributes, + &NtPathName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + SYNCHRONIZE | FILE_EXECUTE, + &ObjectAttributes, + &Iosb, + FILE_SHARE_READ | FILE_SHARE_DELETE, + FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); + + /* Free NT path name */ + RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathName.Buffer); + + /* If opening the file failed - return failure */ + if (!NT_SUCCESS(Status)) return FALSE; + + /* Create a section for this file */ + Status = NtCreateSection(&SectionHandle, + SECTION_MAP_READ | SECTION_MAP_EXECUTE | SECTION_MAP_WRITE, + NULL, + NULL, + PAGE_EXECUTE, + SEC_COMMIT, + FileHandle); + + /* Close file handle */ + NtClose(FileHandle); + + /* If creating section failed - return failure */ + if (!NT_SUCCESS(Status)) return FALSE; + + /* Map view of this section */ + Status = ZwMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &ViewBase, + 0, + 0, + NULL, + &ViewSize, + ViewShare, + 0, + PAGE_EXECUTE); + /* Close section handle */ + NtClose(SectionHandle); + + /* If section mapping failed - return failure */ + if (!NT_SUCCESS(Status)) return FALSE; + + /* Get pointer to the NT header of this section */ + NtHeader = RtlImageNtHeader(ViewBase); + if (!NtHeader) + { + /* Unmap the section and fail */ + NtUnmapViewOfSection(NtCurrentProcess(), ViewBase); + return FALSE; + } + + /* Go through the list of modules */ + ListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; + ListEntry = ListHead->Flink; + + while (ListEntry != ListHead) + { + CurEntry = CONTAINING_RECORD(ListEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + ListEntry = ListEntry->Flink; + + /* Check if it's already being unloaded */ + if (!CurEntry->InMemoryOrderModuleList.Flink) continue; + + _SEH2_TRY + { + /* Check if timedate stamp and sizes match */ + if (CurEntry->TimeDateStamp == NtHeader->FileHeader.TimeDateStamp && + CurEntry->SizeOfImage == NtHeader->OptionalHeader.SizeOfImage) + { + /* Time, date and size match. Let's compare their headers */ + NtHeader2 = RtlImageNtHeader(CurEntry->DllBase); + + if (RtlCompareMemory(NtHeader2, NtHeader, sizeof(IMAGE_NT_HEADERS))) + { + /* Headers match too! Finally ask the kernel to compare mapped files */ + Status = ZwAreMappedFilesTheSame(CurEntry->DllBase, ViewBase); + + if (!NT_SUCCESS(Status)) + { + _SEH2_YIELD(continue;) + } + else + { + /* This is our entry! */ + *LdrEntry = CurEntry; + + /* Unmap the section */ + NtUnmapViewOfSection(NtCurrentProcess(), ViewBase); + + _SEH2_YIELD(return TRUE;) + } + } + } + } + _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(break;) + } + _SEH2_END; + } + + /* Unmap the section */ + NtUnmapViewOfSection(NtCurrentProcess(), ViewBase); + return FALSE; } Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Tue Mar 22 12:41:52 2011 @@ -17,13 +17,15 @@ VOID RtlInitializeHeapManager(VOID); VOID LdrpInitLoader(VOID); extern PTEB LdrpTopLevelDllBeingLoadedTeb; +VOID NTAPI RtlpInitDeferedCriticalSection(VOID); +VOID RtlpInitializeVectoredExceptionHandling(VOID); /* GLOBALS *******************************************************************/ extern PLDR_DATA_TABLE_ENTRY LdrpImageEntry; -static RTL_CRITICAL_SECTION PebLock; -static RTL_BITMAP TlsBitMap; -static RTL_BITMAP TlsExpansionBitMap; +extern RTL_CRITICAL_SECTION FastPebLock; +extern RTL_BITMAP TlsBitMap; +extern RTL_BITMAP TlsExpansionBitMap; #define VALUE_BUFFER_SIZE 256 @@ -309,7 +311,7 @@ NTSTATUS NTAPI -LdrpInitializeProcess(PCONTEXT Context, +LdrpInitializeProcess_(PCONTEXT Context, PVOID SystemArgument1) { PIMAGE_NT_HEADERS NTHeaders; @@ -372,6 +374,9 @@ Peb->NumberOfProcessors = SystemInformation.NumberOfProcessors; + /* Initialize Critical Section Data */ + RtlpInitDeferedCriticalSection(); + /* Load execution options */ LoadImageFileExecutionOptions(Peb); @@ -430,9 +435,12 @@ ZwTerminateProcess(NtCurrentProcess(), STATUS_IMAGE_MACHINE_TYPE_MISMATCH_EXE); } + /* initialized vectored exception handling */ + RtlpInitializeVectoredExceptionHandling(); + /* initalize peb lock support */ - RtlInitializeCriticalSection(&PebLock); - Peb->FastPebLock = &PebLock; + RtlInitializeCriticalSection(&FastPebLock); + Peb->FastPebLock = &FastPebLock; /* initialize tls bitmaps */ RtlInitializeBitMap(&TlsBitMap, Peb->TlsBitmapBits, TLS_MINIMUM_AVAILABLE); Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Tue Mar 22 12:41:52 2011 @@ -32,8 +32,8 @@ #endif static BOOLEAN LdrpDllShutdownInProgress = FALSE; -static HANDLE LdrpKnownDllsDirHandle = NULL; -static UNICODE_STRING LdrpKnownDllPath = {0, 0, NULL}; +extern HANDLE LdrpKnownDllObjectDirectory; +extern UNICODE_STRING LdrpKnownDllPath; static PLDR_DATA_TABLE_ENTRY LdrpLastModule = NULL; extern PLDR_DATA_TABLE_ENTRY LdrpImageEntry; @@ -231,13 +231,13 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenDirectoryObject(&LdrpKnownDllsDirHandle, + Status = NtOpenDirectoryObject(&LdrpKnownDllObjectDirectory, DIRECTORY_QUERY | DIRECTORY_TRAVERSE, &ObjectAttributes); if (!NT_SUCCESS(Status)) { DPRINT("NtOpenDirectoryObject() failed (Status %lx)\n", Status); - LdrpKnownDllsDirHandle = NULL; + LdrpKnownDllObjectDirectory = NULL; return; } @@ -249,8 +249,8 @@ MAX_PATH * sizeof(WCHAR)); if (LinkTarget.Buffer == NULL) { - NtClose(LdrpKnownDllsDirHandle); - LdrpKnownDllsDirHandle = NULL; + NtClose(LdrpKnownDllObjectDirectory); + LdrpKnownDllObjectDirectory = NULL; return; } @@ -259,7 +259,7 @@ InitializeObjectAttributes(&ObjectAttributes, &Name, OBJ_CASE_INSENSITIVE, - LdrpKnownDllsDirHandle, + LdrpKnownDllObjectDirectory, NULL); Status = NtOpenSymbolicLinkObject(&LinkHandle, SYMBOLIC_LINK_ALL_ACCESS, @@ -267,8 +267,8 @@ if (!NT_SUCCESS(Status)) { RtlFreeUnicodeString(&LinkTarget); - NtClose(LdrpKnownDllsDirHandle); - LdrpKnownDllsDirHandle = NULL; + NtClose(LdrpKnownDllObjectDirectory); + LdrpKnownDllObjectDirectory = NULL; return; } @@ -279,8 +279,8 @@ if (!NT_SUCCESS(Status)) { RtlFreeUnicodeString(&LinkTarget); - NtClose(LdrpKnownDllsDirHandle); - LdrpKnownDllsDirHandle = NULL; + NtClose(LdrpKnownDllObjectDirectory); + LdrpKnownDllObjectDirectory = NULL; } RtlCreateUnicodeString(&LdrpKnownDllPath, @@ -431,7 +431,7 @@ DPRINT("LdrpMapKnownDll() called\n"); - if (LdrpKnownDllsDirHandle == NULL) + if (LdrpKnownDllObjectDirectory == NULL) { DPRINT("Invalid 'KnownDlls' directory\n"); return STATUS_UNSUCCESSFUL; @@ -442,7 +442,7 @@ InitializeObjectAttributes(&ObjectAttributes, DllName, OBJ_CASE_INSENSITIVE, - LdrpKnownDllsDirHandle, + LdrpKnownDllObjectDirectory, NULL); Status = NtOpenSection(SectionHandle, SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE, @@ -1189,7 +1189,7 @@ * NOTE * */ -static NTSTATUS +NTSTATUS LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders, PVOID ImageBase) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs