Ros-diffs

ros-diffs@reactos.org

81390 discussions

Start a nNew thread

[navaraf] 20307: Dead branch
by navaraf＠svn.reactos.com 23 Dec '05

23 Dec '05

Dead branch Deleted: branches/pnpmgr_cleanup/

1 0

[navaraf] 20306: Already merged to trunk
by navaraf＠svn.reactos.com 23 Dec '05

23 Dec '05

Already merged to trunk Deleted: branches/ndis_wip_22102004/

1 0

[gvg] 20305: Return error code that oskit understands. Fixes ftp upload.
by gvg＠svn.reactos.com 22 Dec '05

22 Dec '05

Return error code that oskit understands. Fixes ftp upload. Modified: trunk/reactos/drivers/lib/ip/transport/tcp/event.c _____ Modified: trunk/reactos/drivers/lib/ip/transport/tcp/event.c --- trunk/reactos/drivers/lib/ip/transport/tcp/event.c 2005-12-22 22:22:14 UTC (rev 20304) +++ trunk/reactos/drivers/lib/ip/transport/tcp/event.c 2005-12-22 22:23:07 UTC (rev 20305) @@ -89,7 +89,7 @@ if (NdisStatus != NDIS_STATUS_SUCCESS) { TI_DbgPrint(DEBUG_TCP, ("Error from NDIS: %08x\n", NdisStatus)); - return STATUS_NO_MEMORY; + return OSK_ENOBUFS; } GetDataPtr( Packet.NdisPacket, MaxLLHeaderSize,

1 0

[gvg] 20304: Silence debug message
by gvg＠svn.reactos.com 22 Dec '05

22 Dec '05

Silence debug message Modified: trunk/reactos/drivers/lib/ip/network/loopback.c _____ Modified: trunk/reactos/drivers/lib/ip/network/loopback.c --- trunk/reactos/drivers/lib/ip/network/loopback.c 2005-12-22 20:41:46 UTC (rev 20303) +++ trunk/reactos/drivers/lib/ip/network/loopback.c 2005-12-22 22:22:14 UTC (rev 20304) @@ -108,7 +108,8 @@ TI_DbgPrint(DEBUG_DATALINK, ("Work item inserted %x %x\n", &LoopWorkItem, WQItem)); } else { - DbgPrint("LOOP WORKER BUSY %x %x\n", &LoopWorkItem, WQItem); + TI_DbgPrint(DEBUG_DATALINK, + ("LOOP WORKER BUSY %x %x\n", &LoopWorkItem, WQItem)); } TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); }

1 0

[gvg] 20303: Fix nul stripping and get GreatLord of my back ; -)
by gvg＠svn.reactos.com 22 Dec '05

22 Dec '05

Fix nul stripping and get GreatLord of my back ;-) Modified: trunk/reactos/lib/crt/stdio/vfwprint.c _____ Modified: trunk/reactos/lib/crt/stdio/vfwprint.c --- trunk/reactos/lib/crt/stdio/vfwprint.c 2005-12-22 18:32:14 UTC (rev 20302) +++ trunk/reactos/lib/crt/stdio/vfwprint.c 2005-12-22 20:41:46 UTC (rev 20303) @@ -368,10 +368,14 @@ tmp = buf; if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) { j = 0; - while ( j < i && ( *tmp == L'0' || *tmp == L'.' )) { + while ( j < i && *tmp == L'0' ) { tmp++; i--; } + if ( j < i && *tmp == L'.' ) { + tmp++; + i--; + } } // else // while (i < precision--)

1 0

[turner] 20302: version -> release
by turner＠svn.reactos.com 22 Dec '05

22 Dec '05

version -> release Modified: branches/ros-branch-0_2_9/reactos/include/reactos/version.h _____ Modified: branches/ros-branch-0_2_9/reactos/include/reactos/version.h --- branches/ros-branch-0_2_9/reactos/include/reactos/version.h 2005-12-22 16:30:37 UTC (rev 20301) +++ branches/ros-branch-0_2_9/reactos/include/reactos/version.h 2005-12-22 18:32:14 UTC (rev 20302) @@ -22,7 +22,7 @@ #define KERNEL_VERSION_PATCH_LEVEL 9 /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ -#define KERNEL_VERSION_BUILD_TYPE L"RC2" +#define KERNEL_VERSION_BUILD_TYPE L"RELEASE" #endif

1 0

[mbosma] 20301: Only allow bmp since it is the only format supported by reactos.
by mbosma＠svn.reactos.com 22 Dec '05

22 Dec '05

Only allow bmp since it is the only format supported by reactos. Modified: trunk/reactos/lib/cpl/desk/Fr.rc Modified: trunk/reactos/lib/cpl/desk/Ja.rc Modified: trunk/reactos/lib/cpl/desk/de.rc Modified: trunk/reactos/lib/cpl/desk/en.rc Modified: trunk/reactos/lib/cpl/desk/gr.rc Modified: trunk/reactos/lib/cpl/desk/hu.rc _____ Modified: trunk/reactos/lib/cpl/desk/Fr.rc --- trunk/reactos/lib/cpl/desk/Fr.rc 2005-12-22 13:57:52 UTC (rev 20300) +++ trunk/reactos/lib/cpl/desk/Fr.rc 2005-12-22 16:30:37 UTC (rev 20301) @@ -107,6 +107,6 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Images (*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0" - IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png" + IDS_BACKGROUND_COMDLG_FILTER "Images (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_SUPPORTED_EXT "*.bmp;*.dib" END _____ Modified: trunk/reactos/lib/cpl/desk/Ja.rc --- trunk/reactos/lib/cpl/desk/Ja.rc 2005-12-22 13:57:52 UTC (rev 20300) +++ trunk/reactos/lib/cpl/desk/Ja.rc 2005-12-22 16:30:37 UTC (rev 20301) @@ -105,6 +105,6 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "ëµæ£ (*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0" - IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png" + IDS_BACKGROUND_COMDLG_FILTER "ëµæ£ (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_SUPPORTED_EXT "*.bmp;*.dib" END _____ Modified: trunk/reactos/lib/cpl/desk/de.rc --- trunk/reactos/lib/cpl/desk/de.rc 2005-12-22 13:57:52 UTC (rev 20300) +++ trunk/reactos/lib/cpl/desk/de.rc 2005-12-22 16:30:37 UTC (rev 20301) @@ -81,6 +81,6 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Bilddateien (*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0" - IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png" + IDS_BACKGROUND_COMDLG_FILTER "Bilddateien (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_SUPPORTED_EXT "*.bmp;*.dib" END _____ Modified: trunk/reactos/lib/cpl/desk/en.rc --- trunk/reactos/lib/cpl/desk/en.rc 2005-12-22 13:57:52 UTC (rev 20300) +++ trunk/reactos/lib/cpl/desk/en.rc 2005-12-22 16:30:37 UTC (rev 20301) @@ -105,6 +105,6 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Pictures (*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0" - IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png" + IDS_BACKGROUND_COMDLG_FILTER "Pictures (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_SUPPORTED_EXT "*.bmp;*.dib" END _____ Modified: trunk/reactos/lib/cpl/desk/gr.rc --- trunk/reactos/lib/cpl/desk/gr.rc 2005-12-22 13:57:52 UTC (rev 20300) +++ trunk/reactos/lib/cpl/desk/gr.rc 2005-12-22 16:30:37 UTC (rev 20301) @@ -105,6 +105,6 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "?ÚÛ³ÝÕ? (*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0" - IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png" + IDS_BACKGROUND_COMDLG_FILTER "?ÚÛ³ÝÕ? (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_SUPPORTED_EXT "*.bmp;*.dib" END _____ Modified: trunk/reactos/lib/cpl/desk/hu.rc --- trunk/reactos/lib/cpl/desk/hu.rc 2005-12-22 13:57:52 UTC (rev 20300) +++ trunk/reactos/lib/cpl/desk/hu.rc 2005-12-22 16:30:37 UTC (rev 20301) @@ -91,6 +91,6 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "KÚpek (*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0" - IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png" + IDS_BACKGROUND_COMDLG_FILTER "KÚpek (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_SUPPORTED_EXT "*.bmp;*.dib" END

1 0

[hpoussin] 20300: msmouse.inf: Change some section names to be able to install the vmware mouse driver (still not working)
by hpoussin＠svn.reactos.com 22 Dec '05

22 Dec '05

msmouse.inf: Change some section names to be able to install the vmware mouse driver (still not working) usbport.inf: Add identifier for Intel 82371SB PIIX3 USB controller Modified: trunk/reactos/media/inf/msmouse.inf Modified: trunk/reactos/media/inf/usbport.inf _____ Modified: trunk/reactos/media/inf/msmouse.inf --- trunk/reactos/media/inf/msmouse.inf 2005-12-22 13:54:07 UTC (rev 20299) +++ trunk/reactos/media/inf/msmouse.inf 2005-12-22 13:57:52 UTC (rev 20300) @@ -79,14 +79,14 @@ ;------------------------------ PS/2 DRIVER ----------------------------- -[PS2_Inst.NT] +[PS2_Inst] CopyFiles = PS2_CopyFiles.NT, Mouclass_CopyFiles.NT AddReg = PS2_AddReg [PS2_CopyFiles.NT] i8042prt.sys -[PS2_Inst.NT.Services] +[PS2_Inst.Services] ;DO NOT INSTALL i8042prt driver, as long as it is not PnP-compatible ;AddService = i8042prt, 0x00000002, i8042prt_Service_Inst AddService = , 0x00000002 _____ Modified: trunk/reactos/media/inf/usbport.inf --- trunk/reactos/media/inf/usbport.inf 2005-12-22 13:54:07 UTC (rev 20299) +++ trunk/reactos/media/inf/usbport.inf 2005-12-22 13:57:52 UTC (rev 20300) @@ -34,6 +34,7 @@ %USB\ROOT_HUB.DeviceDesc%=RootHub_Inst,USB\ROOT_HUB20 [IntelMfg] +%PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc%=UHCI_Inst,PCI\VEN_8086&DEV _7020&CC_0C0300 %PCI\VEN_8086&DEV_7112&CC_0C0300.DeviceDesc%=UHCI_Inst,PCI\VEN_8086&DEV_ 7112&CC_0C0300 ;------------------------------ UHCI DRIVER ----------------------------- @@ -125,4 +126,5 @@ USB\ROOT_HUB.DeviceDesc = "Root hub" IntelMfg = "Intel" +PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc = "Intel 82371SB PIIX3 USB controller" PCI\VEN_8086&DEV_7112&CC_0C0300.DeviceDesc = "Intel 82371AB/EB/MB PIIX4 USB controller" \ No newline at end of file

1 0

[hpoussin] 20299: Expand the value if we have a REG_EXPAND_SZ entry
by hpoussin＠svn.reactos.com 22 Dec '05

22 Dec '05

Expand the value if we have a REG_EXPAND_SZ entry Modified: trunk/reactos/subsys/system/services/config.c _____ Modified: trunk/reactos/subsys/system/services/config.c --- trunk/reactos/subsys/system/services/config.c 2005-12-22 11:50:12 UTC (rev 20298) +++ trunk/reactos/subsys/system/services/config.c 2005-12-22 13:54:07 UTC (rev 20299) @@ -231,6 +231,8 @@ DWORD dwError; DWORD dwSize; DWORD dwType; + DWORD dwSizeNeeded; + LPWSTR expanded = NULL; LPBYTE ptr = NULL; *lpValue = NULL; @@ -260,9 +262,22 @@ if (dwType == REG_EXPAND_SZ) { - /* FIXME: ... */ - DPRINT1("Expand me!\n"); - *lpValue = (LPWSTR)ptr; + /* Expand the value... */ + dwSizeNeeded = ExpandEnvironmentStringsW((LPCWSTR)ptr, NULL, 0); + if (dwSizeNeeded == 0) + { + dwError = GetLastError(); + goto done; + } + expanded = HeapAlloc(GetProcessHeap(), 0, dwSizeNeeded); + if (dwSizeNeeded < ExpandEnvironmentStringsW((LPCWSTR)ptr, expanded, dwSizeNeeded)) + { + dwError = GetLastError(); + goto done; + } + *lpValue = expanded; + HeapFree(GetProcessHeap(), 0, ptr); + dwError = ERROR_SUCCESS; } else { @@ -271,7 +286,10 @@ done:; if (dwError != ERROR_SUCCESS) + { HeapFree(GetProcessHeap(), 0, ptr); + HeapFree(GetProcessHeap(), 0, expanded); + } return dwError; }

1 0

[gvg] 20298: Remove debugging breakpoint accidentally left in
by gvg＠svn.reactos.com 22 Dec '05

22 Dec '05

Remove debugging breakpoint accidentally left in Modified: trunk/reactos/drivers/lib/ip/network/ports.c _____ Modified: trunk/reactos/drivers/lib/ip/network/ports.c --- trunk/reactos/drivers/lib/ip/network/ports.c 2005-12-22 11:44:16 UTC (rev 20297) +++ trunk/reactos/drivers/lib/ip/network/ports.c 2005-12-22 11:50:12 UTC (rev 20298) @@ -56,7 +56,6 @@ ULONG AllocatedPort; ULONG Next; -__asm__("int $3\n"); if (PortSet->StartingPort + PortSet->PortsToOversee <= PortSet->LastAllocatedPort + 1) { Next = PortSet->StartingPort;

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