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

Henri Verbeet : wined3d: Get rid of IWineD3DTextureImpl.
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: 2d4bce87ba4db01ec75c6cbf4a7d7012ec08dd86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4bce87ba4db01ec75c6cbf4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 16 18:58:02 2011 +0100 wined3d: Get rid of IWineD3DTextureImpl. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/texture.c | 34 +++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 12 ++---------- 3 files changed, 21 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e8bcf9e..972aaa5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1104,7 +1104,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, void *parent, const struct wined3d_parent_ops *parent_ops, IWineD3DBaseTexture **texture) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DTextureImpl *object; + IWineD3DBaseTextureImpl *object; HRESULT hr; TRACE("(%p) : Width %d, Height %d, Levels %d, Usage %#x\n", This, Width, Height, Levels, Usage); @@ -4472,7 +4472,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, } /* SetTexture isn't allowed on textures in WINED3DPOOL_SCRATCH */ - if (texture && ((IWineD3DTextureImpl *)texture)->resource.pool == WINED3DPOOL_SCRATCH) + if (texture && ((IWineD3DBaseTextureImpl *)texture)->resource.pool == WINED3DPOOL_SCRATCH) { WARN("Rejecting attempt to set scratch texture.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 224ed48..4bc018c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -191,7 +191,7 @@ static const struct wined3d_resource_ops texture_resource_ops = texture_unload, }; -static void texture_cleanup(IWineD3DTextureImpl *This) +static void texture_cleanup(IWineD3DBaseTextureImpl *This) { unsigned int i; @@ -221,7 +221,7 @@ static void texture_cleanup(IWineD3DTextureImpl *This) static HRESULT WINAPI IWineD3DTextureImpl_QueryInterface(IWineD3DBaseTexture *iface, REFIID riid, LPVOID *ppobj) { - IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; + IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IWineD3DBase) @@ -238,7 +238,7 @@ static HRESULT WINAPI IWineD3DTextureImpl_QueryInterface(IWineD3DBaseTexture *if static ULONG WINAPI IWineD3DTextureImpl_AddRef(IWineD3DBaseTexture *iface) { - IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; + IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; TRACE("(%p) : AddRef increasing from %d\n", This, This->resource.ref); return InterlockedIncrement(&This->resource.ref); } @@ -246,7 +246,7 @@ static ULONG WINAPI IWineD3DTextureImpl_AddRef(IWineD3DBaseTexture *iface) /* Do not call while under the GL lock. */ static ULONG WINAPI IWineD3DTextureImpl_Release(IWineD3DBaseTexture *iface) { - IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; + IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; ULONG ref; TRACE("(%p) : Releasing from %d\n", This, This->resource.ref); ref = InterlockedDecrement(&This->resource.ref); @@ -262,28 +262,28 @@ static ULONG WINAPI IWineD3DTextureImpl_Release(IWineD3DBaseTexture *iface) static HRESULT WINAPI IWineD3DTextureImpl_SetPrivateData(IWineD3DBaseTexture *iface, REFGUID riid, const void *data, DWORD data_size, DWORD flags) { - return resource_set_private_data(&((IWineD3DTextureImpl *)iface)->resource, riid, data, data_size, flags); + return resource_set_private_data(&((IWineD3DBaseTextureImpl *)iface)->resource, riid, data, data_size, flags); } static HRESULT WINAPI IWineD3DTextureImpl_GetPrivateData(IWineD3DBaseTexture *iface, REFGUID guid, void *data, DWORD *data_size) { - return resource_get_private_data(&((IWineD3DTextureImpl *)iface)->resource, guid, data, data_size); + return resource_get_private_data(&((IWineD3DBaseTextureImpl *)iface)->resource, guid, data, data_size); } static HRESULT WINAPI IWineD3DTextureImpl_FreePrivateData(IWineD3DBaseTexture *iface, REFGUID refguid) { - return resource_free_private_data(&((IWineD3DTextureImpl *)iface)->resource, refguid); + return resource_free_private_data(&((IWineD3DBaseTextureImpl *)iface)->resource, refguid); } static DWORD WINAPI IWineD3DTextureImpl_SetPriority(IWineD3DBaseTexture *iface, DWORD priority) { - return resource_set_priority(&((IWineD3DTextureImpl *)iface)->resource, priority); + return resource_set_priority(&((IWineD3DBaseTextureImpl *)iface)->resource, priority); } static DWORD WINAPI IWineD3DTextureImpl_GetPriority(IWineD3DBaseTexture *iface) { - return resource_get_priority(&((IWineD3DTextureImpl *)iface)->resource); + return resource_get_priority(&((IWineD3DBaseTextureImpl *)iface)->resource); } /* Do not call while under the GL lock. */ @@ -294,14 +294,14 @@ static void WINAPI IWineD3DTextureImpl_PreLoad(IWineD3DBaseTexture *iface) static WINED3DRESOURCETYPE WINAPI IWineD3DTextureImpl_GetType(IWineD3DBaseTexture *iface) { - return resource_get_type(&((IWineD3DTextureImpl *)iface)->resource); + return resource_get_type(&((IWineD3DBaseTextureImpl *)iface)->resource); } static void * WINAPI IWineD3DTextureImpl_GetParent(IWineD3DBaseTexture *iface) { TRACE("iface %p.\n", iface); - return ((IWineD3DTextureImpl *)iface)->resource.parent; + return ((IWineD3DBaseTextureImpl *)iface)->resource.parent; } static DWORD WINAPI IWineD3DTextureImpl_SetLOD(IWineD3DBaseTexture *iface, DWORD LODNew) @@ -337,10 +337,10 @@ static void WINAPI IWineD3DTextureImpl_GenerateMipSubLevels(IWineD3DBaseTexture static BOOL WINAPI IWineD3DTextureImpl_IsCondNP2(IWineD3DBaseTexture *iface) { - IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; + IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; TRACE("(%p)\n", This); - return This->cond_np2; + return This->baseTexture.cond_np2; } static struct wined3d_resource * WINAPI IWineD3DTextureImpl_GetSubResource(IWineD3DBaseTexture *iface, @@ -400,7 +400,7 @@ static const IWineD3DBaseTextureVtbl IWineD3DTexture_Vtbl = IWineD3DTextureImpl_AddDirtyRegion, }; -HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT levels, +HRESULT texture_init(IWineD3DBaseTextureImpl *texture, UINT width, UINT height, UINT levels, IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) { @@ -488,7 +488,7 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT texture->baseTexture.pow2Matrix[10] = 1.0f; texture->baseTexture.pow2Matrix[15] = 1.0f; texture->baseTexture.target = GL_TEXTURE_2D; - texture->cond_np2 = TRUE; + texture->baseTexture.cond_np2 = TRUE; texture->baseTexture.minMipLookup = minMipLookup_noFilter; } else if (gl_info->supported[ARB_TEXTURE_RECTANGLE] && (width != pow2_width || height != pow2_height) @@ -502,7 +502,7 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT texture->baseTexture.pow2Matrix[10] = 1.0f; texture->baseTexture.pow2Matrix[15] = 1.0f; texture->baseTexture.target = GL_TEXTURE_RECTANGLE_ARB; - texture->cond_np2 = TRUE; + texture->baseTexture.cond_np2 = TRUE; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) { @@ -530,7 +530,7 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT texture->baseTexture.pow2Matrix[10] = 1.0f; texture->baseTexture.pow2Matrix[15] = 1.0f; texture->baseTexture.target = GL_TEXTURE_2D; - texture->cond_np2 = FALSE; + texture->baseTexture.cond_np2 = FALSE; } TRACE("xf(%f) yf(%f)\n", texture->baseTexture.pow2Matrix[0], texture->baseTexture.pow2Matrix[5]); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 731f274..ca113d1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1904,6 +1904,7 @@ typedef struct IWineD3DBaseTextureClass DWORD sampler; BOOL is_srgb; BOOL pow2Matrix_identity; + BOOL cond_np2; const struct min_lookup *minMipLookup; const GLenum *magLookup; GLenum target; @@ -1953,16 +1954,7 @@ void basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) DECLSPE DWORD basetexture_set_lod(IWineD3DBaseTextureImpl *texture, DWORD lod) DECLSPEC_HIDDEN; void basetexture_unload(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; -typedef struct IWineD3DTextureImpl -{ - const IWineD3DBaseTextureVtbl *lpVtbl; - struct wined3d_resource resource; - IWineD3DBaseTextureClass baseTexture; - BOOL cond_np2; - -} IWineD3DTextureImpl; - -HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT levels, +HRESULT texture_init(IWineD3DBaseTextureImpl *texture, UINT width, UINT height, UINT levels, IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Add a null driver entry point for GetDeviceCaps .
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: 31e6f4bc0d8aa9daa761e86c64edeadb86808107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31e6f4bc0d8aa9daa761e86c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 16 22:04:51 2011 +0100 gdi32: Add a null driver entry point for GetDeviceCaps. --- dlls/gdi32/dc.c | 22 ++-------------------- dlls/gdi32/driver.c | 24 +++++++++++++++++++++++- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 8633d0b..48b2f78 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -898,26 +898,8 @@ INT WINAPI GetDeviceCaps( HDC hdc, INT cap ) if ((dc = get_dc_ptr( hdc ))) { - if (dc->funcs->pGetDeviceCaps) ret = dc->funcs->pGetDeviceCaps( dc->physDev, cap ); - else switch(cap) /* return meaningful values for some entries */ - { - case HORZRES: ret = 640; break; - case VERTRES: ret = 480; break; - case BITSPIXEL: ret = 1; break; - case PLANES: ret = 1; break; - case NUMCOLORS: ret = 2; break; - case ASPECTX: ret = 36; break; - case ASPECTY: ret = 36; break; - case ASPECTXY: ret = 51; break; - case LOGPIXELSX: ret = 72; break; - case LOGPIXELSY: ret = 72; break; - case SIZEPALETTE: ret = 2; break; - case TEXTCAPS: - ret = (TC_OP_CHARACTER | TC_OP_STROKE | TC_CP_STROKE | - TC_CR_ANY | TC_SF_X_YINDEP | TC_SA_DOUBLE | TC_SA_INTEGER | - TC_SA_CONTIN | TC_UA_ABLE | TC_SO_ABLE | TC_RA_ABLE | TC_VA_ABLE); - break; - } + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetDeviceCaps ); + ret = physdev->funcs->pGetDeviceCaps( physdev, cap ); release_dc_ptr( dc ); } return ret; diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 4b7a165..8139e15 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -440,6 +440,28 @@ static BOOL CDECL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT return FALSE; } +static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) +{ + switch (cap) /* return meaningful values for some entries */ + { + case HORZRES: return 640; + case VERTRES: return 480; + case BITSPIXEL: return 1; + case PLANES: return 1; + case NUMCOLORS: return 2; + case ASPECTX: return 36; + case ASPECTY: return 36; + case ASPECTXY: return 51; + case LOGPIXELSX: return 72; + case LOGPIXELSY: return 72; + case SIZEPALETTE: return 2; + case TEXTCAPS: return (TC_OP_CHARACTER | TC_OP_STROKE | TC_CP_STROKE | + TC_CR_ANY | TC_SF_X_YINDEP | TC_SA_DOUBLE | TC_SA_INTEGER | + TC_SA_CONTIN | TC_UA_ABLE | TC_SO_ABLE | TC_RA_ABLE | TC_VA_ABLE); + default: return 0; + } +} + static BOOL CDECL nulldrv_GetDeviceGammaRamp( PHYSDEV dev, void *ramp ) { return FALSE; @@ -794,7 +816,7 @@ const DC_FUNCTIONS null_driver = nulldrv_GetBitmapBits, /* pGetBitmapBits */ nulldrv_GetCharWidth, /* pGetCharWidth */ nulldrv_GetDIBits, /* pGetDIBits */ - NULL, /* pGetDeviceCaps */ + nulldrv_GetDeviceCaps, /* pGetDeviceCaps */ nulldrv_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ nulldrv_GetICMProfile, /* pGetICMProfile */ nulldrv_GetNearestColor, /* pGetNearestColor */

1 0

Alexandre Julliard : gdi32: Properly manage the driver stack during DC creation and deletion.
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: 45f191dc2a754a1bf340dab5675e0b121f515763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f191dc2a754a1bf340dab56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 16 21:45:39 2011 +0100 gdi32: Properly manage the driver stack during DC creation and deletion. --- dlls/gdi32/dc.c | 48 ++++++++++++++++++++++--------------------- dlls/gdi32/driver.c | 18 ++++++++++++++- dlls/gdi32/enhmfdrv/init.c | 29 ++++++++++++------------- dlls/gdi32/gdi_private.h | 4 +- dlls/gdi32/mfdrv/init.c | 31 +++++++++++++-------------- 5 files changed, 72 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45f191dc2a754a1bf340d…

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DTexture.
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: f1ec3820d75c2b3cb95d70d6c63765e7ae78e4ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ec3820d75c2b3cb95d70d6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 16 18:58:01 2011 +0100 wined3d: Get rid of IWineD3DTexture. --- dlls/d3d8/d3d8_private.h | 8 +---- dlls/d3d8/texture.c | 38 ++++++++++++------------ dlls/d3d9/d3d9_private.h | 9 +---- dlls/d3d9/texture.c | 44 ++++++++++++++-------------- dlls/ddraw/ddraw.c | 3 +- dlls/wined3d/device.c | 12 ++++---- dlls/wined3d/texture.c | 64 +++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 8 +---- include/wine/wined3d.idl | 11 +------ 9 files changed, 82 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1ec3820d75c2b3cb95d7…

1 0

Alexandre Julliard : gdi32: Add a null driver entry point for UnrealizePalette.
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: 2c16ab2ae2c098a6e6f707ccafc9f7c6b0de4066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c16ab2ae2c098a6e6f707cca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 16 22:58:07 2011 +0100 gdi32: Add a null driver entry point for UnrealizePalette. --- dlls/gdi32/driver.c | 7 ++++++- dlls/gdi32/palette.c | 18 +++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 8139e15..f040bde 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -714,6 +714,11 @@ static BOOL CDECL nulldrv_SwapBuffers( PHYSDEV dev ) return TRUE; } +static BOOL CDECL nulldrv_UnrealizePalette( HPALETTE palette ) +{ + return FALSE; +} + static BOOL CDECL nulldrv_wglCopyContext( HGLRC ctx_src, HGLRC ctx_dst, UINT mask ) { return FALSE; @@ -895,7 +900,7 @@ const DC_FUNCTIONS null_driver = nulldrv_StrokeAndFillPath, /* pStrokeAndFillPath */ nulldrv_StrokePath, /* pStrokePath */ nulldrv_SwapBuffers, /* pSwapBuffers */ - NULL, /* pUnrealizePalette */ + nulldrv_UnrealizePalette, /* pUnrealizePalette */ nulldrv_WidenPath, /* pWidenPath */ nulldrv_wglCopyContext, /* pwglCopyContext */ nulldrv_wglCreateContext, /* pwglCreateContext */ diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index a60f342..37e425d 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -38,10 +38,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(palette); +typedef BOOL (CDECL *unrealize_function)(HPALETTE); + typedef struct tagPALETTEOBJ { GDIOBJHDR header; - const DC_FUNCTIONS *funcs; /* DC function table */ + unrealize_function unrealize; WORD version; /* palette version */ WORD count; /* count of palette entries */ PALETTEENTRY *entries; @@ -152,7 +154,7 @@ HPALETTE WINAPI CreatePalette( size = sizeof(LOGPALETTE) + (palette->palNumEntries - 1) * sizeof(PALETTEENTRY); if (!(palettePtr = HeapAlloc( GetProcessHeap(), 0, sizeof(*palettePtr) ))) return 0; - palettePtr->funcs = NULL; + palettePtr->unrealize = NULL; palettePtr->version = palette->palVersion; palettePtr->count = palette->palNumEntries; size = palettePtr->count * sizeof(*palettePtr->entries); @@ -410,7 +412,6 @@ BOOL WINAPI AnimatePalette( PALETTEOBJ * palPtr; UINT pal_entries; const PALETTEENTRY *pptr = PaletteColors; - const DC_FUNCTIONS *funcs; palPtr = GDI_GetObjPtr( hPal, OBJ_PAL ); if (!palPtr) return 0; @@ -436,9 +437,8 @@ BOOL WINAPI AnimatePalette( TRACE("Not animating entry %d -- not PC_RESERVED\n", StartIndex); } } - funcs = palPtr->funcs; GDI_ReleaseObj( hPal ); - if (funcs && funcs->pRealizePalette) funcs->pRealizePalette( NULL, hPal, hPal == hPrimaryPalette ); + /* FIXME: check for palette selected in active window */ } return TRUE; } @@ -650,10 +650,10 @@ static BOOL PALETTE_UnrealizeObject( HGDIOBJ handle ) if (palette) { - const DC_FUNCTIONS *funcs = palette->funcs; - palette->funcs = NULL; + unrealize_function unrealize = palette->unrealize; + palette->unrealize = NULL; GDI_ReleaseObj( handle ); - if (funcs && funcs->pUnrealizePalette) funcs->pUnrealizePalette( handle ); + if (unrealize) unrealize( handle ); } if (InterlockedCompareExchangePointer( (void **)&hLastRealizedPalette, 0, handle ) == handle) @@ -733,7 +733,7 @@ UINT WINAPI GDIRealizePalette( HDC hdc ) { realized = physdev->funcs->pRealizePalette( physdev, dc->hPalette, (dc->hPalette == hPrimaryPalette) ); - palPtr->funcs = dc->funcs; + palPtr->unrealize = physdev->funcs->pUnrealizePalette; GDI_ReleaseObj( dc->hPalette ); } }

1 0

Alexandre Julliard : gdi32: Get rid of the no longer used DC_SAVED flag.
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: 174e906aa573e0f1dbd2ec08f470cca25a695237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=174e906aa573e0f1dbd2ec08f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 16 21:28:53 2011 +0100 gdi32: Get rid of the no longer used DC_SAVED flag. --- dlls/gdi32/dc.c | 26 ++++++++++---------------- dlls/gdi32/gdi_private.h | 1 - 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index d70d2c2..c5e513e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -384,7 +384,7 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) DC *newdc, *dc = get_nulldrv_dc( dev ); if (!(newdc = HeapAlloc( GetProcessHeap(), 0, sizeof(*newdc )))) return 0; - newdc->flags = dc->flags | DC_SAVED; + newdc->flags = dc->flags; newdc->layout = dc->layout; newdc->hPen = dc->hPen; newdc->hBrush = dc->hBrush; @@ -484,7 +484,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) if (!PATH_AssignGdiPath( &dc->path, &dcs->path )) return FALSE; - dc->flags = dcs->flags & ~DC_SAVED; + dc->flags = dcs->flags; dc->layout = dcs->layout; dc->hDevice = dcs->hDevice; dc->ROPmode = dcs->ROPmode; @@ -827,16 +827,13 @@ BOOL WINAPI DeleteDC( HDC hdc ) free_dc_state( dcs ); } - if (!(dc->flags & DC_SAVED)) - { - SelectObject( hdc, GetStockObject(BLACK_PEN) ); - SelectObject( hdc, GetStockObject(WHITE_BRUSH) ); - SelectObject( hdc, GetStockObject(SYSTEM_FONT) ); - SelectObject( hdc, GetStockObject(DEFAULT_BITMAP) ); - if (dc->funcs->pDeleteDC) dc->funcs->pDeleteDC(dc->physDev); - dc->physDev = NULL; - } + SelectObject( hdc, GetStockObject(BLACK_PEN) ); + SelectObject( hdc, GetStockObject(WHITE_BRUSH) ); + SelectObject( hdc, GetStockObject(SYSTEM_FONT) ); + SelectObject( hdc, GetStockObject(DEFAULT_BITMAP) ); + if (dc->funcs->pDeleteDC) dc->funcs->pDeleteDC(dc->physDev); + dc->physDev = NULL; free_dc_ptr( dc ); return TRUE; } @@ -1273,11 +1270,8 @@ BOOL WINAPI SetDCHook( HDC hdc, DCHOOKPROC hookProc, DWORD_PTR dwHookData ) if (!dc) return FALSE; - if (!(dc->flags & DC_SAVED)) - { - dc->dwHookData = dwHookData; - dc->hookProc = hookProc; - } + dc->dwHookData = dwHookData; + dc->hookProc = hookProc; release_dc_ptr( dc ); return TRUE; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2273009..2dd1569 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -318,7 +318,6 @@ typedef struct tagDC } DC; /* DC flags */ -#define DC_SAVED 0x0002 /* It is a saved DC */ #define DC_BOUNDS_ENABLE 0x0008 /* Bounding rectangle tracking is enabled */ #define DC_BOUNDS_SET 0x0010 /* Bounding rectangle has been set */

1 0

Jacek Caban : shdocvw: Fixed allocation failure test.
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: b48efd098f837a949c0200b8d076514a222a9c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b48efd098f837a949c0200b8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 16 19:21:15 2011 +0100 shdocvw: Fixed allocation failure test. --- dlls/shdocvw/shellbrowser.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shellbrowser.c b/dlls/shdocvw/shellbrowser.c index 2715bcc..1ccf379 100644 --- a/dlls/shdocvw/shellbrowser.c +++ b/dlls/shdocvw/shellbrowser.c @@ -759,8 +759,10 @@ static const IDocObjectServiceVtbl DocObjectServiceVtbl = { HRESULT ShellBrowser_Create(IShellBrowser **ppv) { - ShellBrowser *sb = heap_alloc(sizeof(ShellBrowser)); - if(!*ppv) + ShellBrowser *sb; + + sb = heap_alloc(sizeof(ShellBrowser)); + if(!sb) return E_OUTOFMEMORY; sb->IShellBrowser_iface.lpVtbl = &ShellBrowserVtbl;

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the DIB functions.
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: ac5a18027881ff88b459f8fcf6eec19c9c146c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5a18027881ff88b459f8fcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 16 21:14:24 2011 +0100 gdi32: Add null driver entry points for the DIB functions. --- dlls/gdi32/dib.c | 38 ++++++++++++++------------------------ dlls/gdi32/driver.c | 24 +++++++++++++++++++++--- 2 files changed, 35 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 2810c74..05e51df 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -382,26 +382,19 @@ INT WINAPI SetDIBitsToDevice(HDC hdc, INT xDest, INT yDest, DWORD cx, UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) { - INT ret; + INT ret = 0; DC *dc; if (!bits) return 0; - if (!(dc = get_dc_ptr( hdc ))) return 0; - - if(dc->funcs->pSetDIBitsToDevice) + if ((dc = get_dc_ptr( hdc ))) { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDIBitsToDevice ); update_dc( dc ); - ret = dc->funcs->pSetDIBitsToDevice( dc->physDev, xDest, yDest, cx, cy, xSrc, - ySrc, startscan, lines, bits, - info, coloruse ); - } - else { - FIXME("unimplemented on hdc %p\n", hdc); - ret = 0; + ret = physdev->funcs->pSetDIBitsToDevice( physdev, xDest, yDest, cx, cy, xSrc, + ySrc, startscan, lines, bits, info, coloruse ); + release_dc_ptr( dc ); } - - release_dc_ptr( dc ); return ret; } @@ -418,6 +411,8 @@ UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, CONST RGBQUA if ((bitmap = GDI_GetObjPtr( dc->hBitmap, OBJ_BITMAP ))) { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDIBColorTable ); + /* Check if currently selected bitmap is a DIB */ if (bitmap->color_table) { @@ -429,11 +424,8 @@ UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, CONST RGBQUA } } GDI_ReleaseObj( dc->hBitmap ); + physdev->funcs->pSetDIBColorTable( physdev, startpos, entries, colors ); } - - if (dc->funcs->pSetDIBColorTable) - dc->funcs->pSetDIBColorTable(dc->physDev, startpos, entries, colors); - release_dc_ptr( dc ); return result; } @@ -1361,19 +1353,17 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, if (ret && ((bmp = GDI_GetObjPtr(ret, OBJ_BITMAP)))) { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pCreateDIBSection ); bmp->dib = dib; - bmp->funcs = dc->funcs; + bmp->funcs = physdev->funcs; /* create local copy of DIB palette */ if (bpp <= 8) DIB_CopyColorTable( dc, bmp, usage, bmi ); GDI_ReleaseObj( ret ); - if (dc->funcs->pCreateDIBSection) + if (!physdev->funcs->pCreateDIBSection( physdev, ret, bmi, usage )) { - if (!dc->funcs->pCreateDIBSection(dc->physDev, ret, bmi, usage)) - { - DeleteObject( ret ); - ret = 0; - } + DeleteObject( ret ); + ret = 0; } } diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index afd853b..fa77a2e 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -339,6 +339,12 @@ static BOOL CDECL nulldrv_CreateBitmap( PHYSDEV dev, HBITMAP bitmap, LPVOID bits return TRUE; } +static HBITMAP CDECL nulldrv_CreateDIBSection( PHYSDEV dev, HBITMAP bitmap, + const BITMAPINFO *info, UINT usage ) +{ + return bitmap; +} + static BOOL CDECL nulldrv_DeleteBitmap( HBITMAP bitmap ) { return TRUE; @@ -576,6 +582,18 @@ static COLORREF CDECL nulldrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) return color; } +static UINT CDECL nulldrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, const RGBQUAD *colors ) +{ + return 0; +} + +static INT CDECL nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, DWORD height, + INT x_src, INT y_src, UINT start, UINT lines, + const void *bits, const BITMAPINFO *info, UINT coloruse ) +{ + return 0; +} + static void CDECL nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) { } @@ -736,7 +754,7 @@ const DC_FUNCTIONS null_driver = nulldrv_CloseFigure, /* pCloseFigure */ nulldrv_CreateBitmap, /* pCreateBitmap */ NULL, /* pCreateDC */ - NULL, /* pCreateDIBSection */ + nulldrv_CreateDIBSection, /* pCreateDIBSection */ nulldrv_DeleteBitmap, /* pDeleteBitmap */ NULL, /* pDeleteDC */ nulldrv_DeleteObject, /* pDeleteObject */ @@ -811,9 +829,9 @@ const DC_FUNCTIONS null_driver = nulldrv_SetBkMode, /* pSetBkMode */ nulldrv_SetDCBrushColor, /* pSetDCBrushColor */ nulldrv_SetDCPenColor, /* pSetDCPenColor */ - NULL, /* pSetDIBColorTable */ + nulldrv_SetDIBColorTable, /* pSetDIBColorTable */ nulldrv_SetDIBits, /* pSetDIBits */ - NULL, /* pSetDIBitsToDevice */ + nulldrv_SetDIBitsToDevice, /* pSetDIBitsToDevice */ nulldrv_SetDeviceClipping, /* pSetDeviceClipping */ nulldrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ nulldrv_SetLayout, /* pSetLayout */

1 0

Huw Davies : gdi32: Print the fixme when the pen is actually hatched.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: c8c467155df53eb5e32b42484d7967c66114b0d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c467155df53eb5e32b42484… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 16 13:41:59 2011 +0000 gdi32: Print the fixme when the pen is actually hatched. --- dlls/gdi32/pen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 61dd0e9..425b5aa 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -182,7 +182,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, return 0; } - if (brush->lbHatch && ((brush->lbStyle == BS_SOLID) || (brush->lbStyle == BS_HOLLOW))) + if (brush->lbHatch && ((brush->lbStyle != BS_SOLID) && (brush->lbStyle != BS_HOLLOW))) { static int fixme_hatches_shown; if (!fixme_hatches_shown++) FIXME("Hatches not implemented\n");

1 0

Jacek Caban : appwiz.cpl: Get rid of installing addons from cab file support.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 84fbe5db0e41e2dd3c7b4ca2588d867e29721a72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84fbe5db0e41e2dd3c7b4ca25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 16 14:27:29 2011 +0100 appwiz.cpl: Get rid of installing addons from cab file support. --- dlls/appwiz.cpl/addons.c | 115 +--------------------------------------------- 1 files changed, 1 insertions(+), 114 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index e4080e3..dbfd3b9 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -157,93 +157,7 @@ static void set_status(DWORD id) SendMessageW(status, WM_SETTEXT, 0, (LPARAM)buf); } -static void set_registry(const WCHAR *install_dir) -{ - WCHAR mshtml_key[100]; - LPWSTR gecko_path; - HKEY hkey; - DWORD res, len; - - static const WCHAR wszGeckoPath[] = {'G','e','c','k','o','P','a','t','h',0}; - static const WCHAR wszWineGecko[] = {'w','i','n','e','_','g','e','c','k','o',0}; - - memcpy(mshtml_key, mshtml_keyW, sizeof(mshtml_keyW)); - mshtml_key[sizeof(mshtml_keyW)/sizeof(WCHAR)-1] = '\\'; - MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, sizeof(GECKO_VERSION), - mshtml_key+sizeof(mshtml_keyW)/sizeof(WCHAR), - (sizeof(mshtml_key)-sizeof(mshtml_keyW))/sizeof(WCHAR)); - - /* @@ Wine registry key: HKCU\Software\Wine\MSHTML\<version> */ - res = RegCreateKeyW(HKEY_CURRENT_USER, mshtml_key, &hkey); - if(res != ERROR_SUCCESS) { - ERR("Faild to create MSHTML key: %d\n", res); - return; - } - - len = strlenW(install_dir); - gecko_path = heap_alloc((len+1)*sizeof(WCHAR)+sizeof(wszWineGecko)); - memcpy(gecko_path, install_dir, len*sizeof(WCHAR)); - - if (len && gecko_path[len-1] != '\\') - gecko_path[len++] = '\\'; - - memcpy(gecko_path+len, wszWineGecko, sizeof(wszWineGecko)); - - res = RegSetValueExW(hkey, wszGeckoPath, 0, REG_SZ, (LPVOID)gecko_path, - len*sizeof(WCHAR)+sizeof(wszWineGecko)); - heap_free(gecko_path); - RegCloseKey(hkey); - if(res != ERROR_SUCCESS) - ERR("Failed to set GeckoPath value: %08x\n", res); -} - -static BOOL install_cab(LPCWSTR file_name) -{ - char *install_dir_a, *file_name_a; - WCHAR install_dir[MAX_PATH]; - DWORD res, len; - HRESULT hres; - - static const WCHAR gecko_subdirW[] = {'\\','g','e','c','k','o','\\',0}; - - TRACE("(%s)\n", debugstr_w(file_name)); - - GetSystemDirectoryW(install_dir, sizeof(install_dir)/sizeof(WCHAR)); - strcatW(install_dir, gecko_subdirW); - res = CreateDirectoryW(install_dir, NULL); - if(!res && GetLastError() != ERROR_ALREADY_EXISTS) { - ERR("Could not create directory: %08u\n", GetLastError()); - return FALSE; - } - - len = strlenW(install_dir); - MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, -1, install_dir+len, sizeof(install_dir)/sizeof(WCHAR)-len); - res = CreateDirectoryW(install_dir, NULL); - if(!res && GetLastError() != ERROR_ALREADY_EXISTS) { - ERR("Could not create directory: %08u\n", GetLastError()); - return FALSE; - } - - - /* FIXME: Use ExtractFilesW once it's implemented */ - file_name_a = heap_strdupWtoA(file_name); - install_dir_a = heap_strdupWtoA(install_dir); - if(file_name_a && install_dir_a) - hres = ExtractFilesA(file_name_a, install_dir_a, 0, NULL, NULL, 0); - else - hres = E_OUTOFMEMORY; - heap_free(file_name_a); - heap_free(install_dir_a); - if(FAILED(hres)) { - ERR("Could not extract package: %08x\n", hres); - return FALSE; - } - - set_registry(install_dir); - return TRUE; -} - -static BOOL install_msi_file(const WCHAR *file_name) +static BOOL install_file(const WCHAR *file_name) { ULONG res; @@ -256,33 +170,6 @@ static BOOL install_msi_file(const WCHAR *file_name) return TRUE; } -static BOOL install_file(const WCHAR *file_name) -{ - BYTE magic[4]; - HANDLE file; - DWORD size; - BOOL res; - - static const BYTE msi_magic[] = {0xd0,0xcf,0x11,0xe0}; - - file = CreateFileW(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); - if(file == INVALID_HANDLE_VALUE) - return FALSE; - - res = ReadFile(file, magic, sizeof(magic), &size, NULL); - CloseHandle(file); - if(!res || size != sizeof(magic)) - return INET_E_DOWNLOAD_FAILURE; - - if(!memcmp(magic, "MSCF", sizeof(magic))) - return install_cab(file_name); - else if(!memcmp(magic, msi_magic, sizeof(magic))) - return install_msi_file(file_name); - - ERR("Unknown file magic\n"); - return FALSE; -} - static BOOL install_from_unix_file(const char *file_name) { LPWSTR dos_file_name;

1 0