July 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : gdi32: Pass the source/ dest visible rectangles to the StretchBlt driver entry point.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 8bd130b92310f3ba33143b2b345704b03f19ba72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bd130b92310f3ba33143b2b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 11 13:59:05 2011 +0200 gdi32: Pass the source/dest visible rectangles to the StretchBlt driver entry point. --- dlls/gdi32/bitblt.c | 36 ++++++---------- dlls/gdi32/enhmfdrv/bitblt.c | 30 +++++++------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 6 +-- dlls/gdi32/gdi_private.h | 6 +- dlls/gdi32/mfdrv/bitblt.c | 21 ++++----- dlls/gdi32/mfdrv/metafiledrv.h | 5 +- dlls/winex11.drv/bitblt.c | 76 +++++++++++----------------------- dlls/winex11.drv/winex11.drv.spec | 2 +- 8 files changed, 70 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8bd130b92310f3ba33143…

1 0

Alexandre Julliard : gdi32: Pass the dest visible rectangle to the PatBlt driver entry point.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 1ac1d7c69b5c2d832922727a832eb70f48d1a997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac1d7c69b5c2d832922727a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 11 13:59:05 2011 +0200 gdi32: Pass the dest visible rectangle to the PatBlt driver entry point. --- dlls/gdi32/bitblt.c | 28 +++++++++++++++++++++++----- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/graphics.c | 11 +++++------ dlls/gdi32/driver.c | 2 +- dlls/gdi32/enhmfdrv/bitblt.c | 19 +++++++++---------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 3 +-- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/mfdrv/bitblt.c | 5 +++-- dlls/gdi32/mfdrv/metafiledrv.h | 3 +-- dlls/wineps.drv/bitblt.c | 20 ++++++++------------ dlls/wineps.drv/wineps.drv.spec | 2 +- dlls/winex11.drv/bitblt.c | 32 ++++++-------------------------- dlls/winex11.drv/winex11.drv.spec | 2 +- 13 files changed, 61 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ac1d7c69b5c2d8329227…

1 0

André Hentschel : dbghelp: Remove dead code (clang).
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 5d0d2ef893f76f375636be52c1b96e8e305b4fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0d2ef893f76f375636be52c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 10 18:12:01 2011 +0200 dbghelp: Remove dead code (clang). --- dlls/dbghelp/elf_module.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 625127d..19db48c 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1240,7 +1240,6 @@ static BOOL elf_load_file_from_path(HANDLE hProcess, ret = elf_load_file(hProcess, fn, load_offset, dyn_addr, elf_info); HeapFree(GetProcessHeap(), 0, fn); if (ret) break; - s = (t) ? (t+1) : NULL; } HeapFree(GetProcessHeap(), 0, pathW);

1 0

Marcus Meissner : wingstreamer: Set target of parameter pointer, not parameter (Coverity).
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 9450b0eb1e2995d351de3b3cb5097e863c73f14c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9450b0eb1e2995d351de3b3cb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jul 10 18:50:43 2011 +0200 wingstreamer: Set target of parameter pointer, not parameter (Coverity). --- dlls/winegstreamer/gstdemux.c | 2 +- dlls/wineqtdecoder/qtsplitter.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index c28f9b7..6670d6b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1475,7 +1475,7 @@ static HRESULT WINAPI GSTOutPin_DecideAllocator(BaseOutputPin *iface, IMemInputP GSTOutPin *This = (GSTOutPin *)iface; GSTImpl *GSTfilter = (GSTImpl*)This->pin.pin.pinInfo.pFilter; - pAlloc = NULL; + *pAlloc = NULL; if (GSTfilter->pInputPin.pAlloc) hr = IMemInputPin_NotifyAllocator(pPin, GSTfilter->pInputPin.pAlloc, FALSE); else diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 9787dd3..c50afd3 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -1220,7 +1220,7 @@ static HRESULT WINAPI QTOutPin_DecideAllocator(BaseOutputPin *iface, IMemInputPi QTOutPin *This = (QTOutPin *)iface; QTSplitter *QTfilter = (QTSplitter*)This->pin.pin.pinInfo.pFilter; - pAlloc = NULL; + *pAlloc = NULL; if (QTfilter->pInputPin.pAlloc) hr = IMemInputPin_NotifyAllocator(pPin, QTfilter->pInputPin.pAlloc, FALSE); else

1 0

Henri Verbeet : wined3d: Make the device parameter to primary_render_target_is_p8() const.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 3e9930f307c689daa0792a75152e2dd89c79a58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9930f307c689daa0792a751… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 01:06:42 2011 +0200 wined3d: Make the device parameter to primary_render_target_is_p8() const. --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ce669e1..110e206 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1984,11 +1984,11 @@ void surface_bind(struct wined3d_surface *surface, const struct wined3d_gl_info } /* This function checks if the primary render target uses the 8bit paletted format. */ -static BOOL primary_render_target_is_p8(struct wined3d_device *device) +static BOOL primary_render_target_is_p8(const struct wined3d_device *device) { if (device->fb.render_targets && device->fb.render_targets[0]) { - struct wined3d_surface *render_target = device->fb.render_targets[0]; + const struct wined3d_surface *render_target = device->fb.render_targets[0]; if ((render_target->resource.usage & WINED3DUSAGE_RENDERTARGET) && (render_target->resource.format->id == WINED3DFMT_P8_UINT)) return TRUE;

1 0

Henri Verbeet : wined3d: Make the surface parameter to d3dfmt_p8_init_palette() const.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: abfd6b479a884898580beaaefa2b0f15a8351822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abfd6b479a884898580beaaef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 01:06:43 2011 +0200 wined3d: Make the surface parameter to d3dfmt_p8_init_palette() const. --- dlls/wined3d/surface.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 110e206..f0cfeb4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4245,10 +4245,10 @@ HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_c return WINED3D_OK; } -void d3dfmt_p8_init_palette(struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) +void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) { - struct wined3d_device *device = surface->resource.device; - struct wined3d_palette *pal = surface->palette; + const struct wined3d_device *device = surface->resource.device; + const struct wined3d_palette *pal = surface->palette; BOOL index_in_alpha = FALSE; unsigned int i; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c2cb075..ca852ee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2162,7 +2162,7 @@ typedef enum { HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing, struct wined3d_format *format, CONVERT_TYPES *convert) DECLSPEC_HIDDEN; -void d3dfmt_p8_init_palette(struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) DECLSPEC_HIDDEN; +void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) DECLSPEC_HIDDEN; BOOL palette9_changed(struct wined3d_surface *surface) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Store VBO addresses in a struct wined3d_bo_address in device_stream_info_from_declaration ().
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: a3538a1546a925d740d134fe0255cc0dd9e54887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3538a1546a925d740d134fe0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 01:06:44 2011 +0200 wined3d: Store VBO addresses in a struct wined3d_bo_address in device_stream_info_from_declaration(). --- dlls/wined3d/device.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b10fde6..7c03df3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -190,8 +190,7 @@ void device_stream_info_from_declaration(struct wined3d_device *device, { const struct wined3d_vertex_declaration_element *element = &declaration->elements[i]; struct wined3d_buffer *buffer = device->stateBlock->state.streams[element->input_slot].buffer; - GLuint buffer_object = 0; - const BYTE *data = NULL; + struct wined3d_bo_address data; BOOL stride_used; unsigned int idx; DWORD stride; @@ -201,17 +200,20 @@ void device_stream_info_from_declaration(struct wined3d_device *device, if (!buffer) continue; + data.buffer_object = 0; + data.addr = NULL; + stride = device->stateBlock->state.streams[element->input_slot].stride; if (device->stateBlock->state.user_stream) { TRACE("Stream %u is UP, %p\n", element->input_slot, buffer); - buffer_object = 0; - data = (BYTE *)buffer; + data.buffer_object = 0; + data.addr = (BYTE *)buffer; } else { TRACE("Stream %u isn't UP, %p\n", element->input_slot, buffer); - data = buffer_get_memory(buffer, &device->adapter->gl_info, &buffer_object); + data.addr = buffer_get_memory(buffer, &device->adapter->gl_info, &data.buffer_object); /* Can't use vbo's if the base vertex index is negative. OpenGL doesn't accept negative offsets * (or rather offsets bigger than the vbo, because the pointer is unsigned), so use system memory @@ -222,9 +224,9 @@ void device_stream_info_from_declaration(struct wined3d_device *device, { WARN("load_base_vertex_index is < 0 (%d), not using VBOs.\n", device->stateBlock->state.load_base_vertex_index); - buffer_object = 0; - data = buffer_get_sysmem(buffer, &device->adapter->gl_info); - if ((UINT_PTR)data < -device->stateBlock->state.load_base_vertex_index * stride) + data.buffer_object = 0; + data.addr = buffer_get_sysmem(buffer, &device->adapter->gl_info); + if ((UINT_PTR)data.addr < -device->stateBlock->state.load_base_vertex_index * stride) { FIXME("System memory vertex data load offset is negative!\n"); } @@ -232,7 +234,8 @@ void device_stream_info_from_declaration(struct wined3d_device *device, if (fixup) { - if (buffer_object) *fixup = TRUE; + if (data.buffer_object) + *fixup = TRUE; else if (*fixup && !use_vshader && (element->usage == WINED3DDECLUSAGE_COLOR || element->usage == WINED3DDECLUSAGE_POSITIONT)) @@ -247,7 +250,7 @@ void device_stream_info_from_declaration(struct wined3d_device *device, } } } - data += element->offset; + data.addr += element->offset; TRACE("offset %u input_slot %u usage_idx %d\n", element->offset, element->input_slot, element->usage_idx); @@ -287,13 +290,13 @@ void device_stream_info_from_declaration(struct wined3d_device *device, "input_slot %u, offset %u, stride %u, format %s, buffer_object %u]\n", use_vshader ? "shader": "fixed function", idx, debug_d3ddeclusage(element->usage), element->usage_idx, element->input_slot, - element->offset, stride, debug_d3dformat(element->format->id), buffer_object); + element->offset, stride, debug_d3dformat(element->format->id), data.buffer_object); stream_info->elements[idx].format = element->format; stream_info->elements[idx].stride = stride; - stream_info->elements[idx].data = data; + stream_info->elements[idx].data = data.addr; stream_info->elements[idx].stream_idx = element->input_slot; - stream_info->elements[idx].buffer_object = buffer_object; + stream_info->elements[idx].buffer_object = data.buffer_object; if (!device->adapter->gl_info.supported[ARB_VERTEX_ARRAY_BGRA] && element->format->id == WINED3DFMT_B8G8R8A8_UNORM)

1 0

Henri Verbeet : wined3d: Return data as struct wined3d_bo_address in buffer_get_memory().
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 89bf30a25e5c9342de52b1c6d742009a9b03f8ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=89bf30a25e5c9342de52b1c6d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 01:06:45 2011 +0200 wined3d: Return data as struct wined3d_bo_address in buffer_get_memory(). --- dlls/wined3d/buffer.c | 15 ++++++++------- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index fa14f3a..305b5e9 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -467,10 +467,10 @@ static inline void fixup_transformed_pos(float *p) } /* Context activation is done by the caller. */ -const BYTE *buffer_get_memory(struct wined3d_buffer *buffer, - const struct wined3d_gl_info *gl_info, GLuint *buffer_object) +void buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_info *gl_info, + struct wined3d_bo_address *data) { - *buffer_object = buffer->buffer_object; + data->buffer_object = buffer->buffer_object; if (!buffer->buffer_object) { if (buffer->flags & WINED3D_BUFFER_CREATEBO) @@ -479,15 +479,16 @@ const BYTE *buffer_get_memory(struct wined3d_buffer *buffer, buffer->flags &= ~WINED3D_BUFFER_CREATEBO; if (buffer->buffer_object) { - *buffer_object = buffer->buffer_object; - return NULL; + data->buffer_object = buffer->buffer_object; + data->addr = NULL; + return; } } - return buffer->resource.allocatedMemory; + data->addr = buffer->resource.allocatedMemory; } else { - return NULL; + data->addr = NULL; } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7c03df3..5cc1c84 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -213,7 +213,7 @@ void device_stream_info_from_declaration(struct wined3d_device *device, else { TRACE("Stream %u isn't UP, %p\n", element->input_slot, buffer); - data.addr = buffer_get_memory(buffer, &device->adapter->gl_info, &data.buffer_object); + buffer_get_memory(buffer, &device->adapter->gl_info, &data); /* Can't use vbo's if the base vertex index is negative. OpenGL doesn't accept negative offsets * (or rather offsets bigger than the vbo, because the pointer is unsigned), so use system memory diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ca852ee..6119a06 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2405,8 +2405,8 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc return CONTAINING_RECORD(resource, struct wined3d_buffer, resource); } -const BYTE *buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_info *gl_info, - GLuint *buffer_object) DECLSPEC_HIDDEN; +void buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_info *gl_info, + struct wined3d_bo_address *data) DECLSPEC_HIDDEN; BYTE *buffer_get_sysmem(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view

1 0

Henri Verbeet : wined3d: Store a struct wined3d_bo_address in struct wined3d_stream_info_element.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: c5d457c8b4d9ff699799c7476d5f38518a470fcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d457c8b4d9ff699799c7476… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 01:06:46 2011 +0200 wined3d: Store a struct wined3d_bo_address in struct wined3d_stream_info_element. Instead of using separate fields for the buffer object and offset. --- dlls/wined3d/buffer.c | 4 +- dlls/wined3d/device.c | 45 ++++++++++--------- dlls/wined3d/drawprim.c | 28 ++++++------ dlls/wined3d/state.c | 96 ++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 9 ++-- 5 files changed, 93 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5d457c8b4d9ff699799c…

1 0

William Pettersson : winex11: Add grab for XInput2 ButtonPress event.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 266cd6c46acf7465ad65ae2b963a75cfc21d63d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=266cd6c46acf7465ad65ae2b9… Author: William Pettersson <william.pettersson(a)gmail.com> Date: Mon Jul 11 10:29:26 2011 +1000 winex11: Add grab for XInput2 ButtonPress event. --- dlls/winex11.drv/mouse.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 7f62658..980552d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -305,6 +305,7 @@ static void enable_xinput2(void) mask.mask_len = sizeof(mask_bits); memset( mask_bits, 0, sizeof(mask_bits) ); XISetMask( mask_bits, XI_RawMotion ); + XISetMask( mask_bits, XI_ButtonPress ); for (i = 0; i < count; ++i) {

1 0