November 2011 - Wine-commits

Henri Verbeet : wined3d: Make the shader parameter to shader_arb_generate_vshader() const.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: e3a105a6266c31edcfcb0e46b0f95726666a26da URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a105a6266c31edcfcb0e46b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 3 19:37:29 2011 +0100 wined3d: Make the shader parameter to shader_arb_generate_vshader() const. --- 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 ea404cb..1330438 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4103,7 +4103,7 @@ static void init_output_registers(const struct wined3d_shader *shader, DWORD sig } /* GL locking is done by the caller */ -static GLuint shader_arb_generate_vshader(struct wined3d_shader *shader, +static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, struct wined3d_shader_buffer *buffer, const struct arb_vs_compile_args *args, struct arb_vs_compiled_shader *compiled) {

1 0

Henri Verbeet : wined3d: Make the shader parameter to shader_arb_generate_pshader() const.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 55d8063e67eeef0c7ed2e869190cbea4e9d24b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d8063e67eeef0c7ed2e8691… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 3 19:37:30 2011 +0100 wined3d: Make the shader parameter to shader_arb_generate_pshader() const. --- 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 1330438..ffcc2a8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3517,7 +3517,7 @@ static void init_ps_input(const struct wined3d_shader *shader, } /* GL locking is done by the caller */ -static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, +static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, struct wined3d_shader_buffer *buffer, const struct arb_ps_compile_args *args, struct arb_ps_compiled_shader *compiled) {

1 0

Matteo Bruni : wined3d: Add filtering flag to more texture formats.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 307579156fa9e6a925b5d35700d57cf084424b13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=307579156fa9e6a925b5d3570… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 3 15:26:35 2011 +0100 wined3d: Add filtering flag to more texture formats. --- dlls/wined3d/directx.c | 37 ++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2e63a1a..becfd1e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -607,6 +607,12 @@ static BOOL match_dx10_capable(const struct wined3d_gl_info *gl_info, const char return gl_info->limits.glsl_varyings > 44; } +static BOOL match_not_dx10_capable(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) +{ + return !match_dx10_capable(gl_info, gl_renderer, gl_vendor, card_vendor, device); +} + /* A GL context is provided by the caller */ static BOOL match_allows_spec_alpha(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) @@ -780,16 +786,6 @@ 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); @@ -912,9 +908,14 @@ 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) +static void quirk_limited_tex_filtering(struct wined3d_gl_info *gl_info) { - gl_info->quirks |= WINED3D_QUIRK_LIMITED_VTF; + /* Nvidia GeForce 6xxx and 7xxx support accelerated VTF only on a few + selected texture formats. They are apparently the only DX9 class GPUs + supporting VTF. + Also, DX9-era GPUs are somewhat limited with float textures + filtering and blending. */ + gl_info->quirks |= WINED3D_QUIRK_LIMITED_TEX_FILTERING; } struct driver_quirk @@ -1007,9 +1008,9 @@ static const struct driver_quirk quirk_table[] = "Not printing GLSL infolog" }, { - match_limited_vtf, - quirk_limited_vtf, - "Vertex textures support is limited" + match_not_dx10_capable, + quirk_limited_tex_filtering, + "Texture filtering, blending and VTF support is limited" }, }; @@ -3281,7 +3282,9 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, static BOOL CheckFilterCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { /* The flags entry of a format contains the filtering capability */ - if (format->flags & WINED3DFMT_FLAG_FILTERING) return TRUE; + if ((format->flags & WINED3DFMT_FLAG_FILTERING) + || !(adapter->gl_info.quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING)) + return TRUE; return FALSE; } @@ -3720,7 +3723,7 @@ static BOOL CheckVertexTextureCapability(const struct wined3d_adapter *adapter, case WINED3DFMT_R32_FLOAT: return TRUE; default: - return !(gl_info->quirks & WINED3D_QUIRK_LIMITED_VTF); + return !(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 098d03a..c15d879 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -53,7 +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 +#define WINED3D_QUIRK_LIMITED_TEX_FILTERING 0x00000100 /* Texture format fixups */

1 0

Matteo Bruni : wined3d: Test more thoroughly for post-pixelshader blending support, try on more texture formats.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 7b0ba5153f3e42f31b922e5eb997d5e1d0cb44d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0ba5153f3e42f31b922e5eb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 3 15:26:36 2011 +0100 wined3d: Test more thoroughly for post-pixelshader blending support, try on more texture formats. --- dlls/wined3d/utils.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f374967..981ed2c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1053,9 +1053,13 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined } } - if (status == GL_FRAMEBUFFER_COMPLETE && format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING) + if (status == GL_FRAMEBUFFER_COMPLETE && ((format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING) + || !(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING))) { - GLuint rb; + GLuint rb, tex2; + DWORD readback[16 * 16], color; + BYTE r, a; + BOOL match = TRUE; if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_PACKED_DEPTH_STENCIL]) @@ -1069,6 +1073,7 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined } glEnable(GL_BLEND); + glClearColor(0, 0, 0, 1); glClear(GL_COLOR_BUFFER_BIT); if (glGetError() == GL_INVALID_FRAMEBUFFER_OPERATION) { @@ -1077,6 +1082,65 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined format->flags &= ~WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; } + glViewport(0, 0, 16, 16); + glDisable(GL_LIGHTING); + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + + /* Draw a full-black quad */ + glBegin(GL_TRIANGLE_STRIP); + glColor4ub(0x00, 0x00, 0x00, 0xff); + glVertex3f(-1.0f, -1.0f, 0.0f); + glColor4ub(0x00, 0x00, 0x00, 0xff); + glVertex3f(1.0f, -1.0f, 0.0f); + glColor4ub(0x00, 0x00, 0x00, 0xff); + glVertex3f(-1.0f, 1.0f, 0.0f); + glColor4ub(0x00, 0x00, 0x00, 0xff); + glVertex3f(1.0f, 1.0f, 0.0f); + glEnd(); + + /* Draw a half-transparent red quad */ + glBegin(GL_TRIANGLE_STRIP); + glColor4ub(0xff, 0x00, 0x00, 0x80); + glVertex3f(-1.0f, -1.0f, 0.0f); + glColor4ub(0xff, 0x00, 0x00, 0x80); + glVertex3f(1.0f, -1.0f, 0.0f); + glColor4ub(0xff, 0x00, 0x00, 0x80); + glVertex3f(-1.0f, 1.0f, 0.0f); + glColor4ub(0xff, 0x00, 0x00, 0x80); + glVertex3f(1.0f, 1.0f, 0.0f); + glEnd(); + + glGenTextures(1, &tex2); + glBindTexture(GL_TEXTURE_2D, tex2); + + glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 0, 0, 16, 16, 0); + glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); + checkGLcall("Post-pixelshader blending check"); + + color = readback[7 * 16 + 7]; + a = color >> 24; + r = (color & 0x00ff0000) >> 16; + + if (format->red_mask && (r < 0x7b || r > 0x84)) + match = FALSE; + /* If the alpha component is more than 1 bit */ + else if ((format->alpha_mask & (format->alpha_mask - 1)) && (a < 0x9f || a > 0xdf)) + match = FALSE; + if (!match) + { + TRACE("Format doesn't support post-pixelshader blending.\n"); + TRACE("Color output: %#x\n", color); + format->flags &= ~WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; + } + + glBindTexture(GL_TEXTURE_2D, tex); + glDeleteTextures(1, &tex2); + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_PACKED_DEPTH_STENCIL]) { @@ -1125,6 +1189,8 @@ static void init_format_fbo_compat_info(struct wined3d_gl_info *gl_info) gl_info->fbo_ops.glGenFramebuffers(1, &fbo); gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, fbo); + glDrawBuffer(GL_COLOR_ATTACHMENT0); + glReadBuffer(GL_COLOR_ATTACHMENT0); LEAVE_GL(); }

1 0

Matteo Bruni : wined3d: Recognize Northern Islands cards with AMD binary drivers.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: cc221b285bb748658cb9a454a69715ae01b048aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc221b285bb748658cb9a454a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 3 15:26:37 2011 +0100 wined3d: Recognize Northern Islands cards with AMD binary drivers. --- dlls/wined3d/directx.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index becfd1e..44fd88d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1186,6 +1186,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6410D, "AMD Radeon HD 6410D", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6550D, "AMD Radeon HD 6550D", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600, "AMD Radeon HD 6600 Series", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600M, "AMD Radeon HD 6600M Series", DRIVER_AMD_R600, 512 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6800, "AMD Radeon HD 6800 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6900, "AMD Radeon HD 6900 Series", DRIVER_AMD_R600, 2048}, /* Intel cards */ @@ -1708,6 +1709,17 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in } cards[] = { + /* Northern Islands */ + {"HD 6900", CARD_AMD_RADEON_HD6900}, + {"HD 6800", CARD_AMD_RADEON_HD6800}, + {"HD 6630M",CARD_AMD_RADEON_HD6600M}, + {"HD 6600M",CARD_AMD_RADEON_HD6600M}, + {"HD 6600", CARD_AMD_RADEON_HD6600}, + {"HD 6500M",CARD_AMD_RADEON_HD6600M}, + {"HD 6500", CARD_AMD_RADEON_HD6600}, + {"HD 6400", CARD_AMD_RADEON_HD6400}, + {"HD 6300", CARD_AMD_RADEON_HD6300}, + {"HD 6200", CARD_AMD_RADEON_HD6300}, /* Evergreen */ {"HD 5870", CARD_AMD_RADEON_HD5800}, /* Radeon EG CYPRESS PRO */ {"HD 5850", CARD_AMD_RADEON_HD5800}, /* Radeon EG CYPRESS XT */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c15d879..c4784b0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1347,6 +1347,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD6410D = 0x9644, CARD_AMD_RADEON_HD6550D = 0x9640, CARD_AMD_RADEON_HD6600 = 0x6758, + CARD_AMD_RADEON_HD6600M = 0x6741, CARD_AMD_RADEON_HD6800 = 0x6739, CARD_AMD_RADEON_HD6900 = 0x6719,

1 0

Octavian Voicu : ddraw/tests: Use more common pixel formats and caps for attachment tests.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 9776a3bae2138b3ee4fe890b9a9a70b4c65956b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9776a3bae2138b3ee4fe890b9… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Thu Nov 3 13:32:10 2011 +0200 ddraw/tests: Use more common pixel formats and caps for attachment tests. --- dlls/ddraw/tests/dsurface.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 7b5ffd5..cc5936f 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1427,15 +1427,18 @@ static void AttachmentTest7(void) ddsd.dwHeight = 64; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_PALETTEINDEXED8 | DDPF_RGB; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 8; + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; /* D3DFMT_R5G6B5 */ + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xF800; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07E0; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001F; memset(&ddsd2, 0, sizeof(ddsd2)); ddsd2.dwSize = sizeof(ddsd2); ddsd2.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; ddsd2.dwWidth = ddsd.dwWidth; ddsd2.dwHeight = ddsd.dwHeight; - ddsd2.ddsCaps.dwCaps = DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER; + ddsd2.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; U4(ddsd2).ddpfPixelFormat.dwSize = sizeof(U4(ddsd2).ddpfPixelFormat); U4(ddsd2).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; U1(U4(ddsd2).ddpfPixelFormat).dwZBufferBitDepth = 16; @@ -1701,15 +1704,18 @@ static void AttachmentTest(void) ddsd.dwHeight = 64; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_PALETTEINDEXED8 | DDPF_RGB; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 8; + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; /* D3DFMT_R5G6B5 */ + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xF800; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07E0; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001F; memset(&ddsd2, 0, sizeof(ddsd2)); ddsd2.dwSize = sizeof(ddsd2); ddsd2.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; ddsd2.dwWidth = ddsd.dwWidth; ddsd2.dwHeight = ddsd.dwHeight; - ddsd2.ddsCaps.dwCaps = DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER; + ddsd2.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; U4(ddsd2).ddpfPixelFormat.dwSize = sizeof(U4(ddsd2).ddpfPixelFormat); U4(ddsd2).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; U1(U4(ddsd2).ddpfPixelFormat).dwZBufferBitDepth = 16;

1 0

Octavian Voicu : ddraw/tests: Add more attachment/detachment test cases.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 6e75f68153e09f8afb302bce2417a32411b28500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e75f68153e09f8afb302bce2… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Thu Nov 3 13:32:11 2011 +0200 ddraw/tests: Add more attachment/detachment test cases. --- dlls/ddraw/tests/dsurface.c | 88 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 75 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index cc5936f..555ad23 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1452,37 +1452,79 @@ static void AttachmentTest7(void) ok(hr == DD_OK, "CreateSurface returned %08x\n", hr); if (SUCCEEDED(hr)) { - /* DeleteAttachedSurface */ + hr = IDirectDrawSurface7_QueryInterface(surface1, &IID_IDirectDrawSurface, (void **)&surface1v1); + ok(hr == DD_OK, "IDirectDrawSurface7_QueryInterface returned %08x\n", hr); + hr = IDirectDrawSurface7_QueryInterface(surface2, &IID_IDirectDrawSurface, (void **)&surface2v1); + ok(hr == DD_OK, "IDirectDrawSurface7_QueryInterface returned %08x\n", hr); + + /* DeleteAttachedSurface when attaching via IDirectDrawSurface7 */ hr = IDirectDrawSurface7_AddAttachedSurface(surface1, surface2); ok(hr == DD_OK, "AddAttachedSurface returned %08x\n", hr); if (SUCCEEDED(hr)) { ref = getRefcount((IUnknown *)surface2); ok(ref == 2, "Got refcount %d, expected 2\n", ref); - hr = IDirectDrawSurface7_QueryInterface(surface1, &IID_IDirectDrawSurface, (void **)&surface1v1); - ok(hr == DD_OK, "IDirectDrawSurface7_QueryInterface returned %08x\n", hr); - hr = IDirectDrawSurface7_QueryInterface(surface2, &IID_IDirectDrawSurface, (void **)&surface2v1); - ok(hr == DD_OK, "IDirectDrawSurface7_QueryInterface returned %08x\n", hr); + ref = getRefcount((IUnknown *)surface2v1); + ok(ref == 1, "Got refcount %d, expected 1\n", ref); + + /* Try reattach */ + hr = IDirectDrawSurface7_AddAttachedSurface(surface1, surface2); + ok(hr == DDERR_SURFACEALREADYATTACHED, "AddAttachedSurface returned %08x\n", hr); + + /* Attachment / detachment on another interface */ + hr = IDirectDrawSurface_AddAttachedSurface(surface1v1, surface2v1); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "AddAttachedSurface returned %08x\n", hr); hr = IDirectDrawSurface_DeleteAttachedSurface(surface1v1, 0, surface2v1); ok(hr == DDERR_SURFACENOTATTACHED, "DeleteAttachedSurface returned %08x\n", hr); - if (surface2v1 != NULL) IDirectDrawSurface_Release(surface2v1); - if (surface1v1 != NULL) IDirectDrawSurface_Release(surface1v1); + + /* Attaching while already attached to other surface */ + hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface3, NULL); + ok(hr == DD_OK, "CreateSurface returned %08x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface7_AddAttachedSurface(surface3, surface2); + todo_wine ok(hr == DD_OK, "AddAttachedSurface returned %08x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface7_DeleteAttachedSurface(surface3, 0, surface2); + ok(hr == DD_OK, "DeleteAttachedSurface returned %08x\n", hr); + } + IDirectDrawSurface7_Release(surface3); + } + hr = IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface2); ok(hr == DD_OK, "DeleteAttachedSurface returned %08x\n", hr); ref = getRefcount((IUnknown *)surface2); ok(ref == 1, "Got refcount %d, expected 1\n", ref); + ref = getRefcount((IUnknown *)surface2v1); + ok(ref == 1, "Got refcount %d, expected 1\n", ref); } + /* DeleteAttachedSurface when attaching via IDirectDrawSurface */ + hr = IDirectDrawSurface_AddAttachedSurface(surface1v1, surface2v1); + ok(hr == DD_OK, "AddAttachedSurface returned %08x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface2); + ok(hr == DDERR_SURFACENOTATTACHED, "DeleteAttachedSurface returned %08x\n", hr); + hr = IDirectDrawSurface_DeleteAttachedSurface(surface1v1, 0, surface2v1); + ok(hr == DD_OK, "DeleteAttachedSurface returned %08x\n", hr); + } + ref = IDirectDrawSurface7_Release(surface2); + ok(!ref, "Got refcount %d, expected 0\n", ref); + ref = IDirectDrawSurface7_Release(surface1); + ok(!ref, "Got refcount %d, expected 0\n", ref); + /* Automatic detachment on release */ - hr = IDirectDrawSurface7_AddAttachedSurface(surface1, surface2); + hr = IDirectDrawSurface_AddAttachedSurface(surface1v1, surface2v1); ok(hr == DD_OK, "AddAttachedSurface returned %08x\n", hr); - ref = getRefcount((IUnknown *)surface2); + ref = getRefcount((IUnknown *)surface2v1); ok(ref == 2, "Got refcount %d, expected 2\n", ref); - ref = IDirectDrawSurface7_Release(surface1); + ref = IDirectDrawSurface_Release(surface1v1); ok(!ref, "Got refcount %d, expected 0\n", ref); - ref = getRefcount((IUnknown *)surface2); + ref = getRefcount((IUnknown *)surface2v1); ok(ref == 1, "Got refcount %d, expected 1\n", ref); - ref = IDirectDrawSurface7_Release(surface2); + ref = IDirectDrawSurface_Release(surface2v1); ok(!ref, "Got refcount %d, expected 0\n", ref); } else @@ -1736,10 +1778,30 @@ static void AttachmentTest(void) { ref = getRefcount((IUnknown *)surface2); ok(ref == 2, "Got refcount %d, expected 2\n", ref); + + /* Try reattach */ + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); + ok(hr == DDERR_SURFACEALREADYATTACHED, "AddAttachedSurface returned %08x\n", hr); + + /* Attaching while already attached to other surface */ + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface3, NULL); + ok(hr == DD_OK, "CreateSurface returned %08x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface_AddAttachedSurface(surface3, surface2); + todo_wine ok(hr == DD_OK, "AddAttachedSurface returned %08x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface_DeleteAttachedSurface(surface3, 0, surface2); + ok(hr == DD_OK, "DeleteAttachedSurface returned %08x\n", hr); + } + IDirectDrawSurface_Release(surface3); + } + hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2); ok(hr == DD_OK, "DeleteAttachedSurface returned %08x\n", hr); ref = getRefcount((IUnknown *)surface2); - ok(ref == 1, "Got refcount %d, expected 1\n", ref); + ok(ref == 1, "Got refcount %d, expected 2\n", ref); } /* Automatic detachment on release */

1 0

Alexandre Julliard : dpnet/tests: Fix a test that fails on Windows.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 997cb5c6751816f2fc39bed3d5211845a9b12396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=997cb5c6751816f2fc39bed3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 11:24:30 2011 +0100 dpnet/tests: Fix a test that fails on Windows. --- dlls/dpnet/tests/peer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index 1756ac9..0deb988 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -131,8 +131,8 @@ static void test_get_sp_caps(void) ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); ok(caps.dwFlags == (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS | - DPNSPCAPS_SUPPORTSTHREADPOOL), "provider unexpectedly misses some capability flags\n"); - ok(caps.dwNumThreads == 3, "expected 3, got %d\n", caps.dwNumThreads); + DPNSPCAPS_SUPPORTSTHREADPOOL), "unexpected flags %x\n", caps.dwFlags); + ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout);

1 0

Piotr Caban : user32: Fix DFC_BUTTONRADIOMASK flag support in DrawFrameControl.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 816802cb11bf5037430e5eb0df67288f29600067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=816802cb11bf5037430e5eb0d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 3 15:10:41 2011 +0100 user32: Fix DFC_BUTTONRADIOMASK flag support in DrawFrameControl. --- dlls/user32/uitools.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index e11c411..1c1c679 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -792,6 +792,8 @@ static BOOL UITOOLS95_DFC_ButtonRadio(HDC dc, LPRECT r, UINT uFlags) if((uFlags & 0xff) == DFCS_BUTTONRADIOIMAGE) FillRect(dc, r, GetStockObject(BLACK_BRUSH)); + else if((uFlags & 0xff) == DFCS_BUTTONRADIOMASK) + FillRect(dc, r, GetStockObject(WHITE_BRUSH)); xc = myr.left + SmallDiam - SmallDiam/2; yc = myr.top + SmallDiam - SmallDiam/2;

1 0

Jacek Caban : mshtml: HTMLWindow_item code clean up.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: adafcda41c5c87e6715dc2f8262dbb404f5860b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adafcda41c5c87e6715dc2f82… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 3 19:24:09 2011 +0100 mshtml: HTMLWindow_item code clean up. --- dlls/mshtml/htmlwindow.c | 55 +++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 30 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ea02cb1..b0b872c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -323,8 +323,8 @@ static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, { HTMLWindow *This = impl_from_IHTMLWindow2(iface); nsIDOMWindowCollection *nsFrames; - HTMLWindow *window; - HRESULT hres; + HTMLWindow *window = NULL; + HRESULT hres = S_OK; nsresult nsres; TRACE("(%p)->(%p %p)\n", This, pvarIndex, pvarResult); @@ -335,29 +335,28 @@ static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, return E_FAIL; } - if(V_VT(pvarIndex) == VT_I4) { + switch(V_VT(pvarIndex)) { + case VT_I4: { int index = V_I4(pvarIndex); TRACE("Getting index %d\n", index); - if(index < 0) { - hres = DISP_E_MEMBERNOTFOUND; - goto cleanup; - } + if(index < 0) + break; hres = get_frame_by_index(nsFrames, index, &window); - if(FAILED(hres)) - goto cleanup; - }else if(V_VT(pvarIndex) == VT_UINT) { + break; + } + case VT_UINT: { unsigned int index = V_UINT(pvarIndex); TRACE("Getting index %u\n", index); hres = get_frame_by_index(nsFrames, index, &window); - if(FAILED(hres)) - goto cleanup; - }else if(V_VT(pvarIndex) == VT_BSTR) { + break; + } + case VT_BSTR: { BSTR str = V_BSTR(pvarIndex); PRUint32 length, i; TRACE("Getting name %s\n", wine_dbgstr_w(str)); - nsres = nsIDOMWindowCollection_GetLength(nsFrames, &length); + nsIDOMWindowCollection_GetLength(nsFrames, &length); window = NULL; for(i = 0; i < length && !window; ++i) { @@ -369,7 +368,7 @@ static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, if(NS_FAILED(nsres)) { FIXME("nsIDOMWindowCollection_Item failed: 0x%08x\n", nsres); hres = E_FAIL; - goto cleanup; + break; } cur_window = nswindow_to_window(nsWindow); @@ -379,7 +378,7 @@ static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, hres = IHTMLElement_get_id(&cur_window->frame_element->element.IHTMLElement_iface, &id); if(FAILED(hres)) { FIXME("IHTMLElement_get_id failed: 0x%08x\n", hres); - goto cleanup; + break; } if(!strcmpW(id, str)) @@ -387,26 +386,22 @@ static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, SysFreeString(id); } - - if(!window) { - hres = DISP_E_MEMBERNOTFOUND; - goto cleanup; - } - }else { + break; + } + default: hres = E_INVALIDARG; - goto cleanup; } + nsIDOMWindowCollection_Release(nsFrames); + if(FAILED(hres)) + return hres; + if(!window) + return DISP_E_MEMBERNOTFOUND; + IHTMLWindow2_AddRef(&window->IHTMLWindow2_iface); V_VT(pvarResult) = VT_DISPATCH; V_DISPATCH(pvarResult) = (IDispatch*)window; - - hres = S_OK; - -cleanup: - nsIDOMWindowCollection_Release(nsFrames); - - return hres; + return S_OK; } static HRESULT WINAPI HTMLWindow2_get_length(IHTMLWindow2 *iface, LONG *p)

1 0