Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[sginsberg] 42916: - Actually commit prntfont.h change (leftover from 42915)

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 24 19:36:23 2009 New Revision: 42916 URL: http://svn.reactos.org/svn/reactos?rev=42916&view=rev Log: - Actually commit prntfont.h change (leftover from 42915) Modified: trunk/reactos/include/ddk/prntfont.h Modified: trunk/reactos/include/ddk/prntfont.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/prntfont.h?rev… ============================================================================== --- trunk/reactos/include/ddk/prntfont.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/prntfont.h [iso-8859-1] Mon Aug 24 19:36:23 2009 @@ -71,11 +71,11 @@ #define CC_SJIS -17 #define CC_WANSUNG -18 -#define UFF_FILE_MAGIC TAG('1','F','F','U') +#define UFF_FILE_MAGIC 'UFF1' #define UFF_VERSION_NUMBER 0x10001 #define FONT_DIR_SORTED 1 -#define FONT_REC_SIG TAG('C','E','R','F') -#define WINNT_INSTALLER_SIG TAG('I','F','T','N') +#define FONT_REC_SIG 'CERF' +#define WINNT_INSTALLER_SIG 'IFTN' #define FONT_FL_UFM 0x0001 #define FONT_FL_IFI 0x0002 @@ -86,11 +86,11 @@ #define FONT_FL_GLYPHSET_RLE 0x0040 #define FONT_FL_RESERVED 0x8000 -#define DATA_UFM_SIG TAG('M','F','U','D') -#define DATA_IFI_SIG TAG('I','F','I','D') -#define DATA_GTT_SIG TAG('T','T','G','D') -#define DATA_CTT_SIG TAG('T','T','C','D') -#define DATA_VAR_SIG TAG('R','A','V','D') +#define DATA_UFM_SIG 'MFUD' +#define DATA_IFI_SIG 'IFID' +#define DATA_GTT_SIG 'TTGD' +#define DATA_CTT_SIG 'TTCD' +#define DATA_VAR_SIG 'RAVD' #define FG_CANCHANGE 128 #define WM_FI_FILENAME 900

15 years, 4 months

[sginsberg] 42915: - Start deprecating TAG() - Fix inverted tags in prntfont.h, stdunk.h and win32k/objects/font.c

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 24 19:12:25 2009 New Revision: 42915 URL: http://svn.reactos.org/svn/reactos?rev=42915&view=rev Log: - Start deprecating TAG() - Fix inverted tags in prntfont.h, stdunk.h and win32k/objects/font.c Modified: trunk/reactos/drivers/bus/isapnp/isapnp.h trunk/reactos/drivers/bus/pci/pci.h trunk/reactos/drivers/directx/dxg/tags.h trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h trunk/reactos/drivers/filesystems/fastfat/fcb.c trunk/reactos/drivers/filesystems/fastfat/vfat.h trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h trunk/reactos/drivers/filesystems/mup/mup.h trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/dispatch.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/misc.c trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h trunk/reactos/drivers/input/i8042prt/i8042prt.h trunk/reactos/drivers/input/i8042prt/keyboard.c trunk/reactos/drivers/input/kbdclass/kbdclass.h trunk/reactos/drivers/input/mouclass/mouclass.h trunk/reactos/drivers/input/sermouse/sermouse.h trunk/reactos/drivers/ksfilter/ks/ksfunc.h trunk/reactos/drivers/ksfilter/ks/priv.h trunk/reactos/drivers/multimedia/audio/sb16_nt4.old/main.c trunk/reactos/drivers/network/dd/pcnet/pcnet.h trunk/reactos/drivers/network/ndis/include/ndissys.h trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/tcpip/include/address.h trunk/reactos/drivers/network/tcpip/include/tcpip.h trunk/reactos/drivers/serial/serenum/serenum.h trunk/reactos/drivers/serial/serial/serial.h trunk/reactos/drivers/setup/blue/blue.h trunk/reactos/drivers/storage/class/class2/class2.c trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c trunk/reactos/drivers/storage/ide/uniata/stdafx.h trunk/reactos/drivers/storage/scsiport/scsiport_int.h trunk/reactos/drivers/video/displays/framebuf/framebuf.h trunk/reactos/drivers/video/displays/framebufacc/framebufacc.h trunk/reactos/drivers/video/displays/vga/vgaddi.h trunk/reactos/drivers/video/font/ftfd/rosglue.c trunk/reactos/drivers/video/miniport/vbe/vbemp.h trunk/reactos/drivers/video/videoprt/videoprt.c trunk/reactos/drivers/video/videoprt/videoprt.h trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/hal/halppc/generic/dma.c trunk/reactos/hal/halppc/generic/pci.c trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/hal/halx86/generic/pci.c trunk/reactos/include/ddk/stdunk.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/psdk/wdbgexts.h trunk/reactos/include/reactos/probe.h trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/network/memtrack.c trunk/reactos/lib/drivers/ip/network/neighbor.c trunk/reactos/lib/drivers/ip/network/router.c trunk/reactos/lib/drivers/ip/transport/tcp/event.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c trunk/reactos/lib/fslib/vfatlib/check/vfat.h trunk/reactos/lib/rossym/initkm.c trunk/reactos/lib/rtl/bootdata.c trunk/reactos/lib/rtl/registry.c trunk/reactos/lib/rtl/rtlp.h trunk/reactos/lib/rtl/sid.c trunk/reactos/subsystems/win32/win32k/eng/engevent.c trunk/reactos/subsystems/win32/win32k/include/tags.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c Modified: trunk/reactos/drivers/bus/isapnp/isapnp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/isapnp.… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/isapnp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/isapnp/isapnp.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -7,8 +7,7 @@ extern "C" { #endif -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_ISAPNP TAG('I', 'P', 'N', 'P') +#define TAG_ISAPNP 'PNPI' #define IO_RESOURCE_REQUIRED 0x00 //ROS Extension Modified: trunk/reactos/drivers/bus/pci/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.h?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pci.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -6,8 +6,7 @@ #include <stdio.h> #include <ntddk.h> -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_PCI TAG('P', 'C', 'I', '0') +#define TAG_PCI '0ICP' typedef struct _PCI_DEVICE { Modified: trunk/reactos/drivers/directx/dxg/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/tags.h… ============================================================================== --- trunk/reactos/drivers/directx/dxg/tags.h [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/tags.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -1,8 +1,8 @@ -#define TAG_THDD TAG('t', 'h', 'd', 'd') -#define TAG_GINI TAG('G', 'i', 'n', 'i') +#define TAG_THDD 'ddht' +#define TAG_GINI 'iniG' Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -227,12 +227,8 @@ ULONG LastOffset; } CCB, *PCCB; -#ifndef TAG -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#endif - -#define TAG_CCB TAG('I', 'C', 'C', 'B') -#define TAG_FCB TAG('I', 'F', 'C', 'B') +#define TAG_CCB 'BCCI' +#define TAG_FCB 'BCFI' typedef struct { Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -115,9 +115,8 @@ } #ifdef EXT2_POOL_WITH_TAG - #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define Ext2AllocatePool(PoolType,NumberOfBytes) \ - ExAllocatePoolWithTag( PoolType, NumberOfBytes, TAG ( 'E','x','t','2' ) ) + ExAllocatePoolWithTag( PoolType, NumberOfBytes, '2txE' ) #else #define Ext2AllocatePool(PoolType,NumberOfBytes) \ ExAllocatePool( PoolType, NumberOfBytes ) Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -19,7 +19,7 @@ /* -------------------------------------------------------- DEFINES */ -#define TAG_FCB TAG('V', 'F', 'C', 'B') +#define TAG_FCB 'BCFV' /* -------------------------------------------------------- PUBLICS */ Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -402,14 +402,10 @@ UNICODE_STRING SearchPattern; } VFATCCB, *PVFATCCB; -#ifndef TAG -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#endif - -#define TAG_CCB TAG('V', 'C', 'C', 'B') -#define TAG_FCB TAG('V', 'F', 'C', 'B') -#define TAG_IRP TAG('V', 'I', 'R', 'P') -#define TAG_VFAT TAG('V', 'F', 'A', 'T') +#define TAG_CCB 'BCCV' +#define TAG_FCB 'BCFV' +#define TAG_IRP 'PRIV' +#define TAG_VFAT 'TAFV' #define ENTRIES_PER_SECTOR (BLOCKSIZE / sizeof(FATDirEntry)) Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -3,24 +3,16 @@ #include <debug.h> #include <pseh/pseh2.h> -#ifndef TAG -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#endif - #include <fat.h> #include <fatstruc.h> #define Add2Ptr(P,I,T) ((T)((PUCHAR)(P) + (I))) #define PtrOffset(B,O) ((ULONG)((ULONG_PTR)(O) - (ULONG_PTR)(B))) -#ifndef TAG -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#endif - -#define TAG_CCB TAG('V', 'C', 'C', 'B') -#define TAG_FCB TAG('V', 'F', 'C', 'B') -#define TAG_IRP TAG('V', 'I', 'R', 'P') -#define TAG_VFAT TAG('V', 'F', 'A', 'T') +#define TAG_CCB 'BCCV' +#define TAG_FCB 'BCFV' +#define TAG_IRP 'PRIV' +#define TAG_VFAT 'TAFV' /* ------------------------------------------------------ shutdown.c */ DRIVER_DISPATCH FatShutdown; Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -17,8 +17,7 @@ // // Tag for memory allocations // -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define FSREC_TAG TAG('F', 's', 'R', 'c') +#define FSREC_TAG 'cRsF' // // UDFS Offsets Modified: trunk/reactos/drivers/filesystems/mup/mup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -1,9 +1,5 @@ #ifndef MUP_H #define MUP_H - -#ifndef TAG -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#endif #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -715,7 +715,7 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); if (IrpContext) - ExFreePoolWithTag(IrpContext, TAG('N', 'I', 'R', 'P')); + ExFreePoolWithTag(IrpContext, 'PRIN'); IoSetTopLevelIrp(NULL); FsRtlExitFileSystem(); Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -82,7 +82,7 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); if (IrpContext) - ExFreePoolWithTag(IrpContext, TAG('N', 'I', 'R', 'P')); + ExFreePoolWithTag(IrpContext, 'PRIN'); IoSetTopLevelIrp(NULL); FsRtlExitFileSystem(); Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -36,7 +36,7 @@ /* MACROS *******************************************************************/ -#define TAG_FCB TAG('I', 'F', 'C', 'B') +#define TAG_FCB 'BCFI' Modified: trunk/reactos/drivers/filesystems/ntfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -74,7 +74,7 @@ TRACE_(NTFS, "NtfsAllocateIrpContext()\n"); - IrpContext = (PNTFS_IRP_CONTEXT)ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_IRP_CONTEXT), TAG('N', 'I', 'R', 'P')); + IrpContext = (PNTFS_IRP_CONTEXT)ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_IRP_CONTEXT), 'PRIN'); if (IrpContext == NULL) return NULL; RtlZeroMemory(IrpContext, sizeof(NTFS_IRP_CONTEXT)); Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -55,7 +55,7 @@ TRACE_(NTFS, "DriverEntry(%p, '%wZ')\n", DriverObject, RegistryPath); /* Initialize global data */ - NtfsGlobalData = ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_GLOBAL_DATA), TAG('N', 'D', 'R', 'G')); + NtfsGlobalData = ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_GLOBAL_DATA), 'GRDN'); if (!NtfsGlobalData) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -107,7 +107,7 @@ if (NtfsGlobalData) { ExDeleteResourceLite(&NtfsGlobalData->Resource); - ExFreePoolWithTag(NtfsGlobalData, TAG('N', 'D', 'R', 'G')); + ExFreePoolWithTag(NtfsGlobalData, 'GRDN'); } } Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -9,11 +9,7 @@ ((pDeviceExt)->NtfsInfo.UCHARsPerCluster > PAGE_SIZE ? \ (pDeviceExt)->NtfsInfo.UCHARsPerCluster : PAGE_SIZE) -#ifndef TAG -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#endif - -#define TAG_NTFS TAG('N', 'T', 'F', 'S') +#define TAG_NTFS 'SFTN' #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) @@ -83,11 +79,11 @@ } NTFS_INFO, *PNTFS_INFO; -#define NTFS_TYPE_CCB TAG('F','S',0,2) -#define NTFS_TYPE_FCB TAG('F','S',0,3) -#define NTFS_TYPE_VCB TAG('F','S',0,5) -#define NTFS_TYPE_IRP_CONTEST TAG('F','S',0,6) -#define NTFS_TYPE_GLOBAL_DATA TAG('F','S',0,7) +#define NTFS_TYPE_CCB '20SF' +#define NTFS_TYPE_FCB '30SF' +#define NTFS_TYPE_VCB '50SF' +#define NTFS_TYPE_IRP_CONTEST '60SF' +#define NTFS_TYPE_GLOBAL_DATA '70SF' typedef struct { @@ -165,7 +161,7 @@ ULONG LastOffset; } NTFS_CCB, *PNTFS_CCB; -#define TAG_CCB TAG('I', 'C', 'C', 'B') +#define TAG_CCB 'BCCI' typedef struct { Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -14,8 +14,7 @@ * Structures * --------------------------------------------------*/ -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define I8042PRT_TAG TAG('8', '0', '4', '2') +#define I8042PRT_TAG '2408' typedef enum { Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -31,9 +31,6 @@ /* FUNCTIONS *****************************************************************/ -/* Debug stuff */ -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) - static VOID NTAPI i8042DebugWorkItem( IN PDEVICE_OBJECT DeviceObject, @@ -48,7 +45,7 @@ /* We hope kernel would understand this. If * that's not the case, nothing would happen. */ - KdSystemDebugControl(TAG('R', 'o', 's', ' '), Key, 0, NULL, 0, NULL, KernelMode); + KdSystemDebugControl(' soR', Key, 0, NULL, 0, NULL, KernelMode); } /* Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -10,8 +10,7 @@ #define MIN(a, b) ((a) < (b) ? (a) : (b)) -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define CLASS_TAG TAG('K', 'b', 'd', 'C') +#define CLASS_TAG 'CdbK' #define DPFLTR_CLASS_NAME_ID DPFLTR_KBDCLASS_ID typedef enum Modified: trunk/reactos/drivers/input/mouclass/mouclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -10,8 +10,7 @@ #define MIN(a, b) ((a) < (b) ? (a) : (b)) -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define CLASS_TAG TAG('M', 'o', 'u', 'C') +#define CLASS_TAG 'CuoM' #define DPFLTR_CLASS_NAME_ID DPFLTR_MOUCLASS_ID typedef enum Modified: trunk/reactos/drivers/input/sermouse/sermouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/ser… ============================================================================== --- trunk/reactos/drivers/input/sermouse/sermouse.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/sermouse/sermouse.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -4,8 +4,7 @@ #include <ntddmou.h> #include <debug.h> -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define SERMOUSE_TAG TAG('S', 'M', 'o', 'u') +#define SERMOUSE_TAG 'uoMS' typedef enum { Modified: trunk/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -4,9 +4,8 @@ #include "ksiface.h" #include "kstypes.h" -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_KSDEVICE TAG('K', 'S', 'E', 'D') -#define TAG_KSOBJECT_TAG TAG('K', 'S', 'O', 'H') +#define TAG_KSDEVICE 'DESK' +#define TAG_KSOBJECT_TAG 'HOSK' NTSTATUS NTAPI Modified: trunk/reactos/drivers/ksfilter/ks/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/priv.h… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -18,7 +18,7 @@ #include "ksiface.h" -#define TAG_DEVICE_HEADER TAG('H','D','S','K') +#define TAG_DEVICE_HEADER 'KSDH' #define DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PinSet,\ PropGeneral, PropInstances, PropIntersection)\ Modified: trunk/reactos/drivers/multimedia/audio/sb16_nt4.old/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/s… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/sb16_nt4.old/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/audio/sb16_nt4.old/main.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -12,7 +12,6 @@ #define NDEBUG #include <sndblst.h> -#define TAG(A, B, C, D) (IN ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) /* IRP DISPATCH ROUTINES @@ -207,8 +206,8 @@ ExFreePool(ptr) -#define TAG_REG_INFO TAG('I','g','e','R') -#define TAG_REG_NAME TAG('N','g','e','R') +#define TAG_REG_INFO 'RegI' +#define TAG_REG_NAME 'RegN' NTSTATUS NTAPI EnumerateSubkey( Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -155,12 +155,8 @@ #define BREAKPOINT #endif -#ifndef TAG -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#endif - /* memory pool tag */ -#define PCNET_TAG TAG('P', 'c', 'N', 't') +#define PCNET_TAG 'tNcP' #endif // _PCNET_H_ Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -31,7 +31,6 @@ /* the version of NDIS we claim to be */ #define NDIS_VERSION 0x00050000 -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define NDIS_TAG 0x4e4d4953 #define MIN(value1, value2) \ 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 Aug 24 19:12:25 2009 @@ -2236,7 +2236,7 @@ * Gain the access to the miniport data structure first. */ - MiniportPtr = IoGetDriverObjectExtension(DriverObject, (PVOID)TAG('D','I','M','N')); + MiniportPtr = IoGetDriverObjectExtension(DriverObject, (PVOID)'NMID'); if (MiniportPtr == NULL) { NDIS_DbgPrint(MIN_TRACE, ("Can't get driver object extension.\n")); @@ -2487,7 +2487,7 @@ * structure in the driver extension or what? */ - Status = IoAllocateDriverObjectExtension(Miniport->DriverObject, (PVOID)TAG('D','I','M','N'), + Status = IoAllocateDriverObjectExtension(Miniport->DriverObject, (PVOID)'NMID', sizeof(PNDIS_M_DRIVER_BLOCK), (PVOID*)&MiniportPtr); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/drivers/network/tcpip/include/address.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/address.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/address.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -15,7 +15,7 @@ */ #define AddrInitIPv4(IPAddress, RawAddress) \ { \ - INIT_TAG((IPAddress), TAG('I','P','V','4')); \ + INIT_TAG((IPAddress), '4VPI'); \ (IPAddress)->Type = IP_ADDRESS_V4; \ (IPAddress)->Address.IPv4Address = (RawAddress); \ } Modified: trunk/reactos/drivers/network/tcpip/include/tcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/tcpip.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/tcpip.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -30,8 +30,7 @@ #include <debug.h> -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_STRING TAG('S', 'T', 'R', ' ') /* string */ +#define TAG_STRING ' RTS' /* string */ /* Define _NTTEST_ to make test version. Device names are prefixed with 'NT' to allow the driver to run side by side with MS TCP/IP driver */ Modified: trunk/reactos/drivers/serial/serenum/serenum.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/ser… ============================================================================== --- trunk/reactos/drivers/serial/serenum/serenum.h [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serenum/serenum.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -12,8 +12,6 @@ #include <ntddser.h> #include <stdio.h> #include <debug.h> - -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) typedef enum { @@ -57,7 +55,7 @@ UNICODE_STRING CompatibleIds; // REG_MULTI_SZ } PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; -#define SERENUM_TAG TAG('S', 'e', 'r', 'e') +#define SERENUM_TAG 'ereS' /* Flags */ #define FLAG_ENUMERATION_DONE 0x01 Modified: trunk/reactos/drivers/serial/serial/serial.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/seri… ============================================================================== --- trunk/reactos/drivers/serial/serial/serial.h [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/serial.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -12,8 +12,6 @@ #include <ntddser.h> #include <stdio.h> #include <debug.h> - -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) /* See winbase.h */ #define PST_RS232 1 @@ -108,7 +106,7 @@ BOOLEAN ReadAtLeastOneByte; } WORKITEM_DATA, *PWORKITEM_DATA; -#define SERIAL_TAG TAG('S', 'e', 'r', 'l') +#define SERIAL_TAG 'lreS' #define INFINITE ((ULONG)-1) Modified: trunk/reactos/drivers/setup/blue/blue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.h?… ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.h [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/blue.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -12,11 +12,7 @@ #include <stdio.h> #include <stdlib.h> -#ifndef TAG -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#endif - -#define TAG_BLUE TAG('B', 'L', 'U', 'E') +#define TAG_BLUE 'EULB' typedef struct _CFHEADER { Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -14,8 +14,6 @@ //#define NDEBUG #include <debug.h> - -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, ScsiClassGetInquiryData) @@ -4635,7 +4633,7 @@ NULL, NonPagedPoolMustSucceed, SCSI_REQUEST_BLOCK_SIZE, - TAG('H','s','c','S'), + 'ScsH', (USHORT)NumberElements); } 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 24 19:12:25 2009 @@ -493,7 +493,7 @@ Length = GuidString.Length + 32; Buffer = ExAllocatePoolWithTag(NonPagedPool, Length, - TAG('R', 'a', 'm', 'd')); + 'dmaR'); if (!Buffer) { // @@ -542,7 +542,7 @@ SymbolicLinkName.Length = GuidString.Length + 34; Buffer = ExAllocatePoolWithTag(NonPagedPool, SymbolicLinkName.MaximumLength, - TAG('R', 'a', 'm', 'd')); + 'dmaR'); SymbolicLinkName.Buffer = Buffer; if (Buffer) { @@ -618,7 +618,7 @@ DiskLength = Input->DiskLength; ExInitializeFastMutex(&DriveExtension->DiskListLock); IoInitializeRemoveLock(&DriveExtension->RemoveLock, - TAG('R', 'a', 'm', 'd'), + 'dmaR', 0, 1); DriveExtension->DriveDeviceName = DeviceName; @@ -1811,7 +1811,7 @@ Objects) + FinalCount * sizeof(PDEVICE_OBJECT), - TAG('R', 'a', 'm', 'd')); + 'dmaR'); if (!OurDeviceRelations) { // @@ -2231,7 +2231,7 @@ DeviceExtension->Type = RamdiskBus; ExInitializeFastMutex(&DeviceExtension->DiskListLock); IoInitializeRemoveLock(&DeviceExtension->RemoveLock, - TAG('R', 'a', 'm', 'd'), + 'dmaR', 0, 1); InitializeListHead(&DeviceExtension->DiskList); @@ -2322,7 +2322,7 @@ DriverRegistryPath.Buffer = ExAllocatePoolWithTag(PagedPool, RegistryPath->Length + sizeof(WCHAR), - TAG('R', 'a', 'm', 'd')); + 'dmaR'); if (!DriverRegistryPath.Buffer) return STATUS_INSUFFICIENT_RESOURCES; RtlCopyUnicodeString(&DriverRegistryPath, RegistryPath); Modified: trunk/reactos/drivers/storage/ide/uniata/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/stdafx.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/stdafx.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -23,8 +23,7 @@ #undef ExAllocatePool #endif -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_UNIATA TAG('a', 't', 'a', 'U') +#define TAG_UNIATA 'Uata' #define ExAllocatePool(a,b) ExAllocatePoolWithTag(a,b,TAG_UNIATA) Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport_int.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport_int.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -14,8 +14,7 @@ #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #endif -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_SCSIPORT TAG('S', 'C', 'S', 'I') +#define TAG_SCSIPORT 'ISCS' /* Defines how many logical unit arrays will be in a device extension */ #define LUS_NUMBER 8 Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/framebuf.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -68,10 +68,8 @@ DDPIXELFORMAT ddpfDisplay; } PDEV, *PPDEV; -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) - #define DEVICE_NAME L"framebuf" -#define ALLOC_TAG TAG('F','B','U','F') +#define ALLOC_TAG 'FUBF' DHPDEV APIENTRY Modified: trunk/reactos/drivers/video/displays/framebufacc/framebufacc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/framebufacc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebufacc/framebufacc.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -95,10 +95,8 @@ -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) - #define DEVICE_NAME L"framebuf" -#define ALLOC_TAG TAG('F','B','U','F') +#define ALLOC_TAG 'FUBF' DHPDEV APIENTRY Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/vgaddi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -66,8 +66,6 @@ } /***********************************************************/ - -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define DS_SOLIDBRUSH 0x00000001 #define DS_GREYBRUSH 0x00000002 @@ -249,7 +247,7 @@ BOOL DeinitVGA(PPDEV ppdev); // screen.c: Free resources allocated in InitVGA #define DRIVER_EXTRA_SIZE 0 -#define ALLOC_TAG TAG('D', 'v', 'g', 'a') // Dvga tag +#define ALLOC_TAG 'agvD' // Dvga tag #define DLL_NAME L"vga" // DLL name in Unicode #define MAX_SCAN_WIDTH 2048 // pixels Modified: trunk/reactos/drivers/video/font/ftfd/rosglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/ro… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/rosglue.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/rosglue.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -17,8 +17,7 @@ #define NDEBUG #include <debug.h> -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_FREETYPE TAG('F', 'T', 'Y', 'P') +#define TAG_FREETYPE 'PYTF' /* * First some generic routines Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -38,8 +38,7 @@ #include "ntddvdeo.h" #include "video.h" -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_VBE TAG('V', 'B', 'E', ' ') +#define TAG_VBE ' EBV' /* * Compile-time define to get VBE 1.2 support. The implementation Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -666,7 +666,7 @@ ExAllocatePoolWithTag( PagedPool, DriverExtension->RegistryPath.MaximumLength, - TAG('U', 'S', 'T', 'R')); + 'RTSU'); if (DriverExtension->RegistryPath.Buffer == NULL) { RtlInitUnicodeString(&DriverExtension->RegistryPath, NULL); Modified: trunk/reactos/drivers/video/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -36,8 +36,8 @@ #include <debug.h> -#define TAG_VIDEO_PORT TAG('V', 'I', 'D', 'P') -#define TAG_VIDEO_PORT_BUFFER TAG('V', 'p', 'm', '\0' ) +#define TAG_VIDEO_PORT 'PDIV' +#define TAG_VIDEO_PORT_BUFFER '\0mpV' typedef struct _VIDEO_PORT_ADDRESS_MAPPING { Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -23,8 +23,7 @@ #include <math.h> #include <intrin.h> -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_PORTCLASS TAG('P', 'C', 'L', 'S') +#define TAG_PORTCLASS 'SLCP' #define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x)) Modified: trunk/reactos/hal/halppc/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halppc/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/dma.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -114,7 +114,7 @@ #define MAX_MAP_REGISTERS 64 -#define TAG_DMA TAG('D','M','A',' ') +#define TAG_DMA ' AMD' /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/hal/halppc/generic/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/pci.c?r… ============================================================================== --- trunk/reactos/hal/halppc/generic/pci.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/pci.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -656,7 +656,7 @@ /* Allocate the return structure */ PciRegistryInfo = ExAllocatePoolWithTag(NonPagedPool, sizeof(PCI_REGISTRY_INFO_INTERNAL), - TAG('H', 'a', 'l', ' ')); + ' laH'); if (!PciRegistryInfo) return NULL; /* Fill it out */ Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -114,7 +114,7 @@ #define MAX_MAP_REGISTERS 64 -#define TAG_DMA TAG('D','M','A',' ') +#define TAG_DMA ' AMD' /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/hal/halx86/generic/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pci.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -595,7 +595,7 @@ PagedPool, sizeof(CM_RESOURCE_LIST) + (ResourceCount - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), - TAG('H','a','l',' ')); + ' laH'); if (NULL == *AllocatedResources) return STATUS_NO_MEMORY; @@ -815,7 +815,7 @@ /* Allocate the return structure */ PciRegistryInfo = ExAllocatePoolWithTag(NonPagedPool, sizeof(PCI_REGISTRY_INFO_INTERNAL), - TAG('H', 'a', 'l', ' ')); + ' laH'); if (!PciRegistryInfo) return NULL; /* Fill it out */ Modified: trunk/reactos/include/ddk/stdunk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stdunk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/stdunk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/stdunk.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -10,8 +10,6 @@ #ifndef STDUNK_H #define STDUNK_H - -#define STDUNK_TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #include <punknown.h> @@ -153,7 +151,7 @@ STD_CREATE_BODY_WITH_TAG_(classname, unknown, outer_unknown, pool_type, tag, PUNKNOWN) #define STD_CREATE_BODY_(classname, unknown, outer_unknown, pool_type, base) \ - STD_CREATE_BODY_WITH_TAG_(classname, unknown, outer_unknown, pool_type, STDUNK_TAG('r','C','c','P'), base) + STD_CREATE_BODY_WITH_TAG_(classname, unknown, outer_unknown, pool_type, 'rCcP', base) #define STD_CREATE_BODY(classname, unknown, outer_unknown, pool_type) \ STD_CREATE_BODY_(classname, unknown, outer_unknown, pool_type, PUNKNOWN) @@ -187,7 +185,7 @@ size_t size, POOL_TYPE pool_type) { - return KCOM_New(size, pool_type, STDUNK_TAG ('w','N','c','P')); + return KCOM_New(size, pool_type, 'wNcP'); } inline PVOID Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -5585,7 +5585,7 @@ IN ULONG Length ); -#define PCI_DATA_TAG TAG('P', 'C', 'I', ' ') +#define PCI_DATA_TAG ' ICP' #define PCI_DATA_VERSION 1 typedef struct _PCIBUSDATA Modified: trunk/reactos/include/psdk/wdbgexts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wdbgexts.h?re… ============================================================================== --- trunk/reactos/include/psdk/wdbgexts.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wdbgexts.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -20,7 +20,7 @@ #define DBGKD_VERS_FLAG_HSS 0x0010 #define DBGKD_VERS_FLAG_PARTITIONS 0x0020 -#define KDBG_TAG TAG('K', 'D', 'B', 'G') +#define KDBG_TAG 'GBDK' typedef struct _DBGKD_GET_VERSION32 { Modified: trunk/reactos/include/reactos/probe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/probe.h?re… ============================================================================== --- trunk/reactos/include/reactos/probe.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/probe.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -164,7 +164,7 @@ /* Allocate space for the buffer */ Buffer = ExAllocatePoolWithTag(PagedPool, Dest->Length + sizeof(WCHAR), - TAG('U', 'S', 'T', 'R')); + 'RTSU'); if (Buffer == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -58,7 +58,7 @@ /* FIXME: Is this needed? */ RtlZeroMemory(IPPacket, sizeof(IP_PACKET)); - INIT_TAG(IPPacket, TAG('I','P','K','T')); + INIT_TAG(IPPacket, 'TKPI'); IPPacket->Free = DontFreePacket; IPPacket->Type = Type; @@ -146,7 +146,7 @@ return NULL; } - INIT_TAG(IF, TAG('F','A','C','E')); + INIT_TAG(IF, 'ECAF'); RtlZeroMemory(IF, sizeof(IP_INTERFACE)); @@ -371,7 +371,7 @@ NULL, /* Free routine */ 0, /* Flags */ sizeof(IPDATAGRAM_REASSEMBLY), /* Size of each entry */ - TAG('I','P','D','R'), /* Tag */ + 'RDPI', /* Tag */ 0); /* Depth */ ExInitializeNPagedLookasideList( @@ -380,7 +380,7 @@ NULL, /* Free routine */ 0, /* Flags */ sizeof(IP_FRAGMENT), /* Size of each entry */ - TAG('I','P','F','G'), /* Tag */ + 'GFPI', /* Tag */ 0); /* Depth */ ExInitializeNPagedLookasideList( @@ -389,7 +389,7 @@ NULL, /* Free routine */ 0, /* Flags */ sizeof(IPDATAGRAM_HOLE), /* Size of each entry */ - TAG('I','P','H','L'), /* Tag */ + 'LHPI', /* Tag */ 0); /* Depth */ /* Start routing subsystem */ Modified: trunk/reactos/lib/drivers/ip/network/memtrack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/mem… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/memtrack.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/memtrack.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -3,7 +3,7 @@ #if DBG -#define TRACK_TAG TAG('T','r','C','K') +#define TRACK_TAG 'KCrT' static LIST_ENTRY AllocatedObjectsList; static KSPIN_LOCK AllocatedObjectsLock; Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -287,7 +287,7 @@ return NULL; } - INIT_TAG(NCE, TAG('N','C','E',' ')); + INIT_TAG(NCE, ' ECN'); NCE->Interface = Interface; NCE->Address = *Address; Modified: trunk/reactos/lib/drivers/ip/network/router.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rou… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/router.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/router.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -219,7 +219,7 @@ return NULL; } - INIT_TAG(Router, TAG('R','O','U','T')); + INIT_TAG(Router, 'TUOR'); RtlCopyMemory( &FIBE->NetworkAddress, NetworkAddress, sizeof(FIBE->NetworkAddress) ); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -197,10 +197,10 @@ #define SMALL_SIZE 128 #define LARGE_SIZE 2048 -#define SIGNATURE_LARGE TAG('L','L','L','L') -#define SIGNATURE_SMALL TAG('S','S','S','S') -#define SIGNATURE_OTHER TAG('O','O','O','O') -#define TCP_TAG TAG('T','C','P',' ') +#define SIGNATURE_LARGE 'LLLL' +#define SIGNATURE_SMALL 'SSSS' +#define SIGNATURE_OTHER 'OOOO' +#define TCP_TAG ' PCT' static NPAGED_LOOKASIDE_LIST LargeLookasideList; static NPAGED_LOOKASIDE_LIST SmallLookasideList; Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -509,7 +509,7 @@ NULL, /* Free routine */ 0, /* Flags */ sizeof(TCP_SEGMENT), /* Size of each entry */ - TAG('T','C','P','S'), /* Tag */ + 'SPCT', /* Tag */ 0); /* Depth */ StartTimer(); Modified: trunk/reactos/lib/fslib/vfatlib/check/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/vf… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/vfat.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/vfat.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -361,13 +361,9 @@ UNICODE_STRING SearchPattern; } VFATCCB, *PVFATCCB; -#ifndef TAG -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#endif - -#define TAG_CCB TAG('V', 'C', 'C', 'B') -#define TAG_FCB TAG('V', 'F', 'C', 'B') -#define TAG_IRP TAG('V', 'I', 'R', 'P') +#define TAG_CCB 'BCCV' +#define TAG_FCB 'BCFV' +#define TAG_IRP 'PRIV' #define ENTRIES_PER_SECTOR (BLOCKSIZE / sizeof(FATDirEntry)) Modified: trunk/reactos/lib/rossym/initkm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/initkm.c?rev=42… ============================================================================== --- trunk/reactos/lib/rossym/initkm.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym/initkm.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -17,8 +17,7 @@ #define NDEBUG #include <debug.h> -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_ROSSYM TAG('R', 'S', 'Y', 'M') +#define TAG_ROSSYM 'MYSR' static PVOID RosSymAllocMemKM(ULONG_PTR Size) Modified: trunk/reactos/lib/rtl/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bootdata.c?rev=429… ============================================================================== --- trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -45,7 +45,7 @@ /* allocate and initialize the security descriptor */ AbsSD = RtlpAllocateMemory(sizeof(SECURITY_DESCRIPTOR), - TAG('S', 'e', 'S', 'd')); + 'dSeS'); if (AbsSD == NULL) { Status = STATUS_NO_MEMORY; @@ -63,7 +63,7 @@ DaclSize = sizeof(ACL) + sizeof(ACE) + RtlLengthSid(LocalSystemSid); Dacl = RtlpAllocateMemory(DaclSize, - TAG('S', 'e', 'A', 'c')); + 'cAeS'); if (Dacl == NULL) { Status = STATUS_NO_MEMORY; @@ -111,13 +111,13 @@ if (Dacl != NULL) { RtlpFreeMemory(Dacl, - TAG('S', 'e', 'A', 'c')); + 'cAeS'); } if (AbsSD != NULL) { RtlpFreeMemory(AbsSD, - TAG('S', 'e', 'S', 'd')); + 'dSeS'); } } @@ -162,7 +162,7 @@ /* allocate enough memory for the security descriptor */ RelSD = RtlpAllocateMemory(DescriptorSize, - TAG('S', 'e', 'S', 'd')); + 'dSeS'); if (RelSD == NULL) { Status = STATUS_NO_MEMORY; @@ -297,7 +297,7 @@ ASSERT(AbsSDSize > DescriptorSize); AbsSD = RtlpAllocateMemory(DescriptorSize, - TAG('S', 'e', 'S', 'd')); + 'dSeS'); if (AbsSD == NULL) { Status = STATUS_NO_MEMORY; @@ -357,7 +357,7 @@ /* allocate enough memory for the new self-relative descriptor */ NewRelSD = RtlpAllocateMemory(RelSDSize, - TAG('S', 'e', 'S', 'd')); + 'dSeS'); if (NewRelSD == NULL) { Status = STATUS_NO_MEMORY; @@ -392,20 +392,20 @@ if (RelSD != NULL) { RtlpFreeMemory(RelSD, - TAG('S', 'e', 'S', 'd')); + 'dSeS'); } if (NewRelSD != NULL) { RtlpFreeMemory(NewRelSD, - TAG('S', 'e', 'S', 'd')); + 'dSeS'); } #ifdef _WIN64 if (AbsSDAllocated) { RtlpFreeMemory(AbsSD, - TAG('S', 'e', 'S', 'd')); + 'dSeS'); } #endif @@ -660,9 +660,9 @@ ASSERT(SecurityDescriptor->Dacl != NULL); RtlpFreeMemory(SecurityDescriptor->Dacl, - TAG('S', 'e', 'A', 'c')); + 'cAeS'); RtlpFreeMemory(SecurityDescriptor, - TAG('S', 'e', 'S', 'd')); + 'dSeS'); RtlFreeSid(SystemSid); } Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=429… ============================================================================== --- trunk/reactos/lib/rtl/registry.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/registry.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h> -#define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v') +#define TAG_RTLREGISTRY 'vrqR' extern SIZE_T RtlpAllocDeallocQueryBufferSize; Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=42915&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -165,9 +165,9 @@ IN ULONG Service); /* Tags for the String Allocators */ -#define TAG_USTR TAG('U', 'S', 'T', 'R') -#define TAG_ASTR TAG('A', 'S', 'T', 'R') -#define TAG_OSTR TAG('O', 'S', 'T', 'R') +#define TAG_USTR 'RTSU' +#define TAG_ASTR 'RTSA' +#define TAG_OSTR 'RTSO' /* Timer Queue */ Modified: trunk/reactos/lib/rtl/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sid.c?rev=42915&r1… ============================================================================== --- trunk/reactos/lib/rtl/sid.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sid.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h> -#define TAG_SID TAG('p', 'S', 'i', 'd') +#define TAG_SID 'diSp' /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/eng/engevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engevent.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engevent.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -12,7 +12,7 @@ #define NDEBUG #include <debug.h> -#define TAG_ENG TAG('E', 'n', 'g', ' ') +#define TAG_ENG ' gnE' /* PUBLIC FUNCTIONS **********************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -1,102 +1,102 @@ #ifndef _WIN32K_TAGS_H #define _WIN32K_TAGS_H -#define TAG_STRING TAG('S', 'T', 'R', ' ') /* string */ -#define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v') /* RTL registry */ +#define TAG_STRING ' RTS' /* string */ +#define TAG_RTLREGISTRY 'vrqR' /* RTL registry */ /* ntuser */ -#define TAG_MOUSE TAG('M', 'O', 'U', 'S') /* mouse */ -#define TAG_KEYBOARD TAG('K', 'B', 'D', ' ') /* keyboard */ -#define TAG_ACCEL TAG('A', 'C', 'C', 'L') /* accelerator */ -#define TAG_HOOK TAG('W', 'N', 'H', 'K') /* hook */ -#define TAG_HOTKEY TAG('H', 'O', 'T', 'K') /* hotkey */ -#define TAG_MENUITEM TAG('M', 'E', 'N', 'I') /* menu item */ -#define TAG_MSG TAG('M', 'E', 'S', 'G') /* message */ -#define TAG_MSGQ TAG('M', 'S', 'G', 'Q') /* message queue */ -#define TAG_USRMSG TAG('U', 'M', 'S', 'G') /* user message */ -#define TAG_WNDPROP TAG('W', 'P', 'R', 'P') /* window property */ -#define TAG_WNAM TAG('W', 'N', 'A', 'M') /* window name */ -#define TAG_WINLIST TAG('W', 'N', 'L', 'S') /* window handle list */ -#define TAG_WININTLIST TAG('W', 'N', 'I', 'P') /* window internal pos */ -#define TAG_WINPROCLST TAG('W', 'N', 'P', 'L') /* window proc list */ -#define TAG_SBARINFO TAG('S', 'B', 'I', 'N') /* scrollbar info */ -#define TAG_TIMER TAG('T', 'I', 'M', 'R') /* timer entry */ -#define TAG_TIMERTD TAG('T', 'I', 'M', 'T') /* timer thread dereference list */ -#define TAG_TIMERBMP TAG('T', 'I', 'M', 'B') /* timers bitmap */ -#define TAG_CALLBACK TAG('C', 'B', 'C', 'K') /* callback memory */ -#define TAG_WINSTA TAG('W', 'S', 'T', 'A') /* window station */ -#define TAG_PDCE TAG('U', 's', 'd', 'c') /* dce */ -#define TAG_INPUT TAG('U', 's', 's', 'y') /* Input */ +#define TAG_MOUSE 'SUOM' /* mouse */ +#define TAG_KEYBOARD ' DBK' /* keyboard */ +#define TAG_ACCEL 'LCCA' /* accelerator */ +#define TAG_HOOK 'KHNW' /* hook */ +#define TAG_HOTKEY 'KTOH' /* hotkey */ +#define TAG_MENUITEM 'INEM' /* menu item */ +#define TAG_MSG 'GSEM' /* message */ +#define TAG_MSGQ 'QGSM' /* message queue */ +#define TAG_USRMSG 'GSMU' /* user message */ +#define TAG_WNDPROP 'PRPW' /* window property */ +#define TAG_WNAM 'MANW' /* window name */ +#define TAG_WINLIST 'SLNW' /* window handle list */ +#define TAG_WININTLIST 'PINW' /* window internal pos */ +#define TAG_WINPROCLST 'LPNW' /* window proc list */ +#define TAG_SBARINFO 'NIBS' /* scrollbar info */ +#define TAG_TIMER 'RMIT' /* timer entry */ +#define TAG_TIMERTD 'TMIT' /* timer thread dereference list */ +#define TAG_TIMERBMP 'BMIT' /* timers bitmap */ +#define TAG_CALLBACK 'KCBC' /* callback memory */ +#define TAG_WINSTA 'ATSW' /* window station */ +#define TAG_PDCE 'cdsU' /* dce */ +#define TAG_INPUT 'yssU' /* Input */ /* gdi objects from the handle table */ -#define TAG_DC TAG('G', 'l', 'a', '1') /* dc */ -#define TAG_REGION TAG('G', 'l', 'a', '4') /* region */ -#define TAG_SURFACE TAG('G', 'l', 'a', '5') /* bitmap */ -#define TAG_CLIENTOBJ TAG('G', 'h', '0', '6') -#define TAG_PATH TAG('G', 'h', '0', '7') -#define TAG_PALETTE TAG('G', 'l', 'a', '8') -#define TAG_ICMLCS TAG('G', 'h', '0', '9') -#define TAG_LFONT TAG('G', 'l', 'a', ':') -#define TAG_RFONT TAG('G', 'h', '0', ';') /* correct? */ -#define TAG_PFE TAG('G', 'h', '0', '<') -#define TAG_PFT TAG('G', 'h', '0', '=') /* correct? */ -#define TAG_ICMCXF TAG('G', 'h', '0', '>') /* correct? */ -#define TAG_SPRITE TAG('G', 'h', '0', '?') /* correct? */ -#define TAG_BRUSH TAG('G', 'l', 'a', '@') -#define TAG_UMPD TAG('G', 'h', '0', 'A') /* correct? */ -#define TAG_SPACE TAG('G', 'h', '0', 'C') /* correct? */ -#define TAG_META TAG('G', 'h', '0', 'E') /* correct? */ -#define TAG_EFSTATE TAG('G', 'h', '0', 'F') /* correct? */ -#define TAG_BMFD TAG('G', 'h', '0', 'G') /* correct? */ -#define TAG_VTFD TAG('G', 'h', '0', 'H') /* correct? */ -#define TAG_TTFD TAG('G', 'h', '0', 'I') /* correct? */ -#define TAG_RC TAG('G', 'h', '0', 'J') /* correct? */ -#define TAG_TEMP TAG('G', 'h', '0', 'K') /* correct? */ -#define TAG_DRVOBJ TAG('G', 'h', '0', 'L') /* correct? */ -#define TAG_DCIOBJ TAG('G', 'h', '0', 'M') /* correct? */ -#define TAG_SPOOL TAG('G', 'h', '0', 'N') /* correct? */ +#define TAG_DC '1alG' /* dc */ +#define TAG_REGION '4alG' /* region */ +#define TAG_SURFACE '5alG' /* bitmap */ +#define TAG_CLIENTOBJ '60hG' +#define TAG_PATH '70hG' +#define TAG_PALETTE '8alG' +#define TAG_ICMLCS '90hG' +#define TAG_LFONT ':alG' +#define TAG_RFONT ';0gG' /* correct? */ +#define TAG_PFE '<0hG' +#define TAG_PFT '=0hG' /* correct? */ +#define TAG_ICMCXF '>0hG' /* correct? */ +#define TAG_SPRITE '?0hG' /* correct? */ +#define TAG_BRUSH '@alG' +#define TAG_UMPD 'A0hG' /* correct? */ +#define TAG_SPACE 'c0hG' /* correct? */ +#define TAG_META 'E0hG' /* correct? */ +#define TAG_EFSTATE 'F0hG' /* correct? */ +#define TAG_BMFD 'G0hG' /* correct? */ +#define TAG_VTFD 'H0hG' /* correct? */ +#define TAG_TTFD 'I0hG' /* correct? */ +#define TAG_RC 'J0hG' /* correct? */ +#define TAG_TEMP 'K0hG' /* correct? */ +#define TAG_DRVOBJ 'L0hG' /* correct? */ +#define TAG_DCIOBJ 'M0hG' /* correct? */ +#define TAG_SPOOL 'N0hG' /* correct? */ /* other gdi objects */ -#define TAG_BEZIER TAG('B', 'E', 'Z', 'R') /* bezier */ -#define TAG_BITMAP TAG('B', 'T', 'M', 'P') /* bitmap */ -#define TAG_PATBLT TAG('P', 'B', 'L', 'T') /* patblt */ -#define TAG_CLIP TAG('C', 'L', 'I', 'P') /* clipping */ -#define TAG_COORD TAG('C', 'O', 'R', 'D') /* coords */ -#define TAG_GDIDEV TAG('G', 'd', 'e', 'v') /* gdi dev support*/ -#define TAG_GDIPDEV TAG('G', 'D', 'e', 'v') /* gdi PDev */ -#define TAG_GDIHNDTBLE TAG('G', 'D', 'I', 'H') /* gdi handle table */ -#define TAG_GDIICM TAG('G', 'i', 'c', 'm') /* gdi Icm */ -#define TAG_DIB TAG('D', 'I', 'B', ' ') /* dib */ -#define TAG_COLORMAP TAG('C', 'O', 'L', 'M') /* color map */ -#define TAG_SHAPE TAG('S', 'H', 'A', 'P') /* shape */ -#define TAG_PALETTEMAP TAG('P', 'A', 'L', 'M') /* palette mapping */ -#define TAG_PRINT TAG('P', 'R', 'N', 'T') /* print */ -#define TAG_GDITEXT TAG('T', 'X', 'T', 'O') /* text */ -#define TAG_PENSTYLES TAG('G', 's', 't', 'y') /* pen styles */ +#define TAG_BEZIER 'RZEB' /* bezier */ +#define TAG_BITMAP 'PMTB' /* bitmap */ +#define TAG_PATBLT 'TLBP' /* patblt */ +#define TAG_CLIP 'PILC' /* clipping */ +#define TAG_COORD 'DROC' /* coords */ +#define TAG_GDIDEV 'vedG' /* gdi dev support*/ +#define TAG_GDIPDEV 'veDG' /* gdi PDev */ +#define TAG_GDIHNDTBLE 'HIDG' /* gdi handle table */ +#define TAG_GDIICM 'mciG' /* gdi Icm */ +#define TAG_DIB ' BID' /* dib */ +#define TAG_COLORMAP 'MLOC' /* color map */ +#define TAG_SHAPE 'PAHS' /* shape */ +#define TAG_PALETTEMAP 'MLAP' /* palette mapping */ +#define TAG_PRINT 'TNRP' /* print */ +#define TAG_GDITEXT 'OTXT' /* text */ +#define TAG_PENSTYLES 'ytsG' /* pen styles */ /* Eng objects */ -#define TAG_CLIPOBJ TAG('C', 'L', 'P', 'O') /* clip object */ -#define TAG_DRIVEROBJ TAG('D', 'R', 'V', 'O') /* driver object */ -#define TAG_DFSM TAG('D', 'f', 's', 'm') /* Eng event allocation */ -#define TAG_EPATH TAG('G', 'p', 'a', 't') /* path object */ -#define TAG_FONT TAG('F', 'N', 'T', 'E') /* font entry */ -#define TAG_FONTOBJ TAG('G', 'f', 'n', 't') /* font object */ -#define TAG_WNDOBJ TAG('W', 'N', 'D', 'O') /* window object */ -#define TAG_XLATEOBJ TAG('X', 'L', 'A', 'O') /* xlate object */ -#define TAG_GSEM TAG('G', 's', 'e', 'm') /* Gdi Semaphore */ +#define TAG_CLIPOBJ 'OPLC' /* clip object */ +#define TAG_DRIVEROBJ 'OVRD' /* driver object */ +#define TAG_DFSM 'msfD' /* Eng event allocation */ +#define TAG_EPATH 'tapG' /* path object */ +#define TAG_FONT 'ETNF' /* font entry */ +#define TAG_FONTOBJ 'tnfG' /* font object */ +#define TAG_WNDOBJ 'ODNW' /* window object */ +#define TAG_XLATEOBJ 'OALX' /* xlate object */ +#define TAG_GSEM 'mesG' /* Gdi Semaphore */ /* misc */ -#define TAG_DRIVER TAG('G', 'D', 'R', 'V') /* video drivers */ -#define TAG_FNTFILE TAG('F', 'N', 'T', 'F') /* font file */ -#define TAG_SSECTPOOL TAG('S', 'S', 'C', 'P') /* shared section pool */ -#define TAG_PFF TAG('G', 'p', 'f', 'f') /* physical font file */ +#define TAG_DRIVER 'VRDG' /* video drivers */ +#define TAG_FNTFILE 'FTNF' /* font file */ +#define TAG_SSECTPOOL 'PCSS' /* shared section pool */ +#define TAG_PFF 'ffpG' /* physical font file */ /* Dx internal tags rember I do not known if it right namees */ -#define TAG_DXPVMLIST TAG('D', 'X', 'P', 'L') /* pmvlist for the driver */ -#define TAG_DXFOURCC TAG('D', 'X', 'F', 'O') /* pdwFourCC for the driver */ -#define TAG_DDRAW TAG('D', 'h', ' ', '1') -#define TAG_DDSURF TAG('D', 'h', ' ', '2') -#define TAG_EDDGBL TAG('E', 'D', 'D', 'G') /* ? edd_directdraw_global ??*/ +#define TAG_DXPVMLIST 'LPXD' /* pmvlist for the driver */ +#define TAG_DXFOURCC 'OFXD' /* pdwFourCC for the driver */ +#define TAG_DDRAW '1 hD' +#define TAG_DDSURF '2 hD' +#define TAG_EDDGBL 'GDDE' /* ? edd_directdraw_global ??*/ #endif /* _WIN32K_TAGS_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -3,7 +3,7 @@ #include <include/engobjects.h> -#define TAG_FINF TAG('F', 'I', 'N', 'F') +#define TAG_FINF 'FNIF' // // EXSTROBJ flags. // Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -70,7 +70,7 @@ /* FIXME - lock the process */ Win32Process = ExAllocatePoolWithTag(NonPagedPool, sizeof(PROCESSINFO), - TAG('W', '3', '2', 'p')); + 'p23W'); if (Win32Process == NULL) RETURN( STATUS_NO_MEMORY); @@ -188,7 +188,7 @@ /* FIXME - lock the process */ Win32Thread = ExAllocatePoolWithTag(NonPagedPool, sizeof(THREADINFO), - TAG('W', '3', '2', 't')); + 't23W'); if (Win32Thread == NULL) RETURN( STATUS_NO_MEMORY); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -18,7 +18,7 @@ #include <winsta.h> -#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl(TAG('R', 'o', 's', 'D'), (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) +#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) HBITMAP NTAPI UserLoadImage(PCWSTR); BOOL NTAPI W32kDosPathNameToNtPathName(PCWSTR, PUNICODE_STRING); Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -656,7 +656,7 @@ SafeFileNames.MaximumLength = SafeFileNames.Length = cbStringSize - sizeof(WCHAR); SafeFileNames.Buffer = ExAllocatePoolWithTag(PagedPool, cbStringSize, - TAG('R','T','S','U')); + 'RTSU'); if (!SafeFileNames.Buffer) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); @@ -682,7 +682,7 @@ { SetLastNtError(Status); /* Free the string buffer for the safe filename */ - ExFreePoolWithTag(SafeFileNames.Buffer,TAG('R','T','S','U')); + ExFreePoolWithTag(SafeFileNames.Buffer,'RTSU'); return FALSE; } @@ -713,7 +713,7 @@ } /* Free the string for the safe filenames */ - ExFreePoolWithTag(SafeFileNames.Buffer,TAG('R','T','S','U')); + ExFreePoolWithTag(SafeFileNames.Buffer,'RTSU'); return bRet; } Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -1,6 +1,6 @@ #ifdef GDI_DEBUG -#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl(TAG('R', 'o', 's', 'D'), (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) +#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) NTSYSAPI ULONG APIENTRY RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); static int leak_reported = 0;

15 years, 4 months

[fireball] 42914: - Update zorder when switching focus from one window to another, and when a windows becomes visible. Not quite there yet - window's contents is not being repainted if needed, but switching between windows is much better now. - Remove unneeded magic from NTDRV.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Aug 24 18:47:13 2009 New Revision: 42914 URL: http://svn.reactos.org/svn/reactos?rev=42914&view=rev Log: - Update zorder when switching focus from one window to another, and when a windows becomes visible. Not quite there yet - window's contents is not being repainted if needed, but switching between windows is much better now. - Remove unneeded magic from NTDRV. Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Mon Aug 24 18:47:13 2009 @@ -708,12 +708,25 @@ void CDECL RosDrv_SetCapture( HWND hwnd, UINT flags ) { - UNIMPLEMENTED; + if (!(flags & (GUI_INMOVESIZE | GUI_INMENUMODE))) return; + + if (hwnd) + { + /* Capturing */ + FIXME("Capture set for hwnd %x\n", hwnd); + } + else + { + FIXME("Capture released\n"); + } } void CDECL RosDrv_SetFocus( HWND hwnd ) { - UNIMPLEMENTED; + RECT rc; + //UNIMPLEMENTED; + GetWindowRect(hwnd, &rc); + RosDrv_UpdateZOrder(hwnd, &rc); } void CDECL RosDrv_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) @@ -774,19 +787,10 @@ UINT CDECL RosDrv_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) { - /*int x, y; - unsigned int width, height;*/ - DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); - - if (style & WS_MINIMIZE) return swp; - if (IsRectEmpty( rect )) return swp; - - /* only fetch the new rectangle if the ShowWindow was a result of a window manager event */ - TRACE( "win %p cmd %d at %s flags %08x\n", hwnd, cmd, wine_dbgstr_rect(rect), swp ); - return swp & ~(SWP_NOMOVE | SWP_NOCLIENTMOVE | SWP_NOSIZE | SWP_NOCLIENTSIZE); + return swp; } LRESULT CDECL RosDrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam )

15 years, 4 months

[janderwald] 42913: - Check that all pins have been closed when the last filter reference is gone - Fix freeing of stream data (hacked atm) - Implement retrieving of all property items for PinWaveCyclic

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Aug 24 15:00:14 2009 New Revision: 42913 URL: http://svn.reactos.org/svn/reactos?rev=42913&view=rev Log: - Check that all pins have been closed when the last filter reference is gone - Fix freeing of stream data (hacked atm) - Implement retrieving of all property items for PinWaveCyclic Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Mon Aug 24 15:00:14 2009 @@ -235,16 +235,16 @@ NTSTATUS Status = STATUS_SUCCESS; IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; - for(Index = 0; Index < This->Descriptor->Factory.PinDescriptorCount; Index++) - { - /* all pins should have been closed by now */ - ASSERT(This->Pins[Index] == NULL); - } - DPRINT("IPortFilterWaveCyclic_fnClose ref %u\n", This->ref); if (This->ref == 1) { + for(Index = 0; Index < This->Descriptor->Factory.PinDescriptorCount; Index++) + { + /* all pins should have been closed by now */ + ASSERT(This->Pins[Index] == NULL); + } + /* release reference to port */ This->SubDevice->lpVtbl->Release(This->SubDevice); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] Mon Aug 24 15:00:14 2009 @@ -73,6 +73,7 @@ const GUID KSPROPSETID_Topology = {0x720D4AC0L, 0x7533, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; const GUID KSPROPSETID_Pin = {0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSPROPTYPESETID_General = {0x97E99BA0L, 0xBDEA, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; const GUID IID_IAllocatorMXF = {0xa5f0d62cL, 0xb30f, 0x11d2, {0xb7, 0xa3, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1}}; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Mon Aug 24 15:00:14 2009 @@ -300,11 +300,12 @@ */ This->Irp->IoStatus.Information = StreamHeader->FrameExtent; - /* free stream data, no tag as wdmaud.drv does it atm */ - //ExFreePool(StreamHeader->Data); - - /* free stream header, no tag as wdmaud.drv allocates it atm */ - //ExFreePool(StreamHeader); + if (This->Irp->RequestorMode != KernelMode) + { + /* HACK - WDMAUD should pass PKSSTREAM_HEADERs */ + ExFreePool(StreamHeader->Data); + ExFreePool(StreamHeader); + } /* complete the request */ IoCompleteRequest(This->Irp, IO_SOUND_INCREMENT); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Mon Aug 24 15:00:14 2009 @@ -463,6 +463,34 @@ } Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + if (IsEqualGUIDAligned(&Property->Set, &GUID_NULL)) + { + if (Property->Flags & KSPROPERTY_TYPE_SETSUPPORT) + { + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(GUID)) + { + /* buffer too small */ + Irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + Irp->IoStatus.Information = sizeof(GUID); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_BUFFER_OVERFLOW; + } + /* FIXME copy guids + * KSPROPSETID_Audio when available + * KSPROPSETID_Sysaudio_Pin + */ + RtlMoveMemory(Irp->UserBuffer, &KSPROPSETID_Connection, sizeof(GUID)); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(GUID); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; + } + } + if (IsEqualGUIDAligned(&Property->Set, &KSPROPSETID_Connection)) { @@ -1041,6 +1069,7 @@ KeBugCheck(0); } + Status = This->Miniport->lpVtbl->NewStream(This->Miniport, &This->Stream, NULL, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] Mon Aug 24 15:00:14 2009 @@ -15,6 +15,7 @@ IN PKSPROPERTY Property, IN ULONG InputBufferLength, IN ULONG OutputBufferLength, + OUT PVOID OutputBuffer, OUT PFNKSHANDLER *PropertyHandler); NTSTATUS @@ -237,7 +238,7 @@ } /* property handler is used to verify input parameters */ - Status = FindPropertyHandler(IoStatus, Descriptor, Property, PropertyLength, DataLength, &PropertyHandler); + Status = FindPropertyHandler(IoStatus, Descriptor, Property, PropertyLength, DataLength, Data, &PropertyHandler); if (!NT_SUCCESS(Status)) { DPRINT("FindPropertyHandler failed with %x\n", Status); @@ -368,9 +369,12 @@ IN PKSPROPERTY Property, IN ULONG InputBufferLength, IN ULONG OutputBufferLength, + OUT PVOID OutputBuffer, OUT PFNKSHANDLER *PropertyHandler) { ULONG Index, ItemIndex; + PULONG Flags; + PKSPROPERTY_DESCRIPTION Description; for(Index = 0; Index < Descriptor->FilterPropertySet.FreeKsPropertySetOffset; Index++) { @@ -385,6 +389,48 @@ if (Property->Flags & KSPROPERTY_TYPE_GET) *PropertyHandler = Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].GetPropertyHandler; + + if (Property->Flags & KSPROPERTY_TYPE_BASICSUPPORT) + { + if (sizeof(ULONG) > OutputBufferLength) + { + /* too small buffer */ + return STATUS_INVALID_PARAMETER; + } + + /* get output buffer */ + Flags = (PULONG)OutputBuffer; + + /* clear flags */ + *Flags = KSPROPERTY_TYPE_BASICSUPPORT; + + if (Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].GetSupported) + *Flags |= KSPROPERTY_TYPE_GET; + + if (Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].SetSupported) + *Flags |= KSPROPERTY_TYPE_SET; + + IoStatus->Information = sizeof(ULONG); + + if (OutputBufferLength >= sizeof(KSPROPERTY_DESCRIPTION)) + { + /* get output buffer */ + Description = (PKSPROPERTY_DESCRIPTION)OutputBuffer; + + /* store result */ + Description->DescriptionSize = sizeof(KSPROPERTY_DESCRIPTION); + Description->PropTypeSet.Set = KSPROPTYPESETID_General; + Description->PropTypeSet.Id = 0; + Description->PropTypeSet.Flags = 0; + Description->MembersListCount = 0; + Description->Reserved = 0; + + IoStatus->Information = sizeof(KSPROPERTY_DESCRIPTION); + } + + return STATUS_SUCCESS; + } + if (Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].MinProperty > InputBufferLength) { @@ -536,14 +582,14 @@ } } - Status = FindPropertyHandler(&Irp->IoStatus, Descriptor, Property, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, &PropertyHandler); - if (PropertyHandler) + Status = FindPropertyHandler(&Irp->IoStatus, Descriptor, Property, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Irp->UserBuffer, &PropertyHandler); + if (NT_SUCCESS(Status) && PropertyHandler) { KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PVOID)Descriptor; DPRINT("Calling property handler %p\n", PropertyHandler); Status = PropertyHandler(Irp, Property, Irp->UserBuffer); } - else + else if (!NT_SUCCESS(Status)) { RtlStringFromGUID(&Property->Set, &GuidString); DPRINT1("Unhandeled property: Set %S Id %u Flags %x InputLength %u OutputLength %u\n", GuidString.Buffer, Property->Id, Property->Flags, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength);

15 years, 4 months

[spetreolle] 42912: temporarily disable kernel32:pipe tests. the testing process seems to go further if this test crashes, looking at testman output.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Mon Aug 24 14:57:34 2009 New Revision: 42912 URL: http://svn.reactos.org/svn/reactos?rev=42912&view=rev Log: temporarily disable kernel32:pipe tests. the testing process seems to go further if this test crashes, looking at testman output. Modified: trunk/rostests/winetests/kernel32/testlist.c Modified: trunk/rostests/winetests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/testli… ============================================================================== --- trunk/rostests/winetests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/testlist.c [iso-8859-1] Mon Aug 24 14:57:34 2009 @@ -64,7 +64,7 @@ { "module", func_module }, { "mailslot", func_mailslot }, { "path", func_path }, - { "pipe", func_pipe }, + //{ "pipe", func_pipe }, { "process", func_process }, { "profile", func_profile }, { "resource", func_resource },

15 years, 4 months

[cwittich] 42911: sync user32 winetest with wine 1.1.28

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Aug 24 14:42:47 2009 New Revision: 42911 URL: http://svn.reactos.org/svn/reactos?rev=42911&view=rev Log: sync user32 winetest with wine 1.1.28 Modified: trunk/rostests/winetests/user32/combo.c trunk/rostests/winetests/user32/cursoricon.c trunk/rostests/winetests/user32/dialog.c trunk/rostests/winetests/user32/input.c trunk/rostests/winetests/user32/menu.c trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/win.c Modified: trunk/rostests/winetests/user32/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/combo.c?… ============================================================================== --- trunk/rostests/winetests/user32/combo.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/combo.c [iso-8859-1] Mon Aug 24 14:42:47 2009 @@ -94,27 +94,28 @@ static void test_setfont(DWORD style) { - HWND hCombo = build_combo(style); - HFONT hFont1 = CreateFont(10, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); - HFONT hFont2 = CreateFont(8, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); + HWND hCombo; + HFONT hFont1, hFont2; RECT r; int i; + if (!is_font_installed("Marlett")) + { + skip("Marlett font not available\n"); + return; + } + trace("Style %x\n", style); + + hCombo = build_combo(style); + hFont1 = CreateFont(10, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, SYMBOL_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); + hFont2 = CreateFont(8, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, SYMBOL_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); + GetClientRect(hCombo, &r); expect_rect(r, 0, 0, 100, 24); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); todo_wine expect_rect(r, 5, 5, 105, 105); - - if (!is_font_installed("Marlett")) - { - skip("Marlett font not available\n"); - DestroyWindow(hCombo); - DeleteObject(hFont1); - DeleteObject(hFont2); - return; - } if (font_height(hFont1) == 10 && font_height(hFont2) == 8) { @@ -140,11 +141,14 @@ todo_wine expect_rect(r, 5, 5, 105, 99); } else - skip("Invalid Marlett font heights\n"); + { + ok(0, "Expected Marlett font heights 10/8, got %d/%d\n", + font_height(hFont1), font_height(hFont2)); + } for (i = 1; i < 30; i++) { - HFONT hFont = CreateFont(i, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); + HFONT hFont = CreateFont(i, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, SYMBOL_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); int height = font_height(hFont); SendMessage(hCombo, WM_SETFONT, (WPARAM)hFont, FALSE); Modified: trunk/rostests/winetests/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/cursoric… ============================================================================== --- trunk/rostests/winetests/user32/cursoricon.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/cursoricon.c [iso-8859-1] Mon Aug 24 14:42:47 2009 @@ -956,6 +956,262 @@ HeapFree(GetProcessHeap(), 0, hotspot); } +static HICON create_test_icon(HDC hdc, int width, int height, int bpp, + BOOL maskvalue, UINT32 *color, int colorSize) +{ + ICONINFO iconInfo; + BITMAPINFO bitmapInfo; + UINT32 *buffer = NULL; + UINT32 mask = maskvalue ? 0xFFFFFFFF : 0x00000000; + + memset(&bitmapInfo, 0, sizeof(bitmapInfo)); + bitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bitmapInfo.bmiHeader.biWidth = width; + bitmapInfo.bmiHeader.biHeight = height; + bitmapInfo.bmiHeader.biPlanes = 1; + bitmapInfo.bmiHeader.biBitCount = bpp; + bitmapInfo.bmiHeader.biCompression = BI_RGB; + bitmapInfo.bmiHeader.biSizeImage = colorSize; + + iconInfo.fIcon = TRUE; + iconInfo.xHotspot = 0; + iconInfo.yHotspot = 0; + + iconInfo.hbmMask = CreateBitmap( width, height, 1, 1, &mask ); + if(!iconInfo.hbmMask) return NULL; + + iconInfo.hbmColor = CreateDIBSection(hdc, &bitmapInfo, DIB_RGB_COLORS, (void**)&buffer, NULL, 0); + if(!iconInfo.hbmColor || !buffer) + { + DeleteObject(iconInfo.hbmMask); + return NULL; + } + + memcpy(buffer, color, colorSize); + + return CreateIconIndirect(&iconInfo); +} + +static BOOL color_match(COLORREF a, COLORREF b) +{ + /* 5-bit accuracy is a sufficient test. This will match, so long as + * colors are never truncated to less that 3x5-bit accuracy i.e. + * paletized. */ + return (a & 0x00F8F8F8) == (b & 0x00F8F8F8); +} + +static void check_alpha_draw(HDC hdc, BOOL drawiconex, BOOL alpha, int bpp, int line) +{ + HICON hicon; + UINT32 mask; + UINT32 color[2]; + COLORREF modern_expected, legacy_expected, result; + + mask = 0x00000000; + color[0] = 0x00A0B0C0; + color[1] = alpha ? 0xFF000000 : 0x00000000; + modern_expected = alpha ? 0x00FFFFFF : 0x00C0B0A0; + legacy_expected = 0x00C0B0A0; + + hicon = create_test_icon(hdc, 2, 1, bpp, 0, color, sizeof(color)); + if (!hicon) return; + + SetPixelV(hdc, 0, 0, 0x00FFFFFF); + + if(drawiconex) + DrawIconEx(hdc, 0, 0, hicon, 2, 1, 0, NULL, DI_NORMAL); + else + DrawIcon(hdc, 0, 0, hicon); + + result = GetPixel(hdc, 0, 0); + ok (color_match(result, modern_expected) || /* Windows 2000 and up */ + broken(color_match(result, legacy_expected)), /* Windows NT 4.0, 9X and below */ + "%s. Expected a close match to %06X (modern) or %06X (legacy) with %s. " + "Got %06X from line %d\n", + alpha ? "Alpha blending" : "Not alpha blending", modern_expected, legacy_expected, + drawiconex ? "DrawIconEx" : "DrawIcon", result, line); +} + +static void check_DrawIcon(HDC hdc, BOOL maskvalue, UINT32 color, int bpp, COLORREF background, + COLORREF modern_expected, COLORREF legacy_expected, int line) +{ + COLORREF result; + HICON hicon = create_test_icon(hdc, 1, 1, bpp, maskvalue, &color, sizeof(color)); + if (!hicon) return; + SetPixelV(hdc, 0, 0, background); + DrawIcon(hdc, 0, 0, hicon); + result = GetPixel(hdc, 0, 0); + + ok (color_match(result, modern_expected) || /* Windows 2000 and up */ + broken(color_match(result, legacy_expected)), /* Windows NT 4.0, 9X and below */ + "Overlaying Mask %d on Color %06X with DrawIcon. " + "Expected a close match to %06X (modern), or %06X (legacy). Got %06X from line %d\n", + maskvalue, color, modern_expected, legacy_expected, result, line); +} + +static void test_DrawIcon(void) +{ + BITMAPINFO bitmapInfo; + HDC hdcDst = NULL; + HBITMAP bmpDst = NULL; + HBITMAP bmpOld = NULL; + UINT32 *bits = 0; + + hdcDst = CreateCompatibleDC(0); + ok(hdcDst != 0, "CreateCompatibleDC(0) failed to return a valid DC\n"); + if (!hdcDst) + return; + + if(GetDeviceCaps(hdcDst, BITSPIXEL) <= 8) + { + skip("Windows will distort DrawIcon colors at 8-bpp and less due to palletizing.\n"); + goto cleanup; + } + + memset(&bitmapInfo, 0, sizeof(bitmapInfo)); + bitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bitmapInfo.bmiHeader.biWidth = 1; + bitmapInfo.bmiHeader.biHeight = 1; + bitmapInfo.bmiHeader.biBitCount = 32; + bitmapInfo.bmiHeader.biPlanes = 1; + bitmapInfo.bmiHeader.biCompression = BI_RGB; + bitmapInfo.bmiHeader.biSizeImage = sizeof(UINT32); + + bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok (bmpDst && bits, "CreateDIBSection failed to return a valid bitmap and buffer\n"); + if (!bmpDst || !bits) + goto cleanup; + bmpOld = SelectObject(hdcDst, bmpDst); + + /* Mask is only heeded if alpha channel is always zero */ + check_DrawIcon(hdcDst, FALSE, 0x00A0B0C0, 32, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); + check_DrawIcon(hdcDst, TRUE, 0x00A0B0C0, 32, 0x00FFFFFF, 0x003F4F5F, 0x003F4F5F, __LINE__); + + /* Test alpha blending */ + /* Windows 2000 and up will alpha blend, earlier Windows versions will not */ + check_DrawIcon(hdcDst, FALSE, 0xFFA0B0C0, 32, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); + check_DrawIcon(hdcDst, TRUE, 0xFFA0B0C0, 32, 0x00FFFFFF, 0x00C0B0A0, 0x003F4F5F, __LINE__); + + check_DrawIcon(hdcDst, FALSE, 0x80A0B0C0, 32, 0x00000000, 0x00605850, 0x00C0B0A0, __LINE__); + check_DrawIcon(hdcDst, TRUE, 0x80A0B0C0, 32, 0x00000000, 0x00605850, 0x00C0B0A0, __LINE__); + check_DrawIcon(hdcDst, FALSE, 0x80A0B0C0, 32, 0x00FFFFFF, 0x00DFD7CF, 0x00C0B0A0, __LINE__); + check_DrawIcon(hdcDst, TRUE, 0x80A0B0C0, 32, 0x00FFFFFF, 0x00DFD7CF, 0x003F4F5F, __LINE__); + + check_DrawIcon(hdcDst, FALSE, 0x01FFFFFF, 32, 0x00000000, 0x00010101, 0x00FFFFFF, __LINE__); + check_DrawIcon(hdcDst, TRUE, 0x01FFFFFF, 32, 0x00000000, 0x00010101, 0x00FFFFFF, __LINE__); + + /* Test detecting of alpha channel */ + /* If a single pixel's alpha channel is non-zero, the icon + will be alpha blended, otherwise it will be draw with + and + xor blts. */ + check_alpha_draw(hdcDst, FALSE, FALSE, 32, __LINE__); + check_alpha_draw(hdcDst, FALSE, TRUE, 32, __LINE__); + +cleanup: + if(bmpOld) + SelectObject(hdcDst, bmpOld); + if(bmpDst) + DeleteObject(bmpDst); + if(hdcDst) + DeleteDC(hdcDst); +} + +static void check_DrawIconEx(HDC hdc, BOOL maskvalue, UINT32 color, int bpp, UINT flags, COLORREF background, + COLORREF modern_expected, COLORREF legacy_expected, int line) +{ + COLORREF result; + HICON hicon = create_test_icon(hdc, 1, 1, bpp, maskvalue, &color, sizeof(color)); + if (!hicon) return; + SetPixelV(hdc, 0, 0, background); + DrawIconEx(hdc, 0, 0, hicon, 1, 1, 0, NULL, flags); + result = GetPixel(hdc, 0, 0); + + ok (color_match(result, modern_expected) || /* Windows 2000 and up */ + broken(color_match(result, legacy_expected)), /* Windows NT 4.0, 9X and below */ + "Overlaying Mask %d on Color %06X with DrawIconEx flags %08X. " + "Expected a close match to %06X (modern) or %06X (legacy). Got %06X from line %d\n", + maskvalue, color, flags, modern_expected, legacy_expected, result, line); +} + +static void test_DrawIconEx(void) +{ + BITMAPINFO bitmapInfo; + HDC hdcDst = NULL; + HBITMAP bmpDst = NULL; + HBITMAP bmpOld = NULL; + UINT32 bits = 0; + + hdcDst = CreateCompatibleDC(0); + ok(hdcDst != 0, "CreateCompatibleDC(0) failed to return a valid DC\n"); + if (!hdcDst) + return; + + if(GetDeviceCaps(hdcDst, BITSPIXEL) <= 8) + { + skip("Windows will distort DrawIconEx colors at 8-bpp and less due to palletizing.\n"); + goto cleanup; + } + + memset(&bitmapInfo, 0, sizeof(bitmapInfo)); + bitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bitmapInfo.bmiHeader.biWidth = 1; + bitmapInfo.bmiHeader.biHeight = 1; + bitmapInfo.bmiHeader.biBitCount = 32; + bitmapInfo.bmiHeader.biPlanes = 1; + bitmapInfo.bmiHeader.biCompression = BI_RGB; + bitmapInfo.bmiHeader.biSizeImage = sizeof(UINT32); + bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok (bmpDst && bits, "CreateDIBSection failed to return a valid bitmap and buffer\n"); + if (!bmpDst || !bits) + goto cleanup; + bmpOld = SelectObject(hdcDst, bmpDst); + + /* Test null, image only, and mask only drawing */ + check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, 0, 0x00102030, 0x00102030, 0x00102030, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, 0, 0x00102030, 0x00102030, 0x00102030, __LINE__); + + check_DrawIconEx(hdcDst, FALSE, 0x80A0B0C0, 32, DI_MASK, 0x00FFFFFF, 0x00000000, 0x00000000, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x80A0B0C0, 32, DI_MASK, 0x00FFFFFF, 0x00FFFFFF, 0x00FFFFFF, __LINE__); + + todo_wine + { + check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); + } + + /* Test normal drawing */ + check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); + todo_wine check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x003F4F5F, 0x003F4F5F, __LINE__); + check_DrawIconEx(hdcDst, FALSE, 0xFFA0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); + + /* Test alpha blending */ + /* Windows 2000 and up will alpha blend, earlier Windows versions will not */ + check_DrawIconEx(hdcDst, TRUE, 0xFFA0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x00C0B0A0, 0x003F4F5F, __LINE__); + + check_DrawIconEx(hdcDst, FALSE, 0x80A0B0C0, 32, DI_NORMAL, 0x00000000, 0x00605850, 0x00C0B0A0, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x80A0B0C0, 32, DI_NORMAL, 0x00000000, 0x00605850, 0x00C0B0A0, __LINE__); + check_DrawIconEx(hdcDst, FALSE, 0x80A0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x00DFD7CF, 0x00C0B0A0, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x80A0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x00DFD7CF, 0x003F4F5F, __LINE__); + + check_DrawIconEx(hdcDst, FALSE, 0x01FFFFFF, 32, DI_NORMAL, 0x00000000, 0x00010101, 0x00FFFFFF, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x01FFFFFF, 32, DI_NORMAL, 0x00000000, 0x00010101, 0x00FFFFFF, __LINE__); + + /* Test detecting of alpha channel */ + /* If a single pixel's alpha channel is non-zero, the icon + will be alpha blended, otherwise it will be draw with + and + xor blts. */ + check_alpha_draw(hdcDst, TRUE, FALSE, 32, __LINE__); + check_alpha_draw(hdcDst, TRUE, TRUE, 32, __LINE__); + +cleanup: + if(bmpOld) + SelectObject(hdcDst, bmpOld); + if(bmpDst) + DeleteObject(bmpDst); + if(hdcDst) + DeleteDC(hdcDst); +} + static void test_DestroyCursor(void) { static const BYTE bmp_bits[4096]; @@ -1063,6 +1319,8 @@ test_CreateIcon(); test_LoadImage(); test_CreateIconFromResource(); + test_DrawIcon(); + test_DrawIconEx(); test_DestroyCursor(); do_parent(); test_child_process(); Modified: trunk/rostests/winetests/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dialog.c… ============================================================================== --- trunk/rostests/winetests/user32/dialog.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/dialog.c [iso-8859-1] Mon Aug 24 14:42:47 2009 @@ -901,23 +901,72 @@ "string retrieved using GetDlgItemText should have been NULL terminated\n"); } +static INT_PTR CALLBACK DestroyDlgWinProc (HWND hDlg, UINT uiMsg, + WPARAM wParam, LPARAM lParam) +{ + if (uiMsg == WM_INITDIALOG) + { + DestroyWindow(hDlg); + return TRUE; + } + return FALSE; +} + +static INT_PTR CALLBACK DestroyOnCloseDlgWinProc (HWND hDlg, UINT uiMsg, + WPARAM wParam, LPARAM lParam) +{ + switch (uiMsg) + { + case WM_INITDIALOG: + PostMessage(hDlg, WM_CLOSE, 0, 0); + return TRUE; + case WM_CLOSE: + DestroyWindow(hDlg); + return TRUE; + case WM_DESTROY: + PostQuitMessage(0); + return TRUE; + } + return FALSE; +} + static void test_DialogBoxParamA(void) { - int ret; + INT_PTR ret; HWND hwnd_invalid = (HWND)0x4444; SetLastError(0xdeadbeef); ret = DialogBoxParamA(GetModuleHandle(NULL), "IDD_DIALOG" , hwnd_invalid, 0 , 0); - ok(0 == ret || broken(ret == -1), "DialogBoxParamA returned %d, expected 0\n", ret); + ok(0 == ret || broken(ret == -1), "DialogBoxParamA returned %ld, expected 0\n", ret); ok(ERROR_INVALID_WINDOW_HANDLE == GetLastError() || broken(GetLastError() == 0xdeadbeef), "got %d, expected ERROR_INVALID_WINDOW_HANDLE\n",GetLastError()); + + /* Test a dialog which destroys itself on WM_INITDIALOG. */ + SetLastError(0xdeadbeef); + ret = DialogBoxParamA(GetModuleHandle(NULL), "IDD_DIALOG", 0, DestroyDlgWinProc, 0); + ok(-1 == ret, "DialogBoxParamA returned %ld, expected -1\n", ret); + ok(ERROR_INVALID_WINDOW_HANDLE == GetLastError() || + GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), + "got %d, expected ERROR_INVALID_WINDOW_HANDLE\n",GetLastError()); + + /* Test a dialog which destroys itself on WM_CLOSE. */ + ret = DialogBoxParamA(GetModuleHandle(NULL), "IDD_DIALOG", 0, DestroyOnCloseDlgWinProc, 0); + ok(0 == ret, "DialogBoxParamA returned %ld, expected 0\n", ret); + SetLastError(0xdeadbeef); ret = DialogBoxParamA(GetModuleHandle(NULL), "RESOURCE_INVALID" , 0, 0, 0); - ok(-1 == ret, "DialogBoxParamA returned %d, expected -1\n", ret); + ok(-1 == ret, "DialogBoxParamA returned %ld, expected -1\n", ret); ok(ERROR_RESOURCE_NAME_NOT_FOUND == GetLastError() || broken(GetLastError() == 0xdeadbeef), "got %d, expected ERROR_RESOURCE_NAME_NOT_FOUND\n",GetLastError()); + + SetLastError(0xdeadbeef); + ret = DefDlgProcA(0, WM_ERASEBKGND, 0, 0); + ok(ret == 0, "DefDlgProcA returned %ld, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, + "got %d, expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError()); } static void test_DisabledDialogTest(void) @@ -1020,6 +1069,63 @@ DestroyWindow(hDlg); } +static void test_SaveRestoreFocus(void) +{ + HWND hDlg; + HRSRC hResource; + HANDLE hTemplate; + DLGTEMPLATE* pTemplate; + LONG_PTR foundId; + HWND foundHwnd; + + /* create the dialog */ + hResource = FindResourceA(g_hinst, "MULTI_EDIT_DIALOG", RT_DIALOG); + hTemplate = LoadResource(g_hinst, hResource); + pTemplate = LockResource(hTemplate); + + hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, messageBoxFontDlgWinProc, 0); + ok (hDlg != 0, "Failed to create test dialog.\n"); + + foundId = GetWindowLongPtr(GetFocus(), GWLP_ID); + ok (foundId == 1000, "First edit box should have gained focus on dialog creation. Expected: %d, Found: %ld\n", 1000, foundId); + + /* de- then reactivate the dialog */ + SendMessage(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), 0); + SendMessage(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_ACTIVE, 0), 0); + + foundId = GetWindowLongPtr(GetFocus(), GWLP_ID); + ok (foundId == 1000, "First edit box should have regained focus after dialog reactivation. Expected: %d, Found: %ld\n", 1000, foundId); + + /* select the next tabbable item */ + SetFocus(GetNextDlgTabItem(hDlg, GetFocus(), FALSE)); + + foundId = GetWindowLongPtr(GetFocus(), GWLP_ID); + ok (foundId == 1001, "Second edit box should have gained focus. Expected: %d, Found: %ld\n", 1001, foundId); + + /* de- then reactivate the dialog */ + SendMessage(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), 0); + SendMessage(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_ACTIVE, 0), 0); + + foundId = GetWindowLongPtr(GetFocus(), GWLP_ID); + ok (foundId == 1001, "Second edit box should have gained focus after dialog reactivation. Expected: %d, Found: %ld\n", 1001, foundId); + + /* disable the 2nd box */ + EnableWindow(GetFocus(), FALSE); + + foundHwnd = GetFocus(); + ok (foundHwnd == NULL, "Second edit box should have lost focus after being disabled. Expected: %p, Found: %p\n", NULL, foundHwnd); + + /* de- then reactivate the dialog */ + SendMessage(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), 0); + SendMessage(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_ACTIVE, 0), 0); + + foundHwnd = GetFocus(); + ok (foundHwnd == NULL, "No controls should have gained focus after dialog reactivation. Expected: %p, Found: %p\n", NULL, foundHwnd); + + /* clean up */ + DestroyWindow(hDlg); +} + START_TEST(dialog) { g_hinst = GetModuleHandleA (0); @@ -1034,4 +1140,5 @@ test_DialogBoxParamA(); test_DisabledDialogTest(); test_MessageBoxFontTest(); -} + test_SaveRestoreFocus(); +} Modified: trunk/rostests/winetests/user32/input.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/input.c?… ============================================================================== --- trunk/rostests/winetests/user32/input.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/input.c [iso-8859-1] Mon Aug 24 14:42:47 2009 @@ -44,7 +44,7 @@ * */ -#define _WIN32_WINNT 0x401 +#define _WIN32_WINNT 0x500 #define _WIN32_IE 0x0500 #include <stdarg.h> @@ -59,6 +59,20 @@ /* globals */ static HWND hWndTest; static LONG timetag = 0x10000000; + +static struct { + LONG last_key_down; + LONG last_key_up; + LONG last_syskey_down; + LONG last_syskey_up; + LONG last_char; + LONG last_syschar; + LONG last_hook_down; + LONG last_hook_up; + LONG last_hook_syskey_down; + LONG last_hook_syskey_up; + BOOL expect_alt; +} key_status; static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); @@ -824,7 +838,8 @@ Msg != WM_GETTEXT && Msg != WM_GETICON && Msg != WM_IME_SELECT && - Msg != WM_DEVICECHANGE) + Msg != WM_DEVICECHANGE && + Msg != WM_TIMECHANGE) { ok(sent_messages_cnt < MAXKEYMESSAGES, "Too many messages\n"); if (sent_messages_cnt < MAXKEYMESSAGES) @@ -922,6 +937,224 @@ UnhookWindowsHookEx(hook); } +static void reset_key_status(void) +{ + key_status.last_key_down = -1; + key_status.last_key_up = -1; + key_status.last_syskey_down = -1; + key_status.last_syskey_up = -1; + key_status.last_char = -1; + key_status.last_syschar = -1; + key_status.last_hook_down = -1; + key_status.last_hook_up = -1; + key_status.last_hook_syskey_down = -1; + key_status.last_hook_syskey_up = -1; + key_status.expect_alt = FALSE; +} + +static void test_unicode_keys(HWND hwnd, HHOOK hook) +{ + TEST_INPUT inputs[2]; + MSG msg; + + /* init input data that never changes */ + inputs[1].type = inputs[0].type = INPUT_KEYBOARD; + inputs[1].u.ki.dwExtraInfo = inputs[0].u.ki.dwExtraInfo = 0; + inputs[1].u.ki.time = inputs[0].u.ki.time = 0; + + /* pressing & releasing a single unicode character */ + inputs[0].u.ki.wVk = 0; + inputs[0].u.ki.wScan = 0x3c0; + inputs[0].u.ki.dwFlags = KEYEVENTF_UNICODE; + + reset_key_status(); + SendInput(1, (INPUT*)inputs, sizeof(INPUT)); + while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ + if(msg.message == WM_KEYDOWN && msg.wParam == VK_PACKET){ + TranslateMessage(&msg); + } + DispatchMessageW(&msg); + } + ok(key_status.last_key_down == VK_PACKET, + "Last keydown msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_down); + ok(key_status.last_char == 0x3c0, + "Last char msg wparam should have been 0x3c0 (was: 0x%x)\n", key_status.last_char); + if(hook) + ok(key_status.last_hook_down == 0x3c0, + "Last hookdown msg should have been 0x3c0, was: 0x%x\n", key_status.last_hook_down); + + inputs[1].u.ki.wVk = 0; + inputs[1].u.ki.wScan = 0x3c0; + inputs[1].u.ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP; + + reset_key_status(); + SendInput(1, (INPUT*)(inputs+1), sizeof(INPUT)); + while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ + if(msg.message == WM_KEYDOWN && msg.wParam == VK_PACKET){ + TranslateMessage(&msg); + } + DispatchMessageW(&msg); + } + ok(key_status.last_key_up == VK_PACKET, + "Last keyup msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_up); + if(hook) + ok(key_status.last_hook_up == 0x3c0, + "Last hookup msg should have been 0x3c0, was: 0x%x\n", key_status.last_hook_up); + + /* holding alt, pressing & releasing a unicode character, releasing alt */ + inputs[0].u.ki.wVk = VK_LMENU; + inputs[0].u.ki.wScan = 0; + inputs[0].u.ki.dwFlags = 0; + + inputs[1].u.ki.wVk = 0; + inputs[1].u.ki.wScan = 0x3041; + inputs[1].u.ki.dwFlags = KEYEVENTF_UNICODE; + + reset_key_status(); + key_status.expect_alt = TRUE; + SendInput(2, (INPUT*)inputs, sizeof(INPUT)); + while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ + if(msg.message == WM_SYSKEYDOWN && msg.wParam == VK_PACKET){ + TranslateMessage(&msg); + } + DispatchMessageW(&msg); + } + ok(key_status.last_syskey_down == VK_PACKET, + "Last syskeydown msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_syskey_down); + ok(key_status.last_syschar == 0x3041, + "Last syschar msg should have been 0x3041 (was: 0x%x)\n", key_status.last_syschar); + if(hook) + ok(key_status.last_hook_syskey_down == 0x3041, + "Last hooksysdown msg should have been 0x3041, was: 0x%x\n", key_status.last_hook_syskey_down); + + inputs[1].u.ki.wVk = 0; + inputs[1].u.ki.wScan = 0x3041; + inputs[1].u.ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP; + + inputs[0].u.ki.wVk = VK_LMENU; + inputs[0].u.ki.wScan = 0; + inputs[0].u.ki.dwFlags = KEYEVENTF_KEYUP; + + reset_key_status(); + key_status.expect_alt = TRUE; + SendInput(2, (INPUT*)inputs, sizeof(INPUT)); + while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ + if(msg.message == WM_SYSKEYDOWN && msg.wParam == VK_PACKET){ + TranslateMessage(&msg); + } + DispatchMessageW(&msg); + } + ok(key_status.last_key_up == VK_PACKET, + "Last keyup msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_up); + if(hook) + ok(key_status.last_hook_up == 0x3041, + "Last hook up msg should have been 0x3041, was: 0x%x\n", key_status.last_hook_up); +} + +static LRESULT CALLBACK unicode_wnd_proc( HWND hWnd, UINT msg, WPARAM wParam, + LPARAM lParam ) +{ + switch(msg){ + case WM_KEYDOWN: + key_status.last_key_down = wParam; + break; + case WM_SYSKEYDOWN: + key_status.last_syskey_down = wParam; + break; + case WM_KEYUP: + key_status.last_key_up = wParam; + break; + case WM_SYSKEYUP: + key_status.last_syskey_up = wParam; + break; + case WM_CHAR: + key_status.last_char = wParam; + break; + case WM_SYSCHAR: + key_status.last_syschar = wParam; + break; + } + return DefWindowProcW(hWnd, msg, wParam, lParam); +} + +static LRESULT CALLBACK llkbd_unicode_hook(int nCode, WPARAM wParam, LPARAM lParam) +{ + if(nCode == HC_ACTION){ + LPKBDLLHOOKSTRUCT info = (LPKBDLLHOOKSTRUCT)lParam; + ok(info->vkCode == VK_PACKET || (key_status.expect_alt && info->vkCode == VK_LMENU), "vkCode should have been VK_PACKET[%04x], was: %04x\n", VK_PACKET, info->vkCode); + key_status.expect_alt = FALSE; + switch(wParam){ + case WM_KEYDOWN: + key_status.last_hook_down = info->scanCode; + break; + case WM_KEYUP: + key_status.last_hook_up = info->scanCode; + break; + case WM_SYSKEYDOWN: + key_status.last_hook_syskey_down = info->scanCode; + break; + case WM_SYSKEYUP: + key_status.last_hook_syskey_up = info->scanCode; + break; + } + } + return CallNextHookEx(NULL, nCode, wParam, lParam); +} + +static void test_Input_unicode(void) +{ + WCHAR classNameW[] = {'I','n','p','u','t','U','n','i','c','o','d','e', + 'K','e','y','T','e','s','t','C','l','a','s','s',0}; + WCHAR windowNameW[] = {'I','n','p','u','t','U','n','i','c','o','d','e', + 'K','e','y','T','e','s','t',0}; + MSG msg; + WNDCLASSW wclass; + HANDLE hInstance = GetModuleHandleW(NULL); + HHOOK hook; + + wclass.lpszClassName = classNameW; + wclass.style = CS_HREDRAW | CS_VREDRAW; + wclass.lpfnWndProc = unicode_wnd_proc; + wclass.hInstance = hInstance; + wclass.hIcon = LoadIcon(0, IDI_APPLICATION); + wclass.hCursor = LoadCursor( NULL, IDC_ARROW); + wclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wclass.lpszMenuName = 0; + wclass.cbClsExtra = 0; + wclass.cbWndExtra = 0; + if(!RegisterClassW(&wclass)){ + win_skip("Unicode functions not supported\n"); + return; + } + /* create the test window that will receive the keystrokes */ + hWndTest = CreateWindowW(wclass.lpszClassName, windowNameW, + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100, + NULL, NULL, hInstance, NULL); + + assert(hWndTest); + assert(IsWindowUnicode(hWndTest)); + + hook = SetWindowsHookExW(WH_KEYBOARD_LL, llkbd_unicode_hook, GetModuleHandleW(NULL), 0); + if(!hook) + win_skip("unable to set WH_KEYBOARD_LL hook\n"); + + ShowWindow(hWndTest, SW_SHOW); + SetWindowPos(hWndTest, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + SetForegroundWindow(hWndTest); + UpdateWindow(hWndTest); + + /* flush pending messages */ + while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageW(&msg); + + SetFocus(hWndTest); + + test_unicode_keys(hWndTest, hook); + + if(hook) + UnhookWindowsHookEx(hook); + DestroyWindow(hWndTest); +} + static void test_keynames(void) { int i, len; @@ -1319,6 +1552,7 @@ { test_Input_blackbox(); test_Input_whitebox(); + test_Input_unicode(); } else win_skip("SendInput is not available\n"); Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Mon Aug 24 14:42:47 2009 @@ -536,7 +536,7 @@ mi.cbSize = sizeof(mi); mi.fMask = MIM_STYLE; pGetMenuInfo( hmenu, &mi); - mi.dwStyle |= mnuopt == 1 ? MNS_NOCHECK : MNS_CHECKORBMP; + if( mnuopt) mi.dwStyle |= mnuopt == 1 ? MNS_NOCHECK : MNS_CHECKORBMP; ret = pSetMenuInfo( hmenu, &mi); ok( ret, "SetMenuInfo failed with error %d\n", GetLastError()); } @@ -2451,6 +2451,48 @@ return hmenu; } +/* use InsertMenuItem: does not set the MFT_BITMAP flag, + * and does not accept non-magic bitmaps with invalid + * bitmap handles */ +static HMENU create_menuitem_from_data(const struct menu_data *item, INT item_count) +{ + HMENU hmenu; + INT i; + BOOL ret; + MENUITEMINFO mii = { sizeof( MENUITEMINFO)}; + + hmenu = CreateMenu(); + assert(hmenu != 0); + + for (i = 0; i < item_count; i++) + { + SetLastError(0xdeadbeef); + + mii.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STATE; + mii.fType = 0; + if( item[i].type & MFT_BITMAP) + { + mii.fMask |= MIIM_BITMAP; + mii.hbmpItem = (HBITMAP)item[i].str; + } + else if( item[i].type & MFT_SEPARATOR) + mii.fType = MFT_SEPARATOR; + else + { + mii.fMask |= MIIM_STRING; + mii.dwTypeData = (LPSTR)item[i].str; + mii.cch = strlen( item[i].str); + } + mii.fState = 0; + if( item[i].type & MF_HELP) mii.fType |= MF_HELP; + mii.wID = item[i].id; + ret = InsertMenuItem( hmenu, -1, TRUE, &mii); + ok(ret, "%d: InsertMenuItem(%04x, %04x, %p) error %u\n", + i, item[i].type, item[i].id, item[i].str, GetLastError()); + } + return hmenu; +} + static void compare_menu_data(HMENU hmenu, const struct menu_data *item, INT item_count) { INT count, i; @@ -2479,14 +2521,12 @@ "%u: expected fType %04x, got %04x\n", i, item[i].type, mii.fType); ok(mii.wID == item[i].id, "%u: expected wID %04x, got %04x\n", i, item[i].id, mii.wID); - if (item[i].type & (MF_BITMAP | MF_SEPARATOR)) - { + if (mii.hbmpItem || !item[i].str) /* For some reason Windows sets high word to not 0 for * not "magic" ids. */ ok(LOWORD(mii.hbmpItem) == LOWORD(item[i].str), "%u: expected hbmpItem %p, got %p\n", i, item[i].str, mii.hbmpItem); - } else { ok(mii.cch == strlen(item[i].str), @@ -2499,6 +2539,7 @@ static void test_InsertMenu(void) { + HBITMAP hbm = CreateBitmap(1,1,1,1,NULL); /* Note: XP treats only bitmap handles 1 - 6 as "magic" ones * regardless of their id. */ @@ -2514,16 +2555,28 @@ { MF_STRING|MF_HELP, 2, "Help" }, { MF_BITMAP|MF_HELP, SC_CLOSE, MAKEINTRESOURCE(1) } }; - static const struct menu_data in2[] = + static const struct menu_data out1a[] = { { MF_STRING, 1, "File" }, - { MF_BITMAP|MF_HELP, SC_CLOSE, MAKEINTRESOURCE(100) }, + { MF_STRING|MF_HELP, 2, "Help" }, + { MF_HELP, SC_CLOSE, MAKEINTRESOURCE(1) } + }; + const struct menu_data in2[] = + { + { MF_STRING, 1, "File" }, + { MF_BITMAP|MF_HELP, SC_CLOSE, (char*)hbm }, { MF_STRING|MF_HELP, 2, "Help" } }; - static const struct menu_data out2[] = + const struct menu_data out2[] = { { MF_STRING, 1, "File" }, - { MF_BITMAP|MF_HELP, SC_CLOSE, MAKEINTRESOURCE(100) }, + { MF_BITMAP|MF_HELP, SC_CLOSE, (char*)hbm }, + { MF_STRING|MF_HELP, 2, "Help" } + }; + const struct menu_data out2a[] = + { + { MF_STRING, 1, "File" }, + { MF_HELP, SC_CLOSE, (char*)hbm }, { MF_STRING|MF_HELP, 2, "Help" } }; static const struct menu_data in3[] = @@ -2550,9 +2603,16 @@ { MF_STRING|MF_HELP, 2, "Help" }, { MF_BITMAP|MF_HELP, 1, MAKEINTRESOURCE(1) } }; + static const struct menu_data out4a[] = + { + { MF_STRING, 1, "File" }, + { MF_STRING|MF_HELP, 2, "Help" }, + { MF_HELP, 1, MAKEINTRESOURCE(1) } + }; HMENU hmenu; #define create_menu(a) create_menu_from_data((a), sizeof(a)/sizeof((a)[0])) +#define create_menuitem(a) create_menuitem_from_data((a), sizeof(a)/sizeof((a)[0])) #define compare_menu(h, a) compare_menu_data((h), (a), sizeof(a)/sizeof((a)[0])) hmenu = create_menu(in1); @@ -2571,7 +2631,25 @@ compare_menu(hmenu, out4); DestroyMenu(hmenu); + /* now using InsertMenuItemInfo */ + hmenu = create_menuitem(in1); + compare_menu(hmenu, out1a); + DestroyMenu(hmenu); + + hmenu = create_menuitem(in2); + compare_menu(hmenu, out2a); + DestroyMenu(hmenu); + + hmenu = create_menuitem(in3); + compare_menu(hmenu, out3); + DestroyMenu(hmenu); + + hmenu = create_menuitem(in4); + compare_menu(hmenu, out4a); + DestroyMenu(hmenu); + #undef create_menu +#undef create_menuitem #undef compare_menu } @@ -2932,6 +3010,166 @@ DestroyWindow( hwnd); } +/* show menu trees have a maximum depth */ +static void test_menu_maxdepth(void) +{ +#define NR_MENUS 100 + HMENU hmenus[ NR_MENUS]; + int i; + DWORD ret; + + SetLastError(12345678); + for( i = 0; i < NR_MENUS; i++) { + hmenus[i] = CreatePopupMenu(); + if( !hmenus[i]) break; + } + ok( i == NR_MENUS, "could not create more than %d menu's\n", i); + for( i = 1; i < NR_MENUS; i++) { + ret = AppendMenuA( hmenus[i], MF_POPUP, (UINT_PTR)hmenus[i-1],"test"); + if( !ret) break; + } + trace("Maximum depth is %d\n", i); + ok( GetLastError() == 12345678, "unexpected error %d\n", GetLastError()); + ok( i < NR_MENUS || + broken( i == NR_MENUS), /* win98, NT */ + "no ( or very large) limit on menu depth!\n"); + + for( i = 0; i < NR_MENUS; i++) + DestroyMenu( hmenus[i]); +} + +/* bug #12171 */ +static void test_menu_circref(void) +{ + HMENU menu1, menu2; + DWORD ret; + + menu1 = CreatePopupMenu(); + menu2 = CreatePopupMenu(); + ok( menu1 && menu2, "error creating menus.\n"); + ret = AppendMenuA( menu1, MF_POPUP, (UINT_PTR)menu2, "winetest"); + ok( ret, "AppendMenu failed, error is %d\n", GetLastError()); + ret = AppendMenuA( menu1, MF_STRING | MF_HILITE, 123, "winetest"); + ok( ret, "AppendMenu failed, error is %d\n", GetLastError()); + /* app chooses an id that happens to clash with its own hmenu */ + ret = AppendMenuA( menu2, MF_STRING, (UINT_PTR)menu2, "winetest"); + ok( ret, "AppendMenu failed, error is %d\n", GetLastError()); + /* now attempt to change the string of the first item of menu1 */ + ret = ModifyMenuA( menu1, (UINT_PTR)menu2, MF_POPUP, (UINT_PTR)menu2, "menu 2"); + ok( !ret || + broken( ret), /* win98, NT */ + "ModifyMenu should have failed.\n"); + if( !ret) { /* will probably stack fault if the ModifyMenu succeeded */ + ret = GetMenuState( menu1, 123, 0); + ok( ret == MF_HILITE, "GetMenuState returned %x\n",ret); + } + DestroyMenu( menu2); + DestroyMenu( menu1); +} + +/* test how the menu texts are aligned when the menu items have + * different combinations of text and bitmaps (bug #13350) */ +static void test_menualign(void) +{ + BYTE bmfill[300]; + HMENU menu; + HBITMAP hbm1, hbm2, hbm3; + MENUITEMINFO mii = { sizeof(MENUITEMINFO)}; + DWORD ret; + HWND hwnd; + MENUINFO mi = { sizeof( MENUINFO)}; + + if( !winetest_interactive) { + skip( "interactive alignment tests.\n"); + return; + } + hwnd = CreateWindowEx(0, + "STATIC", + "Menu text alignment Test\nPlease make a selection.", + WS_OVERLAPPEDWINDOW, + 100, 100, + 300, 300, + NULL, NULL, 0, NULL); + ShowWindow( hwnd, SW_SHOW); + /* create bitmaps */ + memset( bmfill, 0xcc, sizeof( bmfill)); + hbm1 = CreateBitmap( 10,10,1,1,bmfill); + hbm2 = CreateBitmap( 20,20,1,1,bmfill); + hbm3 = CreateBitmap( 50,6,1,1,bmfill); + ok( hbm1 && hbm2 && hbm3, "Creating bitmaps failed\n"); + menu = CreatePopupMenu(); + ok( menu != NULL, "CreatePopupMenu() failed\n"); + if( pGetMenuInfo) { + mi.fMask = MIM_STYLE; + ret = pGetMenuInfo( menu, &mi); + ok( menu != NULL, "GetMenuInfo() failed\n"); + ok( 0 == mi.dwStyle, "menuinfo style is %x\n", mi.dwStyle); + } + /* test 1 */ + mii.fMask = MIIM_BITMAP | MIIM_STRING | MIIM_ID; + mii.wID = 1; + mii.hbmpItem = hbm1; + mii.dwTypeData = (LPSTR) " OK: menu texts are correctly left-aligned."; + ret = InsertMenuItem( menu, -1, TRUE, &mii); + ok( ret, "InsertMenuItem() failed\n"); + mii.fMask = MIIM_BITMAP | MIIM_STRING | MIIM_ID ; + mii.wID = 2; + mii.hbmpItem = hbm2; + mii.dwTypeData = (LPSTR) " FAIL: menu texts are NOT left-aligned."; + ret = InsertMenuItem( menu, -1, TRUE, &mii); + ok( ret, "InsertMenuItem() failed\n"); + ret = TrackPopupMenu( menu, TPM_RETURNCMD, 110, 200, 0, hwnd, NULL); + ok( ret != 2, "User indicated that menu text alignment test 1 failed %d\n", ret); + /* test 2*/ + mii.fMask = MIIM_BITMAP | MIIM_STRING | MIIM_ID; + mii.wID = 3; + mii.hbmpItem = hbm3; + mii.dwTypeData = NULL; + ret = InsertMenuItem( menu, 0, TRUE, &mii); + ok( ret, "InsertMenuItem() failed\n"); + mii.fMask = MIIM_BITMAP | MIIM_STRING | MIIM_ID; + mii.wID = 1; + mii.hbmpItem = hbm1; + /* make the text a bit longer, to keep it readable */ + /* this bug is on winXP and reproduced on wine */ + mii.dwTypeData = (LPSTR) " OK: menu texts are to the right of the bitmaps........"; + ret = SetMenuItemInfo( menu, 1, TRUE, &mii); + ok( ret, "SetMenuItemInfo() failed\n"); + mii.wID = 2; + mii.hbmpItem = hbm2; + mii.dwTypeData = (LPSTR) " FAIL: menu texts are below the first bitmap. "; + ret = SetMenuItemInfo( menu, 2, TRUE, &mii); + ok( ret, "SetMenuItemInfo() failed\n"); + ret = TrackPopupMenu( menu, TPM_RETURNCMD, 110, 200, 0, hwnd, NULL); + ok( ret != 2, "User indicated that menu text alignment test 2 failed %d\n", ret); + /* test 3 */ + mii.fMask = MIIM_TYPE | MIIM_ID; + mii.wID = 3; + mii.fType = MFT_BITMAP; + mii.dwTypeData = (LPSTR) hbm3; + ret = SetMenuItemInfo( menu, 0, TRUE, &mii); + ok( ret, "SetMenuItemInfo() failed\n"); + mii.fMask = MIIM_BITMAP | MIIM_STRING | MIIM_ID; + mii.wID = 1; + mii.hbmpItem = NULL; + mii.dwTypeData = (LPSTR) " OK: menu texts are below the bitmap."; + ret = SetMenuItemInfo( menu, 1, TRUE, &mii); + ok( ret, "SetMenuItemInfo() failed\n"); + mii.wID = 2; + mii.hbmpItem = NULL; + mii.dwTypeData = (LPSTR) " FAIL: menu texts are NOT below the bitmap."; + ret = SetMenuItemInfo( menu, 2, TRUE, &mii); + ok( ret, "SetMenuItemInfo() failed\n"); + ret = TrackPopupMenu( menu, TPM_RETURNCMD, 110, 200, 0, hwnd, NULL); + ok( ret != 2, "User indicated that menu text alignment test 3 failed %d\n", ret); + /* cleanup */ + DeleteObject( hbm1); + DeleteObject( hbm2); + DeleteObject( hbm3); + DestroyMenu( menu); + DestroyWindow( hwnd); +} + START_TEST(menu) { init_function_pointers(); @@ -2947,6 +3185,7 @@ test_CheckMenuRadioItem(); test_menu_resource_layout(); test_InsertMenu(); + test_menualign(); } register_menu_check_class(); @@ -2970,4 +3209,6 @@ test_menu_hilitemenuitem(); test_menu_trackpopupmenu(); test_menu_cancelmode(); -} + test_menu_maxdepth(); + test_menu_circref(); +} Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Mon Aug 24 14:42:47 2009 @@ -581,7 +581,7 @@ { WM_GETTEXT, sent|defwinproc|optional }, { WM_WINDOWPOSCHANGED, sent }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_MINIMIZED }, + { WM_SIZE, sent|defwinproc|wparam|lparam, SIZE_MINIMIZED, 0 }, { WM_NCCALCSIZE, sent|optional }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, @@ -1004,7 +1004,7 @@ { WM_CHILDACTIVATE, sent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOREDRAW|SWP_NOCOPYBITS|SWP_STATECHANGED, 0, SWP_NOACTIVATE }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_MINIMIZED }, + { WM_SIZE, sent|defwinproc|wparam|lparam, SIZE_MINIMIZED, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam, 0, 0 }, /* FIXME: Wine creates an icon/title window while Windows doesn't */ @@ -1044,7 +1044,7 @@ { WM_CHILDACTIVATE, sent }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOREDRAW|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_MINIMIZED }, + { WM_SIZE, sent|defwinproc|wparam|lparam, SIZE_MINIMIZED, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam, 0, 0 }, /* FIXME: Wine creates an icon/title window while Windows doesn't */ @@ -1065,7 +1065,7 @@ { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOREDRAW|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_MINIMIZED }, + { WM_SIZE, sent|defwinproc|wparam|lparam, SIZE_MINIMIZED, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam, 0, 0 }, /* FIXME: Wine creates an icon/title window while Windows doesn't */ @@ -3186,7 +3186,7 @@ { WM_NCCALCSIZE, sent|wparam, 1 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOCLIENTSIZE|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_MINIMIZED }, + { WM_SIZE, sent|defwinproc|wparam|lparam, SIZE_MINIMIZED, 0 }, { WM_CHILDACTIVATE, sent|wparam|lparam|defwinproc, 0, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI child */ { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam, 0, 0 }, /* MDI child */ @@ -5209,6 +5209,49 @@ { WM_CTLCOLORBTN, sent|defwinproc }, { 0 } }; +static const struct message WmSetStyleButtonSeq[] = +{ + { BM_SETSTYLE, sent }, + { WM_APP, sent|wparam|lparam, 0, 0 }, + { WM_PAINT, sent }, + { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ + { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ + { WM_CTLCOLORBTN, sent|parent }, + { 0 } +}; +static const struct message WmSetStyleStaticSeq[] = +{ + { BM_SETSTYLE, sent }, + { WM_APP, sent|wparam|lparam, 0, 0 }, + { WM_PAINT, sent }, + { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ + { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ + { WM_CTLCOLORSTATIC, sent|parent }, + { 0 } +}; +static const struct message WmSetStyleUserSeq[] = +{ + { BM_SETSTYLE, sent }, + { WM_APP, sent|wparam|lparam, 0, 0 }, + { WM_PAINT, sent }, + { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ + { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ + { WM_CTLCOLORBTN, sent|parent }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_PAINT) }, + { 0 } +}; +static const struct message WmSetStyleOwnerdrawSeq[] = +{ + { BM_SETSTYLE, sent }, + { WM_APP, sent|wparam|lparam, 0, 0 }, + { WM_PAINT, sent }, + { WM_NCPAINT, sent|optional }, /* FIXME: Wine sends it */ + { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ + { WM_CTLCOLORBTN, sent|parent }, + { WM_CTLCOLORBTN, sent|parent|optional }, /* Win9x doesn't send it */ + { WM_DRAWITEM, sent|wparam|lparam|parent, ID_BUTTON, 0x000010e4 }, + { 0 } +}; static WNDPROC old_button_proc; @@ -5268,29 +5311,30 @@ DWORD dlg_code; const struct message *setfocus; const struct message *killfocus; + const struct message *setstyle; } button[] = { { BS_PUSHBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, - WmSetFocusButtonSeq, WmKillFocusButtonSeq }, + WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq }, { BS_DEFPUSHBUTTON, DLGC_BUTTON | DLGC_DEFPUSHBUTTON, - WmSetFocusButtonSeq, WmKillFocusButtonSeq }, + WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq }, { BS_CHECKBOX, DLGC_BUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq }, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq }, { BS_AUTOCHECKBOX, DLGC_BUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq }, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq }, { BS_RADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq }, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq }, { BS_3STATE, DLGC_BUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq }, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq }, { BS_AUTO3STATE, DLGC_BUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq }, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq }, { BS_GROUPBOX, DLGC_STATIC, - WmSetFocusStaticSeq, WmKillFocusStaticSeq }, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq }, { BS_USERBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, - WmSetFocusButtonSeq, WmKillFocusButtonSeq }, + WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleUserSeq }, { BS_AUTORADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq }, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq }, { BS_OWNERDRAW, DLGC_BUTTON, - WmSetFocusOwnerdrawSeq, WmKillFocusOwnerdrawSeq } + WmSetFocusOwnerdrawSeq, WmKillFocusOwnerdrawSeq, WmSetStyleOwnerdrawSeq } }; unsigned int i; HWND hwnd, parent; @@ -5319,6 +5363,8 @@ MSG msg; DWORD style; + trace("button style %08x\n", button[i].style); + hwnd = CreateWindowExA(0, "my_button_class", "test", button[i].style | WS_CHILD | BS_NOTIFY, 0, 0, 50, 14, parent, (HMENU)ID_BUTTON, 0, NULL); ok(hwnd != 0, "Failed to create button window\n"); @@ -5327,9 +5373,9 @@ style &= ~(WS_CHILD | BS_NOTIFY); /* XP turns a BS_USERBUTTON into BS_PUSHBUTTON */ if (button[i].style == BS_USERBUTTON) - todo_wine ok(style == BS_PUSHBUTTON, "expected style BS_PUSHBUTTON got %x\n", style); + ok(style == BS_PUSHBUTTON, "expected style BS_PUSHBUTTON got %x\n", style); else - ok(style == button[i].style, "expected style %x got %x\n", button[i].style, style); + ok(style == button[i].style, "expected style %x got %x\n", button[i].style, style); dlg_code = SendMessageA(hwnd, WM_GETDLGCODE, 0, 0); ok(dlg_code == button[i].dlg_code, "%u: wrong dlg_code %08x\n", i, dlg_code); @@ -5342,7 +5388,6 @@ log_all_parent_messages++; - trace("button style %08x\n", button[i].style); ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); SetFocus(hwnd); SendMessage(hwnd, WM_APP, 0, 0); /* place a separator mark here */ @@ -5354,9 +5399,20 @@ while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(button[i].killfocus, "SetFocus(0) on a button", FALSE); + ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); + + SendMessage(hwnd, BM_SETSTYLE, button[i].style | BS_BOTTOM, TRUE); + SendMessage(hwnd, WM_APP, 0, 0); /* place a separator mark here */ + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok_sequence(button[i].setstyle, "BM_SETSTYLE on a button", FALSE); + + style = GetWindowLongA(hwnd, GWL_STYLE); + style &= ~(WS_VISIBLE | WS_CHILD | BS_NOTIFY); + /* XP doesn't turn a BS_USERBUTTON into BS_PUSHBUTTON here! */ + ok(style == button[i].style, "expected style %x got %x\n", button[i].style, style); + log_all_parent_messages--; - ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); DestroyWindow(hwnd); } @@ -10198,7 +10254,7 @@ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|wparam|defwinproc, SIZE_MINIMIZED }, + { WM_SIZE, sent|wparam|lparam|defwinproc, SIZE_MINIMIZED, 0 }, { 0 } }; static const struct message WmMinimize_1[] = { @@ -10208,7 +10264,7 @@ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|wparam|defwinproc, SIZE_MINIMIZED }, + { WM_SIZE, sent|wparam|lparam|defwinproc, SIZE_MINIMIZED, 0 }, { 0 } }; static const struct message WmMinimize_2[] = { @@ -10217,7 +10273,7 @@ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|wparam|defwinproc, SIZE_MINIMIZED }, + { WM_SIZE, sent|wparam|lparam|defwinproc, SIZE_MINIMIZED, 0 }, { 0 } }; static const struct message WmMinimize_3[] = { @@ -10225,7 +10281,7 @@ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|wparam|defwinproc, SIZE_MINIMIZED }, + { WM_SIZE, sent|wparam|lparam|defwinproc, SIZE_MINIMIZED, 0 }, { 0 } }; static const struct message WmShowMinNoActivate[] = { @@ -10233,7 +10289,7 @@ { WM_WINDOWPOSCHANGING, sent }, { WM_WINDOWPOSCHANGED, sent }, { WM_MOVE, sent|defwinproc|optional }, - { WM_SIZE, sent|wparam|defwinproc|optional, SIZE_MINIMIZED }, + { WM_SIZE, sent|wparam|lparam|defwinproc|optional, SIZE_MINIMIZED, 0 }, { 0 } }; static const struct message WmMinMax_1[] = { @@ -10259,7 +10315,7 @@ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc|optional }, - { WM_SIZE, sent|wparam|defwinproc|optional, SIZE_MINIMIZED }, + { WM_SIZE, sent|wparam|lparam|defwinproc|optional, SIZE_MINIMIZED, 0 }, { 0 } }; static const struct message WmMinMax_4[] = { Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Mon Aug 24 14:42:47 2009 @@ -4859,6 +4859,75 @@ DestroyWindow(mw); } +static LRESULT CALLBACK TestNCRedraw_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + static UINT ncredrawflags; + PAINTSTRUCT ps; + + switch(msg) + { + case WM_CREATE: + ncredrawflags = *(UINT *) (((CREATESTRUCT *)lParam)->lpCreateParams); + return 0; + case WM_NCPAINT: + RedrawWindow(hwnd, NULL, NULL, ncredrawflags); + break; + case WM_PAINT: + BeginPaint(hwnd, &ps); + EndPaint(hwnd, &ps); + return 0; + } + return DefWindowProc(hwnd, msg, wParam, lParam); +} + +static void run_NCRedrawLoop(UINT flags) +{ + HWND hwnd; + MSG msg; + + UINT loopcount = 0; + + hwnd = CreateWindowA("TestNCRedrawClass", "MainWindow", + WS_OVERLAPPEDWINDOW, 0, 0, 200, 100, + NULL, NULL, 0, &flags); + ShowWindow(hwnd, SW_SHOW); + UpdateWindow(hwnd); + while(PeekMessage(&msg, hwnd, 0, 0, PM_REMOVE) != 0) + { + if (msg.message == WM_PAINT) loopcount++; + if (loopcount >= 100) break; + TranslateMessage(&msg); + DispatchMessage(&msg); + MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT); + } + if (flags == (RDW_INVALIDATE | RDW_FRAME)) + todo_wine ok(loopcount < 100, "Detected infinite WM_PAINT loop (%x).\n", flags); + else + ok(loopcount < 100, "Detected infinite WM_PAINT loop (%x).\n", flags); + DestroyWindow(hwnd); +} + +static void test_NCRedraw(void) +{ + WNDCLASSA wndclass; + + wndclass.lpszClassName = "TestNCRedrawClass"; + wndclass.style = CS_HREDRAW | CS_VREDRAW; + wndclass.lpfnWndProc = TestNCRedraw_WndProc; + wndclass.cbClsExtra = 0; + wndclass.cbWndExtra = 0; + wndclass.hInstance = 0; + wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION); + wndclass.hCursor = LoadCursor(NULL, IDC_ARROW); + wndclass.hbrBackground = GetStockObject(WHITE_BRUSH); + wndclass.lpszMenuName = NULL; + + RegisterClassA(&wndclass); + + run_NCRedrawLoop(RDW_INVALIDATE | RDW_FRAME); + run_NCRedrawLoop(RDW_INVALIDATE); +} + static void test_GetWindowModuleFileName(void) { HWND hwnd; @@ -5647,6 +5716,7 @@ test_SetMenu(hwndMain); test_SetFocus(hwndMain); test_SetActiveWindow(hwndMain); + test_NCRedraw(); test_children_zorder(hwndMain); test_popup_zorder(hwndMain2, hwndMain);

15 years, 4 months

[janderwald] 42910: - Fix calling property handler in IKsFilter_DispatchDeviceIoControl - Found by [[Amine Khaldi]] - Implement handling of KSPROPERTY_TYPE_BASICSUPPORT

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Aug 24 14:21:20 2009 New Revision: 42910 URL: http://svn.reactos.org/svn/reactos?rev=42910&view=rev Log: - Fix calling property handler in IKsFilter_DispatchDeviceIoControl - Found by [[Amine Khaldi]] - Implement handling of KSPROPERTY_TYPE_BASICSUPPORT Modified: trunk/reactos/drivers/ksfilter/ks/filter.c trunk/reactos/drivers/ksfilter/ks/ksfunc.h trunk/reactos/drivers/ksfilter/ks/property.c Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Mon Aug 24 14:21:20 2009 @@ -706,10 +706,10 @@ IN PIRP Irp) { PIO_STACK_LOCATION IoStack; - PFNKSHANDLER PropertyHandler = NULL; IKsFilter * Filter; IKsFilterImpl * This; NTSTATUS Status; + PKSFILTER FilterInstance; /* obtain filter from object header */ Status = IKsFilter_GetFilterFromIrp(Irp, &Filter); @@ -735,19 +735,24 @@ return STATUS_NOT_IMPLEMENTED; } - /* find a supported property handler */ - Status = KsPropertyHandler(Irp, 2, FilterPropertySet); - if (NT_SUCCESS(Status)) - { - KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PVOID)This; - DPRINT("Calling property handler %p\n", PropertyHandler); - Status = PropertyHandler(Irp, IoStack->Parameters.DeviceIoControl.Type3InputBuffer, Irp->UserBuffer); - } - else - { - /* call driver's property handler */ - UNIMPLEMENTED - Status = STATUS_NOT_IMPLEMENTED; + /* call property handler supported by ks */ + Status = KspPropertyHandler(Irp, 2, FilterPropertySet, NULL, sizeof(KSPROPERTY_ITEM)); + + if (Status == STATUS_NOT_FOUND) + { + /* get filter instance */ + FilterInstance = Filter->lpVtbl->GetStruct(Filter); + + /* check if the driver supports property sets */ + if (FilterInstance->Descriptor->AutomationTable && FilterInstance->Descriptor->AutomationTable->PropertySetsCount) + { + /* call driver's filter property handler */ + Status = KspPropertyHandler(Irp, + FilterInstance->Descriptor->AutomationTable->PropertySetsCount, + FilterInstance->Descriptor->AutomationTable->PropertySets, + NULL, + FilterInstance->Descriptor->AutomationTable->PropertyItemSize); + } } Irp->IoStatus.Status = Status; Modified: trunk/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Mon Aug 24 14:21:20 2009 @@ -139,4 +139,13 @@ KspFreeCreateItems( IN PLIST_ENTRY ListHead); +NTSTATUS +KspPropertyHandler( + IN PIRP Irp, + IN ULONG PropertySetsCount, + IN const KSPROPERTY_SET* PropertySet, + IN PFNKSALLOCATOR Allocator OPTIONAL, + IN ULONG PropertyItemSize OPTIONAL); + + #endif Modified: trunk/reactos/drivers/ksfilter/ks/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/proper… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] Mon Aug 24 14:21:20 2009 @@ -17,9 +17,11 @@ IN PKSPROPERTY Property, IN ULONG InputBufferLength, IN ULONG OutputBufferLength, + OUT PVOID OutputBuffer, OUT PFNKSHANDLER *PropertyHandler) { ULONG Index, ItemIndex; + //PULONG Flags; for(Index = 0; Index < PropertySetCount; Index++) { @@ -42,6 +44,46 @@ IoStatus->Information = PropertySet[Index].PropertyItem[ItemIndex].MinData; return STATUS_BUFFER_TOO_SMALL; } +#if 0 + if (Property->Flags & KSPROPERTY_TYPE_BASICSUPPORT) + { + if (sizeof(ULONG) > OutputBufferLength) + { + /* too small buffer */ + return STATUS_INVALID_PARAMETER; + } + + /* get output buffer */ + Flags = (PULONG)OutputBuffer; + + /* clear flags */ + *Flags = KSPROPERTY_TYPE_BASICSUPPORT; + + if (PropertySet[Index].PropertyItem[ItemIndex].GetSupported) + *Flags |= KSPROPERTY_TYPE_GET; + + if (PropertySet[Index].PropertyItem[ItemIndex].SetSupported) + *Flags |= KSPROPERTY_TYPE_SET; + + IoStatus->Information = sizeof(ULONG); + + if (OutputBufferLength >= sizeof(KSPROPERTY_DESCRIPTION)) + { + /* get output buffer */ + Description = (PKSPROPERTY_DESCRIPTION)OutputBuffer; + + /* store result */ + Description->DescriptionSize = sizeof(KSPROPERTY_DESCRIPTION); + Description->PropTypeSet.Set = KSPROPTYPESETID_General; + Description->PropTypeSet.Id = 0; + Description->PropTypeSet.Flags = 0; + Description->MembersListCount = 0; + Description->Reserved = 0; + + IoStatus->Information = sizeof(KSPROPERTY_DESCRIPTION); + } + } +#endif if (Property->Flags & KSPROPERTY_TYPE_SET) *PropertyHandler = PropertySet[Index].PropertyItem[ItemIndex].SetPropertyHandler; @@ -69,7 +111,7 @@ PKSPROPERTY Property; PIO_STACK_LOCATION IoStack; NTSTATUS Status; - PFNKSHANDLER PropertyHandler; + PFNKSHANDLER PropertyHandler = NULL; /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -97,9 +139,9 @@ } /* find the property handler */ - Status = FindPropertyHandler(&Irp->IoStatus, PropertySet, PropertySetsCount, Property, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, &PropertyHandler); - - if (NT_SUCCESS(Status)) + Status = FindPropertyHandler(&Irp->IoStatus, PropertySet, PropertySetsCount, Property, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Irp->UserBuffer, &PropertyHandler); + + if (NT_SUCCESS(Status) && PropertyHandler) { /* call property handler */ Status = PropertyHandler(Irp, Property, Irp->UserBuffer);

15 years, 4 months

[cwittich] 42909: sync kernel32 profile with wine 1.1.28

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Aug 24 14:17:02 2009 New Revision: 42909 URL: http://svn.reactos.org/svn/reactos?rev=42909&view=rev Log: sync kernel32 profile with wine 1.1.28 Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] Mon Aug 24 14:17:02 2009 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <k32.h> @@ -383,13 +383,13 @@ case ENCODING_UTF16LE: DPRINT("UTF16 Little Endian encoding\n"); - szFile = pBuffer;// + 1; + szFile = pBuffer; szEnd = (WCHAR *)((char *)pBuffer + dwFileSize); break; case ENCODING_UTF16BE: DPRINT("UTF16 Big Endian encoding\n"); - szFile = pBuffer;// + 1; + szFile = pBuffer; szEnd = (WCHAR *)((char *)pBuffer + dwFileSize); PROFILE_ByteSwapShortBuffer(szFile, dwFileSize / sizeof(WCHAR)); break; @@ -1611,12 +1611,12 @@ * Win95: * - if the buffer is 0 or 1 character long then it is as if it was of * infinite length. - * - otherwise, if the buffer is to small only the section names that fit + * - otherwise, if the buffer is too small only the section names that fit * are returned. - * - note that this means if the buffer was to small to return even just + * - note that this means if the buffer was too small to return even just * the first section name then a single '\0' will be returned. * - the return value is the number of characters written in the buffer, - * except if the buffer was too smal in which case len-2 is returned + * except if the buffer was too small in which case len-2 is returned * * Win2000: * - if the buffer is 0, 1 or 2 characters long then it is filled with

15 years, 4 months

[gschneider] 42908: gdb2: Use const char* for string constants, gcc 4.4 warnings

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon Aug 24 14:06:53 2009 New Revision: 42908 URL: http://svn.reactos.org/svn/reactos?rev=42908&view=rev Log: gdb2: Use const char* for string constants, gcc 4.4 warnings Modified: trunk/rosapps/applications/devutils/gdb2/gdb2.cpp Modified: trunk/rosapps/applications/devutils/gdb2/gdb2.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/gdb2… ============================================================================== --- trunk/rosapps/applications/devutils/gdb2/gdb2.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/gdb2/gdb2.cpp [iso-8859-1] Mon Aug 24 14:06:53 2009 @@ -26,7 +26,7 @@ #define PARAMS_SEPARATOR " " #define PARAMS_SEPARATOR_LEN strlen(PARAMS_SEPARATOR); -void DisplayError(char *pszAPI); +void DisplayError(const char *pszAPI); void ReadAndHandleOutput(HANDLE hPipeRead); void PrepAndLaunchRedirectedChild(HANDLE hChildStdOut, HANDLE hChildStdIn, @@ -274,7 +274,7 @@ // DisplayError // Displays the error number and corresponding message. /////////////////////////////////////////////////////////////////////// -void DisplayError(char *pszAPI) +void DisplayError(const char *pszAPI) { LPVOID lpvMessageBuffer; CHAR szPrintBuffer[512];

15 years, 4 months

[gschneider] 42907: netreg: include stdio.h for fprintf, sprintf and sscanf; gcc 4.4 warnings

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon Aug 24 14:01:38 2009 New Revision: 42907 URL: http://svn.reactos.org/svn/reactos?rev=42907&view=rev Log: netreg: include stdio.h for fprintf, sprintf and sscanf; gcc 4.4 warnings Modified: trunk/rosapps/applications/net/netreg/netreg.cpp Modified: trunk/rosapps/applications/net/netreg/netreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/netreg/ne… ============================================================================== --- trunk/rosapps/applications/net/netreg/netreg.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/net/netreg/netreg.cpp [iso-8859-1] Mon Aug 24 14:01:38 2009 @@ -10,6 +10,7 @@ #include <windows.h> #include <winsock.h> #include <stdlib.h> +#include <stdio.h> #include <map> #include <string> #include <sstream>

15 years, 4 months

← Newer
1
...
4
5
6
7
8
9
10
...
66
Older →

Jump to page:

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