November 2012 - Wine-Commits

Dmitry Timoshkov : gdiplus: Avoid GdipCloneMatrix calls for the graphics transformation matrix.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 0a81a34643db45e1ee66d00c9c3b0c0abbdb990b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a81a34643db45e1ee66d00c9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 7 11:36:26 2012 +0800 gdiplus: Avoid GdipCloneMatrix calls for the graphics transformation matrix. --- dlls/gdiplus/font.c | 9 +-- dlls/gdiplus/gdiplus_private.h | 10 ++-- dlls/gdiplus/graphics.c | 126 +++++++++++++--------------------------- 3 files changed, 49 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a81a34643db45e1ee66d…

1 0

Sam Edwards : opengl32: Implement the wglUseFontOutlines WGL_FONT_LINES format.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: ced7d66a112a03ea8d9482e47fb5ee61dccbc367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced7d66a112a03ea8d9482e47… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Tue Nov 6 00:58:30 2012 -0700 opengl32: Implement the wglUseFontOutlines WGL_FONT_LINES format. --- dlls/opengl32/wgl.c | 62 +++++++++++++++++++++++++++++++++++--------------- 1 files changed, 43 insertions(+), 19 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index b5c61ce..fdb94e4 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1395,7 +1395,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; UINT glyph; const MAT2 identity = {{0,1},{0,0},{0,0},{0,1}}; - GLUtesselator *tess; + GLUtesselator *tess = NULL; LOGFONTW lf; HFONT old_font, unscaled_font; UINT em_size = 1024; @@ -1407,17 +1407,20 @@ static BOOL wglUseFontOutlines_common(HDC hdc, if(deviation <= 0.0) deviation = 1.0/em_size; - if (!load_libglu()) + if(format == WGL_FONT_POLYGONS) { - ERR("glu32 is required for this function but isn't available\n"); - return FALSE; - } + if (!load_libglu()) + { + ERR("glu32 is required for this function but isn't available\n"); + return FALSE; + } - tess = pgluNewTess(); - if(!tess) return FALSE; - pgluTessCallback(tess, GLU_TESS_VERTEX, (_GLUfuncptr)tess_callback_vertex); - pgluTessCallback(tess, GLU_TESS_BEGIN, (_GLUfuncptr)tess_callback_begin); - pgluTessCallback(tess, GLU_TESS_END, tess_callback_end); + tess = pgluNewTess(); + if(!tess) return FALSE; + pgluTessCallback(tess, GLU_TESS_VERTEX, (_GLUfuncptr)tess_callback_vertex); + pgluTessCallback(tess, GLU_TESS_BEGIN, (_GLUfuncptr)tess_callback_begin); + pgluTessCallback(tess, GLU_TESS_END, tess_callback_end); + } GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(lf), &lf); rc.left = rc.right = rc.bottom = 0; @@ -1471,7 +1474,8 @@ static BOOL wglUseFontOutlines_common(HDC hdc, funcs->gl.p_glNewList(listBase++, GL_COMPILE); funcs->gl.p_glFrontFace(GL_CW); - pgluTessBeginPolygon(tess, NULL); + if(format == WGL_FONT_POLYGONS) + pgluTessBeginPolygon(tess, NULL); while(!vertices) { @@ -1488,12 +1492,18 @@ static BOOL wglUseFontOutlines_common(HDC hdc, if(vertices) TRACE("\tstart %d, %d\n", pph->pfxStart.x.value, pph->pfxStart.y.value); - pgluTessBeginContour(tess); + if(format == WGL_FONT_POLYGONS) + pgluTessBeginContour(tess); + else + funcs->gl.p_glBegin(GL_LINE_LOOP); if(vertices) { fixed_to_double(pph->pfxStart, em_size, vertices); - pgluTessVertex(tess, vertices, vertices); + if(format == WGL_FONT_POLYGONS) + pgluTessVertex(tess, vertices, vertices); + else + funcs->gl.p_glVertex3d(vertices[0], vertices[1], vertices[2]); vertices += 3; } vertex_total++; @@ -1513,7 +1523,10 @@ static BOOL wglUseFontOutlines_common(HDC hdc, TRACE("\t\tline to %d, %d\n", ppc->apfx[i].x.value, ppc->apfx[i].y.value); fixed_to_double(ppc->apfx[i], em_size, vertices); - pgluTessVertex(tess, vertices, vertices); + if(format == WGL_FONT_POLYGONS) + pgluTessVertex(tess, vertices, vertices); + else + funcs->gl.p_glVertex3d(vertices[0], vertices[1], vertices[2]); vertices += 3; } fixed_to_double(ppc->apfx[i], em_size, previous); @@ -1558,7 +1571,10 @@ static BOOL wglUseFontOutlines_common(HDC hdc, vertices[0] = points[j].x; vertices[1] = points[j].y; vertices[2] = 0.0; - pgluTessVertex(tess, vertices, vertices); + if(format == WGL_FONT_POLYGONS) + pgluTessVertex(tess, vertices, vertices); + else + funcs->gl.p_glVertex3d(vertices[0], vertices[1], vertices[2]); vertices += 3; } } @@ -1569,20 +1585,27 @@ static BOOL wglUseFontOutlines_common(HDC hdc, break; default: ERR("\t\tcurve type = %d\n", ppc->wType); - pgluTessEndContour(tess); + if(format == WGL_FONT_POLYGONS) + pgluTessEndContour(tess); + else + funcs->gl.p_glEnd(); goto error_in_list; } ppc = (TTPOLYCURVE*)((char*)ppc + sizeof(*ppc) + (ppc->cpfx - 1) * sizeof(POINTFX)); } - pgluTessEndContour(tess); + if(format == WGL_FONT_POLYGONS) + pgluTessEndContour(tess); + else + funcs->gl.p_glEnd(); pph = (TTPOLYGONHEADER*)((char*)pph + pph->cb); } } error_in_list: - pgluTessEndPolygon(tess); + if(format == WGL_FONT_POLYGONS) + pgluTessEndPolygon(tess); funcs->gl.p_glTranslated((GLdouble)gm.gmCellIncX / em_size, (GLdouble)gm.gmCellIncY / em_size, 0.0); funcs->gl.p_glEndList(); HeapFree(GetProcessHeap(), 0, buf); @@ -1591,7 +1614,8 @@ error_in_list: error: DeleteObject(SelectObject(hdc, old_font)); - pgluDeleteTess(tess); + if(format == WGL_FONT_POLYGONS) + pgluDeleteTess(tess); return TRUE; }

1 0

Henri Verbeet : wined3d: Use more consistent names for the various bumpenv uniforms.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: e8b0de1e144f2aede080a604293183156121209e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b0de1e144f2aede080a6042… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 6 22:13:27 2012 +0100 wined3d: Use more consistent names for the various bumpenv uniforms. --- dlls/wined3d/glsl_shader.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c5c27ac..781105b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -116,9 +116,9 @@ struct glsl_ps_program GLhandleARB id; GLint *uniform_f_locations; GLint uniform_i_locations[MAX_CONST_I]; - GLint bumpenvmat_location[MAX_TEXTURES]; - GLint luminancescale_location[MAX_TEXTURES]; - GLint luminanceoffset_location[MAX_TEXTURES]; + GLint bumpenv_mat_location[MAX_TEXTURES]; + GLint bumpenv_lum_scale_location[MAX_TEXTURES]; + GLint bumpenv_lum_offset_location[MAX_TEXTURES]; GLint ycorrection_location; GLint np2_fixup_location; const struct ps_np2fixup_info *np2_fixup_info; @@ -788,24 +788,24 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, { const float *data; - if (prog->ps.bumpenvmat_location[i] == -1) + if (prog->ps.bumpenv_mat_location[i] == -1) continue; data = (const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_MAT00]; - GL_EXTCALL(glUniformMatrix2fvARB(prog->ps.bumpenvmat_location[i], 1, 0, data)); + GL_EXTCALL(glUniformMatrix2fvARB(prog->ps.bumpenv_mat_location[i], 1, 0, data)); checkGLcall("glUniformMatrix2fvARB"); /* texbeml needs the luminance scale and offset too. If texbeml * is used, needsbumpmat is set too, so we can check that in the * needsbumpmat check. */ - if (prog->ps.luminancescale_location[i] != -1) + if (prog->ps.bumpenv_lum_scale_location[i] != -1) { const GLfloat *scale = (const GLfloat *)&state->texture_states[i][WINED3D_TSS_BUMPENV_LSCALE]; const GLfloat *offset = (const GLfloat *)&state->texture_states[i][WINED3D_TSS_BUMPENV_LOFFSET]; - GL_EXTCALL(glUniform1fvARB(prog->ps.luminancescale_location[i], 1, scale)); + GL_EXTCALL(glUniform1fvARB(prog->ps.bumpenv_lum_scale_location[i], 1, scale)); checkGLcall("glUniform1fvARB"); - GL_EXTCALL(glUniform1fvARB(prog->ps.luminanceoffset_location[i], 1, offset)); + GL_EXTCALL(glUniform1fvARB(prog->ps.bumpenv_lum_offset_location[i], 1, offset)); checkGLcall("glUniform1fvARB"); } } @@ -1148,12 +1148,12 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (!(map & 1)) continue; - shader_addline(buffer, "uniform mat2 bumpenvmat%d;\n", i); + shader_addline(buffer, "uniform mat2 bumpenv_mat%u;\n", i); if (reg_maps->luminanceparams & (1 << i)) { - shader_addline(buffer, "uniform float luminancescale%d;\n", i); - shader_addline(buffer, "uniform float luminanceoffset%d;\n", i); + shader_addline(buffer, "uniform float bumpenv_lum_scale%u;\n", i); + shader_addline(buffer, "uniform float bumpenv_lum_offset%u;\n", i); extra_constants_needed++; } @@ -3933,7 +3933,7 @@ static void shader_glsl_texbem(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1, &coord_param); shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, NULL, NULL, - "T%u%s + vec4(bumpenvmat%d * %s, 0.0, 0.0)%s", sampler_idx, coord_mask, sampler_idx, + "T%u%s + vec4(bumpenv_mat%u * %s, 0.0, 0.0)%s", sampler_idx, coord_mask, sampler_idx, coord_param.param_str, coord_mask); if (ins->handler_idx == WINED3DSIH_TEXBEML) @@ -3944,7 +3944,7 @@ static void shader_glsl_texbem(const struct wined3d_shader_instruction *ins) 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); - shader_addline(ins->ctx->buffer, "%s%s *= (%s * luminancescale%d + luminanceoffset%d);\n", + shader_addline(ins->ctx->buffer, "%s%s *= (%s * bumpenv_lum_scale%u + bumpenv_lum_offset%u);\n", dst_param.reg_name, dst_param.mask_str, luminance_param.param_str, sampler_idx, sampler_idx); } @@ -3959,7 +3959,7 @@ static void shader_glsl_bem(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1, &src1_param); shader_glsl_append_dst(ins->ctx->buffer, ins); - shader_addline(ins->ctx->buffer, "%s + bumpenvmat%d * %s);\n", + shader_addline(ins->ctx->buffer, "%s + bumpenv_mat%u * %s);\n", src0_param.param_str, sampler_idx, src1_param.param_str); } @@ -4854,12 +4854,12 @@ static void set_glsl_shader_program(const struct wined3d_context *context, for (i = 0; i < MAX_TEXTURES; ++i) { - sprintf(name, "bumpenvmat%u", i); - entry->ps.bumpenvmat_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); - sprintf(name, "luminancescale%u", i); - entry->ps.luminancescale_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); - sprintf(name, "luminanceoffset%u", i); - entry->ps.luminanceoffset_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); + sprintf(name, "bumpenv_mat%u", i); + entry->ps.bumpenv_mat_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); + sprintf(name, "bumpenv_lum_scale%u", i); + entry->ps.bumpenv_lum_scale_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); + sprintf(name, "bumpenv_lum_offset%u", i); + entry->ps.bumpenv_lum_offset_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); } if (ps_compile_args.np2_fixup)

1 0

Jacek Caban : widl: Ignore -app_config option.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 4d323d176caa2b835996976b3bcb9e36733eb271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d323d176caa2b835996976b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 7 11:25:21 2012 +0100 widl: Ignore -app_config option. --- tools/widl/widl.c | 11 +++++++++-- tools/widl/widl.man.in | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 8186b77..1718247 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -51,6 +51,7 @@ static const char usage[] = "Usage: widl [options...] infile.idl\n" " or: widl [options...] --dlldata-only name1 [name2...]\n" +" -app_config Ignored, present for midl compatibility\n" " -b arch Set the target architecture\n" " -c Generate client stub\n" " -d n Set debug level to 'n'\n" @@ -154,7 +155,8 @@ enum { WIN32_OPTION, WIN64_OPTION, WIN32_ALIGN_OPTION, - WIN64_ALIGN_OPTION + WIN64_ALIGN_OPTION, + APP_CONFIG_OPTION }; static const char short_options[] = @@ -173,6 +175,7 @@ static const struct option long_options[] = { { "win64", 0, NULL, WIN64_OPTION }, { "win32-align", 1, NULL, WIN32_ALIGN_OPTION }, { "win64-align", 1, NULL, WIN64_ALIGN_OPTION }, + { "app_config", 0, NULL, APP_CONFIG_OPTION }, { NULL, 0, NULL, 0 } }; @@ -511,7 +514,7 @@ int main(int argc,char *argv[]) now = time(NULL); - while((optc = getopt_long(argc, argv, short_options, long_options, &opti)) != EOF) { + while((optc = getopt_long_only(argc, argv, short_options, long_options, &opti)) != EOF) { switch(optc) { case DLLDATA_OPTION: dlldata_name = xstrdup(optarg); @@ -558,6 +561,10 @@ int main(int argc,char *argv[]) if(win64_packing != 2 && win64_packing != 4 && win64_packing != 8) error("Packing must be one of 2, 4 or 8\n"); break; + case APP_CONFIG_OPTION: + /* widl does not distinguish between app_mode and default mode, + but we ignore this option for midl compatibility */ + break; case 'b': set_target( optarg ); break; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index f74328b..5b6e0de 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -114,6 +114,8 @@ prefixed with \fB0x\fR, it will be interpreted as an hexadecimal number. For the meaning of values, see the \fBDebug\fR section. .PP .B Miscellaneous options: +.IP "\fB-app_config\f" +Ignored, present for midl compatibility. .IP "\fB--local-stubs=\fIfile\fR" Generate empty stubs for call_as/local methods in an object interface and write them to \fIfile\fR.

1 0

Henri Verbeet : wined3d: Introduce a separate structure for the ps specific fields in struct glsl_shader_prog_link .
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 9b118257c414709163e4094abc2d21424eec52d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b118257c414709163e4094ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 6 22:13:26 2012 +0100 wined3d: Introduce a separate structure for the ps specific fields in struct glsl_shader_prog_link. --- dlls/wined3d/glsl_shader.c | 116 ++++++++++++++++++++++++-------------------- 1 files changed, 63 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b118257c414709163e40…

1 0

Henri Verbeet : ddraw: Avoid LPDIRECTDRAWCLIPPER.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 46524c8d7e21b6b86930a20f806c2c4f2cb5e798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46524c8d7e21b6b86930a20f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 6 22:13:24 2012 +0100 ddraw: Avoid LPDIRECTDRAWCLIPPER. --- include/ddraw.h | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46524c8d7e21b6b86930a…

1 0

Sam Edwards : d3d9/tests: Add test for IDirect3DDevice9_Reset with BackBufferWidth/Height = 0.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: e21a4b291c45f1b079ffcc4ddcda7a74e6486516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21a4b291c45f1b079ffcc4dd… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Tue Nov 6 06:34:58 2012 -0700 d3d9/tests: Add test for IDirect3DDevice9_Reset with BackBufferWidth/Height = 0. --- dlls/d3d9/tests/device.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 8fd72cf..614538a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -860,6 +860,7 @@ static void test_reset(void) { HRESULT hr; HWND hwnd = NULL; + RECT winrect; IDirect3D9 *pD3d = NULL; D3DPRESENT_PARAMETERS d3dpp; D3DDISPLAYMODE d3ddm, d3ddm2; @@ -1064,6 +1065,55 @@ static void test_reset(void) IDirect3DSwapChain9_Release(pSwapchain); } + winrect.left = 0; + winrect.top = 0; + winrect.right = 200; + winrect.bottom = 150; + ok(AdjustWindowRect(&winrect, WS_OVERLAPPEDWINDOW, FALSE), "AdjustWindowRect failed\n"); + ok(SetWindowPos(hwnd, NULL, 0, 0, + winrect.right-winrect.left, + winrect.bottom-winrect.top, + SWP_NOMOVE|SWP_NOZORDER), + "SetWindowPos failed\n"); + + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.Windowed = TRUE; + d3dpp.BackBufferWidth = 0; + d3dpp.BackBufferHeight = 0; + hr = IDirect3DDevice9_Reset(device1, &d3dpp); + ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %08x\n", hr); + hr = IDirect3DDevice9_TestCooperativeLevel(device1); + ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); + + ZeroMemory(&vp, sizeof(vp)); + hr = IDirect3DDevice9_GetViewport(device1, &vp); + ok(hr == D3D_OK, "IDirect3DDevice9_GetViewport failed with %08x\n", hr); + if(SUCCEEDED(hr)) + { + ok(vp.X == 0, "D3DVIEWPORT->X = %d\n", vp.X); + ok(vp.Y == 0, "D3DVIEWPORT->Y = %d\n", vp.Y); + todo_wine ok(vp.Width == 200, "D3DVIEWPORT->Width = %d\n", vp.Width); + todo_wine ok(vp.Height == 150, "D3DVIEWPORT->Height = %d\n", vp.Height); + ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %f\n", vp.MinZ); + ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %f\n", vp.MaxZ); + } + + hr = IDirect3DDevice9_GetSwapChain(device1, 0, &pSwapchain); + ok(hr == D3D_OK, "IDirect3DDevice9_GetSwapChain returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + ZeroMemory(&d3dpp, sizeof(d3dpp)); + hr = IDirect3DSwapChain9_GetPresentParameters(pSwapchain, &d3dpp); + ok(hr == D3D_OK, "IDirect3DSwapChain9_GetPresentParameters returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + todo_wine ok(d3dpp.BackBufferWidth == 200, "Back buffer width is %d\n", d3dpp.BackBufferWidth); + todo_wine ok(d3dpp.BackBufferHeight == 150, "Back buffer height is %d\n", d3dpp.BackBufferHeight); + } + IDirect3DSwapChain9_Release(pSwapchain); + } + ZeroMemory( &d3dpp, sizeof(d3dpp) ); d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = TRUE;

1 0

Henri Verbeet : ddraw/tests: Avoid LPDIRECTDRAW7.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 8fd29034d02f06566358f219e33324cc6076e858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd29034d02f06566358f219e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 6 22:13:25 2012 +0100 ddraw/tests: Avoid LPDIRECTDRAW7. --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 75d3792..147e48c 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -29,7 +29,7 @@ #include "d3d.h" #include "unknwn.h" -static LPDIRECTDRAW7 lpDD = NULL; +static IDirectDraw7 *lpDD; static LPDIRECT3D7 lpD3D = NULL; static IDirectDrawSurface7 *lpDDS; static IDirectDrawSurface7 *lpDDSdepth;

1 0

Hans Leidekker : msi: Avoid a crash when target paths have not yet been resolved.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: cfadbddcafa2b2ca3f515ac4d10c7e1b460a402b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfadbddcafa2b2ca3f515ac4d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 6 15:20:02 2012 +0100 msi: Avoid a crash when target paths have not yet been resolved. --- dlls/msi/format.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 0bfd566..033f69c 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -221,7 +221,8 @@ static WCHAR *deformat_component( FORMAT *format, FORMSTR *str, int *ret_len ) else ret = strdupW( msi_get_target_folder( format->package, comp->Directory ) ); - *ret_len = strlenW( ret ); + if (ret) *ret_len = strlenW( ret ); + else *ret_len = 0; msi_free( key ); return ret; } @@ -238,14 +239,12 @@ static WCHAR *deformat_file( FORMAT *format, FORMSTR *str, BOOL shortname, int * if (!(file = msi_get_loaded_file( format->package, key ))) goto done; if (!shortname) { - ret = strdupW( file->TargetPath ); - len = strlenW( ret ); + if ((ret = strdupW( file->TargetPath ))) len = strlenW( ret ); goto done; } if ((len = GetShortPathNameW(file->TargetPath, NULL, 0)) <= 0) { - ret = strdupW( file->TargetPath ); - len = strlenW( ret ); + if ((ret = strdupW( file->TargetPath ))) len = strlenW( ret ); goto done; } len++;

1 0

Jacek Caban : mshtml: Ignore one more property change notification to fix some IE installations.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: 42557724400df6260172d7690326cbae606378ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=42557724400df6260172d7690… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 6 16:56:47 2012 +0100 mshtml: Ignore one more property change notification to fix some IE installations. --- dlls/mshtml/tests/htmldoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 4de1998..849b517 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -940,6 +940,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D case 3000024: case 3000025: case 3000026: + case 3000027: case 3000028: case 3000029: case 3000030:

1 0