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

Paul Vriens : wineboot: Update Dutch translation.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 4e0bb60c7c4cfb2874c4d895686cf6db097b063d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0bb60c7c4cfb2874c4d8956… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Apr 20 12:04:06 2010 +0200 wineboot: Update Dutch translation. --- programs/wineboot/wineboot_Nl.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot_Nl.rc b/programs/wineboot/wineboot_Nl.rc index 14a44c1..b3d53cb 100644 --- a/programs/wineboot/wineboot_Nl.rc +++ b/programs/wineboot/wineboot_Nl.rc @@ -37,3 +37,13 @@ BEGIN LTEXT "Als u het proces beëindigt kun u alle niet-opgeslagen data verliezen.", IDC_STATIC,7,28,172,15 END + +IDD_WAITDLG DIALOG 0, 0, 200, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED +CAPTION "Wine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WAITICON, 3, 3, 10, 10 + LTEXT "De Wine configuratie in %s wordt bijgewerkt, even geduld a.u.b. ...", + IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX +END

1 0

Maarten Lankhorst : mmdevapi: Add support for the clock interface.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 2e130087358e114d3791d0f849a742f4410e32e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e130087358e114d3791d0f84… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 19 11:52:53 2010 +0200 mmdevapi: Add support for the clock interface. --- dlls/mmdevapi/audio.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 165 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index 997e037..33099c5 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -77,6 +77,7 @@ typedef struct ACImpl { ACRender *render; ACCapture *capture; + AClock *clock; } ACImpl; struct ACRender { @@ -91,14 +92,25 @@ struct ACCapture { ACImpl *parent; }; +struct AClock { + const IAudioClockVtbl *lpVtbl; + const IAudioClock2Vtbl *lp2Vtbl; + LONG ref; + ACImpl *parent; +}; + static const IAudioClientVtbl ACImpl_Vtbl; static const IAudioRenderClientVtbl ACRender_Vtbl; static const IAudioCaptureClientVtbl ACCapture_Vtbl; +static const IAudioClockVtbl AClock_Vtbl; +static const IAudioClock2Vtbl AClock2_Vtbl; static HRESULT AudioRenderClient_Create(ACImpl *parent, ACRender **ppv); static void AudioRenderClient_Destroy(ACRender *This); static HRESULT AudioCaptureClient_Create(ACImpl *parent, ACCapture **ppv); static void AudioCaptureClient_Destroy(ACCapture *This); +static HRESULT AudioClock_Create(ACImpl *parent, AClock **ppv); +static void AudioClock_Destroy(AClock *This); static int get_format_PCM(WAVEFORMATEX *format) { @@ -277,6 +289,8 @@ static void AudioClient_Destroy(ACImpl *This) AudioRenderClient_Destroy(This->render); if (This->capture) AudioCaptureClient_Destroy(This->capture); + if (This->clock) + AudioClock_Destroy(This->clock); if (This->parent->flow == eRender && This->init) { setALContext(This->parent->ctx); IAudioClient_Stop((IAudioClient*)This); @@ -846,6 +860,10 @@ static HRESULT WINAPI AC_GetService(IAudioClient *iface, REFIID riid, void **ppv if (!This->capture) hr = AudioCaptureClient_Create(This, &This->capture); *ppv = This->capture; + } else if (IsEqualIID(riid, &IID_IAudioClock)) { + if (!This->clock) + hr = AudioClock_Create(This, &This->clock); + *ppv = This->clock; } if (FAILED(hr)) @@ -1212,4 +1230,151 @@ static const IAudioCaptureClientVtbl ACCapture_Vtbl = ACC_GetNextPacketSize }; +static HRESULT AudioClock_Create(ACImpl *parent, AClock **ppv) +{ + AClock *This; + This = *ppv = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + This->lpVtbl = &AClock_Vtbl; + This->lp2Vtbl = &AClock2_Vtbl; + This->ref = 0; + This->parent = parent; + return S_OK; +} + +static void AudioClock_Destroy(AClock *This) +{ + This->parent->clock = NULL; + HeapFree(GetProcessHeap(), 0, This); +} + +static HRESULT WINAPI AClock_QueryInterface(IAudioClock *iface, REFIID riid, void **ppv) +{ + AClock *This = (AClock*)iface; + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) + || IsEqualIID(riid, &IID_IAudioClock)) + *ppv = iface; + else if (IsEqualIID(riid, &IID_IAudioClock2)) + *ppv = &This->lp2Vtbl; + if (*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + WARN("Unknown interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI AClock_AddRef(IAudioClock *iface) +{ + AClock *This = (AClock*)iface; + ULONG ref; + ref = InterlockedIncrement(&This->ref); + TRACE("Refcount now %i\n", ref); + return ref; +} + +static ULONG WINAPI AClock_Release(IAudioClock *iface) +{ + AClock *This = (AClock*)iface; + ULONG ref; + ref = InterlockedDecrement(&This->ref); + TRACE("Refcount now %i\n", ref); + if (!ref) + AudioClock_Destroy(This); + return ref; +} + +static HRESULT WINAPI AClock_GetFrequency(IAudioClock *iface, UINT64 *freq) +{ + AClock *This = (AClock*)iface; + TRACE("(%p)->(%p)\n", This, freq); + + *freq = (UINT64)This->parent->pwfx->nSamplesPerSec; + return S_OK; +} + +static HRESULT WINAPI AClock_GetPosition(IAudioClock *iface, UINT64 *pos, UINT64 *qpctime) +{ + AClock *This = (AClock*)iface; + DWORD pad; + + TRACE("(%p)->(%p,%p)\n", This, pos, qpctime); + + if (!pos) + return E_POINTER; + + EnterCriticalSection(This->parent->crst); + AC_GetCurrentPadding((IAudioClient*)This->parent, &pad); + *pos = This->parent->frameswritten - pad; + if (qpctime) + *qpctime = gettime(); + LeaveCriticalSection(This->parent->crst); + + return S_OK; +} + +static HRESULT WINAPI AClock_GetCharacteristics(IAudioClock *iface, DWORD *chars) +{ + AClock *This = (AClock*)iface; + TRACE("(%p)->(%p)\n", This, chars); + + if (!chars) + return E_POINTER; + *chars = AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ; + return S_OK; +} + +static const IAudioClockVtbl AClock_Vtbl = +{ + AClock_QueryInterface, + AClock_AddRef, + AClock_Release, + AClock_GetFrequency, + AClock_GetPosition, + AClock_GetCharacteristics +}; + +static AClock *get_clock_from_clock2(IAudioClock2 *iface) +{ + return (AClock*)((char*)iface - offsetof(AClock,lp2Vtbl)); +} + +static HRESULT WINAPI AClock2_QueryInterface(IAudioClock2 *iface, REFIID riid, void **ppv) +{ + AClock *This = get_clock_from_clock2(iface); + return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); +} + +static ULONG WINAPI AClock2_AddRef(IAudioClock2 *iface) +{ + AClock *This = get_clock_from_clock2(iface); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI AClock2_Release(IAudioClock2 *iface) +{ + AClock *This = get_clock_from_clock2(iface); + return IUnknown_Release((IUnknown*)This); +} + +static HRESULT WINAPI AClock2_GetPosition(IAudioClock2 *iface, UINT64 *pos, UINT64 *qpctime) +{ + AClock *This = get_clock_from_clock2(iface); + return AClock_GetPosition((IAudioClock*)This, pos, qpctime); +} + +static const IAudioClock2Vtbl AClock2_Vtbl = +{ + AClock2_QueryInterface, + AClock2_AddRef, + AClock2_Release, + AClock2_GetPosition +}; + #endif

1 0

Jaime Rave : user32: Draw the rect edges from left to right and top to bottom.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 61052164043c8ba8be9a53e29de03e4371fced0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=61052164043c8ba8be9a53e29… Author: Jaime Rave <jaimerave(a)ubuntu-co.com> Date: Mon Apr 19 21:07:01 2010 -0500 user32: Draw the rect edges from left to right and top to bottom. --- dlls/user32/uitools.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 80490cf..9fe2044 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -511,13 +511,13 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc, SelectObject(hdc, RBOuterPen); if(uFlags & BF_BOTTOM) { - MoveToEx(hdc, InnerRect.right-1, InnerRect.bottom-1, NULL); - LineTo(hdc, InnerRect.left-1, InnerRect.bottom-1); + MoveToEx(hdc, InnerRect.left, InnerRect.bottom-1, NULL); + LineTo(hdc, InnerRect.right-1, InnerRect.bottom-1); } if(uFlags & BF_RIGHT) { - MoveToEx(hdc, InnerRect.right-1, InnerRect.bottom-1, NULL); - LineTo(hdc, InnerRect.right-1, InnerRect.top-1); + MoveToEx(hdc, InnerRect.right-1, InnerRect.top, NULL); + LineTo(hdc, InnerRect.right-1, InnerRect.bottom); } /* Draw the inner edge */ @@ -535,13 +535,13 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc, SelectObject(hdc, RBInnerPen); if(uFlags & BF_BOTTOM) { - MoveToEx(hdc, InnerRect.right-1-RBpenplus, InnerRect.bottom-2, NULL); - LineTo(hdc, InnerRect.left-1+LBpenplus, InnerRect.bottom-2); + MoveToEx(hdc, InnerRect.left+LBpenplus, InnerRect.bottom-2, NULL); + LineTo(hdc, InnerRect.right-1-RBpenplus, InnerRect.bottom-2); } if(uFlags & BF_RIGHT) { - MoveToEx(hdc, InnerRect.right-2, InnerRect.bottom-1-RBpenplus, NULL); - LineTo(hdc, InnerRect.right-2, InnerRect.top-1+RTpenplus); + MoveToEx(hdc, InnerRect.right-2, InnerRect.top+2-RBpenplus, NULL); + LineTo(hdc, InnerRect.right-2, InnerRect.bottom-2+RTpenplus); } if( ((uFlags & BF_MIDDLE) && retval) || (uFlags & BF_ADJUST) )

1 0

Nikolay Sivov : shell32/tests: Fix a test failure on W2K ( unimplemented method).
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: f375123f011f648f91ee3d7072b30bf881968d4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f375123f011f648f91ee3d707… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 20 02:57:09 2010 +0400 shell32/tests: Fix a test failure on W2K (unimplemented method). --- dlls/shell32/tests/shfldr_special.c | 48 ++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 7be2bdf..24374bc 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -162,32 +162,34 @@ if (0) hr = IShellFolder2_GetDefaultColumnState(folder, 6, &state); ok(broken(hr == E_NOTIMPL) || hr == E_INVALIDARG /* Win7 */, "got 0x%08x\n", hr); - for(i = 0; i < 6; i++) + hr = IShellFolder2_GetDetailsOf(folder, NULL, 0, &details); + ok(hr == S_OK || broken(E_NOTIMPL) /* W2K */, "got 0x%08x\n", hr); + /* test every column if method is implemented */ + if (hr == S_OK) { - hr = IShellFolder2_GetDetailsOf(folder, NULL, i, &details); - /* doesn't work on W2K */ - if (hr == E_NOTIMPL) break; - - ok(hr == S_OK, "got 0x%08x\n", hr); - /* all columns are left-aligned */ - ok(details.fmt == LVCFMT_LEFT, "got 0x%x\n", details.fmt); - /* can't be on w9x at this point, IShellFolder2 unsupported there, - check present for running Wine with w9x setup */ - if (SHELL_OsIsUnicode()) SHFree(details.str.u.pOleStr); - - hr = IShellFolder2_GetDefaultColumnState(folder, i, &state); - ok(hr == S_OK, "got 0x%08x\n", hr); - /* all columns are string except document count */ - if (i == 1) - ok(state == (SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT), "got 0x%x\n", state); - else - ok(state == (SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT), "got 0x%x\n", state); + ok(details.str.uType == STRRET_WSTR, "got %d\n", details.str.uType); + + for(i = 0; i < 6; i++) + { + hr = IShellFolder2_GetDetailsOf(folder, NULL, i, &details); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* all columns are left-aligned */ + ok(details.fmt == LVCFMT_LEFT, "got 0x%x\n", details.fmt); + /* can't be on w9x at this point, IShellFolder2 unsupported there, + check present for running Wine with w9x setup */ + if (SHELL_OsIsUnicode()) SHFree(details.str.u.pOleStr); + + hr = IShellFolder2_GetDefaultColumnState(folder, i, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + /* all columns are string except document count */ + if (i == 1) + ok(state == (SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT), "got 0x%x\n", state); + else + ok(state == (SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT), "got 0x%x\n", state); + } } - hr = IShellFolder2_GetDetailsOf(folder, NULL, 0, &details); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(details.str.uType == STRRET_WSTR, "got %d\n", details.str.uType); - /* default pidl */ hr = IShellFolder2_QueryInterface(folder, &IID_IPersistFolder2, (void**)&pf); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Alexandre Julliard : gdi32: Convert the driver list to a standard Wine list .
by Alexandre Julliard 20 Apr '10

20 Apr '10

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

Alexandre Julliard : winex11: Fix memory leaks in get_bitmap_argb.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: f84f9394112436810941d8e2b43875f246bff44a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f84f9394112436810941d8e2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 20 13:55:11 2010 +0200 winex11: Fix memory leaks in get_bitmap_argb. --- dlls/winex11.drv/window.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index dac2874..1621861 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -859,7 +859,9 @@ static unsigned long *get_bitmap_argb( HDC hdc, HBITMAP color, HBITMAP mask, uns for (i = 0; i < bm.bmHeight; i++) for (j = 0; j < bm.bmWidth; j++, ptr++) if ((mask_bits[i * width_bytes + j / 8] << (j % 8)) & 0x80) *ptr |= 0xff000000; + HeapFree( GetProcessHeap(), 0, mask_bits ); } + HeapFree( GetProcessHeap(), 0, info ); /* convert to array of longs */ if (bits && sizeof(long) > sizeof(int))

1 0

Detlef Riekenberg : shlwapi: Implement SHCreateThreadRef.
by Alexandre Julliard 20 Apr '10

20 Apr '10

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

Detlef Riekenberg : shlwapi/tests: Add tests for SHCreateThreadRef.
by Alexandre Julliard 20 Apr '10

20 Apr '10

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

Nikolay Sivov : comctl32/listview: Exit early on LVM_CREATEDRAGIMAGE if null pointer passed for a point.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 7371d0d2fcb2fcaf8b60d63f299ded51fc7c43f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7371d0d2fcb2fcaf8b60d63f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 20 02:23:28 2010 +0400 comctl32/listview: Exit early on LVM_CREATEDRAGIMAGE if null pointer passed for a point. --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/listview.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 642a8aa..9ca52c5 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5209,7 +5209,7 @@ static HIMAGELIST LISTVIEW_CreateDragImage(LISTVIEW_INFO *infoPtr, INT iItem, LP HIMAGELIST dragList = 0; TRACE("iItem=%d Count=%d\n", iItem, infoPtr->nItemCount); - if (iItem < 0 || iItem >= infoPtr->nItemCount) + if (iItem < 0 || iItem >= infoPtr->nItemCount || !lppt) return 0; rcItem.left = LVIR_BOUNDS; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 59c3dc1..2c5ef70 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4344,6 +4344,28 @@ static void test_header_notification(void) DestroyWindow(list); } +static void test_createdragimage(void) +{ + HIMAGELIST himl; + POINT pt; + HWND list; + + list = create_listview_control(LVS_ICON); + ok(list != 0, "failed to create listview window\n"); + + insert_item(list, 0); + + /* NULL point */ + himl = (HIMAGELIST)SendMessageA(list, LVM_CREATEDRAGIMAGE, 0, 0); + ok(himl == NULL, "got %p\n", himl); + + himl = (HIMAGELIST)SendMessageA(list, LVM_CREATEDRAGIMAGE, 0, (LPARAM)&pt); + ok(himl != NULL, "got %p\n", himl); + ImageList_Destroy(himl); + + DestroyWindow(list); +} + START_TEST(listview) { HMODULE hComctl32; @@ -4406,6 +4428,7 @@ START_TEST(listview) test_finditem(); test_hover(); test_destroynotify(); + test_createdragimage(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Nikolay Sivov : odbc32: Don't crash on null pointers while TRACE enabled.
by Alexandre Julliard 20 Apr '10

20 Apr '10

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