December 2008 - Wine-commits

Henri Verbeet : wined3d: Slightly improve drawStridedSlow() performance.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: a2febdd200f7149cff7fe923b7316dcdafca693a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2febdd200f7149cff7fe923b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 4 17:41:30 2008 +0100 wined3d: Slightly improve drawStridedSlow() performance. This moves a couple of checks outside of the main drawing loop, since they're not going to change anyway. --- dlls/wined3d/drawprim.c | 204 ++++++++++++++++++++++++---------------------- 1 files changed, 106 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2febdd200f7149cff7fe…

1 0

Henri Verbeet : wined3d: Remove a redundant condition in shader_get_opcode( ).
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: af1bc3d9edf6580a90e1d7d4ea3a17e1b487458b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af1bc3d9edf6580a90e1d7d4e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 4 17:41:31 2008 +0100 wined3d: Remove a redundant condition in shader_get_opcode(). --- dlls/wined3d/baseshader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 1c7c565..c9301d5 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -87,9 +87,10 @@ const SHADER_OPCODE* shader_get_opcode( /** TODO: use dichotomic search */ while (NULL != shader_ins[i].name) { - if (((code & WINED3DSI_OPCODE_MASK) == shader_ins[i].opcode) && - (((hex_version >= shader_ins[i].min_version) && (hex_version <= shader_ins[i].max_version)) || - ((shader_ins[i].min_version == 0) && (shader_ins[i].max_version == 0)))) { + if ((code & WINED3DSI_OPCODE_MASK) == shader_ins[i].opcode + && hex_version >= shader_ins[i].min_version + && (!shader_ins[i].max_version || hex_version <= shader_ins[i].max_version)) + { return &shader_ins[i]; } ++i;

1 0

Henri Verbeet : wined3d: Explicitly pass the version and instruction table to shader_get_opcode().
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: a13df0e4ef3cbcb59f8df1ad6222bdea346c0bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a13df0e4ef3cbcb59f8df1ad6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 4 17:41:31 2008 +0100 wined3d: Explicitly pass the version and instruction table to shader_get_opcode(). --- dlls/wined3d/arb_program_shader.c | 13 ++++++++----- dlls/wined3d/baseshader.c | 36 +++++++++++++++++++----------------- dlls/wined3d/glsl_shader.c | 13 ++++++++----- dlls/wined3d/wined3d_private.h | 4 +--- 4 files changed, 36 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8ec1a3b..9d51250 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1485,6 +1485,9 @@ static void shader_hw_mnxn(const SHADER_OPCODE_ARG *arg) int i; int nComponents = 0; SHADER_OPCODE_ARG tmpArg; + IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)arg->shader; + const SHADER_OPCODE *opcode_table = shader->baseShader.shader_ins; + DWORD shader_version = shader->baseShader.hex_version; memset(&tmpArg, 0, sizeof(SHADER_OPCODE_ARG)); @@ -1499,23 +1502,23 @@ static void shader_hw_mnxn(const SHADER_OPCODE_ARG *arg) switch(arg->opcode->opcode) { case WINED3DSIO_M4x4: nComponents = 4; - tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP4); + tmpArg.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP4); break; case WINED3DSIO_M4x3: nComponents = 3; - tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP4); + tmpArg.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP4); break; case WINED3DSIO_M3x4: nComponents = 4; - tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3); + tmpArg.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); break; case WINED3DSIO_M3x3: nComponents = 3; - tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3); + tmpArg.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); break; case WINED3DSIO_M3x2: nComponents = 2; - tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3); + tmpArg.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); break; default: break; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index c9301d5..5cc992f 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -76,27 +76,25 @@ int shader_addline( return 0; } -const SHADER_OPCODE* shader_get_opcode( - IWineD3DBaseShader *iface, const DWORD code) { - - IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl*) iface; - +const SHADER_OPCODE *shader_get_opcode(const SHADER_OPCODE *opcode_table, DWORD shader_version, DWORD code) +{ DWORD i = 0; - DWORD hex_version = This->baseShader.hex_version; - const SHADER_OPCODE *shader_ins = This->baseShader.shader_ins; /** TODO: use dichotomic search */ - while (NULL != shader_ins[i].name) { - if ((code & WINED3DSI_OPCODE_MASK) == shader_ins[i].opcode - && hex_version >= shader_ins[i].min_version - && (!shader_ins[i].max_version || hex_version <= shader_ins[i].max_version)) + while (opcode_table[i].name) + { + if ((code & WINED3DSI_OPCODE_MASK) == opcode_table[i].opcode + && shader_version >= opcode_table[i].min_version + && (!opcode_table[i].max_version || shader_version <= opcode_table[i].max_version)) { - return &shader_ins[i]; + return &opcode_table[i]; } ++i; } - FIXME("Unsupported opcode %#x(%d) masked %#x, shader version %#x\n", - code, code, code & WINED3DSI_OPCODE_MASK, hex_version); + + FIXME("Unsupported opcode %#x(%d) masked %#x, shader version %#x\n", + code, code, code & WINED3DSI_OPCODE_MASK, shader_version); + return NULL; } @@ -204,6 +202,8 @@ HRESULT shader_get_registers_used( IWineD3DStateBlockImpl *stateBlock) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; + const SHADER_OPCODE *shader_ins = This->baseShader.shader_ins; + DWORD shader_version = This->baseShader.hex_version; unsigned int cur_loop_depth = 0, max_loop_depth = 0; /* There are some minor differences between pixel and vertex shaders */ @@ -241,7 +241,7 @@ HRESULT shader_get_registers_used( /* Fetch opcode */ opcode_token = *pToken++; - curOpcode = shader_get_opcode(iface, opcode_token); + curOpcode = shader_get_opcode(shader_ins, shader_version, opcode_token); /* Unhandled opcode, and its parameters */ if (NULL == curOpcode) { @@ -840,7 +840,9 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; /* To access shader backend callbacks */ + const SHADER_OPCODE *opcode_table = This->baseShader.shader_ins; const SHADER_HANDLER *handler_table = device->shader_backend->shader_instruction_handler_table; + DWORD shader_version = This->baseShader.hex_version; const DWORD *pToken = pFunction; const SHADER_OPCODE *curOpcode = NULL; SHADER_HANDLER hw_fct = NULL; @@ -874,7 +876,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, /* Read opcode */ hw_arg.opcode_token = *pToken++; - curOpcode = shader_get_opcode(iface, hw_arg.opcode_token); + curOpcode = shader_get_opcode(opcode_table, shader_version, hw_arg.opcode_token); /* Select handler */ if (curOpcode == NULL) @@ -1009,7 +1011,7 @@ void shader_trace_init( continue; } opcode_token = *pToken++; - curOpcode = shader_get_opcode(iface, opcode_token); + curOpcode = shader_get_opcode(This->baseShader.shader_ins, This->baseShader.hex_version, opcode_token); len++; if (NULL == curOpcode) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f8c5869..4c1d223 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1747,6 +1747,9 @@ static void shader_glsl_mad(const SHADER_OPCODE_ARG *arg) Vertex shaders to GLSL codes */ static void shader_glsl_mnxn(const SHADER_OPCODE_ARG *arg) { + IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)arg->shader; + const SHADER_OPCODE *opcode_table = shader->baseShader.shader_ins; + DWORD shader_version = shader->baseShader.hex_version; int i; int nComponents = 0; SHADER_OPCODE_ARG tmpArg; @@ -1764,23 +1767,23 @@ static void shader_glsl_mnxn(const SHADER_OPCODE_ARG *arg) switch(arg->opcode->opcode) { case WINED3DSIO_M4x4: nComponents = 4; - tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP4); + tmpArg.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP4); break; case WINED3DSIO_M4x3: nComponents = 3; - tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP4); + tmpArg.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP4); break; case WINED3DSIO_M3x4: nComponents = 4; - tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3); + tmpArg.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); break; case WINED3DSIO_M3x3: nComponents = 3; - tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3); + tmpArg.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); break; case WINED3DSIO_M3x2: nComponents = 2; - tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3); + tmpArg.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); break; default: break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a672864..db19c19 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2161,9 +2161,7 @@ extern int shader_addline( SHADER_BUFFER* buffer, const char* fmt, ...) PRINTF_ATTR(2,3); -extern const SHADER_OPCODE* shader_get_opcode( - IWineD3DBaseShader *iface, - const DWORD code); +const SHADER_OPCODE *shader_get_opcode(const SHADER_OPCODE *shader_ins, DWORD shader_version, DWORD code); /* Vertex shader utility functions */ extern BOOL vshader_get_input(

1 0

Henri Verbeet : wined3d: Explicitly pass the shader version to shader_dump_decl_usage().
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: 71a8a77cf9af7c3aecae2a7c853d1ba2df677235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a8a77cf9af7c3aecae2a7c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 4 17:41:31 2008 +0100 wined3d: Explicitly pass the shader version to shader_dump_decl_usage(). --- dlls/wined3d/baseshader.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 5cc992f..87a7022 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -491,11 +491,8 @@ HRESULT shader_get_registers_used( return WINED3D_OK; } -static void shader_dump_decl_usage( - IWineD3DBaseShaderImpl* This, - DWORD decl, - DWORD param) { - +static void shader_dump_decl_usage(DWORD decl, DWORD param, DWORD shader_version) +{ DWORD regtype = shader_get_regtype(param); TRACE("dcl"); @@ -516,8 +513,7 @@ static void shader_dump_decl_usage( DWORD idx = (decl & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; /* Pixel shaders 3.0 don't have usage semantics */ - char pshader = shader_is_pshader_version(This->baseShader.hex_version); - if (pshader && This->baseShader.hex_version < WINED3DPS_VERSION(3,0)) + if (shader_is_pshader_version(shader_version) && shader_version < WINED3DPS_VERSION(3,0)) return; else TRACE("_"); @@ -1027,7 +1023,7 @@ void shader_trace_init( DWORD usage = *pToken; DWORD param = *(pToken + 1); - shader_dump_decl_usage(This, usage, param); + shader_dump_decl_usage(usage, param, This->baseShader.hex_version); shader_dump_ins_modifiers(param); TRACE(" "); shader_dump_param(iface, param, 0, 0);

1 0

Henri Verbeet : wined3d: Explicitly pass the shader version to shader_dump_param() and shader_dump_arr_entry().
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: 0c954ef743b839d88f3e093342ca38f6f6d8aaf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c954ef743b839d88f3e09334… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 4 17:41:31 2008 +0100 wined3d: Explicitly pass the shader version to shader_dump_param() and shader_dump_arr_entry(). --- dlls/wined3d/baseshader.c | 42 +++++++++++++++++++----------------------- 1 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 87a7022..fd5aadf 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -33,7 +33,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); #define GLNAME_REQUIRE_GLSL ((const char *)1) -static void shader_dump_param(IWineD3DBaseShader *iface, const DWORD param, const DWORD addr_token, int input); +static void shader_dump_param(const DWORD param, const DWORD addr_token, int input, DWORD shader_version); static inline BOOL shader_is_version_token(DWORD token) { return shader_is_pshader_version(token) || @@ -139,6 +139,7 @@ static inline int shader_skip_opcode( * but hopefully those would be recognized */ static int shader_skip_unrecognized(IWineD3DBaseShader *iface, const DWORD *pToken) { + DWORD shader_version = ((IWineD3DBaseShaderImpl *)iface)->baseShader.hex_version; int tokens_read = 0; int i = 0; @@ -151,7 +152,7 @@ static int shader_skip_unrecognized(IWineD3DBaseShader *iface, const DWORD *pTok FIXME("Unrecognized opcode param: token=0x%08x " "addr_token=0x%08x name=", param, addr_token); - shader_dump_param(iface, param, addr_token, i); + shader_dump_param(param, addr_token, i, shader_version); FIXME("\n"); ++i; } @@ -571,20 +572,16 @@ static void shader_dump_decl_usage(DWORD decl, DWORD param, DWORD shader_version } } -static void shader_dump_arr_entry( - IWineD3DBaseShader *iface, - const DWORD param, - const DWORD addr_token, - unsigned int reg, - int input) { - +static void shader_dump_arr_entry(const DWORD param, const DWORD addr_token, + unsigned int reg, int input, DWORD shader_version) +{ char relative = ((param & WINED3DSHADER_ADDRESSMODE_MASK) == WINED3DSHADER_ADDRMODE_RELATIVE); if (relative) { TRACE("["); if (addr_token) - shader_dump_param(iface, addr_token, 0, input); + shader_dump_param(addr_token, 0, input, shader_version); else TRACE("a0.x"); TRACE(" + "); @@ -594,9 +591,8 @@ static void shader_dump_arr_entry( TRACE("]"); } -static void shader_dump_param(IWineD3DBaseShader *iface, const DWORD param, const DWORD addr_token, int input) +static void shader_dump_param(const DWORD param, const DWORD addr_token, int input, DWORD shader_version) { - IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; static const char * const rastout_reg_names[] = { "oPos", "oFog", "oPts" }; static const char * const misctype_reg_names[] = { "vPos", "vFace"}; char swizzle_reg_chars[4]; @@ -606,7 +602,7 @@ static void shader_dump_param(IWineD3DBaseShader *iface, const DWORD param, cons DWORD modifier = param & WINED3DSP_SRCMOD_MASK; /* There are some minor differences between pixel and vertex shaders */ - char pshader = shader_is_pshader_version(This->baseShader.hex_version); + char pshader = shader_is_pshader_version(shader_version); /* For one, we'd prefer color components to be shown for pshaders. * FIXME: use the swizzle function for this */ @@ -638,14 +634,14 @@ static void shader_dump_param(IWineD3DBaseShader *iface, const DWORD param, cons break; case WINED3DSPR_INPUT: TRACE("v"); - shader_dump_arr_entry(iface, param, addr_token, reg, input); + shader_dump_arr_entry(param, addr_token, reg, input, shader_version); break; case WINED3DSPR_CONST: case WINED3DSPR_CONST2: case WINED3DSPR_CONST3: case WINED3DSPR_CONST4: TRACE("c"); - shader_dump_arr_entry(iface, param, addr_token, shader_get_float_offset(param), input); + shader_dump_arr_entry(param, addr_token, shader_get_float_offset(param), input, shader_version); break; case WINED3DSPR_TEXTURE: /* vs: case D3DSPR_ADDR */ TRACE("%c%u", (pshader? 't':'a'), reg); @@ -667,20 +663,20 @@ static void shader_dump_param(IWineD3DBaseShader *iface, const DWORD param, cons /* Vertex shaders >= 3.0 use general purpose output registers * (WINED3DSPR_OUTPUT), which can include an address token */ - if (WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) >= 3) { + if (WINED3DSHADER_VERSION_MAJOR(shader_version) >= 3) { TRACE("o"); - shader_dump_arr_entry(iface, param, addr_token, reg, input); + shader_dump_arr_entry(param, addr_token, reg, input, shader_version); } else TRACE("oT%u", reg); break; case WINED3DSPR_CONSTINT: TRACE("i"); - shader_dump_arr_entry(iface, param, addr_token, reg, input); + shader_dump_arr_entry(param, addr_token, reg, input, shader_version); break; case WINED3DSPR_CONSTBOOL: TRACE("b"); - shader_dump_arr_entry(iface, param, addr_token, reg, input); + shader_dump_arr_entry(param, addr_token, reg, input, shader_version); break; case WINED3DSPR_LABEL: TRACE("l%u", reg); @@ -1026,7 +1022,7 @@ void shader_trace_init( shader_dump_decl_usage(usage, param, This->baseShader.hex_version); shader_dump_ins_modifiers(param); TRACE(" "); - shader_dump_param(iface, param, 0, 0); + shader_dump_param(param, 0, 0, This->baseShader.hex_version); pToken += 2; len += 2; @@ -1070,7 +1066,7 @@ void shader_trace_init( * the destination token. */ if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) { TRACE("("); - shader_dump_param(iface, *(pToken + 2), 0, 1); + shader_dump_param(*(pToken + 2), 0, 1, This->baseShader.hex_version); TRACE(") "); } if (opcode_token & WINED3DSI_COISSUE) { @@ -1109,7 +1105,7 @@ void shader_trace_init( shader_dump_ins_modifiers(param); TRACE(" "); - shader_dump_param(iface, param, addr_token, 0); + shader_dump_param(param, addr_token, 0, This->baseShader.hex_version); } /* Predication token - already printed out, just skip it */ @@ -1126,7 +1122,7 @@ void shader_trace_init( len += tokens_read; TRACE((i == 0)? " " : ", "); - shader_dump_param(iface, param, addr_token, 1); + shader_dump_param(param, addr_token, 1, This->baseShader.hex_version); } } TRACE("\n");

1 0

Alexandre Julliard : server: Limit the number of allocated handles before running out of memory.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: 9434e1996513c02861969fb4b766ab837587c4c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9434e1996513c02861969fb4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 16:12:04 2008 +0100 server: Limit the number of allocated handles before running out of memory. --- server/handle.c | 10 +++++----- server/trace.c | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/server/handle.c b/server/handle.c index 29214d6..37cfa9b 100644 --- a/server/handle.c +++ b/server/handle.c @@ -64,6 +64,7 @@ static struct handle_table *global_table; #define RESERVED_ALL (RESERVED_INHERIT | RESERVED_CLOSE_PROTECT) #define MIN_HANDLE_ENTRIES 32 +#define MAX_HANDLE_ENTRIES 0x00ffffff /* handle to table index conversion */ @@ -191,13 +192,12 @@ struct handle_table *alloc_handle_table( struct process *process, int count ) static int grow_handle_table( struct handle_table *table ) { struct handle_entry *new_entries; - int count = table->count; + int count = min( table->count * 2, MAX_HANDLE_ENTRIES ); - if (count >= INT_MAX / 2) return 0; - count *= 2; - if (!(new_entries = realloc( table->entries, count * sizeof(struct handle_entry) ))) + if (count == table->count || + !(new_entries = realloc( table->entries, count * sizeof(struct handle_entry) ))) { - set_error( STATUS_NO_MEMORY ); + set_error( STATUS_INSUFFICIENT_RESOURCES ); return 0; } table->entries = new_entries; diff --git a/server/trace.c b/server/trace.c index 8b6e622..dfbddac 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4582,6 +4582,7 @@ static const struct { "HANDLE_NOT_CLOSABLE", STATUS_HANDLE_NOT_CLOSABLE }, { "ILLEGAL_FUNCTION", STATUS_ILLEGAL_FUNCTION }, { "INSTANCE_NOT_AVAILABLE", STATUS_INSTANCE_NOT_AVAILABLE }, + { "INSUFFICIENT_RESOURCES", STATUS_INSUFFICIENT_RESOURCES }, { "INVALID_CID", STATUS_INVALID_CID }, { "INVALID_DEVICE_REQUEST", STATUS_INVALID_DEVICE_REQUEST }, { "INVALID_FILE_FOR_SECTION", STATUS_INVALID_FILE_FOR_SECTION },

1 0

Paul Vriens : gdi32/tests: Fix a few test failures on Win9x and WinMe.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 9960ab2418b18245dcf249da3a0ea097cdf62553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9960ab2418b18245dcf249da3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 4 14:44:08 2008 +0100 gdi32/tests: Fix a few test failures on Win9x and WinMe. --- dlls/gdi32/tests/bitmap.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index a47dc38..7ab8323 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2013,21 +2013,27 @@ static void test_bitmapinfoheadersize(void) SetLastError(0xdeadbeef); hdib = CreateDIBSection(hdc, &bmi, 0, NULL, NULL, 0); - ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError()); + ok(hdib != NULL || + broken(!hdib), /* Win98, WinMe */ + "CreateDIBSection error %d\n", GetLastError()); DeleteObject(hdib); bmi.bmiHeader.biSize = sizeof(BITMAPINFO); SetLastError(0xdeadbeef); hdib = CreateDIBSection(hdc, &bmi, 0, NULL, NULL, 0); - ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError()); + ok(hdib != NULL || + broken(!hdib), /* Win98, WinMe */ + "CreateDIBSection error %d\n", GetLastError()); DeleteObject(hdib); bmi.bmiHeader.biSize++; SetLastError(0xdeadbeef); hdib = CreateDIBSection(hdc, &bmi, 0, NULL, NULL, 0); - ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError()); + ok(hdib != NULL || + broken(!hdib), /* Win98, WinMe */ + "CreateDIBSection error %d\n", GetLastError()); DeleteObject(hdib); bmi.bmiHeader.biSize = sizeof(BITMAPV4HEADER); @@ -2041,7 +2047,9 @@ static void test_bitmapinfoheadersize(void) SetLastError(0xdeadbeef); hdib = CreateDIBSection(hdc, &bmi, 0, NULL, NULL, 0); - ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError()); + ok(hdib != NULL || + broken(!hdib), /* Win95 */ + "CreateDIBSection error %d\n", GetLastError()); DeleteObject(hdib); memset(&bci, 0, sizeof(BITMAPCOREINFO));

1 0

Huw Davies : dxgi: Don' t crash and just skip the tests if glX in not available.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 239221442705cbbcfcec8b5bbbd8ec70b6f4d721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=239221442705cbbcfcec8b5bb… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 3 13:33:32 2008 +0000 dxgi: Don't crash and just skip the tests if glX in not available. --- dlls/dxgi/dxgi_main.c | 6 ++++++ dlls/dxgi/tests/device.c | 1 - 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index eaf7b06..b72c04a 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -97,6 +97,12 @@ HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) EnterCriticalSection(&dxgi_cs); object->wined3d = WineDirect3DCreate(10, (IUnknown *)object); + if(!object->wined3d) + { + hr = DXGI_ERROR_UNSUPPORTED; + LeaveCriticalSection(&dxgi_cs); + goto fail; + } object->adapter_count = IWineD3D_GetAdapterCount(object->wined3d); LeaveCriticalSection(&dxgi_cs); diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 7f22bb4..7603c14 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -33,7 +33,6 @@ static IDXGIDevice *create_device(HMODULE d3d10core) HRESULT hr; hr = CreateDXGIFactory(&IID_IDXGIFactory, (void *)&factory); - ok(SUCCEEDED(hr), "CreateDXGIFactory failed, hr %#x\n", hr); if (FAILED(hr)) goto cleanup; hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/put overflow.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 9305cb3cfe64051e8ea71dc8fb3579bc6a8adccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9305cb3cfe64051e8ea71dc8f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 25 21:04:11 2008 +1100 mshtml: Implement IHTMLStyle get/put overflow. --- dlls/mshtml/htmlstyle.c | 30 ++++++++++++++++++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index ee14bb9..d81fdb5 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -73,6 +73,8 @@ static const WCHAR attrMarginLeft[] = {'m','a','r','g','i','n','-','l','e','f','t',0}; static const WCHAR attrMarginRight[] = {'m','a','r','g','i','n','-','r','i','g','h','t',0}; +static const WCHAR attrOverflow[] = + {'o','v','e','r','f','l','o','w',0}; static const WCHAR attrPaddingLeft[] = {'p','a','d','d','i','n','g','-','l','e','f','t',0}; static const WCHAR attrPosition[] = @@ -115,6 +117,7 @@ static const struct{ {attrMargin, DISPID_IHTMLSTYLE_MARGIN}, {attrMarginLeft, DISPID_IHTMLSTYLE_MARGINLEFT}, {attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT}, + {attrOverflow, DISPID_IHTMLSTYLE_OVERFLOW}, {attrPaddingLeft, DISPID_IHTMLSTYLE_PADDINGLEFT}, {attrPosition, DISPID_IHTMLSTYLE2_POSITION}, {attrTextAlign, DISPID_IHTMLSTYLE_TEXTALIGN}, @@ -1733,15 +1736,34 @@ static HRESULT WINAPI HTMLStyle_get_zIndex(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_overflow(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + static const WCHAR szVisible[] = {'v','i','s','i','b','l','e',0}; + static const WCHAR szScroll[] = {'s','c','r','o','l','l',0}; + static const WCHAR szHidden[] = {'h','i','d','d','e','n',0}; + static const WCHAR szAuto[] = {'a','u','t','o',0}; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + /* overflow can only be one of the follow values. */ + if(!v || strcmpiW(szVisible, v) == 0 || strcmpiW(szScroll, v) == 0 || + strcmpiW(szHidden, v) == 0 || strcmpiW(szAuto, v) == 0) + { + return set_nsstyle_attr(This->nsstyle, STYLEID_OVERFLOW, v, 0); + } + + return E_INVALIDARG; } + static HRESULT WINAPI HTMLStyle_get_overflow(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_INVALIDARG; + + return get_style_attr(This, STYLEID_OVERFLOW, p); } static HRESULT WINAPI HTMLStyle_put_pageBreakBefore(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index a6cc5e8..6c45553 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -50,6 +50,7 @@ typedef enum { STYLEID_MARGIN, STYLEID_MARGIN_LEFT, STYLEID_MARGIN_RIGHT, + STYLEID_OVERFLOW, STYLEID_PADDING_LEFT, STYLEID_POSITION, STYLEID_TEXT_ALIGN, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 49b21ad..c7fcc74 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2293,6 +2293,7 @@ static void test_default_style(IHTMLStyle *style) BSTR str; HRESULT hres; float f; + BSTR sOverflowDefault; test_disp((IUnknown*)style, &DIID_DispHTMLStyle); test_ifaces((IUnknown*)style, style_iids); @@ -2601,6 +2602,48 @@ static void test_default_style(IHTMLStyle *style) ok(V_I4(&v) == 1, "V_I4(v) = %d\n", V_I4(&v)); VariantClear(&v); + /* overflow */ + hres = IHTMLStyle_get_overflow(style, NULL); + ok(hres == E_INVALIDARG, "get_overflow failed: %08x\n", hres); + + hres = IHTMLStyle_get_overflow(style, &sOverflowDefault); + ok(hres == S_OK, "get_overflow failed: %08x\n", hres); + + str = a2bstr("test"); + hres = IHTMLStyle_put_overflow(style, str); + ok(hres == E_INVALIDARG, "put_overflow failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("visible"); + hres = IHTMLStyle_put_overflow(style, str); + ok(hres == S_OK, "put_overflow failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("scroll"); + hres = IHTMLStyle_put_overflow(style, str); + ok(hres == S_OK, "put_overflow failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("hidden"); + hres = IHTMLStyle_put_overflow(style, str); + ok(hres == S_OK, "put_overflow failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("auto"); + hres = IHTMLStyle_put_overflow(style, str); + ok(hres == S_OK, "put_overflow failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_overflow(style, &str); + ok(hres == S_OK, "get_overflow failed: %08x\n", hres); + ok(!strcmp_wa(str, "auto"), "str=%s\n", dbgstr_w(str)); + SysFreeString(str); + + /* restore overflow default */ + hres = IHTMLStyle_put_overflow(style, sOverflowDefault); + ok(hres == S_OK, "put_overflow failed: %08x\n", hres); + SysFreeString(sOverflowDefault); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Paul Vriens : shell32/tests: Fix a test failure on Win9x, NT4, Vista and W2K8.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 814bfc0305d4e0126b55bde6481e9dc41a971d37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=814bfc0305d4e0126b55bde64… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 4 11:39:09 2008 +0100 shell32/tests: Fix a test failure on Win9x, NT4, Vista and W2K8. --- dlls/shell32/tests/shfldr_special.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index e8f266f..8c14e51 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -100,7 +100,6 @@ static void test_parse_for_control_panel(void) DWORD eaten = 0xdeadbeef; LPITEMIDLIST pidl; DWORD attr = ~0; - DWORD expected_attr; hr = SHGetDesktopFolder(&psfDesktop); ok(hr == S_OK, "SHGetDesktopFolder failed with error 0x%x\n", hr); @@ -108,9 +107,13 @@ static void test_parse_for_control_panel(void) hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, control_panel_path, &eaten, &pidl, &attr); ok(hr == S_OK, "IShellFolder_ParseDisplayName failed with error 0x%x\n", hr); todo_wine ok(eaten == 0xdeadbeef, "eaten should not have been set to %u\n", eaten); - - expected_attr = SFGAO_CANLINK | SFGAO_FOLDER | SFGAO_HASSUBFOLDER; - todo_wine ok(attr == expected_attr, "attr should be 0x%x, not 0x%x\n", expected_attr, attr); + todo_wine + ok((attr == (SFGAO_CANLINK | SFGAO_FOLDER)) || /* Win9x, NT4 */ + (attr == (SFGAO_CANLINK | SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_STREAM)) || /* W2K */ + (attr == (SFGAO_CANLINK | SFGAO_FOLDER | SFGAO_HASSUBFOLDER)) || /* W2K, XP, W2K3 */ + (attr == (SFGAO_CANLINK | SFGAO_NONENUMERATED)) || /* Vista */ + (attr == SFGAO_CANLINK), /* Vista, W2K8 */ + "Unexpected attributes : %08x\n", attr); ILFree(pidl); }

1 0