February 2022 - Wine-Commits

Nikolay Sivov : evr: Fix long types warnings.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: e091d5e87c4443a22994ba84179468560f0353e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e091d5e87c4443a22994ba84… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 1 18:59:06 2022 +0300 evr: Fix long types warnings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/Makefile.in | 1 - dlls/evr/evr.c | 2 +- dlls/evr/mixer.c | 72 ++++++++++++++++++++++++++-------------------------- dlls/evr/presenter.c | 40 ++++++++++++++--------------- dlls/evr/sample.c | 30 +++++++++++----------- 5 files changed, 72 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e091d5e87c4443a22994…

1 0

Nikolay Sivov : evr/presenter: Initial implementation of GetCurrentImage().
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 22fda5990ffc9b22258e914192d23fedf7d75dd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22fda5990ffc9b22258e9141… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 1 18:59:07 2022 +0300 evr/presenter: Initial implementation of GetCurrentImage(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 2 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 910af2891e3..7e14cb2f720 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -65,6 +65,7 @@ struct sample_queue unsigned int used; unsigned int front; unsigned int back; + IMFSample *last_presented; }; struct streaming_thread @@ -120,6 +121,7 @@ struct video_presenter struct { int presented; + LONGLONG sampletime; } frame_stats; CRITICAL_SECTION cs; @@ -507,6 +509,13 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM IDirect3DSwapChain9_Present(presenter->swapchain, NULL, NULL, NULL, NULL, 0); presenter->frame_stats.presented++; + EnterCriticalSection(&presenter->cs); + if (presenter->thread.queue.last_presented) + IMFSample_Release(presenter->thread.queue.last_presented); + presenter->thread.queue.last_presented = sample; + IMFSample_AddRef(presenter->thread.queue.last_presented); + LeaveCriticalSection(&presenter->cs); + IDirect3DDevice9_Release(device); IDirect3DSurface9_Release(backbuffer); IDirect3DSurface9_Release(surface); @@ -739,6 +748,8 @@ static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) TRACE("Terminated streaming thread tid %#lx.\n", presenter->thread.tid); + if (presenter->thread.queue.last_presented) + IMFSample_Release(presenter->thread.queue.last_presented); memset(&presenter->thread, 0, sizeof(presenter->thread)); video_presenter_set_allocator_callback(presenter, NULL); @@ -1461,9 +1472,88 @@ static HRESULT WINAPI video_presenter_control_RepaintVideo(IMFVideoDisplayContro static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayControl *iface, BITMAPINFOHEADER *header, BYTE **dib, DWORD *dib_size, LONGLONG *timestamp) { - FIXME("%p, %p, %p, %p, %p.\n", iface, header, dib, dib_size, timestamp); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + IDirect3DSurface9 *readback = NULL, *surface; + D3DSURFACE_DESC surface_desc; + D3DLOCKED_RECT mapped_rect; + IDirect3DDevice9 *device; + IMFSample *sample; + LONG stride; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %p, %p, %p.\n", iface, header, dib, dib_size, timestamp); + + EnterCriticalSection(&presenter->cs); + + sample = presenter->thread.queue.last_presented; + presenter->thread.queue.last_presented = NULL; + + if (!presenter->swapchain || !sample) + { + hr = MF_E_INVALIDREQUEST; + } + else if (SUCCEEDED(hr = video_presenter_get_sample_surface(sample, &surface))) + { + IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device); + IDirect3DSurface9_GetDesc(surface, &surface_desc); + + if (surface_desc.Format != D3DFMT_X8R8G8B8) + { + FIXME("Unexpected surface format %d.\n", surface_desc.Format); + hr = E_FAIL; + } + + if (SUCCEEDED(hr)) + { + if (FAILED(hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, surface_desc.Width, + surface_desc.Height, D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, &readback, NULL))) + { + WARN("Failed to create readback surface, hr %#lx.\n", hr); + } + } + + if (SUCCEEDED(hr)) + hr = IDirect3DDevice9_GetRenderTargetData(device, surface, readback); + + if (SUCCEEDED(hr)) + { + MFGetStrideForBitmapInfoHeader(D3DFMT_X8R8G8B8, surface_desc.Width, &stride); + *dib_size = abs(stride) * surface_desc.Height; + if (!(*dib = CoTaskMemAlloc(*dib_size))) + hr = E_OUTOFMEMORY; + } + + if (SUCCEEDED(hr)) + { + if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(readback, &mapped_rect, NULL, D3DLOCK_READONLY))) + { + memcpy(*dib, mapped_rect.pBits, *dib_size); + IDirect3DSurface9_UnlockRect(readback); + } + } + + memset(header, 0, sizeof(*header)); + header->biSize = sizeof(*header); + header->biWidth = surface_desc.Width; + header->biHeight = surface_desc.Height; + header->biPlanes = 1; + header->biBitCount = 32; + header->biSizeImage = *dib_size; + IMFSample_GetSampleTime(sample, timestamp); + + if (readback) + IDirect3DSurface9_Release(readback); + IDirect3DSurface9_Release(surface); + + IDirect3DDevice9_Release(device); + } + + if (sample) + IMFSample_Release(sample); + + LeaveCriticalSection(&presenter->cs); + + return hr; } static HRESULT WINAPI video_presenter_control_SetBorderColor(IMFVideoDisplayControl *iface, COLORREF color)

1 0

Eric Pouech : oleaut32: Use correct integral type.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 23f9d01aa4ffb278b240050962bea2a006358bdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=23f9d01aa4ffb278b2400509… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 14:05:27 2022 +0100 oleaut32: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 7dcc8d815a3..2a453a1f0e0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9890,7 +9890,7 @@ static DWORD WMSFT_compile_typeinfo_aux(ITypeInfoImpl *info, ++memid; } - name = (UINT*)memid; + name = (DWORD*)memid; for(i = 0; i < info->typeattr.cFuncs; ++i){ TLBFuncDesc *desc = &info->funcdescs[i]; if(desc->Name)

1 0

Zebediah Figura : ws2_32: Return 65467 or 0 in the iMaxUdpDg field.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 5efc6369ebf5d1e262ac68dbcac546a11bded6ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=5efc6369ebf5d1e262ac68db… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 00:20:50 2022 -0600 ws2_32: Return 65467 or 0 in the iMaxUdpDg field. Depending on reported winsock version. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 3 +-- dlls/ws2_32/tests/protocol.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 19a7d901414..7a1483f140f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -419,7 +419,6 @@ static BOOL socket_list_remove( SOCKET socket ) return FALSE; } -#define MAX_UDP_DATAGRAM 1024 static INT WINAPI WSA_DefaultBlockingHook( FARPROC x ); int num_startup; @@ -588,7 +587,7 @@ int WINAPI WSAStartup( WORD version, WSADATA *data ) strcpy( data->szDescription, "WinSock 2.0" ); strcpy( data->szSystemStatus, "Running" ); data->iMaxSockets = (LOBYTE(version) == 1 ? 32767 : 0); - data->iMaxUdpDg = MAX_UDP_DATAGRAM; + data->iMaxUdpDg = (LOBYTE(version) == 1 ? 65467 : 0); /* don't fill lpVendorInfo */ } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index a95b6e685af..8b429e5c914 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2872,7 +2872,7 @@ static void test_startup(void) ok(!strcmp(data.szDescription, "WinSock 2.0"), "got description %s\n", debugstr_a(data.szDescription)); ok(!strcmp(data.szSystemStatus, "Running"), "got status %s\n", debugstr_a(data.szSystemStatus)); ok(data.iMaxSockets == (LOBYTE(tests[i].version) == 1 ? 32767 : 0), "got maximum sockets %u\n", data.iMaxSockets); - todo_wine ok(data.iMaxUdpDg == (LOBYTE(tests[i].version) == 1 ? 65467 : 0), "got maximum datagram size %u\n", data.iMaxUdpDg); + ok(data.iMaxUdpDg == (LOBYTE(tests[i].version) == 1 ? 65467 : 0), "got maximum datagram size %u\n", data.iMaxUdpDg); WSASetLastError(0xdeadbeef); ret = WSACleanup();

1 0

Zebediah Figura : ws2_32: Return WSAEFAULT instead of WSAEINVAL from WSAStartup() if "data" is NULL.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: a6cbdb7de82387e1a75bfdb77fa66310a322e6c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6cbdb7de82387e1a75bfdb7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 00:20:51 2022 -0600 ws2_32: Return WSAEFAULT instead of WSAEINVAL from WSAStartup() if "data" is NULL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/protocol.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7a1483f140f..a75aaee68be 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -594,7 +594,7 @@ int WINAPI WSAStartup( WORD version, WSADATA *data ) if (!LOBYTE(version)) return WSAVERNOTSUPPORTED; - if (!data) return WSAEINVAL; + if (!data) return WSAEFAULT; num_startup++; TRACE( "increasing startup count to %d\n", num_startup ); diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 8b429e5c914..1ff335f7fe2 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2880,8 +2880,7 @@ static void test_startup(void) ok(WSAGetLastError() == WSANOTINITIALISED, "got error %u\n", WSAGetLastError()); ret = WSAStartup(tests[i].version, NULL); - todo_wine_if (LOBYTE(tests[i].version)) - ok(ret == (LOBYTE(tests[i].version) ? WSAEFAULT : WSAVERNOTSUPPORTED), "got %d\n", ret); + ok(ret == (LOBYTE(tests[i].version) ? WSAEFAULT : WSAVERNOTSUPPORTED), "got %d\n", ret); winetest_pop_context(); }

1 0

Rémi Bernon : winehid.sys: Build with nameless unions.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: eb9da265d3b459be78c9baf0a6293528be1bc0c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb9da265d3b459be78c9baf0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 1 09:35:50 2022 +0100 winehid.sys: Build with nameless unions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winehid.sys/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winehid.sys/main.c b/dlls/winehid.sys/main.c index a807c0da097..ca549ab4728 100644 --- a/dlls/winehid.sys/main.c +++ b/dlls/winehid.sys/main.c @@ -20,8 +20,6 @@ #include <stdarg.h> -#define NONAMELESSUNION - #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -36,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); static NTSTATUS WINAPI internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { - NTSTATUS status = irp->IoStatus.u.Status; + NTSTATUS status = irp->IoStatus.Status; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode;

1 0

Paul Gofman : hnetcfg: Return stub interface from upnpnat_get_StaticPortMappingCollection() if UPNP IGD is found.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: cbf2ca57749874a34f0ce19f30431577fa8a4e66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbf2ca57749874a34f0ce19f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 1 13:49:21 2022 +0300 hnetcfg: Return stub interface from upnpnat_get_StaticPortMappingCollection() if UPNP IGD is found. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/Makefile.in | 2 +- dlls/hnetcfg/apps.c | 3 +- dlls/hnetcfg/hnetcfg_private.h | 1 + dlls/hnetcfg/port.c | 348 ++++++++++++++++++++++++++++++++++++++++- dlls/hnetcfg/tests/policy.c | 3 +- 5 files changed, 350 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cbf2ca57749874a34f0c…

1 0

Paul Gofman : hnetcfg: Get gateway description location in init_gateway_connection().
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 583605be049af1ad8a7551b7073c15832b2644a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=583605be049af1ad8a7551b7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 1 13:49:22 2022 +0300 hnetcfg: Get gateway description location in init_gateway_connection(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 89a3f571d45..fa866d874c9 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -27,6 +27,7 @@ #include "string.h" #include "assert.h" #include "winsock2.h" +#include "winhttp.h" #include "ole2.h" #include "netfw.h" #include "natupnp.h" @@ -40,11 +41,49 @@ static struct { LONG refs; BOOL winsock_initialized; + WCHAR locationW[256]; } upnp_gateway_connection; static SRWLOCK upnp_gateway_connection_lock = SRWLOCK_INIT; +static BOOL parse_search_response( char *response, WCHAR *locationW, unsigned int location_size ) +{ + char *saveptr = NULL, *tok, *tok2; + unsigned int status; + + tok = strtok_s( response, "\n", &saveptr ); + if (!tok) return FALSE; + + /* HTTP/1.1 200 OK */ + tok2 = strtok( tok, " " ); + if (!tok2) return FALSE; + tok2 = strtok( NULL, " " ); + if (!tok2) return FALSE; + status = atoi( tok2 ); + if (status != HTTP_STATUS_OK) + { + WARN( "status %u.\n", status ); + return FALSE; + } + while ((tok = strtok_s( NULL, "\n", &saveptr ))) + { + tok2 = strtok( tok, " " ); + if (!tok2) continue; + if (!stricmp( tok2, "LOCATION:" )) + { + tok2 = strtok( NULL, " \r" ); + if (!tok2) + { + WARN( "Error parsing location.\n" ); + return FALSE; + } + return !!MultiByteToWideChar( CP_UTF8, 0, tok2, -1, locationW, location_size / 2 ); + } + } + return FALSE; +} + static void gateway_connection_cleanup(void) { TRACE( ".\n" ); @@ -118,6 +157,13 @@ static BOOL init_gateway_connection(void) return FALSE; } TRACE( "Received reply from gateway, len %d.\n", len ); + buffer[len] = 0; + if (!parse_search_response( buffer, upnp_gateway_connection.locationW, sizeof(upnp_gateway_connection.locationW) )) + { + WARN( "Error parsing response.\n" ); + return FALSE; + } + TRACE( "Gateway description location %s.\n", debugstr_w(upnp_gateway_connection.locationW) ); return TRUE; }

1 0

Eric Pouech : include/basetsd.h: Define PtrTo(Ul|L)ong to return a long (as SDK does).
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: c3e57fc3e47c33c90e7a0cfaa28a578533e3c7d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3e57fc3e47c33c90e7a0cfa… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 14:04:51 2022 +0100 include/basetsd.h: Define PtrTo(Ul|L)ong to return a long (as SDK does). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/basetsd.h | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 329db66c8f0..6a6a3945205 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -165,6 +165,17 @@ static inline long HandleToLong(const void *h) return (long)(LONG_PTR)h; } +static inline unsigned long PtrToUlong(const void *p) +{ + return (unsigned long)(ULONG_PTR)p; +} + +static inline long PtrToLong(const void *p) +{ + return (long)(LONG_PTR)p; +} + + #else static inline unsigned HandleToULong(const void *h) @@ -177,26 +188,27 @@ static inline int HandleToLong(const void *h) return (int)(LONG_PTR)h; } -#endif /* !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) */ - -static inline void *ULongToHandle(ULONG32 ul) +static inline unsigned PtrToUlong(const void *p) { - return (void *)(ULONG_PTR)ul; + return (unsigned)(ULONG_PTR)p; } -static inline void *LongToHandle(LONG32 l) +static inline int PtrToLong(const void *p) { - return (void *)(LONG_PTR)l; + return (int)(LONG_PTR)p; } -static inline ULONG32 PtrToUlong(const void *p) + +#endif /* !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) */ + +static inline void *ULongToHandle(ULONG32 ul) { - return (ULONG32)(ULONG_PTR)p; + return (void *)(ULONG_PTR)ul; } -static inline LONG32 PtrToLong(const void *p) +static inline void *LongToHandle(LONG32 l) { - return (LONG32)(LONG_PTR)p; + return (void *)(LONG_PTR)l; } static inline UINT32 PtrToUint(const void *p)

1 0

Eric Pouech : msxml3: Use correct integral type.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: a1add35412ce3f94bfd9d14f2a9e331476556a89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1add35412ce3f94bfd9d14f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 31 14:16:58 2022 +0100 msxml3: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/httprequest.c | 2 +- dlls/msxml3/mxwriter.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 934d580064f..86e569f5dd8 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -687,7 +687,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * BindStatusCallback *bsc; IBindCtx *pbc; HRESULT hr; - int size; + LONG size; hr = CreateBindCtx(0, &pbc); if (hr != S_OK) return hr; diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index e0dd0e3c6e0..084324797c7 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -336,7 +336,7 @@ static HRESULT write_output_buffer(mxwriter *writer, const WCHAR *data, int len) { output_buffer *buffer = &writer->buffer; encoded_buffer *buff; - unsigned int written; + ULONG written; int src_len; if (!len || !*data)

1 0