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

Maarten Lankhorst : mmdevapi: Improve EndpointNotificationCallback stubs.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: f9293dc9772e976abde7987997aa5ce7d7c836d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9293dc9772e976abde798799… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 19 11:52:46 2010 +0200 mmdevapi: Improve EndpointNotificationCallback stubs. --- dlls/mmdevapi/devenum.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index e778ab0..867cc28 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1042,7 +1042,7 @@ static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEn MMDevEnumImpl *This = (MMDevEnumImpl*)iface; TRACE("(%p)->(%p)\n", This, client); FIXME("stub\n"); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI MMDevEnum_UnregisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client) @@ -1050,7 +1050,7 @@ static HRESULT WINAPI MMDevEnum_UnregisterEndpointNotificationCallback(IMMDevice MMDevEnumImpl *This = (MMDevEnumImpl*)iface; TRACE("(%p)->(%p)\n", This, client); FIXME("stub\n"); - return E_NOTIMPL; + return S_OK; } static const IMMDeviceEnumeratorVtbl MMDevEnumVtbl =

1 0

Roderick Colenbrander : wgl: Ignore fbconfigs which are window drawable but which lack a visual.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: 26862c5ece31d9e297d87e82b47dfa4e31247ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26862c5ece31d9e297d87e82b… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Apr 20 12:13:25 2010 +0200 wgl: Ignore fbconfigs which are window drawable but which lack a visual. --- dlls/winex11.drv/opengl.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 94fbb1e..a3c4f6b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -992,6 +992,21 @@ static WineGLPixelFormat *get_formats(Display *display, int *size_ret, int *onsc onscreen_size++; } } else if(run && !visinfo) { + int window_drawable=0; + pglXGetFBConfigAttrib(gdi_display, cfgs[i], GLX_DRAWABLE_TYPE, &window_drawable); + + /* Recent Nvidia drivers and DRI drivers offer window drawable formats without a visual. + * This are formats like 16-bit rgb on a 24-bit desktop. In order to support these formats + * onscreen we would have to use glXCreateWindow instead of XCreateWindow. Further it will + * likely make our child window opengl rendering more complicated since likely you can't use + * XCopyArea on a GLX Window. + * For now ignore fbconfigs which are window drawable but lack a visual. */ + if(window_drawable & GLX_WINDOW_BIT) + { + TRACE("Skipping FBCONFIG_ID 0x%x as an offscreen format because it is window_drawable\n", fmt_id); + continue; + } + TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i); list[size].iPixelFormat = size+1; /* The index starts at 1 */ list[size].fbconfig = cfgs[i];

1 0

Gerald Pfeifer : taskmgr: Remove two variables which are not really used from ApplicationPageCompareFunc .
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: 90e5edbf18be07aed1d52ed20d3ea01fe3b2046a URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e5edbf18be07aed1d52ed20… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Apr 19 18:51:00 2010 +0200 taskmgr: Remove two variables which are not really used from ApplicationPageCompareFunc. --- programs/taskmgr/applpage.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index b958887..9f05868 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -411,9 +411,7 @@ static int CALLBACK ApplicationPageCompareFunc(LPARAM lParam1, LPARAM lParam2, L static void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam) { - int idctrl; LPNMHDR pnmh; - LPNM_LISTVIEW pnmv; LV_DISPINFOW* pnmdi; LPAPPLICATION_PAGE_LIST_ITEM pAPLI; @@ -423,9 +421,7 @@ static void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam) LoadStringW(hInst, IDS_APPLICATION_NOT_RESPONDING, wszNotResponding, sizeof(wszNotResponding)/sizeof(WCHAR)); LoadStringW(hInst, IDS_APPLICATION_RUNNING, wszRunning, sizeof(wszRunning)/sizeof(WCHAR)); - idctrl = (int) wParam; pnmh = (LPNMHDR) lParam; - pnmv = (LPNM_LISTVIEW) lParam; pnmdi = (LV_DISPINFOW*) lParam; if (pnmh->hwndFrom == hApplicationPageListCtrl) {

1 0

Gerald Pfeifer : wordpad: Remove variable hwndPreview which is not really used from init_preview.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: 62871e0b7124c574ddc932b09eaf0e8840dabdaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=62871e0b7124c574ddc932b09… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Apr 19 18:48:04 2010 +0200 wordpad: Remove variable hwndPreview which is not really used from init_preview. --- programs/wordpad/print.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 71c0627..226052e 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -789,7 +789,6 @@ static void update_scaled_preview(HWND hMainWnd) void init_preview(HWND hMainWnd, LPWSTR wszFileName) { - HWND hwndPreview; HINSTANCE hInstance = GetModuleHandleW(0); preview.page = 1; preview.hdc = 0; @@ -799,7 +798,7 @@ void init_preview(HWND hMainWnd, LPWSTR wszFileName) preview.zoomlevel = 0; preview_bar_show(hMainWnd, TRUE); - hwndPreview = CreateWindowExW(0, wszPreviewWndClass, NULL, + CreateWindowExW(0, wszPreviewWndClass, NULL, WS_VISIBLE | WS_CHILD | WS_VSCROLL | WS_HSCROLL, 0, 0, 200, 10, hMainWnd, (HMENU)IDC_PREVIEW, hInstance, NULL); }

1 0

Nikolay Sivov : odbc32: Don't crash on null pointers while TRACE enabled.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: c31c4454aa1ce35ee926f1ba6794a55de4073a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31c4454aa1ce35ee926f1ba6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 20 02:27:50 2010 +0400 odbc32: Don't crash on null pointers while TRACE enabled. --- dlls/odbc32/proxyodbc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 0928651..50a2f99 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -959,9 +959,9 @@ SQLRETURN WINAPI SQLDataSources(SQLHENV EnvironmentHandle, if (TRACE_ON(odbc)) { TRACE("returns: %d \t", ret); - if (*NameLength1 > 0) + if (NameLength1 && *NameLength1 > 0) TRACE("DataSource = %s,", ServerName); - if (*NameLength2 > 0) + if (NameLength2 && *NameLength2 > 0) TRACE(" Description = %s", Description); TRACE("\n"); }

1 0

Gerald Pfeifer : winhlp32: Remove not really used id from WINHELP_IndexDlgProc.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: b33d0d5405924e9fd34d902ab8de9119b63d6a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b33d0d5405924e9fd34d902ab… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Apr 19 14:41:48 2010 +0200 winhlp32: Remove not really used id from WINHELP_IndexDlgProc. --- programs/winhlp32/winhelp.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index c5176ca..ffab618 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1307,12 +1307,9 @@ static INT_PTR CALLBACK WINHELP_IndexDlgProc(HWND hWnd, UINT msg, WPARAM wParam, */ static INT_PTR CALLBACK WINHELP_SearchDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { - static struct index_data* id; - switch (msg) { case WM_INITDIALOG: - id = (struct index_data*)((PROPSHEETPAGE*)lParam)->lParam; return TRUE; case WM_NOTIFY: switch (((NMHDR*)lParam)->code)

1 0

Gerald Pfeifer : comctl32: Remove unused scrollInfo from LISTVIEW_MouseWheel.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: aa745feddc8c56f5bca9f202edea600b2be8f547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa745feddc8c56f5bca9f202e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Apr 19 14:35:06 2010 +0200 comctl32: Remove unused scrollInfo from LISTVIEW_MouseWheel. --- dlls/comctl32/listview.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9ca52c5..aeb1ae1 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9493,16 +9493,12 @@ static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) { INT gcWheelDelta = 0; INT pulScrollLines = 3; - SCROLLINFO scrollInfo; TRACE("(wheelDelta=%d)\n", wheelDelta); SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); gcWheelDelta -= wheelDelta; - scrollInfo.cbSize = sizeof(SCROLLINFO); - scrollInfo.fMask = SIF_POS; - switch(infoPtr->uView) { case LV_VIEW_ICON:

1 0

Detlef Riekenberg : shlwapi/tests: Add tests for SHCreateThreadRef.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: 1b67da35662944a3eb9e3fbf9e3de7b7dad3a22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b67da35662944a3eb9e3fbf9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 19 23:26:49 2010 +0200 shlwapi/tests: Add tests for SHCreateThreadRef. --- dlls/shlwapi/tests/thread.c | 105 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 99 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/tests/thread.c b/dlls/shlwapi/tests/thread.c index cb88036..24d5be1 100644 --- a/dlls/shlwapi/tests/thread.c +++ b/dlls/shlwapi/tests/thread.c @@ -29,6 +29,7 @@ #include "wine/test.h" +static HRESULT (WINAPI *pSHCreateThreadRef)(LONG*, IUnknown**); static HRESULT (WINAPI *pSHGetThreadRef)(IUnknown**); static HRESULT (WINAPI *pSHSetThreadRef)(IUnknown*); @@ -36,31 +37,37 @@ static DWORD AddRef_called; typedef struct { - void* lpVtbl; + const IUnknownVtbl* lpVtbl; LONG *ref; } threadref; -static HRESULT WINAPI threadref_QueryInterface(threadref *This, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI threadref_QueryInterface(IUnknown *iface, REFIID riid, LPVOID *ppvObj) { + threadref * This = (threadref *)iface; + trace("unexpected QueryInterface(%p, %p, %p) called\n", This, riid, ppvObj); *ppvObj = NULL; return E_NOINTERFACE; } -static ULONG WINAPI threadref_AddRef(threadref *This) +static ULONG WINAPI threadref_AddRef(IUnknown *iface) { + threadref * This = (threadref *)iface; + AddRef_called++; return InterlockedIncrement(This->ref); } -static ULONG WINAPI threadref_Release(threadref *This) +static ULONG WINAPI threadref_Release(IUnknown *iface) { + threadref * This = (threadref *)iface; + trace("unexpected Release(%p) called\n", This); return InterlockedDecrement(This->ref); } /* VTable */ -static void* threadref_vt[] = +static const IUnknownVtbl threadref_vt = { threadref_QueryInterface, threadref_AddRef, @@ -69,12 +76,96 @@ static void* threadref_vt[] = static void init_threadref(threadref* iface, LONG *refcount) { - iface->lpVtbl = (void*)threadref_vt; + iface->lpVtbl = &threadref_vt; iface->ref = refcount; } /* ##### */ +static void test_SHCreateThreadRef(void) +{ + IUnknown *pobj; + IUnknown *punk; + LONG refcount; + HRESULT hr; + + /* Not present before IE 6_XP_sp2 */ + if (!pSHCreateThreadRef) { + win_skip("SHCreateThreadRef not found\n"); + return; + } + + /* start with a clean state */ + hr = pSHSetThreadRef(NULL); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + pobj = NULL; + refcount = 0xdeadbeef; + hr = pSHCreateThreadRef(&refcount, &pobj); + ok((hr == S_OK) && pobj && (refcount == 1), + "got 0x%x and %p with %d (expected S_OK and '!= NULL' with 1)\n", + hr, pobj, refcount); + + /* the object is not automatic set as ThreadRef */ + punk = NULL; + hr = pSHGetThreadRef(&punk); + ok( (hr == E_NOINTERFACE) && (punk == NULL), + "got 0x%x and %p (expected E_NOINTERFACE and NULL)\n", hr, punk); + + /* set the object */ + hr = pSHSetThreadRef(pobj); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + /* read back */ + punk = NULL; + hr = pSHGetThreadRef(&punk); + ok( (hr == S_OK) && (punk == pobj) && (refcount == 2), + "got 0x%x and %p with %d (expected S_OK and %p with 2)\n", + hr, punk, refcount, pobj); + + /* free the ref from SHGetThreadRef */ + if (SUCCEEDED(hr)) { + hr = IUnknown_Release(pobj); + ok((hr == 1) && (hr == refcount), + "got %d with %d (expected 1 with 1)\n", hr, refcount); + } + + /* free the object */ + if (pobj) { + hr = IUnknown_Release(pobj); + ok((hr == 0) && (hr == refcount), + "got %d with %d (expected 0 with 0)\n", hr, refcount); + } + + if (0) { + /* the ThreadRef has still the pointer, + but the object no longer exist after the *_Release */ + punk = NULL; + hr = pSHGetThreadRef(&punk); + trace("got 0x%x and %p with %d\n", hr, punk, refcount); + } + + /* remove the dead object pointer */ + hr = pSHSetThreadRef(NULL); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + /* parameter check */ + if (0) { + /* vista: E_INVALIDARG, XP: crash */ + pobj = NULL; + hr = pSHCreateThreadRef(NULL, &pobj); + ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); + + refcount = 0xdeadbeef; + /* vista: E_INVALIDARG, XP: crash */ + hr = pSHCreateThreadRef(&refcount, NULL); + ok( (hr == E_INVALIDARG) && (refcount == 0xdeadbeef), + "got 0x%x with 0x%x (expected E_INVALIDARG and oxdeadbeef)\n", + hr, refcount); + } +} + + static void test_SHGetThreadRef(void) { IUnknown *punk; @@ -147,9 +238,11 @@ START_TEST(thread) { HMODULE hshlwapi = GetModuleHandleA("shlwapi.dll"); + pSHCreateThreadRef = (void *) GetProcAddress(hshlwapi, "SHCreateThreadRef"); pSHGetThreadRef = (void *) GetProcAddress(hshlwapi, "SHGetThreadRef"); pSHSetThreadRef = (void *) GetProcAddress(hshlwapi, "SHSetThreadRef"); + test_SHCreateThreadRef(); test_SHGetThreadRef(); test_SHSetThreadRef();

1 0

Detlef Riekenberg : shlwapi: Implement SHCreateThreadRef.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: bb1ca6e08d9f798502d2f20eb4bdcfac5e7d89d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb1ca6e08d9f798502d2f20eb… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 19 23:26:48 2010 +0200 shlwapi: Implement SHCreateThreadRef. --- dlls/shlwapi/shlwapi.spec | 1 + dlls/shlwapi/thread.c | 87 +++++++++++++++++++++++++++++++++++++++++++++ include/shlwapi.h | 1 + 3 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 367046b..268a2e2 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -683,6 +683,7 @@ @ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) @ stdcall SHCreateStreamOnFileW(wstr long ptr) @ stdcall SHCreateStreamWrapper(ptr ptr long ptr) +@ stdcall SHCreateThreadRef(ptr ptr) @ stdcall SHDeleteEmptyKeyA(long ptr) @ stdcall SHDeleteEmptyKeyW(long ptr) @ stdcall SHDeleteKeyA(long str) diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c index fd9e4ba..00d26f7 100644 --- a/dlls/shlwapi/thread.c +++ b/dlls/shlwapi/thread.c @@ -120,6 +120,93 @@ typedef struct tagSHLWAPI_THREAD_INFO IUnknown *refIE; /* Reference to the IE process */ } SHLWAPI_THREAD_INFO, *LPSHLWAPI_THREAD_INFO; +typedef struct +{ + const IUnknownVtbl* lpVtbl; + LONG *ref; +} threadref; + +static HRESULT WINAPI threadref_QueryInterface(IUnknown *iface, REFIID riid, LPVOID *ppvObj) +{ + threadref * This = (threadref *)iface; + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObj); + + if (ppvObj == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppvObj); + *ppvObj = This; + IUnknown_AddRef((IUnknown*)*ppvObj); + return S_OK; + } + + *ppvObj = NULL; + FIXME("(%p, %s, %p) interface not supported\n", This, debugstr_guid(riid), ppvObj); + return E_NOINTERFACE; +} + +static ULONG WINAPI threadref_AddRef(IUnknown *iface) +{ + threadref * This = (threadref *)iface; + + TRACE("(%p)\n", This); + return InterlockedIncrement(This->ref); +} + +static ULONG WINAPI threadref_Release(IUnknown *iface) +{ + LONG refcount; + threadref * This = (threadref *)iface; + + TRACE("(%p)\n", This); + + refcount = InterlockedDecrement(This->ref); + if (!refcount) + HeapFree(GetProcessHeap(), 0, This); + + return refcount; +} + +/* VTable */ +static const IUnknownVtbl threadref_vt = +{ + threadref_QueryInterface, + threadref_AddRef, + threadref_Release, +}; + +/************************************************************************* + * SHCreateThreadRef [SHLWAPI.@] + * + * Create a per-thread IUnknown object + * + * PARAMS + * lprefcount [I] Pointer to a LONG to be used as refcount + * lppUnknown [O] Destination to receive the created object reference + * + * RETURNS + * Success: S_OK. lppUnknown is set to the object reference. + * Failure: E_INVALIDARG, if a parameter is NULL + */ +HRESULT WINAPI SHCreateThreadRef(LONG *lprefcount, IUnknown **lppUnknown) +{ + threadref * This; + TRACE("(%p, %p)\n", lprefcount, lppUnknown); + + if (!lprefcount || !lppUnknown) + return E_INVALIDARG; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(threadref)); + This->lpVtbl = &threadref_vt; + This->ref = lprefcount; + + *lprefcount = 1; + *lppUnknown = (IUnknown *) This; + TRACE("=> returning S_OK with %p\n", This); + return S_OK; +} /************************************************************************* * SHGetThreadRef [SHLWAPI.@] diff --git a/include/shlwapi.h b/include/shlwapi.h index 223bcdd..d4362ac 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -974,6 +974,7 @@ HRESULT WINAPI SHCreateStreamWrapper(LPBYTE,DWORD,DWORD,struct IStream**); HRESULT WINAPI SHAutoComplete(HWND,DWORD); /* Threads */ +HRESULT WINAPI SHCreateThreadRef(LONG*, IUnknown**); HRESULT WINAPI SHGetThreadRef(IUnknown**); HRESULT WINAPI SHSetThreadRef(IUnknown*); HRESULT WINAPI SHReleaseThreadRef(void);

1 0

Alexandre Julliard : gdi32: Convert the driver list to a standard Wine list .
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: 3858ad7bd39aa0ecd82c37b322e726efb994d622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3858ad7bd39aa0ecd82c37b32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 20 13:20:49 2010 +0200 gdi32: Convert the driver list to a standard Wine list. --- dlls/gdi32/driver.c | 44 +++++++++++++++++--------------------------- 1 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 639e4a8..05c2513 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -33,20 +33,20 @@ #include "gdi_private.h" #include "wine/unicode.h" +#include "wine/list.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(driver); struct graphics_driver { - struct graphics_driver *next; - struct graphics_driver *prev; + struct list entry; HMODULE module; /* module handle */ unsigned int count; /* reference count */ DC_FUNCTIONS funcs; }; -static struct graphics_driver *first_driver; +static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; static CRITICAL_SECTION driver_section; @@ -68,8 +68,6 @@ static struct graphics_driver *create_driver( HMODULE module ) struct graphics_driver *driver; if (!(driver = HeapAlloc( GetProcessHeap(), 0, sizeof(*driver)))) return NULL; - driver->next = NULL; - driver->prev = NULL; driver->module = module; driver->count = 1; @@ -213,10 +211,7 @@ static struct graphics_driver *create_driver( HMODULE module ) } else memset( &driver->funcs, 0, sizeof(driver->funcs) ); - /* add it to the list */ - driver->prev = NULL; - if ((driver->next = first_driver)) driver->next->prev = driver; - first_driver = driver; + list_add_head( &drivers, &driver->entry ); return driver; } @@ -293,7 +288,7 @@ const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) if ((module = GetModuleHandleW( name ))) { - for (driver = first_driver; driver; driver = driver->next) + LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) { if (driver->module == module) { @@ -333,9 +328,9 @@ const DC_FUNCTIONS *DRIVER_get_driver( const DC_FUNCTIONS *funcs ) struct graphics_driver *driver; EnterCriticalSection( &driver_section ); - for (driver = first_driver; driver; driver = driver->next) + LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) if (&driver->funcs == funcs) break; - if (!driver) ERR( "driver not found, trouble ahead\n" ); + if (&driver->entry == &drivers) ERR( "driver not found, trouble ahead\n" ); driver->count++; LeaveCriticalSection( &driver_section ); return funcs; @@ -353,21 +348,16 @@ void DRIVER_release_driver( const DC_FUNCTIONS *funcs ) EnterCriticalSection( &driver_section ); - for (driver = first_driver; driver; driver = driver->next) - if (&driver->funcs == funcs) break; - - if (!driver) goto done; - if (--driver->count) goto done; - - /* removed last reference, free it */ - if (driver->next) driver->next->prev = driver->prev; - if (driver->prev) driver->prev->next = driver->next; - else first_driver = driver->next; - if (driver == display_driver) display_driver = NULL; - - FreeLibrary( driver->module ); - HeapFree( GetProcessHeap(), 0, driver ); - done: + 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 ); }

1 0