Ros-diffs March 2012

ros-diffs@reactos.org

22 participants
351 discussions

[cgutman] 56184: [NTOSKRNL] - Reenable some dereferences of the driver object - Fix return values in NtLoadDriver - Split unloading into code for legacy drivers and non-legacy drivers
by cgutman＠svn.reactos.org 18 Mar '12

18 Mar '12

Author: cgutman Date: Sun Mar 18 22:11:46 2012 New Revision: 56184 URL: http://svn.reactos.org/svn/reactos?rev=56184&view=rev Log: [NTOSKRNL] - Reenable some dereferences of the driver object - Fix return values in NtLoadDriver - Split unloading into code for legacy drivers and non-legacy drivers Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Sun Mar 18 22:11:46 2012 @@ -364,10 +364,44 @@ NTAPI IopUnloadDevice(IN PDEVICE_OBJECT DeviceObject) { -#if 0 PDRIVER_OBJECT DriverObject = DeviceObject->DriverObject; PEXTENDED_DEVOBJ_EXTENSION ThisExtension = IoGetDevObjExtension(DeviceObject); - PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject); + + /* Check if deletion is pending */ + if (ThisExtension->ExtensionFlags & DOE_DELETE_PENDING) + { + if (DeviceObject->AttachedDevice) + { + DPRINT("Device object is in the middle of a device stack\n"); + return; + } + + if (DeviceObject->ReferenceCount) + { + DPRINT("Device object still has %d references\n", DeviceObject->ReferenceCount); + return; + } + + /* Check if we have a Security Descriptor */ + if (DeviceObject->SecurityDescriptor) + { + /* Free it */ + ExFreePoolWithTag(DeviceObject->SecurityDescriptor, TAG_SD); + } + + /* Remove the device from the list */ + IopEditDeviceList(DeviceObject->DriverObject, DeviceObject, IopRemove); + + /* Dereference the keep-alive */ + ObDereferenceObject(DeviceObject); + } + + /* We can't unload a non-PnP driver here */ + if (DriverObject->Flags & DRVO_LEGACY_DRIVER) + { + DPRINT("Not a PnP driver! '%wZ' will not be unloaded!\n", &DriverObject->DriverName); + return; + } /* Return if we've already called unload (maybe we're in it?) */ if (DriverObject->Flags & DRVO_UNLOAD_INVOKED) return; @@ -375,80 +409,15 @@ /* We can't unload unless there's an unload handler */ if (!DriverObject->DriverUnload) { - if (DeviceNode && !(DeviceNode->Flags & DNF_LEGACY_DRIVER)) - DPRINT1("No DriverUnload function on PnP driver! '%wZ' will not be unloaded!\n", &DriverObject->DriverName); - + DPRINT1("No DriverUnload function on PnP driver! '%wZ' will not be unloaded!\n", &DriverObject->DriverName); return; } - /* Check if deletion is pending */ - if (ThisExtension->ExtensionFlags & DOE_DELETE_PENDING) - { - if (DeviceObject->AttachedDevice) - { - DPRINT("Device object is in the middle of a device stack\n"); - return; - } - - if (DeviceObject->ReferenceCount) - { - DPRINT("Device object still has %d references\n", DeviceObject->ReferenceCount); - return; - } - - /* Check if we have a Security Descriptor */ - if (DeviceObject->SecurityDescriptor) - { - /* Free it */ - ExFreePoolWithTag(DeviceObject->SecurityDescriptor, TAG_SD); - } - - /* Remove the device from the list */ - IopEditDeviceList(DeviceObject->DriverObject, DeviceObject, IopRemove); - - /* Dereference the keep-alive */ - ObDereferenceObject(DeviceObject); - } - - /* Loop all the device objects */ - DeviceObject = DriverObject->DeviceObject; - while (DeviceObject) - { - /* - * Make sure we're not attached, having a reference count - * or already deleting - */ - if (DeviceObject->ReferenceCount) - { - DPRINT("Device object still has %d references\n", DeviceObject->ReferenceCount); - return; - } - - if (DeviceObject->AttachedDevice) - { - DPRINT("Device object is in the middle of a device stack\n"); - return; - } - - if (IoGetDevObjExtension(DeviceObject)->ExtensionFlags & (DOE_DELETE_PENDING | DOE_REMOVE_PENDING)) - { - DPRINT("Device object has a pending destructive operation\n"); - return; - } - - /* Check the next device */ - DeviceObject = DeviceObject->NextDevice; - } - - /* Loop all the device objects */ - DeviceObject = DriverObject->DeviceObject; - while (DeviceObject) - { - /* Set the unload pending flag */ - IoGetDevObjExtension(DeviceObject)->ExtensionFlags |= DOE_UNLOAD_PENDING; - - /* Go to the next device */ - DeviceObject = DeviceObject->NextDevice; + /* Bail if there are still devices present */ + if (DriverObject->DeviceObject) + { + DPRINT("Devices still present! '%wZ' will not be unloaded!\n", &DriverObject->DriverName); + return; } DPRINT1("Unloading driver '%wZ' (automatic)\n", &DriverObject->DriverName); @@ -461,10 +430,6 @@ /* Make object temporary so it can be deleted */ ObMakeTemporaryObject(DriverObject); - - /* Dereference once more, referenced at driver object creation */ - ObDereferenceObject(DriverObject); -#endif } VOID Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sun Mar 18 22:11:46 2012 @@ -589,7 +589,7 @@ Status = IopInitializeDevice(DeviceNode, DriverObject); /* Remove extra reference */ - //ObDereferenceObject(DriverObject); + ObDereferenceObject(DriverObject); } return STATUS_SUCCESS; @@ -885,7 +885,7 @@ } /* Remove extra reference from IopInitializeDriverModule */ - //ObDereferenceObject(DriverObject); + ObDereferenceObject(DriverObject); return Status; } @@ -948,6 +948,7 @@ { /* Fail */ IopFreeDeviceNode(DeviceNode); + ObDereferenceObject(DriverObject); return; } @@ -957,6 +958,7 @@ { /* Fail */ IopFreeDeviceNode(DeviceNode); + ObDereferenceObject(DriverObject); return; } @@ -1268,7 +1270,8 @@ */ /* Call the load/unload routine, depending on current process */ - if (DriverObject->DriverUnload && DriverObject->DriverSection) + if (DriverObject->DriverUnload && DriverObject->DriverSection && + (UnloadPnpDrivers || (DriverObject->Flags & DRVO_LEGACY_DRIVER))) { /* Loop through each device object of the driver and set DOE_UNLOAD_PENDING flag */ @@ -1484,7 +1487,7 @@ RtlZeroMemory(DriverObject, ObjectSize); DriverObject->Type = IO_TYPE_DRIVER; DriverObject->Size = sizeof(DRIVER_OBJECT); - DriverObject->Flags = DRVO_LEGACY_DRIVER;//DRVO_BUILTIN_DRIVER; + DriverObject->Flags = DRVO_LEGACY_DRIVER; DriverObject->DriverExtension = (PDRIVER_EXTENSION)(DriverObject + 1); DriverObject->DriverExtension->DriverObject = DriverObject; DriverObject->DriverInit = InitializationFunction; @@ -1584,6 +1587,10 @@ /* Returns to caller the object */ *pDriverObject = DriverObject; } + + /* We're going to say if we don't have any DOs from DriverEntry, then we're not legacy. + * Other parts of the I/O manager depend on this behavior */ + if (!DriverObject->DeviceObject) DriverObject->Flags &= ~DRVO_LEGACY_DRIVER; /* Loop all Major Functions */ for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) @@ -1920,7 +1927,7 @@ DPRINT("Loading module from %wZ\n", &ImagePath); Status = MmLoadSystemImage(&ImagePath, NULL, NULL, 0, (PVOID)&ModuleObject, &BaseAddress); - if (!NT_SUCCESS(Status) && Status != STATUS_IMAGE_ALREADY_LOADED) + if (!NT_SUCCESS(Status)) { DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); LoadParams->Status = Status; @@ -1931,43 +1938,37 @@ /* * Initialize the driver module if it's loaded for the first time */ - if (Status != STATUS_IMAGE_ALREADY_LOADED) + Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &ServiceName, &DeviceNode); + if (!NT_SUCCESS(Status)) { - Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &ServiceName, &DeviceNode); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopCreateDeviceNode() failed (Status %lx)\n", Status); - MmUnloadSystemImage(ModuleObject); - LoadParams->Status = Status; - (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); - return; - } - - IopDisplayLoadingMessage(&DeviceNode->ServiceName); - - Status = IopInitializeDriverModule( - DeviceNode, - ModuleObject, - &DeviceNode->ServiceName, - (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || - Type == 8 /* SERVICE_RECOGNIZER_DRIVER */), - &DriverObject); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopInitializeDriver() failed (Status %lx)\n", Status); - MmUnloadSystemImage(ModuleObject); - IopFreeDeviceNode(DeviceNode); - LoadParams->Status = Status; - (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); - return; - } - - /* Initialize and start device */ - IopInitializeDevice(DeviceNode, DriverObject); - Status = IopStartDevice(DeviceNode); + DPRINT1("IopCreateDeviceNode() failed (Status %lx)\n", Status); + MmUnloadSystemImage(ModuleObject); + LoadParams->Status = Status; + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + return; } + + IopDisplayLoadingMessage(&DeviceNode->ServiceName); + + Status = IopInitializeDriverModule(DeviceNode, + ModuleObject, + &DeviceNode->ServiceName, + (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || + Type == 8 /* SERVICE_RECOGNIZER_DRIVER */), + &DriverObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopInitializeDriver() failed (Status %lx)\n", Status); + MmUnloadSystemImage(ModuleObject); + IopFreeDeviceNode(DeviceNode); + LoadParams->Status = Status; + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + return; + } + + /* Initialize and start device */ + IopInitializeDevice(DeviceNode, DriverObject); + Status = IopStartDevice(DeviceNode); } else {

1 0

[cgutman] 56183: [NTOSKRNL] - Remove an extra deference to the device object that happened inside the IopDeleteDevice function (called by Ob when the reference count is 0)
by cgutman＠svn.reactos.org 18 Mar '12

18 Mar '12

Author: cgutman Date: Sun Mar 18 21:38:45 2012 New Revision: 56183 URL: http://svn.reactos.org/svn/reactos?rev=56183&view=rev Log: [NTOSKRNL] - Remove an extra deference to the device object that happened inside the IopDeleteDevice function (called by Ob when the reference count is 0) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Mar 18 21:38:45 2012 @@ -1158,12 +1158,9 @@ /* All children must be deleted before a parent is deleted */ ASSERT(!DeviceNode->Child); + ASSERT(DeviceNode->PhysicalDeviceObject); KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); - - ASSERT(DeviceNode->PhysicalDeviceObject); - - ObDereferenceObject(DeviceNode->PhysicalDeviceObject); /* Get previous sibling */ if (DeviceNode->Parent && DeviceNode->Parent->Child != DeviceNode)

1 0

[ekohl] 56182: [INCLUDE] Add pSetupGuidFromString(), pSetupIsGuidNull() and pSetupStringFromGuid() to the PSDK header setupapi.h and remove a local declaration.
by ekohl＠svn.reactos.org 18 Mar '12

18 Mar '12

Author: ekohl Date: Sun Mar 18 21:28:48 2012 New Revision: 56182 URL: http://svn.reactos.org/svn/reactos?rev=56182&view=rev Log: [INCLUDE] Add pSetupGuidFromString(), pSetupIsGuidNull() and pSetupStringFromGuid() to the PSDK header setupapi.h and remove a local declaration. Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/include/psdk/setupapi.h Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Sun Mar 18 21:28:48 2012 @@ -30,9 +30,6 @@ #define NDEBUG #include <debug.h> - -/* setupapi */ -DWORD WINAPI pSetupGuidFromString(PCWSTR pString, LPGUID lpGUID); typedef INT_PTR (WINAPI *PPROPERTYSHEETW)(LPCPROPSHEETHEADERW); typedef HPROPSHEETPAGE (WINAPI *PCREATEPROPERTYSHEETPAGEW)(LPCPROPSHEETPAGEW); Modified: trunk/reactos/include/psdk/setupapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/setupapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/setupapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/setupapi.h [iso-8859-1] Sun Mar 18 21:28:48 2012 @@ -1434,10 +1434,12 @@ WINSETUPAPI BOOL WINAPI pSetupEnablePrivilege(PCWSTR, BOOL); WINSETUPAPI PWSTR WINAPI pSetupGetFileTitle(PCWSTR); WINSETUPAPI BOOL WINAPI pSetupGetVersionInfoFromImage(LPWSTR, PULARGE_INTEGER, LPWORD); +WINSETUPAPI DWORD WINAPI pSetupGuidFromString(PCWSTR, LPGUID); +WINSETUPAPI BOOL WINAPI pSetupIsGuidNull(LPGUID); WINSETUPAPI BOOL WINAPI pSetupIsUserAdmin(VOID); WINSETUPAPI PWSTR WINAPI pSetupMultiByteToUnicode(PCSTR, UINT); WINSETUPAPI DWORD WINAPI pSetupOpenAndMapForRead(PCWSTR, PDWORD, PHANDLE, PHANDLE, PVOID*); - +WINSETUPAPI DWORD WINAPI pSetupStringFromGuid(LPGUID, PWSTR, DWORD); WINSETUPAPI DWORD WINAPI pSetupStringTableAddString(HSTRING_TABLE, LPWSTR, DWORD);

1 0

[cgutman] 56181: [PCI] - Add an unload handler to prevent warnings from the I/O manager
by cgutman＠svn.reactos.org 18 Mar '12

18 Mar '12

Author: cgutman Date: Sun Mar 18 21:04:12 2012 New Revision: 56181 URL: http://svn.reactos.org/svn/reactos?rev=56181&view=rev Log: [PCI] - Add an unload handler to prevent warnings from the I/O manager Modified: trunk/reactos/drivers/bus/pci/pci.c Modified: trunk/reactos/drivers/bus/pci/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pci.c [iso-8859-1] Sun Mar 18 21:04:12 2012 @@ -181,6 +181,14 @@ } +VOID +NTAPI +PciUnload( + IN PDRIVER_OBJECT DriverObject) +{ + /* The driver object extension is destroyed by the I/O manager */ +} + NTSTATUS NTAPI DriverEntry( @@ -196,6 +204,7 @@ DriverObject->MajorFunction[IRP_MJ_PNP] = PciPnpControl; DriverObject->MajorFunction[IRP_MJ_POWER] = PciPowerControl; DriverObject->DriverExtension->AddDevice = PciAddDevice; + DriverObject->DriverUnload = PciUnload; Status = IoAllocateDriverObjectExtension( DriverObject,

1 0

[rharabien] 56180: [VBE_NEW][REGEDIT] - Fix two bugs mentioned by Victor on mailing list. Other bugs was already fixed.
by rharabien＠svn.reactos.org 18 Mar '12

18 Mar '12

Author: rharabien Date: Sun Mar 18 14:02:07 2012 New Revision: 56180 URL: http://svn.reactos.org/svn/reactos?rev=56180&view=rev Log: [VBE_NEW][REGEDIT] - Fix two bugs mentioned by Victor on mailing list. Other bugs was already fixed. Modified: trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/drivers/video/miniport/vga_new/vbe.c Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] Sun Mar 18 14:02:07 2012 @@ -290,7 +290,7 @@ str[val_idx] = str[str_idx]; break; default: - fprintf(stderr,"Warning! Unrecognized escape sequence: \\%c'\n", + fprintf(stderr,"Warning! Unrecognized escape sequence: \\%C'\n", str[str_idx]); str[val_idx] = str[str_idx]; break; Modified: trunk/reactos/drivers/video/miniport/vga_new/vbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga_new/vbe.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vga_new/vbe.c [iso-8859-1] Sun Mar 18 14:02:07 2012 @@ -12,10 +12,10 @@ /* GLOBALS ********************************************************************/ -static const PCHAR Nv11Board = "NV11 (GeForce2) Board"; -static const PCHAR Nv11Chip = "Chip Rev B2"; -static const PCHAR Nv11Vendor = "NVidia Corporation"; -static const PCHAR IntelBrookdale = "Brookdale-G Graphics Controller"; +static const CHAR Nv11Board[] = "NV11 (GeForce2) Board"; +static const CHAR Nv11Chip[] = "Chip Rev B2"; +static const CHAR Nv11Vendor[] = "NVidia Corporation"; +static const CHAR IntelBrookdale[] = "Brookdale-G Graphics Controller"; static const PCHAR BrokenVesaBiosList[] = { "SiS 5597", @@ -51,12 +51,12 @@ } /* For Brookdale-G (Intel), special hack used */ - g_bIntelBrookdaleBIOS = !strncmp(Product, IntelBrookdale, sizeof(IntelBrookdale)); + g_bIntelBrookdaleBIOS = !strncmp(Product, IntelBrookdale, sizeof(IntelBrookdale) - 1); /* For NVIDIA make sure */ - if (!(strncmp(Vendor, Nv11Vendor, sizeof(Nv11Vendor))) && - !(strncmp(Product, Nv11Board, sizeof(Nv11Board))) && - !(strncmp(Revision, Nv11Chip, sizeof(Nv11Chip))) && + if (!(strncmp(Vendor, Nv11Vendor, sizeof(Nv11Vendor) - 1)) && + !(strncmp(Product, Nv11Board, sizeof(Nv11Board) - 1)) && + !(strncmp(Revision, Nv11Chip, sizeof(Nv11Chip) - 1)) && (OemRevision == 0x311)) { /* Read version */

1 0

[dreimer] 56179: rapps update.
by dreimer＠svn.reactos.org 17 Mar '12

17 Mar '12

Author: dreimer Date: Sat Mar 17 22:07:56 2012 New Revision: 56179 URL: http://svn.reactos.org/svn/reactos?rev=56179&view=rev Log: rapps update. Modified: trunk/reactos/base/applications/rapps/rapps/bittorrent.txt trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/firefox5.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/smplayer.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt Modified: trunk/reactos/base/applications/rapps/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/bittorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/bittorrent.txt [iso-8859-1] Sat Mar 17 22:07:56 2012 @@ -2,13 +2,13 @@ [Section] Name = BitTorrent -Version = 7.6 +Version = 7.6.1 Licence = Freeware for non-commercial uses Description = The Original BitTorrent Client. Size = 5.78M Category = 5 URLSite = http://www.bittorrent.com/ -URLDownload = http://download.bittorrent.com/dl/BitTorrent-7.6.exe +URLDownload = http://download.bittorrent.com/dl/BitTorrent-7.6.1.exe CDPath = none [Section.0407] 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] Sat Mar 17 22:07:56 2012 @@ -2,59 +2,59 @@ [Section] Name = Mozilla Firefox 3.6 -Version = 3.6.27 +Version = 3.6.28 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. Size = 8.22MB Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 8.06MB URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 8.05MB URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. Size = 8.28MB URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 8.06MB URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 8.9MB URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 8.46MB URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. Size = 8.53MB URLSite = http://www.mozilla-europe.org/sk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Size = 8.44MB URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… Modified: trunk/reactos/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] Sat Mar 17 22:07:56 2012 @@ -1,60 +1,60 @@ ï»¿; UTF-8 [Section] -Name = Mozilla Firefox 10 -Version = 10.0.2 +Name = Mozilla Firefox 11 +Version = 11.0 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. Size = 15.06MB Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/e… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/11.0/win32/en-… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 14.92MB URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/d… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/11.0/win32/de/… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 14.88MB URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/e… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/11.0/win32/es-… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. Size = 15.18MB URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/f… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/11.0/win32/fr/… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 14.91MB URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/n… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/11.0/win32/nb-… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 15.76MB URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/p… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/11.0/win32/pl/… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 15.33MB URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/r… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/11.0/win32/ru/… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. Size = 15.57MB URLSite = http://www.mozilla-europe.org/sk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/s… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/11.0/win32/sk/… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Size = 15.32MB URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/u… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/11.0/win32/uk/… Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] Sat Mar 17 22:07:56 2012 @@ -2,13 +2,13 @@ [Section] Name = LibreOffice -Version = 3.5.0 +Version = 3.5.1 Licence = LGPL Description = Former called OpenOffice. Open Source Office Suite. -Size = 201.3MB +Size = 201.6MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/3.5.0/win/x86/Lib… +URLDownload = http://download.documentfoundation.org/libreoffice/stable/3.5.1/win/x86/Lib… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Sat Mar 17 22:07:56 2012 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.9.44 +Version = 0.9.46 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 3.1MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.44-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.46-unicode.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Sat Mar 17 22:07:56 2012 @@ -2,13 +2,13 @@ [Section] Name = SciTE -Version = 3.0.3 +Version = 3.0.4 Licence = Freeware Description = SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs. Size = 666KB Category = 7 URLSite = http://www.scintilla.org/ -URLDownload = http://kent.dl.sourceforge.net/project/scintilla/SciTE/3.0.3/Sc303.exe +URLDownload = http://dfn.dl.sourceforge.net/project/scintilla/SciTE/3.0.4/Sc304.exe CDPath = none [Section.0407] 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] Sat Mar 17 22:07:56 2012 @@ -2,41 +2,41 @@ [Section] Name = Mozilla SeaMonkey -Version = 2.7.2 +Version = 2.8 Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. Size = 17.59MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/en-US/SeaMonkey… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.8/win32/en-US/SeaMonkey%2… CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. Size = 17.56MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/de/SeaMonkey%20… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.8/win32/de/SeaMonkey%20Se… [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 = 17.49MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/es-ES/SeaMonkey… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.8/win32/es-ES/SeaMonkey%2… [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 = 17.79MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/fr/SeaMonkey%20… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.8/win32/fr/SeaMonkey%20Se… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. Size = 18.38MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/pl/SeaMonkey%20… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.8/win32/pl/SeaMonkey%20Se… [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 18.01MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/ru/SeaMonkey%20… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.8/win32/ru/SeaMonkey%20Se… [Section.0422] Description = ÐÑÐ¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Mozilla Suite. ÐÐºÐ»ÑÑÐ°Ñ Ð² ÑÐµÐ±Ðµ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ð¹ ÐºÐ»ÑÑÐ½Ñ, IRC-ÐºÐ»ÑÑÐ½Ñ ÑÐ° HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 18.01MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/ru/SeaMonkey%20… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.8/win32/ru/SeaMonkey%20Se… Modified: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] Sat Mar 17 22:07:56 2012 @@ -2,13 +2,13 @@ [Section] Name = SMPlayer -Version = 0.7.0 +Version = 0.7.1 Licence = GPL Description = SMPlayer. -Size = 14.65MB +Size = 15.1MB Category = 1 URLSite = http://smplayer.sourceforge.net/ -URLDownload = http://freefr.dl.sourceforge.net/project/smplayer/SMPlayer/0.7.0/smplayer-0… +URLDownload = http://freefr.dl.sourceforge.net/project/smplayer/SMPlayer/0.7.1/smplayer-0… CDPath = none [Section.0407] 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] Sat Mar 17 22:07:56 2012 @@ -2,47 +2,47 @@ [Section] Name = Mozilla Thunderbird -Version = 3.1.19 +Version = 3.1.20 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 9.06MB Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 8.91MB URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 8.88MB URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. Size = 9.13MB URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 9.73MB URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 9.29MB URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 9.29MB URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] Sat Mar 17 22:07:56 2012 @@ -1,48 +1,48 @@ ï»¿; UTF-8 [Section] -Name = Mozilla Thunderbird 10 -Version = 10.0.2 +Name = Mozilla Thunderbird 11 +Version = 11.0 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 16.22MB Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/11.0/win32… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 15.1MB URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/11.0/win32… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 15.0MB URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/11.0/win32… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. Size = 15.4MB URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/11.0/win32… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 15.9MB URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/11.0/win32… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 15.5MB URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/11.0/win32… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 15.5MB URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/11.0/win32… Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] Sat Mar 17 22:07:56 2012 @@ -2,13 +2,13 @@ [Section] Name = ÂµTorrent -Version = 3.1.2 +Version = 3.1.3 Licence = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. Size = 720.87KB Category = 5 URLSite = http://www.utorrent.com/ -URLDownload = http://download.utorrent.com/3.1.2/utorrent.exe +URLDownload = http://download.utorrent.com/3.1.3/utorrent.exe CDPath = none

1 0

[spetreolle] 56178: [MSCOREE] Add InstallRoot key. It is reg_sz and contains the full path to the installation directory. Checked on Windows & Wine.
by spetreolle＠svn.reactos.org 16 Mar '12

16 Mar '12

Author: spetreolle Date: Fri Mar 16 23:40:50 2012 New Revision: 56178 URL: http://svn.reactos.org/svn/reactos?rev=56178&view=rev Log: [MSCOREE] Add InstallRoot key. It is reg_sz and contains the full path to the installation directory. Checked on Windows & Wine. Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== Binary files - no diff available.

1 0

[spetreolle] 56177: [FUSION] Addendum to r56176: Install fusion.dll to 2 more directories.
by spetreolle＠svn.reactos.org 16 Mar '12

16 Mar '12

Author: spetreolle Date: Fri Mar 16 22:04:47 2012 New Revision: 56177 URL: http://svn.reactos.org/svn/reactos?rev=56177&view=rev Log: [FUSION] Addendum to r56176: Install fusion.dll to 2 more directories. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/dll/win32/fusion/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Fri Mar 16 22:04:47 2012 @@ -24,7 +24,9 @@ 8 = media 9 = Microsoft.NET 10 = Microsoft.NET\Framework -11 = Microsoft.NET\Framework\v2.0.50727 +11 = Microsoft.NET\Framework\v1.1.4322 +12 = Microsoft.NET\Framework\v2.0.50727 +13 = Microsoft.NET\Framework\v4.0.30319 .InfEnd Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Fri Mar 16 22:04:47 2012 @@ -106,8 +106,12 @@ set(${var} 9) elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework) set(${var} 10) + elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.1.4322) + set(${var} 11) elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727) - set(${var} 11) + set(${var} 12) + elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v4.0.30319) + set(${var} 13) else() message(ERROR "Wrong destination: ${dir}") endif() Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Fri Mar 16 22:04:47 2012 @@ -23,4 +23,6 @@ set_module_type(fusion win32dll) target_link_libraries(fusion wine uuid) add_importlibs(fusion shlwapi advapi32 dbghelp user32 msvcrt kernel32 ntdll) +add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR all) +add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v4.0.30319 FOR all)

1 0

[spetreolle] 56176: [FUSION] Install fusion.dll where it belongs.
by spetreolle＠svn.reactos.org 16 Mar '12

16 Mar '12

Author: spetreolle Date: Fri Mar 16 20:58:54 2012 New Revision: 56176 URL: http://svn.reactos.org/svn/reactos?rev=56176&view=rev Log: [FUSION] Install fusion.dll where it belongs. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/dll/win32/fusion/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Fri Mar 16 20:58:54 2012 @@ -22,6 +22,9 @@ 6 = inf 7 = bin 8 = media +9 = Microsoft.NET +10 = Microsoft.NET\Framework +11 = Microsoft.NET\Framework\v2.0.50727 .InfEnd Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Fri Mar 16 20:58:54 2012 @@ -102,6 +102,12 @@ set(${var} 7) elseif(${dir} STREQUAL reactos/media) set(${var} 8) + elseif(${dir} STREQUAL reactos/Microsoft.NET) + set(${var} 9) + elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework) + set(${var} 10) + elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727) + set(${var} 11) else() message(ERROR "Wrong destination: ${dir}") endif() Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Fri Mar 16 20:58:54 2012 @@ -23,4 +23,4 @@ set_module_type(fusion win32dll) target_link_libraries(fusion wine uuid) add_importlibs(fusion shlwapi advapi32 dbghelp user32 msvcrt kernel32 ntdll) -add_cd_file(TARGET fusion DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR all)

1 0

[rharabien] 56175: [IMAGEHLP] - Sync to Wine 1.3.37
by rharabien＠svn.reactos.org 16 Mar '12

16 Mar '12

Author: rharabien Date: Fri Mar 16 19:48:57 2012 New Revision: 56175 URL: http://svn.reactos.org/svn/reactos?rev=56175&view=rev Log: [IMAGEHLP] - Sync to Wine 1.3.37 Modified: trunk/reactos/dll/win32/imagehlp/access.c trunk/reactos/dll/win32/imagehlp/imagehlp.spec trunk/reactos/dll/win32/imagehlp/imagehlp_main.c trunk/reactos/dll/win32/imagehlp/integrity.c trunk/reactos/dll/win32/imagehlp/modify.c trunk/reactos/include/psdk/imagehlp.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/imagehlp/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/access.… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/access.c [iso-8859-1] Fri Mar 16 19:48:57 2012 @@ -54,7 +54,7 @@ 148, /* SizeOfImage; */ }; -extern HANDLE IMAGEHLP_hHeap; +DECLSPEC_HIDDEN extern HANDLE IMAGEHLP_hHeap; /*********************************************************************** * GetImageConfigInformation (IMAGEHLP.@) @@ -87,7 +87,7 @@ /*********************************************************************** * ImageLoad (IMAGEHLP.@) */ -PLOADED_IMAGE IMAGEAPI ImageLoad(LPSTR DllName, LPSTR DllPath) +PLOADED_IMAGE WINAPI ImageLoad(PCSTR DllName, PCSTR DllPath) { PLOADED_IMAGE pLoadedImage; @@ -146,7 +146,7 @@ /*********************************************************************** * MapAndLoad (IMAGEHLP.@) */ -BOOL IMAGEAPI MapAndLoad(LPSTR pszImageName, LPSTR pszDllPath, PLOADED_IMAGE pLoadedImage, +BOOL WINAPI MapAndLoad(PCSTR pszImageName, PCSTR pszDllPath, PLOADED_IMAGE pLoadedImage, BOOL bDotDll, BOOL bReadOnly) { CHAR szFileName[MAX_PATH]; Modified: trunk/reactos/dll/win32/imagehlp/imagehlp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/imagehl… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/imagehlp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/imagehlp.spec [iso-8859-1] Fri Mar 16 19:48:57 2012 @@ -50,16 +50,16 @@ @ stdcall SymEnumTypes(long long ptr ptr) dbghelp.SymEnumTypes @ stdcall SymEnumerateModules64(long ptr ptr) dbghelp.SymEnumerateModules64 @ stdcall SymEnumerateModules(long ptr ptr) dbghelp.SymEnumerateModules -@ stdcall SymEnumerateSymbols64(long double ptr ptr) dbghelp.SymEnumerateSymbols64 +@ stdcall SymEnumerateSymbols64(long int64 ptr ptr) dbghelp.SymEnumerateSymbols64 @ stdcall SymEnumerateSymbols(long long ptr ptr) dbghelp.SymEnumerateSymbols @ stub SymEnumerateSymbolsW64 @ stub SymEnumerateSymbolsW @ stdcall SymFindFileInPath(long str str ptr long long long ptr ptr ptr) dbghelp.SymFindFileInPath @ stdcall SymFromAddr(long long ptr ptr) dbghelp.SymFromAddr @ stdcall SymFromName(long str ptr) dbghelp.SymFromName -@ stdcall SymFunctionTableAccess64(long double) dbghelp.SymFunctionTableAccess64 +@ stdcall SymFunctionTableAccess64(long int64) dbghelp.SymFunctionTableAccess64 @ stdcall SymFunctionTableAccess(long long) dbghelp.SymFunctionTableAccess -@ stdcall SymGetLineFromAddr64(long double ptr ptr) dbghelp.SymGetLineFromAddr64 +@ stdcall SymGetLineFromAddr64(long int64 ptr ptr) dbghelp.SymGetLineFromAddr64 @ stdcall SymGetLineFromAddr(long long ptr ptr) dbghelp.SymGetLineFromAddr @ stub SymGetLineFromName64 @ stub SymGetLineFromName @@ -67,15 +67,15 @@ @ stdcall SymGetLineNext(long ptr) dbghelp.SymGetLineNext @ stdcall SymGetLinePrev64(long ptr) dbghelp.SymGetLinePrev64 @ stdcall SymGetLinePrev(long ptr) dbghelp.SymGetLinePrev -@ stdcall SymGetModuleBase64(long double) dbghelp.SymGetModuleBase64 +@ stdcall SymGetModuleBase64(long int64) dbghelp.SymGetModuleBase64 @ stdcall SymGetModuleBase(long long) dbghelp.SymGetModuleBase -@ stdcall SymGetModuleInfo64(long double ptr) dbghelp.SymGetModuleInfo64 +@ stdcall SymGetModuleInfo64(long int64 ptr) dbghelp.SymGetModuleInfo64 @ stdcall SymGetModuleInfo(long long ptr) dbghelp.SymGetModuleInfo -@ stdcall SymGetModuleInfoW64(long double ptr) dbghelp.SymGetModuleInfoW64 +@ stdcall SymGetModuleInfoW64(long int64 ptr) dbghelp.SymGetModuleInfoW64 @ stdcall SymGetModuleInfoW(long long ptr) dbghelp.SymGetModuleInfoW @ stdcall SymGetOptions() dbghelp.SymGetOptions @ stdcall SymGetSearchPath(long str long) dbghelp.SymGetSearchPath -@ stdcall SymGetSymFromAddr64(long double ptr ptr) dbghelp.SymGetSymFromAddr64 +@ stdcall SymGetSymFromAddr64(long int64 ptr ptr) dbghelp.SymGetSymFromAddr64 @ stdcall SymGetSymFromAddr(long long ptr ptr) dbghelp.SymGetSymFromAddr @ stdcall SymGetSymFromName64(long str ptr) dbghelp.SymGetSymFromName64 @ stdcall SymGetSymFromName(long str ptr) dbghelp.SymGetSymFromName @@ -86,20 +86,20 @@ @ stdcall SymGetTypeFromName(long long str ptr) dbghelp.SymGetTypeFromName @ stdcall SymGetTypeInfo(long long long long ptr) dbghelp.SymGetTypeInfo @ stdcall SymInitialize(long str long) dbghelp.SymInitialize -@ stdcall SymLoadModule64(long long str str double long) dbghelp.SymLoadModule64 +@ stdcall SymLoadModule64(long long str str int64 long) dbghelp.SymLoadModule64 @ stdcall SymLoadModule(long long str str long long) dbghelp.SymLoadModule @ stdcall SymMatchFileName(str str ptr ptr) dbghelp.SymMatchFileName @ stdcall SymMatchString(str str long) dbghelp.SymMatchString -@ stdcall SymRegisterCallback64(long ptr double) dbghelp.SymRegisterCallback64 +@ stdcall SymRegisterCallback64(long ptr int64) dbghelp.SymRegisterCallback64 @ stdcall SymRegisterCallback(long ptr ptr) dbghelp.SymRegisterCallback -@ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) dbghelp.SymRegisterFunctionEntryCallback64 +@ stdcall SymRegisterFunctionEntryCallback64(ptr ptr int64) dbghelp.SymRegisterFunctionEntryCallback64 @ stdcall SymRegisterFunctionEntryCallback(ptr ptr ptr) dbghelp.SymRegisterFunctionEntryCallback @ stdcall SymSetContext(long ptr ptr) dbghelp.SymSetContext @ stdcall SymSetOptions(long) dbghelp.SymSetOptions @ stdcall SymSetSearchPath(long str) dbghelp.SymSetSearchPath @ stdcall SymUnDName64(ptr str long) dbghelp.SymUnDName64 @ stdcall SymUnDName(ptr str long) dbghelp.SymUnDName -@ stdcall SymUnloadModule64(long double) dbghelp.SymUnloadModule64 +@ stdcall SymUnloadModule64(long int64) dbghelp.SymUnloadModule64 @ stdcall SymUnloadModule(long long) dbghelp.SymUnloadModule @ stdcall TouchFileTimes(long ptr) @ stdcall UnDecorateSymbolName(str str long long) dbghelp.UnDecorateSymbolName Modified: trunk/reactos/dll/win32/imagehlp/imagehlp_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/imagehl… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/imagehlp_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/imagehlp_main.c [iso-8859-1] Fri Mar 16 19:48:57 2012 @@ -26,7 +26,7 @@ #include "wine/debug.h" /**********************************************************************/ -HANDLE IMAGEHLP_hHeap = NULL; +DECLSPEC_HIDDEN HANDLE IMAGEHLP_hHeap = NULL; /*********************************************************************** * DllMain (IMAGEHLP.init) Modified: trunk/reactos/dll/win32/imagehlp/integrity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/integri… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/integrity.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/integrity.c [iso-8859-1] Fri Mar 16 19:48:57 2012 @@ -77,7 +77,7 @@ return HDR_FAIL; /* verify magic number of 'MZ' */ - if (dos_hdr.e_magic != 0x5A4D) + if (dos_hdr.e_magic != IMAGE_DOS_SIGNATURE) return HDR_FAIL; if (pe_offset != NULL) @@ -392,10 +392,6 @@ /* If we've already got a security directory, find the end of it */ if ((r) && (sd_VirtualAddr != 0)) { - offset = 0; - index = 0; - count = 0; - /* Check if the security directory is at the end of the file. If not, we should probably relocate it. */ if (GetFileSize(FileHandle, NULL) != sd_VirtualAddr + size) @@ -463,10 +459,9 @@ if (Certificate->dwLength % 8) { char null[8]; - DWORD dwBytesWritten; ZeroMemory(null, 8); - WriteFile(FileHandle, null, 8 - (Certificate->dwLength % 8), &dwBytesWritten, NULL); + WriteFile(FileHandle, null, 8 - (Certificate->dwLength % 8), &count, NULL); size += 8 - (Certificate->dwLength % 8); } @@ -480,6 +475,8 @@ if (!IMAGEHLP_RecalculateChecksum(FileHandle)) return FALSE; + if(Index) + *Index = index; return TRUE; } @@ -747,7 +744,7 @@ /*********************************************************************** * ImageGetDigestStream (IMAGEHLP.@) * - * Gets a stream of bytes from a PE file overwhich a hash might be computed to + * Gets a stream of bytes from a PE file over which a hash might be computed to * verify that the image has not changed. Useful for creating a certificate to * be added to the file with ImageAddCertificate. * Modified: trunk/reactos/dll/win32/imagehlp/modify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/modify.… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] Fri Mar 16 19:48:57 2012 @@ -35,8 +35,8 @@ /*********************************************************************** * BindImage (IMAGEHLP.@) */ -BOOL IMAGEAPI BindImage( - LPSTR ImageName, LPSTR DllPath, LPSTR SymbolPath) +BOOL WINAPI BindImage( + PCSTR ImageName, PCSTR DllPath, PCSTR SymbolPath) { return BindImageEx(0, ImageName, DllPath, SymbolPath, NULL); } @@ -44,8 +44,8 @@ /*********************************************************************** * BindImageEx (IMAGEHLP.@) */ -BOOL IMAGEAPI BindImageEx( - DWORD Flags, LPCSTR ImageName, LPCSTR DllPath, LPCSTR SymbolPath, +BOOL WINAPI BindImageEx( + DWORD Flags, PCSTR ImageName, PCSTR DllPath, PCSTR SymbolPath, PIMAGEHLP_STATUS_ROUTINE StatusRoutine) { FIXME("(%d, %s, %s, %s, %p): stub\n", @@ -157,8 +157,8 @@ /*********************************************************************** * MapFileAndCheckSumA (IMAGEHLP.@) */ -DWORD IMAGEAPI MapFileAndCheckSumA( - LPSTR Filename, PDWORD HeaderSum, PDWORD CheckSum) +DWORD WINAPI MapFileAndCheckSumA( + PCSTR Filename, PDWORD HeaderSum, PDWORD CheckSum) { HANDLE hFile; HANDLE hMapping; @@ -223,8 +223,8 @@ /*********************************************************************** * MapFileAndCheckSumW (IMAGEHLP.@) */ -DWORD IMAGEAPI MapFileAndCheckSumW( - PWSTR Filename, LPDWORD HeaderSum, LPDWORD CheckSum) +DWORD WINAPI MapFileAndCheckSumW( + PCWSTR Filename, PDWORD HeaderSum, PDWORD CheckSum) { HANDLE hFile; HANDLE hMapping; @@ -289,8 +289,8 @@ /*********************************************************************** * ReBaseImage (IMAGEHLP.@) */ -BOOL IMAGEAPI ReBaseImage( - LPSTR CurrentImageName, LPSTR SymbolPath, BOOL fReBase, +BOOL WINAPI ReBaseImage( + PCSTR CurrentImageName, PCSTR SymbolPath, BOOL fReBase, BOOL fRebaseSysfileOk, BOOL fGoingDown, ULONG CheckImageSize, ULONG *OldImageSize, ULONG_PTR *OldImageBase, ULONG *NewImageSize, ULONG_PTR *NewImageBase, ULONG TimeStamp) @@ -330,9 +330,9 @@ /*********************************************************************** * SplitSymbols (IMAGEHLP.@) */ -BOOL IMAGEAPI SplitSymbols( - LPSTR ImageName, LPSTR SymbolsPath, - LPSTR SymbolFilePath, ULONG Flags) +BOOL WINAPI SplitSymbols( + PSTR ImageName, PCSTR SymbolsPath, + PSTR SymbolFilePath, ULONG Flags) { FIXME("(%s, %s, %s, %d): stub\n", debugstr_a(ImageName), debugstr_a(SymbolsPath), @@ -345,9 +345,9 @@ /*********************************************************************** * UpdateDebugInfoFile (IMAGEHLP.@) */ -BOOL IMAGEAPI UpdateDebugInfoFile( - LPSTR ImageFileName, LPSTR SymbolPath, - LPSTR DebugFilePath, PIMAGE_NT_HEADERS32 NtHeaders) +BOOL WINAPI UpdateDebugInfoFile( + PCSTR ImageFileName, PCSTR SymbolPath, + PSTR DebugFilePath, PIMAGE_NT_HEADERS32 NtHeaders) { FIXME("(%s, %s, %s, %p): stub\n", debugstr_a(ImageFileName), debugstr_a(SymbolPath), @@ -360,8 +360,8 @@ /*********************************************************************** * UpdateDebugInfoFileEx (IMAGEHLP.@) */ -BOOL IMAGEAPI UpdateDebugInfoFileEx( - LPSTR ImageFileName, LPSTR SymbolPath, LPSTR DebugFilePath, +BOOL WINAPI UpdateDebugInfoFileEx( + PCSTR ImageFileName, PCSTR SymbolPath, PSTR DebugFilePath, PIMAGE_NT_HEADERS32 NtHeaders, DWORD OldChecksum) { FIXME("(%s, %s, %s, %p, %d): stub\n", Modified: trunk/reactos/include/psdk/imagehlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imagehlp.h?re… ============================================================================== --- trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] Fri Mar 16 19:48:57 2012 @@ -259,19 +259,19 @@ typedef BOOL(WINAPI*DIGEST_FUNCTION)(DIGEST_HANDLE refdata,PBYTE pData,DWORD dwLength); PIMAGE_NT_HEADERS IMAGEAPI CheckSumMappedFile(LPVOID,DWORD,LPDWORD,LPDWORD); -DWORD IMAGEAPI MapFileAndCheckSumA(LPSTR,LPDWORD,LPDWORD); -DWORD IMAGEAPI MapFileAndCheckSumW(PWSTR,LPDWORD,LPDWORD); +DWORD IMAGEAPI MapFileAndCheckSumA(PCSTR,LPDWORD,LPDWORD); +DWORD IMAGEAPI MapFileAndCheckSumW(PCWSTR,LPDWORD,LPDWORD); BOOL IMAGEAPI TouchFileTimes(HANDLE,LPSYSTEMTIME); -BOOL IMAGEAPI SplitSymbols(LPSTR,LPSTR,LPSTR,DWORD); -HANDLE IMAGEAPI FindDebugInfoFile(LPSTR,LPSTR,LPSTR); -HANDLE IMAGEAPI FindExecutableImage(LPSTR,LPSTR,LPSTR); -BOOL IMAGEAPI UpdateDebugInfoFile(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS32); -BOOL IMAGEAPI UpdateDebugInfoFileEx(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS32,DWORD); -BOOL IMAGEAPI BindImage(IN LPSTR,IN LPSTR,IN LPSTR); +BOOL IMAGEAPI SplitSymbols(PSTR,PCSTR,PSTR,DWORD); +HANDLE IMAGEAPI FindDebugInfoFile(PCSTR,PCSTR,PSTR); +HANDLE IMAGEAPI FindExecutableImage(PCSTR,PCSTR,PSTR); +BOOL IMAGEAPI UpdateDebugInfoFile(PCSTR,PCSTR,PSTR,PIMAGE_NT_HEADERS32); +BOOL IMAGEAPI UpdateDebugInfoFileEx(PCSTR,PCSTR,PSTR,PIMAGE_NT_HEADERS32,DWORD); +BOOL IMAGEAPI BindImage(IN PCSTR,IN PCSTR,IN PCSTR); BOOL IMAGEAPI BindImageEx(IN DWORD,IN LPCSTR,IN LPCSTR,IN LPCSTR,IN PIMAGEHLP_STATUS_ROUTINE); -BOOL IMAGEAPI ReBaseImage(IN LPSTR,IN LPSTR,IN BOOL, IN BOOL,IN BOOL, IN ULONG, OUT ULONG*, OUT ULONG_PTR*, OUT ULONG*, IN OUT ULONG_PTR*, IN ULONG); - -PLOADED_IMAGE IMAGEAPI ImageLoad(LPSTR,LPSTR); +BOOL IMAGEAPI ReBaseImage(IN PCSTR,IN PCSTR,IN BOOL, IN BOOL,IN BOOL, IN ULONG, OUT ULONG*, OUT ULONG_PTR*, OUT ULONG*, IN OUT ULONG_PTR*, IN ULONG); + +PLOADED_IMAGE IMAGEAPI ImageLoad(PCSTR,PCSTR); BOOL IMAGEAPI ImageUnload(PLOADED_IMAGE); PIMAGE_NT_HEADERS IMAGEAPI ImageNtHeader(IN PVOID); PVOID IMAGEAPI ImageDirectoryEntryToData(IN PVOID,IN BOOLEAN,IN USHORT,OUT PULONG); @@ -279,17 +279,16 @@ PVOID IMAGEAPI ImageDirectoryEntryToData32(PVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size, PIMAGE_SECTION_HEADER *FoundHeader OPTIONAL, PIMAGE_FILE_HEADER FileHeader, PIMAGE_OPTIONAL_HEADER OptionalHeader); PIMAGE_SECTION_HEADER IMAGEAPI ImageRvaToSection(IN PIMAGE_NT_HEADERS,IN PVOID,IN ULONG); PVOID IMAGEAPI ImageRvaToVa(IN PIMAGE_NT_HEADERS,IN PVOID,IN ULONG,IN OUT PIMAGE_SECTION_HEADER*); -BOOL IMAGEAPI MapAndLoad(LPSTR,LPSTR,PLOADED_IMAGE,BOOL,BOOL); +BOOL IMAGEAPI MapAndLoad(PCSTR,PCSTR,PLOADED_IMAGE,BOOL,BOOL); BOOL IMAGEAPI GetImageConfigInformation(PLOADED_IMAGE,PIMAGE_LOAD_CONFIG_DIRECTORY); DWORD IMAGEAPI GetImageUnusedHeaderBytes(PLOADED_IMAGE,LPDWORD); BOOL IMAGEAPI SetImageConfigInformation(PLOADED_IMAGE,PIMAGE_LOAD_CONFIG_DIRECTORY); BOOL IMAGEAPI UnMapAndLoad(PLOADED_IMAGE); -PIMAGE_DEBUG_INFORMATION IMAGEAPI MapDebugInformation(HANDLE,LPSTR,LPSTR,DWORD); +PIMAGE_DEBUG_INFORMATION IMAGEAPI MapDebugInformation(HANDLE,PCSTR,PCSTR,DWORD); BOOL IMAGEAPI UnmapDebugInformation(PIMAGE_DEBUG_INFORMATION); -HANDLE IMAGEAPI FindExecutableImage(LPSTR,LPSTR,LPSTR); -BOOL IMAGEAPI SearchTreeForFile(LPSTR,LPSTR,LPSTR); +BOOL IMAGEAPI SearchTreeForFile(PCSTR,PCSTR,PSTR); BOOL IMAGEAPI MakeSureDirectoryPathExists(LPCSTR); -DWORD IMAGEAPI WINAPI UnDecorateSymbolName(LPCSTR,LPSTR,DWORD, DWORD); +DWORD IMAGEAPI WINAPI UnDecorateSymbolName(LPCSTR,LPSTR,DWORD,DWORD); BOOL IMAGEAPI StackWalk(DWORD,HANDLE,HANDLE,LPSTACKFRAME,LPVOID,PREAD_PROCESS_MEMORY_ROUTINE,PFUNCTION_TABLE_ACCESS_ROUTINE,PGET_MODULE_BASE_ROUTINE,PTRANSLATE_ADDRESS_ROUTINE); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Mar 16 19:48:57 2012 @@ -58,7 +58,7 @@ reactos/dll/win32/cryptnet # Synced to Wine-1.3.37 reactos/dll/win32/cryptui # Synced to Wine-1.3.37 reactos/dll/win32/dbghelp # Synced to Wine-1.3.37 -reactos/dll/win32/dciman32 # Autosync +reactos/dll/win32/dciman32 # Synced to Wine-1.3.37 reactos/dll/win32/dwmapi # Synced to Wine-1.3.37 reactos/dll/win32/fusion # Synced to Wine-1.3.37 reactos/dll/win32/gdiplus # Synced to Wine-1.3.37 @@ -69,7 +69,7 @@ reactos/dll/win32/iccvid # Autosync reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/imaadp32.acm # Synced to Wine-1.3.37 -reactos/dll/win32/imagehlp # Autosync +reactos/dll/win32/imagehlp # Synced to Wine-1.3.37 reactos/dll/win32/imm32 # Synced to Wine-1.3.37 reactos/dll/win32/inetcomm # Synced to Wine-1.3.37 reactos/dll/win32/inetmib1 # Autosync

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
36
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 2012