November 2020 - Wine-devel - list.winehq.org

[PATCH 1/2] windowscodecs: Start interface for unix encoders.
by Esme Povirk 15 Nov '20

15 Nov '20

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/libpng.c | 55 ++++++++++++++++++++++++++ dlls/windowscodecs/pngformat.c | 42 ++++++++++++++------ dlls/windowscodecs/unix_iface.c | 50 +++++++++++++++++++++++ dlls/windowscodecs/unix_lib.c | 12 +++++- dlls/windowscodecs/wincodecs_common.h | 5 +++ dlls/windowscodecs/wincodecs_private.h | 34 ++++++++++++++++ 6 files changed, 186 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 93ff6e056ec..fd1ee679ec3 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -611,6 +611,55 @@ HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **res return S_OK; } +struct png_encoder +{ + struct encoder encoder; +}; + +static inline struct png_encoder *impl_from_encoder(struct encoder* iface) +{ + return CONTAINING_RECORD(iface, struct png_encoder, encoder); +} + +static void CDECL png_encoder_destroy(struct encoder *encoder) +{ + struct png_encoder *This = impl_from_encoder(encoder); + RtlFreeHeap(GetProcessHeap(), 0, This); +} + +static const struct encoder_funcs png_encoder_vtable = { + png_encoder_destroy +}; + +HRESULT CDECL png_encoder_create(struct encoder_info *info, struct encoder **result) +{ + struct png_encoder *This; + + if (!load_libpng()) + { + ERR("Failed reading PNG because unable to find %s\n",SONAME_LIBPNG); + return E_FAIL; + } + + This = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*This)); + + if (!This) + { + return E_OUTOFMEMORY; + } + + This->encoder.vtable = &png_encoder_vtable; + *result = &This->encoder; + + info->container_format = GUID_ContainerFormatPng; + info->clsid = CLSID_WICPngEncoder; + info->encoder_options[0] = ENCODER_OPTION_INTERLACE; + info->encoder_options[1] = ENCODER_OPTION_FILTER; + info->encoder_options[2] = ENCODER_OPTION_END; + + return S_OK; +} + #else HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result) @@ -619,4 +668,10 @@ HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **res return E_FAIL; } +HRESULT CDECL png_encoder_create(struct encoder_info *info, struct encoder **result) +{ + ERR("Trying to save PNG picture, but PNG support is not compiled in.\n"); + return E_FAIL; +} + #endif diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 9d24096b2cd..f0ac83dae1c 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -309,9 +309,6 @@ static CRITICAL_SECTION_DEBUG init_png_cs_debug = }; static CRITICAL_SECTION init_png_cs = { &init_png_cs_debug, -1, 0, 0, 0, 0 }; -static const WCHAR wszPngInterlaceOption[] = {'I','n','t','e','r','l','a','c','e','O','p','t','i','o','n',0}; -static const WCHAR wszPngFilterOption[] = {'F','i','l','t','e','r','O','p','t','i','o','n',0}; - static void *load_libpng(void) { void *result; @@ -392,6 +389,14 @@ static void user_warning_fn(png_structp png_ptr, png_const_charp warning_message WARN("PNG warning: %s\n", debugstr_a(warning_message)); } +static const WCHAR wszPngInterlaceOption[] = {'I','n','t','e','r','l','a','c','e','O','p','t','i','o','n',0}; +static const WCHAR wszPngFilterOption[] = {'F','i','l','t','e','r','O','p','t','i','o','n',0}; + +static const PROPBAG2 encoder_option_properties[ENCODER_OPTION_END] = { + { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszPngInterlaceOption }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszPngFilterOption } +}; + struct png_pixelformat { const WICPixelFormatGUID *guid; UINT bpp; @@ -426,6 +431,8 @@ typedef struct PngEncoder { IStream *stream; png_structp png_ptr; png_infop info_ptr; + struct encoder *encoder; + struct encoder_info encoder_info; UINT frame_count; BOOL frame_initialized; const struct png_pixelformat *format; @@ -964,6 +971,7 @@ static ULONG WINAPI PngEncoder_Release(IWICBitmapEncoder *iface) if (This->stream) IStream_Release(This->stream); HeapFree(GetProcessHeap(), 0, This->data); + encoder_destroy(This->encoder); HeapFree(GetProcessHeap(), 0, This); } @@ -1045,17 +1053,19 @@ static HRESULT WINAPI PngEncoder_Initialize(IWICBitmapEncoder *iface, static HRESULT WINAPI PngEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GUID *format) { + PngEncoder *This = impl_from_IWICBitmapEncoder(iface); TRACE("(%p,%p)\n", iface, format); if (!format) return E_INVALIDARG; - memcpy(format, &GUID_ContainerFormatPng, sizeof(*format)); + memcpy(format, &This->encoder_info.container_format, sizeof(*format)); return S_OK; } static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { + PngEncoder *This = impl_from_IWICBitmapEncoder(iface); IWICComponentInfo *comp_info; HRESULT hr; @@ -1063,7 +1073,7 @@ static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBi if (!info) return E_INVALIDARG; - hr = CreateComponentInfo(&CLSID_WICPngEncoder, &comp_info); + hr = CreateComponentInfo(&This->encoder_info.clsid, &comp_info); if (hr == S_OK) { hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); @@ -1112,11 +1122,8 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, { PngEncoder *This = impl_from_IWICBitmapEncoder(iface); HRESULT hr; - static const PROPBAG2 opts[2] = - { - { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszPngInterlaceOption }, - { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszPngFilterOption }, - }; + DWORD opts_length; + PROPBAG2 opts[6]; TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); @@ -1136,7 +1143,12 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (ppIEncoderOptions) { - hr = CreatePropertyBag2(opts, ARRAY_SIZE(opts), ppIEncoderOptions); + for (opts_length = 0; This->encoder_info.encoder_options[opts_length] < ENCODER_OPTION_END; opts_length++) + { + opts[opts_length] = encoder_option_properties[This->encoder_info.encoder_options[opts_length]]; + } + + hr = CreatePropertyBag2(opts, opts_length, ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock); @@ -1215,6 +1227,14 @@ HRESULT PngEncoder_CreateInstance(REFIID iid, void** ppv) This = HeapAlloc(GetProcessHeap(), 0, sizeof(PngEncoder)); if (!This) return E_OUTOFMEMORY; + ret = get_unix_encoder(&CLSID_WICPngEncoder, &This->encoder_info, &This->encoder); + + if (FAILED(ret)) + { + HeapFree(GetProcessHeap(), 0, This); + return ret; + } + This->IWICBitmapEncoder_iface.lpVtbl = &PngEncoder_Vtbl; This->IWICBitmapFrameEncode_iface.lpVtbl = &PngEncoder_FrameVtbl; This->ref = 1; diff --git a/dlls/windowscodecs/unix_iface.c b/dlls/windowscodecs/unix_iface.c index 5ed995e7642..80769b5d560 100644 --- a/dlls/windowscodecs/unix_iface.c +++ b/dlls/windowscodecs/unix_iface.c @@ -143,3 +143,53 @@ HRESULT get_unix_decoder(const CLSID *decoder_clsid, struct decoder_info *info, return hr; } + +struct encoder_wrapper +{ + struct encoder win32_encoder; + struct encoder *unix_encoder; +}; + +static inline struct encoder_wrapper *impl_from_encoder(struct encoder* iface) +{ + return CONTAINING_RECORD(iface, struct encoder_wrapper, win32_encoder); +} + +void CDECL encoder_wrapper_destroy(struct encoder* iface) +{ + struct encoder_wrapper* This = impl_from_encoder(iface); + unix_funcs->encoder_destroy(This->unix_encoder); + HeapFree(GetProcessHeap(), 0, This); +} + +static const struct encoder_funcs encoder_wrapper_vtable = { + encoder_wrapper_destroy +}; + +HRESULT get_unix_encoder(const CLSID *encoder_clsid, struct encoder_info *info, struct encoder **result) +{ + HRESULT hr; + struct encoder_wrapper *wrapper; + struct encoder *unix_encoder; + + init_unixlib(); + + hr = unix_funcs->encoder_create(encoder_clsid, info, &unix_encoder); + + if (SUCCEEDED(hr)) + { + wrapper = HeapAlloc(GetProcessHeap(), 0, sizeof(*wrapper)); + + if (!wrapper) + { + unix_funcs->encoder_destroy(unix_encoder); + return E_OUTOFMEMORY; + } + + wrapper->win32_encoder.vtable = &encoder_wrapper_vtable; + wrapper->unix_encoder = unix_encoder; + *result = &wrapper->win32_encoder; + } + + return hr; +} diff --git a/dlls/windowscodecs/unix_lib.c b/dlls/windowscodecs/unix_lib.c index dc8549e1eb8..b0c6b37bfce 100644 --- a/dlls/windowscodecs/unix_lib.c +++ b/dlls/windowscodecs/unix_lib.c @@ -76,6 +76,14 @@ HRESULT CDECL decoder_create(const CLSID *decoder_clsid, struct decoder_info *in return E_NOTIMPL; } +HRESULT CDECL encoder_create(const CLSID *encoder_clsid, struct encoder_info *info, struct encoder **result) +{ + if (IsEqualGUID(encoder_clsid, &CLSID_WICPngEncoder)) + return png_encoder_create(info, result); + + return E_NOTIMPL; +} + static const struct unix_funcs unix_funcs = { decoder_create, decoder_initialize, @@ -83,7 +91,9 @@ static const struct unix_funcs unix_funcs = { decoder_copy_pixels, decoder_get_metadata_blocks, decoder_get_color_context, - decoder_destroy + decoder_destroy, + encoder_create, + encoder_destroy }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/windowscodecs/wincodecs_common.h b/dlls/windowscodecs/wincodecs_common.h index b7572d69df4..303c2d9f38b 100644 --- a/dlls/windowscodecs/wincodecs_common.h +++ b/dlls/windowscodecs/wincodecs_common.h @@ -48,6 +48,11 @@ void CDECL decoder_destroy(struct decoder *decoder) decoder->vtable->destroy(decoder); } +void CDECL encoder_destroy(struct encoder *encoder) +{ + encoder->vtable->destroy(encoder); +} + HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, UINT srcwidth, UINT srcheight, INT srcstride, const WICRect *rc, UINT dststride, UINT dstbuffersize, BYTE *dstbuffer) diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index d60b281faef..8495ea73521 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -332,10 +332,41 @@ HRESULT CDECL decoder_get_color_context(struct decoder* This, UINT frame, UINT n BYTE **data, DWORD *datasize); void CDECL decoder_destroy(struct decoder *This); +struct encoder_funcs; + +/* sync with encoder_option_properties */ +enum encoder_option +{ + ENCODER_OPTION_INTERLACE, + ENCODER_OPTION_FILTER, + ENCODER_OPTION_END +}; + +struct encoder_info +{ + GUID container_format; + CLSID clsid; + DWORD encoder_options[7]; +}; + +struct encoder +{ + const struct encoder_funcs *vtable; +}; + +struct encoder_funcs +{ + void (CDECL *destroy)(struct encoder* This); +}; + +void CDECL encoder_destroy(struct encoder* This); + HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result); HRESULT CDECL tiff_decoder_create(struct decoder_info *info, struct decoder **result); HRESULT CDECL jpeg_decoder_create(struct decoder_info *info, struct decoder **result); +HRESULT CDECL png_encoder_create(struct encoder_info *info, struct encoder **result); + struct unix_funcs { HRESULT (CDECL *decoder_create)(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result); @@ -348,9 +379,12 @@ struct unix_funcs HRESULT (CDECL *decoder_get_color_context)(struct decoder* This, UINT frame, UINT num, BYTE **data, DWORD *datasize); void (CDECL *decoder_destroy)(struct decoder* This); + HRESULT (CDECL *encoder_create)(const CLSID *encoder_clsid, struct encoder_info *info, struct encoder **result); + void (CDECL *encoder_destroy)(struct encoder* This); }; HRESULT get_unix_decoder(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result); +HRESULT get_unix_encoder(const CLSID *encoder_clsid, struct encoder_info *info, struct encoder **result); extern HRESULT CommonDecoder_CreateInstance(struct decoder *decoder, const struct decoder_info *decoder_info, REFIID iid, void** ppv) DECLSPEC_HIDDEN; -- 2.17.1

1 0

[PATCH 1/5] quartz/tests: Test adding and removing filters while the graph is running.
by Zebediah Figura 15 Nov '20

15 Nov '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4d2a3195b6d..2e1a8b7ad66 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3708,6 +3708,35 @@ todo_wine hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Add and remove a filter while the graph is running. */ + + hr = IFilterGraph2_AddFilter(graph, &dummy.IBaseFilter_iface, L"dummy"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dummy.state == State_Stopped, "Got state %#x.\n", dummy.state); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Paused); + ok(dummy.state == State_Paused, "Got state %#x.\n", dummy.state); + + hr = IFilterGraph2_RemoveFilter(graph, &dummy.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(dummy.state == State_Paused, "Got state %#x.\n", dummy.state); + + hr = IFilterGraph2_AddFilter(graph, &dummy.IBaseFilter_iface, L"dummy"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(dummy.state == State_Paused, "Got state %#x.\n", dummy.state); + + if (dummy.state == State_Stopped) + dummy.expect_stop_prev = State_Stopped; + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Stopped); + + hr = IFilterGraph2_RemoveFilter(graph, &dummy.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dummy.state == State_Stopped, "Got state %#x.\n", dummy.state); + /* Destroying the graph while it's running stops all filters. */ hr = IMediaControl_Run(control); -- 2.29.2

2 6

[PATCH] makefiles: Disable implicit rules.
by Zebediah Figura 15 Nov '20

15 Nov '20

This improves the time of a full-tree build with no out-of-date objects from ~3.7s to ~0.7s on one of my development machines. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Makefile.in | 3 +++ tools/makedep.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Makefile.in b/Makefile.in index 307a95b3b1a..3dc76398d85 100644 --- a/Makefile.in +++ b/Makefile.in @@ -89,6 +89,9 @@ TOP_INSTALL_DEV = @TOP_INSTALL_DEV@ @ALL_VARS_RULES@ @SET_MAKE@ +# Disable implicit rules +.SUFFIXES: + all: wine @echo "Wine build complete." diff --git a/tools/makedep.c b/tools/makedep.c index 90a21ef825c..ab685b1d596 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4069,6 +4069,9 @@ static void output_dependencies( struct makefile *make ) if (!found) output( "\n%s (everything below this line is auto-generated; DO NOT EDIT!!)\n", separator ); + /* disable implicit rules */ + output( ".SUFFIXES:\n" ); + if (make == top_makefile) { for (i = 0; i < subdirs.count; i++) output_sources( submakes[i] ); -- 2.29.2

1 0

[PATCH] ntdll: get struct link_map fully working on all FreeBSD versions
by Damjan Jovanovic 15 Nov '20

15 Nov '20

autoheader and autoconf need to be run. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- configure.ac | 3 +++ dlls/ntdll/unix/loader.c | 25 +++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-)

1 0

[PATCH] user32: Add InternalGetWindowIcon stub.
by Gijs Vermeulen 14 Nov '20

14 Nov '20

From: David Torok <dt(a)zeroitlab.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47915 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/user32/user32.spec | 1 + dlls/user32/win.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8051ae3f767..b77d71944ea 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -445,6 +445,7 @@ @ stdcall InsertMenuItemA(long long long ptr) @ stdcall InsertMenuItemW(long long long ptr) @ stdcall InsertMenuW(long long long long ptr) +@ stdcall InternalGetWindowIcon(long long) @ stdcall InternalGetWindowText(long ptr long) @ stdcall IntersectRect(ptr ptr ptr) @ stdcall InvalidateRect(long ptr long) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 680defc2071..1bd9ef79cb0 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2886,6 +2886,14 @@ INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount ) return strlen(lpString); } +/******************************************************************* + * InternalGetWindowIcon (USER32.@) + */ +HICON WINAPI InternalGetWindowIcon( HWND hwnd, UINT type ) +{ + FIXME("hwnd %p, type %u, stub!\n", hwnd, type); + return NULL; +} /******************************************************************* * InternalGetWindowText (USER32.@) -- 2.29.2

3 3

[PATCH] ntdll: Add NtDebugActiveProcess stub.
by Gijs Vermeulen 14 Nov '20

14 Nov '20

From: David Torok <dt(a)zeroitlab.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47198 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/unix/process.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index dbd2eab1fa1..248ae72a011 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -190,7 +190,7 @@ @ stdcall -syscall NtCreateUserProcess(ptr ptr long long ptr ptr long long ptr ptr ptr) # @ stub NtCreateWaitablePort @ stdcall -arch=win32,arm64 NtCurrentTeb() -# @ stub NtDebugActiveProcess +@ stdcall -syscall NtDebugActiveProcess(long long) # @ stub NtDebugContinue @ stdcall -syscall NtDelayExecution(long ptr) @ stdcall -syscall NtDeleteAtom(long) @@ -1195,7 +1195,7 @@ @ stub ZwCreateToken @ stdcall -private -syscall ZwCreateUserProcess(ptr ptr long long ptr ptr long long ptr ptr ptr) NtCreateUserProcess # @ stub ZwCreateWaitablePort -# @ stub ZwDebugActiveProcess +@ stdcall -private -syscall ZwDebugActiveProcess(long long) NtDebugActiveProcess # @ stub ZwDebugContinue @ stdcall -private -syscall ZwDelayExecution(long ptr) NtDelayExecution @ stdcall -private -syscall ZwDeleteAtom(long) NtDeleteAtom diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 5ccf435e9ff..941a938bad9 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1744,6 +1744,16 @@ NTSTATUS WINAPI NtResumeProcess( HANDLE handle ) } +/********************************************************************** + * NtDebugActiveProcess (NTDLL.@) + */ +NTSTATUS WINAPI NtDebugActiveProcess( HANDLE process_handle, HANDLE debug_object_handle ) +{ + FIXME( "(%p %p), stub!\n", process_handle, debug_object_handle ); + return STATUS_SUCCESS; +} + + /*********************************************************************** * __wine_make_process_system (NTDLL.@) * -- 2.29.2

2 1

[PATCH] winevulkan: Initialize Vulkan in native_vkGetInstanceProcAddrWINE.
by Georg Lehmann 13 Nov '20

13 Nov '20

In the past this was done in DllMain, the removal broke winelib applications. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/vulkan.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 8e369d95f47..b0a8559fe2c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -2053,6 +2053,10 @@ static void *wine_vk_get_global_proc_addr(const char *name) */ void *native_vkGetInstanceProcAddrWINE(VkInstance instance, const char *name) { + wine_vk_init_once(); + if (!vk_funcs) + return NULL; + return vk_funcs->p_vkGetInstanceProcAddr(instance, name); } -- 2.29.2

2 1

[PATCH] ws2_32: Force adding completion for error status in WS2_ConnectEx().
by Paul Gofman 13 Nov '20

13 Nov '20

Fixes Paradox launcher hang on start (which happens after commit 0c2f556afe7b5fcc873c737512fae5b9c8c07624). The referenced commit did not introduce the problem, it just made getsockopt(..., WS_SO_PROTOCOL_INFOW, ) working and the application is taking another path after getting XP1_IFS_HANDLES flag for protocol. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3efa4ebd64f..7d810c6d7b2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3485,7 +3485,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n { ov->Internal = sock_error_to_ntstatus( get_sock_error( s, FD_CONNECT_BIT )); ov->InternalHigh = 0; - if (cvalue) WS_AddCompletion( s, cvalue, ov->Internal, ov->InternalHigh, FALSE ); + if (cvalue) WS_AddCompletion( s, cvalue, ov->Internal, ov->InternalHigh, TRUE ); if (ov->hEvent) NtSetEvent( ov->hEvent, NULL ); status = STATUS_PENDING; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9357ad0d872..2d69a05aec5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7182,11 +7182,13 @@ static void test_ConnectEx(void) SOCKET connector = INVALID_SOCKET; struct sockaddr_in address, conaddress; int addrlen; - OVERLAPPED overlapped; + OVERLAPPED overlapped, *olp; LPFN_CONNECTEX pConnectEx; GUID connectExGuid = WSAID_CONNECTEX; + HANDLE previous_port, io_port; DWORD bytesReturned; char buffer[1024]; + ULONG_PTR key; BOOL bret; DWORD dwret; int iret; @@ -7305,18 +7307,39 @@ static void test_ConnectEx(void) address.sin_port = htons(1); + previous_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); + ok( previous_port != NULL, "Failed to create completion port %u\n", GetLastError()); + + io_port = CreateIoCompletionPort((HANDLE)connector, previous_port, 125, 0); + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); + + bret = SetFileCompletionNotificationModes((HANDLE)connector, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); + ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && GetLastError() == ERROR_IO_PENDING, "ConnectEx to bad destination failed: " "returned %d + errno %d\n", bret, GetLastError()); dwret = WaitForSingleObject(overlapped.hEvent, 15000); ok(dwret == WAIT_OBJECT_0, "Waiting for connect event failed with %d + errno %d\n", dwret, GetLastError()); + bytesReturned = 0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &bytesReturned, &key, &olp, 200 ); + ok(!bret && GetLastError() == ERROR_CONNECTION_REFUSED, "Got unexpected bret %#x, GetLastError() %u.\n", + bret, GetLastError()); + ok(key == 125, "Key is %lu\n", key); + ok(!bytesReturned, "Number of bytes transferred is %u\n", bytesReturned); + ok(olp == &overlapped, "Overlapped structure is at %p\n", olp); + bret = GetOverlappedResult((HANDLE)connector, &overlapped, &bytesReturned, FALSE); ok(bret == FALSE && GetLastError() == ERROR_CONNECTION_REFUSED, "Connecting to a disconnected host returned error %d - %d\n", bret, WSAGetLastError()); + CloseHandle(io_port); + WSACloseEvent(overlapped.hEvent); closesocket(connector); + + CloseHandle(previous_port); } static void test_AcceptEx(void) @@ -10557,7 +10580,6 @@ START_TEST( sock ) test_WSAAsyncGetServByPort(); test_WSAAsyncGetServByName(); - test_completion_port(); test_address_list_query(); -- 2.28.0

1 0

[PATCH] directmanipulation: Return S_OK form viewport_SetViewportOptions stub.
by Paul Gofman 13 Nov '20

13 Nov '20

Fixes Paradox launcher crash on start when Windows version is set to 10. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/directmanipulation/directmanipulation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index 36a863c7c69..5bb3461d443 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -610,7 +610,7 @@ static HRESULT WINAPI viewport_SetViewportOptions(IDirectManipulationViewport2 * { struct directviewport *This = impl_from_IDirectManipulationViewport2(iface); FIXME("%p, %d\n", This, options); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI viewport_AddConfiguration(IDirectManipulationViewport2 *iface, DIRECTMANIPULATION_CONFIGURATION configuration) -- 2.28.0

1 0

[PATCH] cmd.exe: increase size of WCMD_HandleTildeModifiers() buffers to MAXSTRING
by Damjan Jovanovic 13 Nov '20

13 Nov '20

Some buffers in WCMD_HandleTildeModifiers() are only of size MAX_PATH, even though they handle strings that aren't necessarily filenames. When changed to have size MAXSTRING, a stack overflow crash with strings of size MAX_PATH stops happening. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42731 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- programs/cmd/batch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0