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

Nikolay Sivov : atl: Simplify error handling in AtlAxAttachControl().
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: wine Branch: master Commit: 2b390f01edafbf0efd1f6cd053b780b13e80a360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b390f01edafbf0efd1f6cd05… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 18 16:09:32 2014 +0400 atl: Simplify error handling in AtlAxAttachControl(). --- dlls/atl/atl_ax.c | 28 +++++++++++----------------- dlls/atl/tests/atl_ax.c | 10 +++------- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 0a16010..764c46e 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -949,12 +949,15 @@ static HRESULT IOCS_Init( IOCS *This ) /********************************************************************** * Create new instance of Atl host component and attach it to window * */ -static HRESULT IOCS_Create( HWND hWnd, IUnknown *pUnkControl, IOCS **ppSite ) +static HRESULT IOCS_Create( HWND hWnd, IUnknown *pUnkControl, IUnknown **container ) { HRESULT hr; IOCS *This; - *ppSite = NULL; + if (!container) + return S_OK; + + *container = NULL; This = HeapAlloc(GetProcessHeap(), 0, sizeof(IOCS)); if (!This) @@ -975,7 +978,7 @@ static HRESULT IOCS_Create( HWND hWnd, IUnknown *pUnkControl, IOCS **ppSite ) if ( SUCCEEDED( hr ) ) hr = IOCS_Init( This ); if ( SUCCEEDED( hr ) ) - *ppSite = This; + *container = (IUnknown*)&This->IOleClientSite_iface; else IOCS_Release( This ); @@ -1102,26 +1105,17 @@ HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd, /*********************************************************************** * AtlAxAttachControl [atl100.@] */ -HRESULT WINAPI AtlAxAttachControl(IUnknown* pControl, HWND hWnd, IUnknown** ppUnkContainer) +HRESULT WINAPI AtlAxAttachControl(IUnknown *control, HWND hWnd, IUnknown **container) { - IOCS *pUnkContainer; HRESULT hr; - TRACE( "%p %p %p\n", pControl, hWnd, ppUnkContainer ); + TRACE("(%p %p %p)\n", control, hWnd, container); - if (!pControl) + if (!control) return E_INVALIDARG; - hr = IOCS_Create( hWnd, pControl, &pUnkContainer ); - if ( SUCCEEDED( hr ) && ppUnkContainer) - { - *ppUnkContainer = (IUnknown*) pUnkContainer; - } - - if(!hWnd) - return S_FALSE; - - return hr; + hr = IOCS_Create( hWnd, control, container ); + return hWnd ? hr : S_FALSE; } /********************************************************************** diff --git a/dlls/atl/tests/atl_ax.c b/dlls/atl/tests/atl_ax.c index f2dad74..6b944d1 100644 --- a/dlls/atl/tests/atl_ax.c +++ b/dlls/atl/tests/atl_ax.c @@ -97,15 +97,11 @@ static void test_AtlAxAttachControl(void) hr = pAtlAxAttachControl(pObj, NULL, NULL); ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); - pContainer = (IUnknown *)0xdeadbeef; + pContainer = NULL; hr = pAtlAxAttachControl(pObj, NULL, &pContainer); ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); - ok(pContainer != (IUnknown *)0xdeadbeef && - pContainer != NULL, - "Expected the output container pointer to be initialized to non-NULL, got %p\n", pContainer); - - if (pContainer != (IUnknown *)0xdeadbeef && pContainer != NULL) - IUnknown_Release(pContainer); + ok(pContainer != NULL, "got %p\n", pContainer); + IUnknown_Release(pContainer); hr = pAtlAxAttachControl(pObj, hwnd, NULL); ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr);

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.3.
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: bugzilla Branch: master Commit: 748d99a5e9fd30f8651dd3aad3a47699c3bf0541 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=748d99a5e9fd30f8651dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 09:58:47 2014 +0200 Import of upstream bugzilla release 4.4.3. --- .gitignore | 32 +++++ Bugzilla/Auth.pm | 19 ++- Bugzilla/Auth/Login/CGI.pm | 41 +++++- Bugzilla/Auth/Login/Cookie.pm | 71 +++++++-- Bugzilla/Auth/Persist/Cookie.pm | 38 +++-- Bugzilla/Bug.pm | 59 ++++---- Bugzilla/CGI.pm | 13 ++ Bugzilla/Constants.pm | 2 +- Bugzilla/Template.pm | 16 +++ Bugzilla/Util.pm | 20 ++- Bugzilla/WebService.pm | 26 ++-- Bugzilla/WebService/Server/JSONRPC.pm | 6 +- Bugzilla/WebService/Server/XMLRPC.pm | 6 + Bugzilla/WebService/User.pm | 92 +++++++----- Bugzilla/WebService/Util.pm | 23 +++ contrib/jb2bz.py | 152 ++++++++++++-------- docs/bugzilla.ent | 12 +- docs/bugzilla.ent.tmpl | 4 +- docs/en/xml/bugzilla.ent | 12 +- lib/CGI.pm | 2 +- relogin.cgi | 26 +++- showdependencytree.cgi | 10 +- t/004template.t | 16 ++- .../en/default/account/auth/login-small.html.tmpl | 4 +- template/en/default/account/auth/login.html.tmpl | 4 +- template/en/default/account/cancel-token.txt.tmpl | 2 +- template/en/default/admin/groups/delete.html.tmpl | 3 +- .../en/default/admin/params/attachment.html.tmpl | 4 +- template/en/default/admin/params/auth.html.tmpl | 2 +- template/en/default/admin/sudo.html.tmpl | 5 +- template/en/default/bug/create/create.html.tmpl | 3 + template/en/default/bug/edit.html.tmpl | 5 + template/en/default/email/bugmail.txt.tmpl | 2 +- template/en/default/email/flagmail.txt.tmpl | 2 +- .../en/default/extensions/name-readme.txt.tmpl | 2 +- template/en/default/global/messages.html.tmpl | 8 +- template/en/default/global/user-error.html.tmpl | 17 ++- template/en/default/list/edit-multiple.html.tmpl | 7 +- template/en/default/list/list.html.tmpl | 12 +- template/en/default/pages/release-notes.html.tmpl | 27 ++++ 40 files changed, 587 insertions(+), 220 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=748d99a5e9fd30f86…

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: bugzilla Branch: master Commit: 8e5ec148130c27d3636f3acb9647186eef593788 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=8e5ec148130c27d3636f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 09:59:37 2014 +0200 Merge branch 'upstream'. ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.3.
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: bugzilla Branch: upstream Commit: 748d99a5e9fd30f8651dd3aad3a47699c3bf0541 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=748d99a5e9fd30f8651dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 09:58:47 2014 +0200 Import of upstream bugzilla release 4.4.3. --- .gitignore | 32 +++++ Bugzilla/Auth.pm | 19 ++- Bugzilla/Auth/Login/CGI.pm | 41 +++++- Bugzilla/Auth/Login/Cookie.pm | 71 +++++++-- Bugzilla/Auth/Persist/Cookie.pm | 38 +++-- Bugzilla/Bug.pm | 59 ++++---- Bugzilla/CGI.pm | 13 ++ Bugzilla/Constants.pm | 2 +- Bugzilla/Template.pm | 16 +++ Bugzilla/Util.pm | 20 ++- Bugzilla/WebService.pm | 26 ++-- Bugzilla/WebService/Server/JSONRPC.pm | 6 +- Bugzilla/WebService/Server/XMLRPC.pm | 6 + Bugzilla/WebService/User.pm | 92 +++++++----- Bugzilla/WebService/Util.pm | 23 +++ contrib/jb2bz.py | 152 ++++++++++++-------- docs/bugzilla.ent | 12 +- docs/bugzilla.ent.tmpl | 4 +- docs/en/xml/bugzilla.ent | 12 +- lib/CGI.pm | 2 +- relogin.cgi | 26 +++- showdependencytree.cgi | 10 +- t/004template.t | 16 ++- .../en/default/account/auth/login-small.html.tmpl | 4 +- template/en/default/account/auth/login.html.tmpl | 4 +- template/en/default/account/cancel-token.txt.tmpl | 2 +- template/en/default/admin/groups/delete.html.tmpl | 3 +- .../en/default/admin/params/attachment.html.tmpl | 4 +- template/en/default/admin/params/auth.html.tmpl | 2 +- template/en/default/admin/sudo.html.tmpl | 5 +- template/en/default/bug/create/create.html.tmpl | 3 + template/en/default/bug/edit.html.tmpl | 5 + template/en/default/email/bugmail.txt.tmpl | 2 +- template/en/default/email/flagmail.txt.tmpl | 2 +- .../en/default/extensions/name-readme.txt.tmpl | 2 +- template/en/default/global/messages.html.tmpl | 8 +- template/en/default/global/user-error.html.tmpl | 17 ++- template/en/default/list/edit-multiple.html.tmpl | 7 +- template/en/default/list/list.html.tmpl | 12 +- template/en/default/pages/release-notes.html.tmpl | 27 ++++ 40 files changed, 587 insertions(+), 220 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=748d99a5e9fd30f86…

1 0

Nikolay Sivov : wshom: Added a stub for IWshEnvironment.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: b10c237c5a3403ef40b04da7f7f6c6efc4edaf78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b10c237c5a3403ef40b04da7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 17 13:49:46 2014 +0400 wshom: Added a stub for IWshEnvironment. --- dlls/wshom.ocx/shell.c | 186 +++++++++++++++++++++++++++++++++++++++- dlls/wshom.ocx/tests/wshom.idl | 4 +- dlls/wshom.ocx/wshom.idl | 4 +- dlls/wshom.ocx/wshom_main.c | 3 +- dlls/wshom.ocx/wshom_private.h | 3 +- 5 files changed, 191 insertions(+), 9 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 92733cc..09b3fa0 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -77,6 +77,12 @@ typedef struct BSTR path_link; } WshShortcut; +typedef struct +{ + IWshEnvironment IWshEnvironment_iface; + LONG ref; +} WshEnvironment; + static inline WshCollection *impl_from_IWshCollection( IWshCollection *iface ) { return CONTAINING_RECORD(iface, WshCollection, IWshCollection_iface); @@ -87,6 +93,180 @@ static inline WshShortcut *impl_from_IWshShortcut( IWshShortcut *iface ) return CONTAINING_RECORD(iface, WshShortcut, IWshShortcut_iface); } +static inline WshEnvironment *impl_from_IWshEnvironment( IWshEnvironment *iface ) +{ + return CONTAINING_RECORD(iface, WshEnvironment, IWshEnvironment_iface); +} + +static HRESULT WINAPI WshEnvironment_QueryInterface(IWshEnvironment *iface, REFIID riid, void **obj) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IWshEnvironment)) + { + *obj = iface; + }else { + FIXME("Unknown iface %s\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*obj); + return S_OK; +} + +static ULONG WINAPI WshEnvironment_AddRef(IWshEnvironment *iface) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + LONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) ref = %d\n", This, ref); + return ref; +} + +static ULONG WINAPI WshEnvironment_Release(IWshEnvironment *iface) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + LONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) ref = %d\n", This, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI WshEnvironment_GetTypeInfoCount(IWshEnvironment *iface, UINT *pctinfo) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + TRACE("(%p)->(%p)\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI WshEnvironment_GetTypeInfo(IWshEnvironment *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo(IWshEnvironment_tid, ppTInfo); +} + +static HRESULT WINAPI WshEnvironment_GetIDsOfNames(IWshEnvironment *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IWshEnvironment_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI WshEnvironment_Invoke(IWshEnvironment *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IWshEnvironment_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &This->IWshEnvironment_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI WshEnvironment_get_Item(IWshEnvironment *iface, BSTR name, BSTR *value) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + FIXME("(%p)->(%s %p): stub\n", This, debugstr_w(name), value); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshEnvironment_put_Item(IWshEnvironment *iface, BSTR name, BSTR value) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + FIXME("(%p)->(%s %s): stub\n", This, debugstr_w(name), debugstr_w(value)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshEnvironment_Count(IWshEnvironment *iface, LONG *count) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + FIXME("(%p)->(%p): stub\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshEnvironment_get_length(IWshEnvironment *iface, LONG *len) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + FIXME("(%p)->(%p): stub\n", This, len); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshEnvironment__NewEnum(IWshEnvironment *iface, IUnknown **penum) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + FIXME("(%p)->(%p): stub\n", This, penum); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshEnvironment_Remove(IWshEnvironment *iface, BSTR name) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + FIXME("(%p)->(%s): stub\n", This, debugstr_w(name)); + return E_NOTIMPL; +} + +static const IWshEnvironmentVtbl WshEnvironmentVtbl = { + WshEnvironment_QueryInterface, + WshEnvironment_AddRef, + WshEnvironment_Release, + WshEnvironment_GetTypeInfoCount, + WshEnvironment_GetTypeInfo, + WshEnvironment_GetIDsOfNames, + WshEnvironment_Invoke, + WshEnvironment_get_Item, + WshEnvironment_put_Item, + WshEnvironment_Count, + WshEnvironment_get_length, + WshEnvironment__NewEnum, + WshEnvironment_Remove +}; + +static HRESULT WshEnvironment_Create(IWshEnvironment **env) +{ + WshEnvironment *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->IWshEnvironment_iface.lpVtbl = &WshEnvironmentVtbl; + This->ref = 1; + + *env = &This->IWshEnvironment_iface; + + return S_OK; +} + static HRESULT WINAPI WshCollection_QueryInterface(IWshCollection *iface, REFIID riid, void **ppv) { WshCollection *This = impl_from_IWshCollection(iface); @@ -744,10 +924,10 @@ static HRESULT WINAPI WshShell3_get_SpecialFolders(IWshShell3 *iface, IWshCollec return WshCollection_Create(folders); } -static HRESULT WINAPI WshShell3_get_Environment(IWshShell3 *iface, VARIANT *Type, IWshEnvironment **out_Env) +static HRESULT WINAPI WshShell3_get_Environment(IWshShell3 *iface, VARIANT *type, IWshEnvironment **env) { - FIXME("(%p %p): stub\n", Type, out_Env); - return E_NOTIMPL; + FIXME("(%s %p): semi-stub\n", debugstr_variant(type), env); + return WshEnvironment_Create(env); } static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *WaitOnReturn, int *exit_code) diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index 5c263d1..6255dc6 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -399,7 +399,7 @@ library IWshRuntimeLibrary [id(DISPID_VALUE), propput] HRESULT Item( [in] BSTR Name, - [in] BSTR out_Value); + [in] BSTR Value); [id(1)] HRESULT Count([out, retval] long *out_Count); @@ -408,7 +408,7 @@ library IWshRuntimeLibrary HRESULT length([out, retval] long *out_Count); [id(DISPID_NEWENUM)] - HRESULT _NewEnum([out, retval] IUnknown *out_Enum); + HRESULT _NewEnum([out, retval] IUnknown **out_Enum); [id(0x03e9)] HRESULT Remove([in] BSTR Name); diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index b6bfb1c..02224a3 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -401,7 +401,7 @@ library IWshRuntimeLibrary [id(DISPID_VALUE), propput] HRESULT Item( [in] BSTR Name, - [in] BSTR out_Value); + [in] BSTR Value); [id(1)] HRESULT Count([out, retval] long *out_Count); @@ -410,7 +410,7 @@ library IWshRuntimeLibrary HRESULT length([out, retval] long *out_Count); [id(DISPID_NEWENUM)] - HRESULT _NewEnum([out, retval] IUnknown *out_Enum); + HRESULT _NewEnum([out, retval] IUnknown **out_Enum); [id(0x03e9)] HRESULT Remove([in] BSTR Name); diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index 0f40a0a..8400f83 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -33,8 +33,9 @@ static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { &IID_NULL, - &IID_IWshShell3, &IID_IWshCollection, + &IID_IWshEnvironment, + &IID_IWshShell3, &IID_IWshShortcut }; diff --git a/dlls/wshom.ocx/wshom_private.h b/dlls/wshom.ocx/wshom_private.h index 5bf7403..07a77b4 100644 --- a/dlls/wshom.ocx/wshom_private.h +++ b/dlls/wshom.ocx/wshom_private.h @@ -27,8 +27,9 @@ /* typelibs */ typedef enum tid_t { NULL_tid, - IWshShell3_tid, IWshCollection_tid, + IWshEnvironment_tid, + IWshShell3_tid, IWshShortcut_tid, LAST_tid } tid_t;

1 0

Piotr Caban : msvcr100: Share the source code with msvcrt.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: 4d40aea0bde11e8c856c1c7047a429836b95998e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d40aea0bde11e8c856c1c704… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 17 13:07:00 2014 +0200 msvcr100: Share the source code with msvcrt. --- dlls/msvcr100/Makefile.in | 32 +- dlls/msvcr100/msvcr100.c | 42 - dlls/msvcr100/msvcr100.spec | 2372 +++++++++++++++++++++---------------------- tools/make_specfiles | 1 - 4 files changed, 1216 insertions(+), 1231 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d40aea0bde11e8c856c1…

1 0

Piotr Caban : msvcr110: Share the source code with msvcrt.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: b7c5e341ae8e50316fbe4fe011d409b852e9d074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c5e341ae8e50316fbe4fe01… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 17 13:07:21 2014 +0200 msvcr110: Share the source code with msvcrt. --- dlls/msvcr110/Makefile.in | 32 +- dlls/msvcr110/msvcr110.c | 72 -- dlls/msvcr110/msvcr110.spec | 2436 +++++++++++++++++++++---------------------- dlls/msvcrt/except.c | 8 + dlls/msvcrt/misc.c | 12 + dlls/msvcrt/process.c | 8 + tools/make_specfiles | 1 - 7 files changed, 1276 insertions(+), 1293 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7c5e341ae8e50316fbe4…

1 0

Matteo Bruni : d3d9/tests: Add a test for timestamp queries.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: cdedb06af77a83b7839c3a434cfdba8020b35300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdedb06af77a83b7839c3a434… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 16 18:14:46 2014 +0200 d3d9/tests: Add a test for timestamp queries. --- dlls/d3d9/tests/device.c | 149 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 09b0905..4dd7a6a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3869,6 +3869,154 @@ static void test_occlusion_query_states(void) DestroyWindow(window); } +static void test_timestamp_query(void) +{ + static const float point[3] = {0.0, 0.0, 0.0}; + IDirect3DQuery9 *query, *disjoint_query, *freq_query; + unsigned int data_size, i; + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + ULONG refcount; + HWND window; + HRESULT hr; + UINT64 timestamp, freq; + BOOL disjoint; + + window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_TIMESTAMPFREQ, &freq_query); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("Timestamp queries are not supported, skipping tests.\n"); + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + data_size = IDirect3DQuery9_GetDataSize(freq_query); + ok(data_size == sizeof(UINT64), "Query data size is %u, 8 expected.\n", data_size); + + hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_TIMESTAMPDISJOINT, &disjoint_query); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + data_size = IDirect3DQuery9_GetDataSize(disjoint_query); + ok(data_size == sizeof(BOOL), "Query data size is %u, 4 expected.\n", data_size); + + hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_TIMESTAMP, &query); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + data_size = IDirect3DQuery9_GetDataSize(query); + ok(data_size == sizeof(UINT64), "Query data size is %u, 8 expected.\n", data_size); + + hr = IDirect3DQuery9_Issue(freq_query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < 500; ++i) + { + if ((hr = IDirect3DQuery9_GetData(freq_query, NULL, 0, D3DGETDATA_FLUSH)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_GetData(freq_query, &freq, sizeof(freq), D3DGETDATA_FLUSH); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DQuery9_GetData(query, NULL, 0, D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_GetData(query, &timestamp, sizeof(timestamp), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DQuery9_Issue(disjoint_query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_Issue(disjoint_query, D3DISSUE_BEGIN); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_Issue(disjoint_query, D3DISSUE_BEGIN); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DQuery9_GetData(query, &timestamp, sizeof(timestamp), D3DGETDATA_FLUSH); + ok(hr == S_FALSE || hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, point, 3 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < 500; ++i) + { + if ((hr = IDirect3DQuery9_GetData(query, NULL, 0, D3DGETDATA_FLUSH)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DQuery9_GetData(query, &timestamp, sizeof(timestamp), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_GetData(query, &timestamp, sizeof(timestamp), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DQuery9_Issue(query, D3DISSUE_BEGIN); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DQuery9_Issue(disjoint_query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < 500; ++i) + { + if ((hr = IDirect3DQuery9_GetData(disjoint_query, NULL, 0, D3DGETDATA_FLUSH)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_GetData(disjoint_query, &disjoint, sizeof(disjoint), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* It's not strictly necessary for the TIMESTAMP query to be inside + * a TIMESTAMP_DISJOINT query. */ + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, point, 3 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < 500; ++i) + { + if ((hr = IDirect3DQuery9_GetData(query, NULL, 0, D3DGETDATA_FLUSH)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_GetData(query, &timestamp, sizeof(timestamp), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DQuery9_Release(query); + IDirect3DQuery9_Release(disjoint_query); + IDirect3DQuery9_Release(freq_query); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + static void test_get_set_vertex_shader(void) { IDirect3DVertexShader9 *current_shader = NULL; @@ -7903,6 +8051,7 @@ START_TEST(device) test_vertex_buffer_alignment(); test_query_support(); test_occlusion_query_states(); + test_timestamp_query(); test_get_set_vertex_shader(); test_vertex_shader_constant(); test_get_set_pixel_shader();

1 0

Matteo Bruni : wined3d: Add support for GL_ARB_timer_query extension.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: 4811a839cf4f21a17323a0f0b1f148d0fc9840fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4811a839cf4f21a17323a0f0b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 16 18:14:47 2014 +0200 wined3d: Add support for GL_ARB_timer_query extension. --- dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/wined3d_gl.h | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f3331bf..94a002e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -139,6 +139,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO }, {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, {"GL_ARB_texture_rg", ARB_TEXTURE_RG }, + {"GL_ARB_timer_query", ARB_TIMER_QUERY }, {"GL_ARB_vertex_array_bgra", ARB_VERTEX_ARRAY_BGRA }, {"GL_ARB_vertex_blend", ARB_VERTEX_BLEND }, {"GL_ARB_vertex_buffer_object", ARB_VERTEX_BUFFER_OBJECT }, @@ -2968,6 +2969,15 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) if (!counter_bits) gl_info->supported[ARB_OCCLUSION_QUERY] = FALSE; } + if (gl_info->supported[ARB_TIMER_QUERY]) + { + GLint counter_bits; + + GL_EXTCALL(glGetQueryivARB(GL_TIMESTAMP, GL_QUERY_COUNTER_BITS_ARB, &counter_bits)); + TRACE("Timestamp query counter has %d bits.\n", counter_bits); + if (!counter_bits) + gl_info->supported[ARB_TIMER_QUERY] = FALSE; + } if (!gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] && gl_info->supported[EXT_TEXTURE_MIRROR_CLAMP]) { TRACE(" IMPLIED: ATI_texture_mirror_once support (by EXT_texture_mirror_clamp).\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 7331592..acfbe3c 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -89,6 +89,7 @@ enum wined3d_gl_extension ARB_TEXTURE_NON_POWER_OF_TWO, ARB_TEXTURE_RECTANGLE, ARB_TEXTURE_RG, + ARB_TIMER_QUERY, ARB_VERTEX_ARRAY_BGRA, ARB_VERTEX_BLEND, ARB_VERTEX_BUFFER_OBJECT, @@ -321,6 +322,9 @@ enum wined3d_gl_extension USE_GL_FUNC(glCompressedTexSubImage2DARB) \ USE_GL_FUNC(glCompressedTexSubImage3DARB) \ USE_GL_FUNC(glGetCompressedTexImageARB) \ + /* GL_ARB_timer_query */ \ + USE_GL_FUNC(glQueryCounter) \ + USE_GL_FUNC(glGetQueryObjectui64v) \ /* GL_ARB_vertex_blend */ \ USE_GL_FUNC(glVertexBlendARB) \ USE_GL_FUNC(glWeightPointerARB) \

1 0

Matteo Bruni : wined3d: Add support for timestamp queries.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: a1784d9ed939ea2fdc350489fdbe94502912a276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1784d9ed939ea2fdc350489f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 16 18:14:48 2014 +0200 wined3d: Add support for timestamp queries. --- dlls/d3d9/query.c | 21 ++++- dlls/wined3d/context.c | 67 ++++++++++++++ dlls/wined3d/query.c | 197 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 15 +++ include/wine/wined3d.h | 6 ++ 5 files changed, 301 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1784d9ed939ea2fdc350…

1 0