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

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

Aug. 31, 2011

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

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

Aug. 31, 2011

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 Aug. 31, 2011

Aug. 31, 2011

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 Aug. 31, 2011

Aug. 31, 2011

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

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

Aug. 31, 2011

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: Make the device parameter to wined3d_device_get_stream_source() const.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

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

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

Aug. 31, 2011

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

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

Aug. 31, 2011

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: Forward the null driver PutImage to the DIB driver since the bits are in DIB format .
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

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 Aug. 31, 2011

Aug. 31, 2011

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