wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

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

03 Jul '16

Module: wine Branch: master Commit: 080c74497de63a237c6d20799f83dd33d092b6f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=080c74497de63a237c6d20799… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 27 09:57:49 2016 +0200 d3d9/tests: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 14 ++++---------- dlls/d3d9/tests/visual.c | 5 +---- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index e73af1f..715e34c 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1990,10 +1990,7 @@ static void test_reset(void) ok(d3dpp.BackBufferHeight == 300, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); IDirect3DSwapChain9_Release(swapchain); - winrect.left = 0; - winrect.top = 0; - winrect.right = 200; - winrect.bottom = 150; + SetRect(&winrect, 0, 0, 200, 150); ok(AdjustWindowRect(&winrect, WS_OVERLAPPEDWINDOW, FALSE), "AdjustWindowRect failed\n"); ok(SetWindowPos(hwnd, NULL, 0, 0, winrect.right-winrect.left, @@ -8465,17 +8462,14 @@ static void test_surface_blocks(void) hr = IDirect3DTexture9_UnlockRect(texture, 1); ok(SUCCEEDED(hr), "Failed lock texture, hr %#x.\n", hr); - rect.left = 0; - rect.top = 0; - rect.right = formats[i].block_width == 1 ? 1 : formats[i].block_width >> 1; - rect.bottom = formats[i].block_height == 1 ? 1 : formats[i].block_height >> 1; + SetRect(&rect, 0, 0, formats[i].block_width == 1 ? 1 : formats[i].block_width >> 1, + formats[i].block_height == 1 ? 1 : formats[i].block_height >> 1); hr = IDirect3DTexture9_LockRect(texture, 1, &locked_rect, &rect, 0); ok(SUCCEEDED(hr), "Failed lock texture, hr %#x.\n", hr); hr = IDirect3DTexture9_UnlockRect(texture, 1); ok(SUCCEEDED(hr), "Failed lock texture, hr %#x.\n", hr); - rect.right = formats[i].block_width; - rect.bottom = formats[i].block_height; + SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height); hr = IDirect3DTexture9_LockRect(texture, 1, &locked_rect, &rect, 0); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a308311..a2adc54 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1041,10 +1041,7 @@ static void clear_test(void) hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); - scissor.left = 160; - scissor.right = 480; - scissor.top = 120; - scissor.bottom = 360; + SetRect(&scissor, 160, 120, 480, 360); hr = IDirect3DDevice9_SetScissorRect(device, &scissor); ok(hr == D3D_OK, "IDirect3DDevice_SetScissorRect failed with %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SCISSORTESTENABLE, TRUE);

1 0

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

03 Jul '16

Module: wine Branch: master Commit: 88fb88508804ed3c8e815e8f59a6c94e75c489b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88fb88508804ed3c8e815e8f5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 27 09:45:31 2016 +0200 cards: 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/cards/cards.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/cards/cards.c b/dlls/cards/cards.c index b9506ea..9bec966 100644 --- a/dlls/cards/cards.c +++ b/dlls/cards/cards.c @@ -151,10 +151,7 @@ BOOL WINAPI cdtDrawExt(HDC hdc, int x, int y, int dx, int dy, int card, int mode HBRUSH hBrush; RECT rect; hBrush = CreateSolidBrush(color); - rect.left = x; - rect.top = y; - rect.right = x + cardWidth - 1; - rect.bottom = y + cardHeight - 1; + SetRect(&rect, x, y, x + cardWidth - 1, y + cardHeight - 1); FillRect(hdc, &rect, hBrush); }

1 0

Michael Stefaniuc : d3dx9/tests: Use SetRect() instead of coding it.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 30ee087d065b8f4d68b08be6ba847699131f5494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30ee087d065b8f4d68b08be6b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 28 10:32:31 2016 +0200 d3dx9/tests: Use SetRect() instead of coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/sprite.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index 4a7437f..17ad16a 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -377,12 +377,10 @@ static HRESULT WINAPI d3dx9_sprite_Draw(ID3DXSprite *iface, IDirect3DTexture9 *t This->sprites[This->sprite_count].texw=texdesc.Width; This->sprites[This->sprite_count].texh=texdesc.Height; - if(rect==NULL) { - This->sprites[This->sprite_count].rect.left=0; - This->sprites[This->sprite_count].rect.top=0; - This->sprites[This->sprite_count].rect.right=texdesc.Width; - This->sprites[This->sprite_count].rect.bottom=texdesc.Height; - } else This->sprites[This->sprite_count].rect=*rect; + if (rect) + This->sprites[This->sprite_count].rect = *rect; + else + SetRect(&This->sprites[This->sprite_count].rect, 0, 0, texdesc.Width, texdesc.Height); if(center==NULL) { This->sprites[This->sprite_count].center.x=0.0f;

1 0

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

03 Jul '16

Module: wine Branch: master Commit: 6329f37d5c0b3b6f2ffb5a4eeaf18fe18bbdafe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6329f37d5c0b3b6f2ffb5a4ee… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 28 10:24:43 2016 +0200 d3dx10/tests: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 44c2333..423ab4d 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -344,10 +344,7 @@ float4 main(float4 color : COLOR) : SV_TARGET for (i = 0; i < D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i) { - tmp_rect[i].left = i; - tmp_rect[i].top = i * 2; - tmp_rect[i].right = i + 1; - tmp_rect[i].bottom = (i + 1) * 2; + SetRect(&tmp_rect[i], i, i * 2, i + 1, (i + 1) * 2); tmp_viewport[i].TopLeftX = i * 3; tmp_viewport[i].TopLeftY = i * 4;

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

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

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

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_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_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

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 July 2016