September 2011 - Wine-Commits

Huw Davies : gdi32: When creating a dib_info from a ddb, always make a copy of the colour map.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

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

Alexandre Julliard : gdi32: Allocate the DIB driver on first use, and free it only upon DC destruction.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: d12d98511cc6257b0d8aa6e3af3e804b0a098a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d12d98511cc6257b0d8aa6e3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 23:47:31 2011 +0200 gdi32: Allocate the DIB driver on first use, and free it only upon DC destruction. --- dlls/gdi32/bitmap.c | 17 ++++++++++++----- dlls/gdi32/brush.c | 2 +- dlls/gdi32/dc.c | 5 +++-- dlls/gdi32/dibdrv/dc.c | 32 ++++++++++++++++++++++++-------- dlls/gdi32/dibdrv/dibdrv.h | 5 ----- dlls/gdi32/gdi_private.h | 10 +++++----- 6 files changed, 45 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 95a45ff..9c77016 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -702,13 +702,18 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) } old_physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); - if(old_physdev == &dc->dibdrv.dev) + if(old_physdev == dc->dibdrv) old_physdev = pop_dc_driver( &dc->physDev ); if(bitmap->dib) { - physdev = &dc->dibdrv.dev; - push_dc_driver( &dc->physDev, physdev, physdev->funcs ); + physdev = dc->dibdrv; + if (physdev) push_dc_driver( &dc->physDev, physdev, physdev->funcs ); + else + { + if (!dib_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL, NULL )) goto done; + dc->dibdrv = physdev = dc->physDev; + } } else physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); @@ -742,8 +747,10 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) done: if(!ret) { - if(physdev == &dc->dibdrv.dev) pop_dc_driver( &dc->physDev ); - if(old_physdev == &dc->dibdrv.dev) push_dc_driver( &dc->physDev, old_physdev, old_physdev->funcs ); + if (physdev && physdev == dc->dibdrv) + pop_dc_driver( &dc->physDev ); + if (old_physdev && old_physdev == dc->dibdrv) + push_dc_driver( &dc->physDev, old_physdev, old_physdev->funcs ); } release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 28d326f..ca95f20 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -392,7 +392,7 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) PHYSDEV pattern_dev = physdev; /* FIXME: This will go away once the dib driver implements pattern brushes */ - if(pattern_dev == &dc->dibdrv.dev) + if(pattern_dev == dc->dibdrv) pattern_dev = GET_NEXT_PHYSDEV( physdev, pSelectBrush ); BITMAP_SetOwnerDC( (HBITMAP)brush->logbrush.lbHatch, pattern_dev ); diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5ba4e59..65cc3f7 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -79,8 +79,7 @@ DC *alloc_dc_ptr( WORD magic ) dc->nulldrv.funcs = &null_driver; dc->nulldrv.next = NULL; - dc->dibdrv.dev.funcs = &dib_driver; - dc->dibdrv.dev.next = NULL; + dc->dibdrv = NULL; dc->physDev = &dc->nulldrv; dc->thread = GetCurrentThreadId(); dc->refcount = 1; @@ -185,7 +184,9 @@ void free_dc_ptr( DC *dc ) { PHYSDEV physdev = pop_dc_driver( &dc->physDev ); physdev->funcs->pDeleteDC( physdev ); + if (physdev == dc->dibdrv) dc->dibdrv = NULL; } + if (dc->dibdrv) dc->dibdrv->funcs->pDeleteDC( dc->dibdrv ); free_gdi_handle( dc->hSelf ); free_dc_state( dc ); } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index f6ab1e2..8ab7a06 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -349,6 +349,26 @@ void restore_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) pdev->clip = rgn; } +/********************************************************************** + * dibdrv_CreateDC + */ +static BOOL dibdrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, + LPCWSTR output, const DEVMODEW *data ) +{ + dibdrv_physdev *pdev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pdev) ); + + if (!pdev) return FALSE; + if (!(pdev->clip = CreateRectRgn(0, 0, 0, 0))) + { + HeapFree( GetProcessHeap(), 0, pdev ); + return FALSE; + } + clear_dib_info(&pdev->dib); + clear_dib_info(&pdev->brush_dib); + push_dc_driver( dev, &pdev->dev, &dib_driver ); + return TRUE; +} + /*********************************************************************** * dibdrv_DeleteDC */ @@ -359,7 +379,8 @@ static BOOL dibdrv_DeleteDC( PHYSDEV dev ) DeleteObject(pdev->clip); free_pattern_brush(pdev); free_dib_info(&pdev->dib); - return 0; + HeapFree( GetProcessHeap(), 0, pdev ); + return TRUE; } /*********************************************************************** @@ -375,13 +396,8 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) if (!bmp) return 0; assert(bmp->dib); - pdev->clip = CreateRectRgn(0, 0, 0, 0); + free_dib_info(&pdev->dib); pdev->defer = 0; - - clear_dib_info(&pdev->dib); - clear_dib_info(&pdev->brush_dib); - pdev->brush_and_bits = pdev->brush_xor_bits = NULL; - if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, private_color_table)) pdev->defer |= DEFER_FORMAT; @@ -494,7 +510,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pCloseFigure */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ - NULL, /* pCreateDC */ + dibdrv_CreateDC, /* pCreateDC */ NULL, /* pCreateDIBSection */ NULL, /* pDeleteBitmap */ dibdrv_DeleteDC, /* pDeleteDC */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 23a59ee..c1f7e8b 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -40,11 +40,6 @@ static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) return (dibdrv_physdev *)dev; } -static inline DC *get_dibdrv_dc( PHYSDEV dev ) -{ - return CONTAINING_RECORD( dev, DC, dibdrv ); -} - typedef struct primitive_funcs { void (* solid_rects)(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e9c992a..7fe633c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -186,11 +186,11 @@ typedef struct tagDC GDIOBJHDR header; HDC hSelf; /* Handle to this DC */ struct gdi_physdev nulldrv; /* physdev for the null driver */ - struct dibdrv_physdev dibdrv; /* physdev for the dib driver */ - PHYSDEV physDev; /* Physical device (driver-specific) */ - DWORD thread; /* thread owning the DC */ - LONG refcount; /* thread refcount */ - LONG dirty; /* dirty flag */ + PHYSDEV dibdrv; /* physdev for the dib driver */ + PHYSDEV physDev; /* current top of the physdev stack */ + DWORD thread; /* thread owning the DC */ + LONG refcount; /* thread refcount */ + LONG dirty; /* dirty flag */ INT saveLevel; struct tagDC *saved_dc; DWORD_PTR dwHookData;

1 0

Francois Gouget : po: Remove English strings from the Walloon translation.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: cf518dc6d150284860b93db778da2bb7eb67bff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf518dc6d150284860b93db77… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 8 00:20:08 2011 +0200 po: Remove English strings from the Walloon translation. --- po/wa.po | 191 ++++++++++++++++++++----------------------------------------- 1 files changed, 63 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf518dc6d150284860b93…

1 0

Francois Gouget : po: Remove English strings from the Ukrainian translation .
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 5d9c30464fd940deb78f78de0dab85dc3716ea7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9c30464fd940deb78f78de0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 8 00:13:35 2011 +0200 po: Remove English strings from the Ukrainian translation. --- po/uk.po | 796 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 397 insertions(+), 399 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d9c30464fd940deb78f7…

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_scissor_rect() const.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

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

Henri Verbeet : ddraw: Also check errors returned by ddraw_create_gdi_swapchain() in CreateSurface().
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

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 : wined3d: Use draw_binding for the surface_modify_location() call in surface_unmap() as well.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

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

Alexandre Julliard : gdi32: Move DIB driver definitions to dibdrv.h.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

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

Francois Gouget : po: Remove English strings from the Chinese (PRC) translation.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 66941383e7bf1b734e1479be9c4d33a1d560a739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66941383e7bf1b734e1479be9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 8 00:17:55 2011 +0200 po: Remove English strings from the Chinese (PRC) translation. --- po/zh_CN.po | 48 ++---------------------------------------------- 1 files changed, 2 insertions(+), 46 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 7a17d0a..977a290 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5600,7 +5600,6 @@ msgid "insert disk %s" msgstr "插入软盘 %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -5632,35 +5631,6 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" -"\n" -"Usage:\n" -"msiexec command {required parameter} [optional parammeter]\n" -"\n" -"Install a product:\n" -"\t/i {package|productcode} [property]\n" -"\t/package {package|productcode} [property]\n" -"\t/a package [property]\n" -"Repair an installation:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" -"Uninstall a product:\n" -"\t/uninstall {package|productcode} [property]\n" -"\t/x {package|productcode} [property]\n" -"Advertise a product:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" -"Apply a patch:\n" -"\t/p patchpackage [property]\n" -"\t/p patchpackage /a package [property]\n" -"Log and UI Modifiers for above commands:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -"\t/q{|n|b|r|f|n+|b+|b-}\n" -"Register MSI Service:\n" -"\t/y\n" -"Unregister MSI Service:\n" -"\t/z\n" -"Display this help:\n" -"\t/help\n" -"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s" @@ -6957,19 +6927,6 @@ msgid "" "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" -"Wine 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.\n" -"\n" -"Wine 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.\n" -"\n" -"You should have received a copy of the GNU Lesser General Public License " -"along with Wine; if not, write to the Free Software Foundation, Inc., 51 " -"Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." #: shell32.rc:265 msgid "Wine License" @@ -6977,7 +6934,7 @@ msgstr "Wine 使用许可" #: shell32.rc:155 msgid "Trash" -msgstr "Trash" +msgstr "" #: shlwapi.rc:27 msgid "%ld bytes" @@ -7767,9 +7724,8 @@ msgid "Timeout" msgstr "" #: wldap32.rc:113 -#, fuzzy msgid "Auth Unknown" -msgstr "Context Unknown" +msgstr "" #: wldap32.rc:114 msgid "Filter Error"

1 0

André Hentschel : ntdll: Allow reading from a writable section.
by Alexandre Julliard Sept. 7, 2011

Sept. 7, 2011

Module: wine Branch: master Commit: 8fc74191205e03719ee275fcd957ddd6deda7ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc74191205e03719ee275fcd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 6 18:00:42 2011 +0200 ntdll: Allow reading from a writable section. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index a7679da..dda1f37 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1341,7 +1341,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz size = ROUND_SIZE( sec->VirtualAddress, sec->SizeOfRawData ); if (sec->Characteristics & IMAGE_SCN_MEM_READ) vprot |= VPROT_READ; - if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_WRITECOPY; + if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_READ | VPROT_WRITECOPY; if (sec->Characteristics & IMAGE_SCN_MEM_EXECUTE) vprot |= VPROT_EXEC; /* Dumb game crack lets the AOEP point into a data section. Adjust. */

1 0