[PATCH 0/1] MR960: windowscodecs: Redirect TIFF debug output to the Wine debug functions.

[PATCH 1/1] windowscodecs: Redirect TIFF debug output to the Wine debug functions.

[Alexandre Julliard]

From: Alexandre Julliard

---
 dlls/windowscodecs/libtiff.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/dlls/windowscodecs/libtiff.c b/dlls/windowscodecs/libtiff.c
index c4676601c2c..1bfc555f116 100644
--- a/dlls/windowscodecs/libtiff.c
+++ b/dlls/windowscodecs/libtiff.c
@@ -34,6 +34,21 @@
 #include "wine/debug.h"

WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+WINE_DECLARE_DEBUG_CHANNEL(tiff);
+
+static void tiff_error_handler( const char *module, const char *format, va_list args )
+{
+    if (!ERR_ON(tiff)) return;
+    if (wine_dbg_vlog( __WINE_DBCL_ERR, &__wine_dbch_tiff, module, format, args ) != -1)
+        __wine_dbg_output( "\n" );
+}
+
+static void tiff_warning_handler( const char *module, const char *format, va_list args )
+{
+    if (!WARN_ON(tiff)) return;
+    if (wine_dbg_vlog( __WINE_DBCL_WARN, &__wine_dbch_tiff, module, format, args ) != -1)
+        __wine_dbg_output( "\n" );
+}

static tsize_t tiff_stream_read(thandle_t client_data, tdata_t data, tsize_t size)
 {
@@ -1077,6 +1092,8 @@ HRESULT CDECL tiff_decoder_create(struct decoder_info *info, struct decoder **re
     info->block_format = GUID_ContainerFormatTiff;
     info->clsid = CLSID_WICTiffDecoder;

+    TIFFSetErrorHandler( tiff_error_handler );
+    TIFFSetWarningHandler( tiff_warning_handler );
     return S_OK;
 }

@@ -1316,5 +1333,7 @@ HRESULT CDECL tiff_encoder_create(struct encoder_info *info, struct encoder **re

*result = &This->encoder;

+    TIFFSetErrorHandler( tiff_error_handler );
+    TIFFSetWarningHandler( tiff_warning_handler );
     return S_OK;
 }

[PATCH 0/1] MR960: windowscodecs: Redirect TIFF debug output to the Wine debug functions. - approved

[Esme Povirk (＠madewokherd)]

This merge request was approved by Esme Povirk.