From ea55caa53a66ed0fcc90b7cd8be8325724a89bfa Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Fri, 17 Feb 2017 12:17:20 +0000 Subject: [PATCH] [WINDOWSCODECS] - Fix some MSVC-specific definitions svn path=/trunk/; revision=73809 --- reactos/dll/win32/windowscodecs/msvc-thiscall.c | 1 + reactos/dll/win32/windowscodecs/typeof.h | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/reactos/dll/win32/windowscodecs/msvc-thiscall.c b/reactos/dll/win32/windowscodecs/msvc-thiscall.c index 7b2490841f7..0e347bae9ec 100644 --- a/reactos/dll/win32/windowscodecs/msvc-thiscall.c +++ b/reactos/dll/win32/windowscodecs/msvc-thiscall.c @@ -1,5 +1,6 @@ #include "wincodecs_private.h" +#undef DEFINE_THISCALL_WRAPPER #define DEFINE_THISCALL_WRAPPER(func,args) \ typedef struct {int x[args/4];} _tag_##func; \ void __stdcall func(_tag_##func p1); \ diff --git a/reactos/dll/win32/windowscodecs/typeof.h b/reactos/dll/win32/windowscodecs/typeof.h index 384091cbd6d..6ca1dc9f079 100644 --- a/reactos/dll/win32/windowscodecs/typeof.h +++ b/reactos/dll/win32/windowscodecs/typeof.h @@ -24,17 +24,17 @@ struct png_color_16_struct; typedef struct jpeg_error_mgr * (__cdecl typeof(jpeg_std_error))(struct jpeg_error_mgr *); typedef void (__cdecl typeof(jpeg_CreateDecompress))(struct jpeg_decompress_struct *, int, __typeof_size); -typedef int (__cdecl typeof(jpeg_read_header))(struct jpeg_decompress_struct *, int); -typedef int (__cdecl typeof(jpeg_start_decompress))(struct jpeg_decompress_struct *); +typedef int (__cdecl typeof(jpeg_read_header))(struct jpeg_decompress_struct *, unsigned char); +typedef unsigned char (__cdecl typeof(jpeg_start_decompress))(struct jpeg_decompress_struct *); typedef unsigned int (__cdecl typeof(jpeg_read_scanlines))(struct jpeg_decompress_struct *, unsigned char **, unsigned int); -typedef int (__cdecl typeof(jpeg_finish_decompress))(struct jpeg_decompress_struct *); +typedef unsigned char (__cdecl typeof(jpeg_finish_decompress))(struct jpeg_decompress_struct *); typedef void (__cdecl typeof(jpeg_destroy_decompress))(struct jpeg_decompress_struct *); typedef unsigned char (__cdecl typeof(jpeg_resync_to_restart))(struct jpeg_decompress_struct *, int); typedef void (__cdecl typeof(jpeg_CreateCompress))(struct jpeg_compress_struct *, int, __typeof_size); typedef void (__cdecl typeof(jpeg_start_compress))(struct jpeg_compress_struct *, unsigned char); typedef void (__cdecl typeof(jpeg_destroy_compress))(struct jpeg_compress_struct *); -typedef void (__cdecl typeof(jpeg_finish_compress))(struct jpeg_decompress_struct *); -typedef void (__cdecl typeof(jpeg_set_defaults))(struct jpeg_decompress_struct *); +typedef void (__cdecl typeof(jpeg_finish_compress))(struct jpeg_compress_struct *); +typedef void (__cdecl typeof(jpeg_set_defaults))(struct jpeg_compress_struct *); typedef unsigned int (__cdecl typeof(jpeg_write_scanlines))(struct jpeg_compress_struct *, char **, unsigned int); typedef void (*png_error_ptr_1)(struct png_struct_def *, const char *); @@ -79,7 +79,7 @@ typedef void (__cdecl typeof(png_set_crc_action))(struct png_struct_def *, int, typedef void (__stdcall typeof(png_set_PLTE))(struct png_struct_def *, struct png_info_def *, const struct png_color_struct *, int); typedef void (__stdcall typeof(png_set_tRNS))(struct png_struct_def *, struct png_info_def *, const unsigned char *, int, const struct png_color_16_struct *); typedef void *thandle_t_1; -typedef int (*TIFFReadWriteProc_1)(thandle_t_1, void *, long); +typedef int (*TIFFReadWriteProc_1)(thandle_t_1, void *, __typeof_intptr); typedef unsigned int (*TIFFSeekProc_1)(void *, unsigned int, int); typedef int (*TIFFCloseProc_1)(thandle_t_1); typedef unsigned int (*TIFFSizeProc_1)(thandle_t_1); -- 2.17.1