Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 40385: - Drivers must use DelayedWorkQueue
by cgutman＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: cgutman Date: Mon Apr 6 06:13:32 2009 New Revision: 40385 URL: http://svn.reactos.org/svn/reactos?rev=40385&view=rev Log: - Drivers must use DelayedWorkQueue Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/misc.c trunk/reactos/drivers/network/ndis/ndis/workitem.c trunk/reactos/drivers/network/tcpip/tcpip/main.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Apr 6 06:13:32 2009 @@ -773,7 +773,7 @@ IoWorkItem = IoAllocateWorkItem(Adapter->NdisMiniportBlock.DeviceObject); if (IoWorkItem) - IoQueueWorkItem(IoWorkItem, MiniportWorker, CriticalWorkQueue, IoWorkItem); + IoQueueWorkItem(IoWorkItem, MiniportWorker, DelayedWorkQueue, IoWorkItem); KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Mon Apr 6 06:13:32 2009 @@ -398,7 +398,7 @@ { PWORK_QUEUE_ITEM pntWorkItem = (PWORK_QUEUE_ITEM)pWorkItem->WrapperReserved; ExInitializeWorkItem(pntWorkItem, ndisProcWorkItemHandler, pWorkItem); - ExQueueWorkItem(pntWorkItem, CriticalWorkQueue); + ExQueueWorkItem(pntWorkItem, DelayedWorkQueue); return NDIS_STATUS_SUCCESS; } Modified: trunk/reactos/drivers/network/ndis/ndis/workitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/workitem.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/workitem.c [iso-8859-1] Mon Apr 6 06:13:32 2009 @@ -29,7 +29,7 @@ IoQueueWorkItem(WorkItem, Routine, - CriticalWorkQueue, + DelayedWorkQueue, WorkItemContext); } Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Mon Apr 6 06:13:32 2009 @@ -695,7 +695,7 @@ */ { if( !IpWorkItemQueued ) { - ExQueueWorkItem( &IpWorkItem, CriticalWorkQueue ); + ExQueueWorkItem( &IpWorkItem, DelayedWorkQueue ); IpWorkItemQueued = TRUE; } }

1 0

[cgutman] 40384: - Report to drivers that we are NDIS 5.0
by cgutman＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: cgutman Date: Mon Apr 6 06:06:33 2009 New Revision: 40384 URL: http://svn.reactos.org/svn/reactos?rev=40384&view=rev Log: - Report to drivers that we are NDIS 5.0 Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Mon Apr 6 06:06:33 2009 @@ -33,7 +33,7 @@ #include "ndissys.h" -#define NDIS_VERSION 0x00040000 /* the version of NDIS we claim to be to miniport drivers */ +#define NDIS_VERSION 0x00050000 /* the version of NDIS we claim to be to miniport drivers */ #define PARAMETERS_KEY L"Parameters" /* The parameters subkey under the device-specific key */ /*

1 0

[tkreuzer] 40383: DDK update - Add devioctl.h - miniport.h: fix include guard and add more stuff - video.h: fix include guard, remove VideoDebugprint prototype - videoagp.h: fix include guard -winddi.h: fix include guard, add some defines and some function pointer types - guiddef.h: add definition of EXTERN_C
by tkreuzer＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: tkreuzer Date: Mon Apr 6 05:21:04 2009 New Revision: 40383 URL: http://svn.reactos.org/svn/reactos?rev=40383&view=rev Log: DDK update - Add devioctl.h - miniport.h: fix include guard and add more stuff - video.h: fix include guard, remove VideoDebugprint prototype - videoagp.h: fix include guard -winddi.h: fix include guard, add some defines and some function pointer types - guiddef.h: add definition of EXTERN_C Added: trunk/reactos/include/ddk/devioctl.h (with props) Modified: trunk/reactos/include/ddk/miniport.h trunk/reactos/include/ddk/video.h trunk/reactos/include/ddk/videoagp.h trunk/reactos/include/ddk/winddi.h trunk/reactos/include/psdk/guiddef.h Added: trunk/reactos/include/ddk/devioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/devioctl.h?rev… ============================================================================== --- trunk/reactos/include/ddk/devioctl.h (added) +++ trunk/reactos/include/ddk/devioctl.h [iso-8859-1] Mon Apr 6 05:21:04 2009 @@ -1,0 +1,106 @@ +/* + * devioctl.h + * + * IOCTL definitions + * + * This file is part of the ReactOS ddk. + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + +#ifndef _DEVIOCTL_ +#define _DEVIOCTL_ + +/* DEVICE_OBJECT.DeviceType */ + +#define DEVICE_TYPE ULONG + +#define FILE_DEVICE_BEEP 0x00000001 +#define FILE_DEVICE_CD_ROM 0x00000002 +#define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003 +#define FILE_DEVICE_CONTROLLER 0x00000004 +#define FILE_DEVICE_DATALINK 0x00000005 +#define FILE_DEVICE_DFS 0x00000006 +#define FILE_DEVICE_DISK 0x00000007 +#define FILE_DEVICE_DISK_FILE_SYSTEM 0x00000008 +#define FILE_DEVICE_FILE_SYSTEM 0x00000009 +#define FILE_DEVICE_INPORT_PORT 0x0000000a +#define FILE_DEVICE_KEYBOARD 0x0000000b +#define FILE_DEVICE_MAILSLOT 0x0000000c +#define FILE_DEVICE_MIDI_IN 0x0000000d +#define FILE_DEVICE_MIDI_OUT 0x0000000e +#define FILE_DEVICE_MOUSE 0x0000000f +#define FILE_DEVICE_MULTI_UNC_PROVIDER 0x00000010 +#define FILE_DEVICE_NAMED_PIPE 0x00000011 +#define FILE_DEVICE_NETWORK 0x00000012 +#define FILE_DEVICE_NETWORK_BROWSER 0x00000013 +#define FILE_DEVICE_NETWORK_FILE_SYSTEM 0x00000014 +#define FILE_DEVICE_NULL 0x00000015 +#define FILE_DEVICE_PARALLEL_PORT 0x00000016 +#define FILE_DEVICE_PHYSICAL_NETCARD 0x00000017 +#define FILE_DEVICE_PRINTER 0x00000018 +#define FILE_DEVICE_SCANNER 0x00000019 +#define FILE_DEVICE_SERIAL_MOUSE_PORT 0x0000001a +#define FILE_DEVICE_SERIAL_PORT 0x0000001b +#define FILE_DEVICE_SCREEN 0x0000001c +#define FILE_DEVICE_SOUND 0x0000001d +#define FILE_DEVICE_STREAMS 0x0000001e +#define FILE_DEVICE_TAPE 0x0000001f +#define FILE_DEVICE_TAPE_FILE_SYSTEM 0x00000020 +#define FILE_DEVICE_TRANSPORT 0x00000021 +#define FILE_DEVICE_UNKNOWN 0x00000022 +#define FILE_DEVICE_VIDEO 0x00000023 +#define FILE_DEVICE_VIRTUAL_DISK 0x00000024 +#define FILE_DEVICE_WAVE_IN 0x00000025 +#define FILE_DEVICE_WAVE_OUT 0x00000026 +#define FILE_DEVICE_8042_PORT 0x00000027 +#define FILE_DEVICE_NETWORK_REDIRECTOR 0x00000028 +#define FILE_DEVICE_BATTERY 0x00000029 +#define FILE_DEVICE_BUS_EXTENDER 0x0000002a +#define FILE_DEVICE_MODEM 0x0000002b +#define FILE_DEVICE_VDM 0x0000002c +#define FILE_DEVICE_MASS_STORAGE 0x0000002d +#define FILE_DEVICE_SMB 0x0000002e +#define FILE_DEVICE_KS 0x0000002f +#define FILE_DEVICE_CHANGER 0x00000030 +#define FILE_DEVICE_SMARTCARD 0x00000031 +#define FILE_DEVICE_ACPI 0x00000032 +#define FILE_DEVICE_DVD 0x00000033 +#define FILE_DEVICE_FULLSCREEN_VIDEO 0x00000034 +#define FILE_DEVICE_DFS_FILE_SYSTEM 0x00000035 +#define FILE_DEVICE_DFS_VOLUME 0x00000036 +#define FILE_DEVICE_SERENUM 0x00000037 +#define FILE_DEVICE_TERMSRV 0x00000038 +#define FILE_DEVICE_KSEC 0x00000039 +#define FILE_DEVICE_FIPS 0x0000003a + +#define CTL_CODE(DeviceType, Function, Method, Access)( \ + ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)) + +#define DEVICE_TYPE_FROM_CTL_CODE(ctl) (((ULONG) (ctl & 0xffff0000)) >> 16) + +#define METHOD_FROM_CTL_CODE(ctrlCode) ((ULONG)((ctrlCode) & 3)) + +#define METHOD_BUFFERED 0 +#define METHOD_IN_DIRECT 1 +#define METHOD_OUT_DIRECT 2 +#define METHOD_NEITHER 3 + +#define METHOD_DIRECT_TO_HARDWARE METHOD_IN_DIRECT +#define METHOD_DIRECT_FROM_HARDWARE METHOD_OUT_DIRECT + +#define FILE_ANY_ACCESS 0x00000000 +#define FILE_SPECIAL_ACCESS FILE_ANY_ACCESS +#define FILE_READ_ACCESS 0x00000001 +#define FILE_WRITE_ACCESS 0x00000002 + +#endif /* !_DEVIOCTL_ */ Propchange: trunk/reactos/include/ddk/devioctl.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/ddk/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/miniport.h?rev… ============================================================================== --- trunk/reactos/include/ddk/miniport.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/miniport.h [iso-8859-1] Mon Apr 6 05:21:04 2009 @@ -20,12 +20,48 @@ * */ -#ifndef __MINIPORT_H -#define __MINIPORT_H +#ifndef _MINIPORT_ +#define _MINIPORT_ + +#include <ntdef.h> +#include <stddef.h> +#include <basetsd.h> +#include <sdkddkver.h> +#include <guiddef.h> + #ifdef __cplusplus extern "C" { #endif + +typedef enum _INTERFACE_TYPE +{ + InterfaceTypeUndefined = -1, + Internal, + Isa, + Eisa, + MicroChannel, + TurboChannel, + PCIBus, + VMEBus, + NuBus, + PCMCIABus, + CBus, + MPIBus, + MPSABus, + ProcessorInternal, + InternalPowerBus, + PNPISABus, + PNPBus, + Vmcs, + MaximumInterfaceType +} INTERFACE_TYPE, *PINTERFACE_TYPE; + +typedef enum _KINTERRUPT_MODE +{ + LevelSensitive, + Latched +} KINTERRUPT_MODE, *PKINTERRUPT_MODE; #define EMULATOR_READ_ACCESS 0x01 #define EMULATOR_WRITE_ACCESS 0x02 @@ -35,7 +71,6 @@ Ushort, Ulong } EMULATOR_PORT_ACCESS_TYPE, *PEMULATOR_PORT_ACCESS_TYPE; - typedef struct _EMULATOR_ACCESS_ENTRY { ULONG BasePort; @@ -58,6 +93,170 @@ } VIDEO_ACCESS_RANGE, *PVIDEO_ACCESS_RANGE; #endif +typedef VOID (*PINTERFACE_REFERENCE)(PVOID Context); +typedef VOID (*PINTERFACE_DEREFERENCE)(PVOID Context); + +typedef struct _INTERFACE +{ + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; +} INTERFACE, *PINTERFACE; + +typedef enum _IRQ_DEVICE_POLICY +{ + IrqPolicyMachineDefault = 0, + IrqPolicyAllCloseProcessors, + IrqPolicyOneCloseProcessor, + IrqPolicyAllProcessorsInMachine, + IrqPolicySpecifiedProcessors, + IrqPolicySpreadMessagesAcrossAllProcessors +} IRQ_DEVICE_POLICY, *PIRQ_DEVICE_POLICY; + +typedef enum _IRQ_PRIORITY +{ + IrqPriorityUndefined = 0, + IrqPriorityLow, + IrqPriorityNormal, + IrqPriorityHigh +} IRQ_PRIORITY, *PIRQ_PRIORITY; + +typedef enum _DMA_WIDTH +{ + Width8Bits, + Width16Bits, + Width32Bits, + MaximumDmaWidth +} DMA_WIDTH, *PDMA_WIDTH; + +typedef enum _DMA_SPEED +{ + Compatible, + TypeA, + TypeB, + TypeC, + TypeF, + MaximumDmaSpeed +} DMA_SPEED, *PDMA_SPEED; + +#pragma pack(push,4) +typedef enum _BUS_DATA_TYPE +{ + ConfigurationSpaceUndefined = -1, + Cmos, + EisaConfiguration, + Pos, + CbusConfiguration, + PCIConfiguration, + VMEConfiguration, + NuBusConfiguration, + PCMCIAConfiguration, + MPIConfiguration, + MPSAConfiguration, + PNPISAConfiguration, + SgiInternalConfiguration, + MaximumBusDataType +} BUS_DATA_TYPE, *PBUS_DATA_TYPE; +#pragma pack(pop) + +typedef struct _IO_RESOURCE_DESCRIPTOR +{ + UCHAR Option; + UCHAR Type; + UCHAR ShareDisposition; + UCHAR Spare1; + USHORT Flags; + USHORT Spare2; + + union + { + struct + { + ULONG Length; + ULONG Alignment; + PHYSICAL_ADDRESS MinimumAddress; + PHYSICAL_ADDRESS MaximumAddress; + } Port; + + struct + { + ULONG Length; + ULONG Alignment; + PHYSICAL_ADDRESS MinimumAddress; + PHYSICAL_ADDRESS MaximumAddress; + } Memory; + + struct + { + ULONG MinimumVector; + ULONG MaximumVector; + IRQ_DEVICE_POLICY AffinityPolicy; + IRQ_PRIORITY PriorityPolicy; + KAFFINITY TargetedProcessors; + } Interrupt; + + struct + { + ULONG MinimumChannel; + ULONG MaximumChannel; + } Dma; + + struct + { + ULONG Length; + ULONG Alignment; + PHYSICAL_ADDRESS MinimumAddress; + PHYSICAL_ADDRESS MaximumAddress; + } Generic; + + struct + { + ULONG Data[3]; + } DevicePrivate; + + struct + { + ULONG Length; + ULONG MinBusNumber; + ULONG MaxBusNumber; + ULONG Reserved; + } BusNumber; + + struct + { + ULONG Priority; + ULONG Reserved1; + ULONG Reserved2; + } ConfigData; + + struct + { + ULONG Length40; + ULONG Alignment40; + PHYSICAL_ADDRESS MinimumAddress; + PHYSICAL_ADDRESS MaximumAddress; + } Memory40; + + struct + { + ULONG Length48; + ULONG Alignment48; + PHYSICAL_ADDRESS MinimumAddress; + PHYSICAL_ADDRESS MaximumAddress; + } Memory48; + + struct + { + ULONG Length64; + ULONG Alignment64; + PHYSICAL_ADDRESS MinimumAddress; + PHYSICAL_ADDRESS MaximumAddress; + } Memory64; + } u; +} IO_RESOURCE_DESCRIPTOR, *PIO_RESOURCE_DESCRIPTOR; + typedef VOID DDKAPI (*PBANKED_SECTION_ROUTINE)( IN ULONG ReadBank, Modified: trunk/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=40… ============================================================================== --- trunk/reactos/include/ddk/video.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/video.h [iso-8859-1] Mon Apr 6 05:21:04 2009 @@ -20,10 +20,10 @@ * */ -#ifndef __VIDEO_H -#define __VIDEO_H - -#ifdef __WINDDI_H +#ifndef __VIDEO_H__ +#define __VIDEO_H__ + +#ifdef _WINDDI_ #error winddi.h cannot be included with video.h #else @@ -632,14 +632,6 @@ VPAPI VOID DDKAPI -VideoDebugPrint( - IN ULONG DebugPrintLevel, - IN PCHAR DebugMessage, - IN ...); - -VPAPI -VOID -DDKAPI VideoPortAcquireDeviceLock( IN PVOID HwDeviceExtension); @@ -1558,6 +1550,6 @@ } #endif -#endif /* defined __WINDDI_H */ - -#endif /* __VIDEO_H */ +#endif /* defined _WINDDI_ */ + +#endif /* __VIDEO_H__ */ Modified: trunk/reactos/include/ddk/videoagp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/videoagp.h?rev… ============================================================================== --- trunk/reactos/include/ddk/videoagp.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/videoagp.h [iso-8859-1] Mon Apr 6 05:21:04 2009 @@ -20,8 +20,8 @@ * */ -#ifndef __VIDEOAGP_H -#define __VIDEOAGP_H +#ifndef __VIDEOAGP_H__ +#define __VIDEOAGP_H__ #include "video.h" @@ -120,4 +120,4 @@ } #endif -#endif /* __VIDEOAGP_H */ +#endif /* __VIDEOAGP_H__ */ Modified: trunk/reactos/include/ddk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddi.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddi.h [iso-8859-1] Mon Apr 6 05:21:04 2009 @@ -20,10 +20,10 @@ * */ -#ifndef __WINDDI_H -#define __WINDDI_H - -#ifdef __VIDEO_H +#ifndef _WINDDI_ +#define _WINDDI_ + +#ifdef __VIDEO_H__ #error video.h cannot be included with winddi.h #else @@ -113,6 +113,12 @@ #define GX_OFFSET 1 #define GX_SCALE 2 #define GX_GENERAL 3 + +#define LTOFX(x) ((x) << 4) +#define FXTOL(x) ((x) >> 4) +#define FXTOLFLOOR(x) ((x) >> 4) +#define FXTOLCEILING(x) ((x + 0x0F) >> 4) +#define FXTOLROUND(x) ((((x) >> 3) + 1) >> 1) typedef struct _POINTE { FLOATL x; @@ -802,7 +808,7 @@ typedef struct _PATHDATA { FLONG flags; ULONG count; - POINTFIX *glypptfx; + POINTFIX *pptfx; } PATHDATA, *PPATHDATA; /* PATHOBJ.fl constants */ @@ -3636,21 +3642,20 @@ IN ULONG iEngineVersion, IN ULONG cj, OUT DRVENABLEDATA *pded); -#if 0 -typedef DHPDEV + +typedef DHPDEV (APIENTRY *PFN_DrvEnablePDEV)( IN DEVMODEW *pdm, IN LPWSTR pwszLogAddress, IN ULONG cPat, OUT HSURF *phsurfPatterns, IN ULONG cjCaps, - OUT ULONG *pdevcaps, + GDIINFO *pdevcaps, IN ULONG cjDevInfo, OUT DEVINFO *pdi, IN HDEV hdev, IN LPWSTR pwszDeviceName, IN HANDLE hDriver); -#endif typedef HSURF (APIENTRY *PFN_DrvEnableSurface)( @@ -4095,10 +4100,21 @@ DrvDisableDirectDraw( IN DHPDEV dhpdev); +typedef VOID +(APIENTRY *PFN_DrvDisableDirectDraw)( + IN DHPDEV dhpdev); + WIN32KAPI BOOL APIENTRY DrvEnableDirectDraw( + IN DHPDEV dhpdev, + OUT DD_CALLBACKS *pCallBacks, + OUT DD_SURFACECALLBACKS *pSurfaceCallBacks, + OUT DD_PALETTECALLBACKS *pPaletteCallBacks); + +typedef BOOL +(APIENTRY *PFN_DrvEnableDirectDraw)( IN DHPDEV dhpdev, OUT DD_CALLBACKS *pCallBacks, OUT DD_SURFACECALLBACKS *pSurfaceCallBacks, @@ -4115,10 +4131,32 @@ OUT DWORD *pdwNumFourCCCodes, OUT DWORD *pdwFourCC); +typedef BOOL +(APIENTRY *PFN_DrvGetDirectDrawInfo)( + IN DHPDEV dhpdev, + OUT DD_HALINFO *pHalInfo, + OUT DWORD *pdwNumHeaps, + OUT VIDEOMEMORY *pvmList, + OUT DWORD *pdwNumFourCCCodes, + OUT DWORD *pdwFourCC); + +//DECLSPEC_DEPRECATED_DDK +BOOL +APIENTRY +DrvQuerySpoolType( + IN DHPDEV dhpdev, + IN LPWSTR pwchType); + +typedef BOOL +(APIENTRY *PFN_DrvQuerySpoolType)( + IN DHPDEV dhpdev, + IN LPWSTR pwchType); + + #ifdef __cplusplus } #endif -#endif /* defined __VIDEO_H */ - -#endif /* __WINDDI_H */ +#endif /* defined __VIDEO_H__ */ + +#endif /* _WINDDI_ */ Modified: trunk/reactos/include/psdk/guiddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/guiddef.h?rev… ============================================================================== --- trunk/reactos/include/psdk/guiddef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/guiddef.h [iso-8859-1] Mon Apr 6 05:21:04 2009 @@ -33,6 +33,14 @@ #ifndef DECLSPEC_SELECTANY #define DECLSPEC_SELECTANY __declspec(selectany) +#endif + +#ifndef EXTERN_C +#ifdef __cplusplus +#define EXTERN_C extern "C" +#else +#define EXTERN_C extern +#endif #endif #undef DEFINE_GUID

1 0

[tkreuzer] 40382: Remove a bunch of useless funtion pointer types
by tkreuzer＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: tkreuzer Date: Mon Apr 6 04:12:48 2009 New Revision: 40382 URL: http://svn.reactos.org/svn/reactos?rev=40382&view=rev Log: Remove a bunch of useless funtion pointer types Modified: trunk/reactos/subsystems/win32/win32k/include/engobjects.h Modified: trunk/reactos/subsystems/win32/win32k/include/engobjects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/engobjects.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/engobjects.h [iso-8859-1] Mon Apr 6 04:12:48 2009 @@ -88,51 +88,6 @@ PATHOBJ PathObj; } PATHGDI; -typedef BOOL (APIENTRY *PFN_BitBlt)(SURFOBJ *, SURFOBJ *, SURFOBJ *, CLIPOBJ *, - XLATEOBJ *, RECTL *, POINTL *, POINTL *, - BRUSHOBJ *, POINTL *, ROP4); - -typedef BOOL (APIENTRY *PFN_TransparentBlt)(SURFOBJ *, SURFOBJ *, CLIPOBJ *, XLATEOBJ *, RECTL *, RECTL *, ULONG, ULONG); - -typedef BOOL (APIENTRY *PFN_StretchBlt)(SURFOBJ *, SURFOBJ *, SURFOBJ *, CLIPOBJ *, - XLATEOBJ *, COLORADJUSTMENT *, POINTL *, - RECTL *, RECTL *, PPOINT, ULONG); - -typedef BOOL (APIENTRY *PFN_TextOut)(SURFOBJ *, STROBJ *, FONTOBJ *, CLIPOBJ *, - RECTL *, RECTL *, BRUSHOBJ *, BRUSHOBJ *, - POINTL *, MIX); - -typedef BOOL (APIENTRY *PFN_Paint)(SURFOBJ *, CLIPOBJ *, BRUSHOBJ *, POINTL *, MIX); - -typedef BOOL (APIENTRY *PFN_StrokePath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, XFORMOBJ *, - BRUSHOBJ *, POINTL *, LINEATTRS *, MIX); - -typedef BOOL (APIENTRY *PFN_FillPath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, BRUSHOBJ *, - POINTL *, MIX, ULONG); - -typedef BOOL (APIENTRY *PFN_StrokeAndFillPath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, - XFORMOBJ *, BRUSHOBJ *, LINEATTRS *, BRUSHOBJ *, - POINTL *, MIX, ULONG); - -typedef BOOL (APIENTRY *PFN_LineTo)(SURFOBJ *, CLIPOBJ *, BRUSHOBJ *, - LONG, LONG, LONG, LONG, RECTL *, MIX); - -typedef BOOL (APIENTRY *PFN_CopyBits)(SURFOBJ *, SURFOBJ *, CLIPOBJ *, - XLATEOBJ *, RECTL *, POINTL *); - -typedef VOID (APIENTRY *PFN_Synchronize)(DHPDEV, RECTL *); - -typedef VOID (APIENTRY *PFN_MovePointer)(SURFOBJ *, LONG, LONG, RECTL *); - -typedef ULONG (APIENTRY *PFN_SetPointerShape)(SURFOBJ *, SURFOBJ *, SURFOBJ *, XLATEOBJ *, - LONG, LONG, LONG, LONG, RECTL *, FLONG); - -typedef HBITMAP (APIENTRY *PFN_CreateDeviceBitmap)(DHPDEV, SIZEL, ULONG); - -typedef BOOL (APIENTRY *PFN_SetPalette)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); - -typedef BOOL (APIENTRY *PFN_GradientFill)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*, ULONG, PVOID, ULONG, RECTL*, POINTL*, ULONG); - typedef struct _WNDGDI { WNDOBJ WndObj; LIST_ENTRY ListEntry;

1 0

[tkreuzer] 40381: - Update the EBRUSHOBJ independent of changing the brush/pen handle in DC_vUpdateFill/LineBrush - Mark the brushes as dirty after change of surface, palette and DIB colot table - Update the EBURHOBJs on demand in IntGdiPolygon and IntRectangle - Fixes bug 4340 See issue #4340 for more details.
by tkreuzer＠svn.reactos.org 05 Apr '09

05 Apr '09

Author: tkreuzer Date: Mon Apr 6 03:51:27 2009 New Revision: 40381 URL: http://svn.reactos.org/svn/reactos?rev=40381&view=rev Log: - Update the EBRUSHOBJ independent of changing the brush/pen handle in DC_vUpdateFill/LineBrush - Mark the brushes as dirty after change of surface, palette and DIB colot table - Update the EBURHOBJs on demand in IntGdiPolygon and IntRectangle - Fixes bug 4340 See issue #4340 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Mon Apr 6 03:51:27 2009 @@ -85,11 +85,8 @@ BRUSH_ShareUnlockBrush(pdc->dclevel.pbrFill); pdc->dclevel.pbrFill = pbrFill; - /* ROS HACK, should use surf xlate */ - IntUpdateBrushXlate(pdc, &pdc->rosdc.XlateBrush, pbrFill); - - /* Update eboFill, realizing it, if needed */ - EBRUSHOBJ_vUpdate(&pdc->eboFill, pbrFill, pdc->rosdc.XlateBrush); + /* Mark eboFill as dirty */ + pdcattr->ulDirty_ |= DIRTY_FILL; } else { @@ -98,12 +95,24 @@ } } - /* ROS HACK, should use surf xlate */ - pxlo = pdc->rosdc.XlateBrush; + /* Check if the EBRUSHOBJ needs update */ + if (pdcattr->ulDirty_ & DIRTY_FILL) + { + pbrFill = pdc->dclevel.pbrFill; + + /* ROS HACK, should use surf xlate */ + IntUpdateBrushXlate(pdc, &pdc->rosdc.XlateBrush, pbrFill); + + /* Update eboFill, realizing it, if needed */ + EBRUSHOBJ_vUpdate(&pdc->eboFill, pbrFill, pdc->rosdc.XlateBrush); + } /* Check for DC brush */ if (pdcattr->hbrush == StockObjects[DC_BRUSH]) { + /* ROS HACK, should use surf xlate */ + pxlo = pdc->rosdc.XlateBrush; + /* Update the eboFill's solid color */ EBRUSHOBJ_vSetSolidBrushColor(&pdc->eboFill, pdcattr->crPenClr, pxlo); } @@ -131,11 +140,8 @@ BRUSH_ShareUnlockBrush(pdc->dclevel.pbrLine); pdc->dclevel.pbrLine = pbrLine; - /* ROS HACK, should use surf xlate */ - IntUpdateBrushXlate(pdc, &pdc->rosdc.XlatePen, pbrLine); - - /* Update eboLine, realizing it, if needed */ - EBRUSHOBJ_vUpdate(&pdc->eboLine, pbrLine, pdc->rosdc.XlatePen); + /* Mark eboLine as dirty */ + pdcattr->ulDirty_ |= DIRTY_LINE; } else { @@ -144,12 +150,24 @@ } } - /* ROS HACK, should use surf xlate */ - pxlo = pdc->rosdc.XlatePen; + /* Check if the EBRUSHOBJ needs update */ + if (pdcattr->ulDirty_ & DIRTY_LINE) + { + pbrLine = pdc->dclevel.pbrLine; + + /* ROS HACK, should use surf xlate */ + IntUpdateBrushXlate(pdc, &pdc->rosdc.XlatePen, pbrLine); + + /* Update eboLine, realizing it, if needed */ + EBRUSHOBJ_vUpdate(&pdc->eboLine, pbrLine, pdc->rosdc.XlatePen); + } /* Check for DC pen */ if (pdcattr->hpen == StockObjects[DC_PEN]) { + /* ROS HACK, should use surf xlate */ + pxlo = pdc->rosdc.XlatePen; + /* Update the eboLine's solid color */ EBRUSHOBJ_vSetSolidBrushColor(&pdc->eboLine, pdcattr->crPenClr, pxlo); } @@ -250,13 +268,13 @@ if ((pdc->rosdc.bitsPerPixel <= 8 && ppal->Mode == PAL_INDEXED) || (pdc->rosdc.bitsPerPixel > 8 && ppal->Mode != PAL_INDEXED)) { + /* Get old palette, set new one */ oldPal = pdc->dclevel.hpal; pdc->dclevel.hpal = hpal; - } - else if (pdc->rosdc.bitsPerPixel > 8 && ppal->Mode == PAL_INDEXED) - { - oldPal = pdc->dclevel.hpal; - pdc->dclevel.hpal = hpal; + + /* Mark the brushes invalid */ + pdc->pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE | + DIRTY_BACKGROUND | DIRTY_TEXT; } PALETTE_UnlockPalette(ppal); @@ -382,7 +400,6 @@ HBITMAP hOrgBmp; PSURFACE psurfBmp, psurfOld; HRGN hVisRgn; - PBRUSH pbrush; if (hDC == NULL || hBmp == NULL) return NULL; @@ -443,20 +460,8 @@ /* Release the exclusive lock */ SURFACE_UnlockSurface(psurfBmp); - /* Regenerate the XLATEOBJs. (hack!) */ - pbrush = BRUSH_LockBrush(pdcattr->hbrush); - if (pbrush) - { - IntUpdateBrushXlate(pDC, &pDC->rosdc.XlateBrush, pbrush); - BRUSH_UnlockBrush(pbrush); - } - - pbrush = PEN_LockPen(pdcattr->hpen); - if (pbrush) - { - IntUpdateBrushXlate(pDC, &pDC->rosdc.XlatePen, pbrush); - PEN_UnlockPen(pbrush); - } + /* Mark the brushes invalid */ + pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE; DC_UnlockDc(pDC); Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Mon Apr 6 03:51:27 2009 @@ -128,6 +128,9 @@ } else Entries = 0; + + /* Mark the brushes invalid */ + dc->pdcattr->ulDirty_ |= DIRTY_FILL|DIRTY_LINE|DIRTY_BACKGROUND|DIRTY_TEXT; SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Mon Apr 6 03:51:27 2009 @@ -87,11 +87,11 @@ DestRect.bottom = max(DestRect.bottom, Points[CurrentPoint].y); } - if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) - IntGdiSelectBrush(dc,pdcattr->hbrush); - - if (pdcattr->ulDirty_ & DC_PEN_DIRTY) - IntGdiSelectPen(dc,pdcattr->hpen); + if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) + DC_vUpdateFillBrush(dc); + + if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) + DC_vUpdateLineBrush(dc); /* Special locking order to avoid lock-ups */ pbrFill = dc->dclevel.pbrFill; @@ -568,11 +568,11 @@ DestRect.bottom--; } - if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) - IntGdiSelectBrush(dc,pdcattr->hbrush); - - if (pdcattr->ulDirty_ & DC_PEN_DIRTY) - IntGdiSelectPen(dc,pdcattr->hpen); + if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) + DC_vUpdateFillBrush(dc); + + if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) + DC_vUpdateLineBrush(dc); pbrFill = dc->dclevel.pbrFill; pbrLine = dc->dclevel.pbrLine;

1 0

[gschneider] 40380: - Evgeny Boltik, <BSTSoft AT narod DOT ru>: Add stretching support to TransparentBlt - This should improve themes support & probably show some bitmaps that were hidden before in certain applications - See bug #4337 for more information
by gschneider＠svn.reactos.org 05 Apr '09

05 Apr '09

Author: gschneider Date: Mon Apr 6 03:13:09 2009 New Revision: 40380 URL: http://svn.reactos.org/svn/reactos?rev=40380&view=rev Log: - Evgeny Boltik, <BSTSoft AT narod DOT ru>: Add stretching support to TransparentBlt - This should improve themes support & probably show some bitmaps that were hidden before in certain applications - See bug #4337 for more information Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c trunk/reactos/subsystems/win32/win32k/dib/dib.h trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c trunk/reactos/subsystems/win32/win32k/eng/transblt.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -235,7 +235,7 @@ } BOOLEAN Dummy_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - RECTL* DestRect, POINTL *SourcePoint, + RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -42,7 +42,7 @@ typedef VOID (*PFN_DIB_VLine)(SURFOBJ*,LONG,LONG,LONG,ULONG); typedef BOOLEAN (*PFN_DIB_BitBlt)(PBLTINFO); typedef BOOLEAN (*PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); -typedef BOOLEAN (*PFN_DIB_TransparentBlt)(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); +typedef BOOLEAN (*PFN_DIB_TransparentBlt)(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); typedef BOOLEAN (*PFN_DIB_ColorFill)(SURFOBJ*, RECTL*, ULONG); typedef BOOLEAN (*PFN_DIB_AlphaBlend)(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -68,7 +68,7 @@ VOID Dummy_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN Dummy_BitBlt(PBLTINFO); BOOLEAN Dummy_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); -BOOLEAN Dummy_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); +BOOLEAN Dummy_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN Dummy_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN Dummy_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -78,7 +78,7 @@ VOID DIB_1BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_1BPP_BitBlt(PBLTINFO); BOOLEAN DIB_1BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); +BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_1BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_1BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -88,7 +88,7 @@ VOID DIB_4BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_4BPP_BitBlt(PBLTINFO); BOOLEAN DIB_4BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); +BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_4BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_4BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -98,7 +98,7 @@ VOID DIB_8BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_8BPP_BitBlt(PBLTINFO); BOOLEAN DIB_8BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_8BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); +BOOLEAN DIB_8BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_8BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_8BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -108,7 +108,7 @@ VOID DIB_16BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_16BPP_BitBlt(PBLTINFO); BOOLEAN DIB_16BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_16BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); +BOOLEAN DIB_16BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_16BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_16BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -118,7 +118,7 @@ VOID DIB_24BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_24BPP_BitBlt(PBLTINFO); BOOLEAN DIB_24BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_24BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); +BOOLEAN DIB_24BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_24BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_24BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -128,7 +128,7 @@ VOID DIB_32BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_32BPP_BitBlt(PBLTINFO); BOOLEAN DIB_32BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); +BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_32BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_32BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -455,14 +455,23 @@ BOOLEAN DIB_16BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - RECTL* DestRect, POINTL *SourcePoint, + RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { - ULONG RoundedRight, X, Y, SourceX, SourceY, Source, wd, Dest; + ULONG RoundedRight, X, Y, SourceX = 0, SourceY = 0, Source, wd, Dest; ULONG *DestBits; + LONG DstHeight; + LONG DstWidth; + LONG SrcHeight; + LONG SrcWidth; + + DstHeight = DestRect->bottom - DestRect->top; + DstWidth = DestRect->right - DestRect->left; + SrcHeight = SourceRect->bottom - SourceRect->top; + SrcWidth = SourceRect->right - SourceRect->left; + RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x1); - SourceY = SourcePoint->y; DestBits = (ULONG*)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + DestRect->top * DestSurf->lDelta); @@ -470,41 +479,55 @@ for(Y = DestRect->top; Y < DestRect->bottom; Y++) { - SourceX = SourcePoint->x; + SourceY = SourceRect->top+(Y - DestRect->top) * SrcHeight / DstHeight; for(X = DestRect->left; X < RoundedRight; X += 2, DestBits++, SourceX += 2) { Dest = *DestBits; - Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); - - if(Source != iTransColor) - { - Dest &= 0xFFFF0000; - Dest |= (XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFFFF); - } - - Source = DIB_GetSourceIndex(SourceSurf, SourceX + 1, SourceY); - if(Source != iTransColor) - { - Dest &= 0xFFFF; - Dest |= (XLATEOBJ_iXlate(ColorTranslation, Source) << 16); - } - - *DestBits = Dest; - } - - if(X < DestRect->right) + + SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) { Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); if(Source != iTransColor) { - *((USHORT*)DestBits) = (USHORT)XLATEOBJ_iXlate(ColorTranslation, + Dest &= 0xFFFF0000; + Dest |= (XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFFFF); + } + } + + SourceX = SourceRect->left+(X+1 - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + Dest &= 0xFFFF; + Dest |= (XLATEOBJ_iXlate(ColorTranslation, Source) << 16); + } + } + + *DestBits = Dest; + } + + if(X < DestRect->right) + { + SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + *((USHORT*)DestBits) = (USHORT)XLATEOBJ_iXlate(ColorTranslation, Source); + } } DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } - SourceY++; DestBits = (ULONG*)((ULONG_PTR)DestBits + wd); } Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -481,7 +481,7 @@ BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - RECTL* DestRect, POINTL *SourcePoint, + RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -406,13 +406,22 @@ BOOLEAN DIB_24BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - RECTL* DestRect, POINTL *SourcePoint, + RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { - ULONG X, Y, SourceX, SourceY, Source, wd, Dest; + ULONG X, Y, SourceX, SourceY = 0, Source = 0, wd, Dest; BYTE *DestBits; - SourceY = SourcePoint->y; + LONG DstHeight; + LONG DstWidth; + LONG SrcHeight; + LONG SrcWidth; + + DstHeight = DestRect->bottom - DestRect->top; + DstWidth = DestRect->right - DestRect->left; + SrcHeight = SourceRect->bottom - SourceRect->top; + SrcWidth = SourceRect->right - SourceRect->left; + DestBits = (BYTE*)((PBYTE)DestSurf->pvScan0 + (DestRect->left * 3) + DestRect->top * DestSurf->lDelta); @@ -420,19 +429,23 @@ for(Y = DestRect->top; Y < DestRect->bottom; Y++) { - SourceX = SourcePoint->x; - for(X = DestRect->left; X < DestRect->right; X++, DestBits += 3, SourceX++) + SourceY = SourceRect->top+(Y - DestRect->top) * SrcHeight / DstHeight; + for(X = DestRect->left; X < DestRect->right; X++, DestBits += 3) { - Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); - if(Source != iTransColor) - { - Dest = XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFFFFFF; - *(PUSHORT)(DestBits) = Dest & 0xFFFF; - *(DestBits + 2) = Dest >> 16; + SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + Dest = XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFFFFFF; + *(PUSHORT)(DestBits) = Dest & 0xFFFF; + *(DestBits + 2) = Dest >> 16; + } } } - SourceY++; DestBits = (BYTE*)((ULONG_PTR)DestBits + wd); } Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -279,13 +279,22 @@ BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - RECTL* DestRect, POINTL *SourcePoint, + RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { - ULONG X, Y, SourceX, SourceY, Source, wd; + ULONG X, Y, SourceX, SourceY = 0, Source = 0, wd; ULONG *DestBits; - SourceY = SourcePoint->y; + LONG DstHeight; + LONG DstWidth; + LONG SrcHeight; + LONG SrcWidth; + + DstHeight = DestRect->bottom - DestRect->top; + DstWidth = DestRect->right - DestRect->left; + SrcHeight = SourceRect->bottom - SourceRect->top; + SrcWidth = SourceRect->right - SourceRect->left; + DestBits = (ULONG*)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) + DestRect->top * DestSurf->lDelta); @@ -293,17 +302,21 @@ for(Y = DestRect->top; Y < DestRect->bottom; Y++) { - SourceX = SourcePoint->x; - for(X = DestRect->left; X < DestRect->right; X++, DestBits++, SourceX++) + SourceY = SourceRect->top+(Y - DestRect->top) * SrcHeight / DstHeight; + for(X = DestRect->left; X < DestRect->right; X++, DestBits++) { - Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); - if(Source != iTransColor) - { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, Source); + SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, Source); + } } } - SourceY++; DestBits = (ULONG*)((ULONG_PTR)DestBits + wd); } Modified: trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -377,7 +377,7 @@ BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - RECTL* DestRect, POINTL *SourcePoint, + RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -268,14 +268,23 @@ BOOLEAN DIB_8BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - RECTL* DestRect, POINTL *SourcePoint, + RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { - ULONG RoundedRight, X, Y, SourceX, SourceY, Source, wd, Dest; + ULONG RoundedRight, X, Y, SourceX = 0, SourceY = 0, Source, wd, Dest; ULONG *DestBits; + LONG DstHeight; + LONG DstWidth; + LONG SrcHeight; + LONG SrcWidth; + + DstHeight = DestRect->bottom - DestRect->top; + DstWidth = DestRect->right - DestRect->left; + SrcHeight = SourceRect->bottom - SourceRect->top; + SrcWidth = SourceRect->right - SourceRect->left; + RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x3); - SourceY = SourcePoint->y; DestBits = (ULONG*)((PBYTE)DestSurf->pvScan0 + DestRect->left + (DestRect->top * DestSurf->lDelta)); wd = DestSurf->lDelta - (DestRect->right - DestRect->left); @@ -284,37 +293,57 @@ { DestBits = (ULONG*)((PBYTE)DestSurf->pvScan0 + DestRect->left + (Y * DestSurf->lDelta)); - SourceX = SourcePoint->x; + SourceY = SourceRect->top+(Y - DestRect->top) * SrcHeight / DstHeight; for (X = DestRect->left; X < RoundedRight; X += 4, DestBits++) { Dest = *DestBits; - Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY); - if(Source != iTransColor) - { - Dest &= 0xFFFFFF00; - Dest |= (XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFF); - } - - Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY); - if(Source != iTransColor) - { - Dest &= 0xFFFF00FF; - Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 8) & 0xFF00); - } - - Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY); - if(Source != iTransColor) - { - Dest &= 0xFF00FFFF; - Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 16) & 0xFF0000); - } - - Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY); - if(Source != iTransColor) - { - Dest &= 0x00FFFFFF; - Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 24) & 0xFF000000); + SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + Dest &= 0xFFFFFF00; + Dest |= (XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFF); + } + } + + SourceX = SourceRect->left+(X+1 - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + Dest &= 0xFFFF00FF; + Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 8) & 0xFF00); + } + } + + SourceX = SourceRect->left+(X+2 - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + Dest &= 0xFF00FFFF; + Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 16) & 0xFF0000); + } + } + + SourceX = SourceRect->left+(X+3 - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + Dest &= 0x00FFFFFF; + Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 24) & 0xFF000000); + } } *DestBits = Dest; @@ -324,15 +353,19 @@ { for (; X < DestRect->right; X++) { - Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY); - if(Source != iTransColor) - { - *((BYTE*)DestBits) = (BYTE)(XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFF); + SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + *((BYTE*)DestBits) = (BYTE)(XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFF); + } } DestBits = (PULONG)((ULONG_PTR)DestBits + 1); } } - SourceY++; } return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/eng/transblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/transblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/transblt.c [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -47,28 +47,41 @@ INTENG_ENTER_LEAVE EnterLeaveSource, EnterLeaveDest; SURFOBJ *InputObj, *OutputObj; RECTL OutputRect, InputRect; - POINTL Translate, InputPoint; - - InputRect.left = 0; - InputRect.right = DestRect->right - DestRect->left; - InputRect.top = 0; - InputRect.bottom = DestRect->bottom - DestRect->top; + POINTL Translate; + + LONG DstHeight; + LONG DstWidth; + LONG SrcHeight; + LONG SrcWidth; + + InputRect = *SourceRect; if(!IntEngEnter(&EnterLeaveSource, psoSource, &InputRect, TRUE, &Translate, &InputObj)) { return FALSE; } - - InputPoint.x = SourceRect->left + Translate.x; - InputPoint.y = SourceRect->top + Translate.y; + InputRect.left += Translate.x; + InputRect.right += Translate.x; + InputRect.top += Translate.y; + InputRect.bottom += Translate.y; OutputRect = *DestRect; + if (OutputRect.right < OutputRect.left) + { + OutputRect.left = DestRect->right; + OutputRect.right = DestRect->left; + } + if (OutputRect.bottom < OutputRect.top) + { + OutputRect.top = DestRect->bottom; + OutputRect.bottom = DestRect->top; + } + if(Clip) { if(OutputRect.left < Clip->rclBounds.left) { InputRect.left += Clip->rclBounds.left - OutputRect.left; - InputPoint.x += Clip->rclBounds.left - OutputRect.left; OutputRect.left = Clip->rclBounds.left; } if(Clip->rclBounds.right < OutputRect.right) @@ -79,7 +92,6 @@ if(OutputRect.top < Clip->rclBounds.top) { InputRect.top += Clip->rclBounds.top - OutputRect.top; - InputPoint.y += Clip->rclBounds.top - OutputRect.top; OutputRect.top = Clip->rclBounds.top; } if(Clip->rclBounds.bottom < OutputRect.bottom) @@ -110,28 +122,36 @@ ClippingType = (Clip ? Clip->iDComplexity : DC_TRIVIAL); + DstHeight = OutputRect.bottom - OutputRect.top; + DstWidth = OutputRect.right - OutputRect.left; + SrcHeight = InputRect.bottom - InputRect.top; + SrcWidth = InputRect.right - InputRect.left; switch(ClippingType) { case DC_TRIVIAL: { Ret = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_TransparentBlt( - OutputObj, InputObj, &OutputRect, &InputPoint, ColorTranslation, iTransColor); + OutputObj, InputObj, &OutputRect, &InputRect, ColorTranslation, iTransColor); break; } case DC_RECT: { RECTL ClipRect, CombinedRect; - POINTL Pt; + RECTL InputToCombinedRect; ClipRect.left = Clip->rclBounds.left + Translate.x; ClipRect.right = Clip->rclBounds.right + Translate.x; ClipRect.top = Clip->rclBounds.top + Translate.y; ClipRect.bottom = Clip->rclBounds.bottom + Translate.y; - EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect); - Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; - Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; - Ret = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_TransparentBlt( - OutputObj, InputObj, &CombinedRect, &Pt, ColorTranslation, iTransColor); + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) + { + InputToCombinedRect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * SrcHeight / DstHeight; + InputToCombinedRect.bottom = InputRect.top + (CombinedRect.bottom - OutputRect.top) * SrcHeight / DstHeight; + InputToCombinedRect.left = InputRect.left + (CombinedRect.left - OutputRect.left) * SrcWidth / DstWidth; + InputToCombinedRect.right = InputRect.left + (CombinedRect.right - OutputRect.left) * SrcWidth / DstWidth; + Ret = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_TransparentBlt( + OutputObj, InputObj, &CombinedRect, &InputToCombinedRect, ColorTranslation, iTransColor); + } break; } case DC_COMPLEX: @@ -139,17 +159,16 @@ ULONG Direction, i; RECT_ENUM RectEnum; BOOL EnumMore; - POINTL Pt; if(OutputObj == InputObj) { - if(OutputRect.top < InputPoint.y) + if(OutputRect.top < InputRect.top) { - Direction = OutputRect.left < (InputPoint.x ? CD_RIGHTDOWN : CD_LEFTDOWN); + Direction = OutputRect.left < (InputRect.left ? CD_RIGHTDOWN : CD_LEFTDOWN); } else { - Direction = OutputRect.left < (InputPoint.x ? CD_RIGHTUP : CD_LEFTUP); + Direction = OutputRect.left < (InputRect.left ? CD_RIGHTUP : CD_LEFTUP); } } else @@ -164,19 +183,25 @@ for (i = 0; i < RectEnum.c; i++) { RECTL ClipRect, CombinedRect; + RECTL InputToCombinedRect; ClipRect.left = RectEnum.arcl[i].left + Translate.x; ClipRect.right = RectEnum.arcl[i].right + Translate.x; ClipRect.top = RectEnum.arcl[i].top + Translate.y; ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y; - EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect); - Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; - Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; - Ret = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_TransparentBlt( - OutputObj, InputObj, &CombinedRect, &Pt, ColorTranslation, iTransColor); - if(!Ret) + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) { - break; + InputToCombinedRect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * SrcHeight / DstHeight; + InputToCombinedRect.bottom = InputRect.top + (CombinedRect.bottom - OutputRect.top) * SrcHeight / DstHeight; + InputToCombinedRect.left = InputRect.left + (CombinedRect.left - OutputRect.left) * SrcWidth / DstWidth; + InputToCombinedRect.right = InputRect.left + (CombinedRect.right - OutputRect.left) * SrcWidth / DstWidth; + + Ret = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_TransparentBlt( + OutputObj, InputObj, &CombinedRect, &InputToCombinedRect, ColorTranslation, iTransColor); + if(!Ret) + { + break; + } } } } while(EnumMore && Ret); @@ -209,6 +234,8 @@ RECTL OutputRect, InputClippedRect; SURFACE *psurfDest; SURFACE *psurfSource; + RECTL InputRect; + LONG InputClWidth, InputClHeight, InputWidth, InputHeight; ASSERT(psoDest); ASSERT(psoSource); @@ -232,6 +259,7 @@ InputClippedRect.bottom = DestRect->top; } + InputRect = *SourceRect; /* Clip against the bounds of the clipping region so we won't try to write * outside the surface */ if(Clip) @@ -240,21 +268,27 @@ { return TRUE; } - SourceRect->left += OutputRect.left - DestRect->left; - SourceRect->top += OutputRect.top - DestRect->top; - SourceRect->right += OutputRect.left - DestRect->left; - SourceRect->bottom += OutputRect.top - DestRect->top; + /* Update source rect */ + InputClWidth = InputClippedRect.right - InputClippedRect.left; + InputClHeight = InputClippedRect.bottom - InputClippedRect.top; + InputWidth = InputRect.right - InputRect.left; + InputHeight = InputRect.bottom - InputRect.top; + + InputRect.left += (InputWidth * (OutputRect.left - InputClippedRect.left)) / InputClWidth; + InputRect.right -= (InputWidth * (InputClippedRect.right - OutputRect.right)) / InputClWidth; + InputRect.top += (InputHeight * (OutputRect.top - InputClippedRect.top)) / InputClHeight; + InputRect.bottom -= (InputHeight * (InputClippedRect.bottom - OutputRect.bottom)) / InputClHeight; } else { - OutputRect = *DestRect; + OutputRect = InputClippedRect; } if(psoSource != psoDest) { SURFACE_LockBitmapBits(psurfSource); - MouseSafetyOnDrawStart(psoSource, SourceRect->left, SourceRect->top, - SourceRect->right, SourceRect->bottom); + MouseSafetyOnDrawStart(psoSource, InputRect.left, InputRect.top, + InputRect.right, InputRect.bottom); } SURFACE_LockBitmapBits(psurfDest); MouseSafetyOnDrawStart(psoDest, OutputRect.left, OutputRect.top, @@ -264,7 +298,7 @@ { Ret = GDIDEVFUNCS(psoDest).TransparentBlt( psoDest, psoSource, Clip, ColorTranslation, &OutputRect, - SourceRect, iTransColor, Reserved); + &InputRect, iTransColor, Reserved); } else Ret = FALSE; @@ -272,7 +306,7 @@ if(!Ret) { Ret = EngTransparentBlt(psoDest, psoSource, Clip, ColorTranslation, - &OutputRect, SourceRect, iTransColor, Reserved); + &OutputRect, &InputRect, iTransColor, Reserved); } MouseSafetyOnDrawEnd(psoDest); Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -455,12 +455,6 @@ rcSrc.right = rcSrc.left + cxSrc; rcSrc.bottom = rcSrc.top + cySrc; IntLPtoDP(DCSrc, (LPPOINT)&rcSrc, 2); - - if((cxDst != cxSrc) || (cyDst != cySrc)) - { - DPRINT1("TransparentBlt() does not support stretching at the moment!\n"); - goto done; - } Ret = IntEngTransparentBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, DCDest->rosdc.CombinedClip, XlateObj, &rcDest, &rcSrc,

1 0

[gschneider] 40379: - GdiIsPlayMetafileDC: function GdiGetHandleUserData might fail - Simplify code to use GdiGetLDC which takes this into consideration, fixes a umode crash in gdi32_winetest metafile
by gschneider＠svn.reactos.org 05 Apr '09

05 Apr '09

Author: gschneider Date: Mon Apr 6 01:34:27 2009 New Revision: 40379 URL: http://svn.reactos.org/svn/reactos?rev=40379&view=rev Log: - GdiIsPlayMetafileDC: function GdiGetHandleUserData might fail - Simplify code to use GdiGetLDC which takes this into consideration, fixes a umode crash in gdi32_winetest metafile Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Mon Apr 6 01:34:27 2009 @@ -1157,17 +1157,10 @@ WINAPI GdiIsPlayMetafileDC(HDC hDC) { - PDC_ATTR Dc_Attr; - PLDC pLDC; - - GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr); - if ( Dc_Attr ) + PLDC pLDC = GdiGetLDC(hDC); + if ( pLDC ) { - pLDC = Dc_Attr->pvLDC; - if ( pLDC ) - { - if ( pLDC->Flags & LDC_PLAY_MFDC ) return TRUE; - } + if ( pLDC->Flags & LDC_PLAY_MFDC ) return TRUE; } return FALSE; }

1 0

[gschneider] 40378: - msvcrt's pow function does not set errno, so there is no need for a hard coded breakpoint, jump labels adjusted accordingly - Allows oleaut32_winetest vartest to finish
by gschneider＠svn.reactos.org 05 Apr '09

05 Apr '09

Author: gschneider Date: Mon Apr 6 01:27:39 2009 New Revision: 40378 URL: http://svn.reactos.org/svn/reactos?rev=40378&view=rev Log: - msvcrt's pow function does not set errno, so there is no need for a hard coded breakpoint, jump labels adjusted accordingly - Allows oleaut32_winetest vartest to finish Modified: trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s Modified: trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/pow_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] Mon Apr 6 01:27:39 2009 @@ -65,7 +65,7 @@ or ah,al // Set new CF, PF and ZF sahf // Store AH into Flags jb __fpow1 // Re-direct if x < 0 - ja __fpow3 // Re-direct if x > 0 + ja __fpow2 // Re-direct if x > 0 fxch // Swap st, st(1) fcom qword ptr [edi] // Compare y with zero fxch // Restore x as top of stack @@ -76,10 +76,8 @@ and ah, 0b10111010 // Turn off CF, PF and ZF or ah,al // Set new CF, PF and ZF sahf // Store AH into Flags - ja __fpow3 // Re-direct if y > 0 - fstp st(1) // Set new stack top and pop - mov eax,1 // Set domain error (EDOM) - jmp __fpow5 // End of case + ja __fpow2 // Re-direct if y > 0 + jmp __fpow4 // End of case __fpow1: fxch // Put y on top of stack fld st // Duplicate y as st(1) frndint // Round to integer @@ -92,17 +90,12 @@ and ah, 0b10111010 // Turn off CF, PF and ZF or ah,al // Set new CF, PF and ZF sahf // Store AH into Flags - je __fpow2 // Proceed if y = int(y) - fstp st(1) // Set new stack top and pop - fldz // Set result to zero - fstp st(1) // Set new stack top and pop - mov eax,1 // Set domain error (EDOM) - jmp __fpow5 // End of case -__fpow2: fist dword ptr [ebp-12] // Store y as integer + jne __fpow4 // Proceed if y = int(y) + fist dword ptr [ebp-12] // Store y as integer and dword ptr [ebp-12],1 // Set bit if y is odd fxch // Put x on top of stack fabs // x = |x| -__fpow3: fldln2 // Load log base e of 2 +__fpow2: fldln2 // Load log base e of 2 fxch st(1) // Exchange st, st(1) fyl2x // Compute the natural log(x) fmulp // Compute y * ln(x) @@ -118,21 +111,11 @@ fscale // Scale by power of 2 fstp st(1) // Set new stack top and pop test dword ptr [ebp-12],1 // Negation required ? - jz __fpow4 // No, re-direct + jz __fpow3 // No, re-direct fchs // Negate the result -__fpow4: fstp qword ptr [ebp-8] // Save (double)pow(x, y) +__fpow3: fstp qword ptr [ebp-8] // Save (double)pow(x, y) fld qword ptr [ebp-8] // Load (double)pow(x, y) - fxam // Examine st - fstsw ax // Get the FPU status word - cmp ah,5 // Infinity ? - jne __fpow6 // No, end of case - mov eax,2 // Set range error (ERANGE) - // Get errno pointer offset -__fpow5: int 3 - mov edi,0 // TODO: offset flat:__crt_errno - mov edi,[edi] // Get C errno variable pointer - mov dword ptr [edi],eax // Set errno -__fpow6: pop eax // Restore register eax +__fpow4: pop eax // Restore register eax pop edi // Restore register edi mov esp,ebp // Deallocate temporary space pop ebp

1 0

[mjmartin] 40377: - Create Common Files directory when creating Program Files to match windows fresh install and add registry key for CommonFilesDir. This prevents the key from being incorrectly set using an environment variable.
by mjmartin＠svn.reactos.org 05 Apr '09

05 Apr '09

Author: mjmartin Date: Mon Apr 6 00:05:40 2009 New Revision: 40377 URL: http://svn.reactos.org/svn/reactos?rev=40377&view=rev Log: - Create Common Files directory when creating Program Files to match windows fresh install and add registry key for CommonFilesDir. This prevents the key from being incorrectly set using an environment variable. Modified: trunk/reactos/dll/win32/userenv/lang/bg-BG.rc trunk/reactos/dll/win32/userenv/lang/cs-CZ.rc trunk/reactos/dll/win32/userenv/lang/de-DE.rc trunk/reactos/dll/win32/userenv/lang/el-GR.rc trunk/reactos/dll/win32/userenv/lang/en-US.rc trunk/reactos/dll/win32/userenv/lang/es-ES.rc trunk/reactos/dll/win32/userenv/lang/fi-FI.rc trunk/reactos/dll/win32/userenv/lang/fr-FR.rc trunk/reactos/dll/win32/userenv/lang/hu-HU.rc trunk/reactos/dll/win32/userenv/lang/id-ID.rc trunk/reactos/dll/win32/userenv/lang/it-IT.rc trunk/reactos/dll/win32/userenv/lang/ja-JP.rc trunk/reactos/dll/win32/userenv/lang/lt-LT.rc trunk/reactos/dll/win32/userenv/lang/nl-NL.rc trunk/reactos/dll/win32/userenv/lang/no-NO.rc trunk/reactos/dll/win32/userenv/lang/pl-PL.rc trunk/reactos/dll/win32/userenv/lang/ru-RU.rc trunk/reactos/dll/win32/userenv/lang/sk-SK.rc trunk/reactos/dll/win32/userenv/lang/sv-SE.rc trunk/reactos/dll/win32/userenv/lang/th-TH.rc trunk/reactos/dll/win32/userenv/lang/uk-UA.rc trunk/reactos/dll/win32/userenv/resources.h trunk/reactos/dll/win32/userenv/setup.c Modified: trunk/reactos/dll/win32/userenv/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/bg-BG.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Ìåñòíè íàñòðîéêè\\Ïîñåòåíè" IDS_COOKIES "Êóðàáèéêè" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/cs-CZ.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -45,4 +45,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/de-DE.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Lokale Einstellungen\\Verlauf" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Programme" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/el-GR.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/en-US.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/es-ES.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -50,4 +50,5 @@ IDS_HISTORY "Configuración local\\Historial" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Archivos de programa" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/fi-FI.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,5 +44,6 @@ IDS_HISTORY "Paikalliset Asetukset\\Historia" IDS_COOKIES "Keksit" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/fr-FR.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Local Settings\\Historique" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/hu-HU.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -45,4 +45,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/id-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/id-ID.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/it-IT.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -38,4 +38,5 @@ IDS_HISTORY "Impostazioni locali\\Cronologia" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Programmi" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/ja-JP.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -26,4 +26,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/lt-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/lt-LT.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -46,4 +46,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Slapukai" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/nl-NL.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Local Settings\\Geschiedenis" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/no-NO.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -47,4 +47,5 @@ IDS_HISTORY "Lokale innstillinger\\Logg" IDS_COOKIES "Informasjonkapsel" IDS_PROGRAMFILES "%SystemDrive%\\Programfiler" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/pl-PL.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -49,4 +49,5 @@ IDS_HISTORY "Ustawienia lokalne\\Historia" IDS_COOKIES "Ciasteczka" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/ru-RU.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/sk-SK.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -48,4 +48,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/sv-SE.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Lokala inställningar\\Tidigare" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/th-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/th-TH.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "¡ÒÃµÑé§¤èÒµÑé§µé¹\\»ÃÐÇÑµÔãªé§Ò¹" IDS_COOKIES "¤Ø¡¡Õé" IDS_PROGRAMFILES "%SystemDrive%\\â»Ãá¡ÃÁä¿Åì" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/uk-UA.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/resource… ============================================================================== --- trunk/reactos/dll/win32/userenv/resources.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/resources.h [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -49,5 +49,6 @@ #define IDS_HISTORY 22 #define IDS_COOKIES 23 #define IDS_PROGRAMFILES 24 +#define IDS_COMMONFILES 25 /* EOF */ Modified: trunk/reactos/dll/win32/userenv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/setup.c?… ============================================================================== --- trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -109,6 +109,7 @@ { WCHAR szProfilesPath[MAX_PATH]; WCHAR szProfilePath[MAX_PATH]; + WCHAR szCommonFilesDirPath[MAX_PATH]; WCHAR szBuffer[MAX_PATH]; DWORD dwLength; PFOLDERDATA lpFolderData; @@ -584,6 +585,14 @@ return FALSE; } + if (!LoadStringW(hInstance, + IDS_COMMONFILES, + szCommonFilesDirPath, + MAX_PATH)) + { + DPRINT1("Warning: %lu\n", GetLastError()); + } + /* Expand it */ if (!ExpandEnvironmentStringsW(szBuffer, szProfilesPath, @@ -591,6 +600,17 @@ { DPRINT1("Error: %lu\n", GetLastError()); return FALSE; + } + + wcscpy(szBuffer, szProfilesPath); + wcscat(szBuffer, L"\\"); + wcscat(szBuffer, szCommonFilesDirPath); + + if (!ExpandEnvironmentStringsW(szBuffer, + szCommonFilesDirPath, + MAX_PATH)) + { + DPRINT1("Warning: %lu\n", GetLastError()); } /* Store it */ @@ -621,6 +641,18 @@ return FALSE; } + dwLength = (wcslen(szCommonFilesDirPath) + 1) * sizeof(WCHAR); + Error = RegSetValueExW(hKey, + L"CommonFilesDir", + 0, + REG_SZ, + (LPBYTE)szCommonFilesDirPath, + dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Warning: %lu\n", Error); + } + RegCloseKey (hKey); /* Create directory */ @@ -630,6 +662,15 @@ { DPRINT1("Error: %lu\n", GetLastError()); return FALSE; + } + } + + /* Create directory */ + if (!CreateDirectoryW(szCommonFilesDirPath, NULL)) + { + if (GetLastError () != ERROR_ALREADY_EXISTS) + { + DPRINT1("Warning: %lu\n", GetLastError()); } }

1 0

[cgutman] 40376: - Revert r40367 - Fixes abyss server startup after installing
by cgutman＠svn.reactos.org 05 Apr '09

05 Apr '09

Author: cgutman Date: Sun Apr 5 22:11:24 2009 New Revision: 40376 URL: http://svn.reactos.org/svn/reactos?rev=40376&view=rev Log: - Revert r40367 - Fixes abyss server startup after installing 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] Sun Apr 5 22:11:24 2009 @@ -139,11 +139,11 @@ } -NTSTATUS FileCloseAddress(PTDI_REQUEST Request) -/* - * FUNCTION: Closes an address file object - * ARGUMENTS: - * AddrFile = Pointer to address file object to close +VOID DeleteAddress(PADDRESS_FILE AddrFile) +/* + * FUNCTION: Deletes an address file object + * ARGUMENTS: + * AddrFile = Pointer to address file object to delete */ { KIRQL OldIrql; @@ -151,15 +151,15 @@ PLIST_ENTRY NextEntry; PDATAGRAM_SEND_REQUEST SendRequest; PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; - PADDRESS_FILE AddrFile = Request->Handle.AddressHandle; - - TI_DbgPrint(MID_TRACE, ("Called.\n")); + + TI_DbgPrint(MID_TRACE, ("Called.\n")); + + /* Remove address file from the global list */ + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); + RemoveEntryList(&AddrFile->ListEntry); + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); - - /* Set address file object exclusive to us */ - AF_SET_BUSY(AddrFile); - AF_CLR_VALID(AddrFile); /* FIXME: Kill TCP connections on this address file object */ @@ -197,9 +197,9 @@ TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return STATUS_SUCCESS; + (*AddrFile->Free)(AddrFile); + + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } @@ -339,7 +339,7 @@ * RETURNS: * Status of operation */ -NTSTATUS FileFreeAddress( +NTSTATUS FileCloseAddress( PTDI_REQUEST Request) { KIRQL OldIrql; @@ -350,10 +350,13 @@ AddrFile = Request->Handle.AddressHandle; - /* Remove address file from the global list */ - TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); - RemoveEntryList(&AddrFile->ListEntry); - TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); + TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); + + /* Set address file object exclusive to us */ + AF_SET_BUSY(AddrFile); + AF_CLR_VALID(AddrFile); + + TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); /* Protocol specific handling */ switch (AddrFile->Protocol) { @@ -369,9 +372,33 @@ UDPFreePort( AddrFile->Port ); break; } - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - (*AddrFile->Free)(AddrFile); + + 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); + + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); return Status; }

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