April 2010 - Wine-commits - list.winehq.org

Roderick Colenbrander : wined3d: Move srgb checks away from d3dfmt_get_conv .
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: a4559e761b07038ce954e3c157001146a4f4c2a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4559e761b07038ce954e3c15… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 8 22:49:46 2010 +0200 wined3d: Move srgb checks away from d3dfmt_get_conv. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 67 ++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 43 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dc3e1af..3b87878 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5202,7 +5202,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, * surface to the destination's sysmem copy. If surface conversion is * needed, use BltFast instead to copy in sysmem and use regular surface * loading. */ - d3dfmt_get_conv(dst_impl, FALSE, TRUE, &dummy_desc, &convert, FALSE); + d3dfmt_get_conv(dst_impl, FALSE, TRUE, &dummy_desc, &convert); if (convert != NO_CONVERSION) return IWineD3DSurface_BltFast(dst_surface, dst_x, dst_y, src_surface, src_rect, 0); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cde239a..f9ca8d3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -720,9 +720,23 @@ static void surface_download_data(IWineD3DSurfaceImpl *This, const struct wined3 * correct texture. */ /* Context activation is done by the caller. */ static void surface_upload_data(IWineD3DSurfaceImpl *This, const struct wined3d_gl_info *gl_info, - const struct wined3d_format_desc *format_desc, GLsizei width, GLsizei height, const GLvoid *data) + const struct wined3d_format_desc *format_desc, BOOL srgb, GLsizei width, GLsizei height, const GLvoid *data) { - GLenum internal = format_desc->glInternal; + GLenum internal; + + if (srgb) + { + internal = format_desc->glGammaInternal; + } + else if (This->resource.usage & WINED3DUSAGE_RENDERTARGET + && surface_is_offscreen((IWineD3DSurface *)This)) + { + internal = format_desc->rtInternal; + } + else + { + internal = format_desc->glInternal; + } TRACE("This %p, internal %#x, width %d, height %d, format %#x, type %#x, data %p.\n", This, internal, width, height, format_desc->glFormat, format_desc->glType, data); @@ -783,11 +797,25 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, const struct wined3d_ * the correct texture. */ /* Context activation is done by the caller. */ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, const struct wined3d_gl_info *gl_info, - const struct wined3d_format_desc *format_desc, GLsizei width, GLsizei height) + const struct wined3d_format_desc *format_desc, BOOL srgb, GLsizei width, GLsizei height) { BOOL enable_client_storage = FALSE; const BYTE *mem = NULL; - GLenum internal = format_desc->glInternal; + GLenum internal; + + if (srgb) + { + internal = format_desc->glGammaInternal; + } + else if (This->resource.usage & WINED3DUSAGE_RENDERTARGET + && surface_is_offscreen((IWineD3DSurface *)This)) + { + internal = format_desc->rtInternal; + } + else + { + internal = format_desc->glInternal; + } if (format_desc->heightscale != 1.0f && format_desc->heightscale != 0.0f) height *= format_desc->heightscale; @@ -1475,7 +1503,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) GLint prevRead; BOOL alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; - d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &desc, &convert, srgb); + d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &desc, &convert); /* Activate the surface to read from. In some situations it isn't the currently active target(e.g. backbuffer * locking during offscreen rendering). RESOURCELOAD is ok because glCopyTexSubImage2D isn't affected by any @@ -1518,7 +1546,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) if (!(This->Flags & alloc_flag)) { - surface_allocate_surface(This, gl_info, &desc, This->pow2Width, This->pow2Height); + surface_allocate_surface(This, gl_info, &desc, srgb, This->pow2Width, This->pow2Height); This->Flags |= alloc_flag; } @@ -1553,7 +1581,7 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_ if (surface->Flags & alloc_flag) return; - d3dfmt_get_conv(surface, TRUE, TRUE, &desc, &convert, srgb); + d3dfmt_get_conv(surface, TRUE, TRUE, &desc, &convert); if(convert != NO_CONVERSION) surface->Flags |= SFLAG_CONVERTED; else surface->Flags &= ~SFLAG_CONVERTED; @@ -1569,7 +1597,7 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_ } surface_bind_and_dirtify(surface, srgb); - surface_allocate_surface(surface, gl_info, &desc, width, height); + surface_allocate_surface(surface, gl_info, &desc, srgb, width, height); surface->Flags |= alloc_flag; } @@ -2113,10 +2141,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_ReleaseDC(IWineD3DSurface *iface, HDC IWineD3DSurface Internal (No mapping to directx api) parts follow ****************************************************** */ -HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, struct wined3d_format_desc *desc, CONVERT_TYPES *convert, BOOL srgb_mode) +HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, struct wined3d_format_desc *desc, CONVERT_TYPES *convert) { BOOL colorkey_active = need_alpha_ck && (This->CKeyFlags & WINEDDSD_CKSRCBLT); - const struct wined3d_format_desc *glDesc = This->resource.format_desc; IWineD3DDeviceImpl *device = This->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; BOOL blit_supported = FALSE; @@ -2126,18 +2153,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *desc = *This->resource.format_desc; *convert = NO_CONVERSION; - /* TODO: the caller should perform this check */ - if(srgb_mode) { - desc->glInternal = glDesc->glGammaInternal; - } - else if (This->resource.usage & WINED3DUSAGE_RENDERTARGET - && surface_is_offscreen((IWineD3DSurface *) This)) - { - desc->glInternal = glDesc->rtInternal; - } else { - desc->glInternal = glDesc->glInternal; - } - /* Ok, now look if we have to do any conversion */ switch(This->resource.format_desc->format) { @@ -4773,7 +4788,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D IWineD3DSurfaceImpl_LoadLocation(iface, SFLAG_INSYSMEM, rect); } - d3dfmt_get_conv(This, TRUE /* We need color keying */, FALSE /* We won't use textures */, &desc, &convert, FALSE); + d3dfmt_get_conv(This, TRUE /* We need color keying */, FALSE /* We won't use textures */, &desc, &convert); /* The width is in 'length' not in bytes */ width = This->currentDesc.Width; @@ -4831,7 +4846,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D struct wined3d_context *context = NULL; d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, - &desc, &convert, FALSE); + &desc, &convert); if(srgb) { if((This->Flags & (SFLAG_INTEXTURE | SFLAG_INSYSMEM)) == SFLAG_INTEXTURE) { @@ -4902,7 +4917,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D TRACE("non power of two support\n"); if (mem || (This->Flags & SFLAG_PBO)) { - surface_upload_data(This, gl_info, &desc, + surface_upload_data(This, gl_info, &desc, srgb, This->currentDesc.Width, This->currentDesc.Height, mem); } } else { @@ -4911,7 +4926,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D */ if (mem || (This->Flags & SFLAG_PBO)) { - surface_upload_data(This, gl_info, &desc, This->glRect.right - This->glRect.left, + surface_upload_data(This, gl_info, &desc, srgb, This->glRect.right - This->glRect.left, This->glRect.bottom - This->glRect.top, mem); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fc0a457..f12bd2d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2242,7 +2242,7 @@ typedef enum { } CONVERT_TYPES; HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, - struct wined3d_format_desc *desc, CONVERT_TYPES *convert, BOOL srgb_mode) DECLSPEC_HIDDEN; + struct wined3d_format_desc *desc, CONVERT_TYPES *convert) DECLSPEC_HIDDEN; void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey) DECLSPEC_HIDDEN; BOOL palette9_changed(IWineD3DSurfaceImpl *This) DECLSPEC_HIDDEN;

1 0

Roderick Colenbrander : wined3d: Start moving texture format fixups to the formats table.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: d7e1b973c7bac38f7b178ac8c297672fd2ace565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e1b973c7bac38f7b178ac8c… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 8 22:49:47 2010 +0200 wined3d: Start moving texture format fixups to the formats table. --- dlls/wined3d/surface.c | 68 ++------ dlls/wined3d/utils.c | 327 +++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 207 insertions(+), 189 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7e1b973c7bac38f7b178…

1 0

Roderick Colenbrander : wined3d: Move Q8W8V8U8 conversion to the format table.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 60c6294f843fab02fd48d9a82d4fac8a3797e2c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c6294f843fab02fd48d9a82… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 8 22:49:48 2010 +0200 wined3d: Move Q8W8V8U8 conversion to the format table. --- dlls/wined3d/surface.c | 26 -------------------------- dlls/wined3d/utils.c | 26 ++++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f86c4e4..39029b1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2261,12 +2261,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ } break; - case WINED3DFMT_R8G8B8A8_SNORM: - if (gl_info->supported[NV_TEXTURE_SHADER]) break; - *convert = CONVERT_Q8W8V8U8; - desc->conv_byte_count = 4; - break; - case WINED3DFMT_L4A4_UNORM: /* WINED3DFMT_L4A4_UNORM exists as an internal gl format, but for some reason there is not * format+type combination to load it. Thus convert it to A8L8, then load it @@ -2563,26 +2557,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI } break; - case CONVERT_Q8W8V8U8: - { - unsigned int x, y; - const DWORD *Source; - unsigned char *Dest; - for(y = 0; y < height; y++) { - Source = (const DWORD *)(src + y * pitch); - Dest = dst + y * outpitch; - for (x = 0; x < width; x++ ) { - long color = (*Source++); - /* B */ Dest[0] = ((color >> 16) & 0xff) + 128; /* W */ - /* G */ Dest[1] = ((color >> 8 ) & 0xff) + 128; /* V */ - /* R */ Dest[2] = (color & 0xff) + 128; /* U */ - /* A */ Dest[3] = ((color >> 24) & 0xff) + 128; /* Q */ - Dest += 4; - } - } - break; - } - case CONVERT_L6V5U5: { unsigned int x, y; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5b0af2a..bda0bde 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -263,6 +263,28 @@ static void convert_r8g8_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT widt } } +static void convert_r8g8b8a8_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +{ + unsigned int x, y; + const DWORD *Source; + unsigned char *Dest; + + for(y = 0; y < height; y++) + { + Source = (const DWORD *)(src + y * pitch); + Dest = dst + y * pitch; + for (x = 0; x < width; x++ ) + { + long color = (*Source++); + /* B */ Dest[0] = ((color >> 16) & 0xff) + 128; /* W */ + /* G */ Dest[1] = ((color >> 8 ) & 0xff) + 128; /* V */ + /* R */ Dest[2] = (color & 0xff) + 128; /* U */ + /* A */ Dest[3] = ((color >> 24) & 0xff) + 128; /* Q */ + Dest += 4; + } + } +} + static void convert_r16g16_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) { unsigned int x, y; @@ -493,9 +515,9 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, NV_TEXTURE_SHADER, NULL}, {WINED3DFMT_R8G8B8A8_SNORM, GL_RGBA8, GL_RGBA8, 0, - GL_BGRA, GL_UNSIGNED_BYTE, 0, + GL_BGRA, GL_UNSIGNED_BYTE, 4, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, - WINED3D_GL_EXT_NONE, NULL}, + WINED3D_GL_EXT_NONE, &convert_r8g8b8a8_snorm}, {WINED3DFMT_R8G8B8A8_SNORM, GL_SIGNED_RGBA8_NV, GL_SIGNED_RGBA8_NV, 0, GL_RGBA, GL_BYTE, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING,

1 0

Alexandre Julliard : tests: Use the correct format of varargs list when building with msvcrt.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: cf4272360224cb269fc83d59252ce0ac2c8f8c84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf4272360224cb269fc83d592… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 15:48:05 2010 +0200 tests: Use the correct format of varargs list when building with msvcrt. --- include/wine/test.h | 72 +++++++++++++++++++++++++++++++-------------------- 1 files changed, 44 insertions(+), 28 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index e6a7711..0d00e4b 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -82,23 +82,31 @@ static inline int winetest_strcmpW( const WCHAR *str1, const WCHAR *str2 ) #define START_TEST(name) void func_##name(void) #endif +#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +#define __winetest_cdecl __cdecl +#define __winetest_va_list __builtin_ms_va_list +#else +#define __winetest_cdecl +#define __winetest_va_list va_list +#endif + extern int broken( int condition ); -extern int winetest_vok( int condition, const char *msg, va_list ap ); -extern void winetest_vskip( const char *msg, va_list ap ); +extern int winetest_vok( int condition, const char *msg, __winetest_va_list ap ); +extern void winetest_vskip( const char *msg, __winetest_va_list ap ); #ifdef __GNUC__ -extern void winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); -extern void winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); -extern void winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); -extern void winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2))); +extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); +extern void __winetest_cdecl winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); +extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); +extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2))); #else /* __GNUC__ */ -extern void winetest_ok( int condition, const char *msg, ... ); -extern void winetest_skip( const char *msg, ... ); -extern void winetest_win_skip( const char *msg, ... ); -extern void winetest_trace( const char *msg, ... ); +extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ); +extern void __winetest_cdecl winetest_skip( const char *msg, ... ); +extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ); +extern void __winetest_cdecl winetest_trace( const char *msg, ... ); #endif /* __GNUC__ */ @@ -168,6 +176,14 @@ extern void winetest_trace( const char *msg, ... ); #include <stdio.h> +#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +# define __winetest_va_start(list,arg) __builtin_ms_va_start(list,arg) +# define __winetest_va_end(list) __builtin_ms_va_end(list) +#else +# define __winetest_va_start(list,arg) va_start(list,arg) +# define __winetest_va_end(list) va_end(list) +#endif + struct test { const char *name; @@ -283,7 +299,7 @@ int broken( int condition ) * Return: * 0 if condition does not have the expected value, 1 otherwise */ -int winetest_vok( int condition, const char *msg, va_list args ) +int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { tls_data* data=get_tls_data(); @@ -330,30 +346,30 @@ int winetest_vok( int condition, const char *msg, va_list args ) } } -void winetest_ok( int condition, const char *msg, ... ) +void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) { - va_list valist; + __winetest_va_list valist; - va_start(valist, msg); + __winetest_va_start(valist, msg); winetest_vok(condition, msg, valist); - va_end(valist); + __winetest_va_end(valist); } -void winetest_trace( const char *msg, ... ) +void __winetest_cdecl winetest_trace( const char *msg, ... ) { - va_list valist; + __winetest_va_list valist; tls_data* data=get_tls_data(); if (winetest_debug > 0) { fprintf( stdout, "%s:%d: ", data->current_file, data->current_line ); - va_start(valist, msg); + __winetest_va_start(valist, msg); vfprintf(stdout, msg, valist); - va_end(valist); + __winetest_va_end(valist); } } -void winetest_vskip( const char *msg, va_list args ) +void winetest_vskip( const char *msg, __winetest_va_list args ) { tls_data* data=get_tls_data(); @@ -362,23 +378,23 @@ void winetest_vskip( const char *msg, va_list args ) skipped++; } -void winetest_skip( const char *msg, ... ) +void __winetest_cdecl winetest_skip( const char *msg, ... ) { - va_list valist; - va_start(valist, msg); + __winetest_va_list valist; + __winetest_va_start(valist, msg); winetest_vskip(msg, valist); - va_end(valist); + __winetest_va_end(valist); } -void winetest_win_skip( const char *msg, ... ) +void __winetest_cdecl winetest_win_skip( const char *msg, ... ) { - va_list valist; - va_start(valist, msg); + __winetest_va_list valist; + __winetest_va_start(valist, msg); if (strcmp(winetest_platform, "windows") == 0) winetest_vskip(msg, valist); else winetest_vok(0, msg, valist); - va_end(valist); + __winetest_va_end(valist); } void winetest_start_todo( const char* platform )

1 0

Alexandre Julliard : d3d8: Avoid using a pointer difference in a trace.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 26cc3efb3305485e5c331d0843cc5272ccf55719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26cc3efb3305485e5c331d084… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 15:54:54 2010 +0200 d3d8: Avoid using a pointer difference in a trace. --- dlls/d3d8/device.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e9319be..2312a6a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -171,18 +171,19 @@ static DWORD d3d8_allocate_handle(struct d3d8_handle_table *t, void *object, enu if (t->free_entries) { + DWORD index = t->free_entries - t->entries; /* Use a free handle */ entry = t->free_entries; if (entry->type != D3D8_HANDLE_FREE) { - ERR("Handle %u(%p) is in the free list, but has type %#x.\n", (entry - t->entries), entry, entry->type); + ERR("Handle %u(%p) is in the free list, but has type %#x.\n", index, entry, entry->type); return D3D8_INVALID_HANDLE; } t->free_entries = entry->object; entry->object = object; entry->type = type; - return entry - t->entries; + return index; } if (!(t->entry_count < t->table_size))

1 0

Alexandre Julliard : secur32: Avoid using a pointer difference in a trace.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 43a98ecb21cd93dd719096ab9b3e873e307b4643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a98ecb21cd93dd719096ab9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 16:14:07 2010 +0200 secur32: Avoid using a pointer difference in a trace. --- dlls/secur32/schannel.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 6205f1d..64e08b7 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -129,18 +129,19 @@ static ULONG_PTR schan_alloc_handle(void *object, enum schan_handle_type type) if (schan_free_handles) { + DWORD index = schan_free_handles - schan_handle_table; /* Use a free handle */ handle = schan_free_handles; if (handle->type != SCHAN_HANDLE_FREE) { - ERR("Handle %d(%p) is in the free list, but has type %#x.\n", (handle-schan_handle_table), handle, handle->type); + ERR("Handle %d(%p) is in the free list, but has type %#x.\n", index, handle, handle->type); return SCHAN_INVALID_HANDLE; } schan_free_handles = handle->object; handle->object = object; handle->type = type; - return handle - schan_handle_table; + return index; } if (!(schan_handle_count < schan_handle_table_size)) {

1 0

Alexandre Julliard : ole32/tests: Avoid using a pointer difference in a trace.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 38b6f4dfff715a05f086ddd6961777ebbf5b2357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38b6f4dfff715a05f086ddd69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 16:14:16 2010 +0200 ole32/tests: Avoid using a pointer difference in a trace. --- dlls/ole32/tests/usrmarshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index a655397..a40e66b 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -603,7 +603,7 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, ctx, buffer, unk, &IID_IUnknown); wireip = buffer; - ok(buffer_end == buffer + marshal_size + 2 * sizeof(DWORD), "buffer_end %p buffer %p (diff %x)\n", buffer_end, buffer, buffer_end - buffer); + ok(buffer_end == buffer + marshal_size + 2 * sizeof(DWORD), "buffer_end %p buffer %p\n", buffer_end, buffer); ok(*(DWORD *)wireip == marshal_size, "wireip + 0x0 should be %x instead of %x\n", marshal_size, *(DWORD *)wireip); wireip += sizeof(DWORD);

1 0

Alexandre Julliard : cmd/tests: Add casts to pointer differences in traces.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 5b1f6614ed244c9dfda2f8ae1175643a27500daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b1f6614ed244c9dfda2f8ae1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 16:14:28 2010 +0200 cmd/tests: Add casts to pointer differences in traces. --- programs/cmd/tests/batch.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index e31fdc0..9e93a01 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -172,10 +172,10 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da err = compare_line(out_ptr, out_nl, exp_ptr, exp_nl); if(err == out_nl) ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", - line, out_nl-out_ptr, out_ptr, exp_nl-exp_ptr, exp_ptr); + line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); else if(err) ok(0, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", - *err, err-out_ptr, line, out_nl-out_ptr, out_ptr, exp_nl-exp_ptr, exp_ptr); + *err, (int)(err-out_ptr), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); exp_ptr = exp_nl+1; out_ptr = out_nl+1;

1 0

Alexandre Julliard : hhctrl.ocx: Add casts to pointer differences in traces .
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: d76d32411abf29d74fc935f3b7880f08ee24c933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76d32411abf29d74fc935f3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 16:14:28 2010 +0200 hhctrl.ocx: Add casts to pointer differences in traces. --- dlls/hhctrl.ocx/hhctrl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 99f7130..9ab66de 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -302,7 +302,7 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) } else { - FIXME("Unhandled HTML Help command line parameter! (%.*s)\n", space-szCmdLine, szCmdLine); + FIXME("Unhandled HTML Help command line parameter! (%.*s)\n", (int)(space-szCmdLine), szCmdLine); return 0; } }

1 0

Alexandre Julliard : jscript: Add casts to pointer differences in traces.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 0572d81c2d7cd30c84189a07da79c8fed91d089f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0572d81c2d7cd30c84189a07d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 16:14:28 2010 +0200 jscript: Add casts to pointer differences in traces. --- dlls/jscript/regexp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 0457545..e895603 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -2384,7 +2384,7 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, RECharSet *charSet; const char *opname = reop_names[op]; - TRACE("\n%06d: %*s%s\n", pc - gData->regexp->program, + TRACE("\n%06d: %*s%s\n", (int)(pc - gData->regexp->program), (int)gData->stateStackTop * 2, "", opname); switch (op) { @@ -2623,7 +2623,7 @@ ExecuteREBytecode(REGlobalData *gData, REMatchState *x) for (;;) { const char *opname = reop_names[op]; - TRACE("\n%06d: %*s%s\n", pc - gData->regexp->program, + TRACE("\n%06d: %*s%s\n", (int)(pc - gData->regexp->program), (int)gData->stateStackTop * 2, "", opname); if (REOP_IS_SIMPLE(op)) {

1 0