wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

André Hentschel : winevdm: Use mangled short path names for DOSBox.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: f9c6b4ba406d302a631c27994ee7ad81986deb6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c6b4ba406d302a631c27994… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 30 21:20:24 2011 +0200 winevdm: Use mangled short path names for DOSBox. --- programs/winevdm/winevdm.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index affac51..7950985 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -154,7 +154,7 @@ static void start_dosbox( const char *appname, const char *args ) const char *config_dir = wine_get_config_dir(); WCHAR path[MAX_PATH], config[MAX_PATH]; HANDLE file; - char *p, *buffer; + char *p, *buffer, app[MAX_PATH]; int i; int ret = 1; DWORD written, drives = GetLogicalDrives(); @@ -164,6 +164,8 @@ static void start_dosbox( const char *appname, const char *args ) if (!GetTempPathW( MAX_PATH, path )) return; if (!GetTempFileNameW( path, cfgW, 0, config )) return; if (!GetCurrentDirectoryW( MAX_PATH, path )) return; + if (!GetShortPathNameA( appname, app, MAX_PATH )) return; + if (!GetShortPathNameW( path, path, MAX_PATH )) return; file = CreateFileW( config, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); if (file == INVALID_HANDLE_VALUE) return; @@ -171,7 +173,7 @@ static void start_dosbox( const char *appname, const char *args ) sizeof("mount -z c") + sizeof("config -securemode") + 25 * (strlen(config_dir) + sizeof("mount c /dosdevices/c:")) + 4 * strlenW( path ) + - 6 + strlen( appname ) + strlen( args ) + 20 ); + 6 + strlen( app ) + strlen( args ) + 20 ); p = buffer; p += sprintf( p, "[autoexec]\n" ); for (i = 25; i >= 0; i--) @@ -186,7 +188,7 @@ static void start_dosbox( const char *appname, const char *args ) p += sprintf( p, "%c:\ncd ", path[0] ); p += WideCharToMultiByte( CP_UNIXCP, 0, path + 2, -1, p, 4 * strlenW(path), NULL, NULL ) - 1; p += sprintf( p, "\nconfig -securemode\n" ); - p += sprintf( p, "%s %s\n", appname, args ); + p += sprintf( p, "%s %s\n", app, args ); p += sprintf( p, "exit\n" ); if (WriteFile( file, buffer, strlen(buffer), &written, NULL ) && written == strlen(buffer)) {

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_stream_source_freq() const .
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 124cdf913a538dc65477cfd99fd4800ca8c6a66a URL: http://source.winehq.org/git/wine.git/?a=commit;h=124cdf913a538dc65477cfd99… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 20:12:35 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_stream_source_freq() const. --- dlls/wined3d/device.c | 3 ++- include/wine/wined3d.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 792521a..ba68866 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1839,7 +1839,8 @@ HRESULT CDECL wined3d_device_set_stream_source_freq(struct wined3d_device *devic return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT *divider) +HRESULT CDECL wined3d_device_get_stream_source_freq(const struct wined3d_device *device, + UINT stream_idx, UINT *divider) { struct wined3d_stream_state *stream; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a523785..a038260 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2248,7 +2248,8 @@ HRESULT __cdecl wined3d_device_get_scissor_rect(struct wined3d_device *device, R 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); -HRESULT __cdecl wined3d_device_get_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT *divider); +HRESULT __cdecl wined3d_device_get_stream_source_freq(const struct wined3d_device *device, + UINT stream_idx, UINT *divider); HRESULT __cdecl wined3d_device_get_surface_from_dc(struct wined3d_device *device, HDC dc, struct wined3d_surface **surface); HRESULT __cdecl wined3d_device_get_swapchain(const struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_stream_source() const.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: cfbecf938016f04a8d32ad2769a38a418a8b127d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfbecf938016f04a8d32ad276… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 20:12:34 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_stream_source() 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 82dcd65..792521a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1775,7 +1775,7 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_stream_source(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) { struct wined3d_stream_state *stream; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c609637..a523785 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2246,7 +2246,7 @@ HRESULT __cdecl wined3d_device_get_sampler_state(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); -HRESULT __cdecl wined3d_device_get_stream_source(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); HRESULT __cdecl wined3d_device_get_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT *divider); HRESULT __cdecl wined3d_device_get_surface_from_dc(struct wined3d_device *device,

1 0

Henri Verbeet : ddraw: Get rid of the ImplType fields in IDirectDrawImpl and IDirectDrawSurfaceImpl .
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 43ad90ce3167ba6345698b67eb04afef87c63d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ad90ce3167ba6345698b67e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 20:12:33 2011 +0200 ddraw: Get rid of the ImplType fields in IDirectDrawImpl and IDirectDrawSurfaceImpl. --- dlls/ddraw/ddraw.c | 25 +++++++++---------------- dlls/ddraw/ddraw_private.h | 6 +----- dlls/ddraw/surface.c | 5 ++--- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 14e245b..973ec29 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -206,7 +206,7 @@ static HRESULT WINAPI ddraw7_QueryInterface(IDirectDraw7 *iface, REFIID refiid, IsEqualGUID( &IID_IDirect3D7 , refiid ) ) { /* Check the surface implementation */ - if (This->ImplType != SURFACE_OPENGL) + if (DefaultSurfaceType != SURFACE_OPENGL) { WARN("The app requests a Direct3D interface, but non-opengl surfaces where set in winecfg\n"); /* Do not abort here, only reject 3D Device creation */ @@ -1378,7 +1378,6 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes DWORD count = 0, i, outsize; HRESULT hr; WINED3DDISPLAYMODE d3ddm; - WINED3DSURFTYPE type = This->ImplType; TRACE("iface %p, codes_count %p, codes %p.\n", iface, NumCodes, Codes); @@ -1389,7 +1388,7 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); ++i) { hr = wined3d_check_device_format(This->wineD3D, WINED3DADAPTER_DEFAULT, WINED3DDEVTYPE_HAL, - d3ddm.Format, 0, WINED3DRTYPE_SURFACE, formats[i], type); + d3ddm.Format, 0, WINED3DRTYPE_SURFACE, formats[i], DefaultSurfaceType); if (SUCCEEDED(hr)) { if (count < outsize) @@ -2600,7 +2599,6 @@ static HRESULT WINAPI ddraw7_StartModeTest(IDirectDraw7 *iface, SIZE *Modes, DWO static HRESULT ddraw_create_surface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD, IDirectDrawSurfaceImpl **ppSurf, UINT level, UINT version) { - WINED3DSURFTYPE ImplType = This->ImplType; HRESULT hr; TRACE("ddraw %p, surface_desc %p, surface %p, level %u.\n", @@ -2612,7 +2610,7 @@ static HRESULT ddraw_create_surface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD DDRAW_dump_surface_desc(pDDSD); } - if ((pDDSD->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) && This->ImplType != SURFACE_OPENGL) + if ((pDDSD->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) && DefaultSurfaceType != SURFACE_OPENGL) { WARN("The application requests a 3D capable surface, but a non-OpenGL surface type was set in the registry.\n"); /* Do not fail surface creation, only fail 3D device creation. */ @@ -2626,7 +2624,7 @@ static HRESULT ddraw_create_surface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD return DDERR_OUTOFVIDEOMEMORY; } - hr = ddraw_surface_init(*ppSurf, This, pDDSD, level, ImplType, version); + hr = ddraw_surface_init(*ppSurf, This, pDDSD, level, version); if (FAILED(hr)) { WARN("Failed to initialize surface, hr %#x.\n", hr); @@ -3248,10 +3246,9 @@ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, * 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( (ddraw->ImplType == SURFACE_OPENGL) && !(ddraw->d3d_initialized) && - desc2.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE) ) + * 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; @@ -4695,7 +4692,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, *device = NULL; /* Fail device creation if non-opengl surfaces are used. */ - if (This->ImplType != SURFACE_OPENGL) + if (DefaultSurfaceType != SURFACE_OPENGL) { ERR("The application wants to create a Direct3D device, but non-opengl surfaces are set in the registry.\n"); ERR("Please set the surface implementation to opengl or autodetection to allow 3D rendering.\n"); @@ -5799,7 +5796,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent TRACE("device_parent %p, present_parameters %p, swapchain %p.\n", device_parent, present_parameters, swapchain); hr = wined3d_swapchain_create(ddraw->wined3d_device, present_parameters, - ddraw->ImplType, NULL, &ddraw_null_wined3d_parent_ops, swapchain); + DefaultSurfaceType, NULL, &ddraw_null_wined3d_parent_ops, swapchain); if (FAILED(hr)) { WARN("Failed to create swapchain, hr %#x.\n", hr); @@ -5846,10 +5843,6 @@ HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) ddraw->numIfaces = 1; ddraw->ref7 = 1; - /* See comments in IDirectDrawImpl_CreateNewSurface for a description of - * this field. */ - ddraw->ImplType = DefaultSurfaceType; - /* Get the current screen settings. */ hDC = GetDC(0); ddraw->orig_bpp = GetDeviceCaps(hDC, BITSPIXEL) * GetDeviceCaps(hDC, PLANES); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index d8a8eb8..e03ab19 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -111,9 +111,6 @@ struct IDirectDrawImpl HWND devicewindow; HWND dest_window; - /* The surface type to request */ - WINED3DSURFTYPE ImplType; - /* Helpers for surface creation */ IDirectDrawSurfaceImpl *tex_root; BOOL depthstencil; @@ -194,7 +191,6 @@ struct IDirectDrawSurfaceImpl /* Misc things */ DWORD uniqueness_value; UINT mipmap_level; - WINED3DSURFTYPE ImplType; /* For D3DDevice creation */ BOOL isRenderTarget; @@ -211,7 +207,7 @@ struct IDirectDrawSurfaceImpl HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) DECLSPEC_HIDDEN; void ddraw_surface_destroy(IDirectDrawSurfaceImpl *surface) DECLSPEC_HIDDEN; HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddraw, - DDSURFACEDESC2 *desc, UINT mip_level, WINED3DSURFTYPE surface_type, UINT version) DECLSPEC_HIDDEN; + DDSURFACEDESC2 *desc, UINT mip_level, UINT version) DECLSPEC_HIDDEN; ULONG ddraw_surface_release_iface(IDirectDrawSurfaceImpl *This) DECLSPEC_HIDDEN; static inline IDirectDrawSurfaceImpl *impl_from_IDirect3DTexture(IDirect3DTexture *iface) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 7fb9323..6a2ecad 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5085,7 +5085,7 @@ HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) } HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddraw, - DDSURFACEDESC2 *desc, UINT mip_level, WINED3DSURFTYPE surface_type, UINT version) + DDSURFACEDESC2 *desc, UINT mip_level, UINT version) { WINED3DPOOL pool = WINED3DPOOL_DEFAULT; enum wined3d_format_id format; @@ -5176,11 +5176,10 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr copy_to_surfacedesc2(&surface->surface_desc, desc); surface->first_attached = surface; - surface->ImplType = surface_type; hr = wined3d_surface_create(ddraw->wined3d_device, desc->dwWidth, desc->dwHeight, format, TRUE /* Lockable */, FALSE /* Discard */, mip_level, usage, pool, - WINED3DMULTISAMPLE_NONE, 0 /* MultiSampleQuality */, surface_type, surface, + WINED3DMULTISAMPLE_NONE, 0 /* MultiSampleQuality */, DefaultSurfaceType, surface, &ddraw_surface_wined3d_parent_ops, &surface->wined3d_surface); if (FAILED(hr)) {

1 0

Henri Verbeet : ddraw: Get rid of the surface implementation switching code .
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: c89a3ffe806278fa99cff7e3e27c3845c581315e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c89a3ffe806278fa99cff7e3e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 20:12:32 2011 +0200 ddraw: Get rid of the surface implementation switching code. --- dlls/ddraw/ddraw.c | 179 +-------------------------------------------- dlls/ddraw/surface.c | 25 ------- dlls/wined3d/swapchain.c | 4 +- include/wine/wined3d.h | 1 - 4 files changed, 6 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c89a3ffe806278fa99cff…

1 0

Henri Verbeet : ddraw: Make the OpenGL renderer the default one.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 94ae743ea668e49d40ae4e2dc5fe1f5d9be018cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ae743ea668e49d40ae4e2dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 20:12:31 2011 +0200 ddraw: Make the OpenGL renderer the default one. --- dlls/ddraw/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 37a125d..38f4814 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); /* The configured default surface */ -WINED3DSURFTYPE DefaultSurfaceType = SURFACE_UNKNOWN; +WINED3DSURFTYPE DefaultSurfaceType = SURFACE_OPENGL; /* DDraw list and critical section */ static struct list global_ddraw_list = LIST_INIT(global_ddraw_list);

1 0

Henri Verbeet : wined3d: Use the resource size for copying between a surface's DIB and PBO.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: dd462052c62c3bca78dc51f6bcaa91dec0dfa59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd462052c62c3bca78dc51f6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 21:20:40 2011 +0200 wined3d: Use the resource size for copying between a surface's DIB and PBO. --- dlls/wined3d/surface.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ed047f2..48a5038 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1052,7 +1052,7 @@ static HRESULT surface_getdc(struct wined3d_surface *surface) /* Sync the DIB with the PBO. This can't be done earlier because Map() * activates the allocatedMemory. */ if (surface->flags & SFLAG_PBO) - memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, surface->dib.bitmap_size); + memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, surface->resource.size); return hr; } @@ -3813,11 +3813,9 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) return WINEDDERR_NODC; } + /* Copy the contents of the DIB over to the PBO. */ if ((surface->flags & SFLAG_PBO) && surface->resource.allocatedMemory) - { - /* Copy the contents of the DIB over to the PBO. */ - memcpy(surface->resource.allocatedMemory, surface->dib.bitmap_data, surface->dib.bitmap_size); - } + memcpy(surface->resource.allocatedMemory, surface->dib.bitmap_data, surface->resource.size); /* We locked first, so unlock now. */ wined3d_surface_unmap(surface);

1 0

Alexandre Julliard : gdi32: Use SetDIBits to set the initial bits of a DDB.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: e7c523b135a8e36c22df34e518690e134db27448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c523b135a8e36c22df34e51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 30 21:26:02 2011 +0200 gdi32: Use SetDIBits to set the initial bits of a DDB. --- dlls/gdi32/bitmap.c | 44 +++----------------------------------------- 1 files changed, 3 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 5790248..3a4caca 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -609,52 +609,14 @@ static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; - DWORD err; - int width_bytes; - struct bitblt_coords src, dst; - struct gdi_image_bits bits; if (!bmp->bitmap.bmBits) return; if (bmp->funcs->pPutImage == nulldrv_PutImage) return; - width_bytes = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); - - 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; - dst = src; - - bits.ptr = bmp->bitmap.bmBits; - bits.is_copy = TRUE; - bits.free = free_heap_bits; + get_ddb_bitmapinfo( bmp, info ); + SetDIBits( 0, hbitmap, 0, bmp->bitmap.bmHeight, bmp->bitmap.bmBits, info, DIB_RGB_COLORS ); + HeapFree( GetProcessHeap(), 0, bmp->bitmap.bmBits ); bmp->bitmap.bmBits = NULL; - - /* query the color info */ - info->bmiHeader.biSize = sizeof(info->bmiHeader); - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; - info->bmiHeader.biCompression = BI_RGB; - info->bmiHeader.biXPelsPerMeter = 0; - info->bmiHeader.biYPelsPerMeter = 0; - info->bmiHeader.biClrUsed = 0; - info->bmiHeader.biClrImportant = 0; - info->bmiHeader.biWidth = 0; - info->bmiHeader.biHeight = 0; - info->bmiHeader.biSizeImage = 0; - err = bmp->funcs->pPutImage( NULL, hbitmap, 0, info, NULL, NULL, NULL, SRCCOPY ); - - if (!err || err == ERROR_BAD_FORMAT) - { - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; - info->bmiHeader.biWidth = bmp->bitmap.bmWidth; - info->bmiHeader.biHeight = -dst.height; - info->bmiHeader.biSizeImage = dst.height * width_bytes; - bmp->funcs->pPutImage( NULL, hbitmap, 0, info, &bits, &src, &dst, SRCCOPY ); - } - - if (bits.free) bits.free( &bits ); } /***********************************************************************

1 0

Alexandre Julliard : gdi32: Only use the hdc parameter in SetDIBits when needed.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 5f35075c8be21f46d5c73d782d2aa7435f5d576f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f35075c8be21f46d5c73d782… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 30 21:13:55 2011 +0200 gdi32: Only use the hdc parameter in SetDIBits when needed. --- dlls/gdi32/dib.c | 33 +++++++-------------------------- 1 files changed, 7 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 978119a..a2e9b5e 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -207,15 +207,17 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * return TRUE; } -static int fill_color_table_from_palette( BITMAPINFO *info, DC *dc ) +static int fill_color_table_from_palette( BITMAPINFO *info, HDC hdc ) { PALETTEENTRY palEntry[256]; + HPALETTE palette = GetCurrentObject( hdc, OBJ_PAL ); int i, colors = get_dib_num_of_colors( info ); + if (!palette) return 0; if (!colors) return 0; memset( palEntry, 0, sizeof(palEntry) ); - if (!GetPaletteEntries( dc->hPalette, 0, colors, palEntry )) + if (!GetPaletteEntries( palette, 0, colors, palEntry )) return 0; for (i = 0; i < colors; i++) @@ -498,8 +500,6 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) { - DC *dc = get_dc_ptr( hdc ); - BOOL delete_hdc = FALSE; BITMAPOBJ *bitmap; char src_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *src_info = (BITMAPINFO *)src_bmibuf; @@ -524,26 +524,9 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, src_bits.free = NULL; src_bits.param = NULL; - if (coloruse == DIB_RGB_COLORS && !dc) - { - hdc = CreateCompatibleDC(0); - dc = get_dc_ptr( hdc ); - delete_hdc = TRUE; - } + if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_palette( src_info, hdc )) return 0; - if (!dc) return 0; - - update_dc( dc ); - - if (!(bitmap = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) - { - release_dc_ptr( dc ); - if (delete_hdc) DeleteDC(hdc); - return 0; - } - - if (coloruse == DIB_PAL_COLORS) - if (!fill_color_table_from_palette( src_info, dc )) goto done; + if (!(bitmap = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return 0; if (src_info->bmiHeader.biCompression == BI_RLE4 || src_info->bmiHeader.biCompression == BI_RLE8) { @@ -623,8 +606,6 @@ done: if (src_bits.free) src_bits.free( &src_bits ); if (clip) DeleteObject( clip ); GDI_ReleaseObj( hbitmap ); - release_dc_ptr( dc ); - if (delete_hdc) DeleteDC(hdc); return result; } @@ -1104,7 +1085,7 @@ INT WINAPI GetDIBits( { if( coloruse == DIB_PAL_COLORS ) { - if (!fill_color_table_from_palette( dst_info, dc )) goto done; + if (!fill_color_table_from_palette( dst_info, hdc )) goto done; } else {

1 0

Alexandre Julliard : gdi32: Allow SetDIBits to use the null driver.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: edb48a06eea5faf15ff7b2b40b859c25e9fd2573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb48a06eea5faf15ff7b2b40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 30 21:06:43 2011 +0200 gdi32: Allow SetDIBits to use the null driver. --- dlls/gdi32/dib.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 78dbd14..978119a 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -500,7 +500,6 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, { DC *dc = get_dc_ptr( hdc ); BOOL delete_hdc = FALSE; - PHYSDEV physdev; BITMAPOBJ *bitmap; char src_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *src_info = (BITMAPINFO *)src_bmibuf; @@ -578,11 +577,6 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, if (lines < src.visrect.bottom) src.visrect.bottom = lines; } - /* Hack to ensure we don't get the nulldrv if the bmp hasn't been selected - into a dc yet */ - physdev = GET_DC_PHYSDEV( dc, pCreateBitmap ); - if (!BITMAP_SetOwnerDC( hbitmap, physdev )) goto done; - funcs = get_bitmap_funcs( bitmap ); result = lines;

1 0

← Newer
1
2
3
4
5
6
7
8
...
77
Older →

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 August 2011