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

Andrew Eikum : hlink: Set hlink' s location to NULL if the empty string is given.
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: a8183a63171120602e3361d05197e00aaf02b915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8183a63171120602e3361d05… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 16 14:52:01 2010 -0500 hlink: Set hlink's location to NULL if the empty string is given. --- dlls/hlink/link.c | 4 +++- dlls/hlink/tests/hlink.c | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 52197cc..ffd3cda 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -291,7 +291,9 @@ static HRESULT WINAPI IHlink_fnSetStringReference(IHlink* iface, if (grfHLSETF & HLINKSETF_LOCATION) { heap_free(This->Location); - This->Location = hlink_strdupW( pwzLocation ); + This->Location = NULL; + if (pwzLocation && *pwzLocation) + This->Location = hlink_strdupW( pwzLocation ); } return S_OK; diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 30b06f0..28c0c9a 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1272,12 +1272,12 @@ static void r_getStringRef(unsigned line, IHlink *hlink, const WCHAR *exp_tgt, c if(exp_tgt) ok_(__FILE__,line) (!lstrcmpW(fnd_tgt, exp_tgt), "Found string target should have been %s, was: %s\n", wine_dbgstr_w(exp_tgt), wine_dbgstr_w(fnd_tgt)); else - ok_(__FILE__,line) (exp_tgt == NULL, "Found string target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); + ok_(__FILE__,line) (fnd_tgt == NULL, "Found string target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); if(exp_loc) ok_(__FILE__,line) (!lstrcmpW(fnd_loc, exp_loc), "Found string location should have been %s, was: %s\n", wine_dbgstr_w(exp_loc), wine_dbgstr_w(fnd_loc)); else - ok_(__FILE__,line) (exp_loc == NULL, "Found string location should have been NULL, was: %s\n", wine_dbgstr_w(fnd_loc)); + ok_(__FILE__,line) (fnd_loc == NULL, "Found string location should have been NULL, was: %s\n", wine_dbgstr_w(fnd_loc)); CoTaskMemFree(fnd_tgt); CoTaskMemFree(fnd_loc); @@ -1305,7 +1305,7 @@ static IMoniker *r_getMonikerRef(unsigned line, IHlink *hlink, IMoniker *exp_tgt if(exp_loc) ok_(__FILE__,line) (!lstrcmpW(fnd_loc, exp_loc), "Found string location should have been %s, was: %s\n", wine_dbgstr_w(exp_loc), wine_dbgstr_w(fnd_loc)); else - ok_(__FILE__,line) (exp_loc == NULL, "Found string location should have been NULL, was: %s\n", wine_dbgstr_w(fnd_loc)); + ok_(__FILE__,line) (fnd_loc == NULL, "Found string location should have been NULL, was: %s\n", wine_dbgstr_w(fnd_loc)); CoTaskMemFree(fnd_loc);

1 0

Paul Vriens : shlwapi/tests: Fix some test failures on XP/Vista.
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 33b45cf98df116f927d25c76824fdb7d343fc9db URL: http://source.winehq.org/git/wine.git/?a=commit;h=33b45cf98df116f927d25c768… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Mar 16 19:21:08 2010 +0100 shlwapi/tests: Fix some test failures on XP/Vista. --- dlls/shlwapi/tests/istream.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 9501cd8..4a36b3a 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -432,6 +432,11 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) stream = NULL; ret = (*pSHCreateStreamOnFileEx)(test_file, mode, 0, FALSE, template, &stream); + if (ret == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED)) { + win_skip("File probably locked by Anti-Virus/Spam software, trying again\n"); + Sleep(1000); + ret = (*pSHCreateStreamOnFileEx)(test_file, mode, 0, FALSE, template, &stream); + } ok( ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || ret == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), "SHCreateStreamOnFileEx: expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) or " @@ -491,6 +496,11 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) stream = NULL; ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_CREATE | stgm, 0, FALSE, NULL, &stream); + if (ret == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED)) { + win_skip("File probably locked by Anti-Virus/Spam software, trying again\n"); + Sleep(1000); + ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_CREATE | stgm, 0, FALSE, NULL, &stream); + } ok(ret == S_OK, "SHCreateStreamOnFileEx: expected S_OK, got 0x%08x\n", ret); ok(stream != NULL, "SHCreateStreamOnFileEx: expected a valid IStream object, got NULL\n"); @@ -507,6 +517,11 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) stream = NULL; ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_CREATE | stgm, 0, TRUE, NULL, &stream); + if (ret == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED)) { + win_skip("File probably locked by Anti-Virus/Spam software, trying again\n"); + Sleep(1000); + ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_CREATE | stgm, 0, TRUE, NULL, &stream); + } ok(ret == S_OK, "SHCreateStreamOnFileEx: expected S_OK, got 0x%08x\n", ret); ok(stream != NULL, "SHCreateStreamOnFileEx: expected a valid IStream object, got NULL\n");

1 0

Vincent Povirk : oleaut32: Always use DISPID_PROPERTYPUT to fill in the last argument.
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 5893f3227c88d8db2c6622be23af81f90d1b1e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5893f3227c88d8db2c6622be2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 16 13:32:57 2010 -0500 oleaut32: Always use DISPID_PROPERTYPUT to fill in the last argument. --- dlls/oleaut32/tests/tmarshal.c | 23 +++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 3 +++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + dlls/oleaut32/typelib.c | 5 +---- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 33adf3c..64b6633 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -594,6 +594,15 @@ static HRESULT WINAPI Widget_ByRefUInt( return S_OK; } +static HRESULT WINAPI Widget_put_prop_opt_arg( + IWidget* iface, INT opt, INT i) +{ + trace("put_prop_opt_arg(%08x, %08x)\n", opt, i); + todo_wine ok(opt == 0, "got opt=%08x\n", opt); + ok(i == 0xcafe, "got i=%08x\n", i); + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -627,6 +636,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_get_prop_int, Widget_get_prop_uint, Widget_ByRefUInt, + Widget_put_prop_opt_arg, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -1387,6 +1397,19 @@ static void test_typelibmarshal(void) VariantClear(&varresult); VariantClear(&vararg[0]); + /* test propput with optional argument. */ + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_I4; + V_I4(&vararg[0]) = 0xcafe; + dispparams.cNamedArgs = 1; + dispparams.rgdispidNamedArgs = &dispidNamed; + dispparams.cArgs = 1; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_OPT_ARG, &IID_NULL, 0x40c, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, ITypeInfo_Invoke); + VariantClear(&varresult); + IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 5dc3a12..077fb59 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -140,6 +140,9 @@ library TestTypelib [id(DISPID_TM_BYREF_UINT)] HRESULT ByRefUInt([in, out] UINT *i); + + [id(DISPID_TM_PROP_OPT_ARG), propput] + HRESULT prop_opt_arg([in,optional] INT opt, [in] INT i); } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index ad8ba1b..a4f467e 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -38,6 +38,7 @@ #define DISPID_TM_PROP_INT 19 #define DISPID_TM_PROP_UINT 20 #define DISPID_TM_BYREF_UINT 21 +#define DISPID_TM_PROP_OPT_ARG 22 #define DISPID_NOA_BSTRRET 1 #define DISPID_NOA_ERROR 2 diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c3f5fc2..08a39b9 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6065,9 +6065,6 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( hres = DISP_E_PARAMNOTFOUND; goto func_fail; } - /* ignore the DISPID_PROPERTYPUT named argument from now on */ - cNamedArgs--; - rgdispidNamedArgs++; } if (func_desc->cParamsOpt < 0 && cNamedArgs) @@ -6105,7 +6102,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( USHORT j; src_arg = NULL; for (j = 0; j < cNamedArgs; j++) - if (rgdispidNamedArgs[j] == i) + if (rgdispidNamedArgs[j] == i || (i == func_desc->cParams-1 && rgdispidNamedArgs[j] == DISPID_PROPERTYPUT)) { src_arg = &pDispParams->rgvarg[j]; break;

1 0

Michael Stefaniuc : oleaut32: Plug some memleaks on error paths (Smatch).
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 0346eac906cc437db78698ba362bc2ba19b44b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0346eac906cc437db78698ba3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 16 23:05:47 2010 +0100 oleaut32: Plug some memleaks on error paths (Smatch). --- dlls/oleaut32/typelib2.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index ec3ec1c..08b8684 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2482,8 +2482,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( for(iter2=This->typedata->next->next; iter2!=This->typedata->next; iter2=iter2->next) { if(iter == iter2) continue; - if(iter2->indice == iter->indice) + if(iter2->indice == iter->indice) { + HeapFree(GetProcessHeap(), 0, typedata); return E_ACCESSDENIED; + } } break; @@ -2495,15 +2497,19 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( iter->u.data[0] = (iter->u.data[0]&0xffff) | (i<<16); - if((iter->u.data[3]&1) != (user_vft&1)) + if((iter->u.data[3]&1) != (user_vft&1)) { + HeapFree(GetProcessHeap(), 0, typedata); return TYPE_E_INVALIDID; + } if(user_vft&1) { if(user_vft < (iter->u.data[3]&0xffff)) user_vft = (iter->u.data[3]&0xffff); - if((iter->u.data[3]&0xffff) < This->typeinfo->cbSizeVft) + if((iter->u.data[3]&0xffff) < This->typeinfo->cbSizeVft) { + HeapFree(GetProcessHeap(), 0, typedata); return TYPE_E_INVALIDID; + } } else if(This->typekind != TKIND_MODULE) { iter->u.data[3] = (iter->u.data[3]&0xffff0000) | This->typeinfo->cbSizeVft; This->typeinfo->cbSizeVft += 4;

1 0

Paul Vriens : rsaenh/tests: Fix some test failures on XP (pre SP3).
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 3a5c925250df5476d68099540d7c2ed5f136967a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5c925250df5476d68099540… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Mar 16 19:17:56 2010 +0100 rsaenh/tests: Fix some test failures on XP (pre SP3). --- dlls/rsaenh/tests/rsaenh.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 55dd2df..94b1ed0 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -803,7 +803,12 @@ static void test_sha2(void) for (i=0; i<2048; i++) pbData[i] = (unsigned char)i; /* SHA-256 hash */ + SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_SHA_256, 0, 0, &hHash); + if (!result && GetLastError() == NTE_BAD_ALGID) { + win_skip("SHA-256/384/512 hashes are not supported before Windows XP SP3\n"); + return; + } ok(result, "%08x\n", GetLastError()); if (result) { len = sizeof(DWORD);

1 0

Henri Verbeet : ddraw: Fix IDirectDraw4Impl_GetSurfaceFromDC().
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 89fef0e669dcf323b6eeb481edfe9c91f68f4840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89fef0e669dcf323b6eeb481e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 19:02:22 2010 +0100 ddraw: Fix IDirectDraw4Impl_GetSurfaceFromDC(). Perhaps interesting to note is that this returns an IDirectDrawSurface instead of an IDirectDrawSurface4. --- dlls/ddraw/ddraw_thunks.c | 10 +++++++++- dlls/ddraw/tests/dsurface.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw_thunks.c b/dlls/ddraw/ddraw_thunks.c index 278d720..28991d1 100644 --- a/dlls/ddraw/ddraw_thunks.c +++ b/dlls/ddraw/ddraw_thunks.c @@ -1048,7 +1048,15 @@ static HRESULT WINAPI IDirectDraw4Impl_GetSurfaceFromDC(LPDIRECTDRAW4 This, HDC hDC, LPDIRECTDRAWSURFACE4 *pSurf) { - return IDirectDraw7_GetSurfaceFromDC((IDirectDraw7 *)ddraw_from_ddraw4(This), hDC, (LPDIRECTDRAWSURFACE7 *)pSurf); + IDirectDrawSurface7 *surf7; + HRESULT hr; + + if (!pSurf) return E_INVALIDARG; + + hr = IDirectDraw7_GetSurfaceFromDC((IDirectDraw7 *)ddraw_from_ddraw4(This), hDC, &surf7); + *pSurf = surf7 ? (IDirectDrawSurface4 *)&((IDirectDrawSurfaceImpl *)surf7)->IDirectDrawSurface3_vtbl : NULL; + + return hr; } static HRESULT WINAPI diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index f323ef0..bfd5eae 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3008,6 +3008,7 @@ static void GetDCTest(void) IDirectDrawSurface2 *surf2; IDirectDrawSurface4 *surf4; IDirectDrawSurface7 *surf7; + IDirectDrawSurface *tmp; IDirectDrawSurface7 *tmp7; HRESULT hr; IDirectDraw2 *dd2; @@ -3056,6 +3057,37 @@ static void GetDCTest(void) ok(hr == DD_OK, "IDirectDraw4_CreateSurface failed: 0x%08x\n", hr); dctest_surf((IDirectDrawSurface *) surf4, 2); + hr = IDirectDrawSurface4_QueryInterface(surf4, &IID_IDirectDrawSurface, (void **)&surf); + ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); + + hr = IDirectDrawSurface4_GetDC(surf4, &dc); + ok(SUCCEEDED(hr), "GetDC failed, hr %#x.\n", hr); + + hr = IDirectDraw4_GetSurfaceFromDC(dd4, dc, NULL); + ok(hr == E_INVALIDARG, "Expected hr E_INVALIDARG, got %#x.\n", hr); + + hr = IDirectDraw4_GetSurfaceFromDC(dd4, dc, (IDirectDrawSurface4 **)&tmp); + ok(SUCCEEDED(hr), "GetSurfaceFromDC failed, hr %#x.\n", hr); + ok(tmp == surf, "Expected surface %p, got %p.\n\n", surf, tmp); + + hr = IDirectDrawSurface4_ReleaseDC(surf4, dc); + ok(SUCCEEDED(hr), "ReleaseDC failed, hr %#x.\n", hr); + + dc = CreateCompatibleDC(NULL); + ok(!!dc, "CreateCompatibleDC failed.\n"); + + tmp = (IDirectDrawSurface *)0xdeadbeef; + hr = IDirectDraw4_GetSurfaceFromDC(dd4, dc, (IDirectDrawSurface4 **)&tmp); + ok(hr == DDERR_NOTFOUND, "GetSurfaceFromDC failed, hr %#x.\n", hr); + ok(!tmp, "Expected surface NULL, got %p.\n", tmp); + + ok(DeleteDC(dc), "DeleteDC failed.\n"); + + tmp = (IDirectDrawSurface *)0xdeadbeef; + hr = IDirectDraw4_GetSurfaceFromDC(dd4, NULL, (IDirectDrawSurface4 **)&tmp); + ok(hr == DDERR_NOTFOUND, "GetSurfaceFromDC failed, hr %#x.\n", hr); + ok(!tmp, "Expected surface NULL, got %p.\n", tmp); + IDirectDrawSurface4_Release(surf4); IDirectDraw4_Release(dd4);

1 0

Henri Verbeet : ddraw: Implement IDirectDrawImpl_GetSurfaceFromDC().
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 4e48ae2629cc641f3a02862b9477daae02a1c85b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e48ae2629cc641f3a02862b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 19:02:21 2010 +0100 ddraw: Implement IDirectDrawImpl_GetSurfaceFromDC(). This is a pretty naive implementation, should that become a performance problem it's easy enough to speed up with a search tree of some kind. --- dlls/ddraw/ddraw.c | 21 +++++++++++++++++---- dlls/ddraw/tests/dsurface.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 25 ++++++++++++++++++++++++- include/wine/wined3d.idl | 4 ++++ 4 files changed, 76 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 527f448..4d5701f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1514,11 +1514,24 @@ IDirectDrawImpl_GetSurfaceFromDC(IDirectDraw7 *iface, IDirectDrawSurface7 **Surface) { IDirectDrawImpl *This = (IDirectDrawImpl *)iface; - FIXME("(%p)->(%p,%p): Stub!\n", This, hdc, Surface); + IWineD3DSurface *wined3d_surface; + HRESULT hr; + + TRACE("iface %p, dc %p, surface %p.\n", iface, hdc, Surface); + + if (!Surface) return E_INVALIDARG; - /* Implementation idea if needed: Loop through all surfaces and compare - * their hdc with hdc. Implement it in WineD3D! */ - return DDERR_NOTFOUND; + hr = IWineD3DDevice_GetSurfaceFromDC(This->wineD3DDevice, hdc, &wined3d_surface); + if (FAILED(hr)) + { + TRACE("No surface found for dc %p.\n", hdc); + *Surface = NULL; + return DDERR_NOTFOUND; + } + + IWineD3DSurface_GetParent(wined3d_surface, (IUnknown **)Surface); + TRACE("Returning surface %p.\n", Surface); + return DD_OK; } /***************************************************************************** diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index d53d6a0..f323ef0 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3008,10 +3008,12 @@ static void GetDCTest(void) IDirectDrawSurface2 *surf2; IDirectDrawSurface4 *surf4; IDirectDrawSurface7 *surf7; + IDirectDrawSurface7 *tmp7; HRESULT hr; IDirectDraw2 *dd2; IDirectDraw4 *dd4; IDirectDraw7 *dd7; + HDC dc; memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); @@ -3064,6 +3066,35 @@ static void GetDCTest(void) ok(hr == DD_OK, "IDirectDraw7_CreateSurface failed: 0x%08x\n", hr); dctest_surf((IDirectDrawSurface *) surf7, 2); + hr = IDirectDrawSurface7_GetDC(surf7, &dc); + ok(SUCCEEDED(hr), "GetDC failed, hr %#x.\n", hr); + + hr = IDirectDraw7_GetSurfaceFromDC(dd7, dc, NULL); + ok(hr == E_INVALIDARG, "Expected hr E_INVALIDARG, got %#x.\n", hr); + + hr = IDirectDraw7_GetSurfaceFromDC(dd7, dc, &tmp7); + ok(SUCCEEDED(hr), "GetSurfaceFromDC failed, hr %#x.\n", hr); + ok(tmp7 == surf7, "Expected surface %p, got %p.\n\n", surf7, tmp7); + IDirectDrawSurface7_Release(tmp7); + + hr = IDirectDrawSurface7_ReleaseDC(surf7, dc); + ok(SUCCEEDED(hr), "ReleaseDC failed, hr %#x.\n", hr); + + dc = CreateCompatibleDC(NULL); + ok(!!dc, "CreateCompatibleDC failed.\n"); + + tmp7 = (IDirectDrawSurface7 *)0xdeadbeef; + hr = IDirectDraw7_GetSurfaceFromDC(dd7, dc, &tmp7); + ok(hr == DDERR_NOTFOUND, "GetSurfaceFromDC failed, hr %#x.\n", hr); + ok(!tmp7, "Expected surface NULL, got %p.\n", tmp7); + + ok(DeleteDC(dc), "DeleteDC failed.\n"); + + tmp7 = (IDirectDrawSurface7 *)0xdeadbeef; + hr = IDirectDraw7_GetSurfaceFromDC(dd7, NULL, (IDirectDrawSurface7 **)&tmp7); + ok(hr == DDERR_NOTFOUND, "GetSurfaceFromDC failed, hr %#x.\n", hr); + ok(!tmp7, "Expected surface NULL, got %p.\n", tmp7); + IDirectDrawSurface7_Release(surf7); IDirectDraw7_Release(dd7); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5f4d2f8..0968bfc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6870,6 +6870,28 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EnumResources(IWineD3DDevice *iface, D3 return WINED3D_OK; } +static HRESULT WINAPI IWineD3DDeviceImpl_GetSurfaceFromDC(IWineD3DDevice *iface, HDC dc, IWineD3DSurface **surface) +{ + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + IWineD3DResourceImpl *resource; + + LIST_FOR_EACH_ENTRY(resource, &This->resources, IWineD3DResourceImpl, resource.resource_list_entry) + { + WINED3DRESOURCETYPE type = IWineD3DResource_GetType((IWineD3DResource *)resource); + if (type == WINED3DRTYPE_SURFACE) + { + if (((IWineD3DSurfaceImpl *)resource)->hDC == dc) + { + TRACE("Found surface %p for dc %p.\n", resource, dc); + *surface = (IWineD3DSurface *)resource; + return WINED3D_OK; + } + } + } + + return WINED3DERR_INVALIDCALL; +} + /********************************************************** * IWineD3DDevice VTbl follows **********************************************************/ @@ -7018,7 +7040,8 @@ static const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_UpdateSurface, IWineD3DDeviceImpl_GetFrontBufferData, /*** object tracking ***/ - IWineD3DDeviceImpl_EnumResources + IWineD3DDeviceImpl_EnumResources, + IWineD3DDeviceImpl_GetSurfaceFromDC, }; HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index ac4ee89..b8467d8 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -3456,6 +3456,10 @@ interface IWineD3DDevice : IWineD3DBase [in] D3DCB_ENUMRESOURCES callback, [in] void *data ); + HRESULT GetSurfaceFromDC( + [in] HDC dc, + [out] IWineD3DSurface **surface + ); } IWineD3D *WineDirect3DCreate(UINT dxVersion, IUnknown *parent);

1 0

Michael Stefaniuc : oleaut32: Remove superfluous NULL check before HeapFree (Smatch).
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: c71b82f3c1d872b96c2f53c78d9a89a7e9902dfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c71b82f3c1d872b96c2f53c78… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 16 23:05:39 2010 +0100 oleaut32: Remove superfluous NULL check before HeapFree (Smatch). --- dlls/oleaut32/typelib2.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index a275845..ec3ec1c 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3854,9 +3854,7 @@ static ULONG WINAPI ICreateTypeLib2_fnRelease(ICreateTypeLib2 *iface) } } - if(typeinfo->dual) - HeapFree(GetProcessHeap(), 0, typeinfo->dual); - + HeapFree(GetProcessHeap(), 0, typeinfo->dual); HeapFree(GetProcessHeap(), 0, typeinfo); }

1 0

Henri Verbeet : wined3d: Cleanup IWineD3DDeviceImpl_SetFrontBackBuffers().
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 7b52c2fbed561ac381f63826bab97802d0070e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b52c2fbed561ac381f63826b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 19:02:20 2010 +0100 wined3d: Cleanup IWineD3DDeviceImpl_SetFrontBackBuffers(). --- dlls/wined3d/device.c | 118 +++++++++++++++++++++++++++---------------------- 1 files changed, 65 insertions(+), 53 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3d4a48b..5f4d2f8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5688,85 +5688,97 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetRenderTarget(IWineD3DDevice* iface } static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *iface, - IWineD3DSurface *Front, IWineD3DSurface *Back) + IWineD3DSurface *front, IWineD3DSurface *back) { - IWineD3DSurfaceImpl *FrontImpl = (IWineD3DSurfaceImpl *) Front; - IWineD3DSurfaceImpl *BackImpl = (IWineD3DSurfaceImpl *) Back; - IWineD3DSwapChainImpl *Swapchain; + IWineD3DSurfaceImpl *front_impl = (IWineD3DSurfaceImpl *)front; + IWineD3DSurfaceImpl *back_impl = (IWineD3DSurfaceImpl *)back; + IWineD3DSwapChainImpl *swapchain; HRESULT hr; - TRACE("iface %p, front %p, back %p.\n", iface, Front, Back); + TRACE("iface %p, front %p, back %p.\n", iface, front, back); - hr = IWineD3DDevice_GetSwapChain(iface, 0, (IWineD3DSwapChain **) &Swapchain); - if(hr != WINED3D_OK) { - ERR("Can't get the swapchain\n"); + if (FAILED(hr = IWineD3DDevice_GetSwapChain(iface, 0, (IWineD3DSwapChain **)&swapchain))) + { + ERR("Failed to get the swapchain, hr %#x.\n", hr); return hr; } - /* Make sure to release the swapchain */ - IWineD3DSwapChain_Release((IWineD3DSwapChain *) Swapchain); - - if(FrontImpl && !(FrontImpl->resource.usage & WINED3DUSAGE_RENDERTARGET) ) { - ERR("Trying to set a front buffer which doesn't have WINED3DUSAGE_RENDERTARGET usage\n"); - return WINED3DERR_INVALIDCALL; - } - else if(BackImpl && !(BackImpl->resource.usage & WINED3DUSAGE_RENDERTARGET)) { - ERR("Trying to set a back buffer which doesn't have WINED3DUSAGE_RENDERTARGET usage\n"); + if (front_impl && !(front_impl->resource.usage & WINED3DUSAGE_RENDERTARGET)) + { + ERR("Trying to set a front buffer which doesn't have WINED3DUSAGE_RENDERTARGET usage.\n"); + IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); return WINED3DERR_INVALIDCALL; } - if(Swapchain->frontBuffer != Front) { - TRACE("Changing the front buffer from %p to %p\n", Swapchain->frontBuffer, Front); - - if(Swapchain->frontBuffer) + if (back_impl) + { + if (!(back_impl->resource.usage & WINED3DUSAGE_RENDERTARGET)) { - IWineD3DSurface_SetContainer(Swapchain->frontBuffer, NULL); - ((IWineD3DSurfaceImpl *)Swapchain->frontBuffer)->Flags &= ~SFLAG_SWAPCHAIN; + ERR("Trying to set a back buffer which doesn't have WINED3DUSAGE_RENDERTARGET usage.\n"); + IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); + return WINED3DERR_INVALIDCALL; } - Swapchain->frontBuffer = Front; - if(Swapchain->frontBuffer) { - IWineD3DSurface_SetContainer(Swapchain->frontBuffer, (IWineD3DBase *) Swapchain); - ((IWineD3DSurfaceImpl *)Swapchain->frontBuffer)->Flags |= SFLAG_SWAPCHAIN; + if (!swapchain->backBuffer) + { + swapchain->backBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*swapchain->backBuffer)); + if (!swapchain->backBuffer) + { + ERR("Failed to allocate back buffer array memory.\n"); + IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); + return E_OUTOFMEMORY; + } } } - if(Back && !Swapchain->backBuffer) { - /* We need memory for the back buffer array - only one back buffer this way */ - Swapchain->backBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DSurface *)); - if(!Swapchain->backBuffer) { - ERR("Out of memory\n"); - return E_OUTOFMEMORY; + if (swapchain->frontBuffer != front) + { + TRACE("Changing the front buffer from %p to %p.\n", swapchain->frontBuffer, front); + + if (swapchain->frontBuffer) + { + IWineD3DSurface_SetContainer(swapchain->frontBuffer, NULL); + ((IWineD3DSurfaceImpl *)swapchain->frontBuffer)->Flags &= ~SFLAG_SWAPCHAIN; + } + swapchain->frontBuffer = front; + + if (front) + { + IWineD3DSurface_SetContainer(front, (IWineD3DBase *)swapchain); + front_impl->Flags |= SFLAG_SWAPCHAIN; } } - if(Swapchain->backBuffer[0] != Back) { - TRACE("Changing the back buffer from %p to %p\n", Swapchain->backBuffer, Back); + if (swapchain->backBuffer[0] != back) + { + TRACE("Changing the back buffer from %p to %p.\n", swapchain->backBuffer[0], back); - /* Update the backbuffer count. */ - if (!Swapchain->backBuffer[0]) Swapchain->presentParms.BackBufferCount = 1; - else if (!Back) Swapchain->presentParms.BackBufferCount = 0; + if (swapchain->backBuffer[0]) + { + IWineD3DSurface_SetContainer(swapchain->backBuffer[0], NULL); + ((IWineD3DSurfaceImpl *)swapchain->backBuffer[0])->Flags &= ~SFLAG_SWAPCHAIN; + } + swapchain->backBuffer[0] = back; - if(Swapchain->backBuffer[0]) + if (back) { - IWineD3DSurface_SetContainer(Swapchain->backBuffer[0], NULL); - ((IWineD3DSurfaceImpl *)Swapchain->backBuffer[0])->Flags &= ~SFLAG_SWAPCHAIN; + swapchain->presentParms.BackBufferWidth = back_impl->currentDesc.Width; + swapchain->presentParms.BackBufferHeight = back_impl->currentDesc.Height; + swapchain->presentParms.BackBufferFormat = back_impl->resource.format_desc->format; + swapchain->presentParms.BackBufferCount = 1; + + IWineD3DSurface_SetContainer(back, (IWineD3DBase *)swapchain); + back_impl->Flags |= SFLAG_SWAPCHAIN; } - Swapchain->backBuffer[0] = Back; - - if(Swapchain->backBuffer[0]) { - IWineD3DSurface_SetContainer(Swapchain->backBuffer[0], (IWineD3DBase *) Swapchain); - ((IWineD3DSurfaceImpl *)Swapchain->backBuffer[0])->Flags |= SFLAG_SWAPCHAIN; - Swapchain->presentParms.BackBufferWidth = BackImpl->currentDesc.Width; - Swapchain->presentParms.BackBufferHeight = BackImpl->currentDesc.Height; - Swapchain->presentParms.BackBufferFormat = BackImpl->resource.format_desc->format; - } else { - HeapFree(GetProcessHeap(), 0, Swapchain->backBuffer); - Swapchain->backBuffer = NULL; + else + { + swapchain->presentParms.BackBufferCount = 0; + HeapFree(GetProcessHeap(), 0, swapchain->backBuffer); + swapchain->backBuffer = NULL; } - } + IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Don' t use framebuffer blit for backbuffer formats with fixups in swapchain_blit ().
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 570f865bad363a600fbc51dadd5206a71632c667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=570f865bad363a600fbc51dad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 19:02:15 2010 +0100 wined3d: Don't use framebuffer blit for backbuffer formats with fixups in swapchain_blit(). --- dlls/wined3d/swapchain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index df1638f..dfe194d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -114,7 +114,7 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * else gl_filter = GL_LINEAR; - if (gl_info->fbo_ops.glBlitFramebuffer) + 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);

1 0