September 2011 - Wine-commits

Alexandre Julliard : gdi32: Move DIB driver definitions to dibdrv.h.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 2a5cabc22d7ae46b7992c106c3b8b73c3112ed03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a5cabc22d7ae46b7992c106c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 23:48:24 2011 +0200 gdi32: Move DIB driver definitions to dibdrv.h. --- dlls/gdi32/dibdrv/dibdrv.h | 82 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 84 -------------------------------------------- 2 files changed, 82 insertions(+), 84 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index c1f7e8b..7f0d697 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -18,6 +18,88 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +enum dib_info_flags +{ + private_color_table = 1 +}; + +typedef struct +{ + int bit_count, width, height; + int stride; /* stride in bytes. Will be -ve for bottom-up dibs (see bits). */ + struct gdi_image_bits bits; /* bits.ptr points to the top-left corner of the dib. */ + + DWORD red_mask, green_mask, blue_mask; + int red_shift, green_shift, blue_shift; + int red_len, green_len, blue_len; + + RGBQUAD *color_table; + DWORD color_table_size; + + enum dib_info_flags flags; + + const struct primitive_funcs *funcs; +} dib_info; + +typedef struct +{ + DWORD count; + DWORD dashes[16]; /* 16 is the maximum number for a PS_USERSTYLE pen */ + DWORD total_len; /* total length of the dashes, should be multiplied by 2 if there are an odd number of dash lengths */ +} dash_pattern; + +typedef struct +{ + int left_in_dash; + int cur_dash; + BOOL mark; +} dash_pos; + +typedef struct +{ + DWORD and; + DWORD xor; +} rop_mask; + +typedef struct +{ + void *and; + void *xor; +} rop_mask_bits; + +typedef struct dibdrv_physdev +{ + struct gdi_physdev dev; + dib_info dib; + + HRGN clip; + DWORD defer; + + /* pen */ + COLORREF pen_colorref; + DWORD pen_color, pen_and, pen_xor; + dash_pattern pen_pattern; + dash_pos dash_pos; + BOOL (* pen_lines)(struct dibdrv_physdev *pdev, int num, POINT *pts); + + /* brush */ + UINT brush_style; + UINT brush_hatch; + INT brush_rop; /* PatBlt, for example, can override the DC's rop2 */ + COLORREF brush_colorref; + DWORD brush_color, brush_and, brush_xor; + dib_info brush_dib; + void *brush_and_bits, *brush_xor_bits; + BOOL (* brush_rects)(struct dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN clip); + + /* background */ + DWORD bkgnd_color, bkgnd_and, bkgnd_xor; +} dibdrv_physdev; + +#define DEFER_FORMAT 1 +#define DEFER_PEN 2 +#define DEFER_BRUSH 4 + extern DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 7fe633c..a06a593 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -72,90 +72,6 @@ typedef struct tagGDIOBJHDR struct hdc_list *hdcs; } GDIOBJHDR; -/* Device functions for the Wine driver interface */ - -enum dib_info_flags -{ - private_color_table = 1 -}; - -typedef struct -{ - int bit_count, width, height; - int stride; /* stride in bytes. Will be -ve for bottom-up dibs (see bits). */ - struct gdi_image_bits bits; /* bits.ptr points to the top-left corner of the dib. */ - - DWORD red_mask, green_mask, blue_mask; - int red_shift, green_shift, blue_shift; - int red_len, green_len, blue_len; - - RGBQUAD *color_table; - DWORD color_table_size; - - enum dib_info_flags flags; - - const struct primitive_funcs *funcs; -} dib_info; - -typedef struct -{ - DWORD count; - DWORD dashes[16]; /* 16 is the maximum number for a PS_USERSTYLE pen */ - DWORD total_len; /* total length of the dashes, should be multiplied by 2 if there are an odd number of dash lengths */ -} dash_pattern; - -typedef struct -{ - int left_in_dash; - int cur_dash; - BOOL mark; -} dash_pos; - -typedef struct -{ - DWORD and; - DWORD xor; -} rop_mask; - -typedef struct -{ - void *and; - void *xor; -} rop_mask_bits; - -typedef struct dibdrv_physdev -{ - struct gdi_physdev dev; - dib_info dib; - - HRGN clip; - DWORD defer; - - /* pen */ - COLORREF pen_colorref; - DWORD pen_color, pen_and, pen_xor; - dash_pattern pen_pattern; - dash_pos dash_pos; - BOOL (* pen_lines)(struct dibdrv_physdev *pdev, int num, POINT *pts); - - /* brush */ - UINT brush_style; - UINT brush_hatch; - INT brush_rop; /* PatBlt, for example, can override the DC's rop2 */ - COLORREF brush_colorref; - DWORD brush_color, brush_and, brush_xor; - dib_info brush_dib; - void *brush_and_bits, *brush_xor_bits; - BOOL (* brush_rects)(struct dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN clip); - - /* background */ - DWORD bkgnd_color, bkgnd_and, bkgnd_xor; -} dibdrv_physdev; - -#define DEFER_FORMAT 1 -#define DEFER_PEN 2 -#define DEFER_BRUSH 4 - typedef struct gdi_dc_funcs DC_FUNCTIONS; /* It should not be necessary to access the contents of the GdiPath

1 0

Huw Davies : gdi32: When creating a dib_info from a ddb, always make a copy of the colour map.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 5bd003edaa78e7ac6a84b35c056866df53db23de URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd003edaa78e7ac6a84b35c0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 8 09:55:03 2011 +0100 gdi32: When creating a dib_info from a ddb, always make a copy of the colour map. --- dlls/gdi32/dibdrv/bitblt.c | 17 +++++++++++++---- dlls/gdi32/dibdrv/dc.c | 3 ++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 356d276..0bb37fb 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -604,7 +604,7 @@ DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) { DWORD ret = ERROR_SUCCESS; - dib_info *dib, stand_alone; + dib_info *dib = NULL, stand_alone; TRACE( "%p %p %p\n", dev, hbitmap, info ); @@ -651,7 +651,12 @@ DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, } done: - if (hbitmap) GDI_ReleaseObj( hbitmap ); + if (hbitmap) + { + if (dib) free_dib_info( dib ); + GDI_ReleaseObj( hbitmap ); + } + return ret; } @@ -707,7 +712,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info const struct gdi_image_bits *bits, struct bitblt_coords *src, struct bitblt_coords *dst, DWORD rop ) { - dib_info *dib, stand_alone; + dib_info *dib = NULL, stand_alone; DWORD ret; dib_info src_dib; HRGN saved_clip = NULL; @@ -780,7 +785,11 @@ update_format: ret = ERROR_BAD_FORMAT; done: - if (hbitmap) GDI_ReleaseObj( hbitmap ); + if (hbitmap) + { + if (dib) free_dib_info( dib ); + GDI_ReleaseObj( hbitmap ); + } return ret; } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 8ab7a06..99b441c 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -219,7 +219,8 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_f BITMAPINFO *info = (BITMAPINFO *)buffer; get_ddb_bitmapinfo( bmp, info ); - return init_dib_info_from_bitmapinfo( dib, info, bmp->bitmap.bmBits, flags ); + return init_dib_info_from_bitmapinfo( dib, info, bmp->bitmap.bmBits, + flags | private_color_table ); } return init_dib_info( dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, flags );

1 0

Henri Verbeet : wined3d: Use draw_binding for the surface_modify_location() call in surface_unmap() as well.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 19da825b12e51365a5fecdb230a51bdfaca0363e URL: http://source.winehq.org/git/wine.git/?a=commit;h=19da825b12e51365a5fecdb23… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 7 20:21:57 2011 +0200 wined3d: Use draw_binding for the surface_modify_location() call in surface_unmap() as well. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 633517d..21b4f9a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1000,7 +1000,7 @@ static void surface_unmap(struct wined3d_surface *surface) * date because only a subrectangle was read in Map(). */ if (!fullsurface) { - surface_modify_location(surface, SFLAG_INDRAWABLE, TRUE); + surface_modify_location(surface, surface->draw_binding, TRUE); surface_evict_sysmem(surface); }

1 0

Henri Verbeet : ddraw: Also check errors returned by ddraw_create_gdi_swapchain() in CreateSurface().
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: cbc009b8d2fdd89cd81aa0f45e012b1d25193c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbc009b8d2fdd89cd81aa0f45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 7 20:21:58 2011 +0200 ddraw: Also check errors returned by ddraw_create_gdi_swapchain() in CreateSurface(). --- dlls/ddraw/ddraw.c | 80 +++++++++++++++++++++++++++------------------------ 1 files changed, 42 insertions(+), 38 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 24d3647..7dd0f2d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3209,49 +3209,57 @@ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, return hr; } - /* If the implementation is OpenGL and there's no d3ddevice, attach a d3ddevice - * But attach the d3ddevice only if the currently created surface was - * a primary surface (2D app in 3D mode) or a 3DDEVICE surface (3D app) - * The only case I can think of where this doesn't apply is when a - * 2D app was configured by the user to run with OpenGL and it didn't create - * the render target as first surface. In this case the render target creation - * will cause the 3D init. */ - if (DefaultSurfaceType == SURFACE_OPENGL && !ddraw->d3d_initialized - && desc2.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE)) - { - IDirectDrawSurfaceImpl *target = object, *surface; - struct list *entry; - - /* Search for the primary to use as render target */ - LIST_FOR_EACH(entry, &ddraw->surface_list) + if (!ddraw->d3d_initialized && desc2.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE)) + { + HRESULT hr = WINED3D_OK; + + /* If the implementation is OpenGL and there's no d3ddevice, attach a + * d3ddevice. But attach the d3ddevice only if the currently created + * surface was a primary surface (2D app in 3D mode) or a 3DDEVICE + * surface (3D app). The only case I can think of where this doesn't + * apply is when a 2D app was configured by the user to run with + * OpenGL and it didn't create the render target as first surface. In + * this case the render target creation will cause the 3D init. */ + if (DefaultSurfaceType == SURFACE_OPENGL) { - surface = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); - if((surface->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) == - (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) + IDirectDrawSurfaceImpl *target = object, *surface; + struct list *entry; + + /* Search for the primary to use as render target. */ + LIST_FOR_EACH(entry, &ddraw->surface_list) { - /* found */ - target = surface; - TRACE("Using primary %p as render target\n", target); - break; + surface = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); + if ((surface->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) + == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) + { + TRACE("Using primary %p as render target.\n", target); + target = surface; + break; + } } + + TRACE("Attaching a D3DDevice, rendertarget = %p.\n", target); + hr = ddraw_attach_d3d_device(ddraw, target); + } + else if (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + hr = ddraw_create_gdi_swapchain(ddraw, object); } - TRACE("(%p) Attaching a D3DDevice, rendertarget = %p\n", ddraw, target); - hr = ddraw_attach_d3d_device(ddraw, target); - if (hr != D3D_OK) + if (FAILED(hr)) { IDirectDrawSurfaceImpl *release_surf; - ERR("ddraw_attach_d3d_device failed, hr %#x\n", hr); + ERR("Failed to create swapchain, hr %#x.\n", hr); *Surf = NULL; - /* The before created surface structures are in an incomplete state here. - * WineD3D holds the reference on the IParents, and it released them on the failure - * already. So the regular release method implementation would fail on the attempt - * to destroy either the IParents or the swapchain. So free the surface here. - * The surface structure here is a list, not a tree, because onscreen targets - * cannot be cube textures - */ - while(object) + /* The earlier created surface structures are in an incomplete + * state here. Wined3d holds the reference on the parents, and it + * released them on the failure already. So the regular release + * method implementation would fail on the attempt to destroy + * either the parents or the swapchain. So free the surface here. + * The surface structure here is a list, not a tree, because + * onscreen targets cannot be cube textures. */ + while (object) { release_surf = object; object = object->complex_array[0]; @@ -3261,10 +3269,6 @@ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, return hr; } } - else if(!(ddraw->d3d_initialized) && desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - { - ddraw_create_gdi_swapchain(ddraw, object); - } /* Create a WineD3DTexture if a texture was requested */ if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE)

1 0

Henri Verbeet : ddraw: Introduce a function for creating the swapchain.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: bbfbd66d9ff07623237aff04bf7c06dd0be8aa31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfbd66d9ff07623237aff04b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 7 20:21:59 2011 +0200 ddraw: Introduce a function for creating the swapchain. --- dlls/ddraw/ddraw.c | 78 ++++++++++++++++++++++++++++------------------------ 1 files changed, 42 insertions(+), 36 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7dd0f2d..001a2be 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2833,6 +2833,47 @@ static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSur return hr; } +static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *surface) +{ + HRESULT hr = WINED3D_OK; + + /* If the implementation is OpenGL and there's no d3ddevice, attach a + * d3ddevice. But attach the d3ddevice only if the currently created + * surface was a primary surface (2D app in 3D mode) or a 3DDEVICE surface + * (3D app). The only case I can think of where this doesn't apply is when + * a 2D app was configured by the user to run with OpenGL and it didn't + * create the render target as first surface. In this case the render + * target creation will cause the 3D init. */ + if (DefaultSurfaceType == SURFACE_OPENGL) + { + IDirectDrawSurfaceImpl *target = surface, *primary; + struct list *entry; + + /* Search for the primary to use as render target. */ + LIST_FOR_EACH(entry, &ddraw->surface_list) + { + primary = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); + if ((primary->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) + == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) + { + TRACE("Using primary %p as render target.\n", target); + target = primary; + break; + } + } + + TRACE("Attaching a D3DDevice, rendertarget = %p.\n", target); + hr = ddraw_attach_d3d_device(ddraw, target); + } + else if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + hr = ddraw_create_gdi_swapchain(ddraw, surface); + } + + return hr; + +} + /***************************************************************************** * IDirectDraw7::CreateSurface * @@ -3211,42 +3252,7 @@ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, if (!ddraw->d3d_initialized && desc2.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE)) { - HRESULT hr = WINED3D_OK; - - /* If the implementation is OpenGL and there's no d3ddevice, attach a - * d3ddevice. But attach the d3ddevice only if the currently created - * surface was a primary surface (2D app in 3D mode) or a 3DDEVICE - * surface (3D app). The only case I can think of where this doesn't - * apply is when a 2D app was configured by the user to run with - * OpenGL and it didn't create the render target as first surface. In - * this case the render target creation will cause the 3D init. */ - if (DefaultSurfaceType == SURFACE_OPENGL) - { - IDirectDrawSurfaceImpl *target = object, *surface; - struct list *entry; - - /* Search for the primary to use as render target. */ - LIST_FOR_EACH(entry, &ddraw->surface_list) - { - surface = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); - if ((surface->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) - == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) - { - TRACE("Using primary %p as render target.\n", target); - target = surface; - break; - } - } - - TRACE("Attaching a D3DDevice, rendertarget = %p.\n", target); - hr = ddraw_attach_d3d_device(ddraw, target); - } - else if (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - { - hr = ddraw_create_gdi_swapchain(ddraw, object); - } - - if (FAILED(hr)) + if (FAILED(hr = ddraw_create_swapchain(ddraw, object))) { IDirectDrawSurfaceImpl *release_surf; ERR("Failed to create swapchain, hr %#x.\n", hr);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_sampler_state() const.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 919d3ab9e426dd43c9634f20936e321d83fcfc03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=919d3ab9e426dd43c9634f209… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 7 20:22:00 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_sampler_state() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4a8b5c6..1b722f5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2550,7 +2550,7 @@ HRESULT CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_sampler_state(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_sampler_state(const struct wined3d_device *device, UINT sampler_idx, WINED3DSAMPLERSTATETYPE state, DWORD *value) { TRACE("device %p, sampler_idx %u, state %s, value %p.\n", diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2039398..ddf6561 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2243,7 +2243,7 @@ HRESULT __cdecl wined3d_device_get_render_state(const struct wined3d_device *dev WINED3DRENDERSTATETYPE state, DWORD *value); HRESULT __cdecl wined3d_device_get_render_target(struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface **render_target); -HRESULT __cdecl wined3d_device_get_sampler_state(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device, UINT sampler_idx, WINED3DSAMPLERSTATETYPE state, DWORD *value); HRESULT __cdecl wined3d_device_get_scissor_rect(struct wined3d_device *device, RECT *rect); BOOL __cdecl wined3d_device_get_software_vertex_processing(struct wined3d_device *device);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_scissor_rect() const.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 20e9b3f13f0632503dcd415ac83a5e8d05f50361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e9b3f13f0632503dcd415ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 7 20:22:01 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_scissor_rect() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1b722f5..ac609fd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2595,7 +2595,7 @@ HRESULT CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, con return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_scissor_rect(struct wined3d_device *device, RECT *rect) +HRESULT CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect) { TRACE("device %p, rect %p.\n", device, rect); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ddf6561..b05acae 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2245,7 +2245,7 @@ HRESULT __cdecl wined3d_device_get_render_target(struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface **render_target); HRESULT __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device, UINT sampler_idx, WINED3DSAMPLERSTATETYPE state, DWORD *value); -HRESULT __cdecl wined3d_device_get_scissor_rect(struct wined3d_device *device, RECT *rect); +HRESULT __cdecl wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect); BOOL __cdecl wined3d_device_get_software_vertex_processing(struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer **buffer, UINT *offset, UINT *stride);

1 0

André Hentschel : ntdll/tests: Run the execution test only on x86 platforms.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 94a9db6383f5915826267b2641ced193a661b2f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a9db6383f5915826267b264… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 7 18:54:45 2011 +0200 ntdll/tests: Run the execution test only on x86 platforms. --- dlls/ntdll/tests/info.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 2d5c94f..ec1ce3d 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1194,10 +1194,12 @@ static void test_mapprotection(void) addr = NULL; status = pNtMapViewOfSection ( h, GetCurrentProcess(), &addr, 0, 0, &offset, &count, ViewShare, 0, PAGE_READWRITE); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); +#if defined(__x86_64__) || defined(__i386__) memset (addr, 0xc3, 1); /* lret ... in both i386 and x86_64 */ trace("trying to execute code in the readwrite only mapped anon file...\n"); f = addr;f(); trace("...done.\n"); +#endif status = pNtQueryVirtualMemory( GetCurrentProcess(), addr, MemoryBasicInformation, &info, sizeof(info), &retlen ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);

1 0

Alexandre Julliard : libwine: Avoid converting the final null in strlwrW and struprW.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: f7c98b036c5b7b177d56652ae3f9a153a3783328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7c98b036c5b7b177d56652ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 8 11:16:51 2011 +0200 libwine: Avoid converting the final null in strlwrW and struprW. --- include/wine/unicode.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index b685e43..35c6166 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -265,15 +265,15 @@ WINE_UNICODE_INLINE size_t strcspnW( const WCHAR *str, const WCHAR *reject ) WINE_UNICODE_INLINE WCHAR *strlwrW( WCHAR *str ) { - WCHAR *ret = str; - while ((*str = tolowerW(*str))) str++; + WCHAR *ret; + for (ret = str; *str; str++) *str = tolowerW(*str); return ret; } WINE_UNICODE_INLINE WCHAR *struprW( WCHAR *str ) { - WCHAR *ret = str; - while ((*str = toupperW(*str))) str++; + WCHAR *ret; + for (ret = str; *str; str++) *str = toupperW(*str); return ret; }

1 0

André Hentschel : ntdll/tests: Tests for _wcslwr and _wcsupr.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: ca8d7652f68d564c5e2404048090c345568a8329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8d7652f68d564c5e2404048… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 7 18:03:17 2011 +0200 ntdll/tests: Tests for _wcslwr and _wcsupr. --- dlls/ntdll/tests/string.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 14464d9..9422d41 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -51,8 +51,8 @@ static LPWSTR (WINAPIV *p_ultow)(ULONG, LPWSTR, INT); static LPWSTR (WINAPIV *p_i64tow)(LONGLONG, LPWSTR, INT); static LPWSTR (WINAPIV *p_ui64tow)(ULONGLONG, LPWSTR, INT); -static long (WINAPIV *pwcstol)(LPCWSTR, LPWSTR *, INT); -static ULONG (WINAPIV *pwcstoul)(LPCWSTR, LPWSTR *, INT); +static LPWSTR (__cdecl *p_wcslwr)(LPWSTR); +static LPWSTR (__cdecl *p_wcsupr)(LPWSTR); static LPWSTR (WINAPIV *p_wcschr)(LPCWSTR, WCHAR); static LPWSTR (WINAPIV *p_wcsrchr)(LPCWSTR, WCHAR); @@ -89,8 +89,8 @@ static void InitFunctionPtrs(void) p_i64tow = (void *)GetProcAddress(hntdll, "_i64tow"); p_ui64tow = (void *)GetProcAddress(hntdll, "_ui64tow"); - pwcstol = (void *)GetProcAddress(hntdll, "wcstol"); - pwcstoul = (void *)GetProcAddress(hntdll, "wcstoul"); + p_wcslwr = (void *)GetProcAddress(hntdll, "_wcslwr"); + p_wcsupr = (void *)GetProcAddress(hntdll, "_wcsupr"); p_wcschr= (void *)GetProcAddress(hntdll, "wcschr"); p_wcsrchr= (void *)GetProcAddress(hntdll, "wcsrchr"); @@ -1143,6 +1143,28 @@ static void test_wcsrchr(void) "wcsrchr should have returned NULL\n"); } +static void test_wcslwrupr(void) +{ + static WCHAR teststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; + static WCHAR emptyW[1] = {0}; + static const WCHAR constemptyW[1] = {0}; + + if (0) /* crashes on native */ + { + static const WCHAR conststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; + ok(p_wcslwr((LPWSTR)conststringW) == conststringW, "p_wcslwr returned different string\n"); + ok(p_wcsupr((LPWSTR)conststringW) == conststringW, "p_wcsupr returned different string\n"); + ok(p_wcslwr(NULL) == NULL, "p_wcslwr didn't returned NULL\n"); + ok(p_wcsupr(NULL) == NULL, "p_wcsupr didn't returned NULL\n"); + } + ok(p_wcslwr(teststringW) == teststringW, "p_wcslwr returned different string\n"); + ok(p_wcsupr(teststringW) == teststringW, "p_wcsupr returned different string\n"); + ok(p_wcslwr(emptyW) == emptyW, "p_wcslwr returned different string\n"); + ok(p_wcsupr(emptyW) == emptyW, "p_wcsupr returned different string\n"); + ok(p_wcslwr((LPWSTR)constemptyW) == constemptyW, "p_wcslwr returned different string\n"); + ok(p_wcsupr((LPWSTR)constemptyW) == constemptyW, "p_wcsupr returned different string\n"); +} + static __cdecl int intcomparefunc(const void *a, const void *b) { const int *p = a, *q = b; @@ -1272,6 +1294,8 @@ START_TEST(string) test_wcschr(); if (p_wcsrchr) test_wcsrchr(); + if (p_wcslwr && p_wcsupr) + test_wcslwrupr(); if (patoi) test_atoi(); if (patol)

1 0