wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Henri Verbeet : wined3d: Make the buffer parameter to buffer_is_fully_dirty () const.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: da64996159fc552607932e3bbdb1e5318b14a6a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da64996159fc552607932e3bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 31 19:48:15 2011 +0100 wined3d: Make the buffer parameter to buffer_is_fully_dirty() const. --- dlls/wined3d/buffer.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 69c110a..c896394 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -81,16 +81,14 @@ static BOOL buffer_is_dirty(const struct wined3d_buffer *buffer) return !!buffer->modified_areas; } -static inline BOOL buffer_is_fully_dirty(struct wined3d_buffer *This) +static BOOL buffer_is_fully_dirty(const struct wined3d_buffer *buffer) { unsigned int i; - for(i = 0; i < This->modified_areas; i++) + for (i = 0; i < buffer->modified_areas; ++i) { - if (!This->maps[i].offset && This->maps[i].size == This->resource.size) - { + if (!buffer->maps[i].offset && buffer->maps[i].size == buffer->resource.size) return TRUE; - } } return FALSE; }

1 0

Henri Verbeet : wined3d: Make the buffer parameter to buffer_is_dirty() const.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: b9b2288796b4653c25c473c61fe3b8de3dbbae7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b2288796b4653c25c473c61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 31 19:48:14 2011 +0100 wined3d: Make the buffer parameter to buffer_is_dirty() const. --- dlls/wined3d/buffer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 45518cc..69c110a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -76,9 +76,9 @@ static inline void buffer_clear_dirty_areas(struct wined3d_buffer *This) This->modified_areas = 0; } -static inline BOOL buffer_is_dirty(struct wined3d_buffer *This) +static BOOL buffer_is_dirty(const struct wined3d_buffer *buffer) { - return !!This->modified_areas; + return !!buffer->modified_areas; } static inline BOOL buffer_is_fully_dirty(struct wined3d_buffer *This)

1 0

Henri Verbeet : wined3d: Get rid of the local_constant typedef.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: b49e08aa8d9427fe49dbb99f1b47ac7643a0d943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49e08aa8d9427fe49dbb99f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 31 19:48:13 2011 +0100 wined3d: Get rid of the local_constant typedef. --- dlls/wined3d/arb_program_shader.c | 34 +++++++++++++++++----------------- dlls/wined3d/glsl_shader.c | 24 ++++++++++++------------ dlls/wined3d/shader.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 9 +++++---- 4 files changed, 40 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b49e08aa8d9427fe49dbb…

1 0

Henri Verbeet : wined3d: Create the DIB section for DDSCAPS_OWNDC surfaces on initialization.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: fcf96b634a406be4d3bb8626842fae77f3102cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf96b634a406be4d3bb86268… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 31 19:48:12 2011 +0100 wined3d: Create the DIB section for DDSCAPS_OWNDC surfaces on initialization. --- dlls/ddraw/surface.c | 3 +++ dlls/wined3d/surface.c | 11 +++++++++++ include/wine/wined3d.h | 1 + 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3860959..567d086 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5273,6 +5273,9 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) usage |= WINED3DUSAGE_DEPTHSTENCIL; + if (desc->ddsCaps.dwCaps & DDSCAPS_OWNDC) + usage |= WINED3DUSAGE_OWNDC; + if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) { pool = WINED3DPOOL_SYSTEMMEM; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4f4f331..7361391 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -7305,6 +7305,17 @@ static HRESULT surface_init(struct wined3d_surface *surface, WINED3DSURFTYPE sur return hr; } + /* Similar to lockable rendertargets above, creating the DIB section + * during surface initialization prevents the sysmem pointer from changing + * after a wined3d_surface_getdc() call. */ + if ((usage & WINED3DUSAGE_OWNDC) && !surface->hDC + && SUCCEEDED(surface_create_dib_section(surface))) + { + HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); + surface->resource.heapMemory = NULL; + surface->resource.allocatedMemory = surface->dib.bitmap_data; + } + return hr; } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a921f87..f3bb3dc 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -847,6 +847,7 @@ enum wined3d_sysval_semantic #define WINED3DUSAGE_AUTOGENMIPMAP 0x00000400 #define WINED3DUSAGE_DMAP 0x00004000 #define WINED3DUSAGE_MASK 0x00004fff +#define WINED3DUSAGE_OWNDC 0x20000000 #define WINED3DUSAGE_STATICDECL 0x40000000 #define WINED3DUSAGE_OVERLAY 0x80000000

1 0

Henri Verbeet : wined3d: Get rid of the wined3d_surface_bltfast() export.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 7de4df9fd9dcd505bb929976d439710eceda095d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de4df9fd9dcd505bb929976d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 31 19:48:11 2011 +0100 wined3d: Get rid of the wined3d_surface_bltfast() export. --- dlls/wined3d/surface.c | 20 +++++--------------- dlls/wined3d/swapchain.c | 6 +++--- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d.h | 9 --------- 5 files changed, 10 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c13fc26..4f4f331 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1816,14 +1816,13 @@ cpu: } /* Do not call while under the GL lock. */ -HRESULT CDECL wined3d_surface_bltfast(struct wined3d_surface *dst_surface, DWORD dst_x, DWORD dst_y, - struct wined3d_surface *src_surface, const RECT *src_rect_in, DWORD trans) +HRESULT surface_bltfast(struct wined3d_surface *dst_surface, DWORD dst_x, DWORD dst_y, + struct wined3d_surface *src_surface, const RECT *src_rect_in, DWORD flags) { RECT src_rect, dst_rect; - DWORD flags = 0; - TRACE("dst_surface %p, dst_x %u, dst_y %u, src_surface %p, src_rect_in %s, trans %#x.\n", - dst_surface, dst_x, dst_y, src_surface, wine_dbgstr_rect(src_rect_in), trans); + TRACE("dst_surface %p, dst_x %u, dst_y %u, src_surface %p, src_rect_in %s, flags %#x.\n", + dst_surface, dst_x, dst_y, src_surface, wine_dbgstr_rect(src_rect_in), flags); surface_get_rect(src_surface, src_rect_in, &src_rect); @@ -1832,15 +1831,6 @@ HRESULT CDECL wined3d_surface_bltfast(struct wined3d_surface *dst_surface, DWORD dst_rect.right = dst_x + src_rect.right - src_rect.left; dst_rect.bottom = dst_y + src_rect.bottom - src_rect.top; - if (trans & WINEDDBLTFAST_SRCCOLORKEY) - flags |= WINEDDBLT_KEYSRC; - if (trans & WINEDDBLTFAST_DESTCOLORKEY) - flags |= WINEDDBLT_KEYDEST; - if (trans & WINEDDBLTFAST_WAIT) - flags |= WINEDDBLT_WAIT; - if (trans & WINEDDBLTFAST_DONOTWAIT) - flags |= WINEDDBLT_DONOTWAIT; - return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, NULL, WINED3DTEXF_POINT); } @@ -2604,7 +2594,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P * loading. */ d3dfmt_get_conv(dst_surface, FALSE, TRUE, &format, &convert); if (convert != NO_CONVERSION || format.convert) - return wined3d_surface_bltfast(dst_surface, dst_point->x, dst_point->y, src_surface, src_rect, 0); + return surface_bltfast(dst_surface, dst_point->x, dst_point->y, src_surface, src_rect, 0); context = context_acquire(dst_surface->resource.device, NULL); gl_info = context->gl_info; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1678dce..7141165 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -161,7 +161,7 @@ HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapc if (swapchain->presentParms.Windowed) MapWindowPoints(swapchain->win_handle, NULL, &offset, 1); - wined3d_surface_bltfast(dst_surface, offset.x, offset.y, swapchain->front_buffer, NULL, 0); + surface_bltfast(dst_surface, offset.x, offset.y, swapchain->front_buffer, NULL, 0); return WINED3D_OK; } @@ -476,8 +476,8 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R if (swapchain->device->logo_surface) { /* Blit the logo into the upper left corner of the drawable. */ - wined3d_surface_bltfast(swapchain->back_buffers[0], 0, 0, - swapchain->device->logo_surface, NULL, WINEDDBLTFAST_SRCCOLORKEY); + surface_bltfast(swapchain->back_buffers[0], 0, 0, + swapchain->device->logo_surface, NULL, WINEDDBLT_KEYSRC); } TRACE("Presenting HDC %p.\n", context->hdc); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 9cac395..1befb128 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -200,7 +200,6 @@ @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) -@ cdecl wined3d_surface_bltfast(ptr long long ptr ptr long) @ cdecl wined3d_surface_create(ptr long long long long long long long long long long long ptr ptr ptr) @ cdecl wined3d_surface_decref(ptr) @ cdecl wined3d_surface_flip(ptr ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1a08c5b..168e021 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2079,6 +2079,8 @@ static inline GLuint surface_get_texture_name(const struct wined3d_surface *surf void surface_add_dirty_rect(struct wined3d_surface *surface, const WINED3DBOX *dirty_rect) DECLSPEC_HIDDEN; void surface_bind(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +HRESULT surface_bltfast(struct wined3d_surface *dst_surface, DWORD dst_x, DWORD dst_y, + struct wined3d_surface *src_surface, const RECT *src_rect_in, DWORD flags) DECLSPEC_HIDDEN; HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const WINED3DCOLORVALUE *color) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; BOOL surface_init_sysmem(struct wined3d_surface *surface) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a67949b..a921f87 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1285,13 +1285,6 @@ enum wined3d_sysval_semantic #define WINEDDBLT_DEPTHFILL 0x02000000 #define WINEDDBLT_DONOTWAIT 0x08000000 -/* dwTrans for BltFast */ -#define WINEDDBLTFAST_NOCOLORKEY 0x00000000 -#define WINEDDBLTFAST_SRCCOLORKEY 0x00000001 -#define WINEDDBLTFAST_DESTCOLORKEY 0x00000002 -#define WINEDDBLTFAST_WAIT 0x00000010 -#define WINEDDBLTFAST_DONOTWAIT 0x00000020 - /* DDSURFACEDESC.dwFlags */ #define WINEDDSD_CAPS 0x00000001 #define WINEDDSD_HEIGHT 0x00000002 @@ -2412,8 +2405,6 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *blt_fx, WINED3DTEXTUREFILTERTYPE filter); -HRESULT __cdecl wined3d_surface_bltfast(struct wined3d_surface *dst_surface, DWORD dst_x, DWORD dst_y, - struct wined3d_surface *src_surface, const RECT *src_rect, DWORD trans); HRESULT __cdecl wined3d_surface_create(struct wined3d_device *device, UINT width, UINT height, enum wined3d_format_id format_id, BOOL lockable, BOOL discard, UINT level, DWORD usage, WINED3DPOOL pool, WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, WINED3DSURFTYPE surface_type,

1 0

Alexandre Julliard : gdi32: Add a DC driver entry point for GdiGradientFill .
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 95cba0c0f462d658c602b4b3ab0fc22e625eb22c URL: http://source.winehq.org/git/wine.git/?a=commit;h=95cba0c0f462d658c602b4b3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 23:51:38 2011 +0100 gdi32: Add a DC driver entry point for GdiGradientFill. --- dlls/gdi32/dibdrv/dc.c | 1 + dlls/gdi32/driver.c | 1 + dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/freetype.c | 1 + dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/mfdrv/init.c | 1 + dlls/gdi32/painting.c | 291 +++++++++++++++++++++++--------------------- dlls/gdi32/path.c | 1 + dlls/wineps.drv/init.c | 1 + dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/xrender.c | 1 + include/wine/gdi_driver.h | 3 +- 12 files changed, 166 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95cba0c0f462d658c602b…

1 0

Alexandre Julliard : gdi32/tests: Add some tests for the behavior of a printer DC.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: afd962121ba341a399e8dcef6a60bf059b7f5b10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd962121ba341a399e8dcef6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 20:23:20 2011 +0100 gdi32/tests: Add some tests for the behavior of a printer DC. --- dlls/gdi32/tests/dc.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 2eee7ed..19d417b 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -28,6 +28,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winspool.h" #include "winerror.h" static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); @@ -783,6 +784,101 @@ done: ReleaseDC(NULL, hdc); } +static HDC create_printer_dc(void) +{ + char buffer[260]; + DWORD len; + PRINTER_INFO_2A *pbuf = NULL; + DRIVER_INFO_3A *dbuf = NULL; + HANDLE hprn = 0; + HDC hdc = 0; + HMODULE winspool = LoadLibraryA( "winspool.drv" ); + BOOL (WINAPI *pOpenPrinterA)(LPSTR, HANDLE *, LPPRINTER_DEFAULTSA); + BOOL (WINAPI *pGetDefaultPrinterA)(LPSTR, LPDWORD); + BOOL (WINAPI *pGetPrinterA)(HANDLE, DWORD, LPBYTE, DWORD, LPDWORD); + BOOL (WINAPI *pGetPrinterDriverA)(HANDLE, LPSTR, DWORD, LPBYTE, DWORD, LPDWORD); + BOOL (WINAPI *pClosePrinter)(HANDLE); + + pGetDefaultPrinterA = (void *)GetProcAddress( winspool, "GetDefaultPrinterA" ); + pOpenPrinterA = (void *)GetProcAddress( winspool, "OpenPrinterA" ); + pGetPrinterA = (void *)GetProcAddress( winspool, "GetPrinterA" ); + pGetPrinterDriverA = (void *)GetProcAddress( winspool, "GetPrinterDriverA" ); + pClosePrinter = (void *)GetProcAddress( winspool, "ClosePrinter" ); + + if (!pGetDefaultPrinterA || !pOpenPrinterA || !pGetPrinterA || !pGetPrinterDriverA || !pClosePrinter) + goto done; + + len = sizeof(buffer); + if (!pGetDefaultPrinterA( buffer, &len )) goto done; + if (!pOpenPrinterA( buffer, &hprn, NULL )) goto done; + + pGetPrinterA( hprn, 2, NULL, 0, &len ); + pbuf = HeapAlloc( GetProcessHeap(), 0, len ); + if (!pGetPrinterA( hprn, 2, (LPBYTE)pbuf, len, &len )) goto done; + + pGetPrinterDriverA( hprn, NULL, 3, NULL, 0, &len ); + dbuf = HeapAlloc( GetProcessHeap(), 0, len ); + if (!pGetPrinterDriverA( hprn, NULL, 3, (LPBYTE)dbuf, len, &len )) goto done; + + hdc = CreateDCA( dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, pbuf->pDevMode ); + trace( "hdc %p for driver '%s' printer '%s' port '%s'\n", hdc, + dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName ); +done: + HeapFree( GetProcessHeap(), 0, dbuf ); + HeapFree( GetProcessHeap(), 0, pbuf ); + if (hprn) pClosePrinter( hprn ); + if (winspool) FreeLibrary( winspool ); + if (!hdc) skip( "could not create a DC for the default printer\n" ); + return hdc; +} + +static void test_printer_dc(void) +{ + HDC memdc, display_memdc; + HBITMAP orig, bmp; + DWORD ret; + HDC hdc = create_printer_dc(); + + if (!hdc) return; + + memdc = CreateCompatibleDC( hdc ); + display_memdc = CreateCompatibleDC( 0 ); + + ok( memdc != NULL, "CreateCompatibleDC failed for printer\n" ); + ok( display_memdc != NULL, "CreateCompatibleDC failed for screen\n" ); + + ret = GetDeviceCaps( hdc, TECHNOLOGY ); + ok( ret == DT_RASPRINTER, "wrong type %u\n", ret ); + + ret = GetDeviceCaps( memdc, TECHNOLOGY ); + ok( ret == DT_RASPRINTER, "wrong type %u\n", ret ); + + ret = GetDeviceCaps( display_memdc, TECHNOLOGY ); + ok( ret == DT_RASDISPLAY, "wrong type %u\n", ret ); + + bmp = CreateBitmap( 100, 100, 1, GetDeviceCaps( hdc, BITSPIXEL ), NULL ); + orig = SelectObject( memdc, bmp ); + ok( orig != NULL, "SelectObject failed\n" ); + ok( BitBlt( hdc, 10, 10, 20, 20, memdc, 0, 0, SRCCOPY ), "BitBlt failed\n" ); + + ok( !SelectObject( display_memdc, bmp ), "SelectObject succeeded\n" ); + SelectObject( memdc, orig ); + DeleteObject( bmp ); + + bmp = CreateBitmap( 100, 100, 1, 1, NULL ); + orig = SelectObject( display_memdc, bmp ); + ok( orig != NULL, "SelectObject failed\n" ); + ok( !SelectObject( memdc, bmp ), "SelectObject succeeded\n" ); + ok( BitBlt( hdc, 10, 10, 20, 20, display_memdc, 0, 0, SRCCOPY ), "BitBlt failed\n" ); + ok( BitBlt( memdc, 10, 10, 20, 20, display_memdc, 0, 0, SRCCOPY ), "BitBlt failed\n" ); + ok( BitBlt( display_memdc, 10, 10, 20, 20, memdc, 0, 0, SRCCOPY ), "BitBlt failed\n" ); + + DeleteDC( memdc ); + DeleteDC( display_memdc ); + DeleteDC( hdc ); + DeleteObject( bmp ); +} + START_TEST(dc) { pSetLayout = (void *)GetProcAddress( GetModuleHandle("gdi32.dll"), "SetLayout"); @@ -795,4 +891,5 @@ START_TEST(dc) test_boundsrect(); test_desktop_colorres(); test_gamma(); + test_printer_dc(); }

1 0

Alexandre Julliard : gdi32: Emulate DDB support using the DIB driver when the graphics driver doesn' t support bitmaps.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: f1f5f334687a90842acff555bdb987c901d59f6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f5f334687a90842acff555b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 20:21:15 2011 +0100 gdi32: Emulate DDB support using the DIB driver when the graphics driver doesn't support bitmaps. --- dlls/gdi32/bitmap.c | 11 +++-------- dlls/gdi32/dibdrv/dc.c | 11 +++++++++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index fe9deb7..8aea89c 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -609,11 +609,7 @@ BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) set_initial_bitmap_bits( hbitmap, bitmap ); } } - else - { - WARN( "Trying to select bitmap %p in DC that doesn't support it\n", hbitmap ); - ret = FALSE; - } + else bitmap->funcs = &dib_driver; /* use the DIB driver to emulate DDB support */ } else { @@ -666,7 +662,8 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) if(old_physdev == dc->dibdrv) old_physdev = pop_dc_driver( &dc->physDev ); - if(bitmap->dib) + physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); + if (bitmap->dib || physdev->funcs == &null_driver) { physdev = dc->dibdrv; if (physdev) push_dc_driver( &dc->physDev, physdev, physdev->funcs ); @@ -676,8 +673,6 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) dc->dibdrv = physdev = dc->physDev; } } - else - physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); if (!BITMAP_SetOwnerDC( handle, physdev )) { diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 0b67974..b312fab 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -404,6 +404,14 @@ static BOOL dibdrv_DeleteDC( PHYSDEV dev ) } /*********************************************************************** + * dibdrv_DeleteBitmap + */ +static BOOL dibdrv_DeleteBitmap( HBITMAP bitmap ) +{ + return TRUE; +} + +/*********************************************************************** * dibdrv_SelectBitmap */ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) @@ -414,7 +422,6 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) TRACE("(%p, %p)\n", dev, bitmap); if (!bmp) return 0; - assert(bmp->dib); free_dib_info(&pdev->dib); pdev->defer = 0; @@ -533,7 +540,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pCreateCompatibleDC */ dibdrv_CreateDC, /* pCreateDC */ NULL, /* pCreateDIBSection */ - NULL, /* pDeleteBitmap */ + dibdrv_DeleteBitmap, /* pDeleteBitmap */ dibdrv_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ NULL, /* pDescribePixelFormat */

1 0

Alexandre Julliard : gdi32: Allocate the bits for a DDB the first time it' s used in any DIB driver call.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: c9bdcbafabb532e1b7e10a8b682c13343c897205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9bdcbafabb532e1b7e10a8b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 20:06:37 2011 +0100 gdi32: Allocate the bits for a DDB the first time it's used in any DIB driver call. --- dlls/gdi32/bitmap.c | 47 +++-------------------------------------------- dlls/gdi32/dibdrv/dc.c | 7 +++++++ 2 files changed, 10 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 8295e9a..fe9deb7 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -53,57 +53,15 @@ static const struct gdi_obj_funcs bitmap_funcs = DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) { - BITMAPOBJ *bmp; - DWORD ret; - if (!hbitmap) return ERROR_NOT_SUPPORTED; - if (!(bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return ERROR_INVALID_HANDLE; - - if (bmp->bitmap.bmBits || !bits) - { - ret = dib_driver.pGetImage( 0, hbitmap, info, bits, src ); - } - else if (!(ret = dib_driver.pGetImage( 0, hbitmap, info, NULL, src ))) - { - info->bmiHeader.biHeight = -(src->visrect.bottom - src->visrect.top); - info->bmiHeader.biSizeImage = get_dib_image_size( info ); - - /* make the source rectangle relative to the returned bits */ - src->y -= src->visrect.top; - offset_rect( &src->visrect, 0, -src->visrect.top ); - - /* return all-zero bits */ - bits->ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage ); - bits->is_copy = TRUE; - bits->free = free_heap_bits; - } - GDI_ReleaseObj( hbitmap ); - return ret; + return dib_driver.pGetImage( 0, hbitmap, info, bits, src ); } DWORD nulldrv_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 ) { - BITMAPOBJ *bmp; - if (!hbitmap) return ERROR_SUCCESS; - - if (bits) - { - if (!(bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return ERROR_INVALID_HANDLE; - if (!bmp->bitmap.bmBits) - { - int width_bytes = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); - if (!(bmp->bitmap.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - bmp->bitmap.bmHeight * width_bytes ))) - { - GDI_ReleaseObj( hbitmap ); - return ERROR_OUTOFMEMORY; - } - } - GDI_ReleaseObj( hbitmap ); - } return dib_driver.pPutImage( NULL, hbitmap, clip, info, bits, src, dst, rop ); } @@ -348,11 +306,12 @@ BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits if (bmp) { + const struct gdi_dc_funcs *funcs = get_bitmap_funcs( bmp ); src.visrect.left = src.x = 0; src.visrect.top = src.y = 0; src.visrect.right = src.width = bmp->bitmap.bmWidth; src.visrect.bottom = src.height = bmp->bitmap.bmHeight; - ret = !bmp->funcs->pGetImage( NULL, hbitmap, info, bits, &src ); + ret = !funcs->pGetImage( NULL, hbitmap, info, bits, &src ); GDI_ReleaseObj( hbitmap ); } return ret; diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index ae9f328..0b67974 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -219,6 +219,13 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_f BITMAPINFO *info = (BITMAPINFO *)buffer; get_ddb_bitmapinfo( bmp, info ); + if (!bmp->bitmap.bmBits) + { + int width_bytes = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); + bmp->bitmap.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + bmp->bitmap.bmHeight * width_bytes ); + if (!bmp->bitmap.bmBits) return FALSE; + } return init_dib_info_from_bitmapinfo( dib, info, bmp->bitmap.bmBits, flags | private_color_table ); }

1 0

Alexandre Julliard : winspool/tests: Allow a different way of specifying the paper size capabilities.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 7a8a56a27c6320c96611495f75f2294ba483df51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8a56a27c6320c96611495f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 20:00:26 2011 +0100 winspool/tests: Allow a different way of specifying the paper size capabilities. --- dlls/winspool.drv/tests/info.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 462f6ef..3f26693 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2841,8 +2841,9 @@ static void test_DeviceCapabilities(void) ok(fields != (DWORD)-1, "DeviceCapabilities DC_FIELDS failed\n"); todo_wine ok(fields == (dm->dmFields | DM_FORMNAME) || + fields == ((dm->dmFields | DM_FORMNAME | DM_PAPERSIZE) & ~(DM_PAPERLENGTH|DM_PAPERWIDTH)) || broken(fields == dm->dmFields), /* Win9x/WinMe */ - "fields %x != (dm->dmFields | DM_FORMNAME) %lx\n", fields, (dm->dmFields | DM_FORMNAME)); + "fields %x, dm->dmFields %x\n", fields, dm->dmFields); GlobalUnlock(prn_dlg.hDevMode); GlobalFree(prn_dlg.hDevMode);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2011