December 2011 - Wine-commits

Nikolay Sivov : msxml3: Fix VT_BSTR case for IXMLHttpRequest::send().
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: 9321ed7c39d3877a555ee5e70b91a1b3b71af434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9321ed7c39d3877a555ee5e70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 21 06:48:50 2011 +0300 msxml3: Fix VT_BSTR case for IXMLHttpRequest::send(). --- dlls/msxml3/httprequest.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 3000037..c3d5df9 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -596,19 +596,6 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * } WideCharToMultiByte(cp, 0, str, len, ptr, size, NULL, NULL); if (cp == CP_UTF8) This->use_utf8_content = TRUE; - - bsc->body = GlobalAlloc(GMEM_FIXED, size); - if (!bsc->body) - { - heap_free(bsc); - heap_free(ptr); - return E_OUTOFMEMORY; - } - - send_data = GlobalLock(bsc->body); - memcpy(send_data, ptr, size); - GlobalUnlock(bsc->body); - heap_free(ptr); break; } case VT_ARRAY|VT_UI1:

1 0

Henri Verbeet : wined3d: Don't call surface_init_sysmem() on surfaces with a PBO.
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: b57d1e7c33e704343d2c02995bf01b957718f4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b57d1e7c33e704343d2c02995… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 20 21:42:10 2011 +0100 wined3d: Don't call surface_init_sysmem() on surfaces with a PBO. --- dlls/wined3d/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 64dd24d..998d28e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1810,7 +1810,8 @@ static void surface_unload(struct wined3d_resource *resource) * or the depth stencil into an FBO the texture or render buffer will be removed * and all flags get lost */ - surface_init_sysmem(surface); + if (!(surface->flags & SFLAG_PBO)) + surface_init_sysmem(surface); /* We also get here when the ddraw swapchain is destroyed, for example * for a mode switch. In this case this surface won't necessarily be * an implicit surface. We have to mark it lost so that the

1 0

Henri Verbeet : wined3d: Handle client storage in surface_init_sysmem().
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: 317d5406d57ad5d3c9e2243e69f38ba044a558b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=317d5406d57ad5d3c9e2243e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 20 21:42:11 2011 +0100 wined3d: Handle client storage in surface_init_sysmem(). --- dlls/wined3d/surface.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 998d28e..48d271f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3956,13 +3956,21 @@ BOOL surface_init_sysmem(struct wined3d_surface *surface) { if (!surface->resource.allocatedMemory) { - surface->resource.heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - surface->resource.size + RESOURCE_ALIGNMENT); if (!surface->resource.heapMemory) { - ERR("Out of memory\n"); - return FALSE; + if (!(surface->resource.heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + surface->resource.size + RESOURCE_ALIGNMENT))) + { + ERR("Failed to allocate memory.\n"); + return FALSE; + } + } + else if (!(surface->flags & SFLAG_CLIENT)) + { + ERR("Surface %p has heapMemory %p and flags %#x.\n", + surface, surface->resource.heapMemory, surface->flags); } + surface->resource.allocatedMemory = (BYTE *)(((ULONG_PTR)surface->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); }

1 0

Henri Verbeet : wined3d: Handle client storage in surface_remove_pbo().
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: 0feb72f00052bc8ad59afb8bb191635f495edb21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0feb72f00052bc8ad59afb8bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 20 21:42:12 2011 +0100 wined3d: Handle client storage in surface_remove_pbo(). --- dlls/wined3d/surface.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 48d271f..b658832 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1766,9 +1766,14 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win { surface->resource.allocatedMemory = surface->dib.bitmap_data; } - else if (!surface->resource.heapMemory) + else { - surface->resource.heapMemory = HeapAlloc(GetProcessHeap(), 0, surface->resource.size + RESOURCE_ALIGNMENT); + if (!surface->resource.heapMemory) + surface->resource.heapMemory = HeapAlloc(GetProcessHeap(), 0, surface->resource.size + RESOURCE_ALIGNMENT); + else if (!(surface->flags & SFLAG_CLIENT)) + ERR("Surface %p has heapMemory %p and flags %#x.\n", + surface, surface->resource.heapMemory, surface->flags); + surface->resource.allocatedMemory = (BYTE *)(((ULONG_PTR)surface->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); }

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DVERTEXBLENDFLAGS typedef.
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: b79dc388c318fdf56af979dcc86412fab3f7777c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b79dc388c318fdf56af979dcc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 20 21:42:13 2011 +0100 wined3d: Get rid of the WINED3DVERTEXBLENDFLAGS typedef. --- dlls/wined3d/state.c | 22 ++++++++++++---------- dlls/wined3d/stateblock.c | 2 +- include/wine/wined3d.h | 16 ++++++++-------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8727369..b03a4b8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3780,10 +3780,11 @@ static void transform_worldex(struct wined3d_context *context, const struct wine static void state_vertexblend_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - WINED3DVERTEXBLENDFLAGS f = state->render_states[WINED3D_RS_VERTEXBLEND]; + enum wined3d_vertex_blend_flags f = state->render_states[WINED3D_RS_VERTEXBLEND]; static unsigned int once; - if (f == WINED3DVBF_DISABLE) return; + if (f == WINED3D_VBF_DISABLE) + return; if (!once++) FIXME("Vertex blend flags %#x not supported.\n", f); else WARN("Vertex blend flags %#x not supported.\n", f); @@ -3791,15 +3792,16 @@ static void state_vertexblend_w(struct wined3d_context *context, const struct wi static void state_vertexblend(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - WINED3DVERTEXBLENDFLAGS val = state->render_states[WINED3D_RS_VERTEXBLEND]; + enum wined3d_vertex_blend_flags val = state->render_states[WINED3D_RS_VERTEXBLEND]; struct wined3d_device *device = context->swapchain->device; const struct wined3d_gl_info *gl_info = context->gl_info; static unsigned int once; - switch(val) { - case WINED3DVBF_1WEIGHTS: - case WINED3DVBF_2WEIGHTS: - case WINED3DVBF_3WEIGHTS: + switch (val) + { + case WINED3D_VBF_1WEIGHTS: + case WINED3D_VBF_2WEIGHTS: + case WINED3D_VBF_3WEIGHTS: glEnable(GL_VERTEX_BLEND_ARB); checkGLcall("glEnable(GL_VERTEX_BLEND_ARB)"); @@ -3820,12 +3822,12 @@ static void state_vertexblend(struct wined3d_context *context, const struct wine } break; - case WINED3DVBF_TWEENING: - case WINED3DVBF_0WEIGHTS: /* Indexed vertex blending, not supported. */ + case WINED3D_VBF_TWEENING: + case WINED3D_VBF_0WEIGHTS: /* Indexed vertex blending, not supported. */ if (!once++) FIXME("Vertex blend flags %#x not supported.\n", val); else WARN("Vertex blend flags %#x not supported.\n", val); /* Fall through. */ - case WINED3DVBF_DISABLE: + case WINED3D_VBF_DISABLE: glDisable(GL_VERTEX_BLEND_ARB); checkGLcall("glDisable(GL_VERTEX_BLEND_ARB)"); break; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index adea6bb..ea605c5 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1180,7 +1180,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] = WINED3DMCS_COLOR2; state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] = WINED3DMCS_MATERIAL; state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] = WINED3DMCS_MATERIAL; - state->render_states[WINED3D_RS_VERTEXBLEND] = WINED3DVBF_DISABLE; + state->render_states[WINED3D_RS_VERTEXBLEND] = WINED3D_VBF_DISABLE; state->render_states[WINED3D_RS_CLIPPLANEENABLE] = 0; state->render_states[WINED3D_RS_SOFTWAREVERTEXPROCESSING] = FALSE; tmpfloat.f = 1.0f; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0bcbe08..2296d31 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -411,15 +411,15 @@ enum wined3d_blend_op WINED3D_BLEND_OP_MAX = 5, }; -typedef enum _WINED3DVERTEXBLENDFLAGS -{ - WINED3DVBF_DISABLE = 0, - WINED3DVBF_1WEIGHTS = 1, - WINED3DVBF_2WEIGHTS = 2, - WINED3DVBF_3WEIGHTS = 3, - WINED3DVBF_TWEENING = 255, - WINED3DVBF_0WEIGHTS = 256 -} WINED3DVERTEXBLENDFLAGS; +enum wined3d_vertex_blend_flags +{ + WINED3D_VBF_DISABLE = 0, + WINED3D_VBF_1WEIGHTS = 1, + WINED3D_VBF_2WEIGHTS = 2, + WINED3D_VBF_3WEIGHTS = 3, + WINED3D_VBF_TWEENING = 255, + WINED3D_VBF_0WEIGHTS = 256, +}; typedef enum _WINED3DCMPFUNC {

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DCMPFUNC typedef.
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: 1ec609670f712ec16c60a8997f41e48820ad12e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ec609670f712ec16c60a8997… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 20 21:42:14 2011 +0100 wined3d: Get rid of the WINED3DCMPFUNC typedef. --- dlls/wined3d/state.c | 34 ++++++++++++++++++++++++++++++---- dlls/wined3d/stateblock.c | 8 ++++---- dlls/wined3d/utils.c | 16 ---------------- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.h | 21 ++++++++++----------- 5 files changed, 44 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b03a4b8..4f3b74b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -202,9 +202,35 @@ static void state_zwritenable(struct wined3d_context *context, const struct wine } } +static GLenum gl_compare_func(enum wined3d_cmp_func f) +{ + switch (f) + { + case WINED3D_CMP_NEVER: + return GL_NEVER; + case WINED3D_CMP_LESS: + return GL_LESS; + case WINED3D_CMP_EQUAL: + return GL_EQUAL; + case WINED3D_CMP_LESSEQUAL: + return GL_LEQUAL; + case WINED3D_CMP_GREATER: + return GL_GREATER; + case WINED3D_CMP_NOTEQUAL: + return GL_NOTEQUAL; + case WINED3D_CMP_GREATEREQUAL: + return GL_GEQUAL; + case WINED3D_CMP_ALWAYS: + return GL_ALWAYS; + default: + FIXME("Unrecognized compare function %#x.\n", f); + return GL_NONE; + } +} + static void state_zfunc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - GLenum depth_func = CompareFunc(state->render_states[WINED3D_RS_ZFUNC]); + GLenum depth_func = gl_compare_func(state->render_states[WINED3D_RS_ZFUNC]); if (!depth_func) return; @@ -530,7 +556,7 @@ static void state_alpha(struct wined3d_context *context, const struct wined3d_st else { ref = ((float)state->render_states[WINED3D_RS_ALPHAREF]) / 255.0f; - glParm = CompareFunc(state->render_states[WINED3D_RS_ALPHAFUNC]); + glParm = gl_compare_func(state->render_states[WINED3D_RS_ALPHAFUNC]); } if(glParm) { glAlphaFunc(glParm, ref); @@ -801,9 +827,9 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ onesided_enable = state->render_states[WINED3D_RS_STENCILENABLE]; twosided_enable = state->render_states[WINED3D_RS_TWOSIDEDSTENCILMODE]; - if (!(func = CompareFunc(state->render_states[WINED3D_RS_STENCILFUNC]))) + if (!(func = gl_compare_func(state->render_states[WINED3D_RS_STENCILFUNC]))) func = GL_ALWAYS; - if (!(func_ccw = CompareFunc(state->render_states[WINED3D_RS_CCW_STENCILFUNC]))) + if (!(func_ccw = gl_compare_func(state->render_states[WINED3D_RS_CCW_STENCILFUNC]))) func_ccw = GL_ALWAYS; ref = state->render_states[WINED3D_RS_STENCILREF]; mask = state->render_states[WINED3D_RS_STENCILMASK]; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index ea605c5..c9ee958 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1134,8 +1134,8 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_SRCBLEND] = WINED3D_BLEND_ONE; state->render_states[WINED3D_RS_DESTBLEND] = WINED3D_BLEND_ZERO; state->render_states[WINED3D_RS_CULLMODE] = WINED3DCULL_CCW; - state->render_states[WINED3D_RS_ZFUNC] = WINED3DCMP_LESSEQUAL; - state->render_states[WINED3D_RS_ALPHAFUNC] = WINED3DCMP_ALWAYS; + state->render_states[WINED3D_RS_ZFUNC] = WINED3D_CMP_LESSEQUAL; + state->render_states[WINED3D_RS_ALPHAFUNC] = WINED3D_CMP_ALWAYS; state->render_states[WINED3D_RS_ALPHAREF] = 0; state->render_states[WINED3D_RS_DITHERENABLE] = FALSE; state->render_states[WINED3D_RS_ALPHABLENDENABLE] = FALSE; @@ -1158,7 +1158,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_STENCILPASS] = WINED3DSTENCILOP_KEEP; state->render_states[WINED3D_RS_STENCILREF] = 0; state->render_states[WINED3D_RS_STENCILMASK] = 0xffffffff; - state->render_states[WINED3D_RS_STENCILFUNC] = WINED3DCMP_ALWAYS; + state->render_states[WINED3D_RS_STENCILFUNC] = WINED3D_CMP_ALWAYS; state->render_states[WINED3D_RS_STENCILWRITEMASK] = 0xffffffff; state->render_states[WINED3D_RS_TEXTUREFACTOR] = 0xffffffff; state->render_states[WINED3D_RS_WRAP0] = 0; @@ -1229,7 +1229,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_CCW_STENCILFAIL] = WINED3DSTENCILOP_KEEP; state->render_states[WINED3D_RS_CCW_STENCILZFAIL] = WINED3DSTENCILOP_KEEP; state->render_states[WINED3D_RS_CCW_STENCILPASS] = WINED3DSTENCILOP_KEEP; - state->render_states[WINED3D_RS_CCW_STENCILFUNC] = WINED3DCMP_ALWAYS; + state->render_states[WINED3D_RS_CCW_STENCILFUNC] = WINED3D_CMP_ALWAYS; state->render_states[WINED3D_RS_COLORWRITEENABLE1] = 0x0000000f; state->render_states[WINED3D_RS_COLORWRITEENABLE2] = 0x0000000f; state->render_states[WINED3D_RS_COLORWRITEENABLE3] = 0x0000000f; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2063701..10df1d1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2496,22 +2496,6 @@ GLenum StencilOp(DWORD op) { } } -GLenum CompareFunc(DWORD func) { - switch ((WINED3DCMPFUNC)func) { - case WINED3DCMP_NEVER : return GL_NEVER; - case WINED3DCMP_LESS : return GL_LESS; - case WINED3DCMP_EQUAL : return GL_EQUAL; - case WINED3DCMP_LESSEQUAL : return GL_LEQUAL; - case WINED3DCMP_GREATER : return GL_GREATER; - case WINED3DCMP_NOTEQUAL : return GL_NOTEQUAL; - case WINED3DCMP_GREATEREQUAL : return GL_GEQUAL; - case WINED3DCMP_ALWAYS : return GL_ALWAYS; - default: - FIXME("Unrecognized WINED3DCMPFUNC value %d\n", func); - return 0; - } -} - BOOL is_invalid_op(const struct wined3d_state *state, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8206026..dd83d1f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2492,7 +2492,6 @@ const char *debug_surflocation(DWORD flag) DECLSPEC_HIDDEN; /* Routines for GL <-> D3D values */ GLenum StencilOp(DWORD op) DECLSPEC_HIDDEN; -GLenum CompareFunc(DWORD func) DECLSPEC_HIDDEN; BOOL is_invalid_op(const struct wined3d_state *state, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) DECLSPEC_HIDDEN; void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2296d31..2005eaa 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -421,18 +421,17 @@ enum wined3d_vertex_blend_flags WINED3D_VBF_0WEIGHTS = 256, }; -typedef enum _WINED3DCMPFUNC -{ - WINED3DCMP_NEVER = 1, - WINED3DCMP_LESS = 2, - WINED3DCMP_EQUAL = 3, - WINED3DCMP_LESSEQUAL = 4, - WINED3DCMP_GREATER = 5, - WINED3DCMP_NOTEQUAL = 6, - WINED3DCMP_GREATEREQUAL = 7, - WINED3DCMP_ALWAYS = 8, - WINED3DCMP_FORCE_DWORD = 0x7fffffff -} WINED3DCMPFUNC; +enum wined3d_cmp_func +{ + WINED3D_CMP_NEVER = 1, + WINED3D_CMP_LESS = 2, + WINED3D_CMP_EQUAL = 3, + WINED3D_CMP_LESSEQUAL = 4, + WINED3D_CMP_GREATER = 5, + WINED3D_CMP_NOTEQUAL = 6, + WINED3D_CMP_GREATEREQUAL = 7, + WINED3D_CMP_ALWAYS = 8, +}; typedef enum _WINED3DZBUFFERTYPE {

1 0

Alexandre Julliard : mountmgr: Require at least one of device or mount point to match when looking for an existing volume .
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: e85a5b2ee96c2b03e415a5b6236454fe2363fe1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e85a5b2ee96c2b03e415a5b62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 21 10:56:52 2011 +0100 mountmgr: Require at least one of device or mount point to match when looking for an existing volume. --- dlls/mountmgr.sys/device.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 2d4116c..c6ba0b9 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -422,6 +422,8 @@ static struct volume *find_matching_volume( const char *udi, const char *device, LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry ) { + int match = 0; + /* when we have a udi we only match drives added manually */ if (udi && volume->udi) continue; /* and when we don't have a udi we only match dynamic drives */ @@ -429,8 +431,17 @@ static struct volume *find_matching_volume( const char *udi, const char *device, disk_device = volume->device; if (disk_device->type != type) continue; - if (device && disk_device->unix_device && strcmp( device, disk_device->unix_device )) continue; - if (mount_point && disk_device->unix_mount && strcmp( mount_point, disk_device->unix_mount )) continue; + if (device && disk_device->unix_device) + { + if (strcmp( device, disk_device->unix_device )) continue; + match++; + } + if (mount_point && disk_device->unix_mount) + { + if (strcmp( mount_point, disk_device->unix_mount )) continue; + match++; + } + if (!match) continue; TRACE( "found matching volume %s for device %s mount %s type %u\n", debugstr_guid(&volume->guid), debugstr_a(device), debugstr_a(mount_point), type ); return grab_volume( volume );

1 0

Alexandre Julliard : winex11: Keep the device info around as long as XInput2 is active.
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: 126bb92717b3889a25a19d5acef4874c83b68543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=126bb92717b3889a25a19d5ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 21 10:57:40 2011 +0100 winex11: Keep the device info around as long as XInput2 is active. --- dlls/winex11.drv/mouse.c | 54 ++++++++++++++++++++++++--------------------- 1 files changed, 29 insertions(+), 25 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 7eabd1e..9d78dcc 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -131,6 +131,8 @@ static Cursor create_cursor( HANDLE handle ); #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H static BOOL xinput2_available; static int xinput2_core_pointer; +static int xinput2_device_count; +static XIDeviceInfo *xinput2_devices; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(XIFreeDeviceInfo); MAKE_FUNCPTR(XIQueryDevice); @@ -255,10 +257,9 @@ static void enable_xinput2(void) { #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H struct x11drv_thread_data *data = x11drv_thread_data(); - XIDeviceInfo *devices; XIEventMask mask; unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; - int i, j, count; + int i, j; if (!xinput2_available) return; @@ -277,27 +278,29 @@ static void enable_xinput2(void) if (data->xi2_state == xi_unavailable) return; wine_tsx11_lock(); - devices = pXIQueryDevice( data->display, XIAllDevices, &count ); - for (i = 0; i < count; ++i) + if (xinput2_devices) pXIFreeDeviceInfo( xinput2_devices ); + xinput2_devices = pXIQueryDevice( data->display, XIAllDevices, &xinput2_device_count ); + for (i = 0; i < xinput2_device_count; ++i) { - if (devices[i].use != XIMasterPointer) continue; - for (j = 0; j < devices[i].num_classes; j++) + if (xinput2_devices[i].use != XIMasterPointer) continue; + for (j = 0; j < xinput2_devices[i].num_classes; j++) { - XIValuatorClassInfo *class = (XIValuatorClassInfo *)devices[i].classes[j]; + XIValuatorClassInfo *class = (XIValuatorClassInfo *)xinput2_devices[i].classes[j]; - if (devices[i].classes[j]->type != XIValuatorClass) continue; + if (xinput2_devices[i].classes[j]->type != XIValuatorClass) continue; if (class->number != 0 && class->number != 1) continue; + TRACE( "Device %u (%s) class %u num %u %f,%f res %u mode %u\n", + xinput2_devices[i].deviceid, debugstr_a(xinput2_devices[i].name), + j, class->number, class->min, class->max, class->resolution, class->mode ); if (class->mode == XIModeAbsolute) { - TRACE( "Device %u (%s) class %u num %u %f,%f res %u is absolute, not enabling XInput2\n", - devices[i].deviceid, debugstr_a(devices[i].name), - j, class->number, class->min, class->max, class->resolution ); + TRACE( "Device is absolute, not enabling XInput2\n" ); goto done; } } TRACE( "Using %u (%s) as core pointer\n", - devices[i].deviceid, debugstr_a(devices[i].name) ); - xinput2_core_pointer = devices[i].deviceid; + xinput2_devices[i].deviceid, debugstr_a(xinput2_devices[i].name) ); + xinput2_core_pointer = xinput2_devices[i].deviceid; break; } @@ -307,20 +310,20 @@ static void enable_xinput2(void) XISetMask( mask_bits, XI_RawMotion ); XISetMask( mask_bits, XI_ButtonPress ); - for (i = 0; i < count; ++i) + for (i = 0; i < xinput2_device_count; ++i) { - if (devices[i].use == XISlavePointer && devices[i].attachment == xinput2_core_pointer) + if (xinput2_devices[i].use == XISlavePointer && + xinput2_devices[i].attachment == xinput2_core_pointer) { TRACE( "Device %u (%s) is attached to the core pointer\n", - devices[i].deviceid, debugstr_a(devices[i].name) ); - mask.deviceid = devices[i].deviceid; + xinput2_devices[i].deviceid, debugstr_a(xinput2_devices[i].name) ); + mask.deviceid = xinput2_devices[i].deviceid; pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); data->xi2_state = xi_enabled; } } done: - pXIFreeDeviceInfo( devices ); wine_tsx11_unlock(); #endif } @@ -333,8 +336,7 @@ static void disable_xinput2(void) #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H struct x11drv_thread_data *data = x11drv_thread_data(); XIEventMask mask; - XIDeviceInfo *devices; - int i, count; + int i; if (data->xi2_state != xi_enabled) return; @@ -345,16 +347,18 @@ static void disable_xinput2(void) mask.mask_len = 0; wine_tsx11_lock(); - devices = pXIQueryDevice( data->display, XIAllDevices, &count ); - for (i = 0; i < count; ++i) + for (i = 0; i < xinput2_device_count; ++i) { - if (devices[i].use == XISlavePointer && devices[i].attachment == xinput2_core_pointer) + if (xinput2_devices[i].use == XISlavePointer && + xinput2_devices[i].attachment == xinput2_core_pointer) { - mask.deviceid = devices[i].deviceid; + mask.deviceid = xinput2_devices[i].deviceid; pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); } } - pXIFreeDeviceInfo( devices ); + pXIFreeDeviceInfo( xinput2_devices ); + xinput2_devices = NULL; + xinput2_device_count = 0; wine_tsx11_unlock(); #endif }

1 0

Alexandre Julliard : winex11: Scale raw motion events according to their valuator range.
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: b90be52cdd4aad5c63f870ed2684a974fbabbcf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b90be52cdd4aad5c63f870ed2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 21 10:58:25 2011 +0100 winex11: Scale raw motion events according to their valuator range. --- dlls/winex11.drv/mouse.c | 34 +++++++++++++++++++++++++++++----- 1 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 9d78dcc..07a420e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1432,20 +1432,44 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev ) XIRawEvent *event = xev->data; const double *values = event->valuators.values; INPUT input; + int i, j; + double dx = 0, dy = 0; struct x11drv_thread_data *thread_data = x11drv_thread_data(); if (!event->valuators.mask_len) return; if (thread_data->xi2_state != xi_enabled) return; - input.u.mi.dx = 0; - input.u.mi.dy = 0; input.u.mi.mouseData = 0; input.u.mi.dwFlags = MOUSEEVENTF_MOVE; input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; - if (XIMaskIsSet( event->valuators.mask, 0 )) input.u.mi.dx = *values++; - if (XIMaskIsSet( event->valuators.mask, 1 )) input.u.mi.dy = *values++; + if (XIMaskIsSet( event->valuators.mask, 0 )) dx = *values++; + if (XIMaskIsSet( event->valuators.mask, 1 )) dy = *values++; + input.u.mi.dx = dx; + input.u.mi.dy = dy; + + wine_tsx11_lock(); + for (i = 0; i < xinput2_device_count; ++i) + { + if (xinput2_devices[i].deviceid != event->deviceid) continue; + for (j = 0; j < xinput2_devices[i].num_classes; j++) + { + XIValuatorClassInfo *class = (XIValuatorClassInfo *)xinput2_devices[i].classes[j]; + + if (xinput2_devices[i].classes[j]->type != XIValuatorClass) continue; + if (class->min >= class->max) continue; + if (class->number == 0) + input.u.mi.dx = dx * (virtual_screen_rect.right - virtual_screen_rect.left) + / (class->max - class->min); + else if (class->number == 1) + input.u.mi.dy = dy * (virtual_screen_rect.bottom - virtual_screen_rect.top) + / (class->max - class->min); + } + break; + } + + wine_tsx11_unlock(); if (thread_data->warp_serial) { @@ -1457,7 +1481,7 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev ) thread_data->warp_serial = 0; /* we caught up now */ } - TRACE( "pos %d,%d\n", input.u.mi.dx, input.u.mi.dy ); + TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy ); input.type = INPUT_MOUSE; __wine_send_input( 0, &input );

1 0

Gabriele Moabiti : wineconsole: Light and dark gray colors are exchanged in the user backend.
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: 70cdcba836aab1b417e11b1671fc858dc3ac389f URL: http://source.winehq.org/git/wine.git/?a=commit;h=70cdcba836aab1b417e11b167… Author: Gabriele Moabiti <gabmoa(a)yahoo.it> Date: Tue Dec 20 22:35:33 2011 +0100 wineconsole: Light and dark gray colors are exchanged in the user backend. --- programs/wineconsole/user.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index dafab16..46963ce 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -34,8 +34,8 @@ UINT g_uiDefaultCharset; const COLORREF WCUSER_ColorMap[16] = { RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x80), RGB(0x00, 0x80, 0x00), RGB(0x00, 0x80, 0x80), - RGB(0x80, 0x00, 0x00), RGB(0x80, 0x00, 0x80), RGB(0x80, 0x80, 0x00), RGB(0x80, 0x80, 0x80), - RGB(0xC0, 0xC0, 0xC0), RGB(0x00, 0x00, 0xFF), RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0xFF), + RGB(0x80, 0x00, 0x00), RGB(0x80, 0x00, 0x80), RGB(0x80, 0x80, 0x00), RGB(0xC0, 0xC0, 0xC0), + RGB(0x80, 0x80, 0x80), RGB(0x00, 0x00, 0xFF), RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0xFF), RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0xFF, 0x00), RGB(0xFF, 0xFF, 0xFF), };

1 0