November 2011 - Wine-Commits

Henri Verbeet : wined3d: Make some parameters to shader_generate_arb_declarations() const.
by Alexandre Julliard Nov. 4, 2011

Nov. 4, 2011

Module: wine Branch: master Commit: e71830625533fef913a8a50cb06f447abc25b4b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71830625533fef913a8a50cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 3 19:37:27 2011 +0100 wined3d: Make some parameters to shader_generate_arb_declarations() const. --- dlls/wined3d/arb_program_shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1573c17..a53f04a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -725,10 +725,10 @@ static DWORD *local_const_mapping(const struct wined3d_shader *shader) } /* Generate the variable & register declarations for the ARB_vertex_program output target */ -static DWORD shader_generate_arb_declarations(struct wined3d_shader *shader, +static DWORD shader_generate_arb_declarations(const struct wined3d_shader *shader, const struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_buffer *buffer, - const struct wined3d_gl_info *gl_info, DWORD *lconst_map, - DWORD *num_clipplanes, struct shader_arb_ctx_priv *ctx) + const struct wined3d_gl_info *gl_info, const DWORD *lconst_map, + DWORD *num_clipplanes, const struct shader_arb_ctx_priv *ctx) { DWORD i, next_local = 0; char pshader = shader_is_pshader_version(reg_maps->shader_version.type);

1 0

Henri Verbeet : wined3d: Make the shader parameter to shader_arb_generate_vshader() const.
by Alexandre Julliard Nov. 4, 2011

Nov. 4, 2011

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 Nov. 4, 2011

Nov. 4, 2011

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: Recognize Northern Islands cards with AMD binary drivers.
by Alexandre Julliard Nov. 4, 2011

Nov. 4, 2011

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

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

Nov. 4, 2011

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

Piotr Caban : user32: Fix DFC_BUTTONRADIOMASK flag support in DrawFrameControl.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

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

Claudio Fontana : wined3d: Rename nVidia GTX560 to GTX560TI, add GTX560 with correct device id.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: 485571539f5c27a5bd391ae69e436d774f8b9276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=485571539f5c27a5bd391ae69… Author: Claudio Fontana <claudio.fontana(a)gmail.com> Date: Thu Nov 3 01:03:37 2011 +0100 wined3d: Rename nVidia GTX560 to GTX560TI, add GTX560 with correct device id. --- dlls/wined3d/directx.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5422a74..0fce621 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1154,7 +1154,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6, 1536}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX550, "NVIDIA GeForce GTX 550 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT555M, "NVIDIA GeForce GT 555M", DRIVER_NVIDIA_GEFORCE6, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560TI, "NVIDIA GeForce GTX 560 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, @@ -1522,7 +1523,8 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl { {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ - {"GTX 560 Ti", CARD_NVIDIA_GEFORCE_GTX560}, /* Geforce 500 - midend */ + {"GTX 560 Ti", CARD_NVIDIA_GEFORCE_GTX560TI}, /* Geforce 500 - midend */ + {"GTX 560", CARD_NVIDIA_GEFORCE_GTX560}, /* Geforce 500 - midend */ {"GT 555M", CARD_NVIDIA_GEFORCE_GT555M}, /* Geforce 500 - midend mobile */ {"GTX 550 Ti", CARD_NVIDIA_GEFORCE_GTX550}, /* Geforce 500 - midend */ {"GTX 480", CARD_NVIDIA_GEFORCE_GTX480}, /* Geforce 400 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2a987d5..90a70b4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1404,7 +1404,8 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0, CARD_NVIDIA_GEFORCE_GTX550 = 0x1244, CARD_NVIDIA_GEFORCE_GT555M = 0x04b8, - CARD_NVIDIA_GEFORCE_GTX560 = 0x1200, + CARD_NVIDIA_GEFORCE_GTX560TI = 0x1200, + CARD_NVIDIA_GEFORCE_GTX560 = 0x1201, CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080,

1 0

Jacek Caban : mshtml: HTMLWindow_item code clean up.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

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

Octavian Voicu : ddraw/tests: Add more attachment/detachment test cases.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

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

Octavian Voicu : ddraw/tests: Use more common pixel formats and caps for attachment tests.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

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