June 2019 - Wine-Commits - list.winehq.org

Zhiyi Zhang : dxgi/tests: Add IDXGIOutput ownership tests.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: da6afd5cfd41c11cb60a9ac050f5b7035b50abe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da6afd5cfd41c11cb60a9ac0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 25 02:47:48 2019 +0430 dxgi/tests: Add IDXGIOutput ownership tests. Mostly to show that IDXGIOutput_TakeOwnership() and IDXGIOutput_ReleaseOwnership() are based on VidPN ownership. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 213 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 212 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da6afd5cfd41c11cb60a…

1 0

Zhiyi Zhang : dxgi: Return DXGI_STATUS_OCCLUDED for minimised windows in d3d11_swapchain_present ().
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 8113aca7623ced28040f3d5acfdea75551ab459f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8113aca7623ced28040f3d5a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 25 02:47:47 2019 +0430 dxgi: Return DXGI_STATUS_OCCLUDED for minimised windows in d3d11_swapchain_present(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 3 +++ dlls/dxgi/tests/dxgi.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 1bc59f4..8dbbfab 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -306,6 +306,9 @@ static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, return DXGI_ERROR_INVALID_CALL; } + if (IsIconic(d3d11_swapchain_get_hwnd(swapchain))) + return DXGI_STATUS_OCCLUDED; + if (flags & ~DXGI_PRESENT_TEST) FIXME("Unimplemented flags %#x.\n", flags); if (flags & DXGI_PRESENT_TEST) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 51ff440..f5c16a7 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4073,8 +4073,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) /* Minimised window. */ ShowWindow(swapchain_desc.OutputWindow, SW_MINIMIZE); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); - todo_wine_if(!is_d3d12) ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), - "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Test %u: Got unexpected hr %#x.\n", i, hr); ShowWindow(swapchain_desc.OutputWindow, SW_NORMAL); /* Hidden window. */

1 0

Alexandre Julliard : vnbt.vxd: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 9b895af1df5c515a4e59e21412a4f51a3b981bbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b895af1df5c515a4e59e214… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:39:32 2019 +0200 vnbt.vxd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vnbt.vxd/Makefile.in | 2 ++ dlls/vnbt.vxd/vnbt.c | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/vnbt.vxd/Makefile.in b/dlls/vnbt.vxd/Makefile.in index 8fc6b3e..63b8c69 100644 --- a/dlls/vnbt.vxd/Makefile.in +++ b/dlls/vnbt.vxd/Makefile.in @@ -1,5 +1,7 @@ MODULE = vnbt.vxd IMPORTS = iphlpapi ws2_32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ vnbt.c diff --git a/dlls/vnbt.vxd/vnbt.c b/dlls/vnbt.vxd/vnbt.c index 17f7d96..fd1dbdc 100644 --- a/dlls/vnbt.vxd/vnbt.c +++ b/dlls/vnbt.vxd/vnbt.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -29,10 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(vxd); -#ifndef INADDR_NONE -#define INADDR_NONE ~0UL -#endif - typedef struct _nbtInfo { DWORD ip;

1 0

Alexandre Julliard : vmm.vxd: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 2c36c977f7e2e4bc8b3e544960343b3153a8f330 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c36c977f7e2e4bc8b3e5449… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:39:22 2019 +0200 vmm.vxd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vmm.vxd/Makefile.in | 2 ++ dlls/vmm.vxd/vmm.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/vmm.vxd/Makefile.in b/dlls/vmm.vxd/Makefile.in index 28a5302..854907e 100644 --- a/dlls/vmm.vxd/Makefile.in +++ b/dlls/vmm.vxd/Makefile.in @@ -1,4 +1,6 @@ MODULE = vmm.vxd +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ vmm.c diff --git a/dlls/vmm.vxd/vmm.c b/dlls/vmm.vxd/vmm.c index 833a8d1..373e826 100644 --- a/dlls/vmm.vxd/vmm.c +++ b/dlls/vmm.vxd/vmm.c @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : vcomp: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 5213ac7e085412e22b713076fe148fb60dc1e9b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5213ac7e085412e22b713076… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:38:23 2019 +0200 vcomp: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/Makefile.in | 2 ++ dlls/vcomp/main.c | 81 ++++++++++++++++++++++++-------------------------- 2 files changed, 41 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5213ac7e085412e22b71…

1 0

Alexandre Julliard : user.exe: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 84f39259b1a52197cd30c38ab4e5be5b8db833b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84f39259b1a52197cd30c38a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:32:37 2019 +0200 user.exe: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/Makefile.in | 2 +- dlls/user.exe16/comm.c | 9 +++------ dlls/user.exe16/dialog.c | 3 --- dlls/user.exe16/message.c | 3 --- dlls/user.exe16/network.c | 5 ----- 5 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/user.exe16/Makefile.in b/dlls/user.exe16/Makefile.in index 5a82b75..664b8e8 100644 --- a/dlls/user.exe16/Makefile.in +++ b/dlls/user.exe16/Makefile.in @@ -1,6 +1,6 @@ MODULE = user.exe16 IMPORTS = mpr user32 gdi32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520 +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,user32.dll,--heap,65520 C_SRCS = \ bidi.c \ diff --git a/dlls/user.exe16/comm.c b/dlls/user.exe16/comm.c index a1715c8..9125c6d 100644 --- a/dlls/user.exe16/comm.c +++ b/dlls/user.exe16/comm.c @@ -50,9 +50,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <stdlib.h> #include <stdarg.h> #include <stdio.h> @@ -416,7 +413,7 @@ INT16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb) TRACE("(%s), ptr %p\n", device, lpdcb); - if (_strnicmp(device,"COM",3)) + if (strnicmp(device,"COM",3)) return -1; port = device[3] - '0'; @@ -457,7 +454,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue) if (port-- == 0) ERR("BUG ! COM0 or LPT0 don't exist !\n"); - if (!_strnicmp(device,"COM",3)) + if (!strnicmp(device,"COM",3)) { if (COM[port].handle) return IE_OPEN; @@ -508,7 +505,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue) } } else - if (!_strnicmp(device,"LPT",3)) { + if (!strnicmp(device,"LPT",3)) { if (LPT[port].handle) return IE_OPEN; diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index 385e859..1041638 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index dd15707..14e7a19 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <assert.h> #include <stdarg.h> #include <string.h> diff --git a/dlls/user.exe16/network.c b/dlls/user.exe16/network.c index 8dc31b1..c137bb1 100644 --- a/dlls/user.exe16/network.c +++ b/dlls/user.exe16/network.c @@ -18,15 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <ctype.h> #include <stdarg.h> #include <string.h> #include <sys/types.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif #include "windef.h" #include "winbase.h"

1 0

Zebediah Figura : quartz/memallocator: Avoid using a magic value for the start media time.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: f1c749239490eb3bb148d115709baa6f579019ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1c749239490eb3bb148d115… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 24 20:05:17 2019 -0500 quartz/memallocator: Avoid using a magic value for the start media time. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/memallocator.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 1d74c3c..b7dff8c 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -40,6 +40,7 @@ typedef struct StdMediaSample2 struct list listentry; LONGLONG tMediaStart; LONGLONG tMediaEnd; + BOOL media_time_valid; } StdMediaSample2; typedef struct BaseMemAllocator @@ -74,8 +75,6 @@ static inline StdMediaSample2 *unsafe_impl_from_IMediaSample(IMediaSample * ifac #define AM_SAMPLE2_PROP_SIZE_WRITABLE FIELD_OFFSET(AM_SAMPLE2_PROPERTIES, pbBuffer) -#define INVALID_MEDIA_TIME (((ULONGLONG)0x7fffffff << 32) | 0xffffffff) - static HRESULT BaseMemAllocator_Init(HRESULT (* fnAlloc)(IMemAllocator *), HRESULT (* fnFree)(IMemAllocator *), HRESULT (* fnVerify)(IMemAllocator *, ALLOCATOR_PROPERTIES *), @@ -435,8 +434,7 @@ static HRESULT StdMediaSample2_Construct(BYTE * pbBuffer, LONG cbBuffer, IMemAll (*ppSample)->props.cbData = sizeof(AM_SAMPLE2_PROPERTIES); (*ppSample)->props.cbBuffer = (*ppSample)->props.lActual = cbBuffer; (*ppSample)->props.pbBuffer = pbBuffer; - (*ppSample)->tMediaStart = INVALID_MEDIA_TIME; - (*ppSample)->tMediaEnd = 0; + (*ppSample)->media_time_valid = FALSE; return S_OK; } @@ -496,8 +494,7 @@ static ULONG WINAPI StdMediaSample2_Release(IMediaSample2 * iface) DeleteMediaType(This->props.pMediaType); This->props.pMediaType = NULL; This->props.dwSampleFlags = 0; - This->tMediaStart = INVALID_MEDIA_TIME; - This->tMediaEnd = 0; + This->media_time_valid = FALSE; if (This->pParent) IMemAllocator_ReleaseBuffer(This->pParent, (IMediaSample *)iface); @@ -725,7 +722,7 @@ static HRESULT WINAPI StdMediaSample2_GetMediaTime(IMediaSample2 * iface, LONGLO TRACE("(%p)->(%p, %p)\n", iface, pStart, pEnd); - if (This->tMediaStart == INVALID_MEDIA_TIME) + if (!This->media_time_valid) return VFW_E_MEDIA_TIME_NOT_SET; *pStart = This->tMediaStart; @@ -745,9 +742,10 @@ static HRESULT WINAPI StdMediaSample2_SetMediaTime(IMediaSample2 *iface, LONGLON if (!end) return E_POINTER; sample->tMediaStart = *start; sample->tMediaEnd = *end; + sample->media_time_valid = TRUE; } else - sample->tMediaStart = INVALID_MEDIA_TIME; + sample->media_time_valid = FALSE; return S_OK; }

1 0

Zebediah Figura : quartz/memallocator: Forbid setting the start media time without setting the end time.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 44318feeb659588175958101b7551d046c9773a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44318feeb659588175958101… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 24 20:05:16 2019 -0500 quartz/memallocator: Forbid setting the start media time without setting the end time. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/memallocator.c | 21 ++++++++++----------- dlls/quartz/tests/memallocator.c | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index ac12abd..1d74c3c 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -734,21 +734,20 @@ static HRESULT WINAPI StdMediaSample2_GetMediaTime(IMediaSample2 * iface, LONGLO return S_OK; } -static HRESULT WINAPI StdMediaSample2_SetMediaTime(IMediaSample2 * iface, LONGLONG * pStart, LONGLONG * pEnd) +static HRESULT WINAPI StdMediaSample2_SetMediaTime(IMediaSample2 *iface, LONGLONG *start, LONGLONG *end) { - StdMediaSample2 *This = impl_from_IMediaSample2(iface); - - TRACE("(%p)->(%p, %p)\n", iface, pStart, pEnd); + StdMediaSample2 *sample = impl_from_IMediaSample2(iface); - if (pStart) - This->tMediaStart = *pStart; - else - This->tMediaStart = INVALID_MEDIA_TIME; + TRACE("sample %p, start %p, end %p.\n", iface, start, end); - if (pEnd) - This->tMediaEnd = *pEnd; + if (start) + { + if (!end) return E_POINTER; + sample->tMediaStart = *start; + sample->tMediaEnd = *end; + } else - This->tMediaEnd = 0; + sample->tMediaStart = INVALID_MEDIA_TIME; return S_OK; } diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c index b4f3b23..3868312 100644 --- a/dlls/quartz/tests/memallocator.c +++ b/dlls/quartz/tests/memallocator.c @@ -379,7 +379,7 @@ static void test_media_time(void) { start = 0x123; hr = IMediaSample_SetMediaTime(sample, &start, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); } end = 0x321;

1 0

Alexandre Julliard : vnetbios.vxd: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 938661fc8ae8359ae48f92fb0b1ccc5c96f5c46f URL: https://source.winehq.org/git/wine.git/?a=commit;h=938661fc8ae8359ae48f92fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:39:39 2019 +0200 vnetbios.vxd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vnetbios.vxd/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/vnetbios.vxd/Makefile.in b/dlls/vnetbios.vxd/Makefile.in index 8e8cb60..3878648 100644 --- a/dlls/vnetbios.vxd/Makefile.in +++ b/dlls/vnetbios.vxd/Makefile.in @@ -1,5 +1,7 @@ MODULE = vnetbios.vxd IMPORTS = netapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ vnetbios.c

1 0

Alexandre Julliard : version: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: ecce06841d54c07a64e741297abbe8e73f2bb854 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecce06841d54c07a64e74129… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:39:00 2019 +0200 version: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in index e26069e..56acecb 100644 --- a/dlls/version/Makefile.in +++ b/dlls/version/Makefile.in @@ -2,6 +2,8 @@ MODULE = version.dll IMPORTLIB = version IMPORTS = kernelbase +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ version.c

1 0