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

Alexandre Julliard : gdi32: Pass the dest visible rectangle to the PatBlt driver entry point.
by Alexandre Julliard July 11, 2011

July 11, 2011

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

Alexandre Julliard : gdi32: Export a function to compute the DC clip box.
by Alexandre Julliard July 11, 2011

July 11, 2011

Module: wine Branch: master Commit: 2ff31091ed633ae564c6eb6dc6554635491b48b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ff31091ed633ae564c6eb6dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 11 13:40:45 2011 +0200 gdi32: Export a function to compute the DC clip box. --- dlls/gdi32/clipping.c | 31 ++++++++++++++++++++++--------- dlls/gdi32/gdi_private.h | 1 + 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 86b19f1..e9978c3 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -53,6 +53,27 @@ static inline RECT get_clip_rect( DC * dc, int left, int top, int right, int bot } /*********************************************************************** + * get_clip_box + * + * Get the clipping rectangle in device coordinates. + */ +int get_clip_box( DC *dc, RECT *rect ) +{ + int ret = ERROR; + HRGN rgn, clip = get_clip_region( dc ); + + if (!clip) return GetRgnBox( dc->hVisRgn, rect ); + + if ((rgn = CreateRectRgn( 0, 0, 0, 0 ))) + { + CombineRgn( rgn, dc->hVisRgn, clip, RGN_AND ); + ret = GetRgnBox( rgn, rect ); + DeleteObject( rgn ); + } + return ret; +} + +/*********************************************************************** * CLIPPING_UpdateGCRegion * * Update the GC clip region when the ClipRgn or VisRgn have changed. @@ -379,19 +400,11 @@ BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) { INT ret; - HRGN clip; DC *dc = get_dc_ptr( hdc ); if (!dc) return ERROR; update_dc( dc ); - if ((clip = get_clip_region(dc))) - { - HRGN hrgn = CreateRectRgn( 0, 0, 0, 0 ); - CombineRgn( hrgn, dc->hVisRgn, clip, RGN_AND ); - ret = GetRgnBox( hrgn, rect ); - DeleteObject( hrgn ); - } - else ret = GetRgnBox( dc->hVisRgn, rect ); + ret = get_clip_box( dc, rect ); if (dc->layout & LAYOUT_RTL) { int tmp = rect->left; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 456d92c..82d72e5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -439,6 +439,7 @@ extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDE extern INT BITMAP_GetWidthBytes( INT bmWidth, INT bpp ) DECLSPEC_HIDDEN; /* clipping.c */ +extern int get_clip_box( DC *dc, RECT *rect ) DECLSPEC_HIDDEN; extern void CLIPPING_UpdateGCRegion( DC * dc ) DECLSPEC_HIDDEN; /* Return the total clip region (if any) */

1 0

Frédéric Delanoy : cmd/tests: Add support for todo_wine constructions.
by Alexandre Julliard July 11, 2011

July 11, 2011

Module: wine Branch: master Commit: 88ff0e816a39304e37a4fcbf5bea55f8270ce579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88ff0e816a39304e37a4fcbf5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 9 23:33:59 2011 +0200 cmd/tests: Add support for todo_wine constructions. --- programs/cmd/tests/batch.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 95366da..03c2b56 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -190,6 +190,8 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da { const char *out_ptr = out_data, *exp_ptr = exp_data, *out_nl, *exp_nl, *err; DWORD line = 0; + static const char todo_wine_cmd[] = {'@','t','o','d','o','_','w','i','n','e','@'}; + BOOL is_todo_wine; while(out_ptr < out_data+out_size && exp_ptr < exp_data+exp_size) { line++; @@ -197,13 +199,22 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da for(exp_nl = exp_ptr; exp_nl < exp_data+exp_size && *exp_nl != '\r' && *exp_nl != '\n'; exp_nl++); for(out_nl = out_ptr; out_nl < out_data+out_size && *out_nl != '\r' && *out_nl != '\n'; out_nl++); + is_todo_wine = (exp_ptr+sizeof(todo_wine_cmd) <= exp_nl && + !memcmp(exp_ptr, todo_wine_cmd, sizeof(todo_wine_cmd))); + if (is_todo_wine) { + exp_ptr += sizeof(todo_wine_cmd); + winetest_start_todo("wine"); + } + err = compare_line(out_ptr, out_nl, exp_ptr, exp_nl); if(err == out_nl) ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); - else if(err) - ok(0, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", - *err, (int)(err-out_ptr), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + else + ok(!err, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", + (err ? *err : 0), (err ? (int)(err-out_ptr) : -1), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + + if(is_todo_wine) winetest_end_todo("wine"); exp_ptr = exp_nl+1; out_ptr = out_nl+1;

1 0

Henri Verbeet : wined3d: Store a struct wined3d_bo_address in struct wined3d_stream_info_element.
by Alexandre Julliard July 11, 2011

July 11, 2011

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

André Hentschel : dbghelp: Remove dead code (clang).
by Alexandre Julliard July 11, 2011

July 11, 2011

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

William Pettersson : winex11: Add grab for XInput2 ButtonPress event.
by Alexandre Julliard July 11, 2011

July 11, 2011

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

Natanael Copa : configure: Test for isinf and isnan needs link to -lm.
by Alexandre Julliard July 11, 2011

July 11, 2011

Module: wine Branch: master Commit: 3b11f79b7b74e3d5f24db33173d6c5600e2e4b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b11f79b7b74e3d5f24db3317… Author: Natanael Copa <ncopa(a)alpinelinux.org> Date: Wed Jul 6 08:58:01 2011 +0000 configure: Test for isinf and isnan needs link to -lm. --- configure | 3 +++ configure.ac | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 61efbd9..2694c59 100755 --- a/configure +++ b/configure @@ -14270,6 +14270,8 @@ $as_echo "#define HAVE_DAYLIGHT 1" >>confdefs.h fi +ac_save_LIBS="$LIBS" +LIBS="$LIBS -lm" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isinf" >&5 $as_echo_n "checking for isinf... " >&6; } if ${ac_cv_have_isinf+:} false; then : @@ -14335,6 +14337,7 @@ then $as_echo "#define HAVE_ISNAN 1" >>confdefs.h fi +LIBS="$ac_save_LIBS" case $host_cpu in diff --git a/configure.ac b/configure.ac index 3d493cf..dccc4d3 100644 --- a/configure.ac +++ b/configure.ac @@ -2327,6 +2327,8 @@ then fi dnl Check for isinf +ac_save_LIBS="$LIBS" +LIBS="$LIBS -lm" AC_CACHE_CHECK([for isinf], ac_cv_have_isinf, AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; return isinf(f)]])],[ac_cv_have_isinf="yes"],[ac_cv_have_isinf="no"])) if test "$ac_cv_have_isinf" = "yes" @@ -2341,6 +2343,7 @@ if test "$ac_cv_have_isnan" = "yes" then AC_DEFINE(HAVE_ISNAN, 1, [Define to 1 if you have the `isnan' function.]) fi +LIBS="$ac_save_LIBS" dnl *** check for the need to define platform-specific symbols

1 0

Henri Verbeet : wined3d: Make the device parameter to primary_render_target_is_p8() const.
by Alexandre Julliard July 11, 2011

July 11, 2011

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 July 11, 2011

July 11, 2011

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: Return data as struct wined3d_bo_address in buffer_get_memory().
by Alexandre Julliard July 11, 2011

July 11, 2011

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