August 2011 - Wine-commits - list.winehq.org

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

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

Andrew Talbot : mscoree: Fix a zero-sized array.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: ee9c02798650ecea1a8cee60feff9677125ec9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee9c02798650ecea1a8cee60f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Aug 30 22:34:51 2011 +0100 mscoree: Fix a zero-sized array. --- dlls/mscoree/corruntimehost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 146dd23..609b73e 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -149,7 +149,7 @@ static void RuntimeHost_DeleteDomain(RuntimeHost *This, MonoDomain *domain) static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *domain, IUnknown **punk) { HRESULT hr; - void *args[0]; + void *args[1]; MonoAssembly *assembly; MonoImage *image; MonoClass *klass;

1 0

Michael Stefaniuc : dsound: Use the same struct for the primary buffer object as for the secondary.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: ffb51208e92041f905447407ac52f1ec2bbabf68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb51208e92041f905447407a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 31 01:11:29 2011 +0200 dsound: Use the same struct for the primary buffer object as for the secondary. --- dlls/dsound/dsound.c | 6 ++-- dlls/dsound/dsound_private.h | 20 ++---------- dlls/dsound/primary.c | 72 ++++++++++++++++++++++++++---------------- dlls/dsound/sound3d.c | 2 +- 4 files changed, 52 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffb51208e92041f905447…

1 0

Michael Stefaniuc : dsound: Don' t delete the primary buffer if a sub iface is still in use.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: c0565143f923f856bb30db06ddef33ac6dd2e9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0565143f923f856bb30db06d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 31 01:13:33 2011 +0200 dsound: Don't delete the primary buffer if a sub iface is still in use. --- dlls/dsound/dsound.c | 7 +++---- dlls/dsound/dsound_private.h | 1 + dlls/dsound/primary.c | 19 +++++++++++++------ dlls/dsound/sound3d.c | 17 ++++++++++------- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index d830c39..1c7b13f 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1558,10 +1558,9 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( device->dsbd.dwFlags |= DSBCAPS_LOCHARDWARE; else device->dsbd.dwFlags |= DSBCAPS_LOCSOFTWARE; hres = primarybuffer_create(device, &(device->primary), &(device->dsbd)); - if (device->primary) { - IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER8)(device->primary)); - *ppdsb = (LPDIRECTSOUNDBUFFER)(device->primary); - } else + if (device->primary) + *ppdsb = (IDirectSoundBuffer*)&device->primary->IDirectSoundBuffer8_iface; + else WARN("primarybuffer_create() failed\n"); } } else { diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index e91fc35..43a800f 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -336,6 +336,7 @@ LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) DECLSPEC_HIDDEN; HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) DECLSPEC_HIDDEN; HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, const DSBUFFERDESC *dsbd) DECLSPEC_HIDDEN; +void primarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; /* duplex.c */ diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index eaca2de..2e0a6a4 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -769,20 +769,26 @@ static ULONG WINAPI PrimaryBufferImpl_AddRef(LPDIRECTSOUNDBUFFER iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); ULONG ref = InterlockedIncrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref - 1); + if(ref == 1) + InterlockedIncrement(&This->numIfaces); return ref; } +void primarybuffer_destroy(IDirectSoundBufferImpl *This) +{ + This->device->primary = NULL; + HeapFree(GetProcessHeap(), 0, This); + TRACE("(%p) released\n", This); +} + static ULONG WINAPI PrimaryBufferImpl_Release(LPDIRECTSOUNDBUFFER iface) { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); DWORD ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); - if (!ref) { - This->device->primary = NULL; - HeapFree(GetProcessHeap(), 0, This); - TRACE("(%p) released\n", This); - } + if (!ref && !InterlockedDecrement(&This->numIfaces)) + primarybuffer_destroy(This); return ref; } @@ -1248,7 +1254,8 @@ HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl * return DSERR_OUTOFMEMORY; } - dsb->ref = 0; + dsb->ref = 1; + dsb->numIfaces = 1; dsb->device = device; dsb->IDirectSoundBuffer8_iface.lpVtbl = (IDirectSoundBuffer8Vtbl *)&dspbvt; diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 0318420..a820c51 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -757,13 +757,9 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_QueryInterface( } if ( IsEqualGUID(riid, &IID_IDirectSoundBuffer) ) { - if (!This->device->primary) - primarybuffer_create(This->device, &This->device->primary, &This->device->dsbd); - if (This->device->primary) { - *ppobj = This->device->primary; - IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER)*ppobj); - return S_OK; - } + *ppobj = &This->device->primary->IDirectSoundBuffer8_iface; + IDirectSoundBuffer8_AddRef(&This->device->primary->IDirectSoundBuffer8_iface); + return S_OK; } FIXME( "Unknown IID %s\n", debugstr_guid( riid ) ); @@ -774,7 +770,12 @@ static ULONG WINAPI IDirectSound3DListenerImpl_AddRef(LPDIRECTSOUND3DLISTENER if { IDirectSound3DListenerImpl *This = (IDirectSound3DListenerImpl *)iface; ULONG ref = InterlockedIncrement(&(This->ref)); + TRACE("(%p) ref was %d\n", This, ref - 1); + + if(ref == 1) + InterlockedIncrement(&This->device->primary->numIfaces); + return ref; } @@ -787,6 +788,8 @@ static ULONG WINAPI IDirectSound3DListenerImpl_Release(LPDIRECTSOUND3DLISTENER i if (!ref) { This->device->listener = 0; HeapFree(GetProcessHeap(), 0, This); + if (!InterlockedDecrement(&This->device->primary->numIfaces)) + primarybuffer_destroy(This->device->primary); TRACE("(%p) released\n", This); } return ref;

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

Michael Stefaniuc : dsound: Move the primary buffer description into the buffer object.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 3747fb74a17fb077a1bb82c9655b8e02b770417e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3747fb74a17fb077a1bb82c96… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 31 01:15:36 2011 +0200 dsound: Move the primary buffer description into the buffer object. --- dlls/dsound/dsound.c | 20 ++++++++++---------- dlls/dsound/dsound_private.h | 1 - dlls/dsound/primary.c | 15 +++++++-------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 1c7b13f..cc27699 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1552,16 +1552,16 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER8)(device->primary)); *ppdsb = (LPDIRECTSOUNDBUFFER)(device->primary); } else { - device->dsbd = *dsbd; - device->dsbd.dwFlags &= ~(DSBCAPS_LOCHARDWARE | DSBCAPS_LOCSOFTWARE); - if (device->hwbuf) - device->dsbd.dwFlags |= DSBCAPS_LOCHARDWARE; - else device->dsbd.dwFlags |= DSBCAPS_LOCSOFTWARE; - hres = primarybuffer_create(device, &(device->primary), &(device->dsbd)); - if (device->primary) - *ppdsb = (IDirectSoundBuffer*)&device->primary->IDirectSoundBuffer8_iface; - else - WARN("primarybuffer_create() failed\n"); + hres = primarybuffer_create(device, &device->primary, dsbd); + if (device->primary) { + *ppdsb = (IDirectSoundBuffer*)&device->primary->IDirectSoundBuffer8_iface; + device->primary->dsbd.dwFlags &= ~(DSBCAPS_LOCHARDWARE | DSBCAPS_LOCSOFTWARE); + if (device->hwbuf) + device->primary->dsbd.dwFlags |= DSBCAPS_LOCHARDWARE; + else + device->primary->dsbd.dwFlags |= DSBCAPS_LOCSOFTWARE; + } else + WARN("primarybuffer_create() failed\n"); } } else { IDirectSoundBufferImpl * dsb; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 43a800f..ed13b71 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -93,7 +93,6 @@ struct DirectSoundDevice RTL_RWLOCK buffer_list_lock; CRITICAL_SECTION mixlock; IDirectSoundBufferImpl *primary; - DSBUFFERDESC dsbd; DWORD speaker_config; LPBYTE tmp_buffer, mix_buffer; DWORD tmp_buffer_len, mix_buffer_len; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 2e0a6a4..b3d1517 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -642,7 +642,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume( HRESULT hres = DS_OK; TRACE("(%p,%d)\n", iface, vol); - if (!(device->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) { + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) { WARN("control unavailable\n"); return DSERR_CONTROLUNAVAIL; } @@ -686,7 +686,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetVolume( DWORD ampfactors; TRACE("(%p,%p)\n", iface, vol); - if (!(device->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) { + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) { WARN("control unavailable\n"); return DSERR_CONTROLUNAVAIL; } @@ -985,7 +985,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan( HRESULT hres = DS_OK; TRACE("(%p,%d)\n", iface, pan); - if (!(device->dsbd.dwFlags & DSBCAPS_CTRLPAN)) { + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLPAN)) { WARN("control unavailable\n"); return DSERR_CONTROLUNAVAIL; } @@ -1032,7 +1032,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetPan( DWORD ampfactors; TRACE("(%p,%p)\n", iface, pan); - if (!(device->dsbd.dwFlags & DSBCAPS_CTRLPAN)) { + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLPAN)) { WARN("control unavailable\n"); return DSERR_CONTROLUNAVAIL; } @@ -1102,7 +1102,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFrequency( return DSERR_INVALIDPARAM; } - if (!(device->dsbd.dwFlags & DSBCAPS_CTRLFREQUENCY)) { + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLFREQUENCY)) { WARN("control unavailable\n"); return DSERR_CONTROLUNAVAIL; } @@ -1138,7 +1138,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCaps( return DSERR_INVALIDPARAM; } - caps->dwFlags = device->dsbd.dwFlags; + caps->dwFlags = This->dsbd.dwFlags; caps->dwBufferBytes = device->buflen; /* Windows reports these as zero */ @@ -1258,8 +1258,7 @@ HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl * dsb->numIfaces = 1; dsb->device = device; dsb->IDirectSoundBuffer8_iface.lpVtbl = (IDirectSoundBuffer8Vtbl *)&dspbvt; - - device->dsbd = *dsbd; + dsb->dsbd = *dsbd; TRACE("Created primary buffer at %p\n", dsb); TRACE("(formattag=0x%04x,chans=%d,samplerate=%d,"

1 0

Alexandre Julliard : gdi32: Forward the null driver GetImage to the DIB driver since the bits are in DIB format .
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: bff79eb2b94789ac1e8b424b2db3c87e26c0799a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff79eb2b94789ac1e8b424b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 15:55:35 2011 +0200 gdi32: Forward the null driver GetImage to the DIB driver since the bits are in DIB format. --- dlls/gdi32/bitmap.c | 46 +++++++++++----------------------------------- dlls/gdi32/dib.c | 16 ++++++++++++++++ dlls/gdi32/dibdrv/dc.c | 9 ++++++++- dlls/gdi32/gdi_private.h | 1 + 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 226f358..9e2cd32 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -54,55 +54,31 @@ DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) { BITMAPOBJ *bmp; - int height, width_bytes; + DWORD ret; if (!hbitmap) return ERROR_NOT_SUPPORTED; if (!(bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return ERROR_INVALID_HANDLE; - 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; - if (bmp->bitmap.bmBitsPixel == 16) + if (bmp->bitmap.bmBits || !bits) { - DWORD *masks = (DWORD *)info->bmiColors; - masks[0] = 0x7c00; - masks[1] = 0x03e0; - masks[2] = 0x001f; - info->bmiHeader.biCompression = BI_BITFIELDS; + ret = dib_driver.pGetImage( 0, hbitmap, info, bits, src ); } - if (!bits) goto done; - - height = src->visrect.bottom - src->visrect.top; - width_bytes = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); - info->bmiHeader.biWidth = bmp->bitmap.bmWidth; - info->bmiHeader.biHeight = -height; - info->bmiHeader.biSizeImage = height * width_bytes; + 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 ); + /* make the source rectangle relative to the returned bits */ + src->y -= src->visrect.top; + offset_rect( &src->visrect, 0, -src->visrect.top ); - if (bmp->bitmap.bmBits) - { - bits->ptr = (char *)bmp->bitmap.bmBits + src->visrect.top * width_bytes; - bits->is_copy = FALSE; - bits->free = NULL; - } - else - { /* return all-zero bits */ bits->ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage ); bits->is_copy = TRUE; bits->free = free_heap_bits; } -done: GDI_ReleaseObj( hbitmap ); - return ERROR_SUCCESS; + return ret; } DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 7ab2982..78dbd14 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -895,6 +895,22 @@ static void fill_default_color_table( BITMAPINFO *info ) } } +void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) +{ + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biWidth = bmp->bitmap.bmWidth; + info->bmiHeader.biHeight = -bmp->bitmap.bmHeight; + 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; + if (info->bmiHeader.biBitCount <= 8) fill_default_color_table( info ); +} + + /****************************************************************************** * GetDIBits [GDI32.@] * diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 245e7c7..7caea01 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -213,7 +213,14 @@ BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void * BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) { - assert(bmp->dib); + if (!bmp->dib) + { + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + 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( dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, flags ); } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2189040..1b855ca 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -308,6 +308,7 @@ extern BOOL BIDI_Reorder( HDC hDC, LPCWSTR lpString, INT uCount, DWORD dwFlags, LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs, INT* cGlyphs ) DECLSPEC_HIDDEN; /* bitmap.c */ +extern void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) DECLSPEC_HIDDEN; extern BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Forward the null driver PutImage to the DIB driver since the bits are in DIB format .
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 6f066ec18a07dea56cf0f544514e5361c434110b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f066ec18a07dea56cf0f5445… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 30 20:48:51 2011 +0200 gdi32: Forward the null driver PutImage to the DIB driver since the bits are in DIB format. --- dlls/gdi32/bitmap.c | 68 ++++++-------------------------------------- dlls/gdi32/mfdrv/objects.c | 1 + 2 files changed, 10 insertions(+), 59 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 9e2cd32..5790248 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -88,73 +88,23 @@ DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *inf BITMAPOBJ *bmp; if (!hbitmap) return ERROR_SUCCESS; - if (!(bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return ERROR_INVALID_HANDLE; - - if (info->bmiHeader.biPlanes != 1) goto update_format; - if (info->bmiHeader.biBitCount != bmp->bitmap.bmBitsPixel) goto update_format; - /* FIXME: check color masks */ if (bits) { - int i, width_bytes = get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); - unsigned char *dst_bits, *src_bits; - - if ((src->width != dst->width) || (src->height != dst->height)) - { - GDI_ReleaseObj( hbitmap ); - return ERROR_TRANSFORM_NOT_SUPPORTED; - } - if (src->visrect.left > 0 || src->visrect.right < bmp->bitmap.bmWidth || - dst->visrect.left > 0 || dst->visrect.right < bmp->bitmap.bmWidth) - { - FIXME( "setting partial rows not supported\n" ); - GDI_ReleaseObj( hbitmap ); - return ERROR_NOT_SUPPORTED; - } - if (clip) - { - FIXME( "clip region not supported\n" ); - GDI_ReleaseObj( hbitmap ); - return ERROR_NOT_SUPPORTED; - } - - if (!bmp->bitmap.bmBits && - !(bmp->bitmap.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - bmp->bitmap.bmHeight * width_bytes ))) + if (!(bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return ERROR_INVALID_HANDLE; + if (!bmp->bitmap.bmBits) { - GDI_ReleaseObj( hbitmap ); - return ERROR_OUTOFMEMORY; - } - dst_bits = (unsigned char *)bmp->bitmap.bmBits + dst->visrect.top * width_bytes; - src_bits = bits->ptr; - if (info->bmiHeader.biHeight > 0) - { - src_bits += (info->bmiHeader.biHeight - 1 - src->visrect.top) * width_bytes; - width_bytes = -width_bytes; - } - else - src_bits += src->visrect.top * width_bytes; - - if (width_bytes != bmp->bitmap.bmWidthBytes) - { - for (i = 0; i < dst->visrect.bottom - dst->visrect.top; i++) + 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 ))) { - memcpy( dst_bits, src_bits, bmp->bitmap.bmWidthBytes ); - src_bits += width_bytes; - dst_bits += abs(width_bytes); + GDI_ReleaseObj( hbitmap ); + return ERROR_OUTOFMEMORY; } } - else memcpy( dst_bits, src_bits, width_bytes * (dst->visrect.bottom - dst->visrect.top) ); + GDI_ReleaseObj( hbitmap ); } - GDI_ReleaseObj( hbitmap ); - return ERROR_SUCCESS; - -update_format: - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; - if (info->bmiHeader.biHeight > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; - GDI_ReleaseObj( hbitmap ); - return ERROR_BAD_FORMAT; + return dib_driver.pPutImage( NULL, hbitmap, clip, info, bits, src, dst, rop ); } diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index 674e7e1..7a5039d 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -202,6 +202,7 @@ INT16 MFDRV_CreateBrushIndirect(PHYSDEV dev, HBRUSH hBrush ) mr->rdParm[1] = DIB_RGB_COLORS; dst_info = (BITMAPINFO *)(mr->rdParm + 2); dst_info->bmiHeader = src_info->bmiHeader; + dst_info->bmiHeader.biClrUsed = 0; cref = GetTextColor( dev->hdc ); dst_info->bmiColors[0].rgbRed = GetRValue(cref); dst_info->bmiColors[0].rgbGreen = GetGValue(cref);

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