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

Nikolay Sivov : ole32/ole2: Use W calls for registry access.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 56fdbc226e1f1cfc5ddce26d2c625d86e427e350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56fdbc226e1f1cfc5ddce26d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 6 01:20:30 2010 +0400 ole32/ole2: Use W calls for registry access. --- dlls/ole32/ole2.c | 93 ++++++++++++++++++++++++----------------------------- 1 files changed, 42 insertions(+), 51 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 2e4da53..73a2d2d 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -119,6 +119,13 @@ static const WCHAR OLEDD_DRAGTRACKERCLASS[] = static const WCHAR prop_olemenuW[] = {'P','R','O','P','_','O','L','E','M','e','n','u','D','e','s','c','r','i','p','t','o','r',0}; +static const WCHAR clsidfmtW[] = + {'C','L','S','I','D','\\','{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-', + '%','0','2','x','%','0','2','x','-','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x', + '%','0','2','x','%','0','2','x','}','\\',0}; + +static const WCHAR emptyW[] = { 0 }; + /* * This is the head of the Drop target container. */ @@ -378,13 +385,12 @@ HRESULT WINAPI OleRegGetUserType( DWORD dwFormOfType, LPOLESTR* pszUserType) { - char keyName[60]; + WCHAR keyName[60]; DWORD dwKeyType; DWORD cbData; HKEY clsidKey; LONG hres; - LPSTR buffer; - HRESULT retVal; + /* * Initialize the out parameter. */ @@ -393,17 +399,17 @@ HRESULT WINAPI OleRegGetUserType( /* * Build the key name we're looking for */ - sprintf( keyName, "CLSID\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\", - clsid->Data1, clsid->Data2, clsid->Data3, - clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], - clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] ); + sprintfW( keyName, clsidfmtW, + clsid->Data1, clsid->Data2, clsid->Data3, + clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], + clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] ); - TRACE("(%s, %d, %p)\n", keyName, dwFormOfType, pszUserType); + TRACE("(%s, %d, %p)\n", debugstr_w(keyName), dwFormOfType, pszUserType); /* * Open the class id Key */ - hres = RegOpenKeyA(HKEY_CLASSES_ROOT, + hres = RegOpenKeyW(HKEY_CLASSES_ROOT, keyName, &clsidKey); @@ -415,8 +421,8 @@ HRESULT WINAPI OleRegGetUserType( */ cbData = 0; - hres = RegQueryValueExA(clsidKey, - "", + hres = RegQueryValueExW(clsidKey, + emptyW, NULL, &dwKeyType, NULL, @@ -431,7 +437,7 @@ HRESULT WINAPI OleRegGetUserType( /* * Allocate a buffer for the registry value. */ - *pszUserType = CoTaskMemAlloc(cbData*2); + *pszUserType = CoTaskMemAlloc(cbData); if (*pszUserType==NULL) { @@ -439,41 +445,24 @@ HRESULT WINAPI OleRegGetUserType( return E_OUTOFMEMORY; } - buffer = HeapAlloc(GetProcessHeap(), 0, cbData); - - if (buffer == NULL) - { - RegCloseKey(clsidKey); - CoTaskMemFree(*pszUserType); - *pszUserType=NULL; - return E_OUTOFMEMORY; - } - - hres = RegQueryValueExA(clsidKey, - "", + hres = RegQueryValueExW(clsidKey, + emptyW, NULL, &dwKeyType, - (LPBYTE) buffer, + (LPBYTE) *pszUserType, &cbData); RegCloseKey(clsidKey); - - if (hres!=ERROR_SUCCESS) + if (hres != ERROR_SUCCESS) { CoTaskMemFree(*pszUserType); - *pszUserType=NULL; + *pszUserType = NULL; - retVal = REGDB_E_READREGDB; - } - else - { - MultiByteToWideChar( CP_ACP, 0, buffer, -1, *pszUserType, cbData /*FIXME*/ ); - retVal = S_OK; + return REGDB_E_READREGDB; } - HeapFree(GetProcessHeap(), 0, buffer); - return retVal; + return S_OK; } /*********************************************************************** @@ -593,7 +582,9 @@ HRESULT WINAPI OleRegGetMiscStatus( DWORD dwAspect, DWORD* pdwStatus) { - char keyName[60]; + static const WCHAR miscstatusW[] = {'M','i','s','c','S','t','a','t','u','s',0}; + static const WCHAR dfmtW[] = {'%','d',0}; + WCHAR keyName[60]; HKEY clsidKey; HKEY miscStatusKey; HKEY aspectKey; @@ -607,17 +598,17 @@ HRESULT WINAPI OleRegGetMiscStatus( /* * Build the key name we're looking for */ - sprintf( keyName, "CLSID\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\", - clsid->Data1, clsid->Data2, clsid->Data3, - clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], - clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] ); + sprintfW( keyName, clsidfmtW, + clsid->Data1, clsid->Data2, clsid->Data3, + clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], + clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] ); - TRACE("(%s, %d, %p)\n", keyName, dwAspect, pdwStatus); + TRACE("(%s, %d, %p)\n", debugstr_w(keyName), dwAspect, pdwStatus); /* * Open the class id Key */ - result = RegOpenKeyA(HKEY_CLASSES_ROOT, + result = RegOpenKeyW(HKEY_CLASSES_ROOT, keyName, &clsidKey); @@ -627,8 +618,8 @@ HRESULT WINAPI OleRegGetMiscStatus( /* * Get the MiscStatus */ - result = RegOpenKeyA(clsidKey, - "MiscStatus", + result = RegOpenKeyW(clsidKey, + miscstatusW, &miscStatusKey); @@ -646,9 +637,9 @@ HRESULT WINAPI OleRegGetMiscStatus( /* * Open the key specific to the requested aspect. */ - sprintf(keyName, "%d", dwAspect); + sprintfW(keyName, dfmtW, dwAspect); - result = RegOpenKeyA(miscStatusKey, + result = RegOpenKeyW(miscStatusKey, keyName, &aspectKey); @@ -2280,13 +2271,13 @@ static void OLEUTL_ReadRegistryDWORDValue( HKEY regKey, DWORD* pdwValue) { - char buffer[20]; + WCHAR buffer[20]; DWORD cbData = sizeof(buffer); DWORD dwKeyType; LONG lres; - lres = RegQueryValueExA(regKey, - "", + lres = RegQueryValueExW(regKey, + emptyW, NULL, &dwKeyType, (LPBYTE)buffer, @@ -2302,7 +2293,7 @@ static void OLEUTL_ReadRegistryDWORDValue( case REG_EXPAND_SZ: case REG_MULTI_SZ: case REG_SZ: - *pdwValue = (DWORD)strtoul(buffer, NULL, 10); + *pdwValue = (DWORD)strtoulW(buffer, NULL, 10); break; } }

1 0

Rico Schüller : d3d10: Parse semantic in parse_fx10_local_variable().
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: be3c8db22c138e94459db3ac0adb24f28b3162fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3c8db22c138e94459db3ac0… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 5 19:00:44 2010 +0200 d3d10: Parse semantic in parse_fx10_local_variable(). --- dlls/d3d10/effect.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 59b6c31..c43f88a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1284,11 +1284,22 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const { unsigned int i; HRESULT hr; + DWORD offset; hr = parse_fx10_variable_head(v, ptr, data); if (FAILED(hr)) return hr; - skip_dword_unknown(ptr, 2); + read_dword(ptr, &offset); + TRACE("Variable semantic at offset %#x.\n", offset); + + if (!copy_name(data + offset, &v->semantic)) + { + ERR("Failed to copy semantic.\n"); + return E_OUTOFMEMORY; + } + TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); + + skip_dword_unknown(ptr, 1); switch (v->type->basetype) {

1 0

Sven Baars : gphoto2.ds: Fix Dutch translation and alignment.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 35c6beeba268c315e4f61d876544f527ace59363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c6beeba268c315e4f61d876… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed May 5 18:55:37 2010 +0200 gphoto2.ds: Fix Dutch translation and alignment. --- dlls/gphoto2.ds/gphoto2_Nl.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Nl.rc b/dlls/gphoto2.ds/gphoto2_Nl.rc index 39bcdf2..5ee68fd 100644 --- a/dlls/gphoto2.ds/gphoto2_Nl.rc +++ b/dlls/gphoto2.ds/gphoto2_Nl.rc @@ -31,18 +31,18 @@ BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 DEFPUSHBUTTON "Importeer geselecteerde bestanden",IDC_IMPORT,120,252,120,14 - PUSHBUTTON "Preview",IDC_FETCH,7,252,48,14 + PUSHBUTTON "Voorbeeld",IDC_FETCH,7,252,48,14 PUSHBUTTON "Importeer alles",IDC_IMPORTALL,60,252,56,14 - CONTROL "Skip This Dialog",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,244,252,76,14 - PUSHBUTTON "Afsluiten",IDC_EXIT,315,252,50,14 + CONTROL "Sla dit venster over",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,244,252,76,14 + PUSHBUTTON "Afsluiten",IDC_EXIT,320,252,45,14 END IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND -CAPTION "Transporteren" +CAPTION "Verplaatsen" FONT 8, "MS Sans Serif" BEGIN - LTEXT "Transporteren... Even geduld",IDC_STATIC,5,19,176,8, SS_CENTER + LTEXT "Verplaatsen... Even geduld",IDC_STATIC,5,19,176,8, SS_CENTER END IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 @@ -52,5 +52,5 @@ FONT 8, "MS Sans Serif" BEGIN CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 LTEXT "Verbinden met camera... Even geduld",IDC_STATIC,128,58, - 116,8 + 120,8 END

1 0

Henri Verbeet : wined3d: Reorganize IWineD3DImpl_CheckDeviceFormat() a bit.
by Alexandre Julliard May 6, 2010

May 6, 2010

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

Henri Verbeet : wined3d: Remove the unused device type parameter to some format capability checking functions .
by Alexandre Julliard May 6, 2010

May 6, 2010

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

Alexandre Julliard : gdi32: Add a global function to retrieve the display driver.
by Alexandre Julliard May 6, 2010

May 6, 2010

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

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

May 6, 2010

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: Don't bother freeing graphics drivers.
by Alexandre Julliard May 6, 2010

May 6, 2010

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

Henri Verbeet : wined3d: Use the FBO cache in swapchain_blit().
by Alexandre Julliard May 6, 2010

May 6, 2010

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: Use the FBO cache in context_apply_blit_state().
by Alexandre Julliard May 6, 2010

May 6, 2010

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