* include/amvideo.h (IFullScreenVideo): Define.

	(BIT_MASKS_MATCH,PALETTISED,PALETTE_ENTRIES,RESET_MASKS,RESET_PALETTE,
	SIZE_EGA_PALETTE,SIZE_MASKS,SIZE_PALETTE): Added Macros.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 8e705dd..1579496 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,7 +1,13 @@
 2006-05-04  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
+       * include/amvideo.h (IFullScreenVideo): Define.
+       (BIT_MASKS_MATCH,PALETTISED,PALETTE_ENTRIES,RESET_MASKS,RESET_PALETTE,
+       SIZE_EGA_PALETTE,SIZE_MASKS,SIZE_PALETTE): Added Macros.
+
+2006-05-04  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
        * include/winnls.h (CAL_SYEARMONTH,CAL_ITWODIGITYEARMAX,
-       CAL_NOUSEROVERRIDE, CAL_RETURN_NUMBER,CAL_USE_CP_ACP): Documented
+       CAL_NOUSEROVERRIDE,CAL_RETURN_NUMBER,CAL_USE_CP_ACP): Documented
        as available on Windows 98 and better.
        (CAL_UMALQURA,CAL_SSHORTESTDAYNAME*): Define, Windows Vista and better.
 

diff --git a/winsup/w32api/include/amvideo.h b/winsup/w32api/include/amvideo.h
index 641b6a4..e546280 100644 (file)
--- a/winsup/w32api/include/amvideo.h
+++ b/winsup/w32api/include/amvideo.h
@@ -24,6 +24,14 @@ extern "C" {
 #define AMDDS_YUV (AMDDS_YUVOFF|AMDDS_YUVOVR|AMDDS_YUVFLP)
 #define AMDDS_RGB (AMDDS_RGBOFF|AMDDS_RGBOVR|AMDDS_RGBFLP)
 #define AMDDS_PRIMARY (AMDDS_DCIPS|AMDDS_PS)
+#define BIT_MASKS_MATCH(pbmi1,pbmi2) (!memcmp((pbmi1)->dwBitMasks,(pbmi2)->dwBitMasks,3*sizeof(DWORD)))
+#define PALETTISED(pbmi) ((pbmi)->bmiHeader.biBitCount <= 8)
+#define PALETTE_ENTRIES(pbmi) (1 << (pbmi)->bmiHeader.biBitCount)
+#define RESET_MASKS(pbmi) ((void)memset((pbmi)->dwBitFields,0,3*sizeof(DWORD)))
+#define RESET_PALETTE(pbmi) ((void)memset(((pbmi)->bmiColors,0,256*sizeof(RGBQUAD)));
+#define SIZE_EGA_PALETTE (16*sizeof(RGBQUAD))
+#define SIZE_MASKS (3*sizeof(DWORD))
+#define SIZE_PALETTE (256*sizeof(RGBQUAD))
 typedef enum {
        AM_PROPERTY_FRAMESTEP_STEP = 1,
        AM_PROPERTY_FRAMESTEP_CANCEL = 2,
@@ -109,6 +117,31 @@ DECLARE_INTERFACE_(IQualProp, IUnknown)
        STDMETHOD(get_Jitter)(THIS_ int*) PURE;
 };
 #undef INTERFACE
+#define INTERFACE IFullScreenVideo
+DECLARE_INTERFACE_(IFullScreenVideo, IUnknown)
+{
+       STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
+       STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+       STDMETHOD_(ULONG,Release)(THIS) PURE;
+       STDMETHOD(CountModes)(THIS_ long*) PURE;
+       STDMETHOD(GetCaption)(THIS_ BSTR*) PURE;
+       STDMETHOD(GetClipFactor)(THIS_ long*) PURE;
+       STDMETHOD(GetCurrentMode)(THIS_ long*) PURE;
+       STDMETHOD(GetMessageDrain)(THIS_ HWND*) PURE;
+       STDMETHOD(GetModeInfo)(THIS_ long,long*,long*,long*) PURE;
+       STDMETHOD(GetMonitor)(THIS_ long*) PURE;
+       STDMETHOD(HideOnDeactivate)(THIS_ long) PURE;
+       STDMETHOD(IsHideOnDeactivate)(THIS) PURE;
+       STDMETHOD(IsModeAvailable)(THIS_ long) PURE;
+       STDMETHOD(IsModeEnabled)(THIS_ long) PURE;
+       STDMETHOD(SetCaption)(THIS_ BSTR) PURE;
+       STDMETHOD(SetClipFactor)(THIS_ long) PURE;
+       STDMETHOD(SetDefault)(THIS) PURE;
+       STDMETHOD(SetEnabled)(THIS_ long,long) PURE;
+       STDMETHOD(SetMessageDrain)(THIS_ HWND) PURE;
+       STDMETHOD(SetMonitor)(THIS_ long) PURE;
+};
+#undef INTERFACE
 #define INTERFACE IFullScreenVideoEx
 DECLARE_INTERFACE_(IFullScreenVideoEx, IFullScreenVideo)
 {