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

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 : 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 : 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 : 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 : d3d10core/tests: Use SetRect() instead of open coding it.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 88217213ef80166deab58d3fd58903729ea5a256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88217213ef80166deab58d3fd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 29 09:53:58 2016 +0200 d3d10core/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/d3d10core/tests/device.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 24b7b50..b857f36 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3960,10 +3960,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 : wined3d: Use SetRect() instead of open coding it.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: bb82e915d14df26e2068cfc545d3113b815695dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb82e915d14df26e2068cfc54… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 29 09:58:26 2016 +0200 wined3d: 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/wined3d/swapchain.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 0df7023..7485c1c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -678,10 +678,8 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai TRACE("offset %s.\n", wine_dbgstr_point(&offset)); - draw_rect.left = 0; - draw_rect.right = swapchain->front_buffer->resource.width; - draw_rect.top = 0; - draw_rect.bottom = swapchain->front_buffer->resource.height; + SetRect(&draw_rect, 0, 0, swapchain->front_buffer->resource.width, + swapchain->front_buffer->resource.height); IntersectRect(&draw_rect, &draw_rect, &swapchain->front_buffer_update); BitBlt(dst_dc, draw_rect.left - offset.x, draw_rect.top - offset.y,

1 0

Benjamin Hodgetts : wined3d: Add Intel Iris chips to identification list.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: a14e5fb1bb19a2bd7cf96e59b0fb4ee70f304401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14e5fb1bb19a2bd7cf96e59b… Author: Benjamin Hodgetts <ben(a)xnode.org> Date: Tue Jun 28 23:59:26 2016 +0100 wined3d: Add Intel Iris chips to identification list. Add the newer and high-end Intel Iris GPU chips to the current identification list. Signed-off-by: Benjamin Hodgetts <ben(a)xnode.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 3 +++ 2 files changed, 10 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 03008cc..7d80752 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1393,10 +1393,13 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWD, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IG6100, "Intel(R) Iris(TM) Graphics 6100", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IP6200, "Intel(R) Iris(TM) Pro Graphics 6200", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD520, "Intel(R) HD Graphics 520", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD530_1, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD530_2, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD540, "Intel(R) Iris(TM) Graphics 540", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IPP580, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, @@ -2003,7 +2006,11 @@ cards_amd_binary[] = cards_intel[] = { /* Skylake */ + {"Iris Pro Graphics P580", CARD_INTEL_IPP580}, {"Skylake", CARD_INTEL_HD520}, + /* Broadwell */ + {"Iris Pro 6200", CARD_INTEL_IP6200}, + {"Iris 6100", CARD_INTEL_IG6100}, /* Haswell */ {"Haswell Mobile", CARD_INTEL_HWM}, /* Ivybridge */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b82ec3d..184d7b5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1936,10 +1936,13 @@ enum wined3d_pci_device CARD_INTEL_IVBS = 0x015a, CARD_INTEL_HWD = 0x0412, CARD_INTEL_HWM = 0x0416, + CARD_INTEL_IG6100 = 0x162b, + CARD_INTEL_IP6200 = 0x1622, CARD_INTEL_HD520 = 0x1916, CARD_INTEL_HD530_1 = 0x1912, CARD_INTEL_HD530_2 = 0x191b, CARD_INTEL_HD540 = 0x1926, + CARD_INTEL_IPP580 = 0x193d, }; struct wined3d_fbo_ops

1 0

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

03 Jul '16

Module: wine Branch: master Commit: 9fd4429d493ff4483c361a466a8cb21206d60b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd4429d493ff4483c361a466… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 29 09:54:30 2016 +0200 mciavi32: 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/mciavi32/mmoutput.c | 6 +----- dlls/mciavi32/wnd.c | 24 +++++++++--------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index c932ab4..ee0481c 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -140,11 +140,7 @@ static BOOL MCIAVI_GetInfoVideo(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK TRACE("bih.biClrUsed=%d\n", wma->inbih->biClrUsed); TRACE("bih.biClrImportant=%d\n", wma->inbih->biClrImportant); - wma->source.left = 0; - wma->source.top = 0; - wma->source.right = wma->inbih->biWidth; - wma->source.bottom = wma->inbih->biHeight; - + SetRect(&wma->source, 0, 0, wma->inbih->biWidth, wma->inbih->biHeight); wma->dest = wma->source; return TRUE; diff --git a/dlls/mciavi32/wnd.c b/dlls/mciavi32/wnd.c index c7dcf61..66c7565 100644 --- a/dlls/mciavi32/wnd.c +++ b/dlls/mciavi32/wnd.c @@ -122,9 +122,11 @@ BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARM if (dwFlags & MCI_DGV_OPEN_PARENT) hParent = lpOpenParms->hWndParent; if (dwFlags & MCI_DGV_OPEN_WS) dwStyle = lpOpenParms->dwStyle; - rc.left = rc.top = 0; - rc.right = (wma->hic ? wma->outbih : wma->inbih)->biWidth; - rc.bottom = (wma->hic ? wma->outbih : wma->inbih)->biHeight; + if (wma->hic) + SetRect(&rc, 0, 0, wma->outbih->biWidth, wma->outbih->biHeight); + else + SetRect(&rc, 0, 0, wma->inbih->biWidth, wma->inbih->biHeight); + AdjustWindowRect(&rc, dwStyle, FALSE); if (!(dwStyle & (WS_CHILD|WS_POPUP))) /* overlapped window ? */ { @@ -161,10 +163,8 @@ DWORD MCIAVI_mciPut(UINT wDevID, DWORD dwFlags, LPMCI_DGV_PUT_PARMS lpParms) if (dwFlags & MCI_DGV_RECT) { /* In MCI, RECT structure is used differently: rc.right = width & rc.bottom = height * So convert input MCI RECT into a normal RECT */ - rc.left = lpParms->rc.left; - rc.top = lpParms->rc.top; - rc.right = lpParms->rc.left + lpParms->rc.right; - rc.bottom = lpParms->rc.top + lpParms->rc.bottom; + SetRect(&rc, lpParms->rc.left, lpParms->rc.top, lpParms->rc.left + lpParms->rc.right, + lpParms->rc.top + lpParms->rc.bottom); } else { GetClientRect(wma->hWndPaint, &rc); } @@ -235,10 +235,7 @@ DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms) } if (dwFlags & MCI_DGV_WHERE_SOURCE) { if (dwFlags & MCI_DGV_WHERE_MAX) { - rc.left = 0; - rc.top = 0; - rc.right = wma->inbih->biWidth; - rc.bottom = wma->inbih->biHeight; + SetRect(&rc, 0, 0, wma->inbih->biWidth, wma->inbih->biHeight); TRACE("WHERE_SOURCE_MAX %s\n", wine_dbgstr_rect(&rc)); } else { TRACE("WHERE_SOURCE %s\n", wine_dbgstr_rect(&wma->source)); @@ -265,10 +262,7 @@ DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms) /* In MCI, RECT structure is used differently: rc.right = width & rc.bottom = height * So convert the normal RECT into a MCI RECT before returning */ - lpParms->rc.left = rc.left; - lpParms->rc.top = rc.top; - lpParms->rc.right = rc.right - rc.left; - lpParms->rc.bottom = rc.bottom - rc.top; + SetRect(&lpParms->rc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top); LeaveCriticalSection(&wma->cs); return 0;

1 0

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

03 Jul '16

Module: wine Branch: master Commit: 275eb8ab2bfbf6ff1e2759b5e4c87e071174f802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275eb8ab2bfbf6ff1e2759b5e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 29 09:55:24 2016 +0200 strmbase: 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/strmbase/video.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 9714d7e..ec3a076 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -368,10 +368,8 @@ HRESULT WINAPI BaseControlVideoImpl_SetSourcePosition(IBasicVideo *iface, LONG L BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); - SourceRect.left = Left; - SourceRect.top = Top; - SourceRect.right = Left + Width; - SourceRect.bottom = Top + Height; + + SetRect(&SourceRect, Left, Top, Left + Width, Top + Height); This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); return S_OK; @@ -408,10 +406,7 @@ HRESULT WINAPI BaseControlVideoImpl_SetDestinationPosition(IBasicVideo *iface, L TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); - DestRect.left = Left; - DestRect.top = Top; - DestRect.right = Left + Width; - DestRect.bottom = Top + Height; + SetRect(&DestRect, Left, Top, Left + Width, Top + Height); This->pFuncsTable->pfnSetTargetRect(This, &DestRect); return S_OK;

1 0

Aaryaman Vasishta : d3drm: Use a table in d3drm3_CreateObject() to create objects in a generic manner.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 94bab100a4fe6b99c5accdf161f638d1f2419903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94bab100a4fe6b99c5accdf16… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Jun 29 15:39:01 2016 +0200 d3drm: Use a table in d3drm3_CreateObject() to create objects in a generic manner. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 40 +++++++++++++++++++++++++++++++++------- dlls/d3drm/d3drm_private.h | 4 ++++ 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 8d054b5..7fcb0ba 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -51,6 +51,19 @@ static const char* get_IID_string(const GUID* guid) return "?"; } +static HRESULT d3drm_create_texture_object(void **object, IDirect3DRM *d3drm) +{ + struct d3drm_texture *texture; + HRESULT hr; + + if (FAILED(hr = d3drm_texture_create(&texture, d3drm))) + return hr; + + *object = &texture->IDirect3DRMTexture_iface; + + return hr; +} + struct d3drm { IDirect3DRM IDirect3DRM_iface; @@ -1106,8 +1119,19 @@ static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, { struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); IUnknown *object; + unsigned int i; HRESULT hr; + static const struct + { + const CLSID *clsid; + HRESULT (*create_object)(void **object, IDirect3DRM *d3drm); + } + object_table[] = + { + {&CLSID_CDirect3DRMTexture, d3drm_create_texture_object}, + }; + TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", iface, debugstr_guid(clsid), outer, debugstr_guid(iid), out); @@ -1127,17 +1151,19 @@ static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, return E_NOTIMPL; } - if (IsEqualGUID(clsid, &CLSID_CDirect3DRMTexture)) + for (i = 0; i < ARRAY_SIZE(object_table); ++i) { - struct d3drm_texture *texture; - if (FAILED(hr = d3drm_texture_create(&texture, &d3drm->IDirect3DRM_iface))) + if (IsEqualGUID(clsid, object_table[i].clsid)) { - *out = NULL; - return hr; + if (FAILED(hr = object_table[i].create_object((void **)&object, &d3drm->IDirect3DRM_iface))) + { + *out = NULL; + return hr; + } + break; } - object = (IUnknown *)&texture->IDirect3DRMTexture3_iface; } - else + if (i == ARRAY_SIZE(object_table)) { FIXME("%s not implemented. Returning CLASSFACTORY_E_FIRST.\n", debugstr_guid(clsid)); *out = NULL; diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 06cbdc1..651eaec 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -26,6 +26,10 @@ #include "wine/list.h" +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a))) +#endif + struct d3drm_device; struct d3drm_object {

1 0