Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[sir_richard] 47908: [PCIX]: Fix 17 different bugs in the new PCI driver. ACPI and PCI IRQ Routing table detection now works, ACPI table mapping doesn't crash anymore, PciGetRegistryValue doens't always fail, some DPRINTs fixed, added missing "continues", "breaks", and early-"returns". Fixed missing, or extra "!"s. If you're going to try being clever with do while FALSE loops, get 'em right! The driver now works up to the point where eVb has last committed his code.
by sir_richard＠svn.reactos.org 29 Jun '10

29 Jun '10

Author: sir_richard Date: Tue Jun 29 20:21:45 2010 New Revision: 47908 URL: http://svn.reactos.org/svn/reactos?rev=47908&view=rev Log: [PCIX]: Fix 17 different bugs in the new PCI driver. ACPI and PCI IRQ Routing table detection now works, ACPI table mapping doesn't crash anymore, PciGetRegistryValue doens't always fail, some DPRINTs fixed, added missing "continues", "breaks", and early-"returns". Fixed missing, or extra "!"s. If you're going to try being clever with do while FALSE loops, get 'em right! The driver now works up to the point where eVb has last committed his code. Modified: trunk/reactos/drivers/bus/pcix/init.c trunk/reactos/drivers/bus/pcix/pci.h trunk/reactos/drivers/bus/pcix/utils.c Modified: trunk/reactos/drivers/bus/pcix/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/init.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/init.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/init.c [iso-8859-1] Tue Jun 29 20:21:45 2010 @@ -37,7 +37,7 @@ HANDLE KeyHandle, SubKey; ULONG NumberOfBytes, i, Length; PKEY_FULL_INFORMATION FullInfo; - PKEY_VALUE_BASIC_INFORMATION KeyInfo; + PKEY_BASIC_INFORMATION KeyInfo; PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; PACPI_BIOS_MULTI_NODE NodeData; UNICODE_STRING ValueName; @@ -98,15 +98,19 @@ PCI_POOL_TAG); if (!ValueInfo) break; - /* Query each sub-key */ - Status = ZwEnumerateKey(KeyHandle, - 0, - KeyValueBasicInformation, - KeyInfo, - Length, - &NumberOfBytes); - for (i = 0; Status != STATUS_NO_MORE_ENTRIES; i++) - { + /* Loop each sub-key */ + i = 0; + while (TRUE) + { + /* Query each sub-key */ + Status = ZwEnumerateKey(KeyHandle, + i++, + KeyBasicInformation, + KeyInfo, + Length, + &NumberOfBytes); + if (Status == STATUS_NO_MORE_ENTRIES) break; + /* Null-terminate the keyname, because the kernel does not */ KeyInfo->Name[KeyInfo->NameLength / sizeof(WCHAR)] = UNICODE_NULL; @@ -127,29 +131,29 @@ sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(L"ACPI BIOS"), &NumberOfBytes); - if (NT_SUCCESS(Status)) - { - /* Check if this is the PCI BIOS subkey */ - if (!wcsncmp((PWCHAR)ValueInfo->Data, - L"ACPI BIOS", - ValueInfo->DataLength)) - { - /* It is, proceed to query the PCI IRQ routing table */ - Status = PciGetRegistryValue(L"Configuration Data", - KeyInfo->Name, - KeyHandle, - REG_FULL_RESOURCE_DESCRIPTOR, - (PVOID*)&Package, - &NumberOfBytes); - ZwClose(SubKey); - break; - } - } - - /* Close the subkey and try the next one */ - ZwClose(SubKey); - } - } + if (NT_SUCCESS(Status)) + { + /* Check if this is the PCI BIOS subkey */ + if (!wcsncmp((PWCHAR)ValueInfo->Data, + L"ACPI BIOS", + ValueInfo->DataLength)) + { + /* It is, proceed to query the PCI IRQ routing table */ + Status = PciGetRegistryValue(L"Configuration Data", + KeyInfo->Name, + KeyHandle, + REG_FULL_RESOURCE_DESCRIPTOR, + (PVOID*)&Package, + &NumberOfBytes); + ZwClose(SubKey); + break; + } + } + + /* Close the subkey and try the next one */ + ZwClose(SubKey); + } + } /* Check if we got here because the routing table was found */ if (!NT_SUCCESS(Status)) @@ -176,6 +180,7 @@ /* Copy the data */ RtlCopyMemory(*AcpiMultiNode, NodeData, Length); + Status = STATUS_SUCCESS; } while (FALSE); /* Close any opened keys, free temporary allocations, and return status */ @@ -202,7 +207,7 @@ /* Try to find the RSDT or XSDT */ Status = PciAcpiFindRsdt(&AcpiMultiNode); - if (NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { /* No ACPI on the machine */ DPRINT1("AcpiFindRsdt() Failed!\n"); @@ -231,7 +236,6 @@ if (!Rsdt) return NULL; /* Validate the table's signature */ - DPRINT1("ACPI RSDT/XSDT at 0x%p\n", Rsdt); if ((Rsdt->Header.Signature != RSDT_SIGNATURE) && (Rsdt->Header.Signature != XSDT_SIGNATURE)) { @@ -269,7 +273,7 @@ if (Rsdt->Header.Signature != XSDT_SIGNATURE) { /* Read the 32-bit physical address */ - PhysicalAddress.LowPart = Rsdt->Tables[CurrentEntry]; + PhysicalAddress.QuadPart = Rsdt->Tables[CurrentEntry]; } else { @@ -313,7 +317,7 @@ HANDLE KeyHandle, SubKey; ULONG NumberOfBytes, i, Length; PKEY_FULL_INFORMATION FullInfo; - PKEY_VALUE_BASIC_INFORMATION KeyInfo; + PKEY_BASIC_INFORMATION KeyInfo; PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; UNICODE_STRING ValueName; struct @@ -364,24 +368,28 @@ Status = STATUS_INSUFFICIENT_RESOURCES; Length = FullInfo->MaxNameLen + 26; KeyInfo = ExAllocatePoolWithTag(PagedPool, Length, PCI_POOL_TAG); - if ( !KeyInfo ) break; + if (!KeyInfo) break; /* Allocate the value information and name we expect to find */ ValueInfo = ExAllocatePoolWithTag(PagedPool, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(L"PCI BIOS"), PCI_POOL_TAG); - if ( !ValueInfo ) break; - - /* Query each sub-key */ - Status = ZwEnumerateKey(KeyHandle, - 0, - KeyValueBasicInformation, - KeyInfo, - Length, - &NumberOfBytes); - for (i = 0; Status != STATUS_NO_MORE_ENTRIES; i++) - { + if (!ValueInfo) break; + + /* Loop each sub-key */ + i = 0; + while (TRUE) + { + /* Query each sub-key */ + Status = ZwEnumerateKey(KeyHandle, + i++, + KeyBasicInformation, + KeyInfo, + Length, + &NumberOfBytes); + if (Status == STATUS_NO_MORE_ENTRIES) break; + /* Null-terminate the keyname, because the kernel does not */ KeyInfo->Name[KeyInfo->NameLength / sizeof(WCHAR)] = UNICODE_NULL; @@ -576,7 +584,9 @@ (NameLength != PCI_HACK_ENTRY_SUBSYS_SIZE) && (NameLength != PCI_HACK_ENTRY_FULL_SIZE)) { + /* It's an invalid entry, skip it */ DPRINT1("Skipping hack entry with invalid length name\n"); + continue; } /* Initialize the entry */ @@ -634,11 +644,11 @@ DPRINT1("Adding Hack entry for Vendor:0x%04x Device:0x%04x ", Entry->VendorID, Entry->DeviceID); if (Entry->Flags & PCI_HACK_HAS_SUBSYSTEM_INFO) - DPRINT1("SybSys:0x%04x SubVendor:0x%04x ", - Entry->SubSystemID, Entry->SubVendorID); + DbgPrint("SybSys:0x%04x SubVendor:0x%04x ", + Entry->SubSystemID, Entry->SubVendorID); if (Entry->Flags & PCI_HACK_HAS_REVISION_INFO) - DPRINT1("Revision:0x%02x", Entry->RevisionID); - DPRINT1(" = 0x%I64x\n", Entry->HackFlags); + DbgPrint("Revision:0x%02x", Entry->RevisionID); + DbgPrint(" = 0x%I64x\n", Entry->HackFlags); } /* Bail out in case of failure */ @@ -843,6 +853,7 @@ /* Check if the system has an ACPI Hardware Watchdog Timer */ WdTable = PciGetAcpiTable(WDRT_SIGNATURE); + Status = STATUS_SUCCESS; } while (FALSE); /* Close all opened keys, return driver status to PnP Manager */ Modified: trunk/reactos/drivers/bus/pcix/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci.h?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] Tue Jun 29 20:21:45 2010 @@ -38,10 +38,10 @@ // // PCI Hack Entry Name Lengths // -#define PCI_HACK_ENTRY_SIZE sizeof(L"VVVVdddd") // 16 -#define PCI_HACK_ENTRY_REV_SIZE sizeof(L"VVVVddddRR") // 20 -#define PCI_HACK_ENTRY_SUBSYS_SIZE sizeof(L"VVVVddddssssIIII") // 32 -#define PCI_HACK_ENTRY_FULL_SIZE sizeof(L"VVVVddddssssIIIIRR") // 36 +#define PCI_HACK_ENTRY_SIZE sizeof(L"VVVVdddd") - sizeof(UNICODE_NULL) +#define PCI_HACK_ENTRY_REV_SIZE sizeof(L"VVVVddddRR") - sizeof(UNICODE_NULL) +#define PCI_HACK_ENTRY_SUBSYS_SIZE sizeof(L"VVVVddddssssIIII") - sizeof(UNICODE_NULL) +#define PCI_HACK_ENTRY_FULL_SIZE sizeof(L"VVVVddddssssIIIIRR") - sizeof(UNICODE_NULL) // // PCI Hack Entry Flags Modified: trunk/reactos/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/utils.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] Tue Jun 29 20:21:45 2010 @@ -260,6 +260,7 @@ /* Copy the data into the buffer and return its length to the caller */ RtlCopyMemory(*OutputBuffer, PartialInfo->Data, NeededLength); if (OutputLength) *OutputLength = NeededLength; + Status = STATUS_SUCCESS; } while (0); /* Close any opened keys and free temporary allocations */ @@ -325,7 +326,6 @@ if (!NT_SUCCESS(Status)) break; /* Success, ranges added done */ - return STATUS_SUCCESS; }; RtlFreeRangeList(&PciIsaBitExclusionList);

1 0

[sir_richard] 47907: [RTL]: RangeList APIs should not be allocating pool with a tag of 0, since this makes the checked kernel ASSERT. Good thing nobody used these APIs (I wonder if they even work), but eVb's PCI driver now does.
by sir_richard＠svn.reactos.org 29 Jun '10

29 Jun '10

Author: sir_richard Date: Tue Jun 29 19:23:16 2010 New Revision: 47907 URL: http://svn.reactos.org/svn/reactos?rev=47907&view=rev Log: [RTL]: RangeList APIs should not be allocating pool with a tag of 0, since this makes the checked kernel ASSERT. Good thing nobody used these APIs (I wonder if they even work), but eVb's PCI driver now does. Modified: trunk/reactos/lib/rtl/rangelist.c Modified: trunk/reactos/lib/rtl/rangelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rangelist.c?rev=47… ============================================================================== --- trunk/reactos/lib/rtl/rangelist.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rangelist.c [iso-8859-1] Tue Jun 29 19:23:16 2010 @@ -65,7 +65,7 @@ return STATUS_INVALID_PARAMETER; /* Create new range entry */ - RangeEntry = RtlpAllocateMemory(sizeof(RTL_RANGE_ENTRY), 0); + RangeEntry = RtlpAllocateMemory(sizeof(RTL_RANGE_ENTRY), 'elRR'); if (RangeEntry == NULL) return STATUS_INSUFFICIENT_RESOURCES; @@ -157,7 +157,7 @@ { Current = CONTAINING_RECORD (Entry, RTL_RANGE_ENTRY, Entry); - NewEntry = RtlpAllocateMemory(sizeof(RTL_RANGE_ENTRY), 0); + NewEntry = RtlpAllocateMemory(sizeof(RTL_RANGE_ENTRY), 'elRR'); if (NewEntry == NULL) return STATUS_INSUFFICIENT_RESOURCES;

1 0

[mjmartin] 47906: [win32k] - Change percision of win32k timers to 0.5 miliseconds. - Remove Destroy parameter from FindTimer as it is just odd and call RemoveTimer where needed. - PostTimerMessages: No need to continue looping the remainder of the timers once the target timer has been found and message posted to message queue.
by mjmartin＠svn.reactos.org 29 Jun '10

29 Jun '10

Author: mjmartin Date: Tue Jun 29 14:37:52 2010 New Revision: 47906 URL: http://svn.reactos.org/svn/reactos?rev=47906&view=rev Log: [win32k] - Change percision of win32k timers to 0.5 miliseconds. - Remove Destroy parameter from FindTimer as it is just odd and call RemoveTimer where needed. - PostTimerMessages: No need to continue looping the remainder of the timers once the target timer has been found and message posted to message queue. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Tue Jun 29 14:37:52 2010 @@ -5,6 +5,7 @@ * FILE: subsystems/win32/win32k/ntuser/timer.c * PROGRAMER: Gunnar * Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * Michael Martin (michael.martin(a)reactos.org) * REVISION HISTORY: 10/04/2003 Implemented System Timers * */ @@ -104,7 +105,7 @@ UserDereferenceObject(pTmr); Ret = UserDeleteObject( UserHMGetHandle(pTmr), otTimer); } - if (!Ret) DPRINT1("Warning unable to delete timer\n"); + if (!Ret) DPRINT1("Warning: Unable to delete timer\n"); return Ret; } @@ -113,8 +114,7 @@ FASTCALL FindTimer(PWINDOW_OBJECT Window, UINT_PTR nID, - UINT flags, - BOOL Distroy) + UINT flags) { PLIST_ENTRY pLE; PTIMER pTmr = FirstpTmr, RetTmr = NULL; @@ -127,10 +127,6 @@ pTmr->pWnd == Window && (pTmr->flags & (TMRF_SYSTEM|TMRF_RIT)) == (flags & (TMRF_SYSTEM|TMRF_RIT))) { - if (Distroy) - { - RemoveTimer(pTmr); - } RetTmr = pTmr; break; } @@ -206,7 +202,7 @@ PTIMER pTmr; UINT Ret= IDEvent; LARGE_INTEGER DueTime; - DueTime.QuadPart = (LONGLONG)(-10000000); + DueTime.QuadPart = (LONGLONG)(-5000000); #if 0 /* Windows NT/2k/XP behaviour */ @@ -234,7 +230,7 @@ if ((Window) && (IDEvent == 0)) IDEvent = 1; - pTmr = FindTimer(Window, IDEvent, Type, FALSE); + pTmr = FindTimer(Window, IDEvent, Type); if ((!pTmr) && (Window == NULL) && (!(Type & TMRF_SYSTEM))) { @@ -350,7 +346,7 @@ { if ( (pTmr->flags & TMRF_READY) && (pTmr->pti == pti) && - ((pTmr->pWnd == Window) || (Window == NULL) ) ) + ((pTmr->pWnd == Window) || (Window == NULL)) ) { Msg.hwnd = (pTmr->pWnd) ? pTmr->pWnd->hSelf : 0; Msg.message = (pTmr->flags & TMRF_SYSTEM) ? WM_SYSTIMER : WM_TIMER; @@ -361,6 +357,7 @@ pTmr->flags &= ~TMRF_READY; ThreadQueue->WakeMask = ~QS_TIMER; Hit = TRUE; + break; } pLE = pTmr->ptmrList.Flink; @@ -389,7 +386,7 @@ KeQueryTickCount(&TickCount); Time = MsqCalculateMessageTime(&TickCount); - DueTime.QuadPart = (LONGLONG)(-1000000); + DueTime.QuadPart = (LONGLONG)(-500000); do { @@ -611,7 +608,15 @@ if ((Window) && (IDEvent == 0)) IDEvent = 1; - pTmr = FindTimer(Window, IDEvent, SystemTimer ? TMRF_SYSTEM : 0, TRUE); + pTmr = FindTimer(Window, IDEvent, SystemTimer ? TMRF_SYSTEM : 0); + + if (pTmr) + { + TimerEnterExclusive(); + RemoveTimer(pTmr); + TimerLeave(); + } + return pTmr ? TRUE : FALSE; }

1 0

[ilardig] 47905: [EVENTVWR] - Polish update by Maciej Bialas.
by ilardig＠svn.reactos.org 29 Jun '10

29 Jun '10

Author: ilardig Date: Tue Jun 29 10:29:30 2010 New Revision: 47905 URL: http://svn.reactos.org/svn/reactos?rev=47905&view=rev Log: [EVENTVWR] - Polish update by Maciej Bialas. Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] Tue Jun 29 10:29:30 2010 @@ -109,13 +109,13 @@ STRINGTABLE BEGIN - IDS_COLUMNTYPE "Type" - IDS_COLUMNDATE "Date" - IDS_COLUMNTIME "Time" - IDS_COLUMNSOURCE "Source" - IDS_COLUMNCATEGORY "Category" - IDS_COLUMNEVENT "Event" - IDS_COLUMNUSER "User" - IDS_COLUMNCOMPUTER "Computer" - IDS_COLUMNEVENTDATA "Event Data" + IDS_COLUMNTYPE "Typ" + IDS_COLUMNDATE "Data" + IDS_COLUMNTIME "Czas" + IDS_COLUMNSOURCE "ród³o" + IDS_COLUMNCATEGORY "Kategoria" + IDS_COLUMNEVENT "Zdarzenie" + IDS_COLUMNUSER "U¿ytkownik" + IDS_COLUMNCOMPUTER "Komputer" + IDS_COLUMNEVENTDATA "Dane zdarzenia" END

1 0

[fireball] 47904: - Merge 47605.
by fireball＠svn.reactos.org 29 Jun '10

29 Jun '10

Author: fireball Date: Tue Jun 29 10:08:23 2010 New Revision: 47904 URL: http://svn.reactos.org/svn/reactos?rev=47904&view=rev Log: - Merge 47605. Modified: branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec (props changed) branches/arwinss/reactos/dll/directx/dsound_new/ (props changed) branches/arwinss/reactos/dll/directx/dsound_new/classfactory.c (props changed) branches/arwinss/reactos/dll/directx/dsound_new/dsound.spec (props changed) branches/arwinss/reactos/dll/directx/dsound_new/regsvr.c (props changed) branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec (props changed) branches/arwinss/reactos/dll/shellext/slayer/slayer.spec (props changed) branches/arwinss/reactos/dll/win32/gdi32/ (props changed) branches/arwinss/reactos/dll/win32/kernel32/ (props changed) branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec (props changed) branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed) branches/arwinss/reactos/include/ndk/amd64/ (props changed) branches/arwinss/reactos/include/ndk/amd64/asmmacro.S (props changed) branches/arwinss/reactos/include/psdk/ (props changed) branches/arwinss/reactos/lib/sdk/crt/time/ (props changed) branches/arwinss/reactos/ntoskrnl/config/cmkcbncb.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/ (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/request.h (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/user.h (props changed) branches/arwinss/reactos/subsystems/win32/win32k/wine/ (props changed) branches/arwinss/reactos/tools/rsym/log2lines.c (props changed) branches/arwinss/reactos/tools/rsym/log2lines.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) Propchange: branches/arwinss/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36930,36936,36992,38148-38151,38264-38265,38268,38355,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/dll/directx/d3d8/d3d8.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/directx/d3d8/d3d8.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/dll/directx/dsound_new/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound_new:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/trunk/reactos/dll/directx/dsound_new:43669-44421,45011,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/directx/dsound_new:43669-44421,45011,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/dll/directx/dsound_new/classfactory.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/classfactory.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857,43860,43905,43907,43969,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 /branches/ros-amd64-bringup/reactos/dll/win32/netshell/classfactory.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/trunk/reactos/dll/directx/dsound_new/classfactory.c:43925-44999,45011,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/directx/dsound_new/classfactory.c:43925-44999,45011,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/dll/directx/dsound_new/dsound.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound/dsound.spec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 /branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857,43860,43905,43907,43969,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/dll/directx/dsound_new/dsound.spec:43925-44999,45011,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/directx/dsound_new/dsound.spec:43925-44999,45011,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/dll/directx/dsound_new/regsvr.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound/regsvr.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 /branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/regsvr.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857,43860,43905,43907,43969,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/dll/directx/dsound_new/regsvr.c:43925-44999,45011,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/directx/dsound_new/regsvr.c:43925-44999,45011,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/dll/shellext/devcpux/devcpux.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/shellext/devcpux/devcpux.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/dll/shellext/slayer/slayer.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/shellext/slayer/slayer.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/dll/win32/gdi32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/gdi32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/gdi32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/win32/gdi32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 /vendor/wine/dlls/gdi32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46696,46915,47274,47321,47585,47798,47861 Propchange: branches/arwinss/reactos/dll/win32/kernel32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/win32/kernel32:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/dll/win32/kernel32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,46959 +/trunk/reactos/dll/win32/kernel32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,46959,47605 Propchange: branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/dll/win32/kernel32/kernel32.pspec:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,46959 +/trunk/reactos/dll/win32/kernel32/kernel32.pspec:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,46959,47605 Propchange: branches/arwinss/reactos/dll/win32/user32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/user32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/user32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/win32/user32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 /vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46696,46915,47274,47321,47585,47798,47861 Propchange: branches/arwinss/reactos/dll/win32/winex11.drv/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/winex11.drv:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/winex11.drv:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/win32/winex11.drv:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 /vendor/wine/dlls/winex11.drv/current:43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46915,47274,47321,47798,47861 Propchange: branches/arwinss/reactos/include/ndk/amd64/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/ndk/amd64:34780-34782,34908-34909,34925,34965,34967,34970,35323-35324,35347-35348,35361,35436,35509,35588,35683,35739,35762,35777,35805,35823,35827,35952,35966,36172,36360,36445,36502-36503,36505,36899,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37990,38013-38014,38149-38150,38264,38355,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41071,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338,44389,44391,44426,44460,44491,44500,44530,44540,44601,44623,44631 -/trunk/reactos/include/ndk/amd64:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/include/ndk/amd64:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/include/ndk/amd64/asmmacro.S ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37475,37536,37820-37821,37868-37869,37990,38013-38014,38149-38150,38264,38355,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41071,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338,44389,44391,44426,44460,44491,44500,44530,44540,44601,44623,44631 -/trunk/reactos/include/ndk/amd64/asmmacro.S:43669-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/include/ndk/amd64/asmmacro.S:43669-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/include/psdk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/psdk:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/include/psdk:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/include/psdk:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/lib/sdk/crt/time/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,4 +1,4 @@ /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new:42414 -/trunk/reactos/lib/sdk/crt/time:42678-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/lib/sdk/crt/time:42678-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 /trunk/reactos/lib/sdk/crt/time_new:39350-42241,42401-42678 Modified: branches/arwinss/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/config… ============================================================================== --- branches/arwinss/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ branches/arwinss/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Tue Jun 29 10:08:23 2010 @@ -234,7 +234,9 @@ if (Found) { /* Reference it */ + ASSERT(Ncb->RefCount != 0xFFFF); Ncb->RefCount++; + break; } } @@ -320,6 +322,7 @@ CmpAcquireNcbLockExclusiveByKey(ConvKey); /* Decrease the reference count */ + ASSERT(Ncb->RefCount >= 1); if (!(--Ncb->RefCount)) { /* Find the NCB in the table */ @@ -579,7 +582,7 @@ NewRefCount = OldRefCount - 1; /* Check if we still have references */ - if( (NewRefCount & 0xFFFF) > 0) + if ((NewRefCount & 0xFFFF) > 0) { /* Do the dereference */ if (InterlockedCompareExchange((PLONG)&Kcb->RefCount, Propchange: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/subsystems/win32/win32k/include:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/subsystems/win32/win32k/include:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 /vendor/wine/server/current:45044,47274,47321,47798 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/request.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/include/request.h:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/subsystems/win32/win32k/include/request.h:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 /vendor/wine/server/current/request.h:43136,43398,43708,45044,47274,47321,47798 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/user.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/user.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/include/user.h:42000-43126,43669-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/subsystems/win32/win32k/include/user.h:42000-43126,43669-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 /vendor/wine/server/current/user.h:43708,45044,47274,47321,47798 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/wine/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/wine:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/wine:42000-43126,43669-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/subsystems/win32/win32k/wine:42000-43126,43669-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 /vendor/wine/server/current:43708,44715,45044,45206,45646,45910,46314,46696,47274,47321,47798 Propchange: branches/arwinss/reactos/tools/rsym/log2lines.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/log2lines.c:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/tools/rsym/log2lines.c:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/tools/rsym/log2lines.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.mak:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/log2lines.mak:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/tools/rsym/log2lines.mak:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/rsym.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/tools/rsym/rsym.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/rsym.h:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/tools/rsym/rsym.h:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/rsym.mak:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/tools/rsym/rsym.mak:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/rsym_common.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/tools/rsym/rsym_common.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605

1 0

[fireball] 47903: - Sync up to Wine-1.2-rc5.
by fireball＠svn.reactos.org 29 Jun '10

29 Jun '10

Author: fireball Date: Tue Jun 29 09:14:16 2010 New Revision: 47903 URL: http://svn.reactos.org/svn/reactos?rev=47903&view=rev Log: - Sync up to Wine-1.2-rc5. Modified: branches/arwinss/reactos/dll/win32/gdi32/ (props changed) branches/arwinss/reactos/dll/win32/gdi32/dc.c branches/arwinss/reactos/dll/win32/gdi32/font.c branches/arwinss/reactos/dll/win32/gdi32/gdi32.spec branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/user32/cursoricon.c branches/arwinss/reactos/dll/win32/user32/dde_server.c branches/arwinss/reactos/dll/win32/user32/msgbox.c branches/arwinss/reactos/dll/win32/user32/resources/oic_bang.svg branches/arwinss/reactos/dll/win32/user32/resources/oic_hand.svg branches/arwinss/reactos/dll/win32/user32/resources/oic_note.svg branches/arwinss/reactos/dll/win32/user32/resources/oic_ques.svg branches/arwinss/reactos/dll/win32/user32/resources/oic_sample.svg branches/arwinss/reactos/dll/win32/user32/resources/user32_Ru.rc branches/arwinss/reactos/dll/win32/user32/sysparams.c branches/arwinss/reactos/dll/win32/user32/win.c branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed) branches/arwinss/reactos/dll/win32/winex11.drv/event.c branches/arwinss/reactos/dll/win32/winex11.drv/init.c branches/arwinss/reactos/dll/win32/winex11.drv/xim.c branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/dll/win32/gdi32/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/dde_server.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/msgbox.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/resources/oic_bang.svg URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/resources/oic_hand.svg URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/resources/oic_note.svg URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/resources/oic_ques.svg URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/resources/oic_sample.svg URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/resources/user32_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/win.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/event.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/xim.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex…

1 0

[dreimer] 47902: Update Thunderbird and FireFox in rapps.
by dreimer＠svn.reactos.org 29 Jun '10

29 Jun '10

Author: dreimer Date: Tue Jun 29 06:31:00 2010 New Revision: 47902 URL: http://svn.reactos.org/svn/reactos?rev=47902&view=rev Log: Update Thunderbird and FireFox in rapps. Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.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] Tue Jun 29 06:31:00 2010 @@ -2,47 +2,47 @@ [Section] Name = Mozilla Firefox 3.6 -Version = 3.6.3 +Version = 3.6.6 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. -Size = 8.0M +Size = 8.2M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/en… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/en… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. -Size = 7.8M +Size = 8.0M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/de… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/de… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. -Size = 7.8M +Size = 8.0M URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/es… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/es… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. -Size = 7.8M +Size = 8.0M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/nb… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/nb… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. -Size = 8.6M +Size = 8.9M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/pl… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/pl… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². -Size = 8.2M +Size = 8.4M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/ru… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/ru… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². -Size = 8.2M +Size = 8.4M URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/uk… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/uk… 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] Tue Jun 29 06:31:00 2010 @@ -2,41 +2,41 @@ [Section] Name = Mozilla Thunderbird -Version = 3.0.5 +Version = 3.1 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. -Size = 8.6M +Size = 9.0M Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. -Size = 8.5M +Size = 8.9M URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. -Size = 8.4M +Size = 8.8M URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. -Size = 9.3M +Size = 9.7M URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². -Size = 8.8M +Size = 9.2M URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². -Size = 8.8M +Size = 9.2M URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/…

1 0

[tkreuzer] 47901: [WS2_32_NEW] Fix WSAAccept parameter (DWORD -> DWORD_PTR)
by tkreuzer＠svn.reactos.org 28 Jun '10

28 Jun '10

Author: tkreuzer Date: Mon Jun 28 21:36:28 2010 New Revision: 47901 URL: http://svn.reactos.org/svn/reactos?rev=47901&view=rev Log: [WS2_32_NEW] Fix WSAAccept parameter (DWORD -> DWORD_PTR) Modified: trunk/reactos/dll/win32/ws2_32_new/src/socklife.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/socklife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/socklife.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/socklife.c [iso-8859-1] Mon Jun 28 21:36:28 2010 @@ -293,7 +293,7 @@ OUT LPSOCKADDR addr, IN OUT LPINT addrlen, IN LPCONDITIONPROC lpfnCondition, - IN DWORD dwCallbackData) + IN DWORD_PTR dwCallbackData) { PWSPROCESS Process; PWSTHREAD Thread;

1 0

[tkreuzer] 47900: [WINMM] Fix a number of 64bit issues, add some comments where the code is not 64 bit safe. This module should be synced with wine, but this still causes a problem with Flash videos on FF2 (likely another timer problem)
by tkreuzer＠svn.reactos.org 28 Jun '10

28 Jun '10

Author: tkreuzer Date: Mon Jun 28 20:58:30 2010 New Revision: 47900 URL: http://svn.reactos.org/svn/reactos?rev=47900&view=rev Log: [WINMM] Fix a number of 64bit issues, add some comments where the code is not 64 bit safe. This module should be synced with wine, but this still causes a problem with Flash videos on FF2 (likely another timer problem) Modified: trunk/reactos/ (props changed) trunk/reactos/dll/win32/winmm/driver.c trunk/reactos/dll/win32/winmm/mci.c trunk/reactos/dll/win32/winmm/midimap/midimap.c trunk/reactos/dll/win32/winmm/mmio.c trunk/reactos/dll/win32/winmm/winmm.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 28 20:58:30 2010 @@ -1,4 +1,4 @@ /branches/header-work:45691-47721 /branches/reactos-yarotows:46848,46966,47800 /branches/ros-amd64-bringup:36852 -/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,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,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37323,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,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-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,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,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,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37323,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,40927-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,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,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,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 Modified: trunk/reactos/dll/win32/winmm/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/driver.c?r… ============================================================================== --- trunk/reactos/dll/win32/winmm/driver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/driver.c [iso-8859-1] Mon Jun 28 20:58:30 2010 @@ -467,7 +467,7 @@ return 0; the_end: - if (lpDrv) TRACE("=> %08lx\n", (DWORD)lpDrv); + if (lpDrv) TRACE("=> %p\n", lpDrv); return (HDRVR)lpDrv; } Modified: trunk/reactos/dll/win32/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mci.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] Mon Jun 28 20:58:30 2010 @@ -975,7 +975,7 @@ /************************************************************************** * MCI_GetDWord [internal] */ -static BOOL MCI_GetDWord(LPDWORD data, LPWSTR* ptr) +static BOOL MCI_GetDWord(DWORD_PTR *data, LPWSTR* ptr) { DWORD val; LPWSTR ret; @@ -1028,7 +1028,7 @@ /************************************************************************** * MCI_ParseOptArgs [internal] */ -static DWORD MCI_ParseOptArgs(LPDWORD data, int _offset, LPCWSTR lpCmd, +static DWORD MCI_ParseOptArgs(DWORD_PTR *data, int _offset, LPCWSTR lpCmd, LPWSTR args, LPDWORD dwFlags) { int len, offset; @@ -1151,7 +1151,7 @@ * MCI_HandleReturnValues [internal] */ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD retType, - LPDWORD data, LPWSTR lpstrRet, UINT uRetLen) + DWORD_PTR *data, LPWSTR lpstrRet, UINT uRetLen) { static const WCHAR wszLd [] = {'%','l','d',0}; static const WCHAR wszLd4 [] = {'%','l','d',' ','%','l','d',' ','%','l','d',' ','%','l','d',0}; @@ -1229,7 +1229,7 @@ LPWINE_MCIDRIVER wmd = 0; DWORD dwFlags = 0, dwRet = 0; int offset = 0; - DWORD data[MCI_DATA_SIZE]; + DWORD_PTR data[MCI_DATA_SIZE]; DWORD retType; LPCWSTR lpCmd = 0; LPWSTR devAlias = NULL; @@ -1282,15 +1282,15 @@ tmp = devType; devType = dev; dev = tmp; dwFlags |= MCI_OPEN_TYPE; - data[2] = (DWORD)devType; + data[2] = (DWORD_PTR)devType; devType = str_dup_upper(devType); dwFlags |= MCI_OPEN_ELEMENT; - data[3] = (DWORD)dev; + data[3] = (DWORD_PTR)dev; } else if (DRIVER_GetLibName(dev, wszMci, buf, sizeof(buf))) { /* this is the name of a mci driver's type */ tmp = strchrW(dev, ' '); if (tmp) *tmp = '\0'; - data[2] = (DWORD)dev; + data[2] = (DWORD_PTR)dev; devType = str_dup_upper(dev); if (tmp) *tmp = ' '; dwFlags |= MCI_OPEN_TYPE; @@ -1309,7 +1309,7 @@ devType = str_dup_upper(buf); } dwFlags |= MCI_OPEN_ELEMENT; - data[3] = (DWORD)dev; + data[3] = (DWORD_PTR)dev; } if ((devAlias = strstrW(args, wszSAliasS))) { WCHAR* tmp2; @@ -1319,7 +1319,7 @@ tmp2 = HeapAlloc(GetProcessHeap(), 0, (tmp - devAlias + 1) * sizeof(WCHAR) ); memcpy( tmp2, devAlias, (tmp - devAlias) * sizeof(WCHAR) ); tmp2[tmp - devAlias] = 0; - data[4] = (DWORD)tmp2; + data[4] = (DWORD_PTR)tmp2; /* should be done in regular options parsing */ /* dwFlags |= MCI_OPEN_ALIAS; */ } else if (dev == 0) { @@ -1378,7 +1378,7 @@ switch (retType = MCI_GetReturnType(lpCmd)) { case 0: offset = 1; break; case MCI_INTEGER: offset = 2; break; - case MCI_STRING: data[1] = (DWORD)lpstrRet; data[2] = uRetLen; offset = 3; break; + case MCI_STRING: data[1] = (DWORD_PTR)lpstrRet; data[2] = uRetLen; offset = 3; break; case MCI_RECT: offset = 5; break; default: ERR("oops\n"); } @@ -1391,7 +1391,7 @@ /* set up call back */ if (dwFlags & MCI_NOTIFY) { - data[0] = (DWORD)hwndCallback; + data[0] = (DWORD_PTR)hwndCallback; } /* FIXME: the command should get it's own notification window set up and @@ -1676,7 +1676,7 @@ TRACE("(%04x, %08X, %p)\n", wDevID, dwParam, lpParms); - if (wDevID == (UINT16)MCI_ALL_DEVICE_ID) { + if (wDevID == MCI_ALL_DEVICE_ID) { /* FIXME: shall I notify once after all is done, or for * each of the open drivers ? if the latest, which notif * to return when only one fails ? Modified: trunk/reactos/dll/win32/winmm/midimap/midimap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/midimap/mi… ============================================================================== --- trunk/reactos/dll/win32/winmm/midimap/midimap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/midimap/midimap.c [iso-8859-1] Mon Jun 28 20:58:30 2010 @@ -260,7 +260,7 @@ return ret; } -static DWORD modOpen(LPDWORD lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) +static DWORD modOpen(DWORD_PTR *lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) { MIDIMAPDATA* mom = HeapAlloc(GetProcessHeap(), 0, sizeof(MIDIMAPDATA)); @@ -270,7 +270,7 @@ if (MIDIMAP_LoadSettings(mom)) { - *lpdwUser = (DWORD)mom; + *lpdwUser = (DWORD_PTR)mom; mom->self = mom; return MMSYSERR_NOERROR; @@ -306,7 +306,7 @@ return ret; } -static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) +static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwParam2) { WORD chn; DWORD ret = MMSYSERR_NOERROR; @@ -330,7 +330,7 @@ return ret; } -static DWORD modData(MIDIMAPDATA* mom, DWORD dwParam) +static DWORD modData(MIDIMAPDATA* mom, DWORD_PTR dwParam) { BYTE lb = LOBYTE(LOWORD(dwParam)); WORD chn = lb & 0x0F; @@ -393,7 +393,7 @@ return ret; } -static DWORD modPrepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) +static DWORD modPrepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwParam2) { if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; if (lpMidiHdr->dwFlags & (MHDR_ISSTRM|MHDR_PREPARED)) @@ -403,7 +403,7 @@ return MMSYSERR_NOERROR; } -static DWORD modUnprepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) +static DWORD modUnprepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwParam2) { if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; if ((lpMidiHdr->dwFlags & MHDR_ISSTRM) || !(lpMidiHdr->dwFlags & MHDR_PREPARED)) @@ -413,7 +413,7 @@ return MMSYSERR_NOERROR; } -static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiCaps, DWORD size) +static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiCaps, DWORD_PTR size) { static const WCHAR name[] = {'W','i','n','e',' ','m','i','d','i',' ','m','a','p','p','e','r',0}; lpMidiCaps->wMid = 0x00FF; @@ -451,8 +451,8 @@ /************************************************************************** * modMessage (MIDIMAP.@) */ -DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) +DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) { TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); @@ -492,7 +492,7 @@ /************************************************************************** * MIDIMAP_drvOpen [internal] */ -static DWORD MIDIMAP_drvOpen(LPSTR str) +static LRESULT MIDIMAP_drvOpen(LPSTR str) { MIDIOUTCAPSW moc; unsigned dev, i; @@ -527,7 +527,7 @@ /************************************************************************** * MIDIMAP_drvClose [internal] */ -static DWORD MIDIMAP_drvClose(DWORD dwDevID) +static LRESULT MIDIMAP_drvClose(DWORD_PTR dwDevID) { if (midiOutPorts) { @@ -541,8 +541,8 @@ /************************************************************************** * DriverProc (MIDIMAP.@) */ -LONG CALLBACK MIDIMAP_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, - DWORD dwParam1, DWORD dwParam2) +LRESULT CALLBACK MIDIMAP_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, + LPARAM dwParam1, LPARAM dwParam2) { /* EPP TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n", */ /* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */ Modified: trunk/reactos/dll/win32/winmm/mmio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mmio.c?rev… ============================================================================== --- trunk/reactos/dll/win32/winmm/mmio.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/mmio.c [iso-8859-1] Mon Jun 28 20:58:30 2010 @@ -665,8 +665,8 @@ refmminfo->wErrorRet = send_message(wm->ioProc, &wm->info, MMIOM_OPEN, (LPARAM)szFileName, 0, FALSE); - /* grab file size, when possible */ - wm->dwFileSize = GetFileSize((HANDLE)wm->info.adwInfo[0], NULL); + /* grab file size, when possible (FIXME: not 64 bit safe) */ + wm->dwFileSize = GetFileSize((HANDLE)(ULONG_PTR)wm->info.adwInfo[0], NULL); if (refmminfo->wErrorRet == 0) return wm->info.hmmio; Modified: trunk/reactos/dll/win32/winmm/winmm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.c?re… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] Mon Jun 28 20:58:30 2010 @@ -760,7 +760,7 @@ TRACE("(%04X, %p) !\n", uDeviceID, lpdwVolume); - if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_AUX, TRUE)) == NULL) + if ((wmld = MMDRV_Get(UlongToHandle(uDeviceID), MMDRV_AUX, TRUE)) == NULL) return MMSYSERR_INVALHANDLE; return MMDRV_Message(wmld, AUXDM_GETVOLUME, (DWORD_PTR)lpdwVolume, 0L); } @@ -774,7 +774,7 @@ TRACE("(%04X, %u) !\n", uDeviceID, dwVolume); - if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_AUX, TRUE)) == NULL) + if ((wmld = MMDRV_Get(UlongToHandle(uDeviceID), MMDRV_AUX, TRUE)) == NULL) return MMSYSERR_INVALHANDLE; return MMDRV_Message(wmld, AUXDM_SETVOLUME, dwVolume, 0L); } @@ -786,7 +786,7 @@ { LPWINE_MLD wmld; - if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_AUX, TRUE)) == NULL) + if ((wmld = MMDRV_Get(UlongToHandle(uDeviceID), MMDRV_AUX, TRUE)) == NULL) return MMSYSERR_INVALHANDLE; return MMDRV_Message(wmld, uMessage, dw1, dw2); @@ -929,7 +929,7 @@ /************************************************************************** * midiOutOpen [WINMM.@] */ -UINT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID, +MMRESULT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags) { HMIDIOUT hMidiOut; @@ -1220,7 +1220,7 @@ /************************************************************************** * midiInOpen [WINMM.@] */ -UINT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, +MMRESULT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags) { HANDLE hMidiIn; @@ -1466,7 +1466,7 @@ return FALSE; } - *lpMidiStrm = (WINE_MIDIStream*)lpwm->mod.rgIds.dwStreamID; + *lpMidiStrm = (WINE_MIDIStream*)(ULONG_PTR)lpwm->mod.rgIds.dwStreamID; // FIXME: not 64 bit safe return *lpMidiStrm != NULL; } @@ -1581,7 +1581,8 @@ #endif if (((LPMIDIEVENT)lpData)->dwStreamID != 0 && ((LPMIDIEVENT)lpData)->dwStreamID != 0xFFFFFFFF && - ((LPMIDIEVENT)lpData)->dwStreamID != (DWORD)lpMidiStrm) { + /* FIXME: not 64 bit safe */ + ((LPMIDIEVENT)lpData)->dwStreamID != (DWORD_PTR)lpMidiStrm) { FIXME("Dropping bad %s lpMidiHdr (streamID=%08x)\n", (lpMidiHdr->dwFlags & MHDR_ISSTRM) ? "stream" : "regular", ((LPMIDIEVENT)lpData)->dwStreamID); @@ -1800,7 +1801,7 @@ lpMidiStrm->dwTimeDiv = 480; /* 480 is 120 quarter notes per minute *//* FIXME ??*/ lpMidiStrm->dwPositionMS = 0; - mosm.dwStreamID = (DWORD)lpMidiStrm; + mosm.dwStreamID = (DWORD_PTR)lpMidiStrm; // FIXME: not 64 bit safe /* FIXME: the correct value is not allocated yet for MAPPER */ mosm.wDeviceID = *lpuDeviceID; lpwm = MIDI_OutAlloc(&hMidiOut, &dwCallback, &dwInstance, &fdwOpen, 1, &mosm);

1 0

[cgutman] 47899: [DHCPCSVC] - Discover adapters synchronously again until a bug (possibly a race condition) is fixed - DHCP failure in certain situations is fixed now
by cgutman＠svn.reactos.org 28 Jun '10

28 Jun '10

Author: cgutman Date: Mon Jun 28 18:50:19 2010 New Revision: 47899 URL: http://svn.reactos.org/svn/reactos?rev=47899&view=rev Log: [DHCPCSVC] - Discover adapters synchronously again until a bug (possibly a race condition) is fixed - DHCP failure in certain situations is fixed now Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ad… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] Mon Jun 28 18:50:19 2010 @@ -365,13 +365,14 @@ } HANDLE StartAdapterDiscovery(VOID) { - HANDLE ThreadHandle, EventHandle; + HANDLE /* ThreadHandle, */ EventHandle; EventHandle = CreateEvent(NULL, FALSE, FALSE, NULL); +#if 0 ThreadHandle = CreateThread(NULL, 0, AdapterDiscoveryThread, @@ -383,6 +384,9 @@ return NULL; CloseHandle(ThreadHandle); +#else + AdapterDiscoveryThread((LPVOID)EventHandle); +#endif return EventHandle; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2010