winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2016
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
465 discussions
Start a n
N
ew thread
Alistair Leslie-Hughes : dpnet: Initialize winsock.
by Alexandre Julliard
03 Nov '16
03 Nov '16
Module: wine Branch: master Commit: db003d4a0860516219efe5bcb6624de2c97f8e8b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=db003d4a0860516219efe5bcb…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 2 09:13:49 2016 +0000 dpnet: Initialize winsock. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/Makefile.in | 2 +- dlls/dpnet/client.c | 4 ++++ dlls/dpnet/dpnet_main.c | 43 +++++++++++++++++++++++++++++++++++++------ dlls/dpnet/dpnet_private.h | 2 ++ dlls/dpnet/lobbiedapp.c | 2 ++ dlls/dpnet/peer.c | 2 ++ dlls/dpnet/server.c | 2 ++ 7 files changed, 50 insertions(+), 7 deletions(-) diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in index 880b7bd..541e104 100644 --- a/dlls/dpnet/Makefile.in +++ b/dlls/dpnet/Makefile.in @@ -1,6 +1,6 @@ MODULE = dpnet.dll IMPORTLIB = dpnet -IMPORTS = dxguid uuid ole32 advapi32 +IMPORTS = dxguid uuid ole32 advapi32 ws2_32 C_SRCS = \ address.c \ diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index de338d8..9692e38 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -115,6 +115,8 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_Initialize(IDirectPlay8Client *ifac This->msghandler = pfn; This->flags = dwFlags; + init_winsock(); + return DPN_OK; } @@ -443,6 +445,8 @@ static HRESULT WINAPI lobbyclient_Initialize(IDirectPlay8LobbyClient *iface, voi This->msghandler = msghandler; This->flags = flags; + init_winsock(); + return DPN_OK; } diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c index 042b95a..cc80ebc 100644 --- a/dlls/dpnet/dpnet_main.c +++ b/dlls/dpnet/dpnet_main.c @@ -40,15 +40,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(dpnet); static HINSTANCE instance; +static BOOL winsock_loaded = FALSE; + +static BOOL WINAPI winsock_startup(INIT_ONCE *once, void *param, void **context) +{ + WSADATA wsa_data; + DWORD res; + + res = WSAStartup(MAKEWORD(1,1), &wsa_data); + if(res == ERROR_SUCCESS) + winsock_loaded = TRUE; + else + ERR("WSAStartup failed: %u\n", res); + return TRUE; +} + +void init_winsock(void) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce(&init_once, winsock_startup, NULL, NULL); +} + /* At process attach */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%x,%p\n", hInstDLL, fdwReason, lpvReserved); - if (fdwReason == DLL_PROCESS_ATTACH) { - instance = hInstDLL; - DisableThreadLibraryCalls(hInstDLL); - } - return TRUE; + TRACE("%p,%x,%p\n", hInstDLL, fdwReason, lpvReserved); + + switch(fdwReason) + { + case DLL_PROCESS_ATTACH: + instance = hInstDLL; + DisableThreadLibraryCalls(hInstDLL); + break; + + case DLL_PROCESS_DETACH: + if (lpvReserved) break; + if(winsock_loaded) + WSACleanup(); + break; + } + return TRUE; } /*********************************************************************** diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index dc6a4f1..89e0777 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -26,6 +26,7 @@ #endif #include <wine/list.h> +#include "winsock2.h" #include "wine/unicode.h" #include "dplay8.h" @@ -135,6 +136,7 @@ extern HRESULT DPNET_CreateDirectPlay8ThreadPool(LPCLASSFACTORY iface, LPUNKNOWN extern HRESULT DPNET_CreateDirectPlay8LobbyClient(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; extern void init_dpn_sp_caps(DPN_SP_CAPS *dpnspcaps) DECLSPEC_HIDDEN; +extern void init_winsock(void) DECLSPEC_HIDDEN; /* used for generic dumping (copied from ddraw) */ typedef struct { diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c index 507a895..8ec9ad1 100644 --- a/dlls/dpnet/lobbiedapp.c +++ b/dlls/dpnet/lobbiedapp.c @@ -101,6 +101,8 @@ static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_Initialize(IDirectPlay8 This->usercontext = pvUserContext; This->connection = pdpnhConnection; + init_winsock(); + return DPN_OK; } diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 4862e67..fe62d59 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -122,6 +122,8 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_Initialize(IDirectPlay8Peer *iface, This->msghandler = pfn; This->flags = dwFlags; + init_winsock(); + return DPN_OK; } diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index cd54ba4..d91822e 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -118,6 +118,8 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_Initialize(IDirectPlay8Server *ifac This->msghandler = pfn; This->flags = dwFlags; + init_winsock(); + return DPN_OK; }
1
0
0
0
Alistair Leslie-Hughes : dpnet: Close resets back to an uninitialized state.
by Alexandre Julliard
03 Nov '16
03 Nov '16
Module: wine Branch: master Commit: eef69511f5d1347af95ffb8556ec6e4712dd3afe URL:
http://source.winehq.org/git/wine.git/?a=commit;h=eef69511f5d1347af95ffb855…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 2 09:13:37 2016 +0000 dpnet: Close resets back to an uninitialized state. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/client.c | 9 ++++++--- dlls/dpnet/tests/client.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 36df50d..de338d8 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -253,9 +253,12 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_GetServerAddress(IDirectPlay8Client static HRESULT WINAPI IDirectPlay8ClientImpl_Close(IDirectPlay8Client *iface, const DWORD dwFlags) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; + IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); + FIXME("(%p):(%x): Stub\n", This, dwFlags); + + This->msghandler = NULL; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8ClientImpl_ReturnBuffer(IDirectPlay8Client *iface, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index cfa7e10..4753d74 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -319,6 +319,33 @@ static void test_cleanup_dp(void) CoUninitialize(); } +static void test_close(void) +{ + HRESULT hr; + static IDirectPlay8Client* client2; + DPN_SP_CAPS caps; + + hr = CoCreateInstance(&CLSID_DirectPlay8Client, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Client, (void **)&client2); + ok(hr == S_OK, "got 0x%x\n", hr); + + memset(&caps, 0, sizeof(DPN_SP_CAPS)); + caps.dwSize = sizeof(DPN_SP_CAPS); + + hr = IDirectPlay8Client_Initialize(client2, NULL, DirectPlayMessageHandler, 0); + ok(hr == S_OK, "got %x\n", hr); + + hr = IDirectPlay8Client_GetSPCaps(client2, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "got %x\n", hr); + + hr = IDirectPlay8Client_Close(client2, 0); + ok(hr == DPN_OK, "got %x\n", hr); + + hr = IDirectPlay8Client_GetSPCaps(client2, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPNERR_UNINITIALIZED, "got %x\n", hr); + + IDirectPlay8Client_Release(client2); +} + START_TEST(client) { if(!test_init_dp()) @@ -329,5 +356,6 @@ START_TEST(client) test_get_sp_caps(); test_player_info(); test_lobbyclient(); + test_close(); test_cleanup_dp(); }
1
0
0
0
Alistair Leslie-Hughes : dpnet: Correctly initialize the DPN_SP_CAPS structure.
by Alexandre Julliard
03 Nov '16
03 Nov '16
Module: wine Branch: master Commit: 7fb80b9029b369d4ee9125b552aa3fd2aa0b6a6d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7fb80b9029b369d4ee9125b55…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 2 09:13:24 2016 +0000 dpnet: Correctly initialize the DPN_SP_CAPS structure. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/peer.c | 1 + dlls/dpnet/tests/client.c | 1 + dlls/dpnet/tests/peer.c | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 264ca70..4862e67 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -544,6 +544,7 @@ static const IDirectPlay8PeerVtbl DirectPlay8Peer_Vtbl = void init_dpn_sp_caps(DPN_SP_CAPS *dpnspcaps) { + dpnspcaps->dwSize = sizeof(DPN_SP_CAPS); dpnspcaps->dwFlags = DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS | DPNSPCAPS_SUPPORTSTHREADPOOL; dpnspcaps->dwNumThreads = 3; diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 6732034..cfa7e10 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -197,6 +197,7 @@ static void test_get_sp_caps(void) hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); + ok(caps.dwSize == sizeof(DPN_SP_CAPS), "got %d\n", caps.dwSize); ok((caps.dwFlags & (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS)) == (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS), diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index f6c413f..9d06c80 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -198,6 +198,7 @@ static void test_get_sp_caps(void) hr = IDirectPlay8Peer_GetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); + ok(caps.dwSize == sizeof(DPN_SP_CAPS), "got %d\n", caps.dwSize); ok((caps.dwFlags & (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS)) == (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS),
1
0
0
0
Józef Kucia : wined3d: Mark buffers as used in wined3d_buffer_copy().
by Alexandre Julliard
03 Nov '16
03 Nov '16
Module: wine Branch: master Commit: 20b989ef86de7e36b7ec9feee49b0bfa9f284b43 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=20b989ef86de7e36b7ec9feee…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 3 12:21:13 2016 +0100 wined3d: Mark buffers as used in wined3d_buffer_copy(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 202ce32..564b1fc 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1264,6 +1264,9 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ DWORD dst_location; HRESULT hr; + buffer_mark_used(dst_buffer); + buffer_mark_used(src_buffer); + device = dst_buffer->resource.device; context = context_acquire(device, NULL);
1
0
0
0
Józef Kucia : d3d9/tests: Add test for evicting bound resources.
by Alexandre Julliard
03 Nov '16
03 Nov '16
Module: wine Branch: master Commit: 5b0cd6fa3e67f9799829bd5769f078351b00dd27 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5b0cd6fa3e67f9799829bd576…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 3 12:21:12 2016 +0100 d3d9/tests: Add test for evicting bound resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 20e3eb9..e25e85c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -21931,6 +21931,143 @@ done: DestroyWindow(window); } +static void test_evict_bound_resources(void) +{ + IDirect3DVertexBuffer9 *vb; + IDirect3DIndexBuffer9 *ib; + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + ULONG refcount; + D3DCOLOR color; + HWND window; + void *data; + HRESULT hr; + + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + green_quad[] = + { + {{-1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + {{-1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + {{ 1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + {{ 1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + }; + static const unsigned short indices[] = {0, 1, 2, 3, 2, 1}; + + window = create_window(); + 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.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateIndexBuffer(device, sizeof(indices), 0, + D3DFMT_INDEX16, D3DPOOL_MANAGED, &ib, NULL); + ok(SUCCEEDED(hr), "Failed to create index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(green_quad), 0, + D3DFVF_XYZ | D3DFVF_DIFFUSE, D3DPOOL_MANAGED, &vb, NULL); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &mat); + ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &mat); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable blending, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set alpha op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set alpha arg, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(green_quad), (void **)&data, 0); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(data, green_quad, sizeof(green_quad)); + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), (void **)&data, 0); + ok(hr == D3D_OK, "Failed to lock index buffer, hr %#x.\n", hr); + memcpy(data, indices, sizeof(indices)); + hr = IDirect3DIndexBuffer9_Unlock(ib); + ok(hr == D3D_OK, "Failed to unlock index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetIndices(device, ib); + ok(hr == D3D_OK, "Failed to set index buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, 4 * sizeof(DWORD)); + ok(hr == D3D_OK, "Failed to set stream source, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, 4, 0, 2); + 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); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_EvictManagedResources(device); + ok(hr == D3D_OK, "Failed to evict managed resources, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, 4, 0, 2); + 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); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + + IDirect3DIndexBuffer9_Release(ib); + IDirect3DVertexBuffer9_Release(vb); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -22056,4 +22193,5 @@ START_TEST(visual) test_color_clamping(); test_line_antialiasing_blending(); test_dsy(); + test_evict_bound_resources(); }
1
0
0
0
Józef Kucia : wined3d: Get rid of WINED3DFMT_VERTEXDATA.
by Alexandre Julliard
03 Nov '16
03 Nov '16
Module: wine Branch: master Commit: aa11efc4af2cdd34bf0c11da0121b15ba4cebc33 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=aa11efc4af2cdd34bf0c11da0…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 3 12:21:11 2016 +0100 wined3d: Get rid of WINED3DFMT_VERTEXDATA. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 +--- dlls/d3d9/device.c | 4 +--- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/utils.c | 2 -- include/wine/wined3d.h | 1 - 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 33ff7a5..fae5610 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -83,7 +83,6 @@ D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_X8D24_UNORM: return D3DFMT_D24X8; case WINED3DFMT_S4X4_UINT_D24_UNORM: return D3DFMT_D24X4S4; case WINED3DFMT_D16_UNORM: return D3DFMT_D16; - case WINED3DFMT_VERTEXDATA: return D3DFMT_VERTEXDATA; case WINED3DFMT_R16_UINT: return D3DFMT_INDEX16; case WINED3DFMT_R32_UINT: return D3DFMT_INDEX32; default: @@ -134,11 +133,10 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) case D3DFMT_D24X8: return WINED3DFMT_X8D24_UNORM; case D3DFMT_D24X4S4: return WINED3DFMT_S4X4_UINT_D24_UNORM; case D3DFMT_D16: return WINED3DFMT_D16_UNORM; - case D3DFMT_VERTEXDATA: return WINED3DFMT_VERTEXDATA; case D3DFMT_INDEX16: return WINED3DFMT_R16_UINT; case D3DFMT_INDEX32: return WINED3DFMT_R32_UINT; default: - FIXME("Unhandled D3DFORMAT %#x\n", format); + FIXME("Unhandled D3DFORMAT %#x.\n", format); return WINED3DFMT_UNKNOWN; } } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b8c4638..dab19ab 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -80,7 +80,6 @@ D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_L16_UNORM: return D3DFMT_L16; case WINED3DFMT_D32_FLOAT: return D3DFMT_D32F_LOCKABLE; case WINED3DFMT_S8_UINT_D24_FLOAT: return D3DFMT_D24FS8; - case WINED3DFMT_VERTEXDATA: return D3DFMT_VERTEXDATA; case WINED3DFMT_R16_UINT: return D3DFMT_INDEX16; case WINED3DFMT_R32_UINT: return D3DFMT_INDEX32; case WINED3DFMT_R16G16B16A16_SNORM: return D3DFMT_Q16W16V16U16; @@ -145,7 +144,6 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) case D3DFMT_L16: return WINED3DFMT_L16_UNORM; case D3DFMT_D32F_LOCKABLE: return WINED3DFMT_D32_FLOAT; case D3DFMT_D24FS8: return WINED3DFMT_S8_UINT_D24_FLOAT; - case D3DFMT_VERTEXDATA: return WINED3DFMT_VERTEXDATA; case D3DFMT_INDEX16: return WINED3DFMT_R16_UINT; case D3DFMT_INDEX32: return WINED3DFMT_R32_UINT; case D3DFMT_Q16W16V16U16: return WINED3DFMT_R16G16B16A16_SNORM; @@ -157,7 +155,7 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) case D3DFMT_A32B32G32R32F: return WINED3DFMT_R32G32B32A32_FLOAT; case D3DFMT_CxV8U8: return WINED3DFMT_R8G8_SNORM_Cx; default: - FIXME("Unhandled D3DFORMAT %#x\n", format); + FIXME("Unhandled D3DFORMAT %#x.\n", format); return WINED3DFMT_UNKNOWN; } } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 25c1853..202ce32 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1578,7 +1578,7 @@ HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, return WINED3DERR_OUTOFVIDEOMEMORY; } - hr = buffer_init(object, device, size, usage, WINED3DFMT_VERTEXDATA, + hr = buffer_init(object, device, size, usage, WINED3DFMT_UNKNOWN, pool, WINED3D_BIND_VERTEX_BUFFER, NULL, parent, parent_ops); if (FAILED(hr)) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2171611..6ab851d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -136,7 +136,6 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_D16_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 2, 16, 0}, {WINED3DFMT_D32_FLOAT, 0, 0, 0, 0, 0, 0, 0, 0, 4, 32, 0}, {WINED3DFMT_S8_UINT_D24_FLOAT, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, - {WINED3DFMT_VERTEXDATA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, /* Vendor-specific formats */ {WINED3DFMT_ATI1N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_ATI2N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, @@ -3664,7 +3663,6 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_S4X4_UINT_D24_UNORM); FMT_TO_STR(WINED3DFMT_L16_UNORM); FMT_TO_STR(WINED3DFMT_S8_UINT_D24_FLOAT); - FMT_TO_STR(WINED3DFMT_VERTEXDATA); FMT_TO_STR(WINED3DFMT_R8G8_SNORM_Cx); FMT_TO_STR(WINED3DFMT_ATI1N); FMT_TO_STR(WINED3DFMT_ATI2N); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9d234d6..c7ecef1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -123,7 +123,6 @@ enum wined3d_format_id WINED3DFMT_S4X4_UINT_D24_UNORM, WINED3DFMT_L16_UNORM, WINED3DFMT_S8_UINT_D24_FLOAT, - WINED3DFMT_VERTEXDATA, WINED3DFMT_R8G8_SNORM_Cx, WINED3DFMT_R32G32B32A32_TYPELESS, WINED3DFMT_R32G32B32A32_FLOAT,
1
0
0
0
Józef Kucia : d3d8/tests: Port test_check_device_format() from d3d9.
by Alexandre Julliard
03 Nov '16
03 Nov '16
Module: wine Branch: master Commit: 606cd128aec41a3fabafffd14db512f16cfe2c2b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=606cd128aec41a3fabafffd14…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 3 12:21:10 2016 +0100 d3d8/tests: Port test_check_device_format() from d3d9. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 95567ca..a912592 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7903,6 +7903,37 @@ static void test_swapchain_parameters(void) DestroyWindow(window); } +static void test_check_device_format(void) +{ + IDirect3D8 *d3d; + HRESULT hr; + + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_VERTEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_INDEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_VERTEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + IDirect3D8_Release(d3d); +} + static void test_miptree_layout(void) { unsigned int pool_idx, format_idx, base_dimension, level_count, offset, i, j; @@ -8152,6 +8183,7 @@ START_TEST(device) test_lost_device(); test_resource_priority(); test_swapchain_parameters(); + test_check_device_format(); test_miptree_layout(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL));
1
0
0
0
Józef Kucia : d3d9/tests: Add test for checking buffer resource format support.
by Alexandre Julliard
03 Nov '16
03 Nov '16
Module: wine Branch: master Commit: 89ba45701149af27bab2eca4c0794c667d4c39bd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=89ba45701149af27bab2eca4c…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 3 12:21:09 2016 +0100 d3d9/tests: Add test for checking buffer resource format support. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9f1d39b..4ea5e6c 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11022,6 +11022,26 @@ static void test_check_device_format(void) ok(FAILED(hr), "Got unexpected hr %#x.\n", hr); } + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_VERTEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_INDEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_VERTEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + IDirect3D9_Release(d3d); }
1
0
0
0
Nikolay Sivov : d2d1: Implement FillContainsPoint() for rectangle geometry.
by Alexandre Julliard
03 Nov '16
03 Nov '16
Module: wine Branch: master Commit: 97e52ab67312a565f3d8c31288ea9bb94edf212a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=97e52ab67312a565f3d8c3128…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 2 16:12:39 2016 +0300 d2d1: Implement FillContainsPoint() for rectangle geometry. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 24 +++++++++++++++++-- dlls/d2d1/tests/d2d1.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++-- include/d2d1.idl | 2 ++ 3 files changed, 86 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 4abe9bc..afbf339 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2390,10 +2390,30 @@ static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_StrokeContainsPoint(ID2D static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_FillContainsPoint(ID2D1RectangleGeometry *iface, D2D1_POINT_2F point, const D2D1_MATRIX_3X2_F *transform, float tolerance, BOOL *contains) { - FIXME("iface %p, point {%.8e, %.8e}, transform %p, tolerance %.8e, contains %p stub!\n", + struct d2d_geometry *geometry = impl_from_ID2D1RectangleGeometry(iface); + D2D1_RECT_F *rect = &geometry->u.rectangle.rect; + float dx, dy; + + TRACE("iface %p, point {%.8e, %.8e}, transform %p, tolerance %.8e, contains %p.\n", iface, point.x, point.y, transform, tolerance, contains); - return E_NOTIMPL; + if (transform) + { + D2D1_MATRIX_3X2_F g_i; + + if (!d2d_matrix_invert(&g_i, transform)) + return D2DERR_UNSUPPORTED_OPERATION; + d2d_point_transform(&point, &g_i, point.x, point.y); + } + + if (tolerance == 0.0f) + tolerance = D2D1_DEFAULT_FLATTENING_TOLERANCE; + + dx = max(fabsf((rect->right + rect->left) / 2.0f - point.x) - (rect->right - rect->left) / 2.0f, 0.0f); + dy = max(fabsf((rect->bottom + rect->top) / 2.0f - point.y) - (rect->bottom - rect->top) / 2.0f, 0.0f); + + *contains = tolerance * tolerance > (dx * dx + dy * dy); + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_CompareWithGeometry(ID2D1RectangleGeometry *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 4409bb8..721afa4 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1749,6 +1749,66 @@ static void test_path_geometry(void) DestroyWindow(window); } +static void test_rectangle_geometry(void) +{ + ID2D1RectangleGeometry *geometry; + ID2D1Factory *factory; + D2D1_POINT_2F point; + D2D1_RECT_F rect; + BOOL contains; + HRESULT hr; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + set_rect(&rect, 0.0f, 0.0f, 10.0f, 20.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + /* Edge. */ + contains = FALSE; + set_point(&point, 0.0f, 0.0f); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!!contains, "Got wrong hit test result %d.\n", contains); + + /* Within tolerance limit around corner. */ + contains = TRUE; + set_point(&point, -D2D1_DEFAULT_FLATTENING_TOLERANCE, 0.0f); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!contains, "Got wrong hit test result %d.\n", contains); + + contains = FALSE; + set_point(&point, -D2D1_DEFAULT_FLATTENING_TOLERANCE + 0.01f, 0.0f); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!!contains, "Got wrong hit test result %d.\n", contains); + + contains = TRUE; + set_point(&point, -D2D1_DEFAULT_FLATTENING_TOLERANCE - 0.01f, 0.0f); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!contains, "Got wrong hit test result %d.\n", contains); + + contains = TRUE; + set_point(&point, -D2D1_DEFAULT_FLATTENING_TOLERANCE, -D2D1_DEFAULT_FLATTENING_TOLERANCE); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!contains, "Got wrong hit test result %d.\n", contains); + + /* Inside. */ + contains = FALSE; + set_point(&point, 5.0f, 5.0f); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!!contains, "Got wrong hit test result %d.\n", contains); + + ID2D1RectangleGeometry_Release(geometry); + + ID2D1Factory_Release(factory); +} + static void test_bitmap_formats(void) { D2D1_BITMAP_PROPERTIES bitmap_desc; @@ -2705,8 +2765,7 @@ todo_wine ok(hr == D2DERR_WRONG_FACTORY, "EndDraw failure expected, hr %#x.\n", hr); /* Effect is d2d resource, but not a brush. */ - rect.left = rect.top = 0.0f; - rect.right = rect.bottom = 10.0f; + set_rect(&rect, 0.0f, 0.0f, 10.0f, 10.0f); hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); ok(SUCCEEDED(hr), "Failed to geometry, hr %#x.\n", hr); @@ -3189,6 +3248,7 @@ START_TEST(d2d1) test_color_brush(); test_bitmap_brush(); test_path_geometry(); + test_rectangle_geometry(); test_bitmap_formats(); test_alpha_mode(); test_shared_bitmap(); diff --git a/include/d2d1.idl b/include/d2d1.idl index 6d39e88..cb07cfa 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -50,6 +50,8 @@ typedef D2D_POINT_2U D2D1_POINT_2U; typedef D2D_RECT_U D2D1_RECT_U; typedef D2D_COLOR_F D2D1_COLOR_F; +cpp_quote("#define D2D1_DEFAULT_FLATTENING_TOLERANCE (0.25f)") + enum { D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR = 0,
1
0
0
0
Nikolay Sivov : gdiplus: Implement GdipBitmapGetHistogram().
by Alexandre Julliard
03 Nov '16
03 Nov '16
Module: wine Branch: master Commit: 509ba80bcbd502fa98ad189d5ae26627f9606757 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=509ba80bcbd502fa98ad189d5…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 2 21:24:21 2016 +0300 gdiplus: Implement GdipBitmapGetHistogram(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 123 +++++++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/image.c | 94 ++++++++++++++++++++++++++++++++-- include/gdiplusflat.h | 1 + 4 files changed, 216 insertions(+), 4 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=509ba80bcbd502fa98ad1…
1
0
0
0
← Newer
1
...
41
42
43
44
45
46
47
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
Results per page:
10
25
50
100
200