July 2016 - Wine-commits - list.winehq.org

Piotr Caban : winemac.drv: Don' t assume that owner is top-level window in set_cocoa_window_properties.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: a04c393a73445f3016e1e3852c22846eb4295bb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04c393a73445f3016e1e3852… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 25 13:59:42 2016 +0200 winemac.drv: Don't assume that owner is top-level window in set_cocoa_window_properties. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 0d507f4..db1e528 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -342,6 +342,8 @@ static void set_cocoa_window_properties(struct macdrv_win_data *data) ex_style = GetWindowLongW(data->hwnd, GWL_EXSTYLE); owner = GetWindow(data->hwnd, GW_OWNER); + if (owner) + owner = GetAncestor(owner, GA_ROOT); owner_win = macdrv_get_cocoa_window(owner, TRUE); macdrv_set_cocoa_parent_window(data->cocoa_window, owner_win);

1 0

Piotr Caban : winex11.drv: Don' t assume that owner is top-level window in set_style_hints.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 6afecf22237ba7dfc1eead69dd29374c26210637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6afecf22237ba7dfc1eead69d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 25 13:59:49 2016 +0200 winex11.drv: Don't assume that owner is top-level window in set_style_hints. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 06ce26e..31ffefe 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -748,10 +748,16 @@ static void set_style_hints( struct x11drv_win_data *data, DWORD style, DWORD ex { Window group_leader = data->whole_window; HWND owner = GetWindow( data->hwnd, GW_OWNER ); - Window owner_win = X11DRV_get_whole_window( owner ); + Window owner_win = 0; XWMHints *wm_hints; Atom window_type; + if (owner) + { + owner = GetAncestor( owner, GA_ROOT ); + owner_win = X11DRV_get_whole_window( owner ); + } + if (owner_win) { XSetTransientForHint( data->display, data->whole_window, owner_win );

1 0

Alistair Leslie-Hughes : d3dx9_38: Share the source with d3dx9_36.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 583ad6a1a23b4bb8c826502fb782779a2cb1a7a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=583ad6a1a23b4bb8c826502fb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 22 06:00:42 2016 +0000 d3dx9_38: 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_38/Makefile.in | 22 +- dlls/d3dx9_38/d3dx9_38.spec | 670 +++++++++++++++++++++--------------------- dlls/d3dx9_38/d3dx9_38_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 356 insertions(+), 339 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=583ad6a1a23b4bb8c8265…

1 0

Alistair Leslie-Hughes : d3dx9_39: Share the source with d3dx9_36.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: beccd5a2e53927137de031c1976e66d35b08afeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=beccd5a2e53927137de031c19… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 22 06:00:55 2016 +0000 d3dx9_39: 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_39/Makefile.in | 22 +- dlls/d3dx9_39/d3dx9_39.spec | 670 +++++++++++++++++++++--------------------- dlls/d3dx9_39/d3dx9_39_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 356 insertions(+), 339 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=beccd5a2e53927137de03…

1 0

Alistair Leslie-Hughes : d3dx9_40: Share the source with d3dx9_36.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 4e518bd4e10f464ef737c4bbdc2170a069a12033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e518bd4e10f464ef737c4bbd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 22 06:01:08 2016 +0000 d3dx9_40: 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_40/Makefile.in | 22 +- dlls/d3dx9_40/d3dx9_40.spec | 670 +++++++++++++++++++++--------------------- dlls/d3dx9_40/d3dx9_40_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 356 insertions(+), 339 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e518bd4e10f464ef737c…

1 0

Alistair Leslie-Hughes : d3dx9_41: Share the source with d3dx9_36.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: ab2ef2dd3c450eb06d7bf5263720ba56feda2cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2ef2dd3c450eb06d7bf5263… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 28 19:01:46 2016 +0200 d3dx9_41: 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_41/Makefile.in | 22 +- dlls/d3dx9_41/d3dx9_41.spec | 670 +++++++++++++++++++++--------------------- dlls/d3dx9_41/d3dx9_41_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 356 insertions(+), 339 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab2ef2dd3c450eb06d7bf…

1 0

Alistair Leslie-Hughes : d3dx9_42: Share the source with d3dx9_36.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 1b9f5c34b5501441c909c505542c651be1bc8872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b9f5c34b5501441c909c5055… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 22 06:01:37 2016 +0000 d3dx9_42: 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_42/Makefile.in | 22 +- dlls/d3dx9_42/d3dx9_42.spec | 666 +++++++++++++++++++++--------------------- dlls/d3dx9_42/d3dx9_42_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 354 insertions(+), 337 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b9f5c34b5501441c909c…

1 0

Alistair Leslie-Hughes : d3dx9_43: Share the source with d3dx9_36.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: dfe3f26b6ddd5f280f61e15a8507e727947b99a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe3f26b6ddd5f280f61e15a8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 22 06:01:50 2016 +0000 d3dx9_43: 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_43/Makefile.in | 22 +- dlls/d3dx9_43/d3dx9_43.spec | 656 +++++++++++++++++++++--------------------- dlls/d3dx9_43/d3dx9_43_main.c | 2 +- tools/make_specfiles | 4 - 4 files changed, 349 insertions(+), 335 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfe3f26b6ddd5f280f61e…

1 0

Matteo Bruni : d3dx9_42: Drop D3DXGatherFragments* exports.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 002daaaddd1cfb74a387df303f09695d4fb4276f URL: http://source.winehq.org/git/wine.git/?a=commit;h=002daaaddd1cfb74a387df303… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 28 19:06:02 2016 +0200 d3dx9_42: Drop D3DXGatherFragments* exports. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_42/d3dx9_42.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec index fbd302e..400461b 100644 --- a/dlls/d3dx9_42/d3dx9_42.spec +++ b/dlls/d3dx9_42/d3dx9_42.spec @@ -138,11 +138,6 @@ @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) @ stdcall D3DXFVFFromDeclarator(ptr ptr) -@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) @ stub D3DXGenerateOutputDecl(ptr ptr) @ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr)

1 0

Michael Stefaniuc : gdiplus: Use SetRect() instead of open coding it.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 9c64ca0d93b83214d3ebda2a3434f6d7a9d254ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c64ca0d93b83214d3ebda2a3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 28 10:28:09 2016 +0200 gdiplus: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/region.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 50cb46a..7d909d2 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -1402,11 +1402,7 @@ GpStatus WINGDIPAPI GdipIsVisibleRegionRect(GpRegion* region, REAL x, REAL y, RE return Ok; } - rect.left = ceilr(x); - rect.top = ceilr(y); - rect.right = ceilr(x + w); - rect.bottom = ceilr(y + h); - + SetRect(&rect, ceilr(x), ceilr(y), ceilr(x + w), ceilr(y + h)); *res = RectInRegion(hrgn, &rect); DeleteObject(hrgn);

1 0