misc

Signed-off-by: Mattias Andrée <maandree@kth.se>

1 files changed, 33 insertions, 6 deletions

diff --git a/gamma-w32-gdi.h b/method-w32-gdi.h
index 245a94d..d78af91 100644
--- a/gamma-w32-gdi.h
+++ b/method-w32-gdi.h
@@ -1,6 +1,23 @@
 /* See LICENSE file for copyright and license details. */
-#ifndef LIBGAMMA_GAMMA_W32_GDI_H
-#define LIBGAMMA_GAMMA_W32_GDI_H
+
+#ifndef WINVER
+# define WINVER 0x0500
+#endif
+#ifdef FAKE_LIBGAMMA_METHOD_W32_GDI
+# include "fake-w32-gdi.h"
+#else
+# include <windows.h>
+# include <wingdi.h>
+#endif
+
+
+/**
+ * The gamma ramp size that devices will always have in Windows GDI
+ * 
+ * @see  http://msdn.microsoft.com/en-us/library/windows/desktop/dd372194(v=vs.85).aspx
+ */
+#define W32_GDI_GAMMA_RAMP_SIZE 256
+
 
 
 /**
@@ -8,6 +25,7 @@
  * 
  * @param  this  The data structure to fill with the method's capabilities
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__)))
 void libgamma_w32_gdi_method_capabilities(libgamma_method_capabilities_t *restrict);
 
 /**
@@ -23,6 +41,7 @@ void libgamma_w32_gdi_method_capabilities(libgamma_method_capabilities_t *restri
  * @return          Zero on success, otherwise (negative) the value of an
  *                  error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__(1)))
 int libgamma_w32_gdi_site_initialise(libgamma_site_state_t *restrict, char *restrict);
 
 /**
@@ -30,6 +49,7 @@ int libgamma_w32_gdi_site_initialise(libgamma_site_state_t *restrict, char *rest
  * 
  * @param  this  The site state
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__)))
 void libgamma_w32_gdi_site_destroy(libgamma_site_state_t *restrict);
 
 /**
@@ -39,6 +59,7 @@ void libgamma_w32_gdi_site_destroy(libgamma_site_state_t *restrict);
  * @return        Zero on success, otherwise (negative) the value of an
  *                error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_w32_gdi_site_restore(libgamma_site_state_t *restrict);
 
 
@@ -51,6 +72,7 @@ int libgamma_w32_gdi_site_restore(libgamma_site_state_t *restrict);
  * @return             Zero on success, otherwise (negative) the value of an
  *                     error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_w32_gdi_partition_initialise(libgamma_partition_state_t *restrict, libgamma_site_state_t *restrict, size_t);
 
 /**
@@ -58,6 +80,7 @@ int libgamma_w32_gdi_partition_initialise(libgamma_partition_state_t *restrict,
  * 
  * @param  this  The partition state
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__)))
 void libgamma_w32_gdi_partition_destroy(libgamma_partition_state_t *restrict);
 
 /**
@@ -67,6 +90,7 @@ void libgamma_w32_gdi_partition_destroy(libgamma_partition_state_t *restrict);
  * @return        Zero on success, otherwise (negative) the value of an
  *                error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_w32_gdi_partition_restore(libgamma_partition_state_t *restrict);
 
 
@@ -79,6 +103,7 @@ int libgamma_w32_gdi_partition_restore(libgamma_partition_state_t *restrict);
  * @return             Zero on success, otherwise (negative) the value of an
  *                     error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_w32_gdi_crtc_initialise(libgamma_crtc_state_t *restrict, libgamma_partition_state_t *restrict, size_t);
 
 /**
@@ -86,6 +111,7 @@ int libgamma_w32_gdi_crtc_initialise(libgamma_crtc_state_t *restrict, libgamma_p
  * 
  * @param  this  The CRTC state
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__)))
 void libgamma_w32_gdi_crtc_destroy(libgamma_crtc_state_t *restrict);
 
 /**
@@ -95,6 +121,7 @@ void libgamma_w32_gdi_crtc_destroy(libgamma_crtc_state_t *restrict);
  * @return        Zero on success, otherwise (negative) the value of an
  *                error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_w32_gdi_crtc_restore(libgamma_crtc_state_t *restrict);
 
 
@@ -106,6 +133,7 @@ int libgamma_w32_gdi_crtc_restore(libgamma_crtc_state_t *restrict);
  * @param   fields  OR:ed identifiers for the information about the CRTC that should be read
  * @return          Zero on success, -1 on error. On error refer to the error reports in `this`
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_w32_gdi_get_crtc_information(libgamma_crtc_information_t *restrict, libgamma_crtc_state_t *restrict, int32_t);
 
 /**
@@ -116,6 +144,7 @@ int libgamma_w32_gdi_get_crtc_information(libgamma_crtc_information_t *restrict,
  * @return         Zero on success, otherwise (negative) the value of an
  *                 error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_w32_gdi_crtc_get_gamma_ramps16(libgamma_crtc_state_t *restrict, libgamma_gamma_ramps16_t *restrict);
 
 /**
@@ -126,7 +155,5 @@ int libgamma_w32_gdi_crtc_get_gamma_ramps16(libgamma_crtc_state_t *restrict, lib
  * @return         Zero on success, otherwise (negative) the value of an
  *                 error identifier provided by this library
  */
-int libgamma_w32_gdi_crtc_set_gamma_ramps16(libgamma_crtc_state_t *restrict, libgamma_gamma_ramps16_t);
-
-
-#endif
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
+int libgamma_w32_gdi_crtc_set_gamma_ramps16(libgamma_crtc_state_t *restrict, const libgamma_gamma_ramps16_t *restrict);