September 2011 - Wine-Commits

Hans Leidekker : msi/test: Mark some test results as broken.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 9562b61bc45edb80deb6de71c9c4d8538ed2a955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9562b61bc45edb80deb6de71c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 9 10:59:36 2011 +0200 msi/test: Mark some test results as broken. --- dlls/msi/tests/install.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1ebdd5d..04c709f 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3154,12 +3154,14 @@ static void test_samesequence(void) MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "Directory not created\n"); - + ok(r == ERROR_SUCCESS || broken(r == ERROR_INSTALL_FAILURE), "Expected ERROR_SUCCESS, got %u\n", r); + if (r == ERROR_SUCCESS) + { + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + } delete_cab_files(); DeleteFile(msifile); } @@ -3174,12 +3176,14 @@ static void test_uiLevelFlags(void) MsiSetInternalUI(INSTALLUILEVEL_NONE | INSTALLUILEVEL_SOURCERESONLY, NULL); r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(!delete_pf("msitest\\maximus", TRUE), "UI install occurred, but execute-only was requested.\n"); - ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "Directory not created\n"); - + ok(r == ERROR_SUCCESS || broken(r == ERROR_INSTALL_FAILURE), "Expected ERROR_SUCCESS, got %u\n", r); + if (r == ERROR_SUCCESS) + { + ok(!delete_pf("msitest\\maximus", TRUE), "UI install occurred, but execute-only was requested.\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + } delete_cab_files(); DeleteFile(msifile); }

1 0

Henri Verbeet : wined3d: Disable sRGB decoding in draw_textured_quad().
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: e82e1c2ac5145a63592baa2c2f5009b3cc343521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e82e1c2ac5145a63592baa2c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 8 23:50:35 2011 +0200 wined3d: Disable sRGB decoding in draw_textured_quad(). We're always supposed to draw the RGB texture here. sRGB decoding may be enabled if sRGB decoding was enabled to last time the surface was used as a texture, or if it was never used as a texture at all. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4cc04cb..d62e31c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -332,6 +332,8 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3 checkGLcall("glTexParameteri"); glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_S, GL_CLAMP); glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_T, GL_CLAMP); + if (context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + glTexParameteri(info.bind_target, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); checkGLcall("glTexEnvi"); @@ -361,6 +363,7 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3 texture->texture_rgb.states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_POINT; texture->texture_rgb.states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; texture->texture_rgb.states[WINED3DTEXSTA_MIPFILTER] = WINED3DTEXF_NONE; + texture->texture_rgb.states[WINED3DTEXSTA_SRGBTEXTURE] = FALSE; } }

1 0

Matteo Bruni : wined3d: Report more vertex texture formats.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 53bb3827064533065cdb8807f5fbcd843c4d323e URL: http://source.winehq.org/git/wine.git/?a=commit;h=53bb3827064533065cdb8807f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 8 23:53:59 2011 +0200 wined3d: Report more vertex texture formats. --- dlls/wined3d/directx.c | 34 +++++++++++++++++++++++++++++++++- dlls/wined3d/utils.c | 20 ++++++++++---------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 11582d4..ef66a47 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -780,6 +780,16 @@ static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, const char *gl_re return gl_vendor == GL_VENDOR_FGLRX; } +static BOOL match_limited_vtf(const struct wined3d_gl_info *gl_info, const char *gl_renderer, + enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) +{ + /* Nvidia GeForce 6xxx and 7xxx support accelerated VTF only on a few + selected texture formats. As they are apparently the only DX9 class GPUs + supporting VTF, the check can be very simple. */ + return gl_info->limits.vertex_samplers && + !match_dx10_capable(gl_info, gl_renderer, gl_vendor, card_vendor, device); +} + static void quirk_arb_constants(struct wined3d_gl_info *gl_info) { TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL.\n", gl_info->limits.arb_vs_native_constants); @@ -902,6 +912,11 @@ static void quirk_infolog_spam(struct wined3d_gl_info *gl_info) gl_info->quirks |= WINED3D_QUIRK_INFO_LOG_SPAM; } +static void quirk_limited_vtf(struct wined3d_gl_info *gl_info) +{ + gl_info->quirks |= WINED3D_QUIRK_LIMITED_VTF; +} + struct driver_quirk { BOOL (*match)(const struct wined3d_gl_info *gl_info, const char *gl_renderer, @@ -991,6 +1006,11 @@ static const struct driver_quirk quirk_table[] = quirk_infolog_spam, "Not printing GLSL infolog" }, + { + match_limited_vtf, + quirk_limited_vtf, + "Vertex textures support is limited" + }, }; /* Certain applications (Steam) complain if we report an outdated driver version. In general, @@ -3673,7 +3693,19 @@ static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, static BOOL CheckVertexTextureCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { - return adapter->gl_info.limits.vertex_samplers && (format->flags & WINED3DFMT_FLAG_VTF); + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + + if (!gl_info->limits.vertex_samplers || !(format->flags & WINED3DFMT_FLAG_VTF)) + return FALSE; + + switch (format->id) + { + case WINED3DFMT_R32G32B32A32_FLOAT: + case WINED3DFMT_R32_FLOAT: + return TRUE; + default: + return !(gl_info->quirks & WINED3D_QUIRK_LIMITED_VTF); + } } HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT adapter_idx, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6ab8dae..9661eb4 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -615,19 +615,19 @@ static const struct wined3d_format_texture_info format_texture_info[] = /* IEEE formats */ {WINED3DFMT_R32_FLOAT, GL_RGB32F_ARB, GL_RGB32F_ARB, 0, GL_RED, GL_FLOAT, 0, - WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_VTF, ARB_TEXTURE_FLOAT, NULL}, {WINED3DFMT_R32_FLOAT, GL_R32F, GL_R32F, 0, GL_RED, GL_FLOAT, 0, - WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_VTF, ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R32G32_FLOAT, GL_RGB32F_ARB, GL_RGB32F_ARB, 0, GL_RGB, GL_FLOAT, 12, - WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_VTF, ARB_TEXTURE_FLOAT, convert_r32g32_float}, {WINED3DFMT_R32G32_FLOAT, GL_RG32F, GL_RG32F, 0, GL_RG, GL_FLOAT, 0, - WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_VTF, ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R32G32B32A32_FLOAT, GL_RGBA32F_ARB, GL_RGBA32F_ARB, 0, GL_RGBA, GL_FLOAT, 0, @@ -636,23 +636,23 @@ static const struct wined3d_format_texture_info format_texture_info[] = /* Float */ {WINED3DFMT_R16_FLOAT, GL_RGB16F_ARB, GL_RGB16F_ARB, 0, GL_RED, GL_HALF_FLOAT_ARB, 0, - WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_VTF, ARB_TEXTURE_FLOAT, NULL}, {WINED3DFMT_R16_FLOAT, GL_R16F, GL_R16F, 0, GL_RED, GL_HALF_FLOAT_ARB, 0, - WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_VTF, ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R16G16_FLOAT, GL_RGB16F_ARB, GL_RGB16F_ARB, 0, GL_RGB, GL_HALF_FLOAT_ARB, 6, - WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_VTF, ARB_TEXTURE_FLOAT, convert_r16g16}, {WINED3DFMT_R16G16_FLOAT, GL_RG16F, GL_RG16F, 0, GL_RG, GL_HALF_FLOAT_ARB, 0, - WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_VTF, ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R16G16B16A16_FLOAT, GL_RGBA16F_ARB, GL_RGBA16F_ARB, 0, GL_RGBA, GL_HALF_FLOAT_ARB, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_VTF, ARB_TEXTURE_FLOAT, NULL}, /* Palettized formats */ {WINED3DFMT_P8_UINT, GL_RGBA, GL_RGBA, 0, @@ -671,7 +671,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_B8G8R8A8_UNORM, GL_RGBA8, GL_SRGB8_ALPHA8_EXT, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET - | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE, + | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE | WINED3DFMT_FLAG_VTF, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B8G8R8X8_UNORM, GL_RGB8, GL_SRGB8_EXT, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fd2bedc..1fac908 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -53,6 +53,7 @@ #define WINED3D_QUIRK_FBO_TEX_UPDATE 0x00000020 #define WINED3D_QUIRK_BROKEN_RGBA16 0x00000040 #define WINED3D_QUIRK_INFO_LOG_SPAM 0x00000080 +#define WINED3D_QUIRK_LIMITED_VTF 0x00000100 /* Texture format fixups */

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_vertex_declaration() const .
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 31906458da4344cfa3df8192997d6e7faf0347de URL: http://source.winehq.org/git/wine.git/?a=commit;h=31906458da4344cfa3df81929… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 8 23:50:38 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_vertex_declaration() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ac609fd..1ee1fac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2636,7 +2636,7 @@ HRESULT CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *devic return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_vertex_declaration(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_vertex_declaration(const struct wined3d_device *device, struct wined3d_vertex_declaration **declaration) { TRACE("device %p, declaration %p.\n", device, declaration); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b05acae..fddac2c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2262,7 +2262,7 @@ HRESULT __cdecl wined3d_device_get_texture_stage_state(struct wined3d_device *de UINT stage, WINED3DTEXTURESTAGESTATETYPE state, DWORD *value); HRESULT __cdecl wined3d_device_get_transform(const struct wined3d_device *device, WINED3DTRANSFORMSTATETYPE state, WINED3DMATRIX *matrix); -HRESULT __cdecl wined3d_device_get_vertex_declaration(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device, struct wined3d_vertex_declaration **declaration); struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, WINED3DVIEWPORT *viewport);

1 0

Henri Verbeet : wined3d: Add support for flipping compressed surfaces to surface_cpu_blt().
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: bbb77cba74e98c36cf24b371939dd0e15a3b4c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb77cba74e98c36cf24b3719… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 8 23:50:37 2011 +0200 wined3d: Add support for flipping compressed surfaces to surface_cpu_blt(). --- dlls/wined3d/surface.c | 123 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 111 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b92a1a1..9116f5f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6355,6 +6355,108 @@ static BOOL cpu_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return FALSE; } +static HRESULT surface_cpu_blt_compressed(const BYTE *src_data, BYTE *dst_data, + UINT src_pitch, UINT dst_pitch, UINT update_w, UINT update_h, + const struct wined3d_format *format, DWORD flags, const WINEDDBLTFX *fx) +{ + UINT row_block_count; + const BYTE *src_row; + BYTE *dst_row; + UINT x, y; + + src_row = src_data; + dst_row = dst_data; + + row_block_count = (update_w + format->block_width - 1) / format->block_width; + + if (!flags) + { + for (y = 0; y < update_h; y += format->block_height) + { + memcpy(dst_row, src_row, row_block_count * format->block_byte_count); + src_row += src_pitch; + dst_row += dst_pitch; + } + + return WINED3D_OK; + } + + if (flags == WINEDDBLT_DDFX && fx->dwDDFX == WINEDDBLTFX_MIRRORUPDOWN) + { + src_row += (((update_h / format->block_height) - 1) * src_pitch); + + switch (format->id) + { + case WINED3DFMT_DXT1: + for (y = 0; y < update_h; y += format->block_height) + { + struct block + { + WORD color[2]; + BYTE control_row[4]; + }; + + const struct block *s = (const struct block *)src_row; + struct block *d = (struct block *)dst_row; + + for (x = 0; x < row_block_count; ++x) + { + d[x].color[0] = s[x].color[0]; + d[x].color[1] = s[x].color[1]; + d[x].control_row[0] = s[x].control_row[3]; + d[x].control_row[1] = s[x].control_row[2]; + d[x].control_row[2] = s[x].control_row[1]; + d[x].control_row[3] = s[x].control_row[0]; + } + src_row -= src_pitch; + dst_row += dst_pitch; + } + return WINED3D_OK; + + case WINED3DFMT_DXT3: + for (y = 0; y < update_h; y += format->block_height) + { + struct block + { + WORD alpha_row[4]; + WORD color[2]; + BYTE control_row[4]; + }; + + const struct block *s = (const struct block *)src_row; + struct block *d = (struct block *)dst_row; + + for (x = 0; x < row_block_count; ++x) + { + d[x].alpha_row[0] = s[x].alpha_row[3]; + d[x].alpha_row[1] = s[x].alpha_row[2]; + d[x].alpha_row[2] = s[x].alpha_row[1]; + d[x].alpha_row[3] = s[x].alpha_row[0]; + d[x].color[0] = s[x].color[0]; + d[x].color[1] = s[x].color[1]; + d[x].control_row[0] = s[x].control_row[3]; + d[x].control_row[1] = s[x].control_row[2]; + d[x].control_row[2] = s[x].control_row[1]; + d[x].control_row[3] = s[x].control_row[0]; + } + src_row -= src_pitch; + dst_row += dst_pitch; + } + return WINED3D_OK; + + default: + FIXME("Compressed flip not implemented for format %s.\n", + debug_d3dformat(format->id)); + return E_NOTIMPL; + } + } + + FIXME("Unsupported blit on compressed surface (format %s, flags %#x, DDFX %#x).\n", + debug_d3dformat(format->id), flags, flags & WINEDDBLT_DDFX ? fx->dwDDFX : 0); + + return E_NOTIMPL; +} + static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *fx, WINED3DTEXTUREFILTERTYPE filter) @@ -6490,17 +6592,15 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * if (src_format->flags & dst_format->flags & WINED3DFMT_FLAG_COMPRESSED) { - UINT row_block_count; + TRACE("%s -> %s copy.\n", debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id)); - if (flags || src_surface == dst_surface) + if (src_surface == dst_surface) { FIXME("Only plain blits supported on compressed surfaces.\n"); hr = E_NOTIMPL; goto release; } - TRACE("%s -> %s copy.\n", debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id)); - if (srcheight != dstheight || srcwidth != dstwidth) { WARN("Stretching not supported on compressed surfaces.\n"); @@ -6508,17 +6608,16 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * goto release; } - dbuf = dlock.pBits; - sbuf = slock.pBits; - - row_block_count = (dstwidth + dst_format->block_width - 1) / dst_format->block_width; - for (y = 0; y < dstheight; y += dst_format->block_height) + if (srcwidth & (src_format->block_width - 1) || srcheight & (src_format->block_height - 1)) { - memcpy(dbuf, sbuf, row_block_count * dst_format->block_byte_count); - dbuf += dlock.Pitch; - sbuf += slock.Pitch; + WARN("Rectangle not block-aligned.\n"); + hr = WINED3DERR_INVALIDCALL; + goto release; } + hr = surface_cpu_blt_compressed(slock.pBits, dlock.pBits, + slock.Pitch, dlock.Pitch, dstwidth, dstheight, + src_format, flags, fx); goto release; }

1 0

Hans Leidekker : msi: SelfUnregModules' counterpart is SelfRegModules.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 984422bad16a79d611d8e9f25c621015f57e8090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=984422bad16a79d611d8e9f25… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 9 11:00:51 2011 +0200 msi: SelfUnregModules' counterpart is SelfRegModules. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index fa92653..4c857f9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7206,7 +7206,7 @@ StandardActions[] = { szRMCCPSearch, ACTION_RMCCPSearch, NULL }, { szScheduleReboot, ACTION_ScheduleReboot, NULL }, { szSelfRegModules, ACTION_SelfRegModules, szSelfUnregModules }, - { szSelfUnregModules, ACTION_SelfUnregModules, szSelfUnregModules }, + { szSelfUnregModules, ACTION_SelfUnregModules, szSelfRegModules }, { szSetODBCFolders, ACTION_SetODBCFolders, NULL }, { szStartServices, ACTION_StartServices, szStopServices }, { szStopServices, ACTION_StopServices, szStartServices },

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_vertex_shader() const.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 5385e1b3dff97f53f025489d4fe66204a9624b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5385e1b3dff97f53f025489d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 8 23:50:39 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_vertex_shader() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1ee1fac..e1cb38f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2683,7 +2683,7 @@ HRESULT CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, st return WINED3D_OK; } -struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(struct wined3d_device *device) +struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wined3d_device *device) { struct wined3d_shader *shader; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fddac2c..ed03929 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2264,7 +2264,7 @@ HRESULT __cdecl wined3d_device_get_transform(const struct wined3d_device *device WINED3DTRANSFORMSTATETYPE state, WINED3DMATRIX *matrix); HRESULT __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device, struct wined3d_vertex_declaration **declaration); -struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(struct wined3d_device *device); +struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, WINED3DVIEWPORT *viewport); HRESULT __cdecl wined3d_device_get_vs_consts_b(struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count);

1 0

Hans Leidekker : msi: Respect the indirect attribute in the SelectionPath event handler.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: f618eb28607e456fab6b61a9c271f5093bbe8065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f618eb28607e456fab6b61a9c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 9 10:59:18 2011 +0200 msi: Respect the indirect attribute in the SelectionPath event handler. --- dlls/msi/dialog.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 2210f17..caad21c 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -691,7 +691,8 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, } else if ( !strcmpW( attribute, szSelectionPath ) ) { - LPWSTR path = msi_dialog_dup_property( dialog, ctrl->property, TRUE ); + BOOL indirect = ctrl->attributes & msidbControlAttributesIndirect; + LPWSTR path = msi_dialog_dup_property( dialog, ctrl->property, indirect ); if (!path) return; SetWindowTextW( ctrl->hwnd, path ); msi_free(path);

1 0

Bruno Jesus : ws2_32: Remove an unnecessary test.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 8f3dabf3c478c5aa7bbb05253ed3046664af9391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f3dabf3c478c5aa7bbb05253… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 8 19:17:51 2011 -0300 ws2_32: Remove an unnecessary test. --- dlls/ws2_32/socket.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ef24723..bfe34ce 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3388,9 +3388,9 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID /* these values need to be set only if SO_KEEPALIVE is enabled */ else if(keepalive) { - if (keepidle && setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, (void *)&keepidle, sizeof(int)) == -1) + if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, (void *)&keepidle, sizeof(int)) == -1) status = WSAEINVAL; - else if (keepintvl && setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, (void *)&keepintvl, sizeof(int)) == -1) + else if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, (void *)&keepintvl, sizeof(int)) == -1) status = WSAEINVAL; } #else

1 0

Alexandre Julliard : wineconsole: Make the traces in WINECON_GrabChanges more readable.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: a763c7dbc8f63bf236cf8175ebeff13501838ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=a763c7dbc8f63bf236cf8175e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 8 22:27:11 2011 +0200 wineconsole: Make the traces in WINECON_GrabChanges more readable. --- programs/wineconsole/wineconsole.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 2938857..56be619 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -214,6 +214,7 @@ void WINECON_GrabChanges(struct inner_data* data) } SERVER_END_REQ; if (!num) {WINE_WARN("hmm renderer signaled but no events available\n"); return;} + WINE_TRACE( "got %u events\n", num ); /* FIXME: should do some event compression here (cursor pos, update) */ /* step 1: keep only last cursor pos event */ @@ -223,7 +224,10 @@ void WINECON_GrabChanges(struct inner_data* data) if (evts[i].event == CONSOLE_RENDERER_CURSOR_POS_EVENT) { if (ev_found != -1) + { + WINE_TRACE("%u/%u: curs-pos(%d,%d) ignoring\n", i+1, num, evts[i].u.cursor_pos.x, evts[i].u.cursor_pos.y); evts[i].event = CONSOLE_RENDERER_NONE_EVENT; + } ev_found = i; } } @@ -244,6 +248,7 @@ void WINECON_GrabChanges(struct inner_data* data) !(evts[i ].u.update.bottom + 1 < evts[ev_found].u.update.top || evts[ev_found].u.update.bottom + 1 < evts[i ].u.update.top)) { + WINE_TRACE("%u/%u: update(%d,%d) merging with %u\n", ev_found+1, num, evts[i].u.update.top, evts[i].u.update.bottom, i+1); evts[i].u.update.top = min(evts[i ].u.update.top, evts[ev_found].u.update.top); evts[i].u.update.bottom = max(evts[i ].u.update.bottom, @@ -253,16 +258,15 @@ void WINECON_GrabChanges(struct inner_data* data) ev_found = i; } - WINE_TRACE("Events:"); for (i = 0; i < num; i++) { switch (evts[i].event) { case CONSOLE_RENDERER_NONE_EVENT: - WINE_TRACE(" NOP"); + WINE_TRACE("%u/%u: NOP\n", i+1, num); break; case CONSOLE_RENDERER_TITLE_EVENT: - WINE_TRACE(" title()"); + WINE_TRACE("%u/%u: title()\n", i+1, num); data->fnSetTitle(data); break; case CONSOLE_RENDERER_ACTIVE_SB_EVENT: @@ -275,7 +279,7 @@ void WINECON_GrabChanges(struct inner_data* data) h = wine_server_call_err( req ) ? 0 : wine_server_ptr_handle(reply->handle); } SERVER_END_REQ; - WINE_TRACE(" active(%p)", h); + WINE_TRACE("%u/%u: active(%p)\n", i+1, num, h); if (h) { CloseHandle(data->hConOut); @@ -286,7 +290,7 @@ void WINECON_GrabChanges(struct inner_data* data) if (data->curcfg.sb_width != evts[i].u.resize.width || data->curcfg.sb_height != evts[i].u.resize.height) { - WINE_TRACE(" resize(%d,%d)", evts[i].u.resize.width, evts[i].u.resize.height); + WINE_TRACE("%u/%u: resize(%d,%d)\n", i+1, num, evts[i].u.resize.width, evts[i].u.resize.height); data->curcfg.sb_width = evts[i].u.resize.width; data->curcfg.sb_height = evts[i].u.resize.height; @@ -299,13 +303,13 @@ void WINECON_GrabChanges(struct inner_data* data) } break; case CONSOLE_RENDERER_UPDATE_EVENT: - WINE_TRACE(" update(%d,%d)", evts[i].u.update.top, evts[i].u.update.bottom); + WINE_TRACE("%u/%u: update(%d,%d)\n", i+1, num, evts[i].u.update.top, evts[i].u.update.bottom); WINECON_FetchCells(data, evts[i].u.update.top, evts[i].u.update.bottom); break; case CONSOLE_RENDERER_CURSOR_POS_EVENT: if (evts[i].u.cursor_pos.x != data->cursor.X || evts[i].u.cursor_pos.y != data->cursor.Y) { - WINE_TRACE(" curs-pos(%d,%d)",evts[i].u.cursor_pos.x, evts[i].u.cursor_pos.y); + WINE_TRACE("%u/%u: curs-pos(%d,%d)\n", i+1, num, evts[i].u.cursor_pos.x, evts[i].u.cursor_pos.y); data->cursor.X = evts[i].u.cursor_pos.x; data->cursor.Y = evts[i].u.cursor_pos.y; data->fnPosCursor(data); @@ -315,7 +319,7 @@ void WINECON_GrabChanges(struct inner_data* data) if (evts[i].u.cursor_geom.size != data->curcfg.cursor_size || evts[i].u.cursor_geom.visible != data->curcfg.cursor_visible) { - WINE_TRACE(" curs-geom(%d,%d)", + WINE_TRACE("%u/%u: curs-geom(%d,%d)\n", i+1, num, evts[i].u.cursor_geom.size, evts[i].u.cursor_geom.visible); data->fnShapeCursor(data, evts[i].u.cursor_geom.size, evts[i].u.cursor_geom.visible, FALSE); @@ -324,20 +328,20 @@ void WINECON_GrabChanges(struct inner_data* data) case CONSOLE_RENDERER_DISPLAY_EVENT: if (evts[i].u.display.left != data->curcfg.win_pos.X) { - WINE_TRACE(" h-scroll(%d)", evts[i].u.display.left); + WINE_TRACE("%u/%u: h-scroll(%d)\n", i+1, num, evts[i].u.display.left); data->fnScroll(data, evts[i].u.display.left, TRUE); data->fnPosCursor(data); } if (evts[i].u.display.top != data->curcfg.win_pos.Y) { - WINE_TRACE(" v-scroll(%d)", evts[i].u.display.top); + WINE_TRACE("%u/%u: v-scroll(%d)\n", i+1, num, evts[i].u.display.top); data->fnScroll(data, evts[i].u.display.top, FALSE); data->fnPosCursor(data); } if (evts[i].u.display.width != data->curcfg.win_width || evts[i].u.display.height != data->curcfg.win_height) { - WINE_TRACE(" win-size(%d,%d)", evts[i].u.display.width, evts[i].u.display.height); + WINE_TRACE("%u/%u: win-size(%d,%d)\n", i+1, num, evts[i].u.display.width, evts[i].u.display.height); data->curcfg.win_width = evts[i].u.display.width; data->curcfg.win_height = evts[i].u.display.height; data->fnComputePositions(data); @@ -345,14 +349,12 @@ void WINECON_GrabChanges(struct inner_data* data) break; case CONSOLE_RENDERER_EXIT_EVENT: data->dying = TRUE; - WINE_TRACE(". Exit!!\n"); + WINE_TRACE("%u/%u: Exit!!\n", i+1, num); return; default: WINE_FIXME("Unknown event type (%d)\n", evts[i].event); } } - - WINE_TRACE(".\n"); } /******************************************************************

1 0