Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[sginsberg] 42374: - Cleanup from 42219 -- remove superfluous return statement
by sginsberg＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: sginsberg Date: Mon Aug 3 22:00:58 2009 New Revision: 42374 URL: http://svn.reactos.org/svn/reactos?rev=42374&view=rev Log: - Cleanup from 42219 -- remove superfluous return statement Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Mon Aug 3 22:00:58 2009 @@ -1022,7 +1022,6 @@ Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return; } NTSTATUS

1 0

[janderwald] 42373: - Add swenum.h (written from scratch)
by janderwald＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: janderwald Date: Mon Aug 3 21:41:56 2009 New Revision: 42373 URL: http://svn.reactos.org/svn/reactos?rev=42373&view=rev Log: - Add swenum.h (written from scratch) Added: trunk/reactos/include/ddk/swenum.h (with props) Added: trunk/reactos/include/ddk/swenum.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/swenum.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/swenum.h (added) +++ trunk/reactos/include/ddk/swenum.h [iso-8859-1] Mon Aug 3 21:41:56 2009 @@ -1,0 +1,153 @@ +#ifndef _SWENUM_ +#define _SWENUM_ + +#define IOCTL_SWENUM_INSTALL_INTERFACE CTL_CODE(FILE_DEVICE_BUS_EXTENDER, 0x000, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_SWENUM_REMOVE_INTERFACE CTL_CODE(FILE_DEVICE_BUS_EXTENDER, 0x001, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_SWENUM_GET_BUS_ID CTL_CODE(FILE_DEVICE_BUS_EXTENDER, 0x002, METHOD_NEITHER, FILE_READ_ACCESS) + +typedef struct _SWENUM_INSTALL_INTERFACE { + GUID DeviceId; + GUID InterfaceId; + WCHAR ReferenceString[1]; + +} SWENUM_INSTALL_INTERFACE, *PSWENUM_INSTALL_INTERFACE; + +#if defined(_KS_) +#define STATIC_BUSID_SoftwareDeviceEnumerator STATIC_KSMEDIUMSETID_Standard +#define BUSID_SoftwareDeviceEnumerator KSMEDIUMSETID_Standard +#else +#define STATIC_BUSID_SoftwareDeviceEnumerator \ + 0x4747B320L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +#endif + +#if defined(_NTDDK_) + + +#if !defined(_KS_) + +typedef VOID (NTAPI *PFNREFERENCEDEVICEOBJECT)(PVOID Context); +typedef VOID (NTAPI *PFNDEREFERENCEDEVICEOBJECT)(PVOID Context); +typedef NTSTATUS (NTAPI *PFNQUERYREFERENCESTRING)(PVOID Context, PWCHAR *String); + +#endif + +#define BUS_INTERFACE_SWENUM_VERSION 0x100 + +typedef struct _BUS_INTERFACE_SWENUM +{ + INTERFACE Interface; + PFNREFERENCEDEVICEOBJECT ReferenceDeviceObject; + PFNDEREFERENCEDEVICEOBJECT DereferenceDeviceObject; + PFNQUERYREFERENCESTRING QueryReferenceString; +} BUS_INTERFACE_SWENUM, *PBUS_INTERFACE_SWENUM; + +#if defined(__cplusplus) +extern "C" { +#endif + +#if defined(_KS_) + +KSDDKAPI +NTSTATUS +NTAPI +KsQuerySoftwareBusInterface( + IN PDEVICE_OBJECT PnpDeviceObject, + OUT PBUS_INTERFACE_SWENUM BusInterface +); + +KSDDKAPI +NTSTATUS +NTAPI +KsReferenceSoftwareBusObject( + IN KSDEVICE_HEADER Header +); + +KSDDKAPI +VOID +NTAPI +KsDereferenceSoftwareBusObject( + IN KSDEVICE_HEADER Header +); + +KSDDKAPI +NTSTATUS +NTAPI +KsCreateBusEnumObject( + IN PWSTR BusIdentifier, + IN PDEVICE_OBJECT BusDeviceObject, + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PDEVICE_OBJECT PnpDeviceObject, + IN REFGUID InterfaceGuid, + IN PWSTR ServiceRelativePath +); + +KSDDKAPI +NTSTATUS +NTAPI +KsGetBusEnumIdentifier( + IN OUT PIRP Irp +); + +KSDDKAPI +NTSTATUS +NTAPI +KsGetBusEnumPnpDeviceObject( + IN PDEVICE_OBJECT DeviceObject, + OUT PDEVICE_OBJECT *PnpDeviceObject +); + +KSDDKAPI +NTSTATUS +NTAPI +KsInstallBusEnumInterface( + IN PIRP Irp +); + +KSDDKAPI +NTSTATUS +NTAPI +KsIsBusEnumChildDevice( + IN PDEVICE_OBJECT DeviceObject, + OUT PBOOLEAN ChildDevice +); + + +KSDDKAPI +NTSTATUS +NTAPI +KsRemoveBusEnumInterface( + IN PIRP Irp +); + +KSDDKAPI +NTSTATUS +NTAPI +KsServiceBusEnumPnpRequest( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp +); + +KSDDKAPI +NTSTATUS +NTAPI +KsServiceBusEnumCreateRequest( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp +); + +KSDDKAPI +NTSTATUS +NTAPI +KsGetBusEnumParentFDOFromChildPDO( + IN PDEVICE_OBJECT DeviceObject, + OUT PDEVICE_OBJECT *FunctionalDeviceObject +); + +#endif + +#if defined(__cplusplus) +} +#endif +#endif +#endif + Propchange: trunk/reactos/include/ddk/swenum.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 42372: - Fix some cleanup vs. close confusion - Check if the search context address is unspecified
by cgutman＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: cgutman Date: Mon Aug 3 21:34:51 2009 New Revision: 42372 URL: http://svn.reactos.org/svn/reactos?rev=42372&view=rev Log: - Fix some cleanup vs. close confusion - Check if the search context address is unspecified Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Mon Aug 3 21:34:51 2009 @@ -98,7 +98,8 @@ (Current->Protocol == SearchContext->Protocol) && (AddrIsEqual(IPAddress, SearchContext->Address) || AddrIsBroadcast(IPAddress, SearchContext->Address) || - AddrIsUnspecified(IPAddress))) { + AddrIsUnspecified(IPAddress) || + AddrIsUnspecified(SearchContext->Address))) { /* We've found a match */ Found = TRUE; break; @@ -139,25 +140,161 @@ } -VOID DeleteAddress(PADDRESS_FILE AddrFile) -/* - * FUNCTION: Deletes an address file object - * ARGUMENTS: - * AddrFile = Pointer to address file object to delete - */ +/* + * FUNCTION: Open an address file object + * ARGUMENTS: + * Request = Pointer to TDI request structure for this request + * Address = Pointer to address to be opened + * Protocol = Protocol on which to open the address + * Options = Pointer to option buffer + * RETURNS: + * Status of operation + */ +NTSTATUS FileOpenAddress( + PTDI_REQUEST Request, + PTA_IP_ADDRESS Address, + USHORT Protocol, + PVOID Options) +{ + IPv4_RAW_ADDRESS IPv4Address; + PADDRESS_FILE AddrFile; + + TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); + + AddrFile = exAllocatePool(NonPagedPool, sizeof(ADDRESS_FILE)); + if (!AddrFile) { + TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + return STATUS_INSUFFICIENT_RESOURCES; + } + + TI_DbgPrint(DEBUG_ADDRFILE, ("Address file object allocated at (0x%X).\n", AddrFile)); + + RtlZeroMemory(AddrFile, sizeof(ADDRESS_FILE)); + + AddrFile->Free = AddrFileFree; + + /* Make sure address is a local unicast address or 0 */ + /* FIXME: IPv4 only */ + AddrFile->Family = Address->Address[0].AddressType; + IPv4Address = Address->Address[0].Address[0].in_addr; + if (IPv4Address != 0 && + !AddrLocateADEv4(IPv4Address, &AddrFile->Address)) { + exFreePool(AddrFile); + TI_DbgPrint(MIN_TRACE, ("Non-local address given (0x%X).\n", DN2H(IPv4Address))); + return STATUS_INVALID_PARAMETER; + } + else + { + /* Bound to the default address ... Copy the address type */ + AddrFile->Address.Type = IP_ADDRESS_V4; + } + + TI_DbgPrint(MID_TRACE, ("Opening address %s for communication (P=%d U=%d).\n", + A2S(&AddrFile->Address), Protocol, IPPROTO_UDP)); + + /* Protocol specific handling */ + switch (Protocol) { + case IPPROTO_TCP: + AddrFile->Port = + TCPAllocatePort(Address->Address[0].Address[0].sin_port); + + if ((Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) || + AddrFile->Port == 0xffff) + { + exFreePool(AddrFile); + return STATUS_INVALID_PARAMETER; + } + + AddrFile->Send = NULL; /* TCPSendData */ + break; + + case IPPROTO_UDP: + TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); + AddrFile->Port = + UDPAllocatePort(Address->Address[0].Address[0].sin_port); + + if ((Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) || + AddrFile->Port == 0xffff) + { + exFreePool(AddrFile); + return STATUS_INVALID_PARAMETER; + } + + TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", + AddrFile->Port, + Address->Address[0].Address[0].sin_port)); + AddrFile->Send = UDPSendDatagram; + break; + + case IPPROTO_ICMP: + AddrFile->Port = 0; + AddrFile->Send = ICMPSendDatagram; + break; + + default: + /* Use raw IP for all other protocols */ + AddrFile->Port = 0; + AddrFile->Send = RawIPSendDatagram; + break; + } + + TI_DbgPrint(MID_TRACE, ("IP protocol number for address file object is %d.\n", + Protocol)); + + TI_DbgPrint(MID_TRACE, ("Port number for address file object is %d.\n", + WN2H(AddrFile->Port))); + + /* Set protocol */ + AddrFile->Protocol = Protocol; + + /* Initialize receive and transmit queues */ + InitializeListHead(&AddrFile->ReceiveQueue); + InitializeListHead(&AddrFile->TransmitQueue); + + /* Initialize spin lock that protects the address file object */ + KeInitializeSpinLock(&AddrFile->Lock); + + /* Set valid flag so the address can be used */ + AF_SET_VALID(AddrFile); + + /* Return address file object */ + Request->Handle.AddressHandle = AddrFile; + + /* Add address file to global list */ + ExInterlockedInsertTailList( + &AddressFileListHead, + &AddrFile->ListEntry, + &AddressFileListLock); + + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + + return STATUS_SUCCESS; +} + + +/* + * FUNCTION: Closes an address file object + * ARGUMENTS: + * Request = Pointer to TDI request structure for this request + * RETURNS: + * Status of operation + */ +NTSTATUS FileCloseAddress( + PTDI_REQUEST Request) { KIRQL OldIrql; + PADDRESS_FILE AddrFile; + NTSTATUS Status = STATUS_SUCCESS; + PDATAGRAM_SEND_REQUEST SendRequest; + PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; PLIST_ENTRY CurrentEntry; PLIST_ENTRY NextEntry; - PDATAGRAM_SEND_REQUEST SendRequest; - PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; TI_DbgPrint(MID_TRACE, ("Called.\n")); - /* Remove address file from the global list */ - TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); - RemoveEntryList(&AddrFile->ListEntry); - TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); + AddrFile = Request->Handle.AddressHandle; TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); @@ -197,143 +334,9 @@ TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - (*AddrFile->Free)(AddrFile); - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); -} - - -/* - * FUNCTION: Open an address file object - * ARGUMENTS: - * Request = Pointer to TDI request structure for this request - * Address = Pointer to address to be opened - * Protocol = Protocol on which to open the address - * Options = Pointer to option buffer - * RETURNS: - * Status of operation - */ -NTSTATUS FileOpenAddress( - PTDI_REQUEST Request, - PTA_IP_ADDRESS Address, - USHORT Protocol, - PVOID Options) -{ - IPv4_RAW_ADDRESS IPv4Address; - PADDRESS_FILE AddrFile; - - TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); - - AddrFile = exAllocatePool(NonPagedPool, sizeof(ADDRESS_FILE)); - if (!AddrFile) { - TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - return STATUS_INSUFFICIENT_RESOURCES; - } - - TI_DbgPrint(DEBUG_ADDRFILE, ("Address file object allocated at (0x%X).\n", AddrFile)); - - RtlZeroMemory(AddrFile, sizeof(ADDRESS_FILE)); - - AddrFile->Free = AddrFileFree; - - /* Make sure address is a local unicast address or 0 */ - /* FIXME: IPv4 only */ - AddrFile->Family = Address->Address[0].AddressType; - IPv4Address = Address->Address[0].Address[0].in_addr; - if (IPv4Address != 0 && - !AddrLocateADEv4(IPv4Address, &AddrFile->Address)) { - exFreePool(AddrFile); - TI_DbgPrint(MIN_TRACE, ("Non-local address given (0x%X).\n", DN2H(IPv4Address))); - return STATUS_INVALID_PARAMETER; - } - else - { - /* Bound to the default address ... Copy the address type */ - AddrFile->Address.Type = IP_ADDRESS_V4; - } - - TI_DbgPrint(MID_TRACE, ("Opening address %s for communication (P=%d U=%d).\n", - A2S(&AddrFile->Address), Protocol, IPPROTO_UDP)); - - /* Protocol specific handling */ - switch (Protocol) { - case IPPROTO_TCP: - AddrFile->Port = - TCPAllocatePort(Address->Address[0].Address[0].sin_port); - - if ((Address->Address[0].Address[0].sin_port && - AddrFile->Port != Address->Address[0].Address[0].sin_port) || - AddrFile->Port == 0xffff) - { - exFreePool(AddrFile); - return STATUS_INVALID_PARAMETER; - } - - AddrFile->Send = NULL; /* TCPSendData */ - break; - - case IPPROTO_UDP: - TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); - AddrFile->Port = - UDPAllocatePort(Address->Address[0].Address[0].sin_port); - - if ((Address->Address[0].Address[0].sin_port && - AddrFile->Port != Address->Address[0].Address[0].sin_port) || - AddrFile->Port == 0xffff) - { - exFreePool(AddrFile); - return STATUS_INVALID_PARAMETER; - } - - TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", - AddrFile->Port, - Address->Address[0].Address[0].sin_port)); - AddrFile->Send = UDPSendDatagram; - break; - - case IPPROTO_ICMP: - AddrFile->Port = 0; - AddrFile->Send = ICMPSendDatagram; - break; - - default: - /* Use raw IP for all other protocols */ - AddrFile->Port = 0; - AddrFile->Send = RawIPSendDatagram; - break; - } - - TI_DbgPrint(MID_TRACE, ("IP protocol number for address file object is %d.\n", - Protocol)); - - TI_DbgPrint(MID_TRACE, ("Port number for address file object is %d.\n", - WN2H(AddrFile->Port))); - - /* Set protocol */ - AddrFile->Protocol = Protocol; - - /* Initialize receive and transmit queues */ - InitializeListHead(&AddrFile->ReceiveQueue); - InitializeListHead(&AddrFile->TransmitQueue); - - /* Initialize spin lock that protects the address file object */ - KeInitializeSpinLock(&AddrFile->Lock); - - /* Set valid flag so the address can be used */ - AF_SET_VALID(AddrFile); - - /* Return address file object */ - Request->Handle.AddressHandle = AddrFile; - - /* Add address file to global list */ - ExInterlockedInsertTailList( - &AddressFileListHead, - &AddrFile->ListEntry, - &AddressFileListLock); - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return STATUS_SUCCESS; + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + + return Status; } @@ -344,24 +347,21 @@ * RETURNS: * Status of operation */ -NTSTATUS FileCloseAddress( +NTSTATUS FileFreeAddress( PTDI_REQUEST Request) { - KIRQL OldIrql; PADDRESS_FILE AddrFile; NTSTATUS Status = STATUS_SUCCESS; + KIRQL OldIrql; + + AddrFile = Request->Handle.AddressHandle; TI_DbgPrint(MID_TRACE, ("Called.\n")); - AddrFile = Request->Handle.AddressHandle; - - TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); - - /* Set address file object exclusive to us */ - AF_SET_BUSY(AddrFile); - AF_CLR_VALID(AddrFile); - - TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); + /* Remove address file from the global list */ + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); + RemoveEntryList(&AddrFile->ListEntry); + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); /* Protocol specific handling */ switch (AddrFile->Protocol) { @@ -380,30 +380,7 @@ break; } - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return Status; -} - - -/* - * FUNCTION: Closes an address file object - * ARGUMENTS: - * Request = Pointer to TDI request structure for this request - * RETURNS: - * Status of operation - */ -NTSTATUS FileFreeAddress( - PTDI_REQUEST Request) -{ - PADDRESS_FILE AddrFile; - NTSTATUS Status = STATUS_SUCCESS; - - AddrFile = Request->Handle.AddressHandle; - - TI_DbgPrint(MID_TRACE, ("Called.\n")); - - DeleteAddress(AddrFile); + (*AddrFile->Free)(AddrFile); TI_DbgPrint(MAX_TRACE, ("Leaving.\n"));

1 0

[sginsberg] 42371: - Minisync of gdiplus to fix a C4717 warning
by sginsberg＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: sginsberg Date: Mon Aug 3 21:27:41 2009 New Revision: 42371 URL: http://svn.reactos.org/svn/reactos?rev=42371&view=rev Log: - Minisync of gdiplus to fix a C4717 warning Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Mon Aug 3 21:27:41 2009 @@ -775,7 +775,7 @@ TRACE("(%p, %d, %d, %d, %d, %.2f, %.2f)\n", path, x, y, width, height, startAngle, sweepAngle); - return GdipAddPathPieI(path, (REAL)x, (REAL)y, (REAL)width, (REAL)height, startAngle, sweepAngle); + return GdipAddPathPie(path, (REAL)x, (REAL)y, (REAL)width, (REAL)height, startAngle, sweepAngle); } GpStatus WINGDIPAPI GdipAddPathPolygon(GpPath *path, GDIPCONST GpPointF *points, INT count)

1 0

[fireball] 42370: - Stick missing winternl.h include to fix compiling until a better solution is found.
by fireball＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: fireball Date: Mon Aug 3 20:42:23 2009 New Revision: 42370 URL: http://svn.reactos.org/svn/reactos?rev=42370&view=rev Log: - Stick missing winternl.h include to fix compiling until a better solution is found. Modified: branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c branches/arwinss/reactos/dll/win32/winex11.drv/event.c branches/arwinss/reactos/dll/win32/winex11.drv/keyboard.c branches/arwinss/reactos/dll/win32/winex11.drv/mouse.c branches/arwinss/reactos/dll/win32/winex11.drv/window.c branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c Modified: branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c [iso-8859-1] Mon Aug 3 20:42:23 2009 @@ -78,6 +78,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/wingdi16.h" #include "x11drv.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/dll/win32/winex11.drv/event.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] Mon Aug 3 20:42:23 2009 @@ -51,6 +51,7 @@ #include "shlobj.h" /* DROPFILES */ #include "shellapi.h" +#include "winternl.h" #include "wine/server.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/dll/win32/winex11.drv/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/keyboard.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/keyboard.c [iso-8859-1] Mon Aug 3 20:42:23 2009 @@ -47,6 +47,7 @@ #include "winreg.h" #include "winnls.h" #include "x11drv.h" +#include "winternl.h" #include "wine/server.h" #include "wine/unicode.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/dll/win32/winex11.drv/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/mouse.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/mouse.c [iso-8859-1] Mon Aug 3 20:42:23 2009 @@ -42,6 +42,7 @@ #include "wine/winuser16.h" #include "x11drv.h" +#include "winternl.h" #include "wine/server.h" #include "wine/library.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/dll/win32/winex11.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] Mon Aug 3 20:42:23 2009 @@ -45,6 +45,7 @@ #include "x11drv.h" #include "xcomposite.h" #include "wine/debug.h" +#include "winternl.h" #include "wine/server.h" #include "mwm.h" Modified: branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c [iso-8859-1] Mon Aug 3 20:42:23 2009 @@ -50,6 +50,7 @@ #include "xvidmode.h" //#include "xrandr.h" #include "xcomposite.h" +#include "winternl.h" #include "wine/server.h" #include "wine/debug.h" #include "wine/library.h"

1 0

[sginsberg] 42369: - mingw: __builtin_return_address -> _ReturnAddress, __builtin_frame_address -> _AddressOfReturnAddress - ReactOS-generic.rbuild: Define __STDC__ for MSVC to fix some code depending on it (not using /Za as it breaks other code)
by sginsberg＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: sginsberg Date: Mon Aug 3 20:02:07 2009 New Revision: 42369 URL: http://svn.reactos.org/svn/reactos?rev=42369&view=rev Log: - mingw: __builtin_return_address -> _ReturnAddress, __builtin_frame_address -> _AddressOfReturnAddress - ReactOS-generic.rbuild: Define __STDC__ for MSVC to fix some code depending on it (not using /Za as it breaks other code) Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/lib/3rdparty/mingw/gs_support.c Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Mon Aug 3 20:02:07 2009 @@ -95,6 +95,7 @@ <group compilerset="msc"> <define name="inline" compiler="cc">__inline</define> + <define name="__STDC__" compiler="cc">1</define> <compilerflag>/Zl</compilerflag> <compilerflag>/Zi</compilerflag> <compilerflag>/W1</compilerflag> Modified: trunk/reactos/lib/3rdparty/mingw/gs_support.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/gs_supp… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] Mon Aug 3 20:02:07 2009 @@ -108,12 +108,22 @@ else #endif { +#ifdef __GNUC__ #ifdef _WIN64 GS_ContextRecord.Rip = (ULONGLONG) __builtin_return_address (0); GS_ContextRecord.Rsp = (ULONGLONG) __builtin_frame_address (0) + 8; #else GS_ContextRecord.Eip = (DWORD) __builtin_return_address (0); GS_ContextRecord.Esp = (DWORD) __builtin_frame_address (0) + 4; +#endif +#else +#ifdef _WIN64 + GS_ContextRecord.Rip = (ULONGLONG) _ReturnAddress(); + GS_ContextRecord.Rsp = (ULONGLONG) _AddressOfReturnAddress(); +#else + GS_ContextRecord.Eip = (DWORD) _ReturnAddress(); + GS_ContextRecord.Esp = (DWORD) _AddressOfReturnAddress(); +#endif #endif }

1 0

[sginsberg] 42368: - Err, fix build of DxHalTest
by sginsberg＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: sginsberg Date: Mon Aug 3 19:40:40 2009 New Revision: 42368 URL: http://svn.reactos.org/svn/reactos?rev=42368&view=rev Log: - Err, fix build of DxHalTest Modified: trunk/rostests/tests/DxHalTest/main.c Modified: trunk/rostests/tests/DxHalTest/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/DxHalTest/main.c?re… ============================================================================== --- trunk/rostests/tests/DxHalTest/main.c [iso-8859-1] (original) +++ trunk/rostests/tests/DxHalTest/main.c [iso-8859-1] Mon Aug 3 19:40:40 2009 @@ -370,7 +370,6 @@ mddsdPrimary.dwFlags = DDSD_CAPS; mddsdPrimary.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_VIDEOMEMORY | DDSCAPS_VISIBLE; - mDdCanCreateSurface; mDdCanCreateSurface.lpDD = &mDDrawGlobal; mDdCanCreateSurface.CanCreateSurface = mCallbacks.HALDD.CanCreateSurface; mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; @@ -411,7 +410,6 @@ mpPrimaryLocals[0] = &mPrimaryLocal; - mDdCreateSurface; mDdCreateSurface.lpDD = &mDDrawGlobal; mDdCreateSurface.CreateSurface = mCallbacks.HALDD.CreateSurface; mDdCreateSurface.lpDDSurfaceDesc = &mddsdPrimary;//pDDSD; @@ -571,7 +569,6 @@ } - mDdUpdateOverlay; mDdUpdateOverlay.lpDD = &mDDrawGlobal; mDdUpdateOverlay.UpdateOverlay = mCallbacks.HALDDSurface.UpdateOverlay; mDdUpdateOverlay.lpDDDestSurface = mpPrimaryLocals[0];

1 0

[sginsberg] 42367: - Make symdump and ctm msvc-aware
by sginsberg＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: sginsberg Date: Mon Aug 3 19:08:45 2009 New Revision: 42367 URL: http://svn.reactos.org/svn/reactos?rev=42367&view=rev Log: - Make symdump and ctm msvc-aware Modified: trunk/rosapps/applications/devutils/symdump/symdump.c trunk/rosapps/applications/sysutils/ctm/ctm.c Modified: trunk/rosapps/applications/devutils/symdump/symdump.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/symd… ============================================================================== --- trunk/rosapps/applications/devutils/symdump/symdump.c [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/symdump/symdump.c [iso-8859-1] Mon Aug 3 19:08:45 2009 @@ -807,6 +807,7 @@ { IMAGEHLP_STACK_FRAME sf; BOOL bRet; + INT NumLocals = 0; // the number of local variables found sf.InstructionOffset = pSymInfo->Address; @@ -821,8 +822,6 @@ printf("Address == 0x%x, ReturnOffset = 0x%x", (UINT)pSymInfo->Address, (UINT)sf.ReturnOffset); // Enumerate local variables - - INT NumLocals = 0; // the number of local variables found bRet = SymEnumSymbols(pei->hProcess, 0, 0, EnumParamsProc, &NumLocals); Modified: trunk/rosapps/applications/sysutils/ctm/ctm.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/ctm/… ============================================================================== --- trunk/rosapps/applications/sysutils/ctm/ctm.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/ctm/ctm.c [iso-8859-1] Mon Aug 3 19:08:45 2009 @@ -277,10 +277,11 @@ int ProcessKeys(int numEvents) { DWORD numChars; + TCHAR key; if ((ProcessCount-scrolled < 17) && (ProcessCount > 17)) scrolled = ProcessCount-17; - TCHAR key = GetKeyPressed(numEvents); + key = GetKeyPressed(numEvents); if (key == KEY_QUIT) return TRUE; else if (key == KEY_KILL)

1 0

[sginsberg] 42366: - Remove WIP comment -- the fix is correct
by sginsberg＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: sginsberg Date: Mon Aug 3 19:08:17 2009 New Revision: 42366 URL: http://svn.reactos.org/svn/reactos?rev=42366&view=rev Log: - Remove WIP comment -- the fix is correct Modified: trunk/rostests/tests/Imagelistviewer/main.c Modified: trunk/rostests/tests/Imagelistviewer/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/Imagelistviewer/mai… ============================================================================== --- trunk/rostests/tests/Imagelistviewer/main.c [iso-8859-1] (original) +++ trunk/rostests/tests/Imagelistviewer/main.c [iso-8859-1] Mon Aug 3 19:08:17 2009 @@ -1,7 +1,7 @@ #include <windows.h> #include <setupapi.h> #include <tchar.h> -#include <stdlib.h> // FIXME-DONTCOMMIT: Why is this needed? +#include <stdlib.h> #include "resource.h" typedef BOOL (WINAPI * SH_GIL_PROC)(HIMAGELIST *phLarge, HIMAGELIST *phSmall);

1 0

[sginsberg] 42365: - Fix some msvc issues in rostests
by sginsberg＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: sginsberg Date: Mon Aug 3 18:59:43 2009 New Revision: 42365 URL: http://svn.reactos.org/svn/reactos?rev=42365&view=rev Log: - Fix some msvc issues in rostests Modified: trunk/rostests/apitests/gdi32api/tests/GetCurrentObject.c trunk/rostests/apitests/gdi32api/tests/GetObject.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c trunk/rostests/dibtests/bltrop/bltrop.c trunk/rostests/drivers/kmtest/deviface_test.c trunk/rostests/drivers/kmtest/ntos_ex.c trunk/rostests/tests/DxHalTest/main.c trunk/rostests/tests/Imagelistviewer/main.c trunk/rostests/tests/global_mem/global_mem.c trunk/rostests/tests/miditest/miditest.c trunk/rostests/tests/winhello/winhello.c Modified: trunk/rostests/apitests/gdi32api/tests/GetCurrentObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetCurrentObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/tests/GetCurrentObject.c [iso-8859-1] Mon Aug 3 18:59:43 2009 @@ -4,6 +4,7 @@ { HWND hWnd; HDC hDC; + HBITMAP hBmp; /* Create a window */ hWnd = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, @@ -70,7 +71,6 @@ /* Default bitmap */ SetLastError(ERROR_SUCCESS); - HBITMAP hBmp; hBmp = GetCurrentObject(hDC, OBJ_BITMAP); RTEST(GDI_HANDLE_GET_TYPE(hBmp) == GDI_OBJECT_TYPE_BITMAP); RTEST(GetLastError() == ERROR_SUCCESS); Modified: trunk/rostests/apitests/gdi32api/tests/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/tests/GetObject.c [iso-8859-1] Mon Aug 3 18:59:43 2009 @@ -103,9 +103,10 @@ BITMAP bitmap; DIBSECTION dibsection; PVOID pData; + HDC hDC; FillMemory(&dibsection, sizeof(DIBSECTION), 0x77); - HDC hDC = GetDC(0); + hDC = GetDC(0); hBitmap = CreateDIBSection(hDC, &bmi, DIB_RGB_COLORS, &pData, NULL, 0); ASSERT(hBitmap); Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c [iso-8859-1] Mon Aug 3 18:59:43 2009 @@ -45,6 +45,10 @@ PBITMAPINFOHEADER pbih = (PBITMAPINFOHEADER)&bmi.bmiHeader; PBITMAPV4HEADER pbV4h = (PBITMAPV4HEADER)&bmi.bmiHeader; PBITMAPV5HEADER pbV5h = (PBITMAPV5HEADER)&bmi.bmiHeader; + + HANDLE hSection; + NTSTATUS Status; + LARGE_INTEGER MaximumSize; hDC = GetDC(0); pbih->biSize = sizeof(BITMAPINFOHEADER); @@ -441,10 +445,6 @@ if (hbmp) DeleteObject(hbmp); /* Test section */ - HANDLE hSection; - NTSTATUS Status; - LARGE_INTEGER MaximumSize; - MaximumSize.QuadPart = 4096; Status = ZwCreateSection(&hSection, SECTION_ALL_ACCESS, Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c [iso-8859-1] Mon Aug 3 18:59:43 2009 @@ -66,6 +66,7 @@ // UINT uint; DWORD data[1000]; UINT i, uint; + ACCESSTIMEOUT ato; #if 1 /* Test normal */ SetLastError(ERROR_SUCCESS); @@ -78,7 +79,6 @@ TEST(GetLastError() == ERROR_INVALID_PARAMETER); /* Test wrong cbSize member */ - ACCESSTIMEOUT ato; ato.cbSize = 1; SetLastError(ERROR_SUCCESS); TEST(NtUserSystemParametersInfo(SPI_GETACCESSTIMEOUT, 0, &ato, 0) == FALSE); Modified: trunk/rostests/dibtests/bltrop/bltrop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/bltrop/bltrop.c?… ============================================================================== --- trunk/rostests/dibtests/bltrop/bltrop.c [iso-8859-1] (original) +++ trunk/rostests/dibtests/bltrop/bltrop.c [iso-8859-1] Mon Aug 3 18:59:43 2009 @@ -30,6 +30,7 @@ HDC hdc, hdcMem; BITMAP bitmap; HBRUSH brush, brush2; + INT l; hdc = BeginPaint(hWnd, &ps); hdcMem = CreateCompatibleDC(hdc); @@ -42,7 +43,7 @@ PatBlt(hdc, 30, 0, 4*bitmap.bmWidth*2, 4*bitmap.bmHeight, PATCOPY); /* hatched brushes */ - INT l = 66; + l = 66; brush = CreateHatchBrush(HS_DIAGCROSS, RGB(255,0,0)); SelectObject(hdc, brush); PatBlt(hdc, 0, 0, 30, l, PATCOPY); Modified: trunk/rostests/drivers/kmtest/deviface_test.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/deviface_t… ============================================================================== --- trunk/rostests/drivers/kmtest/deviface_test.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/deviface_test.c [iso-8859-1] Mon Aug 3 18:59:43 2009 @@ -31,8 +31,8 @@ /* PRIVATE FUNCTIONS **********************************************************/ -NTSTATUS NTAPI -(*IoGetDeviceInterfaces_Func)( +NTSTATUS +(NTAPI *IoGetDeviceInterfaces_Func)( IN CONST GUID *InterfaceClassGuid, IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL, IN ULONG Flags, Modified: trunk/rostests/drivers/kmtest/ntos_ex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_ex.c?… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_ex.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/ntos_ex.c [iso-8859-1] Mon Aug 3 18:59:43 2009 @@ -39,8 +39,8 @@ IN LONG TimerHighValue) { + ULONG *ApcCount = (ULONG *)TimerContext; DPRINT("Timer Apc called!\n"); - ULONG *ApcCount = (ULONG *)TimerContext; (*ApcCount)++; } Modified: trunk/rostests/tests/DxHalTest/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/DxHalTest/main.c?re… ============================================================================== --- trunk/rostests/tests/DxHalTest/main.c [iso-8859-1] (original) +++ trunk/rostests/tests/DxHalTest/main.c [iso-8859-1] Mon Aug 3 18:59:43 2009 @@ -70,6 +70,26 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nCmdShow) { + /* HAL Startup process */ + DEVMODE devmode; + HBITMAP hbmp; + const UINT bmiSize = sizeof(BITMAPINFOHEADER) + 0x10; + UCHAR *pbmiData; + BITMAPINFO *pbmi; + + DWORD *pMasks; + //BOOL newmode = FALSE; + //DWORD Status; /* for create surface */ + UINT i; + UINT j; + UINT cSurfaces; + + DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; + DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; + DDRAWI_DDRAWSURFACE_LCL *pDDSurface; + DDHAL_CREATESURFACEDATA mDdCreateSurface; + + /* get the functions we need */ // DD_GETDRIVERINFODATA drv; HMODULE lib = LoadLibrary("gdi32.dll"); @@ -77,20 +97,6 @@ DdQueryDirectDrawObject = (BOOL (APIENTRY*)(LPDDRAWI_DIRECTDRAW_GBL, LPDDHALINFO,LPDDHAL_DDCALLBACKS,LPDDHAL_DDSURFACECALLBACKS,LPDDHAL_DDPALETTECALLBACKS,LPD3DHAL_CALLBACKS,LPD3DHAL_GLOBALDRIVERDATA,LPDDHAL_DDEXEBUFCALLBACKS,LPDDSURFACEDESC,LPDWORD,LPVIDMEM))GetProcAddress(lib, "GdiEntry2"); DdAttachSurface = (BOOL (APIENTRY*)(LPDDRAWI_DDRAWSURFACE_LCL, LPDDRAWI_DDRAWSURFACE_LCL))GetProcAddress(lib, "GdiEntry11"); DdResetVisrgn = (BOOL (APIENTRY*)(LPDDRAWI_DDRAWSURFACE_LCL, HWND))GetProcAddress(lib, "GdiEntry6"); - - /* HAL Startup process */ - DEVMODE devmode; - HBITMAP hbmp; - const UINT bmiSize = sizeof(BITMAPINFOHEADER) + 0x10; - UCHAR *pbmiData; - BITMAPINFO *pbmi; - - DWORD *pMasks; - //BOOL newmode = FALSE; - //DWORD Status; /* for create surface */ - UINT i; - UINT j; - printf("This apps showing how to start up directx draw/d3d interface and some other as well\n"); printf("This code have been releae to some close applactons with my premtions, if any company\n"); @@ -364,7 +370,7 @@ mddsdPrimary.dwFlags = DDSD_CAPS; mddsdPrimary.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_VIDEOMEMORY | DDSCAPS_VISIBLE; - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; + mDdCanCreateSurface; mDdCanCreateSurface.lpDD = &mDDrawGlobal; mDdCanCreateSurface.CanCreateSurface = mCallbacks.HALDD.CanCreateSurface; mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; @@ -405,7 +411,7 @@ mpPrimaryLocals[0] = &mPrimaryLocal; - DDHAL_CREATESURFACEDATA mDdCreateSurface; + mDdCreateSurface; mDdCreateSurface.lpDD = &mDDrawGlobal; mDdCreateSurface.CreateSurface = mCallbacks.HALDD.CreateSurface; mDdCreateSurface.lpDDSurfaceDesc = &mddsdPrimary;//pDDSD; @@ -500,7 +506,7 @@ mOverlayGlobal.ddpfSurface = mddsdOverlay.ddpfPixelFormat; // setup front- and backbuffer surfaces - UINT cSurfaces = mddsdOverlay.dwBackBufferCount + 1; + cSurfaces = mddsdOverlay.dwBackBufferCount + 1; for ( i = 0; i < cSurfaces; i++) { memset(&mOverlayMore[i], 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); @@ -565,7 +571,7 @@ } - DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; + mDdUpdateOverlay; mDdUpdateOverlay.lpDD = &mDDrawGlobal; mDdUpdateOverlay.UpdateOverlay = mCallbacks.HALDDSurface.UpdateOverlay; mDdUpdateOverlay.lpDDDestSurface = mpPrimaryLocals[0]; @@ -607,7 +613,7 @@ /* blt */ - DDRAWI_DDRAWSURFACE_LCL *pDDSurface = mpPrimaryLocals[0]; + pDDSurface = mpPrimaryLocals[0]; if (!DdResetVisrgn(pDDSurface, NULL)) { Modified: trunk/rostests/tests/Imagelistviewer/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/Imagelistviewer/mai… ============================================================================== --- trunk/rostests/tests/Imagelistviewer/main.c [iso-8859-1] (original) +++ trunk/rostests/tests/Imagelistviewer/main.c [iso-8859-1] Mon Aug 3 18:59:43 2009 @@ -1,6 +1,7 @@ #include <windows.h> #include <setupapi.h> #include <tchar.h> +#include <stdlib.h> // FIXME-DONTCOMMIT: Why is this needed? #include "resource.h" typedef BOOL (WINAPI * SH_GIL_PROC)(HIMAGELIST *phLarge, HIMAGELIST *phSmall); Modified: trunk/rostests/tests/global_mem/global_mem.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/global_mem/global_m… ============================================================================== --- trunk/rostests/tests/global_mem/global_mem.c [iso-8859-1] (original) +++ trunk/rostests/tests/global_mem/global_mem.c [iso-8859-1] Mon Aug 3 18:59:43 2009 @@ -597,8 +597,8 @@ */ TEST_STATUS TestGlobalReAlloc() { + TEST_STATUS result = SKIPPED; OUTPUT_Banner("Testing GlobalReAlloc()"); - TEST_STATUS result = SKIPPED; result = TEST_CombineStatus(result, TestGlobalReAllocFixed()); result = TEST_CombineStatus(result, TestGlobalReAllocMovable()); @@ -767,8 +767,8 @@ */ TEST_STATUS TestGlobalFlags() { + TEST_STATUS result = SKIPPED; OUTPUT_Banner("Testing GlobalFlags()"); - TEST_STATUS result = SKIPPED; result = TEST_CombineStatus(result, TestGlobalFlagsFixed()); result = TEST_CombineStatus(result, TestGlobalFlagsMoveable()); Modified: trunk/rostests/tests/miditest/miditest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/miditest/miditest.c… ============================================================================== --- trunk/rostests/tests/miditest/miditest.c [iso-8859-1] (original) +++ trunk/rostests/tests/miditest/miditest.c [iso-8859-1] Mon Aug 3 18:59:43 2009 @@ -22,6 +22,9 @@ int c; + HMIDIOUT Handle = NULL; + UINT Result; + printf("MIDI output devices: %d\n", outs); for (c = 0; c < outs; c ++) @@ -32,8 +35,7 @@ printf("Opening MIDI output #0\n"); - HMIDIOUT Handle = NULL; - UINT Result = midiOutOpen(&Handle, 0, 0, 0, CALLBACK_NULL); + Result = midiOutOpen(&Handle, 0, 0, 0, CALLBACK_NULL); printf("Result == %d Handle == %d\n", Result, (int)Handle); // play something: Modified: trunk/rostests/tests/winhello/winhello.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/winhello/winhello.c… ============================================================================== --- trunk/rostests/tests/winhello/winhello.c [iso-8859-1] (original) +++ trunk/rostests/tests/winhello/winhello.c [iso-8859-1] Mon Aug 3 18:59:43 2009 @@ -110,7 +110,7 @@ { PAINTSTRUCT ps; /* Also used during window drawing */ HDC hDC; /* A device context used for drawing */ - RECT rc, clr, wir; /* A rectangle used during drawing */ + RECT rc = {0,0,0,0}, clr, wir; /* A rectangle used during drawing */ char spr[100], sir[100]; static HBRUSH hbrWhite=NULL, hbrGray=NULL, hbrBlack=NULL, hbrRed=NULL, hbrBlue=NULL, hbrYellow=NULL; @@ -123,9 +123,8 @@ case WM_CHAR: { - - hDC = GetDC(hWnd); TCHAR text[2]; + hDC = GetDC(hWnd); text[0] = (TCHAR)wParam; text[1] = _T('\0'); @@ -170,10 +169,9 @@ case WM_KEYDOWN: { - - hDC = GetDC(hWnd); RECT Rect; TCHAR text[2]; + hDC = GetDC(hWnd); text[0] = (TCHAR)wParam; text[1] = _T('\0'); @@ -201,10 +199,9 @@ case WM_KEYUP: { - - hDC = GetDC(hWnd); RECT Rect; TCHAR text[2]; + hDC = GetDC(hWnd); text[0] = (TCHAR)wParam; text[1] = _T('\0'); @@ -594,6 +591,8 @@ case WM_CREATE: { + SCROLLINFO si; + TEXTMETRIC tm; /* Register a Ctrl+Alt+C hotkey*/ RegisterHotKey(hWnd, CTRLC, MOD_CONTROL, VK_C); RegisterHotKey(hWnd, ALTF1, MOD_CONTROL | MOD_ALT, VK_F1); @@ -605,7 +604,6 @@ hbrBlue = CreateSolidBrush ( RGB(0x00, 0x00, 0xFF)); hbrYellow = CreateSolidBrush ( RGB(0xFF, 0xFF, 0x00)); - SCROLLINFO si; si.cbSize = sizeof(si); si.fMask = SIF_ALL; si.nMin = 0; @@ -619,7 +617,6 @@ /* The window is being created. Create our button * window now. */ - TEXTMETRIC tm; /* First we use the system fixed font size to choose * a nice button size. */

1 0

← Newer
1
...
58
59
60
61
62
63
64
65
66
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 August 2009