May 2010 - Wine-commits - list.winehq.org

Joel Holdsworth : user32: Fixed some minor glitches in oic_winlogo.ico.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 83d5035bbe038b691dd78918ab2a89a344543a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83d5035bbe038b691dd78918a… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed May 5 19:48:28 2010 +0100 user32: Fixed some minor glitches in oic_winlogo.ico. --- dlls/user32/resources/oic_winlogo.ico | Bin 25214 -> 25214 bytes dlls/user32/resources/oic_winlogo.svg | 222 +++++++++++++++++---------------- 2 files changed, 114 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83d5035bbe038b691dd78…

1 0

Alexandre Julliard : gdi32: Don't bother freeing graphics drivers.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 0e4f742f06f932680ad436b32dead5464d710fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e4f742f06f932680ad436b32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 13:37:32 2010 +0200 gdi32: Don't bother freeing graphics drivers. --- dlls/gdi32/dc.c | 6 ----- dlls/gdi32/driver.c | 56 +-------------------------------------------- dlls/gdi32/gdi_private.h | 2 - 3 files changed, 2 insertions(+), 62 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 577c151..27d491a 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -674,7 +674,6 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, error: if (dc) free_dc_ptr( dc ); - DRIVER_release_driver( funcs ); return 0; } @@ -759,7 +758,6 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) physDev = origDC->physDev; } release_dc_ptr( origDC ); - if (funcs) funcs = DRIVER_get_driver( funcs ); } if (!funcs && !(funcs = DRIVER_load_driver( displayW ))) return 0; @@ -790,7 +788,6 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) error: if (dc) free_dc_ptr( dc ); - DRIVER_release_driver( funcs ); return 0; } @@ -800,7 +797,6 @@ error: */ BOOL WINAPI DeleteDC( HDC hdc ) { - const DC_FUNCTIONS *funcs = NULL; DC * dc; TRACE("%p\n", hdc ); @@ -838,13 +834,11 @@ BOOL WINAPI DeleteDC( HDC hdc ) SelectObject( hdc, GetStockObject(WHITE_BRUSH) ); SelectObject( hdc, GetStockObject(SYSTEM_FONT) ); SelectObject( hdc, GetStockObject(DEFAULT_BITMAP) ); - funcs = dc->funcs; if (dc->funcs->pDeleteDC) dc->funcs->pDeleteDC(dc->physDev); dc->physDev = NULL; } free_dc_ptr( dc ); - if (funcs) DRIVER_release_driver( funcs ); /* do that after releasing the GDI lock */ return TRUE; } diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 05c2513..bb7af56 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -42,7 +42,6 @@ struct graphics_driver { struct list entry; HMODULE module; /* module handle */ - unsigned int count; /* reference count */ DC_FUNCTIONS funcs; }; @@ -69,7 +68,6 @@ static struct graphics_driver *create_driver( HMODULE module ) if (!(driver = HeapAlloc( GetProcessHeap(), 0, sizeof(*driver)))) return NULL; driver->module = module; - driver->count = 1; /* fill the function table */ if (module) @@ -227,11 +225,7 @@ static struct graphics_driver *load_display_driver(void) HMODULE module = 0; HKEY hkey; - if (display_driver) /* already loaded */ - { - display_driver->count++; - return display_driver; - } + if (display_driver) return display_driver; /* already loaded */ strcpy( buffer, "x11" ); /* default value */ /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ @@ -260,7 +254,6 @@ static struct graphics_driver *load_display_driver(void) ExitProcess(1); } - display_driver->count++; /* we don't want to free it */ return display_driver; } @@ -278,7 +271,7 @@ const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) EnterCriticalSection( &driver_section ); /* display driver is a special case */ - if (!strcmpiW( name, displayW ) || + if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) { driver = load_display_driver(); @@ -292,7 +285,6 @@ const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) { if (driver->module == module) { - driver->count++; LeaveCriticalSection( &driver_section ); return &driver->funcs; } @@ -318,50 +310,6 @@ const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) } -/********************************************************************** - * DRIVER_get_driver - * - * Get a new copy of an existing driver. - */ -const DC_FUNCTIONS *DRIVER_get_driver( const DC_FUNCTIONS *funcs ) -{ - struct graphics_driver *driver; - - EnterCriticalSection( &driver_section ); - LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) - if (&driver->funcs == funcs) break; - if (&driver->entry == &drivers) ERR( "driver not found, trouble ahead\n" ); - driver->count++; - LeaveCriticalSection( &driver_section ); - return funcs; -} - - -/********************************************************************** - * DRIVER_release_driver - * - * Release a driver by decrementing ref count and freeing it if needed. - */ -void DRIVER_release_driver( const DC_FUNCTIONS *funcs ) -{ - struct graphics_driver *driver; - - EnterCriticalSection( &driver_section ); - - LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) - { - if (&driver->funcs != funcs) continue; - if (--driver->count) break; - list_remove( &driver->entry ); - if (driver == display_driver) display_driver = NULL; - FreeLibrary( driver->module ); - HeapFree( GetProcessHeap(), 0, driver ); - break; - } - LeaveCriticalSection( &driver_section ); -} - - /***************************************************************************** * DRIVER_GetDriverName * diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index de00eb4..a3ec954 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -386,8 +386,6 @@ extern int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, /* driver.c */ extern const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN; -extern const DC_FUNCTIONS *DRIVER_get_driver( const DC_FUNCTIONS *funcs ) DECLSPEC_HIDDEN; -extern void DRIVER_release_driver( const DC_FUNCTIONS *funcs ) DECLSPEC_HIDDEN; extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN; /* enhmetafile.c */

1 0

Alexandre Julliard : gdi32: Don' t store the display driver in the global list to avoid the need for locking .
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 8dc9e8786b13ac64fa953c1d2d7156fd470e1016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc9e8786b13ac64fa953c1d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 13:48:24 2010 +0200 gdi32: Don't store the display driver in the global list to avoid the need for locking. --- dlls/gdi32/driver.c | 48 +++++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index bb7af56..f23cdc1 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -209,7 +209,6 @@ static struct graphics_driver *create_driver( HMODULE module ) } else memset( &driver->funcs, 0, sizeof(driver->funcs) ); - list_add_head( &drivers, &driver->entry ); return driver; } @@ -221,6 +220,7 @@ static struct graphics_driver *create_driver( HMODULE module ) */ static struct graphics_driver *load_display_driver(void) { + struct graphics_driver *driver; char buffer[MAX_PATH], libname[32], *name, *next; HMODULE module = 0; HKEY hkey; @@ -247,13 +247,18 @@ static struct graphics_driver *load_display_driver(void) name = next; } - if (!(display_driver = create_driver( module ))) + if (!(driver = create_driver( module ))) { MESSAGE( "Could not create graphics driver '%s'\n", buffer ); FreeLibrary( module ); ExitProcess(1); } - + if (InterlockedCompareExchangePointer( (void **)&display_driver, driver, NULL )) + { + /* somebody beat us to it */ + FreeLibrary( driver->module ); + HeapFree( GetProcessHeap(), 0, driver ); + } return display_driver; } @@ -264,47 +269,48 @@ static struct graphics_driver *load_display_driver(void) const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) { HMODULE module; - struct graphics_driver *driver; + struct graphics_driver *driver, *new_driver; static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 }; static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; - EnterCriticalSection( &driver_section ); - /* display driver is a special case */ - if (!strcmpiW( name, displayW ) || - !strcmpiW( name, display1W )) + if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) { driver = load_display_driver(); - LeaveCriticalSection( &driver_section ); return &driver->funcs; } - if ((module = GetModuleHandleW( name ))) { + if (display_driver && display_driver->module == module) return &display_driver->funcs; + EnterCriticalSection( &driver_section ); LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) { - if (driver->module == module) - { - LeaveCriticalSection( &driver_section ); - return &driver->funcs; - } + if (driver->module == module) goto done; } + LeaveCriticalSection( &driver_section ); } - if (!(module = LoadLibraryW( name ))) + if (!(module = LoadLibraryW( name ))) return NULL; + + if (!(new_driver = create_driver( module ))) { - LeaveCriticalSection( &driver_section ); + FreeLibrary( module ); return NULL; } - if (!(driver = create_driver( module ))) + /* check if someone else added it in the meantime */ + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) { + if (driver->module != module) continue; FreeLibrary( module ); - LeaveCriticalSection( &driver_section ); - return NULL; + HeapFree( GetProcessHeap(), 0, new_driver ); + goto done; } - + driver = new_driver; + list_add_head( &drivers, &driver->entry ); TRACE( "loaded driver %p for %s\n", driver, debugstr_w(name) ); +done: LeaveCriticalSection( &driver_section ); return &driver->funcs; }

1 0

Alexandre Julliard : gdi32: Add a global function to retrieve the display driver.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: e27bc88693b2ac023af90f727daa75b1e2278ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27bc88693b2ac023af90f727… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 13:50:30 2010 +0200 gdi32: Add a global function to retrieve the display driver. --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/driver.c | 15 ++++++--------- dlls/gdi32/gdi_private.h | 1 + 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 27d491a..5f304a2 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -760,7 +760,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) release_dc_ptr( origDC ); } - if (!funcs && !(funcs = DRIVER_load_driver( displayW ))) return 0; + if (!funcs && !(funcs = DRIVER_get_display_driver())) return 0; if (!(dc = alloc_dc_ptr( funcs, OBJ_MEMDC ))) goto error; diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index f23cdc1..e6713ea 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -214,18 +214,18 @@ static struct graphics_driver *create_driver( HMODULE module ) /********************************************************************** - * load_display_driver + * DRIVER_get_display_driver * * Special case for loading the display driver: get the name from the config file */ -static struct graphics_driver *load_display_driver(void) +const DC_FUNCTIONS *DRIVER_get_display_driver(void) { struct graphics_driver *driver; char buffer[MAX_PATH], libname[32], *name, *next; HMODULE module = 0; HKEY hkey; - if (display_driver) return display_driver; /* already loaded */ + if (display_driver) return &display_driver->funcs; /* already loaded */ strcpy( buffer, "x11" ); /* default value */ /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ @@ -259,7 +259,7 @@ static struct graphics_driver *load_display_driver(void) FreeLibrary( driver->module ); HeapFree( GetProcessHeap(), 0, driver ); } - return display_driver; + return &display_driver->funcs; } @@ -274,11 +274,8 @@ const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; /* display driver is a special case */ - if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) - { - driver = load_display_driver(); - return &driver->funcs; - } + if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) return DRIVER_get_display_driver(); + if ((module = GetModuleHandleW( name ))) { if (display_driver && display_driver->module == module) return &display_driver->funcs; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a3ec954..766668b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -385,6 +385,7 @@ extern int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, LONG *height, WORD *planes, WORD *bpp, DWORD *compr, DWORD *size ) DECLSPEC_HIDDEN; /* driver.c */ +extern const DC_FUNCTIONS *DRIVER_get_display_driver(void) DECLSPEC_HIDDEN; extern const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN; extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Use the FBO cache in context_apply_blit_state().
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 9982a46296910bfec288930455a19bf9224d27cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9982a46296910bfec28893045… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 5 18:22:34 2010 +0200 wined3d: Use the FBO cache in context_apply_blit_state(). --- dlls/wined3d/context.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9815ce3..ae4f754 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2003,9 +2003,7 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp surface_internal_preload(context->current_rt, SRGB_RGB); ENTER_GL(); - context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); - context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, context->current_rt); - context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, NULL, FALSE); + context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, context->current_rt, NULL); LEAVE_GL(); } else

1 0

Henri Verbeet : wined3d: Use the FBO cache in stretch_rect_fbo().
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 3345146d0b6d27b441918beb4f17b3b3feaee069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3345146d0b6d27b441918beb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 5 18:22:35 2010 +0200 wined3d: Use the FBO cache in stretch_rect_fbo(). --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 8 ++------ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ae4f754..24624ab 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -470,7 +470,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ } /* GL locking is done by the caller */ -static void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, +void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil) { if (surface_is_offscreen(render_target)) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3001b3b..f001591 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5808,11 +5808,9 @@ void stretch_rect_fbo(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surfa } else { TRACE("Source surface %p is offscreen\n", src_surface); ENTER_GL(); - context_bind_fbo(context, GL_READ_FRAMEBUFFER, &context->src_fbo); - context_attach_surface_fbo(context, GL_READ_FRAMEBUFFER, 0, src_surface); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, src_surface, NULL); glReadBuffer(GL_COLOR_ATTACHMENT0); checkGLcall("glReadBuffer()"); - context_attach_depth_stencil_fbo(context, GL_READ_FRAMEBUFFER, NULL, FALSE); } LEAVE_GL(); @@ -5847,10 +5845,8 @@ void stretch_rect_fbo(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surfa TRACE("Destination surface %p is offscreen\n", dst_surface); ENTER_GL(); - context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, &context->dst_fbo); - context_attach_surface_fbo(context, GL_DRAW_FRAMEBUFFER, 0, dst_surface); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, dst_surface, NULL); context_set_draw_buffer(context, GL_COLOR_ATTACHMENT0); - context_attach_depth_stencil_fbo(context, GL_DRAW_FRAMEBUFFER, NULL, FALSE); } glDisable(GL_SCISSOR_TEST); IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cad88b9..8181b31 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1196,6 +1196,8 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil) DECLSPEC_HIDDEN; void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; +void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, + IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil) DECLSPEC_HIDDEN; void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, IWineD3DSurfaceImpl *depth_stencil, BOOL use_render_buffer) DECLSPEC_HIDDEN; void context_attach_surface_fbo(const struct wined3d_context *context,

1 0

Henri Verbeet : wined3d: Use the FBO cache in swapchain_blit().
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 7a2debe113198fab0756dab5a3d1ecf7550c5a9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2debe113198fab0756dab5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 5 18:22:36 2010 +0200 wined3d: Use the FBO cache in swapchain_blit(). --- dlls/wined3d/context.c | 5 ----- dlls/wined3d/swapchain.c | 5 ++--- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 24624ab..d240686 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -841,11 +841,6 @@ static void context_destroy_gl_resources(struct wined3d_context *context) if (context->valid) { - if (context->src_fbo) - { - TRACE("Destroy src FBO %d\n", context->src_fbo); - context_destroy_fbo(context, &context->src_fbo); - } if (context->dst_fbo) { TRACE("Destroy dst FBO %d\n", context->dst_fbo); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b5d2d70..eeb1278 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -117,9 +117,8 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * if (gl_info->fbo_ops.glBlitFramebuffer && is_identity_fixup(backbuffer->resource.format_desc->color_fixup)) { ENTER_GL(); - context_bind_fbo(context, GL_READ_FRAMEBUFFER, &context->src_fbo); - context_attach_surface_fbo(context, GL_READ_FRAMEBUFFER, 0, backbuffer); - context_attach_depth_stencil_fbo(context, GL_READ_FRAMEBUFFER, NULL, FALSE); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, backbuffer, NULL); + glReadBuffer(GL_COLOR_ATTACHMENT0); context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); context_set_draw_buffer(context, GL_BACK); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8181b31..179b4c4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1087,7 +1087,6 @@ struct wined3d_context struct list fbo_list; struct list fbo_destroy_list; struct fbo_entry *current_fbo; - GLuint src_fbo; GLuint dst_fbo; GLuint fbo_read_binding; GLuint fbo_draw_binding;

1 0

Henri Verbeet : wined3d: Remove the unused device type parameter to some format capability checking functions .
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 6478e41b971b354a92982453bba3ccc4879ffee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6478e41b971b354a92982453b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 5 18:22:38 2010 +0200 wined3d: Remove the unused device type parameter to some format capability checking functions. --- dlls/wined3d/directx.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ed2647f..4df04fa 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3201,8 +3201,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceType(IWineD3D *iface, UINT Adapter /* Check if we support bumpmapping for a format */ -static BOOL CheckBumpMapCapability(struct wined3d_adapter *adapter, - WINED3DDEVTYPE DeviceType, const struct wined3d_format_desc *format_desc) +static BOOL CheckBumpMapCapability(struct wined3d_adapter *adapter, const struct wined3d_format_desc *format_desc) { /* Ask the fixed function pipeline implementation if it can deal * with the conversion. If we've got a GL extension giving native @@ -3302,8 +3301,7 @@ static BOOL CheckSrgbReadCapability(struct wined3d_adapter *adapter, const struc && (format_desc->Flags & WINED3DFMT_FLAG_SRGB_READ); } -static BOOL CheckSrgbWriteCapability(struct wined3d_adapter *adapter, - WINED3DDEVTYPE DeviceType, const struct wined3d_format_desc *format_desc) +static BOOL CheckSrgbWriteCapability(struct wined3d_adapter *adapter, const struct wined3d_format_desc *format_desc) { /* Only offer SRGB writing on X8R8G8B8/A8R8G8B8 when we use ARB or GLSL shaders as we are * doing the color fixup in shaders. @@ -3349,8 +3347,7 @@ static BOOL CheckWrapAndMipCapability(struct wined3d_adapter *adapter, const str } /* Check if a texture format is supported on the given adapter */ -static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, - WINED3DDEVTYPE DeviceType, const struct wined3d_format_desc *format_desc) +static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, const struct wined3d_format_desc *format_desc) { const struct wined3d_gl_info *gl_info = &adapter->gl_info; @@ -3582,7 +3579,7 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, static BOOL CheckSurfaceCapability(struct wined3d_adapter *adapter, const struct wined3d_format_desc *adapter_format_desc, - WINED3DDEVTYPE DeviceType, const struct wined3d_format_desc *check_format_desc, + const struct wined3d_format_desc *check_format_desc, WINED3DSURFTYPE SurfaceType) { if(SurfaceType == SURFACE_GDI) { @@ -3615,7 +3612,7 @@ static BOOL CheckSurfaceCapability(struct wined3d_adapter *adapter, } /* All format that are supported for textures are supported for surfaces as well */ - if (CheckTextureCapability(adapter, DeviceType, check_format_desc)) return TRUE; + if (CheckTextureCapability(adapter, check_format_desc)) return TRUE; /* All depth stencil formats are supported on surfaces */ if (CheckDepthStencilCapability(adapter, adapter_format_desc, check_format_desc)) return TRUE; @@ -3688,7 +3685,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } - if (!CheckTextureCapability(adapter, DeviceType, format_desc)) + if (!CheckTextureCapability(adapter, format_desc)) { TRACE_(d3d_caps)("[FAILED] - Cube texture format not supported\n"); return WINED3DERR_NOTAVAILABLE; @@ -3754,7 +3751,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt if (Usage & WINED3DUSAGE_QUERY_SRGBWRITE) { - if (!CheckSrgbWriteCapability(adapter, DeviceType, format_desc)) + if (!CheckSrgbWriteCapability(adapter, format_desc)) { TRACE_(d3d_caps)("[FAILED] - No query srgbwrite support\n"); return WINED3DERR_NOTAVAILABLE; @@ -3789,7 +3786,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt * - WINED3DUSAGE_NONSECURE (d3d9ex) * - WINED3DUSAGE_RENDERTARGET */ - if (!CheckSurfaceCapability(adapter, adapter_format_desc, DeviceType, format_desc, SurfaceType)) + if (!CheckSurfaceCapability(adapter, adapter_format_desc, format_desc, SurfaceType)) { TRACE_(d3d_caps)("[FAILED] - Not supported for plain surfaces\n"); return WINED3DERR_NOTAVAILABLE; @@ -3844,7 +3841,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } - if (!CheckTextureCapability(adapter, DeviceType, format_desc)) + if (!CheckTextureCapability(adapter, format_desc)) { TRACE_(d3d_caps)("[FAILED] - Texture format not supported\n"); return WINED3DERR_NOTAVAILABLE; @@ -3890,7 +3887,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt if (Usage & WINED3DUSAGE_QUERY_LEGACYBUMPMAP) { - if (!CheckBumpMapCapability(adapter, DeviceType, format_desc)) + if (!CheckBumpMapCapability(adapter, format_desc)) { TRACE_(d3d_caps)("[FAILED] - No legacy bumpmap support\n"); return WINED3DERR_NOTAVAILABLE; @@ -3920,7 +3917,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt if (Usage & WINED3DUSAGE_QUERY_SRGBWRITE) { - if (!CheckSrgbWriteCapability(adapter, DeviceType, format_desc)) + if (!CheckSrgbWriteCapability(adapter, format_desc)) { TRACE_(d3d_caps)("[FAILED] - No query srgbwrite support\n"); return WINED3DERR_NOTAVAILABLE; @@ -3983,7 +3980,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } - if (!CheckTextureCapability(adapter, DeviceType, format_desc)) + if (!CheckTextureCapability(adapter, format_desc)) { TRACE_(d3d_caps)("[FAILED] - Format not supported\n"); return WINED3DERR_NOTAVAILABLE; @@ -4083,7 +4080,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt if (Usage & WINED3DUSAGE_QUERY_SRGBWRITE) { - if (!CheckSrgbWriteCapability(adapter, DeviceType, format_desc)) + if (!CheckSrgbWriteCapability(adapter, format_desc)) { TRACE_(d3d_caps)("[FAILED] - No query srgbwrite support\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Henri Verbeet : wined3d: Reorganize IWineD3DImpl_CheckDeviceFormat() a bit.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 6d68701fb322a2cf5b0192d982af431960e0d9ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d68701fb322a2cf5b0192d98… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 5 18:22:37 2010 +0200 wined3d: Reorganize IWineD3DImpl_CheckDeviceFormat() a bit. --- dlls/wined3d/directx.c | 637 +++++++++++++++++++++++------------------------ 1 files changed, 312 insertions(+), 325 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d68701fb322a2cf5b019…

1 0

Aric Stewart : usp10: Fix ScriptGetCMap handling of unsupported glyphs.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: abae85b9767dce7c4eb62f8faffdb328b664dd03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abae85b9767dce7c4eb62f8fa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 5 11:51:52 2010 -0500 usp10: Fix ScriptGetCMap handling of unsupported glyphs. --- dlls/usp10/tests/usp10.c | 15 +++++++++++++-- dlls/usp10/usp10.c | 9 ++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index ad65b25..f76f95c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -583,10 +583,12 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) int cInChars; int cChars; unsigned short pwOutGlyphs3[256]; - WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; DWORD dwFlags; int cnt; + static const WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; + static const WCHAR TestItem2[] = {0x202B, 'i', 'n', 0x202C,0}; + /* Check to make sure that SCRIPT_CACHE gets allocated ok */ dwFlags = 0; cInChars = cChars = 5; @@ -627,10 +629,19 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) for (cnt=0; cnt < cChars && pwOutGlyphs[cnt] == pwOutGlyphs3[cnt]; cnt++) {} ok (cnt == cInChars, "Translation not correct. WCHAR %d - %04x != %04x\n", cnt, pwOutGlyphs[cnt], pwOutGlyphs3[cnt]); - + hr = ScriptFreeCache( &psc); ok (!psc, "psc is not null after ScriptFreeCache\n"); + cInChars = cChars = 4; + hr = ScriptGetCMap(hdc, &psc, TestItem2, cInChars, dwFlags, pwOutGlyphs3); + ok (hr == S_FALSE, "ScriptGetCMap should return S_FALSE not (%08x)\n", hr); + ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + ok(pwOutGlyphs3[0] == 0, "Glyph 0 should be default glyph\n"); + ok(pwOutGlyphs3[3] == 0, "Glyph 0 should be default glyph\n"); + + hr = ScriptFreeCache( &psc); + ok (!psc, "psc is not null after ScriptFreeCache\n"); } static void test_ScriptGetFontProperties(HDC hdc) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0ab86a1..b736966 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1528,6 +1528,8 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; + hr = S_OK; + if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE)) { for (i = 0; i < cChars; i++) @@ -1537,6 +1539,11 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars WORD glyph; if (!hdc) return E_PENDING; if (GetGlyphIndicesW(hdc, &pwcInChars[i], 1, &glyph, GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR) return S_FALSE; + if (glyph == 0xffff) + { + hr = S_FALSE; + glyph = 0x0; + } pwOutGlyphs[i] = set_cache_glyph(psc, pwcInChars[i], glyph); } } @@ -1546,7 +1553,7 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars TRACE("no glyph translation\n"); for (i = 0; i < cChars; i++) pwOutGlyphs[i] = pwcInChars[i]; } - return S_OK; + return hr; } /***********************************************************************

1 0