June 2011 - Wine-commits - list.winehq.org

André Hentschel : dbghelp: Only declare deltapc for i386.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: 3a183a42df95c915254ae1ca6f2d51e505082b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a183a42df95c915254ae1ca6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 28 23:11:02 2011 +0200 dbghelp: Only declare deltapc for i386. --- dlls/dbghelp/cpu_i386.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 8fe5eac..70ee9e6 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -157,8 +157,8 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO WORD val16; DWORD val32; BOOL do_switch; - unsigned deltapc; #ifdef __i386__ + unsigned deltapc; CONTEXT _context; #endif @@ -174,6 +174,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO wine_dbgstr_longlong(curr_count), (void*)(DWORD_PTR)curr_switch, (void*)(DWORD_PTR)next_switch); +#ifdef __i386__ /* if we're at first call (which doesn't actually unwind, it just computes ReturnPC, * or if we're doing the first real unwind (count == 1), then we can directly use * eip. otherwise, eip is *after* the insn that actually made the call to @@ -184,7 +185,6 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO */ deltapc = curr_count <= 1 ? 0 : 1; -#ifdef __i386__ if (!context) { /* setup a pseudo context for the rest of the code (esp. unwinding) */

1 0

Austin Lund : ntoskrnl.exe: Made KdDebuggerEnabled a boolean and set to false.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: 0ad6c2deb9e265c38ebc2c4c31e58ca6cf923044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ad6c2deb9e265c38ebc2c4c3… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Jun 29 13:46:10 2011 +1000 ntoskrnl.exe: Made KdDebuggerEnabled a boolean and set to false. --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 ++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index b283a2f..e5668fd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -41,6 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); WINE_DECLARE_DEBUG_CHANNEL(relay); +BOOLEAN KdDebuggerEnabled = FALSE; + extern LONG CALLBACK vectored_handler( EXCEPTION_POINTERS *ptrs ); KSYSTEM_TIME KeTickCount = { 0, 0, 0 }; diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8fff636..3ecb7ec 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -495,7 +495,7 @@ @ stub IoWriteOperationCount @ stub IoWritePartitionTableEx @ stub IoWriteTransferCount -@ stub KdDebuggerEnabled +@ extern KdDebuggerEnabled @ stub KdDebuggerNotPresent @ stub KdDisableDebugger @ stub KdEnableDebugger

1 0

Alistair Leslie-Hughes : msxml3: Improve namespace tests to highlight get nodeName issue.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: 24d77c263dfe31e84a158ade6b60bd9dfb9aa0e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24d77c263dfe31e84a158ade6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 29 15:12:58 2011 +1000 msxml3: Improve namespace tests to highlight get nodeName issue. --- dlls/msxml3/tests/domdoc.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 22bf385..fd62062 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6997,9 +6997,11 @@ static void test_Namespaces(void) BSTR str; static const CHAR szNamespacesXML[] = "<?xml version=\"1.0\"?>\n" -"<root xmlns:WEB='http://www.winehq.org'>\n" -"<WEB:Site version=\"1.0\" />\n" -"</root>"; +"<XMI xmi.version=\"1.1\" xmlns:Model=\"http://omg.org/mof.Model/1.3\">" +" <XMI.content>" +" <Model:Package name=\"WinePackage\" />" +" </XMI.content>" +"</XMI>"; doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; @@ -7008,7 +7010,7 @@ static void test_Namespaces(void) ok(hr == S_OK, "ret %08x\n", hr ); ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n"); - hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("root"), &pNode ); + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("//XMI.content"), &pNode ); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) { @@ -7023,7 +7025,12 @@ static void test_Namespaces(void) hr = IXMLDOMNode_get_prefix(pNode2, &str); ok( hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("WEB")), "incorrect prefix string\n"); + ok( !lstrcmpW( str, _bstr_("Model")), "incorrect prefix string\n"); + SysFreeString(str); + + hr = IXMLDOMNode_get_nodeName(pNode2, &str); + ok( hr == S_OK, "ret %08x\n", hr ); + todo_wine ok( !lstrcmpW( str, _bstr_("Model:Package")), "incorrect nodeName string\n"); SysFreeString(str); /* Test get_namespaceURI */ @@ -7033,7 +7040,7 @@ static void test_Namespaces(void) hr = IXMLDOMNode_get_namespaceURI(pNode2, &str); ok( hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("http://www.winehq.org")), "incorrect namespaceURI string\n"); + ok( !lstrcmpW( str, _bstr_("http://omg.org/mof.Model/1.3")), "incorrect namespaceURI string\n"); SysFreeString(str); IXMLDOMNode_Release(pNode2);

1 0

Henri Verbeet : wined3d: Get rid of the glsl_dst_param_t typedef.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: 3f62b618c45791555db81945703f754ed3e51301 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f62b618c45791555db819457… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 29 12:33:50 2011 +0200 wined3d: Get rid of the glsl_dst_param_t typedef. --- dlls/wined3d/glsl_shader.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6aabca3..becfe57 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -44,10 +44,11 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); #define WINED3D_GLSL_SAMPLE_LOD 0x4 #define WINED3D_GLSL_SAMPLE_GRAD 0x8 -typedef struct { +struct glsl_dst_param +{ char reg_name[150]; char mask_str[6]; -} glsl_dst_param_t; +}; typedef struct { char reg_name[150]; @@ -1600,7 +1601,7 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i * Also, return the actual register name and swizzle in case the * caller needs this information as well. */ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction *ins, - const struct wined3d_shader_dst_param *wined3d_dst, glsl_dst_param_t *glsl_dst) + const struct wined3d_shader_dst_param *wined3d_dst, struct glsl_dst_param *glsl_dst) { BOOL is_color = FALSE; @@ -1615,7 +1616,7 @@ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction * static DWORD shader_glsl_append_dst_ext(struct wined3d_shader_buffer *buffer, const struct wined3d_shader_instruction *ins, const struct wined3d_shader_dst_param *dst) { - glsl_dst_param_t glsl_dst; + struct glsl_dst_param glsl_dst; DWORD mask; mask = shader_glsl_add_dst_param(ins, dst, &glsl_dst); @@ -1633,7 +1634,7 @@ static DWORD shader_glsl_append_dst(struct wined3d_shader_buffer *buffer, const /** Process GLSL instruction modifiers */ static void shader_glsl_add_instruction_modifiers(const struct wined3d_shader_instruction *ins) { - glsl_dst_param_t dst_param; + struct glsl_dst_param dst_param; DWORD modifiers; if (!ins->dst_count) return; @@ -1964,7 +1965,7 @@ static void shader_glsl_color_correction(const struct wined3d_shader_instruction { struct wined3d_shader_dst_param dst; unsigned int mask_size, remaining; - glsl_dst_param_t dst_param; + struct glsl_dst_param dst_param; char arguments[256]; DWORD mask; @@ -3306,7 +3307,7 @@ static void shader_glsl_texdp3(const struct wined3d_shader_instruction *ins) * Calculate the depth as dst.x / dst.y */ static void shader_glsl_texdepth(const struct wined3d_shader_instruction *ins) { - glsl_dst_param_t dst_param; + struct glsl_dst_param dst_param; shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); @@ -3532,7 +3533,7 @@ static void shader_glsl_texbem(const struct wined3d_shader_instruction *ins) if (ins->handler_idx == WINED3DSIH_TEXBEML) { glsl_src_param_t luminance_param; - glsl_dst_param_t dst_param; + struct glsl_dst_param dst_param; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_2, &luminance_param); shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); @@ -3606,7 +3607,7 @@ static void shader_glsl_texreg2rgb(const struct wined3d_shader_instruction *ins) * If any of the first 3 components are < 0, discard this pixel */ static void shader_glsl_texkill(const struct wined3d_shader_instruction *ins) { - glsl_dst_param_t dst_param; + struct glsl_dst_param dst_param; /* The argument is a destination parameter, and no writemasks are allowed */ shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param);

1 0

Henri Verbeet : wined3d: Get rid of the glsl_src_param_t typedef.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: 8fa44dd76de2e1182cd366d3a812ef1bf7899db4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fa44dd76de2e1182cd366d3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 29 12:33:51 2011 +0200 wined3d: Get rid of the glsl_src_param_t typedef. --- dlls/wined3d/glsl_shader.c | 170 +++++++++++++++++++++++--------------------- 1 files changed, 89 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8fa44dd76de2e1182cd36…

1 0

Henri Verbeet : wined3d: Get rid of the glsl_sample_function_t typedef.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: 12be5afd920d1f7fa1df3213f00fbfbcd9377512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12be5afd920d1f7fa1df3213f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 29 12:33:52 2011 +0200 wined3d: Get rid of the glsl_sample_function_t typedef. --- dlls/wined3d/glsl_shader.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 31378ba..c8b4a0a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -56,10 +56,11 @@ struct glsl_src_param char param_str[200]; }; -typedef struct { +struct glsl_sample_function +{ const char *name; DWORD coord_mask; -} glsl_sample_function_t; +}; enum heap_node_op { @@ -1679,7 +1680,7 @@ static inline const char *shader_get_comp_op(DWORD op) } static void shader_glsl_get_sample_function(const struct wined3d_shader_context *ctx, - DWORD sampler_idx, DWORD flags, glsl_sample_function_t *sample_function) + DWORD sampler_idx, DWORD flags, struct glsl_sample_function *sample_function) { WINED3DSAMPLER_TEXTURE_TYPE sampler_type = ctx->reg_maps->sampler_type[sampler_idx]; const struct wined3d_gl_info *gl_info = ctx->gl_info; @@ -2027,9 +2028,8 @@ static void shader_glsl_color_correction(const struct wined3d_shader_instruction } static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_shader_instruction *ins, - DWORD sampler, const glsl_sample_function_t *sample_function, DWORD swizzle, - const char *dx, const char *dy, - const char *bias, const char *coord_reg_fmt, ...) + DWORD sampler, const struct glsl_sample_function *sample_function, DWORD swizzle, + const char *dx, const char *dy, const char *bias, const char *coord_reg_fmt, ...) { const char *sampler_base; char dst_swizzle[6]; @@ -3042,7 +3042,7 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) struct wined3d_device *device = shader->device; DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, ins->ctx->reg_maps->shader_version.minor); - glsl_sample_function_t sample_function; + struct glsl_sample_function sample_function; const struct wined3d_texture *texture; DWORD sample_flags = 0; DWORD sampler_idx; @@ -3133,9 +3133,9 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) const struct wined3d_shader *shader = ins->ctx->shader; struct wined3d_device *device = shader->device; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; - glsl_sample_function_t sample_function; struct glsl_src_param coord_param, dx_param, dy_param; DWORD sample_flags = WINED3D_GLSL_SAMPLE_GRAD; + struct glsl_sample_function sample_function; DWORD sampler_idx; DWORD swizzle = ins->src[1].swizzle; const struct wined3d_texture *texture; @@ -3167,8 +3167,8 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) struct wined3d_device *device = shader->device; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; struct glsl_src_param coord_param, lod_param; - glsl_sample_function_t sample_function; DWORD sample_flags = WINED3D_GLSL_SAMPLE_LOD; + struct glsl_sample_function sample_function; DWORD sampler_idx; DWORD swizzle = ins->src[1].swizzle; const struct wined3d_texture *texture; @@ -3251,9 +3251,9 @@ static void shader_glsl_texcoord(const struct wined3d_shader_instruction *ins) * then perform a 1D texture lookup from stage dstregnum, place into dst. */ static void shader_glsl_texdp3tex(const struct wined3d_shader_instruction *ins) { - glsl_sample_function_t sample_function; DWORD sampler_idx = ins->dst[0].reg.idx; DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; + struct glsl_sample_function sample_function; struct glsl_src_param src0_param; UINT mask_size; @@ -3379,7 +3379,7 @@ static void shader_glsl_texm3x2tex(const struct wined3d_shader_instruction *ins) DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; DWORD reg = ins->dst[0].reg.idx; struct wined3d_shader_buffer *buffer = ins->ctx->buffer; - glsl_sample_function_t sample_function; + struct glsl_sample_function sample_function; struct glsl_src_param src0_param; shader_glsl_add_src_param(ins, &ins->src[0], src_mask, &src0_param); @@ -3397,9 +3397,9 @@ static void shader_glsl_texm3x3tex(const struct wined3d_shader_instruction *ins) { DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; struct wined3d_shader_tex_mx *tex_mx = ins->ctx->tex_mx; + struct glsl_sample_function sample_function; struct glsl_src_param src0_param; DWORD reg = ins->dst[0].reg.idx; - glsl_sample_function_t sample_function; shader_glsl_add_src_param(ins, &ins->src[0], src_mask, &src0_param); shader_addline(ins->ctx->buffer, "tmp0.z = dot(T%u.xyz, %s);\n", reg, src0_param.param_str); @@ -3442,7 +3442,7 @@ static void shader_glsl_texm3x3spec(const struct wined3d_shader_instruction *ins struct wined3d_shader_buffer *buffer = ins->ctx->buffer; struct wined3d_shader_tex_mx *tex_mx = ins->ctx->tex_mx; DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; - glsl_sample_function_t sample_function; + struct glsl_sample_function sample_function; shader_glsl_add_src_param(ins, &ins->src[0], src_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], src_mask, &src1_param); @@ -3469,7 +3469,7 @@ static void shader_glsl_texm3x3vspec(const struct wined3d_shader_instruction *in struct wined3d_shader_buffer *buffer = ins->ctx->buffer; struct wined3d_shader_tex_mx *tex_mx = ins->ctx->tex_mx; DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; - glsl_sample_function_t sample_function; + struct glsl_sample_function sample_function; struct glsl_src_param src0_param; shader_glsl_add_src_param(ins, &ins->src[0], src_mask, &src0_param); @@ -3498,7 +3498,7 @@ static void shader_glsl_texm3x3vspec(const struct wined3d_shader_instruction *in static void shader_glsl_texbem(const struct wined3d_shader_instruction *ins) { const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; - glsl_sample_function_t sample_function; + struct glsl_sample_function sample_function; struct glsl_src_param coord_param; DWORD sampler_idx; DWORD mask; @@ -3569,9 +3569,9 @@ static void shader_glsl_bem(const struct wined3d_shader_instruction *ins) * Sample 2D texture at dst using the alpha & red (wx) components of src as texture coordinates */ static void shader_glsl_texreg2ar(const struct wined3d_shader_instruction *ins) { + struct glsl_sample_function sample_function; struct glsl_src_param src0_param; DWORD sampler_idx = ins->dst[0].reg.idx; - glsl_sample_function_t sample_function; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_ALL, &src0_param); @@ -3584,9 +3584,9 @@ static void shader_glsl_texreg2ar(const struct wined3d_shader_instruction *ins) * Sample 2D texture at dst using the green & blue (yz) components of src as texture coordinates */ static void shader_glsl_texreg2gb(const struct wined3d_shader_instruction *ins) { + struct glsl_sample_function sample_function; struct glsl_src_param src0_param; DWORD sampler_idx = ins->dst[0].reg.idx; - glsl_sample_function_t sample_function; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_ALL, &src0_param); @@ -3599,9 +3599,9 @@ static void shader_glsl_texreg2gb(const struct wined3d_shader_instruction *ins) * Sample texture at dst using the rgb (xyz) components of src as texture coordinates */ static void shader_glsl_texreg2rgb(const struct wined3d_shader_instruction *ins) { + struct glsl_sample_function sample_function; struct glsl_src_param src0_param; DWORD sampler_idx = ins->dst[0].reg.idx; - glsl_sample_function_t sample_function; /* Dependent read, not valid with conditional NP2 */ shader_glsl_get_sample_function(ins->ctx, sampler_idx, 0, &sample_function);

1 0

Henri Verbeet : wined3d: Make the context parameter to context_create_fbo_entry() const.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: 0bae611bf5fa581377038df97c028bd0e00c46c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bae611bf5fa581377038df97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 29 12:33:53 2011 +0200 wined3d: Make the context parameter to context_create_fbo_entry() const. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fa7242d..8902ac5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -268,7 +268,7 @@ void context_check_fbo_status(struct wined3d_context *context, GLenum target) } } -static struct fbo_entry *context_create_fbo_entry(struct wined3d_context *context, +static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context *context, struct wined3d_surface **render_targets, struct wined3d_surface *depth_stencil, DWORD location) { const struct wined3d_gl_info *gl_info = context->gl_info;

1 0

Henri Verbeet : wined3d: Make the context parameter to context_attach_depth_stencil_fbo() const.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: a8de1272da7e434dcfc752d35f34aabd324170f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8de1272da7e434dcfc752d35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 29 12:33:54 2011 +0200 wined3d: Make the context parameter to context_attach_depth_stencil_fbo() const. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8902ac5..f52609c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -112,7 +112,7 @@ static void context_destroy_fbo(struct wined3d_context *context, GLuint *fbo) } /* GL locking is done by the caller */ -void context_attach_depth_stencil_fbo(struct wined3d_context *context, +void context_attach_depth_stencil_fbo(const struct wined3d_context *context, GLenum fbo_target, struct wined3d_surface *depth_stencil, BOOL use_render_buffer) { const struct wined3d_gl_info *gl_info = context->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a3e12ff..ceae2fd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1224,7 +1224,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) DECLSPEC_HIDDEN; -void context_attach_depth_stencil_fbo(struct wined3d_context *context, +void context_attach_depth_stencil_fbo(const struct wined3d_context *context, GLenum fbo_target, struct wined3d_surface *depth_stencil, BOOL use_render_buffer) DECLSPEC_HIDDEN; void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint *fbo) DECLSPEC_HIDDEN; void context_check_fbo_status(struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN;

1 0

Andrew Eikum : dsound: Inform the driver if we are in emulation mode or not .
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: 7d82403f0598e22a7e24198611bf1661da2aade7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d82403f0598e22a7e2419861… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jun 23 13:12:01 2011 -0500 dsound: Inform the driver if we are in emulation mode or not. --- dlls/dsound/dsound_main.c | 12 ++++++++---- dlls/dsound/propset.c | 6 ++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 5d4fb24..d14a141 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -353,13 +353,15 @@ HRESULT WINAPI DirectSoundEnumerateW( return DSERR_INVALIDPARAM; } + setup_dsound_options(); + devs = waveOutGetNumDevs(); if (devs > 0) { if (GetDeviceID(&DSDEVID_DefaultPlayback, &guid) == DS_OK) { static const WCHAR empty[] = { 0 }; for (wod = 0; wod < devs; ++wod) { if (IsEqualGUID( &guid, &DSOUND_renderer_guids[wod] ) ) { - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); + err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,ds_hw_accel)); if (err == DS_OK) { TRACE("calling lpDSEnumCallback(NULL,\"%s\",\"%s\",%p)\n", "Primary Sound Driver",desc.szDrvname,lpContext); @@ -374,7 +376,7 @@ HRESULT WINAPI DirectSoundEnumerateW( } for (wod = 0; wod < devs; ++wod) { - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); + err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,ds_hw_accel)); if (err == DS_OK) { TRACE("calling lpDSEnumCallback(%s,\"%s\",\"%s\",%p)\n", debugstr_guid(&DSOUND_renderer_guids[wod]),desc.szDesc,desc.szDrvname,lpContext); @@ -455,12 +457,14 @@ DirectSoundCaptureEnumerateW( return DSERR_INVALIDPARAM; } + setup_dsound_options(); + devs = waveInGetNumDevs(); if (devs > 0) { if (GetDeviceID(&DSDEVID_DefaultCapture, &guid) == DS_OK) { for (wid = 0; wid < devs; ++wid) { if (IsEqualGUID( &guid, &DSOUND_capture_guids[wid] ) ) { - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); + err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,ds_hw_accel)); if (err == DS_OK) { TRACE("calling lpDSEnumCallback(NULL,\"%s\",\"%s\",%p)\n", "Primary Sound Capture Driver",desc.szDrvname,lpContext); @@ -479,7 +483,7 @@ DirectSoundCaptureEnumerateW( } for (wid = 0; wid < devs; ++wid) { - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); + err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,ds_hw_accel)); if (err == DS_OK) { TRACE("calling lpDSEnumCallback(%s,\"%s\",\"%s\",%p)\n", debugstr_guid(&DSOUND_capture_guids[wid]),desc.szDesc,desc.szDrvname,lpContext); diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index f6c8091..e2d0e20 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -226,6 +226,8 @@ static HRESULT DSPROPERTY_DescriptionW( } } + setup_dsound_options(); + GetDeviceID(&ppd->DeviceId, &dev_guid); wodn = waveOutGetNumDevs(); @@ -250,9 +252,9 @@ static HRESULT DSPROPERTY_DescriptionW( } if (ppd->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER) - err = waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0); + err = waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,ds_hw_accel); else - err = waveInMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0); + err = waveInMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,ds_hw_accel); if (err != MMSYSERR_NOERROR) {

1 0

Andrew Eikum : winmm/tests: Remove uninteresting tests.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: 79575d33adec96c82fa4ba5f4fe8fbf1e24a6d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79575d33adec96c82fa4ba5f4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jun 23 13:12:07 2011 -0500 winmm/tests: Remove uninteresting tests. --- dlls/winmm/tests/capture.c | 25 +---------------------- dlls/winmm/tests/wave.c | 48 +------------------------------------------- 2 files changed, 2 insertions(+), 71 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index d0d5df9..2860b00 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -294,7 +294,7 @@ static void wave_in_test_device(UINT_PTR device) { WAVEINCAPSA capsA; WAVEINCAPSW capsW; - WAVEFORMATEX format,oformat; + WAVEFORMATEX format; WAVEFORMATEXTENSIBLE wfex; HWAVEIN win; MMRESULT rc; @@ -439,29 +439,6 @@ static void wave_in_test_device(UINT_PTR device) VirtualFree(twoPages, 2 * dwPageSize, MEM_RELEASE); } - /* Testing invalid format: 2 MHz sample rate */ - format.wFormatTag=WAVE_FORMAT_PCM; - format.nChannels=2; - format.wBitsPerSample=16; - format.nSamplesPerSec=2000000; - format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; - format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; - format.cbSize=0; - oformat=format; - rc=waveInOpen(&win,device,&format,0,0,CALLBACK_NULL|WAVE_FORMAT_DIRECT); - ok(rc==WAVERR_BADFORMAT || rc==MMSYSERR_INVALFLAG || - rc==MMSYSERR_INVALPARAM, - "waveInOpen(%s): opening the device with 2 MHz sample rate should fail: " - " rc=%s\n",dev_name(device),wave_in_error(rc)); - if (rc==MMSYSERR_NOERROR) { - trace(" got %dx%2dx%d for %dx%2dx%d\n", - format.nSamplesPerSec, format.wBitsPerSample, - format.nChannels, - oformat.nSamplesPerSec, oformat.wBitsPerSample, - oformat.nChannels); - waveInClose(win); - } - /* test non PCM formats */ format.wFormatTag=WAVE_FORMAT_MULAW; format.nChannels=1; diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index c85f13c..5bf7753 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -820,7 +820,7 @@ static void wave_out_test_device(UINT_PTR device) { WAVEOUTCAPSA capsA; WAVEOUTCAPSW capsW; - WAVEFORMATEX format, oformat; + WAVEFORMATEX format; WAVEFORMATEXTENSIBLE wfex; IMAADPCMWAVEFORMAT wfa; HWAVEOUT wout; @@ -1103,52 +1103,6 @@ static void wave_out_test_device(UINT_PTR device) VirtualFree(twoPages, 0, MEM_RELEASE); } - /* Testing invalid format: 11 bits per sample */ - format.wFormatTag=WAVE_FORMAT_PCM; - format.nChannels=2; - format.wBitsPerSample=11; - format.nSamplesPerSec=22050; - format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; - format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; - format.cbSize=0; - oformat=format; - rc=waveOutOpen(&wout,device,&format,0,0,CALLBACK_NULL|WAVE_FORMAT_DIRECT); - ok(rc==WAVERR_BADFORMAT || rc==MMSYSERR_INVALFLAG || - rc==MMSYSERR_INVALPARAM, - "waveOutOpen(%s): opening the device in 11 bits mode should fail: " - "rc=%s\n",dev_name(device),wave_out_error(rc)); - if (rc==MMSYSERR_NOERROR) { - trace(" got %dx%2dx%d for %dx%2dx%d\n", - format.nSamplesPerSec, format.wBitsPerSample, - format.nChannels, - oformat.nSamplesPerSec, oformat.wBitsPerSample, - oformat.nChannels); - waveOutClose(wout); - } - - /* Testing invalid format: 2 MHz sample rate */ - format.wFormatTag=WAVE_FORMAT_PCM; - format.nChannels=2; - format.wBitsPerSample=16; - format.nSamplesPerSec=2000000; - format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; - format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; - format.cbSize=0; - oformat=format; - rc=waveOutOpen(&wout,device,&format,0,0,CALLBACK_NULL|WAVE_FORMAT_DIRECT); - ok(rc==WAVERR_BADFORMAT || rc==MMSYSERR_INVALFLAG || - rc==MMSYSERR_INVALPARAM, - "waveOutOpen(%s): opening the device at 2 MHz sample rate should fail: " - "rc=%s\n",dev_name(device),wave_out_error(rc)); - if (rc==MMSYSERR_NOERROR) { - trace(" got %dx%2dx%d for %dx%2dx%d\n", - format.nSamplesPerSec, format.wBitsPerSample, - format.nChannels, - oformat.nSamplesPerSec, oformat.wBitsPerSample, - oformat.nChannels); - waveOutClose(wout); - } - /* try some non PCM formats */ format.wFormatTag=WAVE_FORMAT_MULAW; format.nChannels=1;

1 0