May 2009 - Wine-Commits - list.winehq.org

André Hentschel : winemaker: Read the includes of a dsp project file.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: abc68c1ca75a5fd4a3b275fc8be94f2f71e4beb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc68c1ca75a5fd4a3b275fc8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 19 21:01:55 2009 +0200 winemaker: Read the includes of a dsp project file. --- tools/winemaker | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 8170720..3d45247 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -663,9 +663,11 @@ sub source_scan_project_file($$$) } elsif (/^D\s*\"(.*)\"/) { # Preprocessor Definitions $prj_target_cflags.="-D".$1." "; - } elsif (/^I/) { + } elsif (/^I\s*\"(.*)\"/) { # Additional Include Directories - #$prj_target_cflags.="-I" fixpath(option) + $sfilet=$1; + $sfilet=~s/\\/\//g; + push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$sfilet." "; } elsif (/^U\s*\"(.*)\"/) { # Undefines a previously defined symbol $prj_target_cflags.="-U".$1." "; @@ -1847,6 +1849,7 @@ sub get_real_include_name($$$$$) foreach my $include (@{@$target[$T_INCLUDE_PATH]}, @{@$project_settings[$T_INCLUDE_PATH]}) { my $dirname=$include; $dirname=~ s+^-I++; + $dirname=~ s+\s$++; if (!is_absolute($dirname)) { $dirname="@$project[$P_PATH]$dirname"; } else {

1 0

Stefan Dösinger : wined3d: Fix srgb correction.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: bffb89101fb6c758ff05e5fc2de4485b7a9cf794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bffb89101fb6c758ff05e5fc2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 19:09:52 2009 +0200 wined3d: Fix srgb correction. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 769d31b..d5136bb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1954,7 +1954,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, if(args->srgb_correction) { arbfp_add_sRGB_correction(buffer, fragcolor, "TA", "TB", "TC"); - shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); + shader_addline(buffer, "MOV result.color.a, %s;\n", fragcolor); } else if(reg_maps->shader_version.major < 2) { shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); }

1 0

Michael Stefaniuc : msctf: Use FAILED instead of !SUCCEDED.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: 2a11f2df4786a544b51fab700384d77778150bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a11f2df4786a544b51fab700… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 19 23:46:30 2009 +0200 msctf: Use FAILED instead of !SUCCEDED. --- dlls/msctf/context.c | 2 +- dlls/msctf/inputprocessor.c | 2 +- dlls/msctf/tests/inputprocessor.c | 4 ++-- dlls/msctf/threadmgr.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 1f255c8..6a2bed6 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -430,7 +430,7 @@ static WINAPI HRESULT ContextSource_AdviseSink(ITfSource *iface, es = HeapAlloc(GetProcessHeap(),0,sizeof(ContextSink)); if (!es) return E_OUTOFMEMORY; - if (!SUCCEEDED(IUnknown_QueryInterface(punk, riid, (LPVOID*)&es->interfaces.pITfTextEditSink))) + if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&es->interfaces.pITfTextEditSink))) { HeapFree(GetProcessHeap(),0,es); return CONNECT_E_CANNOTCONNECT; diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 90daa2f..a904a68 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -615,7 +615,7 @@ static WINAPI HRESULT IPPSource_AdviseSink(ITfSource *iface, ipps = HeapAlloc(GetProcessHeap(),0,sizeof(InputProcessorProfilesSink)); if (!ipps) return E_OUTOFMEMORY; - if (!SUCCEEDED(IUnknown_QueryInterface(punk, riid, (LPVOID*)&ipps->interfaces.pITfLanguageProfileNotifySink))) + if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&ipps->interfaces.pITfLanguageProfileNotifySink))) { HeapFree(GetProcessHeap(),0,ipps); return CONNECT_E_CANNOTCONNECT; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 318149b..11e7233 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1186,7 +1186,7 @@ static void test_startSession(void) cnt = check_context_refcount(cxt3); hr = ITfDocumentMgr_Push(g_dm, cxt3); - ok(!SUCCEEDED(hr),"Push Succeeded\n"); + ok(FAILED(hr),"Push Succeeded\n"); ok(check_context_refcount(cxt3) == cnt, "Ref changed\n"); cnt = check_context_refcount(cxt2); @@ -1221,7 +1221,7 @@ static void test_startSession(void) ITfContext_Release(cxtTest); hr = ITfDocumentMgr_Pop(g_dm, 0); - ok(!SUCCEEDED(hr),"Pop Succeeded\n"); + ok(FAILED(hr),"Pop Succeeded\n"); hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index c91e536..9b887f0 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -442,7 +442,7 @@ static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, tms = HeapAlloc(GetProcessHeap(),0,sizeof(ThreadMgrSink)); if (!tms) return E_OUTOFMEMORY; - if (!SUCCEEDED(IUnknown_QueryInterface(punk, riid, (LPVOID*)&tms->interfaces.pITfThreadMgrEventSink))) + if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&tms->interfaces.pITfThreadMgrEventSink))) { HeapFree(GetProcessHeap(),0,tms); return CONNECT_E_CANNOTCONNECT;

1 0

Vincent Povirk : gdiplus: Implement GdipTransformPointsI.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: c486e8147d7906217a71986b762dbe8de9e758df URL: http://source.winehq.org/git/wine.git/?a=commit;h=c486e8147d7906217a71986b7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 19 15:40:43 2009 -0500 gdiplus: Implement GdipTransformPointsI. --- dlls/gdiplus/graphics.c | 29 +++++++++++++++++++++++++++-- dlls/gdiplus/tests/graphics.c | 12 ++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4762669..78700ea 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3662,9 +3662,34 @@ GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace GpStatus WINGDIPAPI GdipTransformPointsI(GpGraphics *graphics, GpCoordinateSpace dst_space, GpCoordinateSpace src_space, GpPoint *points, INT count) { - FIXME("(%p, %d, %d, %p, %d): stub\n", graphics, dst_space, src_space, points, count); + GpPointF *pointsF; + GpStatus ret; + INT i; - return NotImplemented; + TRACE("(%p, %d, %d, %p, %d)\n", graphics, dst_space, src_space, points, count); + + if(count <= 0) + return InvalidParameter; + + pointsF = GdipAlloc(sizeof(GpPointF) * count); + if(!pointsF) + return OutOfMemory; + + for(i = 0; i < count; i++){ + pointsF[i].X = (REAL)points[i].X; + pointsF[i].Y = (REAL)points[i].Y; + } + + ret = GdipTransformPoints(graphics, dst_space, src_space, pointsF, count); + + if(ret == Ok) + for(i = 0; i < count; i++){ + points[i].X = roundr(pointsF[i].X); + points[i].Y = roundr(pointsF[i].Y); + } + GdipFree(pointsF); + + return ret; } HPALETTE WINGDIPAPI GdipCreateHalftonePalette(void) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 510a148..61143c6 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -770,6 +770,7 @@ static void test_transformpoints(void) GpGraphics *graphics = NULL; HDC hdc = GetDC(0); GpPointF ptf[2]; + GpPoint pt[2]; status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); @@ -868,6 +869,17 @@ static void test_transformpoints(void) expectf(0.0, ptf[1].X); expectf(1.0, ptf[1].Y); + pt[0].X = 1; + pt[0].Y = 0; + pt[1].X = 0; + pt[1].Y = 1; + status = GdipTransformPointsI(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 2); + expect(Ok, status); + expect(18, pt[0].X); + expect(15, pt[0].Y); + expect(15, pt[1].X); + expect(18, pt[1].Y); + GdipDeleteGraphics(graphics); ReleaseDC(0, hdc); }

1 0

Roderick Colenbrander : wgl: Set PFD_GENERIC_FORMAT on bitmap formats instead of PFD_GENERIC_ACCELERATED .
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: d66ded939c4c21fbc3bd21e9e48a30a41303e9fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66ded939c4c21fbc3bd21e9e… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue May 19 21:42:09 2009 +0200 wgl: Set PFD_GENERIC_FORMAT on bitmap formats instead of PFD_GENERIC_ACCELERATED. --- dlls/winex11.drv/opengl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3d7c456..b15b4e2 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -939,7 +939,7 @@ static WineGLPixelFormat *get_formats(Display *display, int *size_ret, int *onsc list[size].fmt_id = fmt_id; list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]); list[size].offscreenOnly = FALSE; - list[size].dwFlags = PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI | PFD_GENERIC_ACCELERATED; + list[size].dwFlags = PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI | PFD_GENERIC_FORMAT; size++; onscreen_size++; } @@ -1411,11 +1411,11 @@ int CDECL X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev, ppfd->dwFlags |= fmt->dwFlags & (PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI); /* PFD_GENERIC_FORMAT - gdi software rendering - * PFD_GENERIC_ACCELERATED - some parts are accelerated by a display driver (ICD or MCD) + * PFD_GENERIC_ACCELERATED - some parts are accelerated by a display driver (MCD e.g. 3dfx minigl) * none set - full hardware accelerated by a ICD * - * We only set PFD_GENERIC_ACCELERATED on bitmap formats (see get_formats) as that's what ATI and Nvidia Windows drivers do */ - ppfd->dwFlags |= fmt->dwFlags & PFD_GENERIC_ACCELERATED; + * We only set PFD_GENERIC_FORMAT on bitmap formats (see get_formats) as that's what ATI and Nvidia Windows drivers do */ + ppfd->dwFlags |= fmt->dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED); pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DOUBLEBUFFER, &value); if (value) {

1 0

Stefan Dösinger : wined3d: Emulate the 4 component address register in ARB.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: 7b1d48721df2bc3199812bdc5cbbc73cd0969d9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1d48721df2bc3199812bdc5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 15 13:56:40 2009 +0200 wined3d: Emulate the 4 component address register in ARB. --- dlls/wined3d/arb_program_shader.c | 58 ++++++++++++++++++++++++++++++------- dlls/wined3d/baseshader.c | 3 +- dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 53 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 87a1d4c..d871fc9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -84,6 +84,10 @@ struct shader_arb_priv { struct hash_table_t *fragment_shaders; }; +struct shader_arb_ctx_priv { + char addr_reg[20]; +}; + /******************************************************** * ARB_[vertex/fragment]_program helper functions follow ********************************************************/ @@ -503,6 +507,17 @@ static void shader_arb_get_swizzle(const struct wined3d_shader_src_param *param, *ptr = '\0'; } +static void shader_arb_request_a0(const struct wined3d_shader_instruction *ins, const char *src) +{ + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + SHADER_BUFFER *buffer = ins->ctx->buffer; + + if(strcmp(priv->addr_reg, src) == 0) return; + + strcpy(priv->addr_reg, src); + shader_addline(buffer, "ARL A0.x, %s;\n", src); +} + static void shader_arb_get_src_param(const struct wined3d_shader_instruction *ins, const struct wined3d_shader_src_param *src, unsigned int tmpreg, char *outregstr); @@ -543,7 +558,9 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction if(This->baseShader.reg_maps.shader_version.major < 2) { sprintf(rel_reg, "A0.x"); } else { + shader_arb_get_src_param(ins, reg->rel_addr, 0, rel_reg); /* FIXME: GL_NV_vertex_progam2_option */ + shader_arb_request_a0(ins, rel_reg); sprintf(rel_reg, "A0.x"); } if (reg->idx >= rel_offset) @@ -574,7 +591,17 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction sprintf(register_name, "fragment.texcoord[%u]", reg->idx); } } - else sprintf(register_name, "A%u", reg->idx); + else + { + if(This->baseShader.reg_maps.shader_version.major == 1) + { + sprintf(register_name, "A%u", reg->idx); + } + else + { + sprintf(register_name, "A%u_SHADOW", reg->idx); + } + } break; case WINED3DSPR_COLOROUT: @@ -1016,9 +1043,11 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) if(ins->handler_idx == WINED3DSIH_MOVA) { struct wined3d_shader_src_param tmp_src = ins->src[0]; + char write_mask[6]; tmp_src.swizzle = (tmp_src.swizzle & 0x3) * 0x55; shader_arb_get_src_param(ins, &tmp_src, 0, src0_param); + shader_arb_get_write_mask(ins, &ins->dst[0], write_mask); /* This implements the mova formula used in GLSL. The first two instructions * prepare the sign() part. Note that it is fine to have my_sign(0.0) = 1.0 @@ -1027,16 +1056,20 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) * * A0.x = arl(floor(abs(0.0) + 0.5) * 1.0) = floor(0.5) = 0.0 since arl does a floor * + * The ARL is performed when A0 is used - the requested component is read from A0_SHADOW into + * A0.x. We can use the overwritten component of A0_shadow as temporary storage for the sign. + * * TODO: ARR from GL_NV_vertex_program2_option */ - shader_addline(buffer, "SGE TA.y, %s, mova_const.y;\n", src0_param); - shader_addline(buffer, "MAD TA.y, TA.y, mova_const.z, -mova_const.w;\n"); - - shader_addline(buffer, "ABS TA.x, %s;\n", src0_param); - shader_addline(buffer, "ADD TA.x, TA.x, mova_const.x;\n"); - shader_addline(buffer, "FLR TA.x, TA.x;\n"); - shader_addline(buffer, "MUL TA.x, TA.x, TA.y;\n"); - shader_addline(buffer, "ARL A0.x, TA.x;\n"); + shader_addline(buffer, "SGE A0_SHADOW%s, %s, mova_const.y;\n", write_mask, src0_param); + shader_addline(buffer, "MAD A0_SHADOW%s, A0_SHADOW, mova_const.z, -mova_const.w;\n", write_mask); + + shader_addline(buffer, "ABS TA%s, %s;\n", write_mask, src0_param); + shader_addline(buffer, "ADD TA%s, TA, mova_const.x;\n", write_mask); + shader_addline(buffer, "FLR TA%s, TA;\n", write_mask); + shader_addline(buffer, "MUL A0_SHADOW%s, TA, A0_SHADOW;\n", write_mask); + + ((struct shader_arb_ctx_priv *)ins->ctx->backend_data)->addr_reg[0] = '\0'; } else if (ins->ctx->reg_maps->shader_version.major == 1 && !shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type) && ins->dst[0].reg.type == WINED3DSPR_ADDR) @@ -1982,7 +2015,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, lconst_map); /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function); + shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, NULL); if(args->srgb_correction) { arbfp_add_sRGB_correction(buffer, fragcolor, "TA", "TB", "TC"); @@ -2036,7 +2069,9 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, const local_constant *lconst; GLuint ret; DWORD *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); + struct shader_arb_ctx_priv priv_ctx; + memset(&priv_ctx, 0, sizeof(priv_ctx)); /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); @@ -2045,6 +2080,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, } if(need_mova_const((IWineD3DBaseShader *) iface, gl_info)) { shader_addline(buffer, "PARAM mova_const = { 0.5, 0.0, 2.0, 1.0 };\n"); + shader_addline(buffer, "TEMP A0_SHADOW;\n"); } /* Mesa supports only 95 constants */ @@ -2086,7 +2122,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, } /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function); + shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); /* The D3DRS_FOGTABLEMODE render state defines if the shader-generated fog coord is used * or if the fragment depth is used. If the fragment depth is used(FOGTABLEMODE != NONE), diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index cf8171b..2fd79ff 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -929,7 +929,7 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param, /* Shared code in order to generate the bulk of the shader string. * NOTE: A description of how to parse tokens can be found on msdn */ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, - const shader_reg_maps *reg_maps, const DWORD *pFunction) + const shader_reg_maps *reg_maps, const DWORD *pFunction, void *backend_ctx) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; /* To access shader backend callbacks */ @@ -951,6 +951,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, ctx.shader = iface; ctx.reg_maps = reg_maps; ctx.buffer = buffer; + ctx.backend_data = backend_ctx; ins.ctx = &ctx; ins.dst = &dst_param; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 13d82ba..c978e5b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4142,7 +4142,7 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, } /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function); + shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, NULL); /* Pixel shaders < 2.0 place the resulting color in R0 implicitly */ if (reg_maps->shader_version.major < 2) @@ -4229,7 +4229,7 @@ static GLuint shader_glsl_generate_vshader(IWineD3DVertexShader *iface, shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, NULL); /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader*)This, buffer, reg_maps, function); + shader_generate_main((IWineD3DBaseShader*)This, buffer, reg_maps, function, NULL); /* Unpack 3.0 outputs */ if (reg_maps->shader_version.major >= 3) shader_addline(buffer, "order_ps_input(OUT);\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 526ba24..79ac60b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -648,6 +648,7 @@ struct wined3d_shader_context IWineD3DBaseShader *shader; const struct shader_reg_maps *reg_maps; SHADER_BUFFER *buffer; + void *backend_data; }; struct wined3d_shader_register @@ -2575,7 +2576,7 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param, void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, const struct wined3d_shader_version *shader_version); void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, - const shader_reg_maps *reg_maps, const DWORD *pFunction); + const shader_reg_maps *reg_maps, const DWORD *pFunction, void *backend_ctx); HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3d_shader_frontend *fe, struct shader_reg_maps *reg_maps, struct wined3d_shader_semantic *semantics_in, struct wined3d_shader_semantic *semantics_out, const DWORD *byte_code, DWORD constf_size);

1 0

Alexandre Julliard : ntdll: Tweak the file mapping permission checks some more, with tests.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: d5d0738fb9f87f2c01c172d1653158444f520efa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d0738fb9f87f2c01c172d16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 19 21:36:05 2009 +0200 ntdll: Tweak the file mapping permission checks some more, with tests. --- dlls/kernel32/tests/virtual.c | 35 ++++++++++++++++++++++++++++++++++- dlls/kernel32/virtual.c | 3 +-- dlls/ntdll/virtual.c | 6 +++--- server/mapping.c | 2 +- 4 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 5bea009..e665f0f 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -328,7 +328,7 @@ static void test_MapViewOfFile(void) { static const char testfile[] = "testfile.xxx"; const char *name; - HANDLE file, mapping; + HANDLE file, mapping, map2; void *ptr, *ptr2; MEMORY_BASIC_INFORMATION info; BOOL ret; @@ -365,6 +365,39 @@ static void test_MapViewOfFile(void) ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 4096 ); ok( ptr != NULL, "MapViewOfFile FILE_MAP_WRITE error %u\n", GetLastError() ); UnmapViewOfFile( ptr ); + + ret = DuplicateHandle( GetCurrentProcess(), mapping, GetCurrentProcess(), &map2, + FILE_MAP_READ|FILE_MAP_WRITE, FALSE, 0 ); + ok( ret, "DuplicateHandle failed error %u\n", GetLastError()); + ptr = MapViewOfFile( map2, FILE_MAP_WRITE, 0, 0, 4096 ); + ok( ptr != NULL, "MapViewOfFile FILE_MAP_WRITE error %u\n", GetLastError() ); + UnmapViewOfFile( ptr ); + CloseHandle( map2 ); + + ret = DuplicateHandle( GetCurrentProcess(), mapping, GetCurrentProcess(), &map2, + FILE_MAP_READ, FALSE, 0 ); + ok( ret, "DuplicateHandle failed error %u\n", GetLastError()); + ptr = MapViewOfFile( map2, FILE_MAP_WRITE, 0, 0, 4096 ); + if (!ptr) + { + ok( GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLastError() ); + CloseHandle( map2 ); + ret = DuplicateHandle( GetCurrentProcess(), mapping, GetCurrentProcess(), &map2, 0, FALSE, 0 ); + ok( ret, "DuplicateHandle failed error %u\n", GetLastError()); + ptr = MapViewOfFile( map2, 0, 0, 0, 4096 ); + ok( !ptr, "MapViewOfFile succeeded\n" ); + ok( GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLastError() ); + CloseHandle( map2 ); + ret = DuplicateHandle( GetCurrentProcess(), mapping, GetCurrentProcess(), &map2, + FILE_MAP_READ, FALSE, 0 ); + ok( ret, "DuplicateHandle failed error %u\n", GetLastError()); + ptr = MapViewOfFile( map2, 0, 0, 0, 4096 ); + ok( ptr != NULL, "MapViewOfFile NO_ACCESS error %u\n", GetLastError() ); + } + else win_skip( "no access checks on win9x\n" ); + + UnmapViewOfFile( ptr ); + CloseHandle( map2 ); CloseHandle( mapping ); /* read-only mapping */ diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 56c7228..9ad941b 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -539,9 +539,8 @@ LPVOID WINAPI MapViewOfFileEx( HANDLE handle, DWORD access, offset.u.HighPart = offset_high; if (access & FILE_MAP_WRITE) protect = PAGE_READWRITE; - else if (access & FILE_MAP_READ) protect = PAGE_READONLY; else if (access & FILE_MAP_COPY) protect = PAGE_WRITECOPY; - else protect = PAGE_NOACCESS; + else protect = PAGE_READONLY; if (access & FILE_MAP_EXECUTE) protect <<= 4; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e0a758b..0475bd9 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2288,18 +2288,18 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p switch(protect) { case PAGE_NOACCESS: - access = SECTION_QUERY; + access = 0; break; case PAGE_READWRITE: case PAGE_EXECUTE_READWRITE: - access = SECTION_QUERY | SECTION_MAP_WRITE; + access = SECTION_MAP_WRITE; break; case PAGE_READONLY: case PAGE_WRITECOPY: case PAGE_EXECUTE: case PAGE_EXECUTE_READ: case PAGE_EXECUTE_WRITECOPY: - access = SECTION_QUERY | SECTION_MAP_READ; + access = SECTION_MAP_READ; break; default: return STATUS_INVALID_PARAMETER; diff --git a/server/mapping.c b/server/mapping.c index 81c5096..5549a64 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -562,7 +562,7 @@ DECL_HANDLER(get_mapping_info) struct fd *fd; if ((mapping = (struct mapping *)get_handle_obj( current->process, req->handle, - req->access | SECTION_QUERY, &mapping_ops ))) + req->access, &mapping_ops ))) { reply->size = mapping->size; reply->protect = mapping->protect;

1 0

Rico Schüller : winedbg: Do not print more than 9 characters from pThread->name.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: 654c7e36682ed697d5f340cdf0616460cf661ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=654c7e36682ed697d5f340cdf… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue May 19 16:32:04 2009 +0200 winedbg: Do not print more than 9 characters from pThread->name. --- programs/winedbg/tgt_active.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 2b8002b..235d43b 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -271,7 +271,7 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance return DBG_CONTINUE; } if (dbg_read_memory(pThreadName->szName, pThread->name, 9)) - dbg_printf("Thread ID=%04x renamed using MS VC6 extension (name==\"%s\")\n", + dbg_printf("Thread ID=%04x renamed using MS VC6 extension (name==\"%.9s\")\n", pThread->tid, pThread->name); return DBG_CONTINUE; }

1 0

Huw Davies : ole32/tests: Exercise the HGLOBAL marshaller over a range of block sizes.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: 82b4b6423c111d704c0860a404c6282879cc7349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b4b6423c111d704c0860a40… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 19 15:55:51 2009 +0100 ole32/tests: Exercise the HGLOBAL marshaller over a range of block sizes. --- dlls/ole32/tests/usrmarshal.c | 81 ++++++++++++++++++++++++----------------- 1 files changed, 47 insertions(+), 34 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 5c83ddc..ed18ac5 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -162,7 +162,7 @@ static void test_marshal_HGLOBAL(void) MIDL_STUB_MESSAGE stub_msg; RPC_MESSAGE rpc_msg; unsigned char *buffer; - ULONG size; + ULONG size, block_size; HGLOBAL hglobal; HGLOBAL hglobal2; unsigned char *wirehglobal; @@ -188,39 +188,52 @@ static void test_marshal_HGLOBAL(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); HGLOBAL_UserFree(&umcb.Flags, &hglobal2); - hglobal = GlobalAlloc(0, 4); - buffer = GlobalLock(hglobal); - for (i = 0; i < 4; i++) - buffer[i] = i; - GlobalUnlock(hglobal); - init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); - size = HGLOBAL_UserSize(&umcb.Flags, 0, &hglobal); - /* native is poorly programmed and allocates 4/8 bytes more than it needs to - * here - Wine doesn't have to emulate that */ - ok((size == 24) || broken(size == 28) || broken(size == 32), "Size should be 24, instead of %d\n", size); - buffer = HeapAlloc(GetProcessHeap(), 0, size); - init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); - HGLOBAL_UserMarshal(&umcb.Flags, buffer, &hglobal); - wirehglobal = buffer; - ok(*(ULONG *)wirehglobal == WDT_REMOTE_CALL, "Context should be WDT_REMOTE_CALL instead of 0x%08x\n", *(ULONG *)wirehglobal); - wirehglobal += sizeof(ULONG); - ok(*(ULONG *)wirehglobal == (ULONG)(ULONG_PTR)hglobal, "buffer+0x4 should be HGLOBAL\n"); - wirehglobal += sizeof(ULONG); - ok(*(ULONG *)wirehglobal == 4, "buffer+0x8 should be size of HGLOBAL instead of %d\n", *(ULONG *)wirehglobal); - wirehglobal += sizeof(ULONG); - ok(*(ULONG *)wirehglobal == (ULONG)(ULONG_PTR)hglobal, "buffer+0xc should be HGLOBAL\n"); - wirehglobal += sizeof(ULONG); - ok(*(ULONG *)wirehglobal == 4, "buffer+0x10 should be size of HGLOBAL instead of %d\n", *(ULONG *)wirehglobal); - wirehglobal += sizeof(ULONG); - for (i = 0; i < 4; i++) - ok(wirehglobal[i] == i, "buffer+0x%x should be %d\n", 0x10 + i, i); - init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); - HGLOBAL_UserUnmarshal(&umcb.Flags, buffer, &hglobal2); - ok(hglobal2 != NULL, "Didn't unmarshal properly\n"); - HeapFree(GetProcessHeap(), 0, buffer); - init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); - HGLOBAL_UserFree(&umcb.Flags, &hglobal2); - GlobalFree(hglobal); + + for(block_size = 0; block_size <= 17; block_size++) + { + ULONG actual_size, expected_size; + + hglobal = GlobalAlloc(0, block_size); + buffer = GlobalLock(hglobal); + for (i = 0; i < block_size; i++) + buffer[i] = i; + GlobalUnlock(hglobal); + actual_size = GlobalSize(hglobal); + expected_size = actual_size + 5 * sizeof(DWORD); + trace("%d: actual size %d\n", block_size, actual_size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = HGLOBAL_UserSize(&umcb.Flags, 0, &hglobal); + /* native is poorly programmed and allocates 4/8 bytes more than it needs to + * here - Wine doesn't have to emulate that */ + ok(size == expected_size || + broken(size == expected_size + 4) || + broken(size == expected_size + 8), + "%d: got size %d\n", block_size, size); + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HGLOBAL_UserMarshal(&umcb.Flags, buffer, &hglobal); + wirehglobal = buffer; + ok(*(ULONG *)wirehglobal == WDT_REMOTE_CALL, "Context should be WDT_REMOTE_CALL instead of 0x%08x\n", *(ULONG *)wirehglobal); + wirehglobal += sizeof(ULONG); + ok(*(ULONG *)wirehglobal == (ULONG)(ULONG_PTR)hglobal, "buffer+0x4 should be HGLOBAL\n"); + wirehglobal += sizeof(ULONG); + ok(*(ULONG *)wirehglobal == actual_size, "%d: buffer+0x8 %08x\n", block_size, *(ULONG *)wirehglobal); + wirehglobal += sizeof(ULONG); + ok(*(ULONG *)wirehglobal == (ULONG)(ULONG_PTR)hglobal, "buffer+0xc should be HGLOBAL\n"); + wirehglobal += sizeof(ULONG); + ok(*(ULONG *)wirehglobal == actual_size, "%d: buffer+0x10 %08x\n", block_size, *(ULONG *)wirehglobal); + wirehglobal += sizeof(ULONG); + for (i = 0; i < block_size; i++) + ok(wirehglobal[i] == i, "buffer+0x%x should be %d\n", 0x10 + i, i); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HGLOBAL_UserUnmarshal(&umcb.Flags, buffer, &hglobal2); + ok(hglobal2 != NULL, "Didn't unmarshal properly\n"); + HeapFree(GetProcessHeap(), 0, buffer); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + HGLOBAL_UserFree(&umcb.Flags, &hglobal2); + GlobalFree(hglobal); + } } static HENHMETAFILE create_emf(void)

1 0

Frans Kool : winedbg: Add Dutch translations.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: d4e1d88722208bf8f4a1d3b4d8956c88add8a0a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e1d88722208bf8f4a1d3b4d… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Tue May 19 16:03:22 2009 +0200 winedbg: Add Dutch translations. --- programs/winedbg/rsrc.rc | 1 + programs/winedbg/rsrc_Nl.rc | 53 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/rsrc.rc b/programs/winedbg/rsrc.rc index 31ce2d2..fbc07d7 100644 --- a/programs/winedbg/rsrc.rc +++ b/programs/winedbg/rsrc.rc @@ -25,3 +25,4 @@ #include "rsrc_En.rc" #include "rsrc_Ko.rc" +#include "rsrc_Nl.rc" diff --git a/programs/winedbg/rsrc_Nl.rc b/programs/winedbg/rsrc_Nl.rc new file mode 100644 index 0000000..01be67b --- /dev/null +++ b/programs/winedbg/rsrc_Nl.rc @@ -0,0 +1,53 @@ +/* + * Dutch Language Support + * + * Copyright 2009 Frans Kool + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Debug", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Programma Fout" +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "Het programma %s is een serieus probleem tegengekomen en moet \ + afgesloten worden. Excuses voor het ongemak.", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "Dit kan veroorzaakt worden door een probleem in het programma of een fout in Wine. \ + U kunt zoeken op http://appdb.winehq.org naar tips over het draaien \ + van dit programma.\n\n\ + Als dit probleem niet optreedt onder Windows en nog niet is gerapporteerd, \ + dan kunt u het rapporteren op http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Sluiten", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "Wine programma crash" + IDS_INVALID_PARAMS "Interne fouten - foutieve parameters ontvangen" + IDS_UNIDENTIFIED "(onbekend)" +END

1 0