wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

YongHao Hu : msvcp90/tests: Fix a spelling error.
by Alexandre Julliard 29 Apr '15

29 Apr '15

Module: wine Branch: master Commit: 4810f44cf9815c1eb707bdde55400486a6b6b5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4810f44cf9815c1eb707bdde5… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Wed Apr 29 11:31:52 2015 +0800 msvcp90/tests: Fix a spelling error. --- dlls/msvcp90/tests/ios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 1a74147..0c57ca1 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -626,7 +626,7 @@ static BOOL init(void) msvcr = LoadLibraryA("msvcr90.dll"); msvcp = LoadLibraryA("msvcp90.dll"); if(!msvcr || !msvcp) { - win_skip("msvcp90.dll or msvcrt90.dll not installed\n"); + win_skip("msvcp90.dll or msvcr90.dll not installed\n"); return FALSE; }

1 0

Alexandre Julliard : secur32: Add a loop around gnutls_record_send since it may send a partial record.
by Alexandre Julliard 29 Apr '15

29 Apr '15

Module: wine Branch: master Commit: f54a9f4db407ab8224ee76c945e72741e4f3ffba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54a9f4db407ab8224ee76c94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 29 13:07:17 2015 +0900 secur32: Add a loop around gnutls_record_send since it may send a partial record. --- dlls/secur32/schannel_gnutls.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 1173574..7039dcd 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -400,30 +400,31 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, SIZE_T *length) { gnutls_session_t s = (gnutls_session_t)session; - ssize_t ret; - -again: - ret = pgnutls_record_send(s, buffer, *length); + ssize_t ret, total = 0; - if (ret >= 0) - *length = ret; - else if (ret == GNUTLS_E_AGAIN) + for (;;) { - struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); - SIZE_T count = 0; - - if (schan_get_buffer(t, &t->out, &count)) - goto again; + ret = pgnutls_record_send(s, (const char *)buffer + total, *length - total); + if (ret >= 0) + { + total += ret; + TRACE( "sent %d now %d/%ld\n", ret, total, *length ); + if (total == *length) return SEC_E_OK; + } + else if (ret == GNUTLS_E_AGAIN) + { + struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); + SIZE_T count = 0; - return SEC_I_CONTINUE_NEEDED; - } - else - { - pgnutls_perror(ret); - return SEC_E_INTERNAL_ERROR; + if (schan_get_buffer(t, &t->out, &count)) continue; + return SEC_I_CONTINUE_NEEDED; + } + else + { + pgnutls_perror(ret); + return SEC_E_INTERNAL_ERROR; + } } - - return SEC_E_OK; } SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer,

1 0

Nikolay Sivov : include: Fixed method arguments attributes for oleacc.idl.
by Alexandre Julliard 29 Apr '15

29 Apr '15

Module: wine Branch: master Commit: 9a11e524801a1540dd3c36848e7f0e4b6778746f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a11e524801a1540dd3c36848… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 29 00:58:00 2015 +0300 include: Fixed method arguments attributes for oleacc.idl. --- include/oleacc.idl | 108 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 74 insertions(+), 34 deletions(-) diff --git a/include/oleacc.idl b/include/oleacc.idl index 97b7858..dc7af15 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -228,7 +228,9 @@ interface IAccessibleHandler : IUnknown ] interface IAccIdentity : IUnknown { - HRESULT GetIdentityString ([in] DWORD dwIDChild, [out] BYTE **ppIDString, [out] DWORD *pdwIDStringLen); + HRESULT GetIdentityString([in] DWORD idchild, + [out, size_is(*string_len)] BYTE **str, + [out] DWORD *string_len); } [ @@ -238,8 +240,11 @@ interface IAccIdentity : IUnknown ] interface IAccPropServer: IUnknown { - HRESULT GetPropValue ([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] MSAAPROPID idProp, - [out] VARIANT *pvarValue, [out] BOOL *pfHasProp); + HRESULT GetPropValue([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [in] MSAAPROPID idProp, + [out] VARIANT *value, + [out] BOOL *has_prop); } [ @@ -249,45 +254,80 @@ interface IAccPropServer: IUnknown ] interface IAccPropServices : IUnknown { - HRESULT SetPropValue([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] MSAAPROPID idProp, [in] VARIANT var); - - HRESULT SetPropServer([in] const BYTE * pIDString, [in] DWORD dwIDStringLen, [in] const MSAAPROPID* paProps, - [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); - - HRESULT ClearProps([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] const MSAAPROPID* paProps, [in] int cProps); + HRESULT SetPropValue([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [in] MSAAPROPID idProp, + [in] VARIANT var); + + HRESULT SetPropServer([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps, + [in] IAccPropServer* pServer, + [in] AnnoScope AnnoScope); + + HRESULT ClearProps([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps); HRESULT SetHwndProp([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, [in] MSAAPROPID idProp, [in] VARIANT var); HRESULT SetHwndPropStr([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, - [in] MSAAPROPID idProp, [in] LPWSTR str); - - HRESULT SetHwndPropServer([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, - [in] const MSAAPROPID* paProps, [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); - - HRESULT ClearHwndProps([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, - [in] const MSAAPROPID* paProps, [in] int cProps); - - HRESULT ComposeHwndIdentityString([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, - [out] BYTE **ppIDString, [out] DWORD* pdwIDStringLen); - - HRESULT DecomposeHwndIdentityString([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, - [out] HWND* phwnd, [out] DWORD* pidObject, [out] DWORD* pidChild); + [in] MSAAPROPID idProp, [in, string] LPWSTR str); + + HRESULT SetHwndPropServer([in] HWND hwnd, + [in] DWORD idObject, + [in] DWORD idChild, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps, + [in] IAccPropServer *server, + [in] AnnoScope scope); + + HRESULT ClearHwndProps([in] HWND hwnd, + [in] DWORD idObject, + [in] DWORD idChild, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps); + + HRESULT ComposeHwndIdentityString([in] HWND hwnd, + [in] DWORD idObject, + [in] DWORD idChild, + [out, size_is(*string_len)] BYTE **str, + [out] DWORD *string_len); + + HRESULT DecomposeHwndIdentityString([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [out] HWND *phwnd, + [out] DWORD *pidObject, + [out] DWORD *pidChild); HRESULT SetHmenuProp([in] HMENU hmenu, [in] DWORD idChild, [in] MSAAPROPID idProp, [in] VARIANT var); - HRESULT SetHmenuPropStr([in] HMENU hmenu, [in] DWORD idChild, [in] MSAAPROPID idProp, [in] LPWSTR str); - - HRESULT SetHmenuPropServer([in] HMENU hmenu, [in] DWORD idChild, [in] const MSAAPROPID* paProps, - [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); - - HRESULT ClearHmenuProps([in] HMENU hmenu, [in] DWORD idChild, [in] const MSAAPROPID* paProps, [in] int cProps); - - HRESULT ComposeHmenuIdentityString([in] HMENU hmenu, [in] DWORD idChild, - [out] BYTE **ppIDString, [out] DWORD *pdwIDStringLen); - - HRESULT DecomposeHmenuIdentityString([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, - [out] HMENU *phmenu, [out] DWORD *pidChild); + HRESULT SetHmenuPropStr([in] HMENU hmenu, [in] DWORD idChild, [in] MSAAPROPID idProp, [in, string] LPWSTR str); + + HRESULT SetHmenuPropServer([in] HMENU hmenu, + [in] DWORD idChild, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps, + [in] IAccPropServer *server, + [in] AnnoScope scope); + + HRESULT ClearHmenuProps([in] HMENU hmenu, + [in] DWORD idChild, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps); + + HRESULT ComposeHmenuIdentityString([in] HMENU hmenu, + [in] DWORD idChild, + [out, size_is(*string_len)] BYTE **str, + [out] DWORD *string_len); + + HRESULT DecomposeHmenuIdentityString([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [out] HMENU *phmenu, + [out] DWORD *pidChild); } [

1 0

Nikolay Sivov : explorer: Added a stub IShellWindows implementation.
by Alexandre Julliard 29 Apr '15

29 Apr '15

Module: wine Branch: master Commit: b4769495bc6310f9683a005303bd6cff23e167c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4769495bc6310f9683a00530… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 28 18:55:21 2015 +0300 explorer: Added a stub IShellWindows implementation. Most of it was done by Andrew Eikum. --- dlls/shell32/tests/shelldispatch.c | 26 +++- programs/explorer/desktop.c | 269 +++++++++++++++++++++++++++++++++++++ 2 files changed, 288 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4769495bc6310f9683a0…

1 0

Nikolay Sivov : shell32/tests: Some tests for IShellWindows.
by Alexandre Julliard 29 Apr '15

29 Apr '15

Module: wine Branch: master Commit: fae0f6785a110029670d8497e38887750d2eb27b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae0f6785a110029670d8497e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 28 17:38:20 2015 +0300 shell32/tests: Some tests for IShellWindows. --- dlls/shell32/tests/shelldispatch.c | 97 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 75a06cc..02a45cb 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -385,6 +385,102 @@ static void test_ShellFolderView(void) IShellFolder_Release(desktop); } +static void test_ShellWindows(void) +{ + IShellWindows *shellwindows; + LONG cookie, cookie2, ret; + IDispatch *disp; + VARIANT v, v2; + HRESULT hr; + HWND hwnd; + + hr = CoCreateInstance(&CLSID_ShellWindows, NULL, CLSCTX_LOCAL_SERVER, + &IID_IShellWindows, (void**)&shellwindows); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr != S_OK) return; + + /* NULL out argument */ + hr = IShellWindows_Register(shellwindows, NULL, 0, SWC_EXPLORER, NULL); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "got 0x%08x\n", hr); + + hr = IShellWindows_Register(shellwindows, NULL, 0, SWC_EXPLORER, &cookie); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IShellWindows_Register(shellwindows, (IDispatch*)shellwindows, 0, SWC_EXPLORER, &cookie); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IShellWindows_Register(shellwindows, (IDispatch*)shellwindows, 0, SWC_EXPLORER, &cookie); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hwnd = CreateWindowExA(0, "button", "test", BS_CHECKBOX | WS_VISIBLE | WS_POPUP, + 0, 0, 50, 14, 0, 0, 0, NULL); + ok(hwnd != NULL, "got %p, error %d\n", hwnd, GetLastError()); + + cookie = 0; + hr = IShellWindows_Register(shellwindows, NULL, HandleToLong(hwnd), SWC_EXPLORER, &cookie); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cookie != 0, "got %d\n", cookie); + + cookie2 = 0; + hr = IShellWindows_Register(shellwindows, NULL, HandleToLong(hwnd), SWC_EXPLORER, &cookie2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cookie2 != 0 && cookie2 != cookie, "got %d\n", cookie2); + + hr = IShellWindows_Revoke(shellwindows, cookie); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellWindows_Revoke(shellwindows, cookie2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IShellWindows_Revoke(shellwindows, 0); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + /* we can register ourselves as desktop, but FindWindowSW still returns real desktop window */ + cookie = 0; + hr = IShellWindows_Register(shellwindows, NULL, HandleToLong(hwnd), SWC_DESKTOP, &cookie); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cookie != 0, "got %d\n", cookie); + + disp = (void*)0xdeadbeef; + ret = 0xdead; + VariantInit(&v); + hr = IShellWindows_FindWindowSW(shellwindows, &v, &v, SWC_DESKTOP, &ret, SWFO_NEEDDISPATCH, &disp); + ok(hr == S_OK || broken(hr == S_FALSE), "got 0x%08x\n", hr); + if (hr == S_FALSE) /* winxp and earlier */ { + /* older versions allowed to regiser SWC_DESKTOP and access it with FindWindowSW */ + ok(disp == NULL, "got %p\n", disp); + ok(ret == 0, "got %d\n", ret); + } + else { + ok(disp != NULL, "got %p\n", disp); + ok(ret != HandleToUlong(hwnd), "got %d\n", ret); + if (disp) IDispatch_Release(disp); + } + + disp = (void*)0xdeadbeef; + ret = 0xdead; + VariantInit(&v); + hr = IShellWindows_FindWindowSW(shellwindows, &v, &v, SWC_DESKTOP, &ret, 0, &disp); + ok(hr == S_OK || broken(hr == S_FALSE) /* winxp */, "got 0x%08x\n", hr); + ok(disp == NULL, "got %p\n", disp); + ok(ret != HandleToUlong(hwnd), "got %d\n", ret); + + disp = (void*)0xdeadbeef; + ret = 0xdead; + V_VT(&v) = VT_I4; + V_I4(&v) = cookie; + VariantInit(&v2); + hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_BROWSER, &ret, SWFO_COOKIEPASSED, &disp); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(disp == NULL, "got %p\n", disp); + ok(ret == 0, "got %d\n", ret); + + hr = IShellWindows_Revoke(shellwindows, cookie); + ok(hr == S_OK, "got 0x%08x\n", hr); + DestroyWindow(hwnd); + IShellWindows_Release(shellwindows); +} + START_TEST(shelldispatch) { HRESULT r; @@ -398,6 +494,7 @@ START_TEST(shelldispatch) test_namespace(); test_service(); test_ShellFolderView(); + test_ShellWindows(); CoUninitialize(); }

1 0

Nikolay Sivov : dmime: Remove separate IUnknown vtable from IDirectMusicAudioPath impl.
by Alexandre Julliard 29 Apr '15

29 Apr '15

Module: wine Branch: master Commit: ef585842d6af0a705586238b6f79eb9c9ce1800a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef585842d6af0a705586238b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 02:10:26 2015 +0300 dmime: Remove separate IUnknown vtable from IDirectMusicAudioPath impl. --- dlls/dmime/audiopath.c | 126 ++++++++++++++++++----------------------------- dlls/dmime/tests/dmime.c | 1 + 2 files changed, 50 insertions(+), 77 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index bd789c2..16d04c5 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -23,8 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); WINE_DECLARE_DEBUG_CHANNEL(dmfile); struct IDirectMusicAudioPathImpl { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; const IDirectMusicAudioPathVtbl *AudioPathVtbl; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl; @@ -62,82 +60,57 @@ void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath *iface, IDirectSo /***************************************************************************** * IDirectMusicAudioPathImpl implementation */ -/* IDirectMusicAudioPath IUnknown part: */ -static HRESULT WINAPI IDirectMusicAudioPathImpl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicAudioPath)) { - *ppobj = &This->AudioPathVtbl; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = &This->ObjectVtbl; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IUnknown_AddRef (iface); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} +static HRESULT WINAPI IDirectMusicAudioPathImpl_QueryInterface (IDirectMusicAudioPath *iface, REFIID riid, void **ppobj) +{ + ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, AudioPathVtbl, iface); -static ULONG WINAPI IDirectMusicAudioPathImpl_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - TRACE("(%p): AddRef from %d\n", This, ref - 1); + *ppobj = NULL; - DMIME_LockModule(); + if (IsEqualIID (riid, &IID_IDirectMusicAudioPath) || IsEqualIID (riid, &IID_IUnknown)) + *ppobj = &This->AudioPathVtbl; + else if (IsEqualIID (riid, &IID_IDirectMusicObject)) + *ppobj = &This->ObjectVtbl; + else if (IsEqualIID (riid, &IID_IPersistStream)) + *ppobj = &This->PersistStreamVtbl; - return ref; -} - -static ULONG WINAPI IDirectMusicAudioPathImpl_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - if (This->pDSBuffer) { - IDirectSoundBuffer8_Release(This->pDSBuffer); + if (*ppobj) { + IUnknown_AddRef((IUnknown*)*ppobj); + return S_OK; } - This->pPerf = NULL; - HeapFree(GetProcessHeap(), 0, This); - } - DMIME_UnlockModule(); - - return ref; + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); + return E_NOINTERFACE; } -static const IUnknownVtbl DirectMusicAudioPath_Unknown_Vtbl = { - IDirectMusicAudioPathImpl_IUnknown_QueryInterface, - IDirectMusicAudioPathImpl_IUnknown_AddRef, - IDirectMusicAudioPathImpl_IUnknown_Release -}; +static ULONG WINAPI IDirectMusicAudioPathImpl_AddRef (IDirectMusicAudioPath *iface) +{ + ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, AudioPathVtbl, iface); + ULONG ref = InterlockedIncrement(&This->ref); -/* IDirectMusicAudioPathImpl IDirectMusicAudioPath part: */ -static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_QueryInterface (LPDIRECTMUSICAUDIOPATH iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, AudioPathVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); -} + TRACE("(%p): AddRef from %d\n", This, ref - 1); -static ULONG WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_AddRef (LPDIRECTMUSICAUDIOPATH iface) { - ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, AudioPathVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + DMIME_LockModule(); + return ref; } -static ULONG WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_Release (LPDIRECTMUSICAUDIOPATH iface) { - ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, AudioPathVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); +static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *iface) +{ + ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, AudioPathVtbl, iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p): ReleaseRef to %d\n", This, ref); + + if (ref == 0) { + if (This->pDSBuffer) + IDirectSoundBuffer8_Release(This->pDSBuffer); + This->pPerf = NULL; + HeapFree(GetProcessHeap(), 0, This); + } + + DMIME_UnlockModule(); + return ref; } static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_GetObjectInPath (LPDIRECTMUSICAUDIOPATH iface, DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, REFGUID guidObject, WORD dwIndex, REFGUID iidInterface, void** ppObject) { @@ -258,9 +231,9 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_ConvertPCh } static const IDirectMusicAudioPathVtbl DirectMusicAudioPath_AudioPath_Vtbl = { - IDirectMusicAudioPathImpl_IDirectMusicAudioPath_QueryInterface, - IDirectMusicAudioPathImpl_IDirectMusicAudioPath_AddRef, - IDirectMusicAudioPathImpl_IDirectMusicAudioPath_Release, + IDirectMusicAudioPathImpl_QueryInterface, + IDirectMusicAudioPathImpl_AddRef, + IDirectMusicAudioPathImpl_Release, IDirectMusicAudioPathImpl_IDirectMusicAudioPath_GetObjectInPath, IDirectMusicAudioPathImpl_IDirectMusicAudioPath_Activate, IDirectMusicAudioPathImpl_IDirectMusicAudioPath_SetVolume, @@ -270,17 +243,17 @@ static const IDirectMusicAudioPathVtbl DirectMusicAudioPath_AudioPath_Vtbl = { /* IDirectMusicAudioPathImpl IDirectMusicObject part: */ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, ObjectVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IUnknown_QueryInterface ((LPUNKNOWN)&This->AudioPathVtbl, riid, ppobj); } static ULONG WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, ObjectVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IUnknown_AddRef ((LPUNKNOWN)&This->AudioPathVtbl); } static ULONG WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, ObjectVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IUnknown_Release ((LPUNKNOWN)&This->AudioPathVtbl); } static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { @@ -485,17 +458,17 @@ static const IDirectMusicObjectVtbl DirectMusicAudioPath_Object_Vtbl = { /* IDirectMusicAudioPathImpl IPersistStream part: */ static HRESULT WINAPI IDirectMusicAudioPathImpl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, PersistStreamVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IUnknown_QueryInterface ((LPUNKNOWN)&This->AudioPathVtbl, riid, ppobj); } static ULONG WINAPI IDirectMusicAudioPathImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, PersistStreamVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IUnknown_AddRef ((LPUNKNOWN)&This->AudioPathVtbl); } static ULONG WINAPI IDirectMusicAudioPathImpl_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, PersistStreamVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IUnknown_Release ((LPUNKNOWN)&This->AudioPathVtbl); } static HRESULT WINAPI IDirectMusicAudioPathImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -682,7 +655,6 @@ HRESULT WINAPI create_dmaudiopath(REFIID lpcGUID, void **ppobj) *ppobj = NULL; return E_OUTOFMEMORY; } - obj->UnknownVtbl = &DirectMusicAudioPath_Unknown_Vtbl; obj->AudioPathVtbl = &DirectMusicAudioPath_AudioPath_Vtbl; obj->ObjectVtbl = &DirectMusicAudioPath_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicAudioPath_PersistStream_Vtbl; @@ -692,5 +664,5 @@ HRESULT WINAPI create_dmaudiopath(REFIID lpcGUID, void **ppobj) obj->pDesc->guidClass = CLSID_DirectMusicAudioPathConfig; obj->ref = 0; /* will be inited by QueryInterface */ - return IDirectMusicAudioPathImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); + return IUnknown_QueryInterface ((LPUNKNOWN)&obj->AudioPathVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 18586fd..eb65cb2 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -81,6 +81,7 @@ static void test_COM_audiopath(void) hr = IDirectMusicAudioPath_QueryInterface(dmap, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(unk == (IUnknown*)dmap, "got %p, %p\n", unk, dmap); refcount = IUnknown_AddRef(unk); ok(refcount == 5, "refcount == %u, expected 5\n", refcount); refcount = IUnknown_Release(unk);

1 0

Henri Verbeet : d3d10core: Release the wined3d query in d3d10_query_Release() (Valgrind).
by Alexandre Julliard 29 Apr '15

29 Apr '15

Module: wine Branch: master Commit: 39fc8553162dac7635a0e8d0970d64b09c801ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39fc8553162dac7635a0e8d09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 20:30:55 2015 +0200 d3d10core: Release the wined3d query in d3d10_query_Release() (Valgrind). --- dlls/d3d10core/async.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/async.c b/dlls/d3d10core/async.c index d6c3d81..f6886a7 100644 --- a/dlls/d3d10core/async.c +++ b/dlls/d3d10core/async.c @@ -66,16 +66,17 @@ static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface) static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) { - struct d3d10_query *This = impl_from_ID3D10Query(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d10_query *query = impl_from_ID3D10Query(iface); + ULONG refcount = InterlockedDecrement(&query->refcount); - TRACE("%p decreasing refcount to %u.\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", query, refcount); if (!refcount) { - ID3D10Device1_Release(This->device); - wined3d_private_store_cleanup(&This->private_store); - HeapFree(GetProcessHeap(), 0, This); + ID3D10Device1_Release(query->device); + wined3d_query_decref(query->wined3d_query); + wined3d_private_store_cleanup(&query->private_store); + HeapFree(GetProcessHeap(), 0, query); } return refcount;

1 0

Henri Verbeet : d3d10core: Don' t use potentially uninitialized data in the depth/stencil state key ( Valgrind).
by Alexandre Julliard 29 Apr '15

29 Apr '15

Module: wine Branch: master Commit: 0a12107604859f04fdab75eff8240a790221d085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a12107604859f04fdab75eff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 20:30:54 2015 +0200 d3d10core: Don't use potentially uninitialized data in the depth/stencil state key (Valgrind). --- dlls/d3d10core/device.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index d8b3d7e..3ba87b4 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1744,6 +1744,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi { struct d3d10_device *device = impl_from_ID3D10Device(iface); struct d3d10_depthstencil_state *object; + D3D10_DEPTH_STENCIL_DESC tmp_desc; struct wine_rb_entry *entry; HRESULT hr; @@ -1752,7 +1753,19 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi if (!desc) return E_INVALIDARG; - if ((entry = wine_rb_get(&device->depthstencil_states, desc))) + /* D3D10_DEPTH_STENCIL_DESC has a hole, which is a problem because we use + * it as a key in the rbtree. */ + memset(&tmp_desc, 0, sizeof(tmp_desc)); + tmp_desc.DepthEnable = desc->DepthEnable; + tmp_desc.DepthWriteMask = desc->DepthWriteMask; + tmp_desc.DepthFunc = desc->DepthFunc; + tmp_desc.StencilEnable = desc->StencilEnable; + tmp_desc.StencilReadMask = desc->StencilReadMask; + tmp_desc.StencilWriteMask = desc->StencilWriteMask; + tmp_desc.FrontFace = desc->FrontFace; + tmp_desc.BackFace = desc->BackFace; + + if ((entry = wine_rb_get(&device->depthstencil_states, &tmp_desc))) { object = WINE_RB_ENTRY_VALUE(entry, struct d3d10_depthstencil_state, entry); @@ -1767,7 +1780,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi if (!object) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_depthstencil_state_init(object, device, desc))) + if (FAILED(hr = d3d10_depthstencil_state_init(object, device, &tmp_desc))) { WARN("Failed to initialize depthstencil state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object);

1 0

Henri Verbeet : wined3d: Don' t try to apply format fixups for SM4+ shaders.
by Alexandre Julliard 29 Apr '15

29 Apr '15

Module: wine Branch: master Commit: da24b5113949fd98059c43ad9288e4bae8d78326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da24b5113949fd98059c43ad9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 20:30:53 2015 +0200 wined3d: Don't try to apply format fixups for SM4+ shaders. --- dlls/wined3d/glsl_shader.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ff884f9..132ecdf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2765,7 +2765,10 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s shader_glsl_swizzle_to_str(swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); - if (version->type == WINED3D_SHADER_TYPE_PIXEL) + /* FIXME: We currently don't support fixups for vertex shaders or anything + * above SM3. Note that for SM4+ the sampler index doesn't have to match + * the resource index. */ + if (version->type == WINED3D_SHADER_TYPE_PIXEL && version->major < 4) { const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; fixup = priv->cur_ps_args->color_fixup[sampler]; @@ -2780,7 +2783,7 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s } else { - fixup = COLOR_FIXUP_IDENTITY; /* FIXME: Vshader color fixup */ + fixup = COLOR_FIXUP_IDENTITY; } shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], sample_function->data_type);

1 0

Henri Verbeet : d2d1/tests: Add some extend mode tests to test_bitmap_brush().
by Alexandre Julliard 29 Apr '15

29 Apr '15

Module: wine Branch: master Commit: d3cc27f1d8ad65a8d3ea5dfb6adc92146e32df7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3cc27f1d8ad65a8d3ea5dfb6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 20:30:52 2015 +0200 d2d1/tests: Add some extend mode tests to test_bitmap_brush(). --- dlls/d2d1/tests/d2d1.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 357a518..29e1bc6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -706,11 +706,32 @@ static void test_bitmap_brush(void) IDXGISurface *surface; D2D1_COLOR_F color; D2D1_SIZE_U size; + unsigned int i; ULONG refcount; float opacity; HWND window; HRESULT hr; + static const struct + { + D2D1_EXTEND_MODE extend_mode_x; + D2D1_EXTEND_MODE extend_mode_y; + float translate_x; + float translate_y; + D2D1_RECT_F rect; + } + extend_mode_tests[] = + { + {D2D1_EXTEND_MODE_MIRROR, D2D1_EXTEND_MODE_MIRROR, -7.0f, 1.0f, {-4.0f, 0.0f, -8.0f, 4.0f}}, + {D2D1_EXTEND_MODE_WRAP, D2D1_EXTEND_MODE_MIRROR, -3.0f, 1.0f, {-4.0f, 4.0f, 0.0f, 0.0f}}, + {D2D1_EXTEND_MODE_CLAMP, D2D1_EXTEND_MODE_MIRROR, 1.0f, 1.0f, { 4.0f, 0.0f, 0.0f, 4.0f}}, + {D2D1_EXTEND_MODE_MIRROR, D2D1_EXTEND_MODE_WRAP, -7.0f, 5.0f, {-8.0f, 8.0f, -4.0f, 4.0f}}, + {D2D1_EXTEND_MODE_WRAP, D2D1_EXTEND_MODE_WRAP, -3.0f, 5.0f, { 0.0f, 4.0f, -4.0f, 8.0f}}, + {D2D1_EXTEND_MODE_CLAMP, D2D1_EXTEND_MODE_WRAP, 1.0f, 5.0f, { 0.0f, 8.0f, 4.0f, 4.0f}}, + {D2D1_EXTEND_MODE_MIRROR, D2D1_EXTEND_MODE_CLAMP, -7.0f, 9.0f, {-4.0f, 8.0f, -8.0f, 12.0f}}, + {D2D1_EXTEND_MODE_WRAP, D2D1_EXTEND_MODE_CLAMP, -3.0f, 9.0f, {-4.0f, 12.0f, 0.0f, 8.0f}}, + {D2D1_EXTEND_MODE_CLAMP, D2D1_EXTEND_MODE_CLAMP, 1.0f, 9.0f, { 4.0f, 8.0f, 0.0f, 12.0f}}, + }; static const DWORD bitmap_data[] = { 0xffff0000, 0xffffff00, 0xff00ff00, 0xff00ffff, @@ -814,6 +835,34 @@ static void test_bitmap_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); ok(compare_surface(surface, "393636185359a550d459e1e5f0e25411814f724c"), "Surface does not match.\n"); + ID2D1RenderTarget_BeginDraw(rt); + + ID2D1RenderTarget_Clear(rt, &color); + + ID2D1BitmapBrush_SetOpacity(brush, 1.0f); + for (i = 0; i < sizeof(extend_mode_tests) / sizeof(*extend_mode_tests); ++i) + { + ID2D1BitmapBrush_SetExtendModeX(brush, extend_mode_tests[i].extend_mode_x); + extend_mode = ID2D1BitmapBrush_GetExtendModeX(brush); + ok(extend_mode == extend_mode_tests[i].extend_mode_x, + "Test %u: Got unexpected extend mode %#x, expected %#x.\n", + i, extend_mode, extend_mode_tests[i].extend_mode_x); + ID2D1BitmapBrush_SetExtendModeY(brush, extend_mode_tests[i].extend_mode_y); + extend_mode = ID2D1BitmapBrush_GetExtendModeY(brush); + ok(extend_mode == extend_mode_tests[i].extend_mode_y, + "Test %u: Got unexpected extend mode %#x, expected %#x.\n", + i, extend_mode, extend_mode_tests[i].extend_mode_y); + set_matrix_identity(&matrix); + translate_matrix(&matrix, extend_mode_tests[i].translate_x, extend_mode_tests[i].translate_y); + scale_matrix(&matrix, 0.5f, 0.5f); + ID2D1BitmapBrush_SetTransform(brush, &matrix); + ID2D1RenderTarget_FillRectangle(rt, &extend_mode_tests[i].rect, (ID2D1Brush *)brush); + } + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + ok(compare_surface(surface, "b4b775afecdae2d26642001f4faff73663bb8b31"), "Surface does not match.\n"); + ID2D1BitmapBrush_Release(brush); refcount = ID2D1Bitmap_Release(bitmap); ok(!refcount, "Bitmap has %u references left.\n", refcount);

1 0

← Newer
1
2
3
4
5
6
7
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2015