November 2011 - Wine-Commits

Henri Verbeet : wined3d: Introduce a "state" variable in shader_glsl_load_constants().
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 13efdc6a37d3c42d562edbecfb3c2e4d924b7dd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13efdc6a37d3c42d562edbecf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 13 19:52:26 2011 +0100 wined3d: Introduce a "state" variable in shader_glsl_load_constants(). --- dlls/wined3d/glsl_shader.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fc642c9..ff17fcf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -714,6 +714,7 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_device *device = context->swapchain->device; struct wined3d_stateblock *stateBlock = device->stateBlock; + const struct wined3d_state *state = &stateBlock->state; struct shader_glsl_priv *priv = device->shader_priv; float position_fixup[4]; @@ -731,40 +732,40 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, if (useVertexShader) { - const struct wined3d_shader *vshader = stateBlock->state.vertex_shader; + const struct wined3d_shader *vshader = state->vertex_shader; /* Load DirectX 9 float constants/uniforms for vertex shader */ - shader_glsl_load_constantsF(vshader, gl_info, stateBlock->state.vs_consts_f, + shader_glsl_load_constantsF(vshader, gl_info, state->vs_consts_f, prog->vuniformF_locations, &priv->vconst_heap, priv->stack, constant_version); /* Load DirectX 9 integer constants/uniforms for vertex shader */ - shader_glsl_load_constantsI(vshader, gl_info, prog->vuniformI_locations, stateBlock->state.vs_consts_i, + shader_glsl_load_constantsI(vshader, gl_info, prog->vuniformI_locations, state->vs_consts_i, stateBlock->changed.vertexShaderConstantsI & vshader->reg_maps.integer_constants); /* Load DirectX 9 boolean constants/uniforms for vertex shader */ - shader_glsl_load_constantsB(vshader, gl_info, programId, stateBlock->state.vs_consts_b, + shader_glsl_load_constantsB(vshader, gl_info, programId, state->vs_consts_b, stateBlock->changed.vertexShaderConstantsB & vshader->reg_maps.boolean_constants); /* Upload the position fixup params */ - shader_get_position_fixup(context, &stateBlock->state, position_fixup); + shader_get_position_fixup(context, state, position_fixup); GL_EXTCALL(glUniform4fvARB(prog->posFixup_location, 1, position_fixup)); checkGLcall("glUniform4fvARB"); } if (usePixelShader) { - const struct wined3d_shader *pshader = stateBlock->state.pixel_shader; + const struct wined3d_shader *pshader = state->pixel_shader; /* Load DirectX 9 float constants/uniforms for pixel shader */ - shader_glsl_load_constantsF(pshader, gl_info, stateBlock->state.ps_consts_f, + shader_glsl_load_constantsF(pshader, gl_info, state->ps_consts_f, prog->puniformF_locations, &priv->pconst_heap, priv->stack, constant_version); /* Load DirectX 9 integer constants/uniforms for pixel shader */ - shader_glsl_load_constantsI(pshader, gl_info, prog->puniformI_locations, stateBlock->state.ps_consts_i, + shader_glsl_load_constantsI(pshader, gl_info, prog->puniformI_locations, state->ps_consts_i, stateBlock->changed.pixelShaderConstantsI & pshader->reg_maps.integer_constants); /* Load DirectX 9 boolean constants/uniforms for pixel shader */ - shader_glsl_load_constantsB(pshader, gl_info, programId, stateBlock->state.ps_consts_b, + shader_glsl_load_constantsB(pshader, gl_info, programId, state->ps_consts_b, stateBlock->changed.pixelShaderConstantsB & pshader->reg_maps.boolean_constants); /* Upload the environment bump map matrix if needed. The needsbumpmat member specifies the texture stage to load the matrix from. @@ -775,7 +776,7 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, if(prog->bumpenvmat_location[i] == -1) continue; - data = (const float *)&stateBlock->state.texture_states[i][WINED3DTSS_BUMPENVMAT00]; + data = (const float *)&state->texture_states[i][WINED3DTSS_BUMPENVMAT00]; GL_EXTCALL(glUniformMatrix2fvARB(prog->bumpenvmat_location[i], 1, 0, data)); checkGLcall("glUniformMatrix2fvARB"); @@ -784,8 +785,8 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, * needsbumpmat check. */ if (prog->luminancescale_location[i] != -1) { - const GLfloat *scale = (const GLfloat *)&stateBlock->state.texture_states[i][WINED3DTSS_BUMPENVLSCALE]; - const GLfloat *offset = (const GLfloat *)&stateBlock->state.texture_states[i][WINED3DTSS_BUMPENVLOFFSET]; + const GLfloat *scale = (const GLfloat *)&state->texture_states[i][WINED3DTSS_BUMPENVLSCALE]; + const GLfloat *offset = (const GLfloat *)&state->texture_states[i][WINED3DTSS_BUMPENVLOFFSET]; GL_EXTCALL(glUniform1fvARB(prog->luminancescale_location[i], 1, scale)); checkGLcall("glUniform1fvARB");

1 0

Henri Verbeet : wined3d: Get rid of the winetexturestates typedef.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 076edfe9d4b6cd39b6cf41b9f1d3e18688cc8673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=076edfe9d4b6cd39b6cf41b9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 13 19:52:28 2011 +0100 wined3d: Get rid of the winetexturestates typedef. --- dlls/wined3d/wined3d_private.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d36c017..a331f4e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1841,7 +1841,8 @@ void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16 -typedef enum winetexturestates { +enum wined3d_texture_state +{ WINED3DTEXSTA_ADDRESSU = 0, WINED3DTEXSTA_ADDRESSV = 1, WINED3DTEXSTA_ADDRESSW = 2, @@ -1854,7 +1855,7 @@ typedef enum winetexturestates { WINED3DTEXSTA_SRGBTEXTURE = 9, WINED3DTEXSTA_SHADOW = 10, MAX_WINETEXTURESTATES = 11, -} winetexturestates; +}; enum WINED3DSRGB {

1 0

Francois Gouget : include: Move the DDE_xxx macros to dde.rh.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: d1e85a0f1f76ff9048b74651f7c8adae16d93af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e85a0f1f76ff9048b74651f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 14 10:03:20 2011 +0100 include: Move the DDE_xxx macros to dde.rh. --- include/Makefile.in | 1 + include/dde.h | 12 +----------- include/dde.rh | 32 ++++++++++++++++++++++++++++++++ include/winresrc.h | 2 +- 4 files changed, 35 insertions(+), 12 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index ddc07ba..00e9cf4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -203,6 +203,7 @@ SRCDIR_INCLUDES = \ dciddi.h \ dciman.h \ dde.h \ + dde.rh \ ddeml.h \ ddk/compstui.h \ ddk/hidsdi.h \ diff --git a/include/dde.h b/include/dde.h index 117b428..508c1ea 100644 --- a/include/dde.h +++ b/include/dde.h @@ -34,17 +34,7 @@ extern "C" { #define WINUSERAPI DECLSPEC_IMPORT #endif -#define WM_DDE_INITIATE 0x3E0 -#define WM_DDE_TERMINATE 0x3E1 -#define WM_DDE_ADVISE 0x3E2 -#define WM_DDE_UNADVISE 0x3E3 -#define WM_DDE_ACK 0x3E4 -#define WM_DDE_DATA 0x3E5 -#define WM_DDE_REQUEST 0x3E6 -#define WM_DDE_POKE 0x3E7 -#define WM_DDE_EXECUTE 0x3E8 -#define WM_DDE_LAST WM_DDE_EXECUTE -#define WM_DDE_FIRST WM_DDE_INITIATE +#include <dde.rh> /* DDEACK: wStatus in WM_DDE_ACK message */ typedef struct diff --git a/include/dde.rh b/include/dde.rh new file mode 100644 index 0000000..23076a8 --- /dev/null +++ b/include/dde.rh @@ -0,0 +1,32 @@ +/* + * Copyright 1995, Technion, Israel Institute of Technology + * Electrical Eng, Software Lab. + * Author: Michael Veksler. + * Purpose: dde declarations + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WM_DDE_INITIATE 0x3E0 +#define WM_DDE_TERMINATE 0x3E1 +#define WM_DDE_ADVISE 0x3E2 +#define WM_DDE_UNADVISE 0x3E3 +#define WM_DDE_ACK 0x3E4 +#define WM_DDE_DATA 0x3E5 +#define WM_DDE_REQUEST 0x3E6 +#define WM_DDE_POKE 0x3E7 +#define WM_DDE_EXECUTE 0x3E8 +#define WM_DDE_LAST WM_DDE_EXECUTE +#define WM_DDE_FIRST WM_DDE_INITIATE diff --git a/include/winresrc.h b/include/winresrc.h index e179217..2f99661 100644 --- a/include/winresrc.h +++ b/include/winresrc.h @@ -37,7 +37,7 @@ #include <winuser.rh> #include <commctrl.rh> -/* FIXME: #include <dde.rh> */ +#include <dde.rh> #include <winnt.rh> #include <dlgs.h> #include <winver.h>

1 0

Francois Gouget : include: Update commctrl. rh and remove duplication with commctrl.h.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: b078248120e194052301e8fd771ddb91e676a7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b078248120e194052301e8fd7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 14 10:04:20 2011 +0100 include: Update commctrl.rh and remove duplication with commctrl.h. --- include/commctrl.h | 158 +-------------------------------------------------- include/commctrl.rh | 127 +++++++++++++++++++++++------------------ 2 files changed, 72 insertions(+), 213 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b078248120e194052301e…

1 0

Stefan Dösinger : ddraw/tests: Add a test for YV12 partial block locks and lock offsets.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: a9c72d8772b322eec5513c0d399148f7de5d8732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c72d8772b322eec5513c0d3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 13 21:44:27 2011 +0200 ddraw/tests: Add a test for YV12 partial block locks and lock offsets. --- dlls/ddraw/tests/overlay.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index 4f1ac92..6288be1 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -1,7 +1,7 @@ /* * Unit tests for DirectDraw overlay functions * - * Copyright (C) 2008 Stefan Dösinger for CodeWeavers + * Copyright (C) 2008,2011 Stefan Dösinger for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -195,6 +195,9 @@ static void yv12_test(void) HRESULT hr; DDSURFACEDESC2 desc; IDirectDrawSurface7 *surface; + char *base; + RECT rect = {13, 17, 14, 18}; + unsigned int offset; surface = create_overlay(256, 256, MAKEFOURCC('Y','V','1','2')); if(!surface) { @@ -217,6 +220,20 @@ static void yv12_test(void) /* The overlay pitch seems to have 256 byte alignment */ ok((U1(desc).lPitch & 0xff) == 0, "Expected 256 byte aligned pitch, got %u\n", U1(desc).lPitch); + base = desc.lpSurface; + + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr); + + /* YV12 uses 2x2 blocks with 6 bytes per block(4*Y, 1*U, 1*V). Unlike other block-based formats like DXT + * the entire Y channel is stored in one big chunk of memory, followed by the chroma channels. So + * partial locks do not really make sense. Show that they are allowed nevertheless and the offset points + * into the luminance data */ + hr = IDirectDrawSurface7_Lock(surface, &rect, &desc, 0, NULL); + ok(hr == DD_OK, "Partial lock of a YV12 surface returned 0x%08x, expected DD_OK\n", hr); + offset = ((const char *) desc.lpSurface - base); + ok(offset == rect.top * U1(desc).lPitch + rect.left, "Expected %u byte offset from partial lock, got %u\n", + rect.top * U1(desc).lPitch + rect.left, offset); hr = IDirectDrawSurface7_Unlock(surface, NULL); ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr);

1 0

Stefan Dösinger : ddraw/tests: Add a YV12 blit test.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: edfeec60b164caccf6375cff91b3fc142fe2dbd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edfeec60b164caccf6375cff9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 8 23:05:08 2011 +0100 ddraw/tests: Add a YV12 blit test. --- dlls/ddraw/tests/overlay.c | 49 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index 6288be1..ded7c5a 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -194,10 +194,10 @@ static void yv12_test(void) { HRESULT hr; DDSURFACEDESC2 desc; - IDirectDrawSurface7 *surface; + IDirectDrawSurface7 *surface, *dst; char *base; RECT rect = {13, 17, 14, 18}; - unsigned int offset; + unsigned int offset, y; surface = create_overlay(256, 256, MAKEFOURCC('Y','V','1','2')); if(!surface) { @@ -220,7 +220,23 @@ static void yv12_test(void) /* The overlay pitch seems to have 256 byte alignment */ ok((U1(desc).lPitch & 0xff) == 0, "Expected 256 byte aligned pitch, got %u\n", U1(desc).lPitch); + /* Fill the surface with some data for the blit test */ base = desc.lpSurface; + /* Luminance */ + for (y = 0; y < desc.dwHeight; y++) + { + memset(base + desc.lPitch * y, 0x10, desc.dwWidth); + } + /* V */ + for (; y < desc.dwHeight + desc.dwHeight / 4; y++) + { + memset(base + desc.lPitch * y, 0x20, desc.dwWidth); + } + /* U */ + for (; y < desc.dwHeight + desc.dwHeight / 2; y++) + { + memset(base + desc.lPitch * y, 0x30, desc.dwWidth); + } hr = IDirectDrawSurface7_Unlock(surface, NULL); ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr); @@ -237,6 +253,35 @@ static void yv12_test(void) hr = IDirectDrawSurface7_Unlock(surface, NULL); ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr); + dst = create_overlay(256, 256, MAKEFOURCC('Y','V','1','2')); + if (!dst) + { + /* Windows XP with a Radeon X1600 GPU refuses to create a second overlay surface, + * DDERR_NOOVERLAYHW, making the blit tests moot */ + skip("Could not create a second YV12 surface, skipping blit test\n"); + goto cleanup; + } + + hr = IDirectDrawSurface7_Blt(dst, NULL, surface, NULL, 0, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned 0x%08x, expected DD_OK\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDrawSurface7_Lock(dst, NULL, &desc, 0, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned 0x%08x, expected DD_OK\n", hr); + + base = desc.lpSurface; + ok(base[0] == 0x10, "Y data is 0x%02x, expected 0x10\n", base[0]); + base += desc.dwHeight * desc.lPitch; + todo_wine ok(base[0] == 0x20, "V data is 0x%02x, expected 0x20\n", base[0]); + base += desc.dwHeight / 4 * desc.lPitch; + todo_wine ok(base[0] == 0x30, "U data is 0x%02x, expected 0x30\n", base[0]); + + hr = IDirectDrawSurface7_Unlock(dst, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr); + + IDirectDrawSurface7_Release(dst); +cleanup: IDirectDrawSurface7_Release(surface); }

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSHADER_PARAM_REGISTER_TYPE typedef.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 66cb4a8ca966f4ad918fe46293bc6ac33621bc51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66cb4a8ca966f4ad918fe4629… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 13 19:52:27 2011 +0100 wined3d: Get rid of the WINED3DSHADER_PARAM_REGISTER_TYPE typedef. --- dlls/wined3d/shader.c | 2 +- dlls/wined3d/shader_sm4.c | 4 ++-- dlls/wined3d/wined3d_private.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 42c71ed..24b577a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -311,7 +311,7 @@ static void shader_init(struct wined3d_shader *shader, struct wined3d_device *de /* Convert floating point offset relative to a register file to an absolute * offset for float constants. */ -static unsigned int shader_get_float_offset(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx) +static unsigned int shader_get_float_offset(enum wined3d_shader_register_type register_type, UINT register_idx) { switch (register_type) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 19f8c30..f6c3ec1 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -127,7 +127,7 @@ struct wined3d_sm4_opcode_info struct sysval_map { enum wined3d_sysval_semantic sysval; - WINED3DSHADER_PARAM_REGISTER_TYPE register_type; + enum wined3d_shader_register_type register_type; UINT register_idx; }; @@ -173,7 +173,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, 1, 1}, }; -static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = +static const enum wined3d_shader_register_type register_type_table[] = { /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 11e0297..d36c017 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -286,7 +286,7 @@ enum wined3d_sampler_texture_type WINED3DSTT_VOLUME = 4, }; -typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE +enum wined3d_shader_register_type { WINED3DSPR_TEMP = 0, WINED3DSPR_INPUT = 1, @@ -314,7 +314,7 @@ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE WINED3DSPR_CONSTBUFFER, WINED3DSPR_NULL, WINED3DSPR_RESOURCE, -} WINED3DSHADER_PARAM_REGISTER_TYPE; +}; enum wined3d_immconst_type { @@ -597,7 +597,7 @@ struct wined3d_shader_context struct wined3d_shader_register { - WINED3DSHADER_PARAM_REGISTER_TYPE type; + enum wined3d_shader_register_type type; UINT idx; UINT array_idx; const struct wined3d_shader_src_param *rel_addr;

1 0

Henri Verbeet : wined3d: x11_copy_to_screen() shouldn' t be called on mapped surfaces.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: a44401af0fa5e68dc20ff650f636af1b92b60b21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44401af0fa5e68dc20ff650f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 13 19:52:25 2011 +0100 wined3d: x11_copy_to_screen() shouldn't be called on mapped surfaces. --- dlls/wined3d/swapchain.c | 40 ++++------------------------------------ 1 files changed, 4 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a02a189..d04d9c1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -677,6 +677,9 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r if (!(front->resource.usage & WINED3DUSAGE_RENDERTARGET)) return; + if (front->flags & SFLAG_LOCKED) + ERR("Trying to blit a mapped surface.\n"); + TRACE("Copying surface %p to screen.\n", front); src_dc = front->hDC; @@ -690,48 +693,13 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r TRACE("offset %s.\n", wine_dbgstr_point(&offset)); -#if 0 - /* FIXME: This doesn't work... if users really want to run - * X in 8bpp, then we need to call directly into display.drv - * (or Wine's equivalent), and force a private colormap - * without default entries. */ - if (front->palette) - { - SelectPalette(dst_dc, front->palette->hpal, FALSE); - RealizePalette(dst_dc); /* sends messages => deadlocks */ - } -#endif - draw_rect.left = 0; draw_rect.right = front->resource.width; draw_rect.top = 0; draw_rect.bottom = front->resource.height; -#if 0 - /* TODO: Support clippers. */ - if (front->clipper) - { - RECT xrc; - HWND hwnd = front->clipper->hWnd; - if (hwnd && GetClientRect(hwnd,&xrc)) - { - OffsetRect(&xrc, offset.x, offset.y); - IntersectRect(&draw_rect, &draw_rect, &xrc); - } - } -#endif - - if (!rect) - { - /* Only use this if the caller did not pass a rectangle, since - * due to double locking this could be the wrong one... */ - if (front->lockedRect.left != front->lockedRect.right) - IntersectRect(&draw_rect, &draw_rect, &front->lockedRect); - } - else - { + if (rect) IntersectRect(&draw_rect, &draw_rect, rect); - } BitBlt(dst_dc, draw_rect.left - offset.x, draw_rect.top - offset.y, draw_rect.right - draw_rect.left, draw_rect.bottom - draw_rect.top,

1 0

Matteo Bruni : wined3d: Skip blending test on some texture formats.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 62a2ad3d0f8d8435619924a6ff4a19adf94c16cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a2ad3d0f8d8435619924a6f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Nov 9 22:16:37 2011 +0100 wined3d: Skip blending test on some texture formats. It doesn't make sense to test NULL and P8, while the luminance formats right now aren't really tested anyway (and "incidentally" that also workarounds a Nvidia drivers bug). --- dlls/wined3d/utils.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index baf2548..d61172e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1061,7 +1061,9 @@ 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) - || !(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING))) + || !(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING)) + && format->id != WINED3DFMT_NULL && format->id != WINED3DFMT_P8_UINT + && format->glFormat != GL_LUMINANCE && format->glFormat != GL_LUMINANCE_ALPHA) { GLuint rb, tex2; DWORD readback[16 * 16], color;

1 0

Aric Stewart : usp10: Add some additional Latin script ranges.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: e6ee421e88f9ac4819e7cdb540501eff2cfe369b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ee421e88f9ac4819e7cdb54… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 11 08:52:27 2011 -0600 usp10: Add some additional Latin script ranges. --- dlls/usp10/usp10.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a811cad..4ac7b8f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -114,6 +114,31 @@ static const scriptRange scriptRanges[] = { { Script_Latin, 0x1e00, 0x1eff, 0, 0}, /* Greek Extended: U+1F00–U+1FFF */ { Script_Greek, 0x1f00, 0x1fff, 0, 0}, + /* General Punctuation: U+2000 –U+206f */ + /* Superscripts and Subscripts : U+2070 –U+209f */ + /* Currency Symbols : U+20a0 –U+20cf */ + { Script_Latin, 0x2000, 0x20cf, 0, 0}, + /* Letterlike Symbols : U+2100 –U+214f */ + /* Number Forms : U+2150 –U+218f */ + /* Arrows : U+2190 –U+21ff */ + /* Mathematical Operators : U+2200 –U+22ff */ + /* Miscellaneous Technical : U+2300 –U+23ff */ + /* Control Pictures : U+2400 –U+243f */ + /* Optical Character Recognition : U+2440 –U+245f */ + /* Enclosed Alphanumerics : U+2460 –U+24ff */ + /* Box Drawing : U+2500 –U+25ff */ + /* Block Elements : U+2580 –U+259f */ + /* Geometric Shapes : U+25a0 –U+25ff */ + /* Miscellaneous Symbols : U+2600 –U+26ff */ + /* Dingbats : U+2700 –U+27bf */ + /* Miscellaneous Mathematical Symbols-A : U+27c0 –U+27ef */ + /* Supplemental Arrows-A : U+27f0 –U+27ff */ + { Script_Latin, 0x2100, 0x27ff, 0, 0}, + /* Supplemental Arrows-B : U+2900 –U+297f */ + /* Miscellaneous Mathematical Symbols-B : U+2980 –U+29ff */ + /* Supplemental Mathematical Operators : U+2a00 –U+2aff */ + /* Miscellaneous Symbols and Arrows : U+2b00 –U+2bff */ + { Script_Latin, 0x2900, 0x2bff, 0, 0}, /* Latin Extended-C: U+2C60–U+2C7F */ { Script_Latin, 0x2c60, 0x2c7f, 0, 0}, /* Georgian: U+2D00–U+2D2F */

1 0