Ros-diffs March 2011

ros-diffs@reactos.org

21 participants
276 discussions

[cfinck] 51066: Hackfix for Far 1.65. Although the file manager didn't become fully usable with this patch, it works better than without and the patch doesn't seem to have negative side effects. Se...
by cfinck＠svn.reactos.org 16 Mar '11

16 Mar '11

Author: cfinck Date: Wed Mar 16 15:09:31 2011 New Revision: 51066 URL: http://svn.reactos.org/svn/reactos?rev=51066&view=rev Log: Hackfix for Far 1.65. Although the file manager didn't become fully usable with this patch, it works better than without and the patch doesn't seem to have negative side effects. See issue #5503 for more details. Modified: branches/ros-branch-0_3_13/reactos/include/reactos/subsys/csrss/csrss.h Modified: branches/ros-branch-0_3_13/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/inclu… ============================================================================== --- branches/ros-branch-0_3_13/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_13/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Wed Mar 16 15:09:31 2011 @@ -22,7 +22,7 @@ #define MAKE_CSR_API(Number, Server) \ ((Server) << 16) + Number -#define CSR_CSRSS_SECTION_SIZE (65536) +#define CSR_CSRSS_SECTION_SIZE (131072) //(65536) typedef VOID (CALLBACK *PCONTROLDISPATCHER)(DWORD);

1 0

[fireball] 51065: [NTDLL/LDR] - Rewrite LdrQueryProcessModuleInformation. - Start committing PE loader related code (quite a lot of it, and still not all parts yet), unused right now so won't break...
by fireball＠svn.reactos.org 16 Mar '11

16 Mar '11

Author: fireball Date: Wed Mar 16 14:22:15 2011 New Revision: 51065 URL: http://svn.reactos.org/svn/reactos?rev=51065&view=rev Log: [NTDLL/LDR] - Rewrite LdrQueryProcessModuleInformation. - Start committing PE loader related code (quite a lot of it, and still not all parts yet), unused right now so won't break anything. Added: trunk/reactos/dll/ntdll/ldr/ldrpe.c (with props) Modified: trunk/reactos/dll/ntdll/include/ntdllp.h trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/dll/ntdll/ldr/ldrinit.c trunk/reactos/dll/ntdll/ldr/ldrutils.c trunk/reactos/dll/ntdll/ldr/utils.c trunk/reactos/dll/ntdll/ntdll.rbuild 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] Wed Mar 16 14:22:15 2011 @@ -23,14 +23,42 @@ /* Global data */ extern RTL_CRITICAL_SECTION LdrpLoaderLock; +extern BOOLEAN LdrpInLdrInit; /* ldrinit.c */ +NTSTATUS NTAPI LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL); NTSTATUS NTAPI LdrpInitializeTls(VOID); NTSTATUS NTAPI LdrpAllocateTls(VOID); VOID NTAPI LdrpFreeTls(VOID); VOID NTAPI LdrpTlsCallback(PVOID BaseAddress, ULONG Reason); BOOLEAN NTAPI LdrpCallDllEntry(PDLLMAIN_FUNC EntryPoint, PVOID BaseAddress, ULONG Reason, PVOID Context); +/* ldrpe.c */ +NTSTATUS +NTAPI +LdrpSnapThunk(IN PVOID ExportBase, + IN PVOID ImportBase, + IN PIMAGE_THUNK_DATA OriginalThunk, + IN OUT PIMAGE_THUNK_DATA Thunk, + IN PIMAGE_EXPORT_DIRECTORY ExportEntry, + IN ULONG ExportSize, + IN BOOLEAN Static, + IN LPSTR DllName); + +/* ldrutils.c */ +NTSTATUS NTAPI +LdrpGetProcedureAddress(IN PVOID BaseAddress, + IN PANSI_STRING Name, + IN ULONG Ordinal, + OUT PVOID *ProcedureAddress, + IN BOOLEAN ExecuteInit); +NTSTATUS NTAPI +LdrpLoadDll(IN BOOLEAN Redirected, + IN PWSTR DllPath OPTIONAL, + IN PULONG DllCharacteristics OPTIONAL, + IN PUNICODE_STRING DllName, + OUT PVOID *BaseAddress, + IN BOOLEAN CallInit); /* FIXME: Cleanup this mess */ typedef NTSTATUS (NTAPI *PEPFUNC)(PPEB); Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Wed Mar 16 14:22:15 2011 @@ -109,8 +109,7 @@ { LONG OldCount; NTSTATUS Status = STATUS_SUCCESS; - BOOLEAN InInit = FALSE; // FIXME - //BOOLEAN InInit = LdrpInLdrInit; + BOOLEAN InInit = LdrpInLdrInit; DPRINT("LdrLockLoaderLock(%x %p %p)\n", Flags, Result, Cookie); @@ -378,4 +377,157 @@ return !Result ? STATUS_IMAGE_CHECKSUM_MISMATCH : Status; } +/* + * @implemented + */ +NTSTATUS +NTAPI +LdrGetProcedureAddress_(IN PVOID BaseAddress, + IN PANSI_STRING Name, + IN ULONG Ordinal, + OUT PVOID *ProcedureAddress) +{ + /* Call the internal routine and tell it to execute DllInit */ + return LdrpGetProcedureAddress(BaseAddress, Name, Ordinal, ProcedureAddress, TRUE); +} + + +NTSTATUS +NTAPI +LdrQueryProcessModuleInformationEx(IN ULONG ProcessId, + IN ULONG Reserved, + IN PRTL_PROCESS_MODULES ModuleInformation, + IN ULONG Size, + OUT PULONG ReturnedSize OPTIONAL) +{ + PLIST_ENTRY ModuleListHead, InitListHead; + PLIST_ENTRY Entry, InitEntry; + PLDR_DATA_TABLE_ENTRY Module, InitModule; + PRTL_PROCESS_MODULE_INFORMATION ModulePtr = NULL; + NTSTATUS Status = STATUS_SUCCESS; + ULONG UsedSize = sizeof(ULONG); + ANSI_STRING AnsiString; + PCHAR p; + + DPRINT("LdrQueryProcessModuleInformation() called\n"); + + /* Acquire loader lock */ + RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock); + + /* Check if we were given enough space */ + if (Size < UsedSize) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + else + { + ModuleInformation->NumberOfModules = 0; + ModulePtr = &ModuleInformation->Modules[0]; + Status = STATUS_SUCCESS; + } + + /* Traverse the list of modules */ + _SEH2_TRY + { + ModuleListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; + Entry = ModuleListHead->Flink; + + while (Entry != ModuleListHead) + { + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + + DPRINT(" Module %wZ\n", &Module->FullDllName); + + /* Increase the used size */ + UsedSize += sizeof(RTL_PROCESS_MODULE_INFORMATION); + + if (UsedSize > Size) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + else + { + ModulePtr->ImageBase = Module->DllBase; + ModulePtr->ImageSize = Module->SizeOfImage; + ModulePtr->Flags = Module->Flags; + ModulePtr->LoadCount = Module->LoadCount; + ModulePtr->MappedBase = NULL; + ModulePtr->InitOrderIndex = 0; + ModulePtr->LoadOrderIndex = ModuleInformation->NumberOfModules; + + /* Now get init order index by traversing init list */ + InitListHead = &NtCurrentPeb()->Ldr->InInitializationOrderModuleList; + InitEntry = InitListHead->Flink; + + while (InitEntry != InitListHead) + { + InitModule = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + + /* Increase the index */ + ModulePtr->InitOrderIndex++; + + /* Quit the loop if our module is found */ + if (InitModule == Module) break; + + /* Advance to the next entry */ + InitEntry = InitEntry->Flink; + } + + /* Prepare ANSI string with the module's name */ + AnsiString.Length = 0; + AnsiString.MaximumLength = sizeof(ModulePtr->FullPathName); + AnsiString.Buffer = ModulePtr->FullPathName; + RtlUnicodeStringToAnsiString(&AnsiString, + &Module->FullDllName, + FALSE); + + /* Calculate OffsetToFileName field */ + p = strrchr(ModulePtr->FullPathName, '\\'); + if (p != NULL) + ModulePtr->OffsetToFileName = p - ModulePtr->FullPathName + 1; + else + ModulePtr->OffsetToFileName = 0; + + /* Advance to the next module in the output list */ + ModulePtr++; + + /* Increase number of modules */ + if (ModuleInformation) + ModuleInformation->NumberOfModules++; + } + + /* Go to the next entry in the modules list */ + Entry = Entry->Flink; + } + + /* Set returned size if it was provided */ + if (ReturnedSize) + *ReturnedSize = UsedSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Ignoring the exception */ + } _SEH2_END; + + /* Release the lock */ + RtlLeaveCriticalSection(NtCurrentPeb()->LoaderLock); + + DPRINT("LdrQueryProcessModuleInformation() done\n"); + + return Status; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +LdrQueryProcessModuleInformation(IN PRTL_PROCESS_MODULES ModuleInformation, + IN ULONG Size, + OUT PULONG ReturnedSize OPTIONAL) +{ + /* Call Ex version of the API */ + return LdrQueryProcessModuleInformationEx(0, 0, ModuleInformation, Size, ReturnedSize); +} + /* EOF */ 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] Wed Mar 16 14:22:15 2011 @@ -19,6 +19,10 @@ 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""); + +BOOLEAN LdrpInLdrInit; + +PLDR_DATA_TABLE_ENTRY LdrpImageEntry; //RTL_BITMAP TlsBitMap; //RTL_BITMAP TlsExpansionBitMap; @@ -331,6 +335,267 @@ NTSTATUS NTAPI +LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL) +{ +#if 0 + PLDR_DATA_TABLE_ENTRY LocalArray[16]; + PLIST_ENTRY ListHead; + PLIST_ENTRY NextEntry; + PLDR_DATA_TABLE_ENTRY LdrEntry, *LdrRootEntry, OldInitializer; + PVOID EntryPoint; + ULONG Count, i; + //ULONG BreakOnInit; + NTSTATUS Status = STATUS_SUCCESS; + PPEB Peb = NtCurrentPeb(); + RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED ActCtx; + ULONG BreakOnDllLoad; + PTEB OldTldTeb; + + DPRINT1("LdrpRunInitializeRoutines() called for %wZ\n", &LdrpImageEntry->BaseDllName); + + /* Check the Loader Lock */ + LdrpEnsureLoaderLockIsHeld(); + + /* Get the number of entries to call */ + if ((Count = LdrpClearLoadInProgress())) + { + /* Check if we can use our local buffer */ + if (Count > 16) + { + /* Allocate space for all the entries */ + LdrRootEntry = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + Count * sizeof(LdrRootEntry)); + if (!LdrRootEntry) return STATUS_NO_MEMORY; + } + else + { + /* Use our local array */ + LdrRootEntry = LocalArray; + } + } + else + { + /* Don't need one */ + LdrRootEntry = NULL; + } + + /* Show debug message */ + if (ShowSnaps) + { + DPRINT1("[%x,%x] LDR: Real INIT LIST for Process %wZ pid %u %0x%x\n", + NtCurrentTeb()->RealClientId.UniqueThread, + NtCurrentTeb()->RealClientId.UniqueProcess, + Peb->ProcessParameters->ImagePathName, + NtCurrentTeb()->RealClientId.UniqueThread, + NtCurrentTeb()->RealClientId.UniqueProcess); + } + + /* Loop in order */ + ListHead = &Peb->Ldr->InInitializationOrderModuleList; + NextEntry = ListHead->Flink; + i = 0; + while (NextEntry != ListHead) + { + /* Get the Data Entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + + /* Check if we have a Root Entry */ + if (LdrRootEntry) + { + /* Check flags */ + if (!(LdrEntry->Flags & LDRP_ENTRY_PROCESSED)) + { + /* Setup the Cookie for the DLL */ + //LdrpInitSecurityCookie(LdrEntry); + UNIMPLEMENTED; + + /* Check for valid entrypoint */ + if (LdrEntry->EntryPoint) + { + /* Write in array */ + LdrRootEntry[i] = LdrEntry; + + /* Display debug message */ + if (ShowSnaps) + { + DPRINT1("[%x,%x] LDR: %wZ init routine %p\n", + NtCurrentTeb()->RealClientId.UniqueThread, + NtCurrentTeb()->RealClientId.UniqueProcess, + &LdrEntry->FullDllName, + LdrEntry->EntryPoint); + } + i++; + } + } + } + + /* Set the flag */ + LdrEntry->Flags |= LDRP_ENTRY_PROCESSED; + NextEntry = NextEntry->Flink; + } + + /* If we got a context, then we have to call Kernel32 for TS support */ + if (Context) + { + /* Check if we have one */ + //if (Kernel32ProcessInitPostImportfunction) + //{ + /* Call it */ + //Kernel32ProcessInitPostImportfunction(); + //} + + /* Clear it */ + //Kernel32ProcessInitPostImportfunction = NULL; + UNIMPLEMENTED; + } + + /* No root entry? return */ + if (!LdrRootEntry) return STATUS_SUCCESS; + + /* Set the TLD TEB */ + OldTldTeb = LdrpTopLevelDllBeingLoadedTeb; + LdrpTopLevelDllBeingLoadedTeb = NtCurrentTeb(); + + /* Loop */ + i = 0; + while (i < Count) + { + /* Get an entry */ + LdrEntry = LdrRootEntry[i]; + + /* FIXME: Verifiy NX Compat */ + + /* Move to next entry */ + i++; + + /* Get its entrypoint */ + EntryPoint = LdrEntry->EntryPoint; + + /* Are we being debugged? */ + BreakOnDllLoad = 0; + if (Peb->BeingDebugged || Peb->ReadImageFileExecOptions) + { + /* Check if we should break on load */ + Status = LdrQueryImageFileExecutionOptions(&LdrEntry->BaseDllName, + L"BreakOnDllLoad", + REG_DWORD, + &BreakOnDllLoad, + sizeof(ULONG), + NULL); + if (!NT_SUCCESS(Status)) BreakOnDllLoad = 0; + } + + /* Break if aksed */ + if (BreakOnDllLoad) + { + /* Check if we should show a message */ + if (ShowSnaps) + { + DPRINT1("LDR: %wZ loaded.", &LdrEntry->BaseDllName); + DPRINT1(" - About to call init routine at %lx\n", EntryPoint); + } + + /* Break in debugger */ + DbgBreakPoint(); + } + + /* Make sure we have an entrypoint */ + if (EntryPoint) + { + /* Save the old Dll Initializer and write the current one */ + OldInitializer = LdrpCurrentDllInitializer; + LdrpCurrentDllInitializer = LdrEntry; + + /* Set up the Act Ctx */ + ActCtx.Size = sizeof(ActCtx); + ActCtx.Frame.Flags = ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID; + RtlZeroMemory(&ActCtx, sizeof(ActCtx)); + + /* Activate the ActCtx */ + RtlActivateActivationContextUnsafeFast(&ActCtx, + LdrEntry->EntryPointActivationContext); + + /* Check if it has TLS */ + if (LdrEntry->TlsIndex && Context) + { + /* Call TLS */ + LdrpTlsCallback(LdrEntry->DllBase, DLL_PROCESS_ATTACH); + } + + /* Call the Entrypoint */ + DPRINT1("%wZ - Calling entry point at %x for thread attaching\n", + &LdrEntry->BaseDllName, EntryPoint); + LdrpCallDllEntry(EntryPoint, + LdrEntry->DllBase, + DLL_PROCESS_ATTACH, + Context); + + /* Deactivate the ActCtx */ + RtlDeactivateActivationContextUnsafeFast(&ActCtx); + + /* Save the Current DLL Initializer */ + LdrpCurrentDllInitializer = OldInitializer; + + /* Mark the entry as processed */ + LdrEntry->Flags |= LDRP_PROCESS_ATTACH_CALLED; + } + } + + /* Loop in order */ + ListHead = &Peb->Ldr->InInitializationOrderModuleList; + NextEntry = NextEntry->Flink; + while (NextEntry != ListHead) + { + /* Get the Data Entrry */ + LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + + /* FIXME: Verify NX Compat */ + + /* Next entry */ + NextEntry = NextEntry->Flink; + } + + /* Check for TLS */ + if (LdrpImageHasTls && Context) + { + /* Set up the Act Ctx */ + ActCtx.Size = sizeof(ActCtx); + ActCtx.Frame.Flags = ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID; + RtlZeroMemory(&ActCtx, sizeof(ActCtx)); + + /* Activate the ActCtx */ + RtlActivateActivationContextUnsafeFast(&ActCtx, + LdrpImageEntry->EntryPointActivationContext); + + /* Do TLS callbacks */ + LdrpTlsCallback(Peb->ImageBaseAddress, DLL_PROCESS_DETACH); + + /* Deactivate the ActCtx */ + RtlDeactivateActivationContextUnsafeFast(&ActCtx); + } + + /* Restore old TEB */ + LdrpTopLevelDllBeingLoadedTeb = OldTldTeb; + + /* Check if the array is in the heap */ + if (LdrRootEntry != LocalArray) + { + /* Free the array */ + RtlFreeHeap(RtlGetProcessHeap(), 0, LdrRootEntry); + } + + /* Return to caller */ + DPRINT("LdrpAttachProcess() done\n"); + return Status; +#else + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +#endif +} + +NTSTATUS +NTAPI LdrpInitializeTls(VOID) { PLIST_ENTRY NextEntry, ListHead; Added: 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 (added) +++ trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] Wed Mar 16 14:22:15 2011 @@ -1,0 +1,273 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/ntdll/ldr/ldrpe.c + * PURPOSE: Loader Functions dealing low-level PE Format structures + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntdll.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ +ULONG LdrpFatalHardErrorCount; +PVOID LdrpManifestProberRoutine; + +/* PROTOTYPES ****************************************************************/ + +#define IMAGE_REL_BASED_HIGH3ADJ 11 + +NTSTATUS +NTAPI +LdrpLoadImportModule(IN PWSTR DllPath OPTIONAL, + IN LPSTR ImportName, + IN PVOID DllBase, + OUT PLDR_DATA_TABLE_ENTRY *DataTableEntry, + OUT PBOOLEAN Existing); + +/* FUNCTIONS *****************************************************************/ + +USHORT NTAPI +LdrpNameToOrdinal(LPSTR ImportName, + ULONG NumberOfNames, + PVOID ExportBase, + PULONG NameTable, + PUSHORT OrdinalTable) +{ + UNIMPLEMENTED; + return 0; +} + + +NTSTATUS +NTAPI +LdrpSnapThunk(IN PVOID ExportBase, + IN PVOID ImportBase, + IN PIMAGE_THUNK_DATA OriginalThunk, + IN OUT PIMAGE_THUNK_DATA Thunk, + IN PIMAGE_EXPORT_DIRECTORY ExportEntry, + IN ULONG ExportSize, + IN BOOLEAN Static, + IN LPSTR DllName) +{ + BOOLEAN IsOrdinal; + USHORT Ordinal; + ULONG OriginalOrdinal = 0; + PIMAGE_IMPORT_BY_NAME AddressOfData; + PULONG NameTable; + PUSHORT OrdinalTable; + LPSTR ImportName; + USHORT Hint; + NTSTATUS Status; + ULONG_PTR HardErrorParameters[3]; + UNICODE_STRING HardErrorDllName, HardErrorEntryPointName; + ANSI_STRING TempString; + ULONG Mask; + ULONG Response; + PULONG AddressOfFunctions; + UNICODE_STRING TempUString; + ANSI_STRING ForwarderName; + PANSI_STRING ForwardName; + PVOID ForwarderHandle; + ULONG ForwardOrdinal; + + /* Check if the snap is by ordinal */ + if ((IsOrdinal = IMAGE_SNAP_BY_ORDINAL(OriginalThunk->u1.Ordinal))) + { + /* Get the ordinal number, and its normalized version */ + OriginalOrdinal = IMAGE_ORDINAL(OriginalThunk->u1.Ordinal); + Ordinal = (USHORT)(OriginalOrdinal - ExportEntry->Base); + } + else + { + /* First get the data VA */ + AddressOfData = (PIMAGE_IMPORT_BY_NAME) + ((ULONG_PTR)ImportBase + + ((ULONG_PTR)OriginalThunk->u1.AddressOfData & 0xffffffff)); + + /* Get the name */ + ImportName = (LPSTR)AddressOfData->Name; + + /* Now get the VA of the Name and Ordinal Tables */ + NameTable = (PULONG)((ULONG_PTR)ExportBase + + (ULONG_PTR)ExportEntry->AddressOfNames); + OrdinalTable = (PUSHORT)((ULONG_PTR)ExportBase + + (ULONG_PTR)ExportEntry->AddressOfNameOrdinals); + + /* Get the hint */ + Hint = AddressOfData->Hint; + + /* Try to get a match by using the hint */ + if (((ULONG)Hint < ExportEntry->NumberOfNames) && + (!strcmp(ImportName, ((LPSTR)((ULONG_PTR)ExportBase + NameTable[Hint]))))) + { + /* We got a match, get the Ordinal from the hint */ + Ordinal = OrdinalTable[Hint]; + } + else + { + /* Well bummer, hint didn't work, do it the long way */ + Ordinal = LdrpNameToOrdinal(ImportName, + ExportEntry->NumberOfNames, + ExportBase, + NameTable, + OrdinalTable); + } + } + + /* Check if the ordinal is invalid */ + if ((ULONG)Ordinal >= ExportEntry->NumberOfFunctions) + { +FailurePath: + /* Is this a static snap? */ + if (Static) + { + /* These are critical errors. Setup a string for the DLL name */ + RtlInitAnsiString(&TempString, DllName ? DllName : "Unknown"); + RtlAnsiStringToUnicodeString(&HardErrorDllName, &TempString, TRUE); + + /* Set it as the parameter */ + HardErrorParameters[1] = (ULONG_PTR)&HardErrorDllName; + Mask = 2; + + /* Check if we have an ordinal */ + if (IsOrdinal) + { + /* Then set the ordinal as the 1st parameter */ + HardErrorParameters[0] = OriginalOrdinal; + } + else + { + /* We don't, use the entrypoint. Set up a string for it */ + RtlInitAnsiString(&TempString, ImportName); + RtlAnsiStringToUnicodeString(&HardErrorEntryPointName, + &TempString, + TRUE); + + /* Set it as the parameter */ + HardErrorParameters[0] = (ULONG_PTR)&HardErrorEntryPointName; + Mask = 3; + } + + /* Raise the error */ + NtRaiseHardError(IsOrdinal ? STATUS_ORDINAL_NOT_FOUND : + STATUS_ENTRYPOINT_NOT_FOUND, + 2, + Mask, + HardErrorParameters, + OptionOk, + &Response); + + /* Increase the error count */ + if (LdrpInLdrInit) LdrpFatalHardErrorCount++; + + /* Free our string */ + RtlFreeUnicodeString(&HardErrorDllName); + if (!IsOrdinal) + { + /* Free our second string. Return entrypoint error */ + RtlFreeUnicodeString(&HardErrorEntryPointName); + RtlRaiseStatus(STATUS_ENTRYPOINT_NOT_FOUND); + } + + /* Return ordinal error */ + RtlRaiseStatus(STATUS_ORDINAL_NOT_FOUND); + } + + /* Set this as a bad DLL */ + Thunk->u1.Function = (ULONG_PTR)0xffbadd11; + + /* Return the right error code */ + Status = IsOrdinal ? STATUS_ORDINAL_NOT_FOUND : + STATUS_ENTRYPOINT_NOT_FOUND; + } + else + { + /* The ordinal seems correct, get the AddressOfFunctions VA */ + AddressOfFunctions = (PULONG) + ((ULONG_PTR)ExportBase + + (ULONG_PTR)ExportEntry->AddressOfFunctions); + + /* Write the function pointer*/ + Thunk->u1.Function = (ULONG_PTR)ExportBase + AddressOfFunctions[Ordinal]; + + /* Make sure it's within the exports */ + if ((Thunk->u1.Function > (ULONG_PTR)ExportEntry) && + (Thunk->u1.Function < ((ULONG_PTR)ExportEntry + ExportSize))) + { + /* Get the Import and Forwarder Names */ + ImportName = (LPSTR)Thunk->u1.Function; + ForwarderName.Buffer = ImportName; + ForwarderName.Length = (USHORT)(strchr(ImportName, '.') - ImportName); + ForwarderName.MaximumLength = ForwarderName.Length; + Status = RtlAnsiStringToUnicodeString(&TempUString, + &ForwarderName, + TRUE); + + /* Make sure the conversion was OK */ + if (NT_SUCCESS(Status)) + { + /* Load the forwarder, free the temp string */ + Status = LdrpLoadDll(FALSE, + NULL, + NULL, + &TempUString, + &ForwarderHandle, + FALSE); + RtlFreeUnicodeString(&TempUString); + } + + /* If the load or conversion failed, use the failure path */ + if (!NT_SUCCESS(Status)) goto FailurePath; + + /* Now set up a name for the actual forwarder dll */ + RtlInitAnsiString(&ForwarderName, + ImportName + ForwarderName.Length + sizeof(CHAR)); + + /* Check if it's an ordinal forward */ + if ((ForwarderName.Length > 1) && (*ForwarderName.Buffer == '#')) + { + /* We don't have an actual function name */ + ForwardName = NULL; + + /* Convert the string into an ordinal */ + Status = RtlCharToInteger(ForwarderName.Buffer + sizeof(CHAR), + 0, + &ForwardOrdinal); + + /* If this fails, then error out */ + if (!NT_SUCCESS(Status)) goto FailurePath; + } + else + { + /* Import by name */ + ForwardName = &ForwarderName; + } + + /* Get the pointer */ + Status = LdrpGetProcedureAddress(ForwarderHandle, + ForwardName, + ForwardOrdinal, + (PVOID*)&Thunk->u1.Function, + FALSE); + /* If this fails, then error out */ + if (!NT_SUCCESS(Status)) goto FailurePath; + } + else + { + /* It's not within the exports, let's hope it's valid */ + if (!AddressOfFunctions[Ordinal]) goto FailurePath; + } + + /* If we got here, then it's success */ + Status = STATUS_SUCCESS; + } + + /* Return status */ + return Status; +} + +/* EOF */ Propchange: trunk/reactos/dll/ntdll/ldr/ldrpe.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Wed Mar 16 14:22:15 2011 @@ -15,6 +15,8 @@ /* GLOBALS *******************************************************************/ +PLDR_DATA_TABLE_ENTRY LdrpLoadedDllHandleCache; + /* FUNCTIONS *****************************************************************/ BOOLEAN @@ -80,4 +82,248 @@ _SEH2_END; } +BOOLEAN +NTAPI +LdrpCheckForLoadedDllHandle(IN PVOID Base, + OUT PLDR_DATA_TABLE_ENTRY *LdrEntry) +{ + PLDR_DATA_TABLE_ENTRY Current; + PLIST_ENTRY ListHead, Next; + + /* Check the cache first */ + if (LdrpLoadedDllHandleCache && LdrpLoadedDllHandleCache->DllBase == Base) + { + /* We got lucky, return the cached entry */ + *LdrEntry = LdrpLoadedDllHandleCache; + return TRUE; + } + + /* Time for a lookup */ + ListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; + Next = ListHead->Flink; + while(Next != ListHead) + { + /* Get the current entry */ + Current = CONTAINING_RECORD(Next, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Make sure it's not unloading and check for a match */ + if ((Current->InMemoryOrderModuleList.Flink) && (Base == Current->DllBase)) + { + /* Save in cache */ + LdrpLoadedDllHandleCache = Current; + + /* Return it */ + *LdrEntry = Current; + return TRUE; + } + + /* Move to the next one */ + Next = Next->Flink; + } + + /* Nothing found */ + return FALSE; +} + +BOOLEAN +NTAPI +LdrpCheckForLoadedDll(IN PWSTR DllPath, + IN PUNICODE_STRING DllName, + IN BOOLEAN Flag, + IN BOOLEAN RedirectedDll, + OUT PLDR_DATA_TABLE_ENTRY *LdrEntry) +{ + UNIMPLEMENTED; + return FALSE; +} + +NTSTATUS +NTAPI +LdrpGetProcedureAddress(IN PVOID BaseAddress, + IN PANSI_STRING Name, + IN ULONG Ordinal, + OUT PVOID *ProcedureAddress, + IN BOOLEAN ExecuteInit) +{ + NTSTATUS Status = STATUS_SUCCESS; + UCHAR ImportBuffer[64]; + PLDR_DATA_TABLE_ENTRY LdrEntry; + IMAGE_THUNK_DATA Thunk; + PVOID ImageBase; + PIMAGE_IMPORT_BY_NAME ImportName = NULL; + PIMAGE_EXPORT_DIRECTORY ExportDir; + ULONG ExportDirSize; + PLIST_ENTRY Entry; + + /* Show debug message */ + if (ShowSnaps) DPRINT1("LDR: LdrGetProcedureAddress by "); + + /* Check if we got a name */ + if (Name) + { + /* Show debug message */ + if (ShowSnaps) DPRINT1("NAME - %s\n", Name->Buffer); + + /* Make sure it's not too long */ + if ((Name->Length + sizeof(CHAR) + sizeof(USHORT)) > MAXLONG) + { + /* Won't have enough space to add the hint */ + return STATUS_NAME_TOO_LONG; + } + + /* Check if our buffer is large enough */ + if (Name->Length >= (sizeof(ImportBuffer) - sizeof(CHAR))) + { + /* Allocate from heap, plus 2 bytes for the Hint */ + ImportName = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + Name->Length + sizeof(CHAR) + + sizeof(USHORT)); + } + else + { + /* Use our internal buffer */ + ImportName = (PIMAGE_IMPORT_BY_NAME)ImportBuffer; + } + + /* Clear the hint */ + ImportName->Hint = 0; + + /* Copy the name and null-terminate it */ + RtlMoveMemory(&ImportName->Name, Name->Buffer, Name->Length); + ImportName->Name[Name->Length + 1] = 0; + + /* Clear the high bit */ + ImageBase = ImportName; + Thunk.u1.AddressOfData = 0; + } + else + { + /* Do it by ordinal */ + ImageBase = NULL; + + /* Show debug message */ + if (ShowSnaps) DPRINT1("ORDINAL - %lx\n", Ordinal); + + if (Ordinal) + { + Thunk.u1.Ordinal = Ordinal | IMAGE_ORDINAL_FLAG; + } + else + { + /* No ordinal */ + DPRINT1("No ordinal and no name\n"); + return STATUS_INVALID_PARAMETER; + } + } + + /* Acquire lock unless we are initting */ + if (!LdrpInLdrInit) RtlEnterCriticalSection(&LdrpLoaderLock); + + _SEH2_TRY + { + /* Try to find the loaded DLL */ + if (!LdrpCheckForLoadedDllHandle(BaseAddress, &LdrEntry)) + { + /* Invalid base */ + DPRINT1("Invalid base address\n"); + Status = STATUS_DLL_NOT_FOUND; + _SEH2_YIELD(goto Quickie;) + } + + /* Get the pointer to the export directory */ + ExportDir = RtlImageDirectoryEntryToData(LdrEntry->DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportDirSize); + + if (!ExportDir) + { + DPRINT1("Image has no exports\n"); + Status = STATUS_PROCEDURE_NOT_FOUND; + _SEH2_YIELD(goto Quickie;) + } + + /* Now get the thunk */ + Status = LdrpSnapThunk(LdrEntry->DllBase, + ImageBase, + &Thunk, + &Thunk, + ExportDir, + ExportDirSize, + FALSE, + NULL); + + /* Finally, see if we're supposed to run the init routines */ + if (ExecuteInit) + { + /* + * It's possible a forwarded entry had us load the DLL. In that case, + * then we will call its DllMain. Use the last loaded DLL for this. + */ + Entry = NtCurrentPeb()->Ldr->InInitializationOrderModuleList.Blink; + LdrEntry = CONTAINING_RECORD(Entry, + LDR_DATA_TABLE_ENTRY, + InInitializationOrderModuleList); + + /* Make sure we didn't process it yet*/ + if (!(LdrEntry->Flags & LDRP_ENTRY_PROCESSED)) + { + /* Call the init routine */ + _SEH2_TRY + { + Status = LdrpRunInitializeRoutines(NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + } + + /* Make sure we're OK till here */ + if (NT_SUCCESS(Status)) + { + /* Return the address */ + *ProcedureAddress = (PVOID)Thunk.u1.Function; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Just ignore exceptions */ + } + _SEH2_END; + +Quickie: + /* Cleanup */ + if (ImportName && (ImportName != (PIMAGE_IMPORT_BY_NAME)ImportBuffer)) + { + /* We allocated from heap, free it */ + RtlFreeHeap(RtlGetProcessHeap(), 0, ImportName); + } + + /* Release the CS if we entered it */ + if (!LdrpInLdrInit) RtlLeaveCriticalSection(&LdrpLoaderLock); + + /* We're done */ + return Status; +} + +NTSTATUS +NTAPI +LdrpLoadDll(IN BOOLEAN Redirected, + IN PWSTR DllPath OPTIONAL, + IN PULONG DllCharacteristics OPTIONAL, + IN PUNICODE_STRING DllName, + OUT PVOID *BaseAddress, + IN BOOLEAN CallInit) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + /* EOF */ 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] Wed Mar 16 14:22:15 2011 @@ -2848,108 +2848,6 @@ return STATUS_SUCCESS; } - -/*************************************************************************** - * NAME EXPORTED - * LdrQueryProcessModuleInformation - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - * - * NOTE - * - * @implemented - */ -NTSTATUS NTAPI -LdrQueryProcessModuleInformation(IN PRTL_PROCESS_MODULES ModuleInformation OPTIONAL, - IN ULONG Size OPTIONAL, - OUT PULONG ReturnedSize) -{ - PLIST_ENTRY ModuleListHead; - PLIST_ENTRY Entry; - PLDR_DATA_TABLE_ENTRY Module; - PRTL_PROCESS_MODULE_INFORMATION ModulePtr = NULL; - NTSTATUS Status = STATUS_SUCCESS; - ULONG UsedSize = sizeof(ULONG); - ANSI_STRING AnsiString; - PCHAR p; - - DPRINT("LdrQueryProcessModuleInformation() called\n"); -// FIXME: This code is ultra-duplicated. see lib\rtl\dbgbuffer.c - RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock); - - if (ModuleInformation == NULL || Size == 0) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - else - { - ModuleInformation->NumberOfModules = 0; - ModulePtr = &ModuleInformation->Modules[0]; - Status = STATUS_SUCCESS; - } - - ModuleListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; - Entry = ModuleListHead->Flink; - - while (Entry != ModuleListHead) - { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - DPRINT(" Module %wZ\n", - &Module->FullDllName); - - if (UsedSize > Size) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - else if (ModuleInformation != NULL) - { - ModulePtr->Section = 0; - ModulePtr->MappedBase = NULL; // FIXME: ?? - ModulePtr->ImageBase = Module->DllBase; - ModulePtr->ImageSize = Module->SizeOfImage; - ModulePtr->Flags = Module->Flags; - ModulePtr->LoadOrderIndex = 0; // FIXME: ?? - ModulePtr->InitOrderIndex = 0; // FIXME: ?? - ModulePtr->LoadCount = Module->LoadCount; - - AnsiString.Length = 0; - AnsiString.MaximumLength = 256; - AnsiString.Buffer = ModulePtr->FullPathName; - RtlUnicodeStringToAnsiString(&AnsiString, - &Module->FullDllName, - FALSE); - - p = strrchr(ModulePtr->FullPathName, '\\'); - if (p != NULL) - ModulePtr->OffsetToFileName = p - ModulePtr->FullPathName + 1; - else - ModulePtr->OffsetToFileName = 0; - - ModulePtr++; - ModuleInformation->NumberOfModules++; - } - UsedSize += sizeof(RTL_PROCESS_MODULE_INFORMATION); - - Entry = Entry->Flink; - } - - RtlLeaveCriticalSection (NtCurrentPeb()->LoaderLock); - - if (ReturnedSize != 0) - *ReturnedSize = UsedSize; - - DPRINT("LdrQueryProcessModuleInformation() done\n"); - - return(Status); -} - /* * Compute size of an image as it is actually present in virt memory * (i.e. excluding NEVER_LOAD sections) Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Wed Mar 16 14:22:15 2011 @@ -49,6 +49,7 @@ <directory name="ldr"> <file>ldrapi.c</file> <file>ldrinit.c</file> + <file>ldrpe.c</file> <file>ldrutils.c</file> <file>startup.c</file> <file>utils.c</file>

1 0

[cfinck] 51064: Merge 51058, 51062-51063
by cfinck＠svn.reactos.org 16 Mar '11

16 Mar '11

Author: cfinck Date: Wed Mar 16 14:08:30 2011 New Revision: 51064 URL: http://svn.reactos.org/svn/reactos?rev=51064&view=rev Log: Merge 51058, 51062-51063 Modified: branches/ros-branch-0_3_13/reactos/ (props changed) branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox2.txt branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox3.txt branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox36.txt branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/openoffice2.4.txt branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/seamonkey.txt branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/thunderbird.txt branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/winboard.txt branches/ros-branch-0_3_13/reactos/lib/sdk/crt/printf/streamout.c branches/ros-branch-0_3_13/reactos/lib/sdk/crt/stdio/file.c Propchange: branches/ros-branch-0_3_13/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 16 14:08:30 2011 @@ -3,4 +3,4 @@ /branches/reactx/reactos:49994-49995 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 -/trunk/reactos:51043-51044,51046-51048 +/trunk/reactos:51043-51044,51046-51048,51058,51062-51063 Modified: branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] Wed Mar 16 14:08:30 2011 @@ -8,45 +8,37 @@ Size = 5.8M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/en-US/Firefox%20S… +URLDownload = http://svn.reactos.org/packages/Firefox%20Setup%202.0.0.20.exe CDPath = none [Section.0405] Description = NejpopulÃ¡rnÄjÅ¡Ã a jeden z nejlepÅ¡Ãch svobodnÃ½ch webovÃ½ch prohlÃÅ¾eÄÅ¯. URLSite = http://www.mozilla-europe.org/cs/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/cs/Firefox%20Setu… [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. URLSite = http://www.mozilla-europe.org/de/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/de/Firefox%20Setu… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. URLSite = http://www.mozilla-europe.org/es/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/es-ES/Firefox%20S… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/fr/Firefox%20Setu… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. URLSite = http://www.mozilla-europe.org/no/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/nb-NO/Firefox%20S… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/pl/Firefox%20Setu… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/ru/Firefox%20Setu… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/uk/Firefox%20Setu… Modified: branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] Wed Mar 16 14:08:30 2011 @@ -8,52 +8,44 @@ Size = 7.2M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/en-US/Fir… +URLDownload = http://svn.reactos.org/packages/Firefox%20Setup%203.0.19.exe CDPath = none [Section.0405] Description = NejpopulÃ¡rnÄjÅ¡Ã a jeden z nejlepÅ¡Ãch svobodnÃ½ch webovÃ½ch prohlÃÅ¾eÄÅ¯. Size = 7.0M URLSite = http://www.mozilla-europe.org/cs/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/cs/Firefo… [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 7.0M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/de/Firefo… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 7.0M URLSite = http://www.mozilla-europe.org/es/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/es-ES/Fir… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/fr/Firefo… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 7.0M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/nb-NO/Fir… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 7.9M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/pl/Firefo… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 7.8M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/ru/Firefo… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Size = 7.4M URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/uk/Firefo… Modified: branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] Wed Mar 16 14:08:30 2011 @@ -8,47 +8,47 @@ Size = 8.2M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/en-US/Firefox%20Set… +URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/en-US/Firefox… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 8.1M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/de/Firefox%20Setup%… +URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/de/Firefox%20… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 8.1M URLSite = http://www.mozilla-europe.org/es/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/es-ES/Firefox%20Set… +URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/es-ES/Firefox… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. Size = 8.1M URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/fr/Firefox%20Setup%… +URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/fr/Firefox%20… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 8.1M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/nb-NO/Firefox%20Set… +URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/nb-NO/Firefox… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 8.9M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/pl/Firefox%20Setup%… +URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/pl/Firefox%20… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 8.5M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/ru/Firefox%20Setup%… +URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/ru/Firefox%20… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Size = 8.5M URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/uk/Firefox%20Setup%… +URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/uk/Firefox%20… Modified: branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] Wed Mar 16 14:08:30 2011 @@ -8,36 +8,36 @@ Size = 127MB Category = 6 URLSite = http://www.openoffice.org/ -URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/stable/2.4.3/O… +URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/stable/2.4.3/… CDPath = none [Section.0407] Description = DIE Open Source Office Suite. URLSite = http://de.openoffice.org/ Size = 114.2MB -URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/de/2… +URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/de/… [Section.040a] Description = La suite de ofimÃ¡tica de cÃ³digo abierto. URLSite = http://es.openoffice.org/ Size = 113.9MB -URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/es/2… +URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/es/… [Section.040c] Version = 2.4.2 Description = LA suite bureautique open source. URLSite = http://fr.openoffice.org/ Size = 113.9MB -URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/fr/2… +URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/fr/… [Section.0415] URLSite = http://pl.openoffice.org/ Description = Otwarty pakiet biurowy. -URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/pl/2… +URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/pl/… Size = 113.9M [Section.0422] URLSite = http://ua.openoffice.org/ Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. -URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/ru/2… +URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/ru/… Size = 114.8M Modified: branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Wed Mar 16 14:08:30 2011 @@ -8,30 +8,30 @@ Size = 10.2MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/en-US/SeaMonkey%2… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32… CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. Size = 10.1MB -URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/de/SeaMonkey%20Se… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32… [Section.040a] Description = La suite de Mozilla estÃ¡ viva. Es el primero y Ãºnico navegador web, gestor de correo, lector de noticias, Chat y editor HTML que necesitarÃ¡s. Size = 10.1MB -URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/es-ES/SeaMonkey%2… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32… [Section.040c] Description = La suite Mozilla est en vie. Ceci est le seul et l'unique package navigateur, client mail, client chat et composer dont vous aurez besoin. Size = 10.1MB -URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/fr/SeaMonkey%20Se… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. Size = 11.0MB -URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/pl/SeaMonkey%20Se… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32… [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 10.5MB -URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/ru/SeaMonkey%20Se… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32… Modified: branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Wed Mar 16 14:08:30 2011 @@ -8,41 +8,41 @@ Size = 9.0M Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/en-US/Thunderbir… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win3… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 8.8M URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/de/Thunderbird%2… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win3… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 8.8M URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/es-ES/Thunderbir… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win3… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. Size = 8.8M URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/ -URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/fr/Thunderbird%2… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win3… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 9.7M URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/pl/Thunderbird%2… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win3… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 9.2M URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/ru/Thunderbird%2… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win3… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 9.2M URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/uk/Thunderbird%2… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win3… Modified: branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] Wed Mar 16 14:08:30 2011 @@ -8,7 +8,7 @@ Size = 5.9MB Category = 4 URLSite = http://www.gnu.org/software/xboard/ -URLDownload = ftp://ftp.gnu.org/old-gnu/xboard/winboard/winboard-4_2_7b.exe +URLDownload = http://ftp.gnu.org/old-gnu/xboard/winboard/winboard-4_2_7b.exe CDPath = none [Section.0407] Modified: branches/ros-branch-0_3_13/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/lib/s… ============================================================================== --- branches/ros-branch-0_3_13/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_13/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Wed Mar 16 14:08:30 2011 @@ -16,13 +16,6 @@ #ifdef _UNICODE # define streamout wstreamout # define format_float format_floatw -# define _flsbuf _flswbuf -int __cdecl _flswbuf(int ch, FILE *stream); -#endif - -#ifdef _LIBCNT_ -# undef _flsbuf -# define _flsbuf(chr, stream) _TEOF #endif #define MB_CUR_MAX 10 @@ -234,25 +227,19 @@ int streamout_char(FILE *stream, int chr) { +#if defined(_USER32_WSPRINTF) || defined(_LIBCNT_) /* Check if the buffer is full */ if (stream->_cnt < sizeof(TCHAR)) - { -#ifdef _USER32_WSPRINTF - return _TEOF; -#else - /* Strings are done now */ - if (stream->_flag & _IOSTRG) return _TEOF; - - /* Flush buffer for files */ - return _flsbuf(chr, stream) != _TEOF; -#endif - } + return 0; *(TCHAR*)stream->_ptr = chr; stream->_ptr += sizeof(TCHAR); stream->_cnt -= sizeof(TCHAR); return 1; +#else + return _fputtc((TCHAR)chr, stream) != _TEOF; +#endif } static Modified: branches/ros-branch-0_3_13/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/lib/s… ============================================================================== --- branches/ros-branch-0_3_13/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_13/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Wed Mar 16 14:08:30 2011 @@ -2175,12 +2175,33 @@ /********************************************************************* * fputwc (MSVCRT.@) */ -wint_t CDECL fputwc(wint_t wc, FILE* file) -{ - wchar_t mwc=wc; - if (fwrite( &mwc, sizeof(mwc), 1, file) != 1) - return WEOF; - return wc; +wint_t CDECL fputwc(wchar_t c, FILE* stream) +{ + /* If this is a real file stream (and not some temporary one for + sprintf-like functions), check whether it is opened in text mode. + In this case, we have to perform an implicit conversion to ANSI. */ + if (!(stream->_flag & _IOSTRG) && fdesc[stream->_file].wxflag & WX_TEXT) + { + /* Convert to multibyte in text mode */ + char mbc[MB_LEN_MAX]; + int mb_return; + + mb_return = wctomb(mbc, c); + + if(mb_return == -1) + return WEOF; + + /* Output all characters */ + if (fwrite(mbc, mb_return, 1, stream) != 1) + return WEOF; + } + else + { + if (fwrite(&c, sizeof(c), 1, stream) != 1) + return WEOF; + } + + return c; } /*********************************************************************

1 0

[cfinck] 51063: [RAPPS] Change all ftp:// links to http:// ones. The changes to the fragile Mozilla links should be reverted as soon as our/Wine's URLDownloadToFileW function finally supports FTP U...
by cfinck＠svn.reactos.org 16 Mar '11

16 Mar '11

Author: cfinck Date: Wed Mar 16 13:28:39 2011 New Revision: 51063 URL: http://svn.reactos.org/svn/reactos?rev=51063&view=rev Log: [RAPPS] Change all ftp:// links to http:// ones. The changes to the fragile Mozilla links should be reverted as soon as our/Wine's URLDownloadToFileW function finally supports FTP URLs. Vote for Wine Bug 26445 (http://bugs.winehq.org/show_bug.cgi?id=26445) to get this fixed! Modified: trunk/reactos/base/applications/rapps/rapps/firefox2.txt trunk/reactos/base/applications/rapps/rapps/firefox3.txt trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/winboard.txt Modified: trunk/reactos/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] Wed Mar 16 13:28:39 2011 @@ -8,45 +8,37 @@ Size = 5.8M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/en-US/Firefox%20S… +URLDownload = http://svn.reactos.org/packages/Firefox%20Setup%202.0.0.20.exe CDPath = none [Section.0405] Description = NejpopulÃ¡rnÄjÅ¡Ã a jeden z nejlepÅ¡Ãch svobodnÃ½ch webovÃ½ch prohlÃÅ¾eÄÅ¯. URLSite = http://www.mozilla-europe.org/cs/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/cs/Firefox%20Setu… [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. URLSite = http://www.mozilla-europe.org/de/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/de/Firefox%20Setu… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. URLSite = http://www.mozilla-europe.org/es/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/es-ES/Firefox%20S… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/fr/Firefox%20Setu… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. URLSite = http://www.mozilla-europe.org/no/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/nb-NO/Firefox%20S… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/pl/Firefox%20Setu… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/ru/Firefox%20Setu… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/uk/Firefox%20Setu… Modified: trunk/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] Wed Mar 16 13:28:39 2011 @@ -8,52 +8,44 @@ Size = 7.2M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/en-US/Fir… +URLDownload = http://svn.reactos.org/packages/Firefox%20Setup%203.0.19.exe CDPath = none [Section.0405] Description = NejpopulÃ¡rnÄjÅ¡Ã a jeden z nejlepÅ¡Ãch svobodnÃ½ch webovÃ½ch prohlÃÅ¾eÄÅ¯. Size = 7.0M URLSite = http://www.mozilla-europe.org/cs/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/cs/Firefo… [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 7.0M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/de/Firefo… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 7.0M URLSite = http://www.mozilla-europe.org/es/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/es-ES/Fir… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/fr/Firefo… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 7.0M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/nb-NO/Fir… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 7.9M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/pl/Firefo… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 7.8M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/ru/Firefo… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Size = 7.4M URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/uk/Firefo… Modified: trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] Wed Mar 16 13:28:39 2011 @@ -8,36 +8,36 @@ Size = 127MB Category = 6 URLSite = http://www.openoffice.org/ -URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/stable/2.4.3/O… +URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/stable/2.4.3/… CDPath = none [Section.0407] Description = DIE Open Source Office Suite. URLSite = http://de.openoffice.org/ Size = 114.2MB -URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/de/2… +URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/de/… [Section.040a] Description = La suite de ofimÃ¡tica de cÃ³digo abierto. URLSite = http://es.openoffice.org/ Size = 113.9MB -URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/es/2… +URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/es/… [Section.040c] Version = 2.4.2 Description = LA suite bureautique open source. URLSite = http://fr.openoffice.org/ Size = 113.9MB -URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/fr/2… +URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/fr/… [Section.0415] URLSite = http://pl.openoffice.org/ Description = Otwarty pakiet biurowy. -URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/pl/2… +URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/pl/… Size = 113.9M [Section.0422] URLSite = http://ua.openoffice.org/ Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. -URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/ru/2… +URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/ru/… Size = 114.8M Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Wed Mar 16 13:28:39 2011 @@ -8,30 +8,30 @@ Size = 10.2MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/en-US/SeaMonkey%2… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32… CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. Size = 10.1MB -URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/de/SeaMonkey%20Se… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32… [Section.040a] Description = La suite de Mozilla estÃ¡ viva. Es el primero y Ãºnico navegador web, gestor de correo, lector de noticias, Chat y editor HTML que necesitarÃ¡s. Size = 10.1MB -URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/es-ES/SeaMonkey%2… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32… [Section.040c] Description = La suite Mozilla est en vie. Ceci est le seul et l'unique package navigateur, client mail, client chat et composer dont vous aurez besoin. Size = 10.1MB -URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/fr/SeaMonkey%20Se… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. Size = 11.0MB -URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/pl/SeaMonkey%20Se… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32… [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 10.5MB -URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/ru/SeaMonkey%20Se… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Wed Mar 16 13:28:39 2011 @@ -8,41 +8,41 @@ Size = 9.0M Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/en-US/Thunderbir… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win3… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 8.8M URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/de/Thunderbird%2… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win3… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 8.8M URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/es-ES/Thunderbir… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win3… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. Size = 8.8M URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/ -URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/fr/Thunderbird%2… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win3… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 9.7M URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/pl/Thunderbird%2… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win3… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 9.2M URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/ru/Thunderbird%2… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win3… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 9.2M URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/uk/Thunderbird%2… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win3… Modified: trunk/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] Wed Mar 16 13:28:39 2011 @@ -8,7 +8,7 @@ Size = 5.9MB Category = 4 URLSite = http://www.gnu.org/software/xboard/ -URLDownload = ftp://ftp.gnu.org/old-gnu/xboard/winboard/winboard-4_2_7b.exe +URLDownload = http://ftp.gnu.org/old-gnu/xboard/winboard/winboard-4_2_7b.exe CDPath = none [Section.0407]

1 0

[pschweitzer] 51062: [RAPPS] Due to a lack of implemented feature in DLL, switch FF3.6 download links to HTTP. Site given by Mozilla Foundation.
by pschweitzer＠svn.reactos.org 16 Mar '11

16 Mar '11

Author: pschweitzer Date: Wed Mar 16 12:18:57 2011 New Revision: 51062 URL: http://svn.reactos.org/svn/reactos?rev=51062&view=rev Log: [RAPPS] Due to a lack of implemented feature in DLL, switch FF3.6 download links to HTTP. Site given by Mozilla Foundation. Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] Wed Mar 16 12:18:57 2011 @@ -8,47 +8,47 @@ Size = 8.2M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/en-US/Firefox%20Set… +URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/en-US/Firefox… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 8.1M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/de/Firefox%20Setup%… +URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/de/Firefox%20… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 8.1M URLSite = http://www.mozilla-europe.org/es/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/es-ES/Firefox%20Set… +URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/es-ES/Firefox… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. Size = 8.1M URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/fr/Firefox%20Setup%… +URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/fr/Firefox%20… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 8.1M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/nb-NO/Firefox%20Set… +URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/nb-NO/Firefox… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 8.9M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/pl/Firefox%20Setup%… +URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/pl/Firefox%20… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 8.5M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/ru/Firefox%20Setup%… +URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/ru/Firefox%20… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Size = 8.5M URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/uk/Firefox%20Setup%… +URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/uk/Firefox%20…

1 0

[fireball] 51061: [RTL] - Hack away LdrVerifyMappedImageMatchesChecksum() invocations with zero ImageSize until MM is fixed. - Implement a helper ChkSum() routine to be used later by LdrVerifyMappe...
by fireball＠svn.reactos.org 16 Mar '11

16 Mar '11

Author: fireball Date: Wed Mar 16 11:58:12 2011 New Revision: 51061 URL: http://svn.reactos.org/svn/reactos?rev=51061&view=rev Log: [RTL] - Hack away LdrVerifyMappedImageMatchesChecksum() invocations with zero ImageSize until MM is fixed. - Implement a helper ChkSum() routine to be used later by LdrVerifyMappedImageMatchesChecksum(). Modified: trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/lib/rtl/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/image.c?rev=51061&… ============================================================================== --- trunk/reactos/lib/rtl/image.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/image.c [iso-8859-1] Wed Mar 16 11:58:12 2011 @@ -20,6 +20,25 @@ /* FUNCTIONS *****************************************************************/ +USHORT +FORCEINLINE +ChkSum(ULONG Sum, PUSHORT Src, ULONG Len) +{ + ULONG i; + + for (i=0; i<Len; i++) + { + /* Sum up the current word */ + Sum += Src[i]; + + /* Sum up everything above the low word as a carry */ + Sum = (Sum & 0xFFFF) + (Sum >> 16); + } + + /* Apply carry one more time and clamp to the USHORT */ + return (Sum + (Sum >> 16)) & 0xFFFF; +} + BOOLEAN NTAPI LdrVerifyMappedImageMatchesChecksum( @@ -34,8 +53,11 @@ ULONG HeaderSum; ULONG i; + // HACK: Ignore calls with ImageSize=0. Should be fixed by new MM. + if (ImageSize == 0) return TRUE; + /* Get NT header to check if it's an image at all */ - Header = RtlImageNtHeader (BaseAddress); + Header = RtlImageNtHeader(BaseAddress); if (!Header) return FALSE; /* Get checksum to match */ @@ -93,7 +115,7 @@ CalcSum += ImageSize; if (CalcSum != HeaderSum) - DPRINT1("Image %p checksum mismatches! 0x%x != 0x%x\n", BaseAddress, CalcSum, HeaderSum); + DPRINT1("Image %p checksum mismatches! 0x%x != 0x%x, ImageSize %x, FileLen %x\n", BaseAddress, CalcSum, HeaderSum, ImageSize, FileLength); return (BOOLEAN)(CalcSum == HeaderSum); }

1 0

[fireball] 51060: [NTDLL/LDR] - Rewrite LdrImageMatchesChecksum, remove now outdated LdrpCheckImageChecksum.
by fireball＠svn.reactos.org 16 Mar '11

16 Mar '11

Author: fireball Date: Wed Mar 16 09:52:41 2011 New Revision: 51060 URL: http://svn.reactos.org/svn/reactos?rev=51060&view=rev Log: [NTDLL/LDR] - Rewrite LdrImageMatchesChecksum, remove now outdated LdrpCheckImageChecksum. Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Wed Mar 16 09:52:41 2011 @@ -246,4 +246,136 @@ return Status; } +/* + * @implemented + */ +NTSTATUS +NTAPI +LdrVerifyImageMatchesChecksum(IN HANDLE FileHandle, + IN PLDR_CALLBACK Callback, + IN PVOID CallbackContext, + OUT PUSHORT ImageCharacteristics) +{ + FILE_STANDARD_INFORMATION FileStandardInfo; + PIMAGE_IMPORT_DESCRIPTOR ImportData; + PIMAGE_SECTION_HEADER LastSection; + IO_STATUS_BLOCK IoStatusBlock; + PIMAGE_NT_HEADERS NtHeader; + HANDLE SectionHandle; + SIZE_T ViewSize = 0; + PVOID ViewBase = NULL; + BOOLEAN Result; + NTSTATUS Status; + PVOID ImportName; + ULONG Size; + + DPRINT("LdrVerifyImageMatchesChecksum() called\n"); + + /* Create the section */ + Status = NtCreateSection(&SectionHandle, + SECTION_MAP_EXECUTE, + NULL, + NULL, + PAGE_EXECUTE, + SEC_COMMIT, + FileHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1 ("NtCreateSection() failed (Status 0x%x)\n", Status); + return Status; + } + + /* Map the section */ + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &ViewBase, + 0, + 0, + NULL, + &ViewSize, + ViewShare, + 0, + PAGE_EXECUTE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtMapViewOfSection() failed (Status 0x%x)\n", Status); + NtClose(SectionHandle); + return Status; + } + + /* Get the file information */ + Status = NtQueryInformationFile(FileHandle, + &IoStatusBlock, + &FileStandardInfo, + sizeof(FILE_STANDARD_INFORMATION), + FileStandardInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtMapViewOfSection() failed (Status 0x%x)\n", Status); + NtUnmapViewOfSection(NtCurrentProcess(), ViewBase); + NtClose(SectionHandle); + return Status; + } + + /* Protect with SEH */ + _SEH2_TRY + { + /* Verify the checksum */ + Result = LdrVerifyMappedImageMatchesChecksum(ViewBase, + ViewSize, + FileStandardInfo.EndOfFile.LowPart); + + /* Check if a callback was supplied */ + if (Result && Callback) + { + /* Get the NT Header */ + NtHeader = RtlImageNtHeader(ViewBase); + + /* Check if caller requested this back */ + if (ImageCharacteristics) + { + /* Return to caller */ + *ImageCharacteristics = NtHeader->FileHeader.Characteristics; + } + + /* Get the Import Directory Data */ + ImportData = RtlImageDirectoryEntryToData(ViewBase, + FALSE, + IMAGE_DIRECTORY_ENTRY_IMPORT, + &Size); + + /* Make sure there is one */ + if (ImportData) + { + /* Loop the imports */ + while (ImportData->Name) + { + /* Get the name */ + ImportName = RtlImageRvaToVa(NtHeader, + ViewBase, + ImportData->Name, + &LastSection); + + /* Notify the callback */ + Callback(CallbackContext, ImportName); + ImportData++; + } + } + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Fail the request returning STATUS_IMAGE_CHECKSUM_MISMATCH */ + Result = FALSE; + } + _SEH2_END; + + /* Unmap file and close handle */ + NtUnmapViewOfSection(NtCurrentProcess(), ViewBase); + NtClose(SectionHandle); + + /* Return status */ + return !Result ? STATUS_IMAGE_CHECKSUM_MISMATCH : Status; +} + /* EOF */ 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] Wed Mar 16 09:52:41 2011 @@ -2950,76 +2950,6 @@ return(Status); } - -static BOOLEAN -LdrpCheckImageChecksum (IN PVOID BaseAddress, - IN ULONG ImageSize) -{ - PIMAGE_NT_HEADERS Header; - PUSHORT Ptr; - ULONG Sum; - ULONG CalcSum; - ULONG HeaderSum; - ULONG i; - - Header = RtlImageNtHeader (BaseAddress); - if (Header == NULL) - return FALSE; - - HeaderSum = Header->OptionalHeader.CheckSum; - if (HeaderSum == 0) - return TRUE; - - Sum = 0; - Ptr = (PUSHORT) BaseAddress; - for (i = 0; i < ImageSize / sizeof (USHORT); i++) - { - Sum += (ULONG)*Ptr; - if (HIWORD(Sum) != 0) - { - Sum = LOWORD(Sum) + HIWORD(Sum); - } - Ptr++; - } - - if (ImageSize & 1) - { - Sum += (ULONG)*((PUCHAR)Ptr); - if (HIWORD(Sum) != 0) - { - Sum = LOWORD(Sum) + HIWORD(Sum); - } - } - - CalcSum = (USHORT)(LOWORD(Sum) + HIWORD(Sum)); - - /* Subtract image checksum from calculated checksum. */ - /* fix low word of checksum */ - if (LOWORD(CalcSum) >= LOWORD(HeaderSum)) - { - CalcSum -= LOWORD(HeaderSum); - } - else - { - CalcSum = ((LOWORD(CalcSum) - LOWORD(HeaderSum)) & 0xFFFF) - 1; - } - - /* fix high word of checksum */ - if (LOWORD(CalcSum) >= HIWORD(HeaderSum)) - { - CalcSum -= HIWORD(HeaderSum); - } - else - { - CalcSum = ((LOWORD(CalcSum) - HIWORD(HeaderSum)) & 0xFFFF) - 1; - } - - /* add file length */ - CalcSum += ImageSize; - - return (BOOLEAN)(CalcSum == HeaderSum); -} - /* * Compute size of an image as it is actually present in virt memory * (i.e. excluding NEVER_LOAD sections) @@ -3047,100 +2977,6 @@ } return ResidentSize; -} - - -/*************************************************************************** - * NAME EXPORTED - * LdrVerifyImageMatchesChecksum - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - * - * NOTE - * - * @implemented - */ -NTSTATUS NTAPI -LdrVerifyImageMatchesChecksum (IN HANDLE FileHandle, - IN PLDR_CALLBACK Callback, - IN PVOID CallbackContext, - OUT PUSHORT ImageCharacterstics) -{ - FILE_STANDARD_INFORMATION FileInfo; - IO_STATUS_BLOCK IoStatusBlock; - HANDLE SectionHandle; - SIZE_T ViewSize; - PVOID BaseAddress; - BOOLEAN Result; - NTSTATUS Status; - - DPRINT ("LdrVerifyImageMatchesChecksum() called\n"); - - Status = NtCreateSection (&SectionHandle, - SECTION_MAP_READ, - NULL, - NULL, - PAGE_READONLY, - SEC_COMMIT, - FileHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("NtCreateSection() failed (Status %lx)\n", Status); - return Status; - } - - ViewSize = 0; - BaseAddress = NULL; - Status = NtMapViewOfSection (SectionHandle, - NtCurrentProcess (), - &BaseAddress, - 0, - 0, - NULL, - &ViewSize, - ViewShare, - 0, - PAGE_READONLY); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("NtMapViewOfSection() failed (Status %lx)\n", Status); - NtClose (SectionHandle); - return Status; - } - - Status = NtQueryInformationFile(FileHandle, - &IoStatusBlock, - &FileInfo, - sizeof (FILE_STANDARD_INFORMATION), - FileStandardInformation); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("NtMapViewOfSection() failed (Status %lx)\n", Status); - NtUnmapViewOfSection (NtCurrentProcess(), - BaseAddress); - NtClose (SectionHandle); - return Status; - } - - Result = LdrpCheckImageChecksum(BaseAddress, - FileInfo.EndOfFile.u.LowPart); - if (Result == FALSE) - { - Status = STATUS_IMAGE_CHECKSUM_MISMATCH; - } - - NtUnmapViewOfSection (NtCurrentProcess(), - BaseAddress); - - NtClose(SectionHandle); - - return Status; } PIMAGE_BASE_RELOCATION

1 0

[fireball] 51059: [RTL] - Implement LdrVerifyMappedImageChecksum (copied from ntdll/ldr/utils.c).
by fireball＠svn.reactos.org 16 Mar '11

16 Mar '11

Author: fireball Date: Wed Mar 16 09:49:07 2011 New Revision: 51059 URL: http://svn.reactos.org/svn/reactos?rev=51059&view=rev Log: [RTL] - Implement LdrVerifyMappedImageChecksum (copied from ntdll/ldr/utils.c). Modified: trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/lib/rtl/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/image.c?rev=51059&… ============================================================================== --- trunk/reactos/lib/rtl/image.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/image.c [iso-8859-1] Wed Mar 16 09:49:07 2011 @@ -24,11 +24,78 @@ NTAPI LdrVerifyMappedImageMatchesChecksum( IN PVOID BaseAddress, - IN ULONG NumberOfBytes, + IN ULONG ImageSize, IN ULONG FileLength) { - /* FIXME: TODO */ - return TRUE; + PIMAGE_NT_HEADERS Header; + PUSHORT Ptr; + ULONG Sum; + ULONG CalcSum; + ULONG HeaderSum; + ULONG i; + + /* Get NT header to check if it's an image at all */ + Header = RtlImageNtHeader (BaseAddress); + if (!Header) return FALSE; + + /* Get checksum to match */ + HeaderSum = Header->OptionalHeader.CheckSum; + + /* Zero checksum seems to be accepted */ + if (HeaderSum == 0) return TRUE; + + /* Calculate the checksum */ + Sum = 0; + Ptr = (PUSHORT) BaseAddress; + for (i = 0; i < ImageSize / sizeof (USHORT); i++) + { + Sum += (ULONG)*Ptr; + if (HIWORD(Sum) != 0) + { + Sum = LOWORD(Sum) + HIWORD(Sum); + } + Ptr++; + } + + if (ImageSize & 1) + { + Sum += (ULONG)*((PUCHAR)Ptr); + if (HIWORD(Sum) != 0) + { + Sum = LOWORD(Sum) + HIWORD(Sum); + } + } + + CalcSum = (USHORT)(LOWORD(Sum) + HIWORD(Sum)); + + /* Subtract image checksum from calculated checksum. */ + /* fix low word of checksum */ + if (LOWORD(CalcSum) >= LOWORD(HeaderSum)) + { + CalcSum -= LOWORD(HeaderSum); + } + else + { + CalcSum = ((LOWORD(CalcSum) - LOWORD(HeaderSum)) & 0xFFFF) - 1; + } + + /* Fix high word of checksum */ + if (LOWORD(CalcSum) >= HIWORD(HeaderSum)) + { + CalcSum -= HIWORD(HeaderSum); + } + else + { + CalcSum = ((LOWORD(CalcSum) - HIWORD(HeaderSum)) & 0xFFFF) - 1; + } + + /* Add file length */ + CalcSum += ImageSize; + + if (CalcSum != HeaderSum) + DPRINT1("Image %p checksum mismatches! 0x%x != 0x%x\n", BaseAddress, CalcSum, HeaderSum); + + return (BOOLEAN)(CalcSum == HeaderSum); } /*

1 0

[cfinck] 51058: [CRT] - Revert 38185 which synced fputwc to the Wine version for the sake of fixing Winetests. This removed the implicit ANSI conversion, which was honestly checking the wrong flags...
by cfinck＠svn.reactos.org 15 Mar '11

15 Mar '11

Author: cfinck Date: Tue Mar 15 23:45:38 2011 New Revision: 51058 URL: http://svn.reactos.org/svn/reactos?rev=51058&view=rev Log: [CRT] - Revert 38185 which synced fputwc to the Wine version for the sake of fixing Winetests. This removed the implicit ANSI conversion, which was honestly checking the wrong flags. The new version correctly checks for WX_TEXT and only does the conversion in this case. This way we also don't fail any additional Winetests. - Simplify streamout_char in the new printf implementation and use _fputtc instead of _flsbuf. This way, we correctly do an implicit ANSI conversion when required. - Fix fgetwc declaration. Thanks to Timo for many hints and assistance. Most of this code is actually his idea :-) Thanks to Olaf for providing a build server to speed up my code tests. See issue #6007 for more details. Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Tue Mar 15 23:45:38 2011 @@ -16,13 +16,6 @@ #ifdef _UNICODE # define streamout wstreamout # define format_float format_floatw -# define _flsbuf _flswbuf -int __cdecl _flswbuf(int ch, FILE *stream); -#endif - -#ifdef _LIBCNT_ -# undef _flsbuf -# define _flsbuf(chr, stream) _TEOF #endif #define MB_CUR_MAX 10 @@ -234,25 +227,19 @@ int streamout_char(FILE *stream, int chr) { +#if defined(_USER32_WSPRINTF) || defined(_LIBCNT_) /* Check if the buffer is full */ if (stream->_cnt < sizeof(TCHAR)) - { -#ifdef _USER32_WSPRINTF - return _TEOF; -#else - /* Strings are done now */ - if (stream->_flag & _IOSTRG) return _TEOF; - - /* Flush buffer for files */ - return _flsbuf(chr, stream) != _TEOF; -#endif - } + return 0; *(TCHAR*)stream->_ptr = chr; stream->_ptr += sizeof(TCHAR); stream->_cnt -= sizeof(TCHAR); return 1; +#else + return _fputtc((TCHAR)chr, stream) != _TEOF; +#endif } static Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Tue Mar 15 23:45:38 2011 @@ -2175,12 +2175,33 @@ /********************************************************************* * fputwc (MSVCRT.@) */ -wint_t CDECL fputwc(wint_t wc, FILE* file) -{ - wchar_t mwc=wc; - if (fwrite( &mwc, sizeof(mwc), 1, file) != 1) - return WEOF; - return wc; +wint_t CDECL fputwc(wchar_t c, FILE* stream) +{ + /* If this is a real file stream (and not some temporary one for + sprintf-like functions), check whether it is opened in text mode. + In this case, we have to perform an implicit conversion to ANSI. */ + if (!(stream->_flag & _IOSTRG) && fdesc[stream->_file].wxflag & WX_TEXT) + { + /* Convert to multibyte in text mode */ + char mbc[MB_LEN_MAX]; + int mb_return; + + mb_return = wctomb(mbc, c); + + if(mb_return == -1) + return WEOF; + + /* Output all characters */ + if (fwrite(mbc, mb_return, 1, stream) != 1) + return WEOF; + } + else + { + if (fwrite(&c, sizeof(c), 1, stream) != 1) + return WEOF; + } + + return c; } /*********************************************************************

1 0

[pschweitzer] 51057: [NDK] Define HAL_IRQ_TRANSLATOR_VERSION constant [NTOSKRNL] When needed, use HAL_IRQ_TRANSLATOR_VERSION from NDK and don't define it locally
by pschweitzer＠svn.reactos.org 15 Mar '11

15 Mar '11

Author: pschweitzer Date: Tue Mar 15 19:45:43 2011 New Revision: 51057 URL: http://svn.reactos.org/svn/reactos?rev=51057&view=rev Log: [NDK] Define HAL_IRQ_TRANSLATOR_VERSION constant [NTOSKRNL] When needed, use HAL_IRQ_TRANSLATOR_VERSION from NDK and don't define it locally Modified: trunk/reactos/include/ndk/haltypes.h trunk/reactos/ntoskrnl/fstub/translate.c Modified: trunk/reactos/include/ndk/haltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/haltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/haltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/haltypes.h [iso-8859-1] Tue Mar 15 19:45:43 2011 @@ -270,8 +270,13 @@ // extern PUCHAR NTHALAPI KdComPortInUse; -#endif -#endif - - - +// +// HAL Constants +// +#define HAL_IRQ_TRANSLATOR_VERSION 0x0 + +#endif +#endif + + + Modified: trunk/reactos/ntoskrnl/fstub/translate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/translate.c… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/translate.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/translate.c [iso-8859-1] Tue Mar 15 19:45:43 2011 @@ -11,8 +11,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> - -#define HAL_IRQ_TRANSLATOR_VERSION 0x0 /* PRIVATE FUNCTIONS *********************************************************/

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
28
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 March 2011