June 2016 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : d3dx9_25: Share the source with d3dx9_36.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 69ebbc44c2fbad8a9e0fb4c740eca7b0936dd7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ebbc44c2fbad8a9e0fb4c74… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 19 06:01:59 2016 +0000 d3dx9_25: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_25/Makefile.in | 23 +- dlls/d3dx9_25/d3dx9_25.spec | 638 +++++++++++++++++++++--------------------- dlls/d3dx9_25/d3dx9_25_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 341 insertions(+), 323 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69ebbc44c2fbad8a9e0fb…

1 0

Alistair Leslie-Hughes : d3dx9_27: Share the source with d3dx9_36.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 04a257cf32b31be96200c71141fdfd75545fe2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a257cf32b31be96200c7114… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 19 06:01:35 2016 +0000 d3dx9_27: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_27/Makefile.in | 22 +- dlls/d3dx9_27/d3dx9_27.spec | 646 +++++++++++++++++++++--------------------- dlls/d3dx9_27/d3dx9_27_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 344 insertions(+), 327 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04a257cf32b31be96200c…

1 0

Alistair Leslie-Hughes : d3dx9_28: Share the source with d3dx9_36.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: ec4618d4a5d7c937f36d7e1f4b8870b1b6451c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec4618d4a5d7c937f36d7e1f4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 19 06:01:21 2016 +0000 d3dx9_28: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_28/Makefile.in | 23 +- dlls/d3dx9_28/d3dx9_28.spec | 656 +++++++++++++++++++++--------------------- dlls/d3dx9_28/d3dx9_28_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 350 insertions(+), 332 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec4618d4a5d7c937f36d7…

1 0

Alistair Leslie-Hughes : d3dx9_29: Share the source with d3dx9_36.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 883ae6a2c67ff629e1a6de96399bc1061b2bea33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=883ae6a2c67ff629e1a6de963… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 21 16:49:06 2016 +0200 d3dx9_29: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_29/Makefile.in | 23 +- dlls/d3dx9_29/d3dx9_29.spec | 656 +++++++++++++++++++++--------------------- dlls/d3dx9_29/d3dx9_29_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 350 insertions(+), 332 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=883ae6a2c67ff629e1a6d…

1 0

Michael Stefaniuc : atl: Simplify RECT assignments.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: e3bd659be9b2868b121857fb2643d775bbf0d8c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3bd659be9b2868b121857fb2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 21 14:15:44 2016 +0200 atl: Simplify RECT assignments. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl_ax.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 083dbe0..aeda139 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -827,7 +827,7 @@ static void IOCS_OnSize( IOCS* This, LPCRECT rect ) { SIZEL inPix, inHi; - This->size.left = rect->left; This->size.right = rect->right; This->size.top = rect->top; This->size.bottom = rect->bottom; + This->size = *rect; if ( !This->control ) return; @@ -890,9 +890,7 @@ static LRESULT IOCS_OnWndProc( IOCS *This, HWND hWnd, UINT uMsg, WPARAM wParam, case WM_SIZE: { RECT r; - r.left = r.top = 0; - r.right = LOWORD( lParam ); - r.bottom = HIWORD( lParam ); + SetRect(&r, 0, 0, LOWORD(lParam), HIWORD(lParam)); IOCS_OnSize( This, &r ); } break;

1 0

Michael Stefaniuc : amstream: Use SetRect() instead of open coding it.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 0183cd17be37620b0db065e4733b9a2d5cfa4b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0183cd17be37620b0db065e47… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 21 14:14:18 2016 +0200 amstream: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastream.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 0ba9eb8..188ab88 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -1046,11 +1046,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD DDSURFACEDESC desc = { sizeof(desc) }; hr = IDirectDrawSurface_GetSurfaceDesc(object->surface, &desc); if (hr == S_OK) - { - object->rect.left = object->rect.top = 0; - object->rect.right = desc.dwWidth; - object->rect.bottom = desc.dwHeight; - } + SetRect(&object->rect, 0, 0, desc.dwWidth, desc.dwHeight); } *ddraw_stream_sample = &object->IDirectDrawStreamSample_iface;

1 0

Alistair Leslie-Hughes : d3dx9_30: Share the source with d3dx9_36.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: aef6a7634c4b517e4b7b85d0c426eb4f08352968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef6a7634c4b517e4b7b85d0c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 19 06:00:55 2016 +0000 d3dx9_30: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_30/Makefile.in | 22 +- dlls/d3dx9_30/d3dx9_30.spec | 656 +++++++++++++++++++++--------------------- dlls/d3dx9_30/d3dx9_30_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 349 insertions(+), 332 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aef6a7634c4b517e4b7b8…

1 0

Nikolay Sivov : msscript: Implement GetViewStatus().
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: c34f09b9d8dc534d1dc3894bb81f0260b39b2ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c34f09b9d8dc534d1dc3894bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 21 13:41:36 2016 +0300 msscript: Implement GetViewStatus(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 5 +++-- dlls/msscript.ocx/tests/msscript.c | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index ea4ce3c..5be53da 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1073,9 +1073,10 @@ static HRESULT WINAPI ViewObject_GetViewStatus(IViewObjectEx *iface, DWORD *stat { ScriptControl *This = impl_from_IViewObjectEx(iface); - FIXME("(%p)->(%p)\n", This, status); + TRACE("(%p)->(%p)\n", This, status); - return E_NOTIMPL; + *status = VIEWSTATUS_OPAQUE; + return S_OK; } static HRESULT WINAPI ViewObject_QueryHitPoint(IViewObjectEx *iface, DWORD aspect, const RECT *bounds, diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 97c700e..714b075 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -828,8 +828,10 @@ static void test_quickactivate(void) static void test_viewobject(void) { + IViewObjectEx *viewex; IScriptControl *sc; IViewObject *view; + DWORD status; HRESULT hr; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -844,9 +846,18 @@ static void test_viewobject(void) ok(hr == S_OK, "got 0x%08x\n", hr); IViewObject_Release(view); - hr = IScriptControl_QueryInterface(sc, &IID_IViewObjectEx, (void**)&view); + hr = IScriptControl_QueryInterface(sc, &IID_IViewObjectEx, (void**)&viewex); ok(hr == S_OK, "got 0x%08x\n", hr); - IViewObject_Release(view); + + if (0) /* crashes */ + hr = IViewObjectEx_GetViewStatus(viewex, NULL); + + status = 0; + hr = IViewObjectEx_GetViewStatus(viewex, &status); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(status == VIEWSTATUS_OPAQUE, "got %#x\n", status); + + IViewObjectEx_Release(viewex); IScriptControl_Release(sc); }

1 0

Nikolay Sivov : msscript: Update to IViewObjectEx.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 33c2a22f662830c52f7347a0ddb96901cad11dd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c2a22f662830c52f7347a0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 21 13:41:35 2016 +0300 msscript: Update to IViewObjectEx. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 120 +++++++++++++++++++++++++++++-------- dlls/msscript.ocx/tests/msscript.c | 8 +++ 2 files changed, 103 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33c2a22f662830c52f734…

1 0

Alistair Leslie-Hughes : d3dx9_31: Share the source with d3dx9_36.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 2261d91f6f8c6979f3f541c23477a56908df11c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2261d91f6f8c6979f3f541c23… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 21 16:47:24 2016 +0200 d3dx9_31: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_31/Makefile.in | 22 +- dlls/d3dx9_31/d3dx9_31.spec | 656 +++++++++++++++++++++--------------------- dlls/d3dx9_31/d3dx9_31_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 349 insertions(+), 332 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2261d91f6f8c6979f3f54…

1 0