Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 66891: [WIN32K] - Make brush structure definition C++ compatible - Add delete callback for GDI objects and use if for brushes. - Make IntGdiSetSolidBrushColor NTAPI instead of FASTCALL

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 25 22:32:48 2015 New Revision: 66891 URL: http://svn.reactos.org/svn/reactos?rev=66891&view=rev Log: [WIN32K] - Make brush structure definition C++ compatible - Add delete callback for GDI objects and use if for brushes. - Make IntGdiSetSolidBrushColor NTAPI instead of FASTCALL Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.c trunk/reactos/win32ss/gdi/ntgdi/brush.h trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] Wed Mar 25 22:32:48 2015 @@ -154,6 +154,16 @@ } } +VOID +NTAPI +BRUSH_vDeleteObject( + PVOID pvObject) +{ + BRUSH_vCleanup(pvObject); + ExFreePoolWithTag(pvObject, GDITAG_HMGR_BRUSH_TYPE); +} + + INT FASTCALL BRUSH_GetObject(PBRUSH pbrush, INT cjSize, LPLOGBRUSH plogbrush) @@ -385,7 +395,7 @@ } VOID -FASTCALL +NTAPI IntGdiSetSolidBrushColor(HBRUSH hBrush, COLORREF Color) { PBRUSH pbrush; Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Wed Mar 25 22:32:48 2015 @@ -11,12 +11,8 @@ * DON'T MODIFY THIS STRUCTURE UNLESS REALLY NEEDED AND EVEN THEN ASK ON * A MAILING LIST FIRST. */ -typedef struct _BRUSH -{ - /* Header for all gdi objects in the handle table. - Do not (re)move this. */ - BASEOBJECT BaseObject; - +typedef struct _BRUSHBODY +{ ULONG iHatch; // This is not the brush style, but the hatch style! HBITMAP hbmPattern; HBITMAP hbmClient; @@ -34,6 +30,8 @@ PVOID pvRBrush; HDEV hdev; //DWORD unk054; + + /* The following members are for PENs only */ LONG lWidth; FLOAT eWidth; ULONG ulPenStyle; @@ -47,7 +45,21 @@ //DWORD unk078; // 0x078 DWORD unk07c; // 0x07c LIST_ENTRY ListHead; // 0x080 +} BRUSHBODY; + +#ifndef __cplusplus +typedef struct _BRUSH +{ + /* Header for all gdi objects in the handle table. + Do not (re)move this. */ + BASEOBJECT BaseObject; + + BRUSHBODY; } BRUSH, *PBRUSH; +#else +class BRUSH; +typedef class BRUSH *PBRUSH; +#endif typedef struct _EBRUSHOBJ { @@ -68,7 +80,7 @@ struct _PALETTE * ppalDC; struct _PALETTE * ppalDIB; // DWORD dwUnknown44; - BRUSH * pbrush; + PBRUSH pbrush; FLONG flattrs; DWORD ulUnique; // DWORD dwUnknown54; @@ -109,8 +121,8 @@ VOID NTAPI -BRUSH_vCleanup( - PVOID ObjectBody); +BRUSH_vDeleteObject( + PVOID pvObject); extern HSURF gahsurfHatch[HS_DDI_MAX]; @@ -188,5 +200,8 @@ HBRUSH APIENTRY IntGdiCreateNullBrush(VOID); -VOID FASTCALL -IntGdiSetSolidBrushColor(HBRUSH hBrush, COLORREF Color); +VOID +NTAPI +IntGdiSetSolidBrushColor( + _In_ HBRUSH hbr, + _In_ COLORREF crColor); Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Wed Mar 25 22:32:48 2015 @@ -159,7 +159,7 @@ NULL, /* 0d GDIObjType_PFT_TYPE, unused */ GDIOBJ_vCleanup, /* 0e GDIObjType_ICMCXF_TYPE */ NULL, /* 0f GDIObjType_SPRITE_TYPE, unused */ - BRUSH_vCleanup, /* 10 GDIObjType_BRUSH_TYPE, BRUSH, PEN, EXTPEN */ + NULL, /* 10 GDIObjType_BRUSH_TYPE, BRUSH, PEN, EXTPEN */ NULL, /* 11 GDIObjType_UMPD_TYPE, unused */ NULL, /* 12 GDIObjType_UNUSED4_TYPE */ NULL, /* 13 GDIObjType_SPACE_TYPE, unused */ @@ -177,6 +177,44 @@ NULL, /* 1f reserved entry */ }; +static const +GDIOBJDELETEPROC +apfnDelete[] = +{ + NULL, /* 00 GDIObjType_DEF_TYPE */ + NULL, /* 01 GDIObjType_DC_TYPE */ + NULL, /* 02 GDIObjType_UNUSED1_TYPE */ + NULL, /* 03 GDIObjType_UNUSED2_TYPE */ + NULL, /* 04 GDIObjType_RGN_TYPE */ + NULL, /* 05 GDIObjType_SURF_TYPE */ + NULL, /* 06 GDIObjType_CLIENTOBJ_TYPE */ + NULL, /* 07 GDIObjType_PATH_TYPE */ + NULL, /* 08 GDIObjType_PAL_TYPE */ + NULL, /* 09 GDIObjType_ICMLCS_TYPE */ + NULL, /* 0a GDIObjType_LFONT_TYPE */ + NULL, /* 0b GDIObjType_RFONT_TYPE, unused */ + NULL, /* 0c GDIObjType_PFE_TYPE, unused */ + NULL, /* 0d GDIObjType_PFT_TYPE, unused */ + NULL, /* 0e GDIObjType_ICMCXF_TYPE */ + NULL, /* 0f GDIObjType_SPRITE_TYPE, unused */ + BRUSH_vDeleteObject, /* 10 GDIObjType_BRUSH_TYPE, BRUSH, PEN, EXTPEN */ + NULL, /* 11 GDIObjType_UMPD_TYPE, unused */ + NULL, /* 12 GDIObjType_UNUSED4_TYPE */ + NULL, /* 13 GDIObjType_SPACE_TYPE, unused */ + NULL, /* 14 GDIObjType_UNUSED5_TYPE */ + NULL, /* 15 GDIObjType_META_TYPE, unused */ + NULL, /* 16 GDIObjType_EFSTATE_TYPE, unused */ + NULL, /* 17 GDIObjType_BMFD_TYPE, unused */ + NULL, /* 18 GDIObjType_VTFD_TYPE, unused */ + NULL, /* 19 GDIObjType_TTFD_TYPE, unused */ + NULL, /* 1a GDIObjType_RC_TYPE, unused */ + NULL, /* 1b GDIObjType_TEMP_TYPE, unused */ + NULL, /* 1c GDIObjType_DRVOBJ_TYPE */ + NULL, /* 1d GDIObjType_DCIOBJ_TYPE, unused */ + NULL, /* 1e GDIObjType_SPOOL_TYPE, unused */ + NULL, /* 1f reserved entry */ +}; + /* INTERNAL FUNCTIONS ********************************************************/ static @@ -547,18 +585,27 @@ /* Get the object type */ objt = ((ULONG_PTR)pobj->hHmgr >> 16) & 0x1f; - /* Call the cleanup procedure */ - ASSERT(apfnCleanup[objt]); - apfnCleanup[objt](pobj); - - /* Check if the object is allocated from a lookaside list */ - if (pobj->BaseFlags & BASEFLAG_LOOKASIDE) - { - ExFreeToPagedLookasideList(&gpaLookasideList[objt], pobj); + /* Check if we have a delete procedure (for C++ based objects) */ + if (apfnDelete[objt] != NULL) + { + /* Invoke the delete procedure */ + apfnDelete[objt](pobj); } else { - ExFreePoolWithTag(pobj, GDIOBJ_POOL_TAG(objt)); + /* Call the cleanup procedure */ + NT_ASSERT(apfnCleanup[objt]); + apfnCleanup[objt](pobj); + + /* Check if the object is allocated from a lookaside list */ + if (pobj->BaseFlags & BASEFLAG_LOOKASIDE) + { + ExFreeToPagedLookasideList(&gpaLookasideList[objt], pobj); + } + else + { + ExFreePoolWithTag(pobj, GDIOBJ_POOL_TAG(objt)); + } } } Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] Wed Mar 25 22:32:48 2015 @@ -31,6 +31,7 @@ typedef PVOID PGDIOBJ; typedef VOID (NTAPI *GDICLEANUPPROC)(PVOID ObjectBody); +typedef VOID (NTAPI *GDIOBJDELETEPROC)(PVOID ObjectBody); /* Every GDI Object must have this standard type of header. * It's for thread locking. */

10 years, 1 month

[tkreuzer] 66890: [WIN32K] - Add InterlockedIn/DecrementUL - Define NULL to nullptr for C++ code - Reorder includes a bit. First GDI then USER. Don't include most USER headers for C++ for now.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 25 22:32:35 2015 New Revision: 66890 URL: http://svn.reactos.org/svn/reactos?rev=66890&view=rev Log: [WIN32K] - Add InterlockedIn/DecrementUL - Define NULL to nullptr for C++ code - Reorder includes a bit. First GDI then USER. Don't include most USER headers for C++ for now. Modified: trunk/reactos/win32ss/pch.h trunk/reactos/win32ss/user/ntuser/win32.h trunk/reactos/win32ss/win32k.h trunk/reactos/win32ss/win32kp.h Modified: trunk/reactos/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?rev=66890&r1… ============================================================================== --- trunk/reactos/win32ss/pch.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/pch.h [iso-8859-1] Wed Mar 25 22:32:35 2015 @@ -67,13 +67,16 @@ #include <pseh/pseh2.h> /* Public Win32K headers */ -#include <include/callback.h> +#include <include/ntgdityp.h> +#include <ntgdi.h> +#include <include/ntgdihdl.h> +#include <include/ntgdibad.h> + +#ifndef __cplusplus #include <include/ntusrtyp.h> #include <include/ntuser.h> -#include <include/ntgdityp.h> -#include <include/ntgdibad.h> -#include <include/ntgdihdl.h> -#include <ntgdi.h> +#include <include/callback.h> +#endif // __cplusplus /* Undocumented user definitions */ #include <undocuser.h> @@ -82,6 +85,9 @@ #include <ft2build.h> #include FT_FREETYPE_H +#define InterlockedIncrementUL(Value) InterlockedIncrement((PLONG)Value) +#define InterlockedDecrementUL(Value) InterlockedDecrement((PLONG)Value) + /* Internal Win32K header */ #include "win32kp.h" Modified: trunk/reactos/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] Wed Mar 25 22:32:35 2015 @@ -49,7 +49,7 @@ extern BOOL ClientPfnInit; extern HINSTANCE hModClient; extern HANDLE hModuleWin; // This Win32k Instance. -extern PCLS SystemClassList; +extern struct _CLS *SystemClassList; extern BOOL RegisteredSysClasses; typedef struct tagMENUSTATE MENUSTATE, *PMENUSTATE; @@ -77,17 +77,22 @@ PVOID pUMPDObj; } W32THREAD, *PW32THREAD; +#ifdef __cplusplus +typedef struct _THREADINFO : _W32THREAD +{ +#else typedef struct _THREADINFO { W32THREAD; +#endif PTL ptl; PPROCESSINFO ppi; struct _USER_MESSAGE_QUEUE* MessageQueue; struct tagKL* KeyboardLayout; - PCLIENTTHREADINFO pcti; + struct _CLIENTTHREADINFO * pcti; struct _DESKTOP* rpdesk; - PDESKTOPINFO pDeskInfo; - PCLIENTINFO pClientInfo; + struct _DESKTOPINFO * pDeskInfo; + struct _CLIENTINFO * pClientInfo; FLONG TIF_flags; PUNICODE_STRING pstrAppName; /* Messages that are currently dispatched to other threads */ @@ -112,7 +117,7 @@ struct _USER_MESSAGE_QUEUE* pqAttach; PTHREADINFO ptiSibling; ULONG fsHooks; - PHOOK sphkCurrent; + struct tagHOOK * sphkCurrent; LPARAM lParamHkCurrent; WPARAM wParamHkCurrent; struct tagSBTRACK* pSBTrack; @@ -130,6 +135,7 @@ WCHAR wchInjected; UINT cWindows; UINT cVisWindows; +#ifndef __cplusplus /// FIXME! LIST_ENTRY aphkStart[NB_HOOKS]; CLIENTTHREADINFO cti; // Used only when no Desktop or pcti NULL. @@ -151,7 +157,7 @@ #if DBG USHORT acExclusiveLockCount[GDIObjTypeTotal + 1]; #endif - +#endif // __cplusplus } THREADINFO; #include <poppack.h> @@ -234,14 +240,19 @@ #define CLIBS 32 +#ifdef __cplusplus +typedef struct _PROCESSINFO : _W32PROCESS +{ +#else typedef struct _PROCESSINFO { W32PROCESS; +#endif PTHREADINFO ptiList; PTHREADINFO ptiMainThread; struct _DESKTOP* rpdeskStartup; - PCLS pclsPrivateList; - PCLS pclsPublicList; + struct _CLS *pclsPrivateList; + struct _CLS *pclsPublicList; PPROCESSINFO ppiNext; INT cThreads; HDESK hdeskStartup; @@ -276,8 +287,10 @@ #if DBG BYTE DbgChannelLevel[DbgChCount]; +#ifndef __cplusplus DWORD DbgHandleCount[TYPE_CTYPES]; -#endif +#endif // __cplusplus +#endif // DBG } PROCESSINFO; #if DBG Modified: trunk/reactos/win32ss/win32k.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/win32k.h?rev=66890… ============================================================================== --- trunk/reactos/win32ss/win32k.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/win32k.h [iso-8859-1] Wed Mar 25 22:32:35 2015 @@ -3,3 +3,8 @@ /* Headers that shouldn't be precompiled due to GCC bugs */ /* Probe and capture */ #include <reactos/probe.h> + +#ifdef __cplusplus +#undef NULL +#define NULL nullptr +#endif Modified: trunk/reactos/win32ss/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/win32kp.h?rev=6689… ============================================================================== --- trunk/reactos/win32ss/win32kp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/win32kp.h [iso-8859-1] Wed Mar 25 22:32:35 2015 @@ -27,18 +27,10 @@ #define DBG_ENABLE_EVENT_LOGGING 0 #define DBG_ENABLE_SERVICE_HOOKS 0 -/* CSRSS Interface */ -#include "user/ntuser/csr.h" - -/* Misc headers */ -#include "user/ntuser/win32kdebug.h" -#include "user/ntuser/mmcopy.h" -#include "user/ntuser/tags.h" +/* Internal NtGdi Headers */ +typedef struct _DC *PDC; #include "gdi/ntgdi/rect.h" #include "gdi/ntgdi/misc.h" - -/* Internal NtGdi Headers */ -typedef struct _DC *PDC; #include "gdi/ntgdi/gdiobj.h" #include "gdi/ntgdi/palette.h" #include "gdi/eng/surface.h" @@ -74,7 +66,10 @@ #include "reactx/ntddraw/intddraw.h" /* Internal NtUser Headers */ +#include "user/ntuser/win32kdebug.h" #include "user/ntuser/win32.h" +#include "user/ntuser/tags.h" +#ifndef __cplusplus #include "user/ntuser/usrheap.h" #include "user/ntuser/object.h" #include "user/ntuser/ntuser.h" @@ -106,5 +101,11 @@ #include "user/ntuser/scroll.h" #include "user/ntuser/winpos.h" #include "user/ntuser/callback.h" +#include "user/ntuser/mmcopy.h" + +/* CSRSS Interface */ +#include "user/ntuser/csr.h" + +#endif // __cplusplus #include "gdi/ntgdi/gdidebug.h"

10 years, 1 month

[tkreuzer] 66889: [WIN32K] Make internal GDI headers C++ compatible, get rid of USER dependencies

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 25 22:32:22 2015 New Revision: 66889 URL: http://svn.reactos.org/svn/reactos?rev=66889&view=rev Log: [WIN32K] Make internal GDI headers C++ compatible, get rid of USER dependencies Modified: trunk/reactos/win32ss/gdi/eng/driverobj.h trunk/reactos/win32ss/gdi/eng/eng.h trunk/reactos/win32ss/gdi/eng/engobjects.h trunk/reactos/win32ss/gdi/eng/mapping.h trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h trunk/reactos/win32ss/gdi/ntgdi/palette.h Modified: trunk/reactos/win32ss/gdi/eng/driverobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/driverobj.… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/driverobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/driverobj.h [iso-8859-1] Wed Mar 25 22:32:22 2015 @@ -22,5 +22,5 @@ PEDRIVEROBJ DRIVEROBJ_TryLockObject(HDRVOBJ hdo) { - return GDIOBJ_TryLockObject(hdo, GDIObjType_DRVOBJ_TYPE); + return (PEDRIVEROBJ)GDIOBJ_TryLockObject(hdo, GDIObjType_DRVOBJ_TYPE); } Modified: trunk/reactos/win32ss/gdi/eng/eng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/eng.h?rev=… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/eng.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/eng.h [iso-8859-1] Wed Mar 25 22:32:22 2015 @@ -32,8 +32,8 @@ VOID FASTCALL IntEngWindowChanged( - _In_ PWND Window, - _In_ FLONG flChanged); + _In_ struct _WND *Window, + _In_ FLONG flChanged); ULONGLONG APIENTRY Modified: trunk/reactos/win32ss/gdi/eng/engobjects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engobjects… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engobjects.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engobjects.h [iso-8859-1] Wed Mar 25 22:32:22 2015 @@ -40,9 +40,14 @@ ---------------------------------------------------------------------------*/ /* EXtended CLip and Window Region Object */ +#ifdef __cplusplus +typedef struct _XCLIPOBJ : _WNDOBJ +{ +#else typedef struct _XCLIPOBJ { WNDOBJ; +#endif PVOID pClipRgn; /* prgnRao_ or (prgnVis_ if (prgnRao_ == z)) */ RECTL rclClipRgn; PVOID pscanClipRgn; /* Ptr to regions rect buffer based on iDirection. */ Modified: trunk/reactos/win32ss/gdi/eng/mapping.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/mapping.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/mapping.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/mapping.h [iso-8859-1] Wed Mar 25 22:32:22 2015 @@ -16,9 +16,14 @@ PVOID pSection; } FILEVIEW, *PFILEVIEW; +#ifdef __cplusplus +typedef struct _FONTFILEVIEW : FILEVIEW +{ +#else typedef struct _FONTFILEVIEW { FILEVIEW; +#endif DWORD reserved[2]; PWSTR pwszPath; SIZE_T ulRegionSize; Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Wed Mar 25 22:32:22 2015 @@ -220,7 +220,7 @@ { PDC pdc; - pdc = GDIOBJ_LockObject(hdc, GDIObjType_DC_TYPE); + pdc = (PDC)GDIOBJ_LockObject(hdc, GDIObjType_DC_TYPE); if (pdc) { ASSERT((GDI_HANDLE_GET_TYPE(pdc->BaseObject.hHmgr) == GDILoObjType_LO_DC_TYPE) || Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidebug… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] Wed Mar 25 22:32:22 2015 @@ -125,6 +125,7 @@ #define ID_Win32PreServiceHook 'WSH0' #define ID_Win32PostServiceHook 'WSH1' +#ifndef __cplusplus FORCEINLINE void GdiDbgAssertNoLocks(char * pszFile, ULONG nLine) { @@ -139,6 +140,7 @@ ASSERT(FALSE); } } +#endif // __cplusplus #endif Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Wed Mar 25 22:32:22 2015 @@ -1,4 +1,8 @@ #pragma once + +#ifdef _MSC_VER +#pragma warning(disable:4200) // zero-sized array in struct/union +#endif // _MSC_VER // Palette mode flags enum _PALFLAGS

10 years, 1 month

[tkreuzer] 66888: [WIN32SS/INCLUDE] - Add ntwin32.h, move declaration of PTHREADINFO, PPROCESSINFO and W32CLIENTINFO there - Avoid language extensions that are not C++ compatible - Avoid dependenen...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 25 22:32:06 2015 New Revision: 66888 URL: http://svn.reactos.org/svn/reactos?rev=66888&view=rev Log: [WIN32SS/INCLUDE] - Add ntwin32.h, move declaration of PTHREADINFO, PPROCESSINFO and W32CLIENTINFO there - Avoid language extensions that are not C++ compatible - Avoid dependenence to PTHREADINFO/PPROCESSINFO in ntuser.h and use incomplete types instead - Move duplicate definition of PATRECT from ntusrtyp.h to user32.h private header Modified: trunk/reactos/win32ss/include/ntgdityp.h trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/include/ntusrtyp.h trunk/reactos/win32ss/user/user32/include/user32.h Modified: trunk/reactos/win32ss/include/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntgdityp.h… ============================================================================== --- trunk/reactos/win32ss/include/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntgdityp.h [iso-8859-1] Wed Mar 25 22:32:06 2015 @@ -10,6 +10,8 @@ #ifndef _NTGDITYP_ #define _NTGDITYP_ + +#include "ntwin32.h" /* ENUMERATIONS **************************************************************/ @@ -436,9 +438,7 @@ DWORD dwCFCount; } CFONT, *PCFONT; -// -// GDI Batch structures. -// +/* GDI Batch structures. */ typedef struct _GDIBATCHHDR { SHORT Size; @@ -464,24 +464,13 @@ ULONG ulBrushClr; } GDIBSPATBLT, *PGDIBSPATBLT; -#ifndef _NTUSRTYP_ +/* FIXME: this should go to some "public" GDI32 header */ typedef struct _PATRECT { RECT r; HBRUSH hBrush; } PATRECT, * PPATRECT; -#endif -#ifndef __WIN32K_NTUSER_H -typedef struct _W32CLIENTINFO -{ - ULONG CI_flags; - ULONG cSpins; - ULONG ulWindowsVersion; - ULONG ulAppCompatFlags; - ULONG ulAppCompatFlags2; - ULONG W32ClientInfo[57]; -} W32CLIENTINFO, *PW32CLIENTINFO; -#endif + typedef struct _GDIBSPPATBLT { GDIBATCHHDR gbHdr; @@ -539,26 +528,20 @@ { GDIBATCHHDR gbHdr; int fnMode; - RECTL; + RECTL rcl; } GDIBSEXTSELCLPRGN, *PGDIBSEXTSELCLPRGN; -// -// Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn. + +/* Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn. */ typedef struct _GDIBSOBJECT { GDIBATCHHDR gbHdr; HGDIOBJ hgdiobj; } GDIBSOBJECT, *PGDIBSOBJECT; -// -// Declarations missing in ddk/winddi.h -// +/* Declaration missing in ddk/winddi.h */ typedef VOID (APIENTRY *PFN_DrvMovePanning)(LONG, LONG, FLONG); -//typedef BOOL (APIENTRY *PFN_DrvOffset)(SURFOBJ*, LONG, LONG, FLONG); - - -// -// Most of these are defined in ddk/winddi.h -// + +/* Most of these are defined in ddk/winddi.h */ typedef struct _DRIVER_FUNCTIONS { PFN_DrvEnablePDEV EnablePDEV; Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Wed Mar 25 22:32:06 2015 @@ -1,8 +1,8 @@ #ifndef __WIN32K_NTUSER_H #define __WIN32K_NTUSER_H -typedef struct _PROCESSINFO *PPROCESSINFO; -typedef struct _THREADINFO *PTHREADINFO; +struct _PROCESSINFO; +struct _THREADINFO; struct _DESKTOP; struct _WND; struct tagPOPUPMENU; @@ -21,8 +21,8 @@ union { PVOID pi; - PTHREADINFO pti; /* pointer to Win32ThreadInfo */ - PPROCESSINFO ppi; /* pointer to W32ProcessInfo */ + struct _THREADINFO *pti; /* pointer to Win32ThreadInfo */ + struct _PROCESSINFO *ppi; /* pointer to W32ProcessInfo */ }; unsigned char type; /* object type (0 if free) */ unsigned char flags; @@ -141,7 +141,7 @@ HWND hShellWindow; struct _WND *spwndShell; - PPROCESSINFO ppiShellProcess; + struct _PROCESSINFO *ppiShellProcess; union { @@ -178,7 +178,7 @@ typedef struct _THROBJHEAD { HEAD; - PTHREADINFO pti; + struct _THREADINFO *pti; } THROBJHEAD, *PTHROBJHEAD; typedef struct _THRDESKHEAD @@ -200,7 +200,7 @@ { HEAD; ULONG hTaskWow; - PPROCESSINFO ppi; + struct _PROCESSINFO *ppi; } PROCMARKHEAD, *PPROCMARKHEAD; #define UserHMGetHandle(obj) ((obj)->head.h) @@ -218,7 +218,7 @@ ULONG_PTR offPfn; ULONG flags; /* Some internal flags */ INT ihmod; - PTHREADINFO ptiHooked; + struct _THREADINFO *ptiHooked; struct _DESKTOP *rpdesk; /* ReactOS */ LIST_ENTRY Chain; /* Hook chain entry */ @@ -309,7 +309,7 @@ LPDWORD lpdwRegisteredClasses; ULONG Win32ClientInfo3[26]; /* It's just a pointer reference not to be used w the structure in user space. */ - PPROCESSINFO ppi; + struct _PROCESSINFO *ppi; } CLIENTINFO, *PCLIENTINFO; /* Make sure it fits into the TEB */ @@ -1032,8 +1032,8 @@ LUID luid; } BROADCASTPARM, *PBROADCASTPARM; -PTHREADINFO GetW32ThreadInfo(VOID); -PPROCESSINFO GetW32ProcessInfo(VOID); +struct _THREADINFO *GetW32ThreadInfo(VOID); +struct _PROCESSINFO *GetW32ProcessInfo(VOID); typedef struct _WNDMSG { Modified: trunk/reactos/win32ss/include/ntusrtyp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntusrtyp.h… ============================================================================== --- trunk/reactos/win32ss/include/ntusrtyp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntusrtyp.h [iso-8859-1] Wed Mar 25 22:32:06 2015 @@ -11,15 +11,11 @@ #ifndef _NTUSRTYP_ #define _NTUSRTYP_ +#include <ntwin32.h> + /* ENUMERATIONS **************************************************************/ /* TYPES *********************************************************************/ - -typedef struct _PATRECT -{ - RECT r; - HBRUSH hBrush; -} PATRECT, * PPATRECT; /* Bitfields for UserpreferencesMask SPI_ values (with defaults) */ /* See also http://technet.microsoft.com/nl-nl/library/cc957204(en-us).aspx */ @@ -88,7 +84,7 @@ typedef struct { union - { + { ICONRESDIR icon; CURSORRESDIR cursor; } ResInfo; Modified: trunk/reactos/win32ss/user/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/user32.h [iso-8859-1] Wed Mar 25 22:32:06 2015 @@ -61,4 +61,11 @@ /* User macros */ #include "user_x.h" +/* FIXME: this should be in a "public" GDI32 header */ +typedef struct _PATRECT +{ + RECT r; + HBRUSH hBrush; +} PATRECT, * PPATRECT; + #endif /* _USER32_PCH_ */

10 years, 1 month

[tkreuzer] 66887: [WIN32K/INCLUDE] Add ntwin32.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 25 22:30:28 2015 New Revision: 66887 URL: http://svn.reactos.org/svn/reactos?rev=66887&view=rev Log: [WIN32K/INCLUDE] Add ntwin32.h Added: trunk/reactos/win32ss/include/ntwin32.h (with props) Added: trunk/reactos/win32ss/include/ntwin32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntwin32.h?… ============================================================================== --- trunk/reactos/win32ss/include/ntwin32.h (added) +++ trunk/reactos/win32ss/include/ntwin32.h [iso-8859-1] Wed Mar 25 22:30:28 2015 @@ -0,0 +1,16 @@ + +#pragma once + +/* These are opaque for user mode */ +typedef struct _PROCESSINFO *PPROCESSINFO; +typedef struct _THREADINFO *PTHREADINFO; + +typedef struct _W32CLIENTINFO +{ + ULONG CI_flags; + ULONG cSpins; + ULONG ulWindowsVersion; + ULONG ulAppCompatFlags; + ULONG ulAppCompatFlags2; + ULONG W32ClientInfo[57]; +} W32CLIENTINFO, *PW32CLIENTINFO; Propchange: trunk/reactos/win32ss/include/ntwin32.h ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 1 month

[tkreuzer] 66886: [INCLUDE] - intsafe.h: Fix some constants to be C++ compatible - sal.h: Implement _Analysis_mode_, __prefast_operator_new_null and __prefast_operator_new_throws annotations - Make...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 25 22:27:44 2015 New Revision: 66886 URL: http://svn.reactos.org/svn/reactos?rev=66886&view=rev Log: [INCLUDE] - intsafe.h: Fix some constants to be C++ compatible - sal.h: Implement _Analysis_mode_, __prefast_operator_new_null and __prefast_operator_new_throws annotations - Make probe.h (mostly) C++ compatible Modified: trunk/reactos/include/ndk/no_sal2.h trunk/reactos/include/psdk/driverspecs.h trunk/reactos/include/psdk/intsafe.h trunk/reactos/include/psdk/sal.h trunk/reactos/include/reactos/probe.h Modified: trunk/reactos/include/ndk/no_sal2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/no_sal2.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/no_sal2.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/no_sal2.h [iso-8859-1] Wed Mar 25 22:27:44 2015 @@ -5,6 +5,7 @@ /* From sal.h */ #define _Always_(annos) +#define _Analysis_mode_(mode) #define _Analysis_noreturn_ #define _Analysis_assume_(expr) __analysis_assume(expr) #define _At_(target, annos) @@ -664,6 +665,8 @@ #define _Kernel_requires_resource_not_held_(kind) #define _Kernel_acquires_resource_(kind) #define _Landmark_(name) +#define __prefast_operator_new_null +#define __prefast_operator_new_throws /* concurrencysal.h */ #define _Benign_race_begin_ __pragma(warning(push)) Modified: trunk/reactos/include/psdk/driverspecs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/driverspecs.h… ============================================================================== --- trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] Wed Mar 25 22:27:44 2015 @@ -135,8 +135,14 @@ #define __internal_kernel_driver #define __kernel_code #define __kernel_driver -#define __prefast_operator_new_null -#define __prefast_operator_new_throws +#define __prefast_operator_new_null \ + void* __cdecl operator new(size_t size) throw(); \ + void* __cdecl operator new[](size_t size) throw(); \ + _Analysis_mode_(_Analysis_operator_new_null_) +#define __prefast_operator_new_throws \ + void* __cdecl operator new(size_t size) throw(std::bad_alloc); \ + void* __cdecl operator new[](size_t size) throw(std::bad_alloc); \ + _Analysis_mode_(_Analysis_operator_new_throw_) #define __user_code #define __user_driver #define ___drv_unit_internal_kernel_driver Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Wed Mar 25 22:27:44 2015 @@ -147,12 +147,12 @@ #define INT8_MAX ((signed char)127) #define UINT8_MAX ((unsigned char)0xffU) -#define BYTE_MAX 0xff -#define SHORT_MAX 32767 +#define BYTE_MAX ((unsigned char)0xff) +#define SHORT_MAX ((short)32767) #define INT16_MAX ((short)32767) -#define USHORT_MAX 0xffff -#define UINT16_MAX ((unsigned short)0xffffU) -#define WORD_MAX 0xffff +#define USHORT_MAX ((unsigned short)0xffff) +#define UINT16_MAX ((unsigned short)0xffff) +#define WORD_MAX ((unsigned short)0xffff) #define INT_MAX 2147483647 #define INT32_MAX 2147483647 #define UINT_MAX 0xffffffff @@ -196,15 +196,15 @@ /* Error values */ #define INT8_ERROR ((signed char)(-1)) #define UINT8_ERROR ((unsigned char)0xff) -#define BYTE_ERROR 0xff -#define SHORT_ERROR (-1) +#define BYTE_ERROR ((unsigned char)0xff) +#define SHORT_ERROR ((short)(-1)) #define INT16_ERROR ((short)(-1)) -#define USHORT_ERROR 0xffff -#define UINT16_ERROR ((unsigned short)0xffffU) -#define WORD_ERROR 0xffff +#define USHORT_ERROR ((unsigned short)0xffff) +#define UINT16_ERROR ((unsigned short)0xffff) +#define WORD_ERROR ((unsigned short)0xffff) #define INT_ERROR (-1) #define INT32_ERROR (-1) -#define UINT_ERROR 0xffffffff +#define UINT_ERROR 0xffffffffU #define UINT32_ERROR 0xffffffffU #define LONG_ERROR (-1L) #define ULONG_ERROR 0xffffffffUL @@ -228,25 +228,25 @@ #define _SIZE_T_ERROR 0xffffffffffffffffULL #else /* _WIN64 */ #define INT_PTR_ERROR (-1) -#define UINT_PTR_ERROR 0xffffffff +#define UINT_PTR_ERROR 0xffffffffU #define LONG_PTR_ERROR (-1L) #define ULONG_PTR_ERROR 0xffffffffUL #define DWORD_PTR_ERROR 0xffffffffUL #define PTRDIFF_T_ERROR (-1) -#define SIZE_T_ERROR 0xffffffff +#define SIZE_T_ERROR 0xffffffffU #define SSIZE_T_ERROR (-1L) #define _SIZE_T_ERROR 0xffffffffUL #endif /* _WIN64 */ /* special definitons (the CHAR ones should not be defined here!) */ #define _INTSAFE_CHAR CHAR -#define _INTSAFE_CHAR_ERROR 0xff +#define _INTSAFE_CHAR_ERROR ((signed char)(-1)) #ifdef _CHAR_UNSIGNED - #define _INTSAFE_CHAR_MIN 0 - #define _INTSAFE_CHAR_MAX 0xff + #define _INTSAFE_CHAR_MIN ((unsigned char)0) + #define _INTSAFE_CHAR_MAX ((unsigned char)0xff) #else - #define _INTSAFE_CHAR_MIN (-128) - #define _INTSAFE_CHAR_MAX 127 + #define _INTSAFE_CHAR_MIN ((signed char)(-128)) + #define _INTSAFE_CHAR_MAX ((signed char)127) #endif /* _CHAR_UNSIGNED */ #define size_t_ERROR SIZE_T_ERROR Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=668… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Wed Mar 25 22:27:44 2015 @@ -53,9 +53,12 @@ #error broken #endif // ] -#pragma warning(disable:6320) /* disable warning about SEH filter */ -#pragma warning(disable:28247) /* duplicated model file annotations */ +#pragma warning(disable:6320) /* Disable warning about SEH filter */ +#pragma warning(disable:28247) /* Duplicated model file annotations */ #pragma warning(disable:28251) /* Inconsistent annotation */ +#ifndef _M_IX86 // [ +#pragma warning(disable:28110 28111 28161 28162) /* Floating point save */ +#endif // ] /******************************************************************************/ //#include "codeanalysis\sourceannotations.h" @@ -420,6 +423,9 @@ #define _At_buffer_(target, iter, bound, annos) [SAL_at_buffer(p1=_SA_SPECSTRIZE(target), p2=_SA_SPECSTRIZE(iter), p3=_SA_SPECSTRIZE(bound))] [SAL_begin] annos [SAL_end] #define _On_failure_(annos) [SAL_context(p1="SAL_failed")] _Group_(_Post_ _Group_(annos)) #define _Always_(annos) _Group_(annos) _On_failure_(annos) + +#define _Analysis_mode_impl_(mode) _SAL2_NAME(_Analysis_mode_impl) _Group_([SAL_annotes(Name="SAL_analysisMode", p1=_SA_SPECSTRIZE(mode))]) +#define _Analysis_mode_(mode) typedef _Analysis_mode_impl_(mode) int __prefast_analysis_mode_flag__COUNTER__; #define _Analysis_noreturn_ _SAL2_NAME(_Analysis_noreturn_) [SAL_annotes(Name="SAL_terminates")] #define _Analysis_assume_(expr) __assume(expr) @@ -1099,6 +1105,7 @@ #define __inner_exceptthat #define __inner_typefix(ctype) #define _Always_(annos) +#define _Analysis_mode_(mode) #define _Analysis_noreturn_ #define _Analysis_assume_(expr) ((void)0) #define __analysis_assume(expr) ((void)0) 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] Wed Mar 25 22:27:44 2015 @@ -12,7 +12,7 @@ static const ULARGE_INTEGER __emptyULargeInteger = {{0, 0}}; static const IO_STATUS_BLOCK __emptyIoStatusBlock = {{0}, 0}; -#if defined(_WIN32K_) +#if defined(_WIN32K_) && !defined(__cplusplus) static const LARGE_STRING __emptyLargeString = {0, 0, 0, NULL}; #endif @@ -152,7 +152,12 @@ { _SEH2_TRY { +#ifdef __cplusplus + ProbeForRead(UnsafeSrc, sizeof(*UnsafeSrc), 1); + RtlCopyMemory(Dest, UnsafeSrc, sizeof(*UnsafeSrc)); +#else *Dest = ProbeForReadUnicodeString(UnsafeSrc); +#endif if(Dest->Buffer != NULL) { if (Dest->Length != 0) @@ -162,7 +167,7 @@ sizeof(WCHAR)); /* Allocate space for the buffer */ - Buffer = ExAllocatePoolWithTag(PagedPool, + Buffer = (PWCHAR)ExAllocatePoolWithTag(PagedPool, Dest->Length + sizeof(WCHAR), 'RTSU'); if (Buffer == NULL)

10 years, 1 month

[tkreuzer] 66885: [WIN32K] Implement GreCreateDIBitmapFromPackedDIB

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 25 22:27:16 2015 New Revision: 66885 URL: http://svn.reactos.org/svn/reactos?rev=66885&view=rev Log: [WIN32K] Implement GreCreateDIBitmapFromPackedDIB Modified: trunk/reactos/win32ss/gdi/ntgdi/dib.h trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dib.h?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dib.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dib.h [iso-8859-1] Wed Mar 25 22:27:16 2015 @@ -26,4 +26,11 @@ UINT MaxBits, UINT MaxInfo); +HBITMAP +NTAPI +GreCreateDIBitmapFromPackedDIB( + _In_reads_(cjPackedDIB )PVOID pvPackedDIB, + _In_ UINT cjPackedDIB, + _In_ ULONG uUsage); + #define DIB_PAL_BRUSHHACK 3 Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Wed Mar 25 22:27:16 2015 @@ -1539,6 +1539,56 @@ return Bmp; } +HBITMAP +NTAPI +GreCreateDIBitmapFromPackedDIB( + _In_reads_(cjPackedDIB )PVOID pvPackedDIB, + _In_ UINT cjPackedDIB, + _In_ ULONG uUsage) +{ + PBITMAPINFO pbmi; + PBYTE pjBits; + UINT cjInfo, cjBits; + HBITMAP hbm; + + /* We only support BITMAPINFOHEADER, make sure the size is ok */ + if (cjPackedDIB < sizeof(BITMAPINFOHEADER)) + { + return NULL; + } + + /* The packed DIB starts with the BITMAPINFOHEADER */ + pbmi = pvPackedDIB; + + if (cjPackedDIB < pbmi->bmiHeader.biSize) + { + return NULL; + } + + /* Calculate the info size and make sure the packed DIB is large enough */ + cjInfo = DIB_BitmapInfoSize(pbmi, uUsage); + if (cjPackedDIB <= cjInfo) + { + return NULL; + } + + /* The bitmap bits start after the header */ + pjBits = (PBYTE)pvPackedDIB + cjInfo; + cjBits = cjPackedDIB - cjInfo; + + hbm = GreCreateDIBitmapInternal(NULL, + pbmi->bmiHeader.biWidth, + abs(pbmi->bmiHeader.biHeight), + CBM_INIT | CBM_CREATDIB, + pjBits, + pbmi, + uUsage, + 0, + cjBits, + NULL); + + return hbm; +} HBITMAP APIENTRY

10 years, 1 month

[tkreuzer] 66884: [WIN32K] Add definition for DIB_PAL_INDICES and fix typo in the related brush flag (BR_IS_DIBPALINDICES). See http://support.microsoft.com/kb/kbview/108497

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 25 22:27:05 2015 New Revision: 66884 URL: http://svn.reactos.org/svn/reactos?rev=66884&view=rev Log: [WIN32K] Add definition for DIB_PAL_INDICES and fix typo in the related brush flag (BR_IS_DIBPALINDICES). See http://support.microsoft.com/kb/kbview/108497 Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h trunk/reactos/win32ss/include/ntgdityp.h Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Wed Mar 25 22:27:05 2015 @@ -90,7 +90,7 @@ #define BR_IS_PEN 0x00000400 /* Pen */ #define BR_IS_OLDSTYLEPEN 0x00000800 /* Geometric pen */ #define BR_IS_DIBPALCOLORS 0x00001000 -#define BR_IS_DIBPALINDICE 0x00002000 +#define BR_IS_DIBPALINDICES 0x00002000 #define BR_IS_DEFAULTSTYLE 0x00004000 #define BR_IS_MASKING 0x00008000 /* Pattern bitmap is used as transparent mask (?) */ #define BR_IS_INSIDEFRAME 0x00010000 Modified: trunk/reactos/win32ss/include/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntgdityp.h… ============================================================================== --- trunk/reactos/win32ss/include/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntgdityp.h [iso-8859-1] Wed Mar 25 22:27:05 2015 @@ -223,8 +223,12 @@ #define METARGN 2 // GetMetaRgn #define APIRGN 3 -/* Undocumented flag for fdwInit in CreateDIBitmap */ +/* New flag for fdwInit in CreateDIBitmap. See support.microsoft.com/kb/kbview/108497*/ #define CBM_CREATDIB 2 + +/* New color use parameter. See support.microsoft.com/kb/kbview/108497 */ +#define DIB_PAL_INDICES 2 + /* TYPES *********************************************************************/

10 years, 1 month

[tkreuzer] 66883: [WIN32K] - Handle allocation failures in FixupDIBBrushPalette - In IntCreateDIBitmap make sure to the absolute height to GreCreateBitmap

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 25 22:26:52 2015 New Revision: 66883 URL: http://svn.reactos.org/svn/reactos?rev=66883&view=rev Log: [WIN32K] - Handle allocation failures in FixupDIBBrushPalette - In IntCreateDIBitmap make sure to the absolute height to GreCreateBitmap Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Wed Mar 25 22:26:52 2015 @@ -9,7 +9,7 @@ #include <win32k.h> -DBG_DEFAULT_CHANNEL(GdiFont); +DBG_DEFAULT_CHANNEL(EngBrush); static const ULONG gaulHatchBrushes[HS_DDI_MAX][8] = { @@ -271,6 +271,11 @@ 0, 0, 0); + if (ppalNew == NULL) + { + ERR("Failed to allcate palette for brush\n"); + return NULL; + } /* Loop all colors */ for (i = 0; i < ppalDIB->NumColors; i++) @@ -357,6 +362,12 @@ { /* Create a palette with the colors from the DC */ ppalPattern = FixupDIBBrushPalette(psurfPattern->ppal, pebo->ppalDC); + if (ppalPattern == NULL) + { + ERR("FixupDIBBrushPalette() failed.\n"); + return FALSE; + } + pebo->ppalDIB = ppalPattern; } else Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Wed Mar 25 22:26:52 2015 @@ -1379,7 +1379,7 @@ else { handle = GreCreateBitmap(width, - height, + abs(height), 1, 1, NULL);

10 years, 1 month

[akhaldi] 66882: [MCIQTZ32] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Mar 25 16:00:49 2015 New Revision: 66882 URL: http://svn.reactos.org/svn/reactos?rev=66882&view=rev Log: [MCIQTZ32] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/mciqtz32/mciqtz.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mciqtz32/mciqtz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/mciqtz.… ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/mciqtz.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/mciqtz.c [iso-8859-1] Wed Mar 25 16:00:49 2015 @@ -608,6 +608,7 @@ { WINE_MCIQTZ* wma; HRESULT hr; + DWORD ret = MCI_INTEGER_RETURNED; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -666,30 +667,33 @@ LONG state = State_Stopped; IMediaControl_GetState(wma->pmctrl, -1, &state); if (state == State_Stopped) - lpParms->dwReturn = MCI_MODE_STOP; + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_MODE_STOP, MCI_MODE_STOP); else if (state == State_Running) { LONG code; LONG_PTR p1, p2; - lpParms->dwReturn = MCI_MODE_PLAY; + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_MODE_PLAY, MCI_MODE_PLAY); do { hr = IMediaEvent_GetEvent(wma->mevent, &code, &p1, &p2, 0); if (hr == S_OK && code == EC_COMPLETE){ - lpParms->dwReturn = MCI_MODE_STOP; + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_MODE_STOP, MCI_MODE_STOP); IMediaControl_Stop(wma->pmctrl); } } while (hr == S_OK); } else if (state == State_Paused) - lpParms->dwReturn = MCI_MODE_PAUSE; + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_MODE_PAUSE, MCI_MODE_PAUSE); + ret = MCI_RESOURCE_RETURNED; break; } case MCI_STATUS_MEDIA_PRESENT: FIXME("MCI_STATUS_MEDIA_PRESENT not implemented yet\n"); return MCIERR_UNRECOGNIZED_COMMAND; case MCI_STATUS_TIME_FORMAT: - lpParms->dwReturn = wma->time_format; + lpParms->dwReturn = MAKEMCIRESOURCE(wma->time_format, + MCI_FORMAT_RETURN_BASE + wma->time_format); + ret = MCI_RESOURCE_RETURNED; break; case MCI_STATUS_READY: FIXME("MCI_STATUS_READY not implemented yet\n"); @@ -705,7 +709,7 @@ if (dwFlags & MCI_NOTIFY) mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wDevID, MCI_NOTIFY_SUCCESSFUL); - return 0; + return ret; } /*************************************************************************** Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Mar 25 16:00:49 2015 @@ -103,7 +103,7 @@ reactos/dll/win32/mapi32 # Synced to Wine-1.7.27 reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.37 reactos/dll/win32/mcicda # Synced to Wine-1.7.27 -reactos/dll/win32/mciqtz32 # Synced to Wine-1.7.27 +reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.7.37 reactos/dll/win32/mciseq # Synced to Wine-1.7.27 reactos/dll/win32/mciwave # Synced to Wine-1.7.27 reactos/dll/win32/mgmtapi # Synced to Wine-1.7.27

10 years, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs