Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 16836: Add definition of PI_RESOURCE_ARBITER_ENTRY.
by navaraf＠svn.reactos.com 28 Jul '05

28 Jul '05

Add definition of PI_RESOURCE_ARBITER_ENTRY. Modified: trunk/reactos/include/ndk/iotypes.h _____ Modified: trunk/reactos/include/ndk/iotypes.h --- trunk/reactos/include/ndk/iotypes.h 2005-07-28 18:53:35 UTC (rev 16835) +++ trunk/reactos/include/ndk/iotypes.h 2005-07-28 19:23:11 UTC (rev 16836) @@ -213,6 +213,20 @@ ULONG Address; } DEVICE_NODE, *PDEVICE_NODE; +typedef struct _PI_RESOURCE_ARBITER_ENTRY +{ + LIST_ENTRY DeviceArbiterList; + UCHAR ResourceType; + PARBITER_INTERFACE ArbiterInterface; + ULONG Level; + LIST_ENTRY ResourceList; + LIST_ENTRY BestResourceList; + LIST_ENTRY BestConfig; + LIST_ENTRY ActiveArbiterList; + UCHAR State; + UCHAR ResourcesChanged; +} PI_RESOURCE_ARBITER_ENTRY, *PPI_RESOURCE_ARBITER_ENTRY; + typedef struct _DEVOBJ_EXTENSION { CSHORT Type;

1 0

[sedwards] 16835: some cleanups and I hope closer to making it work
by sedwards＠svn.reactos.com 28 Jul '05

28 Jul '05

some cleanups and I hope closer to making it work Modified: trunk/rosapps/sysutils/dosfsck/dosfsck.h Modified: trunk/rosapps/sysutils/dosfsck/msdos_fs.h _____ Modified: trunk/rosapps/sysutils/dosfsck/dosfsck.h --- trunk/rosapps/sysutils/dosfsck/dosfsck.h 2005-07-28 18:45:58 UTC (rev 16834) +++ trunk/rosapps/sysutils/dosfsck/dosfsck.h 2005-07-28 18:53:35 UTC (rev 16835) @@ -18,10 +18,15 @@ typedef unsigned int __u32; typedef unsigned __int64 __u64; typedef unsigned short __le16; -typedef unsigned long __le32; +typedef unsigned int __le32; typedef __int64 loff_t; typedef __int64 ll_t; +#define CF_LE_W(v) (v) +#define CF_LE_L(v) (v) +#define CT_LE_W(v) (v) +#define CT_LE_L(v) (v) + #endif #define _LINUX_STAT_H /* hack to avoid inclusion of <linux/stat.h> */ @@ -34,17 +39,21 @@ #include "msdos_fs.h" +#if 0 #undef CF_LE_W #undef CF_LE_L #undef CT_LE_W #undef CT_LE_L +#endif #if __BYTE_ORDER == __BIG_ENDIAN #include "byteswap.h" +#if 0 #define CF_LE_W(v) bswap_16(v) #define CF_LE_L(v) bswap_32(v) #define CT_LE_W(v) CF_LE_W(v) #define CT_LE_L(v) CF_LE_L(v) +#endif #else #define CF_LE_W(v) (v) #define CF_LE_L(v) (v) _____ Modified: trunk/rosapps/sysutils/dosfsck/msdos_fs.h --- trunk/rosapps/sysutils/dosfsck/msdos_fs.h 2005-07-28 18:45:58 UTC (rev 16834) +++ trunk/rosapps/sysutils/dosfsck/msdos_fs.h 2005-07-28 18:53:35 UTC (rev 16835) @@ -12,12 +12,13 @@ #define MSDOS_DPB_BITS 4 /* log2(MSDOS_DPB) */ #define MSDOS_DPS (SECTOR_SIZE / sizeof(struct msdos_dir_entry)) #define MSDOS_DPS_BITS 4 /* log2(MSDOS_DPS) */ +#if 0 #define CF_LE_W(v) le16_to_cpu(v) #define CF_LE_L(v) le32_to_cpu(v) #define CT_LE_W(v) cpu_to_le16(v) #define CT_LE_L(v) cpu_to_le32(v) +#endif - #define MSDOS_SUPER_MAGIC 0x4d44 /* MD */ #define MSDOS_ROOT_INO 1 /* == MINIX_ROOT_INO */ @@ -178,235 +179,4 @@ struct buffer_head *bh; }; -#ifdef __KERNEL__ - -#include <linux/buffer_head.h> -#include <linux/string.h> -#include <linux/nls.h> -#include <linux/fs.h> - -struct fat_mount_options { - uid_t fs_uid; - gid_t fs_gid; - unsigned short fs_fmask; - unsigned short fs_dmask; - unsigned short codepage; /* Codepage for shortname conversions */ - char *iocharset; /* Charset used for filename input/display */ - unsigned short shortname; /* flags for shortname display/create rule */ - unsigned char name_check; /* r = relaxed, n = normal, s = strict */ - unsigned quiet:1, /* set = fake successful chmods and chowns */ - showexec:1, /* set = only set x bit for com/exe/bat */ - sys_immutable:1, /* set = system files are immutable */ - dotsOK:1, /* set = hidden and system files are named '.filename' */ - isvfat:1, /* 0=no vfat long filename support, 1=vfat support */ - utf8:1, /* Use of UTF8 character set (Default) */ - unicode_xlate:1, /* create escape sequences for unhandled Unicode */ - numtail:1, /* Does first alias have a numeric '~1' type tail? */ - atari:1, /* Use Atari GEMDOS variation of MS-DOS fs */ - nocase:1; /* Does this need case conversion? 0=need case conversion*/ -}; - -#define FAT_HASH_BITS 8 -#define FAT_HASH_SIZE (1UL << FAT_HASH_BITS) -#define FAT_HASH_MASK (FAT_HASH_SIZE-1) - -/* - * MS-DOS file system in-core superblock data - */ -struct msdos_sb_info { - unsigned short sec_per_clus; /* sectors/cluster */ - unsigned short cluster_bits; /* log2(cluster_size) */ - unsigned int cluster_size; /* cluster size */ - unsigned char fats,fat_bits; /* number of FATs, FAT bits (12 or 16) */ - unsigned short fat_start; - unsigned long fat_length; /* FAT start & length (sec.) */ - unsigned long dir_start; - unsigned short dir_entries; /* root dir start & entries */ - unsigned long data_start; /* first data sector */ - unsigned long max_cluster; /* maximum cluster number */ - unsigned long root_cluster; /* first cluster of the root directory */ - unsigned long fsinfo_sector; /* sector number of FAT32 fsinfo */ - struct semaphore fat_lock; - unsigned int prev_free; /* previously allocated cluster number */ - unsigned int free_clusters; /* -1 if undefined */ - struct fat_mount_options options; - struct nls_table *nls_disk; /* Codepage used on disk */ - struct nls_table *nls_io; /* Charset used for input and display */ - void *dir_ops; /* Opaque; default directory operations */ - int dir_per_block; /* dir entries per block */ - int dir_per_block_bits; /* log2(dir_per_block) */ - - int fatent_shift; - struct fatent_operations *fatent_ops; - - spinlock_t inode_hash_lock; - struct hlist_head inode_hashtable[FAT_HASH_SIZE]; -}; - -#define FAT_CACHE_VALID 0 /* special case for valid cache */ - -/* - * MS-DOS file system inode data in memory - */ -struct msdos_inode_info { - spinlock_t cache_lru_lock; - struct list_head cache_lru; - int nr_caches; - /* for avoiding the race between fat_free() and fat_get_cluster() */ - unsigned int cache_valid_id; - - loff_t mmu_private; - int i_start; /* first cluster or 0 */ - int i_logstart; /* logical first cluster */ - int i_attrs; /* unused attribute bits */ - loff_t i_pos; /* on-disk position of directory entry or 0 */ - struct hlist_node i_fat_hash; /* hash by i_location */ - struct inode vfs_inode; -}; - -static inline struct msdos_sb_info *MSDOS_SB(struct super_block *sb) -{ - return sb->s_fs_info; -} - -static inline struct msdos_inode_info *MSDOS_I(struct inode *inode) -{ - return container_of(inode, struct msdos_inode_info, vfs_inode); -} - -/* Return the FAT attribute byte for this inode */ -static inline u8 fat_attr(struct inode *inode) -{ - return ((inode->i_mode & S_IWUGO) ? ATTR_NONE : ATTR_RO) | - (S_ISDIR(inode->i_mode) ? ATTR_DIR : ATTR_NONE) | - MSDOS_I(inode)->i_attrs; -} - -static inline sector_t fat_clus_to_blknr(struct msdos_sb_info *sbi, int clus) -{ - return ((sector_t)clus - FAT_START_ENT) * sbi->sec_per_clus - + sbi->data_start; -} - -static inline void fat16_towchar(wchar_t *dst, const __u8 *src, size_t len) -{ -#ifdef __BIG_ENDIAN - while (len--) { - *dst++ = src[0] | (src[1] << 8); - src += 2; - } -#else - memcpy(dst, src, len * 2); #endif -} - -static inline void fatwchar_to16(__u8 *dst, const wchar_t *src, size_t len) -{ -#ifdef __BIG_ENDIAN - while (len--) { - dst[0] = *src & 0x00FF; - dst[1] = (*src & 0xFF00) >> 8; - dst += 2; - src++; - } -#else - memcpy(dst, src, len * 2); -#endif -} - -/* fat/cache.c */ -extern void fat_cache_inval_inode(struct inode *inode); -extern int fat_get_cluster(struct inode *inode, int cluster, - int *fclus, int *dclus); -extern int fat_bmap(struct inode *inode, sector_t sector, sector_t *phys); - -/* fat/dir.c */ -extern struct file_operations fat_dir_operations; -extern int fat_search_long(struct inode *inode, const unsigned char *name, - int name_len, struct fat_slot_info *sinfo); -extern int fat_dir_empty(struct inode *dir); -extern int fat_subdirs(struct inode *dir); -extern int fat_scan(struct inode *dir, const unsigned char *name, - struct fat_slot_info *sinfo); -extern int fat_get_dotdot_entry(struct inode *dir, struct buffer_head **bh, - struct msdos_dir_entry **de, loff_t *i_pos); -extern int fat_alloc_new_dir(struct inode *dir, struct timespec *ts); -extern int fat_add_entries(struct inode *dir, void *slots, int nr_slots, - struct fat_slot_info *sinfo); -extern int fat_remove_entries(struct inode *dir, struct fat_slot_info *sinfo); - -/* fat/fatent.c */ -struct fat_entry { - int entry; - union { - u8 *ent12_p[2]; - __le16 *ent16_p; - __le32 *ent32_p; - } u; - int nr_bhs; - struct buffer_head *bhs[2]; -}; - -static inline void fatent_init(struct fat_entry *fatent) -{ - fatent->nr_bhs = 0; - fatent->entry = 0; - fatent->u.ent32_p = NULL; - fatent->bhs[0] = fatent->bhs[1] = NULL; -} - -static inline void fatent_set_entry(struct fat_entry *fatent, int entry) -{ - fatent->entry = entry; - fatent->u.ent32_p = NULL; -} - -static inline void fatent_brelse(struct fat_entry *fatent) -{ - int i; - fatent->u.ent32_p = NULL; - for (i = 0; i < fatent->nr_bhs; i++) - brelse(fatent->bhs[i]); - fatent->nr_bhs = 0; - fatent->bhs[0] = fatent->bhs[1] = NULL; -} - -extern void fat_ent_access_init(struct super_block *sb); -extern int fat_ent_read(struct inode *inode, struct fat_entry *fatent, - int entry); -extern int fat_ent_write(struct inode *inode, struct fat_entry *fatent, - int new, int wait); -extern int fat_alloc_clusters(struct inode *inode, int *cluster, - int nr_cluster); -extern int fat_free_clusters(struct inode *inode, int cluster); -extern int fat_count_free_clusters(struct super_block *sb); - -/* fat/file.c */ -extern int fat_generic_ioctl(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); -extern struct file_operations fat_file_operations; -extern struct inode_operations fat_file_inode_operations; -extern int fat_notify_change(struct dentry * dentry, struct iattr * attr); -extern void fat_truncate(struct inode *inode); - -/* fat/inode.c */ -extern void fat_attach(struct inode *inode, loff_t i_pos); -extern void fat_detach(struct inode *inode); -extern struct inode *fat_iget(struct super_block *sb, loff_t i_pos); -extern struct inode *fat_build_inode(struct super_block *sb, - struct msdos_dir_entry *de, loff_t i_pos); -extern int fat_sync_inode(struct inode *inode); -extern int fat_fill_super(struct super_block *sb, void *data, int silent, - struct inode_operations *fs_dir_inode_ops, int isvfat); - -/* fat/misc.c */ -extern void fat_fs_panic(struct super_block *s, const char *fmt, ...); -extern void fat_clusters_flush(struct super_block *sb); -extern int fat_chain_add(struct inode *inode, int new_dclus, int nr_cluster); -extern int date_dos2unix(unsigned short time, unsigned short date); -extern void fat_date_unix2dos(int unix_date, __le16 *time, __le16 *date); -extern int fat_sync_bhs(struct buffer_head **bhs, int nr_bhs); - -#endif /* __KERNEL__ */ - -#endif

1 0

[greatlrd] 16834: implement GDIEntry1 of 16, the code is bit untested, we can not test it until all are in place and win32k/ntdraw got some stub remove. when all GdiEntry1-16 we are compatble with ms directdraw1-7 interface in gdi32.dll
by greatlrd＠svn.reactos.com 28 Jul '05

28 Jul '05

implement GDIEntry1 of 16, the code is bit untested, we can not test it until all are in place and win32k/ntdraw got some stub remove. when all GdiEntry1-16 we are compatble with ms directdraw1-7 interface in gdi32.dll Modified: trunk/reactos/lib/gdi32/gdi32.xml Added: trunk/reactos/lib/gdi32/include/ddentry.h Modified: trunk/reactos/lib/gdi32/include/precomp.h Added: trunk/reactos/lib/gdi32/misc/gdientry.c Modified: trunk/reactos/lib/gdi32/misc/stubs.c _____ Modified: trunk/reactos/lib/gdi32/gdi32.xml --- trunk/reactos/lib/gdi32/gdi32.xml 2005-07-28 18:34:01 UTC (rev 16833) +++ trunk/reactos/lib/gdi32/gdi32.xml 2005-07-28 18:45:58 UTC (rev 16834) @@ -17,6 +17,7 @@ </directory> <directory name="misc"> <file>heap.c</file> + <file>gdientry.c</file> <file>misc.c</file> <file>stubs.c</file> <file>stubsa.c</file> _____ Added: trunk/reactos/lib/gdi32/include/ddentry.h --- trunk/reactos/lib/gdi32/include/ddentry.h 2005-07-28 18:34:01 UTC (rev 16833) +++ trunk/reactos/lib/gdi32/include/ddentry.h 2005-07-28 18:45:58 UTC (rev 16834) @@ -0,0 +1,324 @@ + +#ifndef __D3D8THK_H +#define __D3D8THK_H + +#include <ddk\ddrawint.h> + +#ifdef __cplusplus +extern "C" { +#endif + +BOOL STDCALL NtGdiD3dContextCreate( + HANDLE hDirectDrawLocal, + HANDLE hSurfColor, + HANDLE hSurfZ, + PD3DNTHAL_CONTEXTCREATEDATA pdcci +); + +DWORD STDCALL NtGdiD3dContextDestroy( + PD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData +); + +DWORD STDCALL NtGdiD3dContextDestroyAll(VOID); + +DWORD STDCALL NtGdiD3dDrawPrimitives2( + HANDLE hCmdBuf, + HANDLE hVBuf, + PD3DNTHAL_DRAWPRIMITIVES2DATA pded, + FLATPTR *pfpVidMemCmd, + DWORD *pdwSizeCmd, + FLATPTR *pfpVidMemVtx, + DWORD *pdwSizeVtx +); + +DWORD STDCALL NtGdiD3dValidateTextureStageState( + PD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData +); + +DWORD STDCALL NtGdiDdAddAttachedSurface( + HANDLE hSurface, + HANDLE hSurfaceAttached, + PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData +); + +DWORD STDCALL NtGdiDdAlphaBlt(VOID); + +BOOL STDCALL NtGdiDdAttachSurface( + HANDLE hSurfaceFrom, + HANDLE hSurfaceTo +); + +DWORD STDCALL NtGdiDdBeginMoCompFrame( + HANDLE hMoComp, + PDD_BEGINMOCOMPFRAMEDATA puBeginFrameData +); + +DWORD STDCALL NtGdiDdBlt( + HANDLE hSurfaceDest, + HANDLE hSurfaceSrc, + PDD_BLTDATA puBltData +); + +DWORD STDCALL NtGdiDdCanCreateD3DBuffer( + HANDLE hDirectDraw, + PDD_CANCREATESURFACEDATA puCanCreateSurfaceData +); + +DWORD STDCALL NtGdiDdCanCreateSurface( + HANDLE hDirectDraw, + PDD_CANCREATESURFACEDATA puCanCreateSurfaceData +); + +DWORD STDCALL NtGdiDdColorControl( + HANDLE hSurface, + PDD_COLORCONTROLDATA puColorControlData +); + +DWORD STDCALL NtGdiDdCreateD3DBuffer( + HANDLE hDirectDraw, + HANDLE *hSurface, + DDSURFACEDESC *puSurfaceDescription, + DD_SURFACE_GLOBAL *puSurfaceGlobalData, + DD_SURFACE_LOCAL *puSurfaceLocalData, + DD_SURFACE_MORE *puSurfaceMoreData, + PDD_CREATESURFACEDATA puCreateSurfaceData, + HANDLE *puhSurface +); + +HANDLE STDCALL NtGdiDdCreateDirectDrawObject( + HDC hdc +); + +HANDLE STDCALL NtGdiDdCreateMoComp( + HANDLE hDirectDraw, + PDD_CREATEMOCOMPDATA puCreateMoCompData +); + +DWORD STDCALL NtGdiDdCreateSurface( + HANDLE hDirectDraw, + HANDLE *hSurface, + DDSURFACEDESC *puSurfaceDescription, + DD_SURFACE_GLOBAL *puSurfaceGlobalData, + DD_SURFACE_LOCAL *puSurfaceLocalData, + DD_SURFACE_MORE *puSurfaceMoreData, + PDD_CREATESURFACEDATA puCreateSurfaceData, + HANDLE *puhSurface +); + +DWORD STDCALL NtGdiDdCreateSurfaceEx( + HANDLE hDirectDraw, + HANDLE hSurface, + DWORD dwSurfaceHandle +); + +HANDLE STDCALL NtGdiDdCreateSurfaceObject( + HANDLE hDirectDrawLocal, + HANDLE hSurface, + PDD_SURFACE_LOCAL puSurfaceLocal, + PDD_SURFACE_MORE puSurfaceMore, + PDD_SURFACE_GLOBAL puSurfaceGlobal, + BOOL bComplete +); + +BOOL STDCALL NtGdiDdDeleteDirectDrawObject( + HANDLE hDirectDrawLocal +); + +BOOL STDCALL NtGdiDdDeleteSurfaceObject( + HANDLE hSurface +); + +DWORD STDCALL NtGdiDdDestroyD3DBuffer( + HANDLE hSurface +); + +DWORD STDCALL NtGdiDdDestroyMoComp( + HANDLE hMoComp, + PDD_DESTROYMOCOMPDATA puBeginFrameData +); + +DWORD STDCALL NtGdiDdDestroySurface( + HANDLE hSurface, + BOOL bRealDestroy +); + +DWORD STDCALL NtGdiDdEndMoCompFrame( + HANDLE hMoComp, + PDD_ENDMOCOMPFRAMEDATA puEndFrameData +); + +DWORD STDCALL NtGdiDdFlip( + HANDLE hSurfaceCurrent, + HANDLE hSurfaceTarget, + HANDLE hSurfaceCurrentLeft, + HANDLE hSurfaceTargetLeft, + PDD_FLIPDATA puFlipData +); + +DWORD STDCALL NtGdiDdFlipToGDISurface( + HANDLE hDirectDraw, + PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData +); + +DWORD STDCALL NtGdiDdGetAvailDriverMemory( + HANDLE hDirectDraw, + PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData +); + +DWORD STDCALL NtGdiDdGetBltStatus( + HANDLE hSurface, + PDD_GETBLTSTATUSDATA puGetBltStatusData +); + +HDC STDCALL NtGdiDdGetDC( + HANDLE hSurface, + PALETTEENTRY *puColorTable +); + +DWORD STDCALL NtGdiDdGetDriverInfo( + HANDLE hDirectDraw, + PDD_GETDRIVERINFODATA puGetDriverInfoData +); + +DWORD STDCALL NtGdiDdGetDriverState( + PDD_GETDRIVERSTATEDATA pdata +); + +DWORD STDCALL NtGdiDdGetDxHandle( + HANDLE hDirectDraw, + HANDLE hSurface, + BOOL bRelease +); + +DWORD STDCALL NtGdiDdGetFlipStatus( + HANDLE hSurface, + PDD_GETFLIPSTATUSDATA puGetFlipStatusData +); + +DWORD STDCALL NtGdiDdGetInternalMoCompInfo( + HANDLE hDirectDraw, + PDD_GETINTERNALMOCOMPDATA puGetInternalData +); + +DWORD STDCALL NtGdiDdGetMoCompBuffInfo( + HANDLE hDirectDraw, + PDD_GETMOCOMPCOMPBUFFDATA puGetBuffData +); + +DWORD STDCALL NtGdiDdGetMoCompFormats( + HANDLE hDirectDraw, + PDD_GETMOCOMPFORMATSDATA puGetMoCompFormatsData +); + +DWORD STDCALL NtGdiDdGetMoCompGuids( + HANDLE hDirectDraw, + PDD_GETMOCOMPGUIDSDATA puGetMoCompGuidsData +); + +DWORD STDCALL NtGdiDdGetScanLine( + HANDLE hDirectDraw, + PDD_GETSCANLINEDATA puGetScanLineData +); + +DWORD STDCALL NtGdiDdLock( + HANDLE hSurface, + PDD_LOCKDATA puLockData, + HDC hdcClip +); + +DWORD STDCALL NtGdiDdLockD3D( + HANDLE hSurface, + PDD_LOCKDATA puLockData +); + +BOOL STDCALL NtGdiDdQueryDirectDrawObject( + HANDLE hDirectDrawLocal, + DD_HALINFO *pHalInfo, + DWORD *pCallBackFlags, + PD3DNTHAL_CALLBACKS puD3dCallbacks, + PD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, + PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, + LPDDSURFACEDESC puD3dTextureFormats, + DWORD *puNumHeaps, + VIDEOMEMORY *puvmList, + DWORD *puNumFourCC, + DWORD *puFourCC +); + +DWORD STDCALL NtGdiDdQueryMoCompStatus( + HANDLE hMoComp, + PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData +); + +BOOL STDCALL NtGdiDdReenableDirectDrawObject( + HANDLE hDirectDrawLocal, + BOOL *pubNewMode +); + +BOOL STDCALL NtGdiDdReleaseDC( + HANDLE hSurface +); + +DWORD STDCALL NtGdiDdRenderMoComp( + HANDLE hMoComp, + PDD_RENDERMOCOMPDATA puRenderMoCompData +); + +BOOL STDCALL NtGdiDdResetVisrgn( + HANDLE hSurface, + HWND hwnd +); + +DWORD STDCALL NtGdiDdSetColorKey( + HANDLE hSurface, + PDD_SETCOLORKEYDATA puSetColorKeyData +); + +DWORD STDCALL NtGdiDdSetExclusiveMode( + HANDLE hDirectDraw, + PDD_SETEXCLUSIVEMODEDATA puSetExclusiveModeData +); + +BOOL STDCALL NtGdiDdSetGammaRamp( + HANDLE hDirectDraw, + HDC hdc, + LPVOID lpGammaRamp +); + +DWORD STDCALL NtGdiDdSetOverlayPosition( + HANDLE hSurfaceSource, + HANDLE hSurfaceDestination, + PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData +); + +VOID STDCALL NtGdiDdUnattachSurface( + HANDLE hSurface, + HANDLE hSurfaceAttached +); + +DWORD STDCALL NtGdiDdUnlock( + HANDLE hSurface, + PDD_UNLOCKDATA puUnlockData +); + +DWORD STDCALL NtGdiDdUnlockD3D( + HANDLE hSurface, + PDD_UNLOCKDATA puUnlockData +); + +DWORD STDCALL NtGdiDdUpdateOverlay( + HANDLE hSurfaceDestination, + HANDLE hSurfaceSource, + PDD_UPDATEOVERLAYDATA puUpdateOverlayData +); + +DWORD STDCALL NtGdiDdWaitForVerticalBlank( + HANDLE hDirectDraw, + PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData +); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif // __D3D8THK_H _____ Modified: trunk/reactos/lib/gdi32/include/precomp.h --- trunk/reactos/lib/gdi32/include/precomp.h 2005-07-28 18:34:01 UTC (rev 16833) +++ trunk/reactos/lib/gdi32/include/precomp.h 2005-07-28 18:45:58 UTC (rev 16834) @@ -18,10 +18,15 @@ #include <prntfont.h> #include <ddrawgdi.h> #include <ndk/ntndk.h> +#include <tchar.h> /* Win32K External Headers */ #include <win32k/kapi.h> +/* directdraw syscall */ +#include <ddentry.h> + + #define NtUserGetDCBrushColor(hbr) \ (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_BRUSH, TWOPARAM_ROUTINE_GETDCCOLOR) _____ Added: trunk/reactos/lib/gdi32/misc/gdientry.c --- trunk/reactos/lib/gdi32/misc/gdientry.c 2005-07-28 18:34:01 UTC (rev 16833) +++ trunk/reactos/lib/gdi32/misc/gdientry.c 2005-07-28 18:45:58 UTC (rev 16834) @@ -0,0 +1,89 @@ +/* + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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 + */ +/* + * $Id: + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS GDI32 + * PURPOSE: Gdi DirectX inteface + * FILE: lib/gdi32/misc/gdientry.c + * PROGRAMER: Magnus Olsen (magnus(a)greatlord.com) + * REVISION HISTORY: + * NOTES: + */ + + +#include "precomp.h" +static LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobalInternal; + + +/* + * @implemented + * + * GDIEntry 1 + */ +BOOL STDCALL DdCreateDirectDrawObject( +LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, +HDC hdc) +{ + HDC newHdc; + /* check see if HDC is NULL or not + if it null we need create the DC */ + + if (hdc != NULL) + { + pDirectDrawGlobal->hDD = (ULONG_PTR)NtGdiDdCreateDirectDrawObject(hdc); + + /* if hDD ==NULL */ + if (!pDirectDrawGlobal->hDD) + { + return FALSE; + } + return TRUE; + } + + /* The hdc was not null we need check see if we alread + have create a directdraw handler */ + + /* if hDD !=NULL */ + if (pDirectDrawGlobalInternal->hDD) + { + /* we have create a directdraw handler already */ + + pDirectDrawGlobal->hDD = pDirectDrawGlobalInternal->hDD; + return TRUE; + } + + /* Now we create the DC */ + newHdc = CreateDC(L"DISPLAY\0", NULL, NULL, NULL); + + /* we are checking if we got a hdc or not */ + if ((ULONG_PTR)newHdc != pDirectDrawGlobalInternal->hDD) + { + pDirectDrawGlobalInternal->hDD = (ULONG_PTR) NtGdiDdCreateDirectDrawObject(newHdc); + NtGdiDeleteDC(newHdc); + } + + pDirectDrawGlobal->hDD = pDirectDrawGlobalInternal->hDD; + + /* test see if we got a handler */ + if (!pDirectDrawGlobalInternal->hDD) + { + return FALSE; + } + + return TRUE; +} _____ Modified: trunk/reactos/lib/gdi32/misc/stubs.c --- trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-28 18:34:01 UTC (rev 16833) +++ trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-28 18:45:58 UTC (rev 16834) @@ -3862,18 +3862,6 @@ return 0; } -/* - * @unimplemented - */ -BOOL STDCALL DdCreateDirectDrawObject( -LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, -HDC hdc -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} /* * @unimplemented

1 0

[sedwards] 16833: fixed opening of the device
by sedwards＠svn.reactos.com 28 Jul '05

28 Jul '05

fixed opening of the device Modified: trunk/rosapps/sysutils/dosfsck/common.h Modified: trunk/rosapps/sysutils/dosfsck/io.c _____ Modified: trunk/rosapps/sysutils/dosfsck/common.h --- trunk/rosapps/sysutils/dosfsck/common.h 2005-07-28 16:52:15 UTC (rev 16832) +++ trunk/rosapps/sysutils/dosfsck/common.h 2005-07-28 18:34:01 UTC (rev 16833) @@ -1,18 +1,7 @@ /* common.h - Common functions */ -/* Written 1993 by Werner Almesberger */ -#if 0 -#include <linux/version.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) -# define __KERNEL__ -# include <asm/types.h> -# undef __KERNEL__ # define MSDOS_FAT12 4084 /* maximum number of clusters in a 12 bit FAT */ -#endif -#endif -# define MSDOS_FAT12 4084 /* maximum number of clusters in a 12 bit FAT */ - #include "version.h" #ifndef _COMMON_H _____ Modified: trunk/rosapps/sysutils/dosfsck/io.c --- trunk/rosapps/sysutils/dosfsck/io.c 2005-07-28 16:52:15 UTC (rev 16832) +++ trunk/rosapps/sysutils/dosfsck/io.c 2005-07-28 18:34:01 UTC (rev 16833) @@ -53,21 +53,43 @@ unsigned device_no; +static int WIN32open(const char *path, int oflag, ...); +#define open WIN32open +static int WIN32close(int fd); +#define close WIN32close +static int WIN32read(int fd, void *buf, unsigned int len); +#define read WIN32read +static int WIN32write(int fd, void *buf, unsigned int len); +#define write WIN32write +static loff_t WIN32llseek(int fd, loff_t offset, int whence); +#define llseek WIN32llseek + +static int is_device = 0; + void fs_open(char *path,int rw) { -//#ifdef _WIN32 -// static char dev_buf[] = "\\\\.\\X:"; -//#else +#ifdef _WIN32 + static char dev_buf[] = "\\\\.\\X:"; +#else struct stat stbuf; -//#endif +#endif + + if (path[1] == ':' && path[2] == '\0') { + dev_buf[4] = path[0]; + path = dev_buf; +// is_device = 1; + } + if ((fd = open(path,rw ? O_RDWR : O_RDONLY)) < 0) pdie("open %s",path); changes = last = NULL; did_change = 0; +#if 0 if (fstat(fd,&stbuf) < 0) pdie("fstat %s",path); device_no = S_ISBLK(stbuf.st_mode) ? (stbuf.st_rdev >> 8) & 0xff : 0; +#endif } @@ -176,12 +198,6 @@ /* tab-width: 8 */ /* End: */ - -#define open WIN32open -#define close WIN32close -#define read WIN32read -#define write WIN32write -#define llseek WIN32llseek #define O_SHORT_LIVED _O_SHORT_LIVED #define O_ACCMODE 3

1 0

[greatlrd] 16832: add copyright note
by greatlrd＠svn.reactos.com 28 Jul '05

28 Jul '05

add copyright note Modified: trunk/reactos/lib/gdi32/misc/heap.c _____ Modified: trunk/reactos/lib/gdi32/misc/heap.c --- trunk/reactos/lib/gdi32/misc/heap.c 2005-07-28 16:44:25 UTC (rev 16831) +++ trunk/reactos/lib/gdi32/misc/heap.c 2005-07-28 16:52:15 UTC (rev 16832) @@ -1,3 +1,30 @@ +/* + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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 + */ +/* + * $Id: + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS GDI32 + * PURPOSE: + * FILE: lib/gdi32/misc/heap.c + * PROGRAMER: + * REVISION HISTORY: + * NOTES: + */ + #include "precomp.h" #include <debug.h>

1 0

[greatlrd] 16831: Do not do syscall. redirect the call to DdEntry1-56 in gdi32.dll it make our d3d8thk windows xp compatible.
by greatlrd＠svn.reactos.com 28 Jul '05

28 Jul '05

Do not do syscall. redirect the call to DdEntry1-56 in gdi32.dll it make our d3d8thk windows xp compatible. Modified: trunk/reactos/lib/d3d8thk/d3d8thk.def Modified: trunk/reactos/lib/d3d8thk/d3d8thk.xml Deleted: trunk/reactos/lib/d3d8thk/win32k.S _____ Modified: trunk/reactos/lib/d3d8thk/d3d8thk.def --- trunk/reactos/lib/d3d8thk/d3d8thk.def 2005-07-28 16:42:06 UTC (rev 16830) +++ trunk/reactos/lib/d3d8thk/d3d8thk.def 2005-07-28 16:44:25 UTC (rev 16831) @@ -1,58 +1,58 @@ LIBRARY d3d8thk EXPORTS - OsThunkD3dContextCreate@16 = NtGdiD3dContextCreate@16 - OsThunkD3dContextDestroy@4 = NtGdiD3dContextDestroy@4 - OsThunkD3dContextDestroyAll@0 = NtGdiD3dContextDestroyAll@0 - OsThunkD3dDrawPrimitives2@28 = NtGdiD3dDrawPrimitives2@28 - OsThunkD3dValidateTextureStageState@4 = NtGdiD3dValidateTextureStageState@4 - OsThunkDdAddAttachedSurface@12 = NtGdiDdAddAttachedSurface@12 - OsThunkDdAlphaBlt@12 = NtGdiDdAlphaBlt@12 - OsThunkDdAttachSurface@8 = NtGdiDdAttachSurface@8 - OsThunkDdBeginMoCompFrame@8 = NtGdiDdBeginMoCompFrame@8 - OsThunkDdBlt@12 = NtGdiDdBlt@12 - OsThunkDdCanCreateD3DBuffer@8 = NtGdiDdCanCreateD3DBuffer@8 - OsThunkDdCanCreateSurface@8 = NtGdiDdCanCreateSurface@8 - OsThunkDdColorControl@8 = NtGdiDdColorControl@8 - OsThunkDdCreateD3DBuffer@32 = NtGdiDdCreateD3DBuffer@32 - OsThunkDdCreateDirectDrawObject@4 = NtGdiDdCreateDirectDrawObject@4 - OsThunkDdCreateMoComp@8 = NtGdiDdCreateMoComp@8 - OsThunkDdCreateSurface@32 = NtGdiDdCreateSurface@32 - OsThunkDdCreateSurfaceEx@12 = NtGdiDdCreateSurfaceEx@12 - OsThunkDdCreateSurfaceObject@24 = NtGdiDdCreateSurfaceObject@24 - OsThunkDdDeleteDirectDrawObject@4 = NtGdiDdDeleteDirectDrawObject@4 - OsThunkDdDeleteSurfaceObject@4 = NtGdiDdDeleteSurfaceObject@4 - OsThunkDdDestroyD3DBuffer@4 = NtGdiDdDestroyD3DBuffer@4 - OsThunkDdDestroyMoComp@8 = NtGdiDdDestroyMoComp@8 - OsThunkDdDestroySurface@8 = NtGdiDdDestroySurface@8 - OsThunkDdEndMoCompFrame@8 = NtGdiDdEndMoCompFrame@8 - OsThunkDdFlip@20 = NtGdiDdFlip@20 - OsThunkDdFlipToGDISurface@8 = NtGdiDdFlipToGDISurface@8 - OsThunkDdGetAvailDriverMemory@8 = NtGdiDdGetAvailDriverMemory@8 - OsThunkDdGetBltStatus@8 = NtGdiDdGetBltStatus@8 - OsThunkDdGetDC@8 = NtGdiDdGetDC@8 - OsThunkDdGetDriverInfo@8 = NtGdiDdGetDriverInfo@8 - OsThunkDdGetDriverState@4 = NtGdiDdGetDriverState@4 - OsThunkDdGetDxHandle@12 = NtGdiDdGetDxHandle@12 - OsThunkDdGetFlipStatus@8 = NtGdiDdGetFlipStatus@8 - OsThunkDdGetInternalMoCompInfo@8 = NtGdiDdGetInternalMoCompInfo@8 - OsThunkDdGetMoCompBuffInfo@8 = NtGdiDdGetMoCompBuffInfo@8 - OsThunkDdGetMoCompFormats@8 = NtGdiDdGetMoCompFormats@8 - OsThunkDdGetMoCompGuids@8 = NtGdiDdGetMoCompGuids@8 - OsThunkDdGetScanLine@8 = NtGdiDdGetScanLine@8 - OsThunkDdLock@12 = NtGdiDdLock@12 - OsThunkDdLockD3D@8 = NtGdiDdLockD3D@8 - OsThunkDdQueryDirectDrawObject@44 = NtGdiDdQueryDirectDrawObject@44 - OsThunkDdQueryMoCompStatus@8 = NtGdiDdQueryMoCompStatus@8 - OsThunkDdReenableDirectDrawObject@8 = NtGdiDdReenableDirectDrawObject@8 - OsThunkDdReleaseDC@4 = NtGdiDdReleaseDC@4 - OsThunkDdRenderMoComp@8 = NtGdiDdRenderMoComp@8 - OsThunkDdResetVisrgn@8 = NtGdiDdResetVisrgn@8 - OsThunkDdSetColorKey@8 = NtGdiDdSetColorKey@8 - OsThunkDdSetExclusiveMode@8 = NtGdiDdSetExclusiveMode@8 - OsThunkDdSetGammaRamp@12 = NtGdiDdSetGammaRamp@12 - OsThunkDdSetOverlayPosition@12 = NtGdiDdSetOverlayPosition@12 - OsThunkDdUnattachSurface@8 = NtGdiDdUnattachSurface@8 - OsThunkDdUnlock@8 = NtGdiDdUnlock@8 - OsThunkDdUnlockD3D@8 = NtGdiDdUnlockD3D@8 - OsThunkDdUpdateOverlay@12 = NtGdiDdUpdateOverlay@12 - OsThunkDdWaitForVerticalBlank@8 = NtGdiDdWaitForVerticalBlank@8 + OsThunkD3dContextCreate@16 = DdEntry1@16 + OsThunkD3dContextDestroy@4 = DdEntry2@4 + OsThunkD3dContextDestroyAll@0 = DdEntry3@0 + OsThunkD3dDrawPrimitives2@28 = DdEntry5@28 + OsThunkD3dValidateTextureStageState@4 = DdEntry4@4 + OsThunkDdAddAttachedSurface@12 = DdEntry7@12 + OsThunkDdAlphaBlt@12 = DdEntry8@12 + OsThunkDdAttachSurface@8 = DdEntry9@8 + OsThunkDdBeginMoCompFrame@8 = DdEntry10@8 + OsThunkDdBlt@12 = DdEntry11@12 + OsThunkDdCanCreateD3DBuffer@8 = DdEntry13@8 + OsThunkDdCanCreateSurface@8 = DdEntry12@8 + OsThunkDdColorControl@8 = DdEntry14@8 + OsThunkDdCreateD3DBuffer@32 = DdEntry17@32 + OsThunkDdCreateDirectDrawObject@4 = DdEntry15@4 + OsThunkDdCreateMoComp@8 = DdEntry18@8 + OsThunkDdCreateSurface@32 = DdEntry16@32 + OsThunkDdCreateSurfaceEx@12 = DdEntry50@12 + OsThunkDdCreateSurfaceObject@24 = DdEntry19@24 + OsThunkDdDeleteDirectDrawObject@4 = DdEntry20@4 + OsThunkDdDeleteSurfaceObject@4 = DdEntry21@4 + OsThunkDdDestroyD3DBuffer@4 = DdEntry24@4 + OsThunkDdDestroyMoComp@8 = DdEntry22@8 + OsThunkDdDestroySurface@8 = DdEntry23@8 + OsThunkDdEndMoCompFrame@8 = DdEntry25@8 + OsThunkDdFlip@20 = DdEntry26@20 + OsThunkDdFlipToGDISurface@8 = DdEntry27@8 + OsThunkDdGetAvailDriverMemory@8 = DdEntry28@8 + OsThunkDdGetBltStatus@8 = DdEntry29@8 + OsThunkDdGetDC@8 = DdEntry30@8 + OsThunkDdGetDriverInfo@8 = DdEntry31@8 + OsThunkDdGetDriverState@4 = DdEntry6@4 + OsThunkDdGetDxHandle@12 = DdEntry32@12 + OsThunkDdGetFlipStatus@8 = DdEntry33@8 + OsThunkDdGetInternalMoCompInfo@8 = DdEntry34@8 + OsThunkDdGetMoCompBuffInfo@8 = DdEntry35@8 + OsThunkDdGetMoCompFormats@8 = DdEntry37@8 + OsThunkDdGetMoCompGuids@8 = DdEntry36@8 + OsThunkDdGetScanLine@8 = DdEntry38@8 + OsThunkDdLock@12 = DdEntry39@12 + OsThunkDdLockD3D@8 = DdEntry40@8 + OsThunkDdQueryDirectDrawObject@44 = DdEntry41@44 + OsThunkDdQueryMoCompStatus@8 = DdEntry42@8 + OsThunkDdReenableDirectDrawObject@8 = DdEntry43@8 + OsThunkDdReleaseDC@4 = DdEntry44@4 + OsThunkDdRenderMoComp@8 = DdEntry45@8 + OsThunkDdResetVisrgn@8 = DdEntry46@8 + OsThunkDdSetColorKey@8 = DdEntry47@8 + OsThunkDdSetExclusiveMode@8 = DdEntry48@8 + OsThunkDdSetGammaRamp@12 = DdEntry49@12 + OsThunkDdSetOverlayPosition@12 = DdEntry51@12 + OsThunkDdUnattachSurface@8 = DdEntry52@8 + OsThunkDdUnlock@8 = DdEntry53@8 + OsThunkDdUnlockD3D@8 = DdEntry54@8 + OsThunkDdUpdateOverlay@12 = DdEntry55@12 + OsThunkDdWaitForVerticalBlank@8 = DdEntry56@8 _____ Modified: trunk/reactos/lib/d3d8thk/d3d8thk.xml --- trunk/reactos/lib/d3d8thk/d3d8thk.xml 2005-07-28 16:42:06 UTC (rev 16830) +++ trunk/reactos/lib/d3d8thk/d3d8thk.xml 2005-07-28 16:44:25 UTC (rev 16831) @@ -1,5 +1,5 @@ <module name="d3d8thk" type="win32dll" installbase="system32" installname="d3d8thk.dll"> <importlibrary definition="d3d8thk.def" /> + <library>gdi32</library> <file>d3d8thk.rc</file> - <file>win32k.S</file> </module> _____ Deleted: trunk/reactos/lib/d3d8thk/win32k.S --- trunk/reactos/lib/d3d8thk/win32k.S 2005-07-28 16:42:06 UTC (rev 16830) +++ trunk/reactos/lib/d3d8thk/win32k.S 2005-07-28 16:44:25 UTC (rev 16831) @@ -1 +0,0 @@ -#include "../gdi32/misc/win32k.S"

1 0

[greatlrd] 16830: Add DdEntry 1-56 it is pure syscall to win32k/ntdraw. Windows XP and higher does have this entry. And thanks to that we can make directdraw Windows XP or higher compatible. But rember alot of directdraw api are still stub in win32k/ntdraw.
by greatlrd＠svn.reactos.com 28 Jul '05

28 Jul '05

Add DdEntry 1-56 it is pure syscall to win32k/ntdraw. Windows XP and higher does have this entry. And thanks to that we can make directdraw Windows XP or higher compatible. But rember alot of directdraw api are still stub in win32k/ntdraw. Modified: trunk/reactos/lib/gdi32/gdi32.def _____ Modified: trunk/reactos/lib/gdi32/gdi32.def --- trunk/reactos/lib/gdi32/gdi32.def 2005-07-28 13:40:52 UTC (rev 16829) +++ trunk/reactos/lib/gdi32/gdi32.def 2005-07-28 16:42:06 UTC (rev 16830) @@ -98,6 +98,62 @@ DescribePixelFormat@16 DeviceCapabilitiesExA@20 DeviceCapabilitiesExW@20 +DdEntry1@16=NtGdiD3dContextCreate@16 +DdEntry2@4=NtGdiD3dContextDestroy@4 +DdEntry3@0=NtGdiD3dContextDestroyAll@0 +DdEntry4@4=NtGdiD3dValidateTextureStageState@4 +DdEntry5@28=NtGdiD3dDrawPrimitives2@28 +DdEntry6@4=NtGdiDdGetDriverState@4 +DdEntry7@12=NtGdiDdAddAttachedSurface@12 +DdEntry8@12=NtGdiDdAlphaBlt@12 +DdEntry9@8=NtGdiDdAttachSurface@8 +DdEntry10@8=NtGdiDdBeginMoCompFrame@8 +DdEntry11@12=NtGdiDdBlt@12 +DdEntry13@8=NtGdiDdCanCreateD3DBuffer@8 +DdEntry12@8=NtGdiDdCanCreateSurface@8 +DdEntry14@8=NtGdiDdColorControl@8 +DdEntry15@4=NtGdiDdCreateDirectDrawObject@4 +DdEntry16@32=NtGdiDdCreateSurface@32 +DdEntry17@32=NtGdiDdCreateD3DBuffer@32 +DdEntry18@8=NtGdiDdCreateMoComp@8 +DdEntry19@24=NtGdiDdCreateSurfaceObject@24 +DdEntry20@4=NtGdiDdDeleteDirectDrawObject@4 +DdEntry21@4=NtGdiDdDeleteSurfaceObject@4 +DdEntry22@8=NtGdiDdDestroyMoComp@8 +DdEntry23@8=NtGdiDdDestroySurface@8 +DdEntry24@4=NtGdiDdDestroyD3DBuffer@4 +DdEntry25@8=NtGdiDdEndMoCompFrame@8 +DdEntry26@20=NtGdiDdFlip@20 +DdEntry27@8=NtGdiDdFlipToGDISurface@8 +DdEntry28@8=NtGdiDdGetAvailDriverMemory@8 +DdEntry29@8=NtGdiDdGetBltStatus@8 +DdEntry30@8=NtGdiDdGetDC@8 +DdEntry31@8=NtGdiDdGetDriverInfo@8 +DdEntry32@12=NtGdiDdGetDxHandle@12 +DdEntry33@8=NtGdiDdGetFlipStatus@8 +DdEntry34@8=NtGdiDdGetInternalMoCompInfo@8 +DdEntry35@8=NtGdiDdGetMoCompBuffInfo@8 +DdEntry36@8=NtGdiDdGetMoCompGuids@8 +DdEntry37@8=NtGdiDdGetMoCompFormats@8 +DdEntry38@8=NtGdiDdGetScanLine@8 +DdEntry39@12=NtGdiDdLock@12 +DdEntry40@8=NtGdiDdLockD3D@8 +DdEntry41@44=NtGdiDdQueryDirectDrawObject@44 +DdEntry42@8=NtGdiDdQueryMoCompStatus@8 +DdEntry43@8=NtGdiDdReenableDirectDrawObject@8 +DdEntry44@4=NtGdiDdReleaseDC@4 +DdEntry45@8=NtGdiDdRenderMoComp@8 +DdEntry46@8=NtGdiDdResetVisrgn@8 +DdEntry47@8=NtGdiDdSetColorKey@8 +DdEntry48@8=NtGdiDdSetExclusiveMode@8 +DdEntry49@12=NtGdiDdSetGammaRamp@12 +DdEntry50@12=NtGdiDdCreateSurfaceEx@12 +DdEntry51@12=NtGdiDdSetOverlayPosition@12 +DdEntry52@8=NtGdiDdUnattachSurface@8 +DdEntry53@8=NtGdiDdUnlock@8 +DdEntry54@8=NtGdiDdUnlockD3D@8 +DdEntry55@12=NtGdiDdUpdateOverlay@12 +DdEntry56@8=NtGdiDdWaitForVerticalBlank@8 DrawEscape@16 Ellipse@20=NtGdiEllipse@20 EnableEUDC@4

1 0

[gdalsnes] 16829: merge from trunk 16686-16827
by gdalsnes＠svn.reactos.com 28 Jul '05

28 Jul '05

merge from trunk 16686-16827 misc stuff still crash often due to referencing problems/freed message queue Added: branches/win32k rewrite attempt/win32k/docs/ Added: branches/win32k rewrite attempt/win32k/docs/refs.txt Modified: branches/win32k rewrite attempt/win32k/eng/event.c Modified: branches/win32k rewrite attempt/win32k/include/focus.h Modified: branches/win32k rewrite attempt/win32k/include/mmcopy.h Modified: branches/win32k rewrite attempt/win32k/include/userfuncs.h Modified: branches/win32k rewrite attempt/win32k/misc/copy.c Modified: branches/win32k rewrite attempt/win32k/ntuser/class.c Modified: branches/win32k rewrite attempt/win32k/ntuser/focus.c Modified: branches/win32k rewrite attempt/win32k/ntuser/input.c Modified: branches/win32k rewrite attempt/win32k/ntuser/monitor.c Modified: branches/win32k rewrite attempt/win32k/ntuser/window.c Modified: branches/win32k rewrite attempt/win32k/ntuser/winpos.c Modified: branches/win32k rewrite attempt/win32k/objects/brush.c Modified: branches/win32k rewrite attempt/win32k/objects/cliprgn.c Modified: branches/win32k rewrite attempt/win32k/objects/color.c Modified: branches/win32k rewrite attempt/win32k/objects/coord.c Modified: branches/win32k rewrite attempt/win32k/objects/dc.c Modified: branches/win32k rewrite attempt/win32k/objects/dib.c Modified: branches/win32k rewrite attempt/win32k/objects/fillshap.c Modified: branches/win32k rewrite attempt/win32k/objects/line.c Modified: branches/win32k rewrite attempt/win32k/objects/pen.c Modified: branches/win32k rewrite attempt/win32k/objects/print.c Modified: branches/win32k rewrite attempt/win32k/objects/rect.c Modified: branches/win32k rewrite attempt/win32k/objects/region.c Modified: branches/win32k rewrite attempt/win32k/objects/text.c Modified: branches/win32k rewrite attempt/win32k/tests/win32k.xml Modified: branches/win32k rewrite attempt/win32k/win32k.xml _____ Added: branches/win32k rewrite attempt/win32k/docs/refs.txt --- branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-07-28 13:40:52 UTC (rev 16829) @@ -0,0 +1,26 @@ +References: +----------- + +window -> desktop +window -> class + +window -> queue/thread_input ????????? +thread -> queue/thread_input ????????? + +thread -> process +process -> winsta +thread -> desktop +desktop -> winsta +winsta -> session + + +Above references create following dependencies: +----------------------------------------------- + +window -> desktop -> winsta -> session +window -> class + +thread -> process -> winsta -> session +thread -> desktop -> winsta -> session + +process -> winsta -> session _____ Modified: branches/win32k rewrite attempt/win32k/eng/event.c --- branches/win32k rewrite attempt/win32k/eng/event.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/eng/event.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -36,7 +36,7 @@ STDCALL EngCreateEvent ( OUT PEVENT *Event ) { - (*Event) = ExAllocatePool(NonPagedPool, sizeof(TAG_DRIVER)); + (*Event) = ExAllocatePool(NonPagedPool, sizeof(KEVENT)); if ((*Event) == NULL) { return FALSE; _____ Modified: branches/win32k rewrite attempt/win32k/include/focus.h --- branches/win32k rewrite attempt/win32k/include/focus.h 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/include/focus.h 2005-07-28 13:40:52 UTC (rev 16829) @@ -9,9 +9,8 @@ PWINDOW_OBJECT FASTCALL UserGetFocusWindow(); -PWINDOW_OBJECT FASTCALL -IntGetForegroundWindow(VOID); + /* * These functions take the window handles from current thread queue. */ _____ Modified: branches/win32k rewrite attempt/win32k/include/mmcopy.h --- branches/win32k rewrite attempt/win32k/include/mmcopy.h 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/include/mmcopy.h 2005-07-28 13:40:52 UTC (rev 16829) @@ -4,8 +4,9 @@ #include <pseh/pseh.h> NTSTATUS _MmCopyFromCaller( PVOID Target, PVOID Source, UINT Bytes ); +NTSTATUS _MmCopyToCaller( PVOID Target, PVOID Source, UINT Bytes ); #define MmCopyFromCaller(x,y,z) _MmCopyFromCaller((PCHAR)(x),(PCHAR)(y),(UINT)(z)) -#define MmCopyToCaller(x,y,z) MmCopyFromCaller(x,y,z) +#define MmCopyToCaller(x,y,z) _MmCopyToCaller((PCHAR)(x),(PCHAR)(y),(UINT)(z)) #endif/*NDK_MMCOPY_H*/ _____ Modified: branches/win32k rewrite attempt/win32k/include/userfuncs.h --- branches/win32k rewrite attempt/win32k/include/userfuncs.h 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/include/userfuncs.h 2005-07-28 13:40:52 UTC (rev 16829) @@ -38,8 +38,12 @@ NTSTATUS FASTCALL UserAcquireOrReleaseInputOwnership(BOOLEAN Release); -/* focus.c */ +/******************** FOCUS.C ********************************/ + PWINDOW_OBJECT FASTCALL +UserGetForegroundWindow(VOID); + +PWINDOW_OBJECT FASTCALL UserSetFocus(PWINDOW_OBJECT Wnd OPTIONAL); @@ -96,7 +100,8 @@ UserCreateMenuObject(HANDLE* h); -/* caret.c */ +/************************* CARET.C ****************************/ + BOOL FASTCALL UserShowCaret(PWINDOW_OBJECT Wnd); @@ -106,12 +111,14 @@ BOOL FASTCALL UserHideCaret(PWINDOW_OBJECT Wnd); -/* winpos.c */ +/************************* WINPOS.C ****************************/ + BOOL FASTCALL UserGetClientOrigin(PWINDOW_OBJECT hWnd, LPPOINT Point); -/* scrollbar.c */ +/************************* SCROLLBAR.C ****************************/ + DWORD FASTCALL UserShowScrollBar(PWINDOW_OBJECT Wnd, int wBar, DWORD bShow); @@ -144,7 +151,7 @@ ClassReferenceClass(PWNDCLASS_OBJECT Class); VOID FASTCALL -ClassDereferenceClass(PWNDCLASS_OBJECT Class); +UserDereferenceClass(PWNDCLASS_OBJECT Class); PWNDCLASS_OBJECT FASTCALL ClassCreateClass(DWORD bytes); _____ Modified: branches/win32k rewrite attempt/win32k/misc/copy.c --- branches/win32k rewrite attempt/win32k/misc/copy.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/misc/copy.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -2,9 +2,23 @@ NTSTATUS _MmCopyFromCaller( PVOID Target, PVOID Source, UINT Bytes ) { NTSTATUS Status = STATUS_SUCCESS; + + _SEH_TRY { + ProbeForRead(Source,Bytes,1); + RtlCopyMemory(Target,Source,Bytes); + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; + return Status; +} + +NTSTATUS _MmCopyToCaller( PVOID Target, PVOID Source, UINT Bytes ) { + NTSTATUS Status = STATUS_SUCCESS; + _SEH_TRY { - RtlCopyMemory(Target,Source,Bytes); + ProbeForWrite(Target,Bytes,1); + RtlCopyMemory(Target,Source,Bytes); } _SEH_HANDLE { Status = _SEH_GetExceptionCode(); } _SEH_END; _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/class.c --- branches/win32k rewrite attempt/win32k/ntuser/class.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/ntuser/class.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -54,7 +54,7 @@ } VOID FASTCALL -ClassDereferenceClass(PWNDCLASS_OBJECT Class) +UserDereferenceClass(PWNDCLASS_OBJECT Class) { //if (--Class->RefCount == 0) //{ @@ -319,7 +319,7 @@ if (ClassObject->hInstance == lpwcx->hInstance) { SetLastWin32Error(ERROR_CLASS_ALREADY_EXISTS); - ClassDereferenceClass(ClassObject); + UserDereferenceClass(ClassObject); return(NULL); } } @@ -739,7 +739,7 @@ if (Class->hInstance && Class->hInstance != hInstance) { - ClassDereferenceClass(Class); + UserDereferenceClass(Class); SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST); RETURN(FALSE); } @@ -747,20 +747,20 @@ if (!IsListEmpty(&Class->ClassWindowsListHead)) { /* Dereference the ClassReferenceClassByNameOrAtom() call */ - ClassDereferenceClass(Class); + UserDereferenceClass(Class); SetLastWin32Error(ERROR_CLASS_HAS_WINDOWS); RETURN(FALSE); } /* Dereference the ClassReferenceClassByNameOrAtom() call */ - ClassDereferenceClass(Class); + UserDereferenceClass(Class); RemoveEntryList(&Class->ListEntry); RtlDeleteAtomFromAtomTable(WinStaObject->AtomTable, Class->Atom); /* Free the object */ - ClassDereferenceClass(Class); + UserDereferenceClass(Class); RETURN(TRUE); _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/focus.c --- branches/win32k rewrite attempt/win32k/ntuser/focus.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/ntuser/focus.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -91,7 +91,7 @@ /* FIXME: IntIsWindow */ - IntPostOrSendMessage(hWnd, WM_NCACTIVATE, (WPARAM)(Window == IntGetForegroundWindow()), 0); + IntPostOrSendMessage(hWnd, WM_NCACTIVATE, (WPARAM)(Window == UserGetForegroundWindow()), 0); /* FIXME: WA_CLICKACTIVE */ IntPostOrSendMessage(hWnd, WM_ACTIVATE, MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, @@ -340,8 +340,9 @@ DPRINT("Enter NtUserGetForegroundWindow\n"); UserEnterExclusive(); - PUSER_MESSAGE_QUEUE ForegroundQueue = UserGetFocusMessageQueue(); - RETURN(ForegroundQueue != NULL ? ForegroundQueue->ActiveWindow : 0); + //PUSER_MESSAGE_QUEUE ForegroundQueue = UserGetFocusMessageQueue(); + //RETURN(ForegroundQueue != NULL ? ForegroundQueue->ActiveWindow : 0); + RETURN(GetHwnd(UserGetForegroundWindow())); CLEANUP: DPRINT("Leave NtUserGetForegroundWindow, ret=%i\n",_ret_); @@ -352,7 +353,7 @@ PWINDOW_OBJECT FASTCALL -IntGetForegroundWindow(VOID) +UserGetForegroundWindow(VOID) { PUSER_MESSAGE_QUEUE ForegroundQueue = UserGetFocusMessageQueue(); _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/input.c --- branches/win32k rewrite attempt/win32k/ntuser/input.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/ntuser/input.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -379,13 +379,11 @@ MSG Mesg; NTSTATUS Status; -// Status = ObmReferenceObjectByHandle(InputWindowStation->HandleTable, -// InputWindowStation->ShellWindow, -// otWindow, -// (PVOID *)&Window); - - Window = IntGetWindowObject( InputWindowStation->ShellWindow); - + Window = UserGetObject( + &InputWindowStation->HandleTable, + InputWindowStation->ShellWindow, + USER_WINDOW); + if (!NT_SUCCESS(Status)) { DPRINT1("Couldn't find window to send Windows key message!\n"); @@ -399,8 +397,6 @@ /* The QS_HOTKEY is just a guess */ MsqPostMessage(Window->MessageQueue, &Mesg, FALSE, QS_HOTKEY); - -// ObmDereferenceObject(Window); } STATIC VOID STDCALL @@ -930,7 +926,6 @@ SwapButtons = CurInfo->SwapButtons; DoMove = FALSE; -// ExAcquireFastMutex(&CurInfo->CursorMutex); UserGetCursorLocation(WinSta, &MousePos); OrgPos.x = MousePos.x; OrgPos.y = MousePos.y; @@ -948,17 +943,18 @@ MousePos.y += mi->dy; } -// Status = ObmReferenceObjectByHandle(WinSta->HandleTable, -// WinSta->ActiveDesktop->DesktopWindow, otWindow, (PVOID*)&DesktopWindow); - - DesktopWindow = UserGetDesktopWindow(); + //FIXME: make typename like HACCEL, HWND -> USER_WND, USER_ACCEL + DesktopWindow = UserGetObject( + &WinSta->HandleTable, + WinSta->ActiveDesktop->DesktopWindow, + USER_WINDOW); + if (DesktopWindow) { if(MousePos.x >= DesktopWindow->ClientRect.right) MousePos.x = DesktopWindow->ClientRect.right - 1; if(MousePos.y >= DesktopWindow->ClientRect.bottom) MousePos.y = DesktopWindow->ClientRect.bottom - 1; -// ObmDereferenceObject(DesktopWindow); } if(MousePos.x < 0) @@ -983,7 +979,6 @@ DoMove = (MousePos.x != OrgPos.x || MousePos.y != OrgPos.y); } -// ExReleaseFastMutex(&CurInfo->CursorMutex); if (DoMove) { @@ -1000,9 +995,9 @@ IntEngMovePointer(SurfObj, MousePos.x, MousePos.y, &(GDIDEV(SurfObj)->Pointer.Exclude)); /* Only now, update the info in the GDIDEVICE, so EngMovePointer can - * use the old values to move the pointer image */ - GDIDEV(SurfObj)->Pointer.Pos.x = MousePos.x; - GDIDEV(SurfObj)->Pointer.Pos.y = MousePos.y; + * use the old values to move the pointer image */ + GDIDEV(SurfObj)->Pointer.Pos.x = MousePos.x; + GDIDEV(SurfObj)->Pointer.Pos.y = MousePos.y; BITMAPOBJ_UnlockBitmap(BitmapObj); } @@ -1019,7 +1014,7 @@ if(DoMove) { Msg.message = WM_MOUSEMOVE; - //FIXME: uhm... Msg is built on stack... + /* Msg is built on stack but MsqInsertSystemMessage copies it, so its ok */ MsqInsertSystemMessage(&Msg); } _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/monitor.c --- branches/win32k rewrite attempt/win32k/ntuser/monitor.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/ntuser/monitor.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -111,7 +111,6 @@ HANDLE Handle; PMONITOR_OBJECT Monitor; -// Monitor = ObmCreateObject(PsGetWin32Thread()->Desktop->WindowStation->HandleTable, &Handle, otMonitor, sizeof (MONITOR_OBJECT)); Monitor = UserCreateMonitorObject(&Handle); if (Monitor == NULL) { @@ -174,10 +173,7 @@ IntGetMonitorObject(IN HMONITOR hMonitor) { PMONITOR_OBJECT Monitor; -// NTSTATUS Status; -// Status = ObmReferenceObjectByHandle(PsGetWin32Thread()->Desktop->WindowStation->H andleTable, hMonitor, otMonitor, (PVOID *)&Monitor); - Monitor = UserGetMonitorObject(hMonitor); if (!Monitor) { _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/window.c --- branches/win32k rewrite attempt/win32k/ntuser/window.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/ntuser/window.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -428,7 +428,7 @@ RemoveEntryList(&Window->ClassListEntry); /* dereference the class */ - ClassDereferenceClass(Window->Class); + UserDereferenceClass(Window->Class); Window->Class = NULL; if(Window->WindowRegion) @@ -495,7 +495,7 @@ pwi->rcClient = WindowObject->ClientRect; pwi->dwStyle = WindowObject->Style; pwi->dwExStyle = WindowObject->ExStyle; - pwi->dwWindowStatus = (IntGetForegroundWindow() == WindowObject); /* WS_ACTIVECAPTION */ + pwi->dwWindowStatus = (UserGetForegroundWindow() == WindowObject); /* WS_ACTIVECAPTION */ IntGetWindowBorderMeasures(WindowObject, &pwi->cxWindowBorders, &pwi->cyWindowBorders); pwi->atomWindowType = (WindowObject->Class ? WindowObject->Class->Atom : 0); pwi->wCreatorVersion = 0x400; /* FIXME - return a real version number */ @@ -510,13 +510,19 @@ { PMENU_OBJECT OldMenuObject, NewMenuObject = NULL; + if ((WindowObject->Style & (WS_CHILD | WS_POPUP)) == WS_CHILD) + { + SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); + return FALSE; + } + *Changed = (WindowObject->IDMenu != (UINT) Menu); if (! *Changed) { return TRUE; } - if (0 != WindowObject->IDMenu) + if (WindowObject->IDMenu) { OldMenuObject = UserGetMenuObject((HMENU) WindowObject->IDMenu); ASSERT(NULL == OldMenuObject || OldMenuObject->MenuInfo.Wnd == WindowObject->Self); @@ -574,12 +580,24 @@ DestroyThreadWindows(struct _ETHREAD *Thread) { PLIST_ENTRY Current; - PW32PROCESS Win32Process; +// PW32PROCESS Win32Process; PW32THREAD Win32Thread; - PWINDOW_OBJECT *List, *pWnd; - ULONG Cnt = 0; +// PWINDOW_OBJECT *List, *pWnd, Wnd; + PWINDOW_OBJECT Wnd; +// ULONG Cnt = 0; Win32Thread = Thread->Tcb.Win32Thread; + + while (!IsListEmpty(&Win32Thread->WindowListHead)) + { + Current = RemoveHeadList(&Win32Thread->WindowListHead); + Wnd = CONTAINING_RECORD(Current, WINDOW_OBJECT, ThreadListEntry); + /* window removes itself from the list */ + UserDestroyWindow(Wnd); + } + +#if 0 + Win32Process = (PW32PROCESS)Thread->ThreadsProcess->Win32Process; Current = Win32Thread->WindowListHead.Flink; @@ -615,7 +633,7 @@ ExFreePool(List); return; } - +#endif } @@ -1494,10 +1512,12 @@ /* Check the window station. */ if (PsGetWin32Thread()->Desktop == NULL) { - ClassDereferenceClass(ClassObject); + UserDereferenceClass(ClassObject); DPRINT("Thread is not attached to a desktop! Cannot create window!\n"); return (HWND)0; } + + //FIXME: DO NOT REFERENCE WINSTA! Reference desktop instead!! WinStaObject = UserGetCurrentWinSta(); ObReferenceObjectByPointer(WinStaObject, KernelMode, ExWindowStationObjectType, 0); @@ -1513,7 +1533,7 @@ if (!WindowObject) { ObDereferenceObject(WinStaObject); - ClassDereferenceClass(ClassObject); + UserDereferenceClass(ClassObject); SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); return (HWND)0; } @@ -1529,6 +1549,8 @@ * Fill out the structure describing it. */ WindowObject->Class = ClassObject; + + //er dette n°dvendig? InsertTailList(&ClassObject->ClassWindowsListHead, &WindowObject->ClassListEntry); WindowObject->ExStyle = dwExStyle; @@ -1551,8 +1573,11 @@ WindowObject->MessageQueue = UserGetCurrentQueue(); + ASSERT(WindowObject->MessageQueue); + DPRINT1("Set 0x%x's parent to 0x%x\n",WindowObject, ParentWindow); WindowObject->ParentWnd = ParentWindow; + if((OwnerWindow = IntGetWindowObject(OwnerWindowHandle))) { WindowObject->Owner = OwnerWindowHandle; @@ -1604,7 +1629,7 @@ TAG_STRING); if (NULL == WindowObject->WindowName.Buffer) { - ClassDereferenceClass(ClassObject); + UserDereferenceClass(ClassObject); DPRINT1("Failed to allocate mem for window name\n"); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; @@ -1691,7 +1716,7 @@ /* FIXME - Delete window object and remove it from the thread windows list */ /* FIXME - delete allocated DCE */ - ClassDereferenceClass(ClassObject); + UserDereferenceClass(ClassObject); DPRINT1("CBT-hook returned !0\n"); return (HWND) NULL; } @@ -1894,7 +1919,7 @@ if (Result == (LRESULT)-1) { /* FIXME: Cleanup. */ - ClassDereferenceClass(ClassObject); + UserDereferenceClass(ClassObject); DPRINT("IntCreateWindowEx(): send CREATE message failed.\n"); return((HWND)0); } @@ -2149,7 +2174,7 @@ WinPosActivateOtherWindow(Wnd); } } - +// IntDereferenceMessageQueue(Window->MessageQueue); if (Wnd->MessageQueue->ActiveWindow == Wnd->Self) Wnd->MessageQueue->ActiveWindow = NULL; _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/winpos.c --- branches/win32k rewrite attempt/win32k/ntuser/winpos.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/ntuser/winpos.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -114,56 +114,71 @@ WinPosActivateOtherWindow(PWINDOW_OBJECT Window) { PWINDOW_OBJECT Wnd, Old; - int TryTopmost; + HWND Fg; if (!Window || IntIsDesktopWindow(Window)) { IntSetFocusMessageQueue(NULL); return; } + + /* If this is popup window, try to activate the owner first. */ + if ((Window->Style & WS_POPUP) && (Wnd = IntGetOwner(Window))) + { + for(;;) + { + Old = Wnd; + Wnd = Wnd->ParentWnd;//IntGetParentObject(Wnd); + if(IntIsDesktopWindow(Wnd)) + { + Wnd = Old; + break; + } + } + + if ((Wnd->Style & (WS_DISABLED | WS_VISIBLE)) == WS_VISIBLE && + (Wnd->Style & (WS_POPUP | WS_CHILD)) != WS_CHILD) + goto done; + + } + + /* Pick a next top-level window. */ + /* FIXME: Search for non-tooltip windows first. */ Wnd = Window; - for(;;) + while (Wnd != NULL) { - HWND *List, *phWnd; - Old = Wnd; - Wnd = Wnd->ParentWnd; - if(!Wnd) + if (Old->NextSibling == NULL) { - IntSetFocusMessageQueue(NULL); - return; + Wnd = NULL; +//(( if (Old != Window) +//(( IntReleaseWindowObject(Old); + break; } + Wnd = IntGetWindowObject(Old->NextSibling->Self); +// IntUnLockRelatives(Old); +// if (Old != Window) +// IntReleaseWindowObject(Old); + if ((Wnd->Style & (WS_DISABLED | WS_VISIBLE)) == WS_VISIBLE && + (Wnd->Style & (WS_POPUP | WS_CHILD)) != WS_CHILD) + break; + } - if((List = IntWinListChildren(Wnd))) +done: +// Fg = NtUserGetForegroundWindow(); + Fg = GetHwnd(UserGetForegroundWindow()); + if (Wnd && (!Fg || Window->Self == Fg)) + { + if (IntSetForegroundWindow(Wnd)) { - for(TryTopmost = 0; TryTopmost <= 1; TryTopmost++) - { - for(phWnd = List; *phWnd; phWnd++) - { - PWINDOW_OBJECT Child; - - if((*phWnd) == Window->Self) - { - continue; - } - - if((Child = IntGetWindowObject(*phWnd))) -// Child = *phWnd; - { - if(((! TryTopmost && (0 == (Child->ExStyle & WS_EX_TOPMOST))) - || (TryTopmost && (0 != (Child->ExStyle & WS_EX_TOPMOST)))) - && IntSetForegroundWindow(Child)) - { - ExFreePool(List); - return; - } - } - } - } - ExFreePool(List); +// IntReleaseWindowObject(Wnd); + return; } } - + if (!IntSetActiveWindow(Wnd)) + IntSetActiveWindow(0); +// if (Wnd) +// IntReleaseWindowObject(Wnd); } @@ -733,7 +748,7 @@ //FIXME - tmp = IntGetForegroundWindow(); + tmp = UserGetForegroundWindow(); if (WinPos->hwnd == (tmp ? tmp->Self : 0)) { WinPos->flags |= SWP_NOACTIVATE; /* Already active */ _____ Modified: branches/win32k rewrite attempt/win32k/objects/brush.c --- branches/win32k rewrite attempt/win32k/objects/brush.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/objects/brush.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -563,7 +563,7 @@ CONST VOID *PackedDIB) { BITMAPINFO *SafeBitmapInfoAndData; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; HBRUSH hBrush; SafeBitmapInfoAndData = EngAllocMem(0, BitmapInfoSize, 0); @@ -573,10 +573,24 @@ return NULL; } - Status = MmCopyFromCaller(SafeBitmapInfoAndData, BitmapInfoAndData, - BitmapInfoSize); + _SEH_TRY + { + ProbeForRead(BitmapInfoAndData, + BitmapInfoSize, + 1); + RtlCopyMemory(SafeBitmapInfoAndData, + BitmapInfoAndData, + BitmapInfoSize); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) { + EngFreeMem(SafeBitmapInfoAndData); SetLastNtError(Status); return 0; } @@ -632,11 +646,23 @@ if (Point != NULL) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; POINT SafePoint; SafePoint.x = dc->w.brushOrgX; SafePoint.y = dc->w.brushOrgY; - Status = MmCopyToCaller(Point, &SafePoint, sizeof(POINT)); + _SEH_TRY + { + ProbeForWrite(Point, + sizeof(POINT), + 1); + *Point = SafePoint; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); @@ -661,7 +687,7 @@ ULONG Reserved) { PPATRECT rb = NULL; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; BOOL Ret; if (cRects > 0) @@ -672,7 +698,21 @@ SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - Status = MmCopyFromCaller(rb, pRects, sizeof(PATRECT) * cRects); + _SEH_TRY + { + ProbeForRead(pRects, + cRects * sizeof(PATRECT), + 1); + RtlCopyMemory(rb, + pRects, + cRects * sizeof(PATRECT)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) { ExFreePool(rb); _____ Modified: branches/win32k rewrite attempt/win32k/objects/cliprgn.c --- branches/win32k rewrite attempt/win32k/objects/cliprgn.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/objects/cliprgn.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -192,7 +192,19 @@ Ret = IntGdiGetClipBox(hDC, &Saferect); - Status = MmCopyToCaller(rc, &Saferect, sizeof(RECT)); + _SEH_TRY + { + ProbeForWrite(rc, + sizeof(RECT), + 1); + *rc = Saferect; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { @@ -341,7 +353,7 @@ BOOL STDCALL NtGdiRectVisible(HDC hDC, CONST PRECT UnsafeRect) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PROSRGNDATA Rgn; PDC dc = DC_LockDc(hDC); BOOL Result = FALSE; @@ -353,10 +365,23 @@ return FALSE; } - Status = MmCopyFromCaller(&Rect, UnsafeRect, sizeof(RECT)); + _SEH_TRY + { + ProbeForRead(UnsafeRect, + sizeof(RECT), + 1); + Rect = *UnsafeRect; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); + SetLastNtError(Status); return FALSE; } _____ Modified: branches/win32k rewrite attempt/win32k/objects/color.c --- branches/win32k rewrite attempt/win32k/objects/color.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/objects/color.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -588,6 +588,13 @@ return old; } +/* + Win 2k Graphics API, Black Book. by coriolis.com + Page 62, Note that Steps 3, 5, and 6 are not required for Windows NT(tm) + and Windows 2000(tm). + + Step 5. UnrealizeObject(hTrackBrush); + */ BOOL STDCALL NtGdiUnrealizeObject(HGDIOBJ hgdiobj) { @@ -595,7 +602,6 @@ GDIOBJHDR * ptr; DWORD objectType; BOOL Ret = FALSE; - UNIMPLEMENTED; ptr = GDIOBJ_LockObj(hgdiobj, GDI_OBJECT_TYPE_DONTCARE); if (ptr == 0) @@ -606,12 +612,6 @@ objectType = GDIOBJ_GetObjectType(hgdiobj); switch(objectType) { - case GDI_OBJECT_TYPE_PALETTE: - { - /* Make sure this is a Palette object!*/ - DPRINT1("GDI_OBJECT_TYPE_PALETTE\n"); - break; - } /* msdn.microsoft.com, "Windows 2000/XP: If hgdiobj is a brush, UnrealizeObject does nothing, @@ -620,7 +620,7 @@ */ case GDI_OBJECT_TYPE_BRUSH: { - DPRINT1("GDI_OBJECT_TYPE_BRUSH\n"); + DPRINT("GDI_OBJECT_TYPE_BRUSH\n"); Ret = TRUE; break; } _____ Modified: branches/win32k rewrite attempt/win32k/objects/coord.c --- branches/win32k rewrite attempt/win32k/objects/coord.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/objects/coord.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -63,17 +63,29 @@ { XFORM xformTemp; XFORM xform1, xform2; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; BOOL Ret; - - Status = MmCopyFromCaller( &xform1, Unsafexform1, sizeof(XFORM) ); - if(!NT_SUCCESS(Status)) + _SEH_TRY { - SetLastNtError(Status); - return FALSE; + ProbeForWrite(UnsafeXFormResult, + sizeof(XFORM), + 1); + ProbeForRead(Unsafexform1, + sizeof(XFORM), + 1); + ProbeForRead(Unsafexform2, + sizeof(XFORM), + 1); + xform1 = *Unsafexform1; + xform2 = *Unsafexform2; } - Status = MmCopyFromCaller( &xform2, Unsafexform2, sizeof(XFORM) ); + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -83,7 +95,17 @@ Ret = IntGdiCombineTransform(&xformTemp, &xform1, &xform2); /* Copy the result to xformResult */ - Status = MmCopyToCaller( UnsafeXFormResult, &xformTemp, sizeof(XFORM) ); + _SEH_TRY + { + /* pointer was already probed! */ + *UnsafeXFormResult = xformTemp; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -131,7 +153,7 @@ int Count) { PDC dc; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; LPPOINT Points; ULONG Size; @@ -159,7 +181,21 @@ return FALSE; } - Status = MmCopyFromCaller(Points, UnsafePoints, Size); + _SEH_TRY + { + ProbeForWrite(UnsafePoints, + Size, + 1); + RtlCopyMemory(Points, + UnsafePoints, + Size); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); @@ -170,7 +206,19 @@ IntDPtoLP(dc, Points, Count); - Status = MmCopyToCaller(UnsafePoints, Points, Size); + _SEH_TRY + { + /* pointer was already probed! */ + RtlCopyMemory(UnsafePoints, + Points, + Size); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); @@ -218,7 +266,7 @@ LPXFORM XForm) { PDC dc; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; dc = DC_LockDc ( hDC ); if (!dc) @@ -233,7 +281,18 @@ return FALSE; } - Status = MmCopyToCaller(XForm, &dc->w.xformWorld2Wnd, sizeof(XFORM)); + _SEH_TRY + { + ProbeForWrite(XForm, + sizeof(XFORM), + 1); + *XForm = dc->w.xformWorld2Wnd; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; DC_UnlockDc(dc); return NT_SUCCESS(Status); @@ -280,7 +339,7 @@ NtGdiLPtoDP ( HDC hDC, LPPOINT UnsafePoints, INT Count ) { PDC dc; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; LPPOINT Points; ULONG Size; @@ -308,7 +367,21 @@ [truncated at 1000 lines; 2213 more skipped]

1 0

[ea] 16828: Fix compilation (as hinted by Alex).
by ea＠svn.reactos.com 28 Jul '05

28 Jul '05

Fix compilation (as hinted by Alex). Modified: trunk/reactos/subsys/csrss/win32csr/conio.c _____ Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-07-28 10:45:21 UTC (rev 16827) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-07-28 11:48:58 UTC (rev 16828) @@ -248,7 +248,7 @@ Request->Status = STATUS_SUCCESS; /* If we don't need a console, then get out of here */ - if (!Request->Data.AllocConsoleRequest.ConsoleNotNeeded) + if (!Request->Data.AllocConsoleRequest.ConsoleNeeded) { DPRINT1("No console needed\n"); return STATUS_SUCCESS;

1 0

[chorns] 16827: Don't clean alias modules
by chorns＠svn.reactos.com 28 Jul '05

28 Jul '05

Don't clean alias modules Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-28 04:12:43 UTC (rev 16826) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-28 10:45:21 UTC (rev 16827) @@ -489,6 +489,9 @@ void MingwModuleHandler::GenerateCleanTarget () const { + if ( module.type == Alias ) + return; + fprintf ( fMakefile, ".PHONY: %s_clean\n", module.name.c_str() );

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs