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

Roderick Colenbrander : wined3d: Move X8L8V8U8 surface conversion to the format table.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: 7df7ce40c32e12565281af06761378ca1c3e9388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df7ce40c32e12565281af067… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 8 22:49:49 2010 +0200 wined3d: Move X8L8V8U8 surface conversion to the format table. --- dlls/wined3d/surface.c | 57 ----------------------------------------------- dlls/wined3d/utils.c | 58 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 39029b1..4f10c88 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2247,20 +2247,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ } break; - case WINED3DFMT_R8G8_SNORM_L8X8_UNORM: - *convert = CONVERT_X8L8V8U8; - desc->conv_byte_count = 4; - if (gl_info->supported[NV_TEXTURE_SHADER]) - { - /* Use formats from gl table. It is a bit unfortunate, but the conversion - * is needed to set the X format to 255 to get 1.0 for alpha when sampling - * the texture. OpenGL can't use GL_DSDT8_MAG8_NV as internal format with - * the needed type and format parameter, so the internal format contains a - * 4th component, which is returned as alpha - */ - } - 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 @@ -2612,49 +2598,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; } - case CONVERT_X8L8V8U8: - { - unsigned int x, y; - const DWORD *Source; - unsigned char *Dest; - - if (gl_info->supported[NV_TEXTURE_SHADER]) - { - /* This implementation works with the fixed function pipeline and shaders - * without further modification after converting the surface. - */ - 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++); - /* L */ Dest[2] = ((color >> 16) & 0xff); /* L */ - /* V */ Dest[1] = ((color >> 8 ) & 0xff); /* V */ - /* U */ Dest[0] = (color & 0xff); /* U */ - /* I */ Dest[3] = 255; /* X */ - Dest += 4; - } - } - } else { - /* Doesn't work correctly with the fixed function pipeline, but can work in - * shaders if the shader is adjusted. (There's no use for this format in gl's - * standard fixed function pipeline anyway). - */ - 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); /* L */ - /* G */ Dest[1] = ((color >> 8 ) & 0xff) + 128; /* V */ - /* R */ Dest[2] = (color & 0xff) + 128; /* U */ - Dest += 4; - } - } - } - break; - } - case CONVERT_A4L4: { unsigned int x, y; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bda0bde..9a3e762 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -263,6 +263,56 @@ static void convert_r8g8_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT widt } } +static void convert_r8g8_snorm_l8x8_unorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +{ + unsigned int x, y; + const DWORD *Source; + unsigned char *Dest; + + /* Doesn't work correctly with the fixed function pipeline, but can work in + * shaders if the shader is adjusted. (There's no use for this format in gl's + * standard fixed function pipeline anyway). + */ + 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); /* L */ + /* G */ Dest[1] = ((color >> 8 ) & 0xff) + 128; /* V */ + /* R */ Dest[2] = (color & 0xff) + 128; /* U */ + Dest += 4; + } + } +} + +static void convert_r8g8_snorm_l8x8_unorm_nv(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +{ + unsigned int x, y; + const DWORD *Source; + unsigned char *Dest; + + /* This implementation works with the fixed function pipeline and shaders + * without further modification after converting the surface. + */ + 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++); + /* L */ Dest[2] = ((color >> 16) & 0xff); /* L */ + /* V */ Dest[1] = ((color >> 8 ) & 0xff); /* V */ + /* U */ Dest[0] = (color & 0xff); /* U */ + /* I */ Dest[3] = 255; /* X */ + Dest += 4; + } + } +} + static void convert_r8g8b8a8_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) { unsigned int x, y; @@ -507,13 +557,13 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, NV_TEXTURE_SHADER, NULL}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, GL_RGB8, GL_RGB8, 0, - GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, + GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, - WINED3D_GL_EXT_NONE, NULL}, + WINED3D_GL_EXT_NONE, &convert_r8g8_snorm_l8x8_unorm}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, GL_DSDT8_MAG8_INTENSITY8_NV, GL_DSDT8_MAG8_INTENSITY8_NV, 0, - GL_DSDT_MAG_VIB_NV, GL_UNSIGNED_INT_8_8_S8_S8_REV_NV, 0, + GL_DSDT_MAG_VIB_NV, GL_UNSIGNED_INT_8_8_S8_S8_REV_NV, 4, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, - NV_TEXTURE_SHADER, NULL}, + NV_TEXTURE_SHADER, &convert_r8g8_snorm_l8x8_unorm_nv}, {WINED3DFMT_R8G8B8A8_SNORM, GL_RGBA8, GL_RGBA8, 0, GL_BGRA, GL_UNSIGNED_BYTE, 4, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING,

1 0

Roderick Colenbrander : wined3d: Move Q8W8V8U8 conversion to the format table.
by Alexandre Julliard April 9, 2010

April 9, 2010

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

Roderick Colenbrander : wined3d: Start moving texture format fixups to the formats table.
by Alexandre Julliard April 9, 2010

April 9, 2010

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

Alexandre Julliard : ntdll: Build the virtual_release_address_space function on all platforms.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: 4ce995451e5b3d6c1cd4243f1d6f44275cb66a29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce995451e5b3d6c1cd4243f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 16:25:25 2010 +0200 ntdll: Build the virtual_release_address_space function on all platforms. --- dlls/ntdll/virtual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 15973fb..6fedbf3 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1683,10 +1683,11 @@ static int free_reserved_memory( void *base, size_t size, void *arg ) */ void virtual_release_address_space( BOOL free_high_mem ) { -#ifdef __i386__ struct free_range range; sigset_t sigset; + if (user_space_limit == address_space_limit) return; /* no need to free anything */ + server_enter_uninterrupted_section( &csVirtual, &sigset ); /* no large address space on win9x */ @@ -1707,7 +1708,6 @@ void virtual_release_address_space( BOOL free_high_mem ) } server_leave_uninterrupted_section( &csVirtual, &sigset ); -#endif }

1 0

Alexandre Julliard : jscript: Add casts to pointer differences in traces.
by Alexandre Julliard April 9, 2010

April 9, 2010

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

Alexandre Julliard : cmd/tests: Add casts to pointer differences in traces.
by Alexandre Julliard April 9, 2010

April 9, 2010

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 : tests: Use the correct format of varargs list when building with msvcrt.
by Alexandre Julliard April 9, 2010

April 9, 2010

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 : ole32/tests: Avoid using a pointer difference in a trace.
by Alexandre Julliard April 9, 2010

April 9, 2010

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

Roderick Colenbrander : wined3d: Let d3dfmt_get_conv return a wined3d_format_desc.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: 00598c3e36bd4e5c3639a9b88df82c6cba44a541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00598c3e36bd4e5c3639a9b88… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 8 22:49:45 2010 +0200 wined3d: Let d3dfmt_get_conv return a wined3d_format_desc. --- dlls/wined3d/device.c | 5 +- dlls/wined3d/surface.c | 136 +++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 5 +- 3 files changed, 77 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00598c3e36bd4e5c3639a…

1 0

Alexandre Julliard : hhctrl.ocx: Add casts to pointer differences in traces .
by Alexandre Julliard April 9, 2010

April 9, 2010

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