wine-commits October 2016

wine-commits@winehq.org

2 participants
451 discussions

Jacek Caban : ws2_32: Pass completion routing to NtDeviceIoControlFile in server_ioctl_sock only if caller provided completion routine.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: 93863d25fc32a6229590e3b97a9d12e1a94676d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93863d25fc32a6229590e3b97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 12 17:11:34 2016 +0200 ws2_32: Pass completion routing to NtDeviceIoControlFile in server_ioctl_sock only if caller provided completion routine. Otherwise we're always doing non-blocking calls, preventing server from doing the right thing (and in actually doing the opposite in WS_SIO_ADDRESS_LIST_CHANGE case). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 27 ++++++++++++++++++--------- dlls/ws2_32/tests/sock.c | 2 -- server/sock.c | 2 +- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e3c7507..e8c5130 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4520,18 +4520,27 @@ static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_s { HANDLE event = overlapped ? overlapped->hEvent : 0; HANDLE handle = SOCKET2HANDLE( s ); - struct ws2_async *wsa; + struct ws2_async *wsa = NULL; + IO_STATUS_BLOCK *io = (PIO_STATUS_BLOCK)overlapped, iosb; + void *cvalue = NULL; NTSTATUS status; - PIO_STATUS_BLOCK io; - if (!(wsa = (struct ws2_async *)alloc_async_io( sizeof(*wsa) ))) - return WSA_NOT_ENOUGH_MEMORY; - wsa->hSocket = handle; - wsa->user_overlapped = overlapped; - wsa->completion_func = completion; - io = (overlapped ? (PIO_STATUS_BLOCK)overlapped : &wsa->local_iosb); + if (completion) + { + if (!(wsa = (struct ws2_async *)alloc_async_io( sizeof(*wsa) ))) + return WSA_NOT_ENOUGH_MEMORY; + wsa->hSocket = handle; + wsa->user_overlapped = overlapped; + wsa->completion_func = completion; + if (!io) io = &wsa->local_iosb; + cvalue = wsa; + } + else if (!io) + io = &iosb; + else if (!((ULONG_PTR)overlapped->hEvent & 1)) + cvalue = overlapped; - status = NtDeviceIoControlFile( handle, event, ws2_async_apc, wsa, io, code, + status = NtDeviceIoControlFile( handle, event, wsa ? ws2_async_apc : NULL, cvalue, io, code, in_buff, in_size, out_buff, out_size ); if (status == STATUS_NOT_SUPPORTED) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 320f820..b7aaea3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8387,7 +8387,6 @@ static void test_sioAddressListChange(void) ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); error = GetLastError(); ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); -todo_wine ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); CloseHandle(overlapped.hEvent); @@ -8426,7 +8425,6 @@ todo_wine ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); error = GetLastError(); ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); -todo_wine ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); CloseHandle(overlapped.hEvent); diff --git a/server/sock.c b/server/sock.c index 89049e0..d7349fc 100644 --- a/server/sock.c +++ b/server/sock.c @@ -548,7 +548,7 @@ obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *a switch(code) { case WS_SIO_ADDRESS_LIST_CHANGE: - if ((sock->state & FD_WINE_NONBLOCKING) && !blocking) + if ((sock->state & FD_WINE_NONBLOCKING) && blocking) { set_error( STATUS_CANT_WAIT ); return 0;

1 0

Huw Davies : include: Add a padding WORD to ensure that wWeight is at the correct offset.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: f1ef14e02375d29a53e5796acc40d0c47dc11dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ef14e02375d29a53e5796ac… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 13 16:52:49 2016 +0100 include: Add a padding WORD to ensure that wWeight is at the correct offset. This is a bug in MS's C version of these structures. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 43 +++++++++++++++++++++++++++++++++++++++++++ include/richedit.h | 2 ++ 2 files changed, 45 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 88270aa..36e082e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -747,6 +747,7 @@ static void test_EM_SETCHARFORMAT(void) { HWND hwndRichEdit = new_richedit(NULL); CHARFORMAT2A cf2; + CHARFORMAT2W cfW; int rc = 0; int tested_effects[] = { CFE_BOLD, @@ -1196,6 +1197,48 @@ static void test_EM_SETCHARFORMAT(void) ok((cf2.dwEffects & CFE_BOLD) == CFE_BOLD, "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x\n", i, cf2.dwEffects, CFE_BOLD); + /* show that wWeight is at the correct offset in CHARFORMAT2A */ + memset(&cf2, 0, sizeof(cf2)); + cf2.cbSize = sizeof(cf2); + cf2.dwMask = CFM_WEIGHT; + cf2.wWeight = 100; + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2); + memset(&cf2, 0, sizeof(cf2)); + cf2.cbSize = sizeof(cf2); + SendMessageA(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2); + ok(cf2.wWeight == 100, "got %d\n", cf2.wWeight); + + memset(&cf2, 0, sizeof(cf2)); + cf2.cbSize = sizeof(cf2); + cf2.dwMask = CFM_SPACING; + cf2.sSpacing = 10; + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2); + memset(&cf2, 0, sizeof(cf2)); + cf2.cbSize = sizeof(cf2); + SendMessageA(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2); + ok(cf2.sSpacing == 10, "got %d\n", cf2.sSpacing); + + /* show that wWeight is at the correct offset in CHARFORMAT2W */ + memset(&cfW, 0, sizeof(cfW)); + cfW.cbSize = sizeof(cfW); + cfW.dwMask = CFM_WEIGHT; + cfW.wWeight = 100; + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cfW); + memset(&cfW, 0, sizeof(cfW)); + cfW.cbSize = sizeof(cfW); + SendMessageA(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cfW); + ok(cfW.wWeight == 100, "got %d\n", cfW.wWeight); + + memset(&cfW, 0, sizeof(cfW)); + cfW.cbSize = sizeof(cfW); + cfW.dwMask = CFM_SPACING; + cfW.sSpacing = 10; + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cfW); + memset(&cfW, 0, sizeof(cfW)); + cfW.cbSize = sizeof(cfW); + SendMessageA(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cfW); + ok(cfW.sSpacing == 10, "got %d\n", cfW.sSpacing); + DestroyWindow(hwndRichEdit); } diff --git a/include/richedit.h b/include/richedit.h index f0ae57e..63221e2 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -287,6 +287,7 @@ typedef struct _charformat2a { BYTE bCharSet; BYTE bPitchAndFamily; char szFaceName[LF_FACESIZE]; + WORD pad; /* Not in MS's C version, but needed to ensure that wWeight is at the correct offset to match the C++ version */ WORD wWeight; SHORT sSpacing; COLORREF crBackColor; @@ -309,6 +310,7 @@ typedef struct _charformat2w { BYTE bCharSet; BYTE bPitchAndFamily; WCHAR szFaceName[LF_FACESIZE]; + WORD pad; /* Not in MS's C version, but needed to ensure that wWeight is at the correct offset to match the C++ version */ WORD wWeight; SHORT sSpacing; COLORREF crBackColor;

1 0

Huw Davies : riched20/tests: Add a test to show the insert style is cleared if the selection changes.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: 9bce3e61138d04ad6867f97977a816fd80cfdb54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bce3e61138d04ad6867f9797… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 13 16:52:48 2016 +0100 riched20/tests: Add a test to show the insert style is cleared if the selection changes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index d694d28..88270aa 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1057,6 +1057,14 @@ static void test_EM_SETCHARFORMAT(void) /* Set two effects on an empty selection */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); + /* first clear bold, italic */ + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + memset(&cf2, 0, sizeof(CHARFORMAT2A)); + cf2.cbSize = sizeof(CHARFORMAT2A); + cf2.dwMask = CFM_BOLD | CFM_ITALIC; + cf2.dwEffects = 0; + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2); + SendMessageA(hwndRichEdit, EM_SETSEL, 2, 2); /* Empty selection */ memset(&cf2, 0, sizeof(CHARFORMAT2A)); @@ -1084,6 +1092,14 @@ static void test_EM_SETCHARFORMAT(void) /* Setting the (empty) selection to exactly the same place as before should NOT clear the insertion style! */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); + /* first clear bold, italic */ + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + memset(&cf2, 0, sizeof(CHARFORMAT2A)); + cf2.cbSize = sizeof(CHARFORMAT2A); + cf2.dwMask = CFM_BOLD | CFM_ITALIC; + cf2.dwEffects = 0; + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2); + SendMessageA(hwndRichEdit, EM_SETSEL, 2, 2); /* Empty selection */ memset(&cf2, 0, sizeof(CHARFORMAT2A)); @@ -1108,8 +1124,51 @@ static void test_EM_SETCHARFORMAT(void) ok((cf2.dwEffects & CFE_BOLD) == CFE_BOLD, "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x\n", i, cf2.dwEffects, CFE_BOLD); + /* Moving the selection will clear the insertion style */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); + /* first clear bold, italic */ + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + memset(&cf2, 0, sizeof(CHARFORMAT2A)); + cf2.cbSize = sizeof(CHARFORMAT2A); + cf2.dwMask = CFM_BOLD | CFM_ITALIC; + cf2.dwEffects = 0; + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2); + + SendMessageA(hwndRichEdit, EM_SETSEL, 2, 2); /* Empty selection */ + + memset(&cf2, 0, sizeof(CHARFORMAT2A)); + cf2.cbSize = sizeof(CHARFORMAT2A); + cf2.dwMask = CFM_BOLD; + cf2.dwEffects = CFE_BOLD; + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2); + + /* Move selection and then put it back, insert style should be forgotten here. */ + SendMessageA(hwndRichEdit, EM_SETSEL, 3, 3); + SendMessageA(hwndRichEdit, EM_SETSEL, 2, 2); /* Empty selection */ + + /* Selection is now nonempty */ + SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"newi"); + + memset(&cf2, 0, sizeof(CHARFORMAT2A)); + cf2.cbSize = sizeof(CHARFORMAT2A); + SendMessageA(hwndRichEdit, EM_SETSEL, 2, 6); + SendMessageA(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2); + + ok(((cf2.dwMask & CFM_BOLD) == CFM_BOLD), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, CFM_BOLD); + ok((cf2.dwEffects & CFE_BOLD) == 0, + "%d, cf2.dwEffects == 0x%08x not expecting effect 0x%08x\n", i, cf2.dwEffects, CFE_BOLD); + /* Ditto with EM_EXSETSEL */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); + /* first clear bold, italic */ + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + memset(&cf2, 0, sizeof(CHARFORMAT2A)); + cf2.cbSize = sizeof(CHARFORMAT2A); + cf2.dwMask = CFM_BOLD | CFM_ITALIC; + cf2.dwEffects = 0; + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2); + cr.cpMin = 2; cr.cpMax = 2; SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); /* Empty selection */

1 0

Alistair Leslie-Hughes : dpnet: Correct GetComponentByName to return the correct buffer size.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: 7c609f07b4e1e9a5f0c0ef38329c461e1a9b3ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c609f07b4e1e9a5f0c0ef383… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 13 10:07:08 2016 +0000 dpnet: Correct GetComponentByName to return the correct buffer size. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/address.c | 4 ++-- dlls/dpnet/tests/address.c | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index d87d4e7..6305fe7 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -377,9 +377,9 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByName(IDirectPlay8Add struct component *entry; DWORD i; - TRACE("(%p)->(%p %p %p %p)\n", This, pwszName, pvBuffer, pdwBufferSize, pdwDataType); + TRACE("(%p)->(%s %p %p %p)\n", This, debugstr_w(pwszName), pvBuffer, pdwBufferSize, pdwDataType); - if(!pwszName || !pdwBufferSize || !pdwDataType || (!pvBuffer && pdwBufferSize)) + if(!pwszName || !pdwBufferSize || !pdwDataType || (!pvBuffer && *pdwBufferSize)) return E_POINTER; for(i=0; i < This->comp_count; i++) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index cb226f9..dd0ef23 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -123,6 +123,15 @@ static void address_addcomponents(void) hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost)+2, DPNA_DATATYPE_STRING); ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + size = 0; + hr = IDirectPlay8Address_GetComponentByName(localaddr, DPNA_KEY_HOSTNAME, NULL, &size, &type); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(size == sizeof(localhost), "Invalid string length: %d\n", size); + + size = 1; + hr = IDirectPlay8Address_GetComponentByName(localaddr, DPNA_KEY_HOSTNAME, NULL, &size, &type); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + size = sizeof(buffer); hr = IDirectPlay8Address_GetComponentByName(localaddr, DPNA_KEY_HOSTNAME, buffer, &size, &type); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Aric Stewart : include: Define IoSkipCurrentIrpStackLocation.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: c86d81d5508a155a1b8752152292835479161c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c86d81d5508a155a1b8752152… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 13 13:49:35 2016 +0200 include: Define IoSkipCurrentIrpStackLocation. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index d6ee235..3e93469 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1192,17 +1192,21 @@ NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); # ifdef NONAMELESSSTRUCT # define IoGetCurrentIrpStackLocation(_Irp) ((_Irp)->Tail.Overlay.s.u2.CurrentStackLocation) # define IoGetNextIrpStackLocation(_Irp) ((_Irp)->Tail.Overlay.s.u2.CurrentStackLocation - 1) + static inline void IoSkipCurrentIrpStackLocation(IRP *irp) {irp->Tail.Overlay.s.u2.CurrentStackLocation++; irp->CurrentLocation++;} # else # define IoGetCurrentIrpStackLocation(_Irp) ((_Irp)->Tail.Overlay.u2.CurrentStackLocation) # define IoGetNextIrpStackLocation(_Irp) ((_Irp)->Tail.Overlay.u2.CurrentStackLocation - 1) + static inline void IoSkipCurrentIrpStackLocation(IRP *irp) {irp->Tail.Overlay.u2.CurrentStackLocation++; irp->CurrentLocation++;} # endif #else # ifdef NONAMELESSSTRUCT # define IoGetCurrentIrpStackLocation(_Irp) ((_Irp)->Tail.Overlay.s.CurrentStackLocation) # define IoGetNextIrpStackLocation(_Irp) ((_Irp)->Tail.Overlay.s.CurrentStackLocation - 1) + static inline void IoSkipCurrentIrpStackLocation(IRP *irp) {irp->Tail.Overlay.s.CurrentStackLocation++; irp->CurrentLocation++;} # else # define IoGetCurrentIrpStackLocation(_Irp) ((_Irp)->Tail.Overlay.CurrentStackLocation) # define IoGetNextIrpStackLocation(_Irp) ((_Irp)->Tail.Overlay.CurrentStackLocation - 1) + static inline void IoSkipCurrentIrpStackLocation(IRP *irp) {irp->Tail.Overlay.CurrentStackLocation++; irp->CurrentLocation++;} # endif #endif

1 0

Matteo Bruni : wined3d: Cleanup user clip distances defines and fields a bit.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: a599109247bfd2e3efd5807ffb31a236ab29718d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a599109247bfd2e3efd5807ff… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 13 01:04:10 2016 +0200 wined3d: Cleanup user clip distances defines and fields a bit. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 13 ++++++++----- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/glsl_shader.c | 22 +++++++++++----------- dlls/wined3d/state.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 10 +++++----- 6 files changed, 35 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a599109247bfd2e3efd58…

1 0

Matteo Bruni : d3d10core/tests: Add a test for ddy.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: e8bc4627fd21e6071a93c84e9781542964bb0f90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8bc4627fd21e6071a93c84e9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 13 01:04:09 2016 +0200 d3d10core/tests: Add a test for ddy. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 163 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 886a950..9f98850 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9532,6 +9532,168 @@ static void test_required_format_support(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_ddy(void) +{ + static const struct + { + struct vec4 position; + unsigned int color; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f, 1.0f}, 0x00ff0000}, + {{-1.0f, 1.0f, 0.0f, 1.0f}, 0x0000ff00}, + {{ 1.0f, -1.0f, 0.0f, 1.0f}, 0x00ff0000}, + {{ 1.0f, 1.0f, 0.0f, 1.0f}, 0x0000ff00}, + }; + static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"SV_POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; +#if 0 +struct vs_data +{ + float4 pos : SV_POSITION; + float4 color : COLOR; +}; + +void main(in struct vs_data vs_input, out struct vs_data vs_output) +{ + vs_output.pos = vs_input.pos; + vs_output.color = vs_input.color; +} +#endif + static const DWORD vs_code[] = + { + 0x43425844, 0xd5b32785, 0x35332906, 0x4d05e031, 0xf66a58af, 0x00000001, 0x00000144, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000068, 0x00010040, + 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067, + 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, + 0x0100003e, + }; +#if 0 +struct ps_data +{ + float4 pos : SV_POSITION; + float4 color : COLOR; +}; + +float4 main(struct ps_data ps_input) : SV_Target +{ + return ddy(ps_input.color) * 240.0 + 0.5; +} +#endif + static const DWORD ps_code[] = + { + 0x43425844, 0x423712f6, 0x786c59c2, 0xa6023c60, 0xb79faad2, 0x00000001, 0x00000138, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x0000007c, 0x00000040, + 0x0000001f, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0500000c, 0x001000f2, 0x00000000, 0x00101e46, 0x00000001, 0x0f000032, 0x001020f2, + 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x43700000, 0x43700000, 0x43700000, 0x43700000, + 0x00004002, 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, 0x0100003e, + }; + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10InputLayout *input_layout; + unsigned int stride, offset; + struct resource_readback rb; + ID3D10RenderTargetView *rtv; + ID3D10Texture2D *texture; + ID3D10VertexShader *vs; + ID3D10PixelShader *ps; + ID3D10Device *device; + ID3D10Buffer *vb; + DWORD color; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + hr = ID3D10Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + vb = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, sizeof(quad), quad); + + hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + + ID3D10Device_IASetInputLayout(device, input_layout); + ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + stride = sizeof(*quad); + offset = 0; + ID3D10Device_IASetVertexBuffers(device, 0, 1, &vb, &stride, &offset); + ID3D10Device_VSSetShader(device, vs); + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D10Device_PSSetShader(device, ps); + + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + ID3D10Device_ClearRenderTargetView(device, rtv, red); + ID3D10Device_Draw(device, 4, 0); + + get_texture_readback(texture, 0, &rb); + color = get_readback_color(&rb, 320, 190); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 255, 240); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 320, 240); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 385, 240); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 320, 290); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + release_resource_readback(&rb); + + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, NULL); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); + ID3D10Device_Draw(device, 4, 0); + + get_texture_readback(test_context.backbuffer, 0, &rb); + color = get_readback_color(&rb, 320, 190); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 255, 240); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 320, 240); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 385, 240); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 320, 290); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + release_resource_readback(&rb); + + ID3D10PixelShader_Release(ps); + ID3D10VertexShader_Release(vs); + ID3D10Buffer_Release(vb); + ID3D10InputLayout_Release(input_layout); + ID3D10Texture2D_Release(texture); + ID3D10RenderTargetView_Release(rtv); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -9586,4 +9748,5 @@ START_TEST(device) test_face_culling(); test_line_antialiasing_blending(); test_required_format_support(); + test_ddy(); }

1 0

Matteo Bruni : d3d10core/tests: Make the window client rect match the d3d swapchain size.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: b545c1eb1c4bc6f171700a16090dc980a7b51fd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b545c1eb1c4bc6f171700a160… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 13 01:04:08 2016 +0200 d3d10core/tests: Make the window client rect match the d3d swapchain size. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 37b08e5..886a950 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -920,6 +920,7 @@ static BOOL init_test_context_(unsigned int line, struct d3d10core_test_context { D3D10_VIEWPORT vp; HRESULT hr; + RECT rect; memset(context, 0, sizeof(*context)); @@ -928,8 +929,10 @@ static BOOL init_test_context_(unsigned int line, struct d3d10core_test_context skip_(__FILE__, line)("Failed to create device.\n"); return FALSE; } + SetRect(&rect, 0, 0, 640, 480); + AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); context->window = CreateWindowA("static", "d3d10core_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); context->swapchain = create_swapchain(context->device, context->window, NULL); hr = IDXGISwapChain_GetBuffer(context->swapchain, 0, &IID_ID3D10Texture2D, (void **)&context->backbuffer); ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); @@ -7396,6 +7399,7 @@ static void test_swapchain_flip(void) DWORD color; HWND window; HRESULT hr; + RECT rect; static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = { @@ -7476,8 +7480,10 @@ static void test_swapchain_flip(void) skip("Failed to create device, skipping tests.\n"); return; } + SetRect(&rect, 0, 0, 640, 480); + AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); window = CreateWindowA("static", "d3d10core_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); desc.buffer_count = 3; desc.swap_effect = DXGI_SWAP_EFFECT_SEQUENTIAL; desc.windowed = TRUE;

1 0

Matteo Bruni : d3d11/tests: Add a test for derivative shader instructions.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: c061b3e2ece1c8c1df1a5006cc105acc4d6e0a08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c061b3e2ece1c8c1df1a5006c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 13 01:04:07 2016 +0200 d3d11/tests: Add a test for derivative shader instructions. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 241 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 241 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c061b3e2ece1c8c1df1a5…

1 0

Matteo Bruni : d3d11/tests: Make the window client rect match the d3d swapchain size.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: 9d89fd032bd45b5c933bbf4b5e9355c917ccf18a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d89fd032bd45b5c933bbf4b5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 13 01:04:06 2016 +0200 d3d11/tests: Make the window client rect match the d3d swapchain size. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ed4987e..4ff7d45 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1056,6 +1056,7 @@ static BOOL init_test_context_(unsigned int line, struct d3d11_test_context *con struct device_desc device_desc; D3D11_VIEWPORT vp; HRESULT hr; + RECT rect; memset(context, 0, sizeof(*context)); @@ -1066,8 +1067,10 @@ static BOOL init_test_context_(unsigned int line, struct d3d11_test_context *con skip_(__FILE__, line)("Failed to create device.\n"); return FALSE; } + SetRect(&rect, 0, 0, 640, 480); + AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); context->window = CreateWindowA("static", "d3d11_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); context->swapchain = create_swapchain(context->device, context->window, NULL); hr = IDXGISwapChain_GetBuffer(context->swapchain, 0, &IID_ID3D11Texture2D, (void **)&context->backbuffer); ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); @@ -7695,6 +7698,7 @@ static void test_swapchain_flip(void) DWORD color; HWND window; HRESULT hr; + RECT rect; static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = { @@ -7774,8 +7778,10 @@ static void test_swapchain_flip(void) skip("Failed to create device, skipping tests.\n"); return; } + SetRect(&rect, 0, 0, 640, 480); + AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); window = CreateWindowA("static", "d3d11_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); desc.buffer_count = 3; desc.swap_effect = DXGI_SWAP_EFFECT_SEQUENTIAL; desc.windowed = TRUE;

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
46
Older →

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