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

Zebediah Figura : qcap: Use a function table for video capture driver operations.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 8ad370744375b32b65f87235dbe47ae71b25557a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ad370744375b32b65f87235… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 29 10:26:16 2020 -0500 qcap: Use a function table for video capture driver operations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_private.h | 40 +++++---- dlls/qcap/v4l.c | 211 +++++++++++++++++++---------------------------- dlls/qcap/vfwcapture.c | 78 +++++++++--------- 3 files changed, 151 insertions(+), 178 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8ad370744375b32b65f8…

1 0

Zebediah Figura : qcap: Combine the internal header files.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 9e035293b1265b426e2f0ee1730f60e77e656a5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e035293b1265b426e2f0ee1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 29 10:26:15 2020 -0500 qcap: Combine the internal header files. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 15 +---------- dlls/qcap/avico.c | 13 +--------- dlls/qcap/avimux.c | 14 +---------- dlls/qcap/capture.h | 42 ------------------------------- dlls/qcap/capturegraph.c | 28 +-------------------- dlls/qcap/filewriter.c | 6 +---- dlls/qcap/qcap_main.c | 23 ++--------------- dlls/qcap/qcap_main.h | 36 --------------------------- dlls/qcap/qcap_private.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/qcap/smartteefilter.c | 15 +---------- dlls/qcap/v4l.c | 15 +---------- dlls/qcap/vfwcapture.c | 24 +----------------- 12 files changed, 72 insertions(+), 221 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e035293b1265b426e2f…

1 0

Hans Leidekker : winhttp: Add support for ping and pong messages.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: dffd8e86475a8fd034c3167b576551ff7fd02f5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dffd8e86475a8fd034c3167b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 29 15:46:12 2020 +0200 winhttp: Add support for ping and pong messages. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 177 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 136 insertions(+), 41 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 06588d6f60..7cb07b5c10 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3112,29 +3112,18 @@ static DWORD send_bytes( struct netconn *netconn, char *bytes, int len ) return (count == len) ? ERROR_SUCCESS : ERROR_INTERNAL_ERROR; } -static enum socket_opcode map_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type ) -{ - switch (type) - { - case WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_TEXT; - case WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_BINARY; - case WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE: return SOCKET_OPCODE_CLOSE; - default: - FIXME("buffer type %u not supported\n", type); - return SOCKET_OPCODE_INVALID; - } -} - #define FIN_BIT (1 << 7) #define MASK_BIT (1 << 7) #define RESERVED_BIT (7 << 4) +#define CONTROL_BIT (1 << 3) -static DWORD send_frame( struct netconn *netconn, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, USHORT status, const char *buf, +static DWORD send_frame( struct netconn *netconn, enum socket_opcode opcode, USHORT status, const char *buf, DWORD buflen, BOOL final ) { DWORD i = 0, j, ret, offset = 2, len = buflen; - enum socket_opcode opcode = map_buffer_type( type ); - char hdr[14], byte, *mask; + char hdr[14], byte, *mask = NULL; + + TRACE("sending %02x frame\n", opcode); if (opcode == SOCKET_OPCODE_CLOSE) len += sizeof(status); @@ -3159,9 +3148,14 @@ static DWORD send_frame( struct netconn *netconn, WINHTTP_WEB_SOCKET_BUFFER_TYPE hdr[9] = len & 0xff; offset += 8; } - mask = &hdr[offset]; - RtlGenRandom( mask, 4 ); - if ((ret = send_bytes( netconn, hdr, offset + 4 ))) return ret; + + if ((ret = send_bytes( netconn, hdr, offset ))) return ret; + if (len) + { + mask = &hdr[offset]; + RtlGenRandom( mask, 4 ); + if ((ret = send_bytes( netconn, mask, 4 ))) return ret; + } if (opcode == SOCKET_OPCODE_CLOSE) /* prepend status code */ { @@ -3181,12 +3175,26 @@ static DWORD send_frame( struct netconn *netconn, WINHTTP_WEB_SOCKET_BUFFER_TYPE return ERROR_SUCCESS; } +static enum socket_opcode map_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type ) +{ + switch (type) + { + case WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_TEXT; + case WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_BINARY; + case WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE: return SOCKET_OPCODE_CLOSE; + default: + FIXME("buffer type %u not supported\n", type); + return SOCKET_OPCODE_INVALID; + } +} + static DWORD socket_send( struct socket *socket, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, const void *buf, DWORD len, BOOL async ) { + enum socket_opcode opcode = map_buffer_type( type ); DWORD ret; - ret = send_frame( socket->request->netconn, type, 0, buf, len, TRUE ); + ret = send_frame( socket->request->netconn, opcode, 0, buf, len, TRUE ); if (async) { if (!ret) @@ -3276,24 +3284,19 @@ static DWORD receive_bytes( struct netconn *netconn, char *buf, DWORD len, DWORD return ERROR_SUCCESS; } -static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( enum socket_opcode opcode, BOOL fragment ) +static BOOL is_supported_opcode( enum socket_opcode opcode ) { switch (opcode) { case SOCKET_OPCODE_TEXT: - if (fragment) return WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; - return WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE; - case SOCKET_OPCODE_BINARY: - if (fragment) return WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE; - return WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE; - case SOCKET_OPCODE_CLOSE: - return WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE; - + case SOCKET_OPCODE_PING: + case SOCKET_OPCODE_PONG: + return TRUE; default: - FIXME("opcode %u not handled\n", opcode); - return ~0u; + FIXME( "opcode %02x not handled\n", opcode ); + return FALSE; } } @@ -3303,11 +3306,12 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket char hdr[2]; if ((ret = receive_bytes( netconn, hdr, sizeof(hdr), &count ))) return ret; - if ((hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || (map_opcode( hdr[0] & 0xf, FALSE ) == ~0u)) + if ((hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || !is_supported_opcode( hdr[0] & 0xf )) { return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; } *opcode = hdr[0] & 0xf; + TRACE("received %02x frame\n", *opcode); len = hdr[1] & ~MASK_BIT; if (len == 126) @@ -3328,13 +3332,109 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket return ERROR_SUCCESS; } +static void CALLBACK task_socket_send_pong( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) +{ + struct socket_send *s = ctx; + + TRACE("running %p\n", work); + send_frame( s->socket->request->netconn, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE ); + + release_object( &s->socket->hdr ); + heap_free( s ); +} + +static DWORD socket_send_pong( struct socket *socket ) +{ + if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + { + struct socket_send *s; + DWORD ret; + + if (!(s = heap_alloc( sizeof(*s) ))) return ERROR_OUTOFMEMORY; + s->socket = socket; + + addref_object( &socket->hdr ); + if ((ret = queue_task( &socket->send_q, task_socket_send_pong, s ))) + { + release_object( &socket->hdr ); + heap_free( s ); + } + return ret; + } + return send_frame( socket->request->netconn, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE ); +} + +static DWORD socket_drain( struct socket *socket ) +{ + struct netconn *netconn = socket->request->netconn; + DWORD ret, count; + + while (socket->read_size) + { + char buf[1024]; + if ((ret = receive_bytes( netconn, buf, min(socket->read_size, sizeof(buf)), &count ))) return ret; + socket->read_size -= count; + } + return ERROR_SUCCESS; +} + +static DWORD handle_control_frame( struct socket *socket ) +{ + switch (socket->opcode) + { + case SOCKET_OPCODE_PING: + return socket_send_pong( socket ); + + case SOCKET_OPCODE_PONG: + return socket_drain( socket ); + + default: + ERR("unhandled control opcode %02x\n", socket->opcode); + return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + } + + return ERROR_SUCCESS; +} + +static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( enum socket_opcode opcode, BOOL fragment ) +{ + switch (opcode) + { + case SOCKET_OPCODE_TEXT: + if (fragment) return WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; + return WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE; + + case SOCKET_OPCODE_BINARY: + if (fragment) return WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE; + return WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE; + + case SOCKET_OPCODE_CLOSE: + return WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE; + + default: + FIXME("opcode %02x not handled\n", opcode); + return ~0u; + } +} + static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD *ret_len, WINHTTP_WEB_SOCKET_BUFFER_TYPE *ret_type, BOOL async ) { struct netconn *netconn = socket->request->netconn; DWORD count, ret = ERROR_SUCCESS; - if (!socket->read_size) ret = receive_frame( netconn, &socket->read_size, &socket->opcode ); + if (!socket->read_size) + { + for (;;) + { + if (!(ret = receive_frame( netconn, &socket->read_size, &socket->opcode ))) + { + if (!(socket->opcode & CONTROL_BIT) || (ret = handle_control_frame( socket ))) break; + } + else if (ret == WSAETIMEDOUT) ret = socket_send_pong( socket ); + if (ret) break; + } + } if (!ret) ret = receive_bytes( netconn, buf, min(len, socket->read_size), &count ); if (!ret) { @@ -3426,7 +3526,7 @@ static DWORD socket_shutdown( struct socket *socket, USHORT status, const void * struct netconn *netconn = socket->request->netconn; DWORD ret; - if (!(ret = send_frame( netconn, WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE, status, reason, len, TRUE ))) + if (!(ret = send_frame( netconn, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE ))) { socket->state = SOCKET_STATE_SHUTDOWN; } @@ -3505,16 +3605,11 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea struct netconn *netconn = socket->request->netconn; DWORD ret, count; - while (socket->read_size) /* drain any pending data */ - { - char buf[1024]; - if ((ret = receive_bytes( netconn, buf, min(socket->read_size, sizeof(buf)), &count ))) goto done; - socket->read_size -= count; - } + if ((ret = socket_drain( socket ))) goto done; if (socket->state < SOCKET_STATE_SHUTDOWN) { - if ((ret = send_frame( netconn, WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE, status, reason, len, TRUE ))) goto done; + if ((ret = send_frame( netconn, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE ))) goto done; socket->state = SOCKET_STATE_SHUTDOWN; }

1 0

Nikolay Sivov : evr: Add IMFVideoProcessor stub.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 881336569c593057503f66f4f5857f1a43571c80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=881336569c593057503f66f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 29 15:43:37 2020 +0300 evr: Add IMFVideoProcessor stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 8 +-- include/evr9.idl | 2 +- 3 files changed, 137 insertions(+), 7 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 006427b77a..e8905f633a 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -49,6 +49,7 @@ struct video_mixer IMFGetService IMFGetService_iface; IMFVideoMixerBitmap IMFVideoMixerBitmap_iface; IMFVideoPositionMapper IMFVideoPositionMapper_iface; + IMFVideoProcessor IMFVideoProcessor_iface; LONG refcount; struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; @@ -95,6 +96,11 @@ static struct video_mixer *impl_from_IMFVideoPositionMapper(IMFVideoPositionMapp return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoPositionMapper_iface); } +static struct video_mixer *impl_from_IMFVideoProcessor(IMFVideoProcessor *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoProcessor_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -152,6 +158,10 @@ static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, { *obj = &mixer->IMFVideoPositionMapper_iface; } + else if (IsEqualIID(riid, &IID_IMFVideoProcessor)) + { + *obj = &mixer->IMFVideoProcessor_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -914,6 +924,129 @@ static const IMFVideoPositionMapperVtbl video_mixer_position_mapper_vtbl = video_mixer_position_mapper_MapOutputCoordinateToInputStream, }; +static HRESULT WINAPI video_mixer_processor_QueryInterface(IMFVideoProcessor *iface, REFIID riid, void **obj) +{ + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, obj); +} + +static ULONG WINAPI video_mixer_processor_AddRef(IMFVideoProcessor *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_processor_Release(IMFVideoProcessor *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_processor_GetAvailableVideoProcessorModes(IMFVideoProcessor *iface, UINT *count, + GUID **modes) +{ + FIXME("%p, %p, %p.\n", iface, count, modes); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetVideoProcessorCaps(IMFVideoProcessor *iface, GUID *mode, + DXVA2_VideoProcessorCaps *caps) +{ + FIXME("%p, %s, %p.\n", iface, debugstr_guid(mode), caps); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetVideoProcessorMode(IMFVideoProcessor *iface, GUID *mode) +{ + FIXME("%p, %p.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_SetVideoProcessorMode(IMFVideoProcessor *iface, GUID *mode) +{ + FIXME("%p, %s.\n", iface, debugstr_guid(mode)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetProcAmpRange(IMFVideoProcessor *iface, DWORD prop, DXVA2_ValueRange *range) +{ + FIXME("%p, %#x, %p.\n", iface, prop, range); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetProcAmpValues(IMFVideoProcessor *iface, DWORD flags, DXVA2_ProcAmpValues *values) +{ + FIXME("%p, %#x, %p.\n", iface, flags, values); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_SetProcAmpValues(IMFVideoProcessor *iface, DWORD flags, DXVA2_ProcAmpValues *values) +{ + FIXME("%p, %#x, %p.\n", iface, flags, values); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetFilteringRange(IMFVideoProcessor *iface, DWORD prop, DXVA2_ValueRange *range) +{ + FIXME("%p, %#x, %p.\n", iface, prop, range); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetFilteringValue(IMFVideoProcessor *iface, DWORD prop, DXVA2_Fixed32 *value) +{ + FIXME("%p, %#x, %p.\n", iface, prop, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_SetFilteringValue(IMFVideoProcessor *iface, DWORD prop, DXVA2_Fixed32 *value) +{ + FIXME("%p, %#x, %p.\n", iface, prop, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetBackgroundColor(IMFVideoProcessor *iface, COLORREF *color) +{ + FIXME("%p, %p.\n", iface, color); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_SetBackgroundColor(IMFVideoProcessor *iface, COLORREF color) +{ + FIXME("%p, %#x.\n", iface, color); + + return E_NOTIMPL; +} + +static const IMFVideoProcessorVtbl video_mixer_processor_vtbl = +{ + video_mixer_processor_QueryInterface, + video_mixer_processor_AddRef, + video_mixer_processor_Release, + video_mixer_processor_GetAvailableVideoProcessorModes, + video_mixer_processor_GetVideoProcessorCaps, + video_mixer_processor_GetVideoProcessorMode, + video_mixer_processor_SetVideoProcessorMode, + video_mixer_processor_GetProcAmpRange, + video_mixer_processor_GetProcAmpValues, + video_mixer_processor_SetProcAmpValues, + video_mixer_processor_GetFilteringRange, + video_mixer_processor_GetFilteringValue, + video_mixer_processor_SetFilteringValue, + video_mixer_processor_GetBackgroundColor, + video_mixer_processor_SetBackgroundColor, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -943,6 +1076,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFGetService_iface.lpVtbl = &video_mixer_getservice_vtbl; object->IMFVideoMixerBitmap_iface.lpVtbl = &video_mixer_bitmap_vtbl; object->IMFVideoPositionMapper_iface.lpVtbl = &video_mixer_position_mapper_vtbl; + object->IMFVideoProcessor_iface.lpVtbl = &video_mixer_processor_vtbl; object->refcount = 1; object->input_count = 1; video_mixer_init_input(&object->inputs[0]); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 5bfa87014d..c37f921b09 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -405,10 +405,8 @@ static void test_default_mixer(void) IUnknown_Release(unk); hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoPositionMapper, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -425,10 +423,8 @@ todo_wine IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerControl, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); diff --git a/include/evr9.idl b/include/evr9.idl index 1572d87838..b3d363cdee 100644 --- a/include/evr9.idl +++ b/include/evr9.idl @@ -62,7 +62,7 @@ interface IMFVideoMixerBitmap : IUnknown [ object, - uuid(6AB0000C-FECE-4d1f-A2AC-A9573530656E), + uuid(6ab0000c-fece-4d1f-a2ac-a9573530656e), pointer_default(unique) ] interface IMFVideoProcessor : IUnknown

1 0

Changping Yu : kernel32/tests: Add test for thread enumeration order in toolhelp.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: ab7485bb4beccae445717719bff718f11f80e3d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab7485bb4beccae445717719… Author: Changping Yu <dead.ash(a)hotmail.com> Date: Mon Jun 29 11:25:01 2020 +0800 kernel32/tests: Add test for thread enumeration order in toolhelp. Signed-off-by: Changping Yu <dead.ash(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/toolhelp.c | 174 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 172 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index 9250f8dc54..eab35e0a47 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -22,11 +22,14 @@ #include <stdlib.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "tlhelp32.h" #include "wine/test.h" #include "winuser.h" +#include "winternl.h" static char selfname[MAX_PATH]; @@ -38,9 +41,12 @@ static BOOL (WINAPI *pProcess32First)(HANDLE, LPPROCESSENTRY32); static BOOL (WINAPI *pProcess32Next)(HANDLE, LPPROCESSENTRY32); static BOOL (WINAPI *pThread32First)(HANDLE, LPTHREADENTRY32); static BOOL (WINAPI *pThread32Next)(HANDLE, LPTHREADENTRY32); +static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, void *, ULONG, ULONG *); /* 1 minute should be more than enough */ #define WAIT_TIME (60 * 1000) +/* Specify the number of simultaneous threads to test */ +#define NUM_THREADS 4 static DWORD WINAPI sub_thread(void* pmt) { @@ -150,6 +156,166 @@ static void test_process(DWORD curr_pid, DWORD sub_pcs_pid) ok(!pProcess32First( hSnapshot, &pe ), "shouldn't return a process\n"); } +static DWORD WINAPI get_id_thread(void* curr_pid) +{ + HANDLE hSnapshot; + THREADENTRY32 te; + HANDLE ev, threads[NUM_THREADS]; + DWORD thread_ids[NUM_THREADS]; + DWORD thread_traversed[NUM_THREADS]; + DWORD tid, first_tid = 0; + BOOL found = FALSE; + int i, matched_idx = -1; + ULONG buf_size = 0; + NTSTATUS status; + BYTE* pcs_buffer = NULL; + DWORD pcs_offset = 0; + SYSTEM_PROCESS_INFORMATION* spi = NULL; + + ev = CreateEventW(NULL, TRUE, FALSE, NULL); + ok(ev != NULL, "Cannot create event\n"); + + for (i = 0; i < NUM_THREADS; i++) + { + threads[i] = CreateThread(NULL, 0, sub_thread, ev, 0, &tid); + ok(threads[i] != NULL, "Cannot create thread\n"); + thread_ids[i] = tid; + } + + hSnapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0); + ok(hSnapshot != NULL, "Cannot create snapshot\n"); + + /* Check that this current process is enumerated */ + te.dwSize = sizeof(te); + ok(pThread32First(hSnapshot, &te), "Thread cannot traverse\n"); + do + { + if (found) + { + if (te.th32OwnerProcessID != PtrToUlong(curr_pid)) break; + + if (matched_idx >= 0) + { + thread_traversed[matched_idx++] = te.th32ThreadID; + if (matched_idx >= NUM_THREADS) break; + } + else if (thread_ids[0] == te.th32ThreadID) + { + matched_idx = 0; + thread_traversed[matched_idx++] = te.th32ThreadID; + } + } + else if (te.th32OwnerProcessID == PtrToUlong(curr_pid)) + { + found = TRUE; + first_tid = te.th32ThreadID; + } + } + while (pThread32Next(hSnapshot, &te)); + + ok(found, "Couldn't find self and/or sub-process in process list\n"); + + /* Check if the thread order is strictly consistent */ + found = FALSE; + for (i = 0; i < NUM_THREADS; i++) + { + if (thread_traversed[i] != thread_ids[i]) + { + found = TRUE; + break; + } + /* Reset data */ + thread_traversed[i] = 0; + } + todo_wine + ok(found == FALSE, "The thread order is not strictly consistent\n"); + + /* Determine the order by NtQuerySystemInformation function */ + pcs_buffer = NULL; + status = pNtQuerySystemInformation(SystemProcessInformation, pcs_buffer, buf_size, &buf_size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Failed with %x\n", status); + if (status == STATUS_INFO_LENGTH_MISMATCH) + { + pcs_buffer = HeapAlloc(GetProcessHeap(), 0, buf_size); + ok(pcs_buffer != NULL, "Unable to allocate space\n"); + found = FALSE; + matched_idx = -1; + + status = NtQuerySystemInformation(SystemProcessInformation, pcs_buffer, buf_size, &buf_size); + do { + spi = (SYSTEM_PROCESS_INFORMATION*)&pcs_buffer[pcs_offset]; + if (spi->UniqueProcessId == curr_pid) + { + found = TRUE; + break; + } + pcs_offset += spi->NextEntryOffset; + } while (spi->NextEntryOffset != 0); + + ok(found && spi, "No process found\n"); + for (i = 0; i < spi->dwThreadCount; i++) + { + tid = HandleToULong(spi->ti[i].ClientId.UniqueThread); + if (matched_idx > 0) + { + thread_traversed[matched_idx++] = tid; + if (matched_idx >= NUM_THREADS) break; + } + else if (tid == thread_ids[0]) + { + matched_idx = 0; + thread_traversed[matched_idx++] = tid; + } + } + } + if (pcs_buffer) + HeapFree(GetProcessHeap(), 0, pcs_buffer); + + ok(matched_idx > 0, "No thread id match found\n"); + + found = FALSE; + for (i = 0; i < NUM_THREADS; i++) + { + if (thread_traversed[i] != thread_ids[i]) + { + found = TRUE; + break; + } + } + todo_wine + ok(found == FALSE, "wrong order in NtQuerySystemInformation function\n"); + + SetEvent(ev); + WaitForMultipleObjects( NUM_THREADS, threads, TRUE, WAIT_TIME ); + for (i = 0; i < NUM_THREADS; i++) + CloseHandle(threads[i]); + CloseHandle(ev); + CloseHandle(hSnapshot); + + return first_tid; +} + +static void test_main_thread(DWORD curr_pid, DWORD main_tid) +{ + HANDLE thread; + DWORD tid = 0; + int error; + + /* Check that the main thread id is first one in this thread. */ + tid = get_id_thread(ULongToPtr(curr_pid)); + todo_wine + ok(tid == main_tid, "The first thread id returned is not the main thread id\n"); + + /* Check that the main thread id is first one in other thread. */ + thread = CreateThread(NULL, 0, get_id_thread, ULongToPtr(curr_pid), 0, NULL); + error = WaitForSingleObject(thread, WAIT_TIME); + ok(error == WAIT_OBJECT_0, "Thread did not complete within timelimit\n"); + + ok(GetExitCodeThread(thread, &tid), "Could not retrieve exit code\n"); + todo_wine + ok(tid == main_tid, "The first thread id returned is not the main thread id\n"); +} + static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) { HANDLE hSnapshot; @@ -158,7 +324,7 @@ static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) int num = 0; unsigned curr_found = 0; unsigned sub_found = 0; - + hSnapshot = pCreateToolhelp32Snapshot( TH32CS_SNAPTHREAD, 0 ); ok(hSnapshot != NULL, "Cannot create snapshot\n"); @@ -291,6 +457,7 @@ START_TEST(toolhelp) HANDLE ev1, ev2; DWORD w; HANDLE hkernel32 = GetModuleHandleA("kernel32"); + HANDLE hntdll = GetModuleHandleA("ntdll.dll"); pCreateToolhelp32Snapshot = (VOID *) GetProcAddress(hkernel32, "CreateToolhelp32Snapshot"); pModule32First = (VOID *) GetProcAddress(hkernel32, "Module32First"); @@ -299,11 +466,13 @@ START_TEST(toolhelp) pProcess32Next = (VOID *) GetProcAddress(hkernel32, "Process32Next"); pThread32First = (VOID *) GetProcAddress(hkernel32, "Thread32First"); pThread32Next = (VOID *) GetProcAddress(hkernel32, "Thread32Next"); + pNtQuerySystemInformation = (VOID *) GetProcAddress(hntdll, "NtQuerySystemInformation"); if (!pCreateToolhelp32Snapshot || !pModule32First || !pModule32Next || !pProcess32First || !pProcess32Next || - !pThread32First || !pThread32Next) + !pThread32First || !pThread32Next || + !pNtQuerySystemInformation) { win_skip("Needed functions are not available, most likely running on Windows NT\n"); return; @@ -339,6 +508,7 @@ START_TEST(toolhelp) test_process(pid, info.dwProcessId); test_thread(pid, info.dwProcessId); + test_main_thread(pid, GetCurrentThreadId()); test_module(pid, curr_expected_modules, ARRAY_SIZE(curr_expected_modules)); test_module(info.dwProcessId, sub_expected_modules, ARRAY_SIZE(sub_expected_modules));

1 0

Alexandre Julliard : ntdll: Remove support for being loaded directly from libwine.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 83a4549e9baa252d0fb92d14e5a39119b8583813 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83a4549e9baa252d0fb92d14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 12:11:57 2020 +0200 ntdll: Remove support for being loaded directly from libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 35 ++--------------------------------- dlls/ntdll/unix/loader.c | 37 ------------------------------------- 2 files changed, 2 insertions(+), 70 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index aa7b58b732..ab554438af 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3900,33 +3900,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } -static NTSTATUS load_ntdll_so( HMODULE module, const IMAGE_NT_HEADERS *nt ) -{ - NTSTATUS (__cdecl *init_func)( HMODULE module, const void *ptr_in, void *ptr_out ); - Dl_info info; - char *name; - void *handle; - - if (!dladdr( load_ntdll_so, &info )) - { - fprintf( stderr, "cannot get path to ntdll.dll.so\n" ); - exit(1); - } - name = strdup( info.dli_fname ); - strcpy( name + strlen(name) - strlen(".dll.so"), ".so" ); - if (!(handle = dlopen( name, RTLD_NOW ))) - { - fprintf( stderr, "failed to load %s: %s\n", name, dlerror() ); - exit(1); - } - if (!(init_func = dlsym( handle, "__wine_init_unix_lib" ))) - { - fprintf( stderr, "init func not found in %s\n", name ); - exit(1); - } - return init_func( module, nt, &unix_funcs ); -} - /*********************************************************************** * __wine_process_init */ @@ -3948,13 +3921,9 @@ void __wine_process_init(void) HMODULE ntdll_module = (HMODULE)((__wine_spec_nt_header.OptionalHeader.ImageBase + 0xffff) & ~0xffff); INITIAL_TEB stack; SIZE_T info_size; - TEB *teb; - PEB *peb; - - if (!unix_funcs) load_ntdll_so( ntdll_module, &__wine_spec_nt_header ); + TEB *teb = thread_init( &info_size ); + PEB *peb = teb->Peb; - teb = thread_init( &info_size ); - peb = teb->Peb; peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL ); peb->LoaderLock = &loader_section; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 10b483a95a..6043367a8e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -105,10 +105,6 @@ static void (CDECL *p__wine_set_unix_funcs)( int version, const struct unix_func static void fatal_error( const char *err, ... ) __attribute__((noreturn, format(printf,1,2))); #endif -extern int __wine_main_argc; -extern char **__wine_main_argv; -extern char **__wine_main_environ; - #if defined(linux) || defined(__APPLE__) static const BOOL use_preloader = TRUE; #else @@ -1803,39 +1799,6 @@ void __wine_main( int argc, char *argv[], char *envp[] ) } -static int add_area( void *base, size_t size, void *arg ) -{ - mmap_add_reserved_area( base, size ); - return 0; -} - -/*********************************************************************** - * __wine_init_unix_lib - * - * Lib entry point called by ntdll.dll.so if not yet initialized. - */ -NTSTATUS __cdecl __wine_init_unix_lib( HMODULE module, const void *ptr_in, void *ptr_out ) -{ - const IMAGE_NT_HEADERS *nt = ptr_in; - -#ifdef __APPLE__ - extern char **__wine_get_main_environment(void); - char **envp = __wine_get_main_environment(); -#else - char **envp = __wine_main_environ; -#endif - init_paths( __wine_main_argc, __wine_main_argv, envp ); - - ntdll_module = module; - map_so_dll( nt, module ); - fixup_ntdll_imports( &__wine_spec_nt_header ); - init_environment( __wine_main_argc, __wine_main_argv, envp ); - wine_dll_set_callback( load_builtin_callback ); - *(struct unix_funcs **)ptr_out = &unix_funcs; - wine_mmap_enum_reserved_areas( add_area, NULL, 0 ); - return STATUS_SUCCESS; -} - BOOL WINAPI DECLSPEC_HIDDEN DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { if (reason == DLL_PROCESS_ATTACH) LdrDisableThreadCalloutsForDll( inst );

1 0

Jacek Caban : mshtml: Add IHTMLRectCollection::item implementation.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 4633304cde2aeeb363b303a238ccedeb366cce5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4633304cde2aeeb363b303a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 29 16:49:57 2020 +0200 mshtml: Add IHTMLRectCollection::item implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 30 ++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 14 ++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index a594337ead..6578ee7510 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -671,8 +671,34 @@ static HRESULT WINAPI HTMLRectCollection_get__newEnum(IHTMLRectCollection *iface static HRESULT WINAPI HTMLRectCollection_item(IHTMLRectCollection *iface, VARIANT *index, VARIANT *result) { HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(index), result); - return E_NOTIMPL; + nsIDOMClientRect *nsrect; + IHTMLRect *rect; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(index), result); + + if(V_VT(index) != VT_I4 || V_I4(index) < 0) { + FIXME("Unsupported for %s index\n", debugstr_variant(index)); + return E_NOTIMPL; + } + + nsres = nsIDOMClientRectList_Item(This->rect_list, V_I4(index), &nsrect); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + if(!nsrect) { + V_VT(result) = VT_NULL; + return S_OK; + } + + hres = create_html_rect(nsrect, &rect); + nsIDOMClientRect_Release(nsrect); + if(FAILED(hres)) + return hres; + + V_VT(result) = VT_DISPATCH; + V_DISPATCH(result) = (IDispatch *)rect; + return S_OK; } static const IHTMLRectCollectionVtbl HTMLRectCollectionVtbl = { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 89785123c6..3aee3dfb7b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5144,6 +5144,7 @@ static void test_elem_bounding_client_rect(IUnknown *unk) IHTMLRectCollection *rects; IHTMLRect *rect, *rect2; IHTMLElement2 *elem2; + VARIANT v, index; LONG l; HRESULT hres; @@ -5185,6 +5186,19 @@ static void test_elem_bounding_client_rect(IUnknown *unk) test_disp((IUnknown*)rects, &IID_IHTMLRectCollection, NULL, L"[object]"); + hres = IHTMLRectCollection_get_length(rects, &l); + ok(hres == S_OK, "get_length failed: %08x\n", hres); + ok(l == 1, "length = %u\n", l); + + V_VT(&index) = VT_I4; + V_I4(&index) = 0; + V_VT(&v) = VT_ERROR; + hres = IHTMLRectCollection_item(rects, &index, &v); + ok(hres == S_OK, "item failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + test_disp((IUnknown*)V_DISPATCH(&v), &IID_IHTMLRect, NULL, L"[object]"); + VariantClear(&v); + IHTMLRectCollection_Release(rects); IHTMLElement2_Release(elem2); }

1 0

Jacek Caban : mshtml: Return NULL in IHTMLDocument2::get_cookie if InternetGetCookieExW failes.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: cbb70ff04199fc125dc2d9af9e2ff866f9a07314 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbb70ff04199fc125dc2d9af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 29 16:49:40 2020 +0200 mshtml: Return NULL in IHTMLDocument2::get_cookie if InternetGetCookieExW failes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 15 ++++----------- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 57ec662de8..0f8bf3f2dc 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -904,17 +904,10 @@ static HRESULT WINAPI HTMLDocument_get_cookie(IHTMLDocument2 *iface, BSTR *p) size = 0; bret = InternetGetCookieExW(This->window->url, NULL, NULL, &size, 0, NULL); - if(!bret) { - switch(GetLastError()) { - case ERROR_INSUFFICIENT_BUFFER: - break; - case ERROR_NO_MORE_ITEMS: - *p = NULL; - return S_OK; - default: - FIXME("InternetGetCookieExW failed: %u\n", GetLastError()); - return HRESULT_FROM_WIN32(GetLastError()); - } + if(!bret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { + WARN("InternetGetCookieExW failed: %u\n", GetLastError()); + *p = NULL; + return S_OK; } if(!size) { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7b19271ad4..89785123c6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7276,6 +7276,11 @@ static void test_defaults(IHTMLDocument2 *doc) test_default_selection(doc); test_doc_title(doc, L""); test_dom_implementation(doc); + + str = (BSTR)0xdeadbeef; + hres = IHTMLDocument2_get_cookie(doc, &str); + ok(hres == S_OK, "get_cookie failed: %08x\n", hres); + ok(!str, "cookie = %s\n", wine_dbgstr_w(str)); } #define test_button_name(a,b) _test_button_name(__LINE__,a,b)

1 0

Vijay Kiran Kamuju : include: Fix typo in DS3DALG_DEFAULT.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 3a17ee90663566f7ca53e61be26f0e9bee201566 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a17ee90663566f7ca53e61b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Jun 29 11:41:29 2020 +0200 include: Fix typo in DS3DALG_DEFAULT. Spotted by Ozkan Sezer Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dsound.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dsound.h b/include/dsound.h index 85235ef1bb..bfb52a297a 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -116,7 +116,7 @@ DEFINE_GUID(DSDEVID_DefaultVoiceCapture, 0xDEF00003,0x9C6D,0x47ED,0xAA,0xF1,0x4D DEFINE_GUID(DSDEVID_WinePlayback, 0x40316A1D,0x605B,0xD611,0x87,0xC6,0x00,0x80,0xAD,0x00,0x02,0xFE); -#define DSD3DALG_DEFAULT GUID_NULL +#define DS3DALG_DEFAULT GUID_NULL DEFINE_GUID(DS3DALG_NO_VIRTUALIZATION, 0xc241333f,0x1c1b,0x11d2,0x94,0xf5,0x00,0xc0,0x4f,0xc2,0x8a,0xca); DEFINE_GUID(DS3DALG_HRTF_FULL, 0xc2413340,0x1c1b,0x11d2,0x94,0xf5,0x00,0xc0,0x4f,0xc2,0x8a,0xca); DEFINE_GUID(DS3DALG_HRTF_LIGHT, 0xc2413342,0x1c1b,0x11d2,0x94,0xf5,0x00,0xc0,0x4f,0xc2,0x8a,0xca);

1 0

Alexandre Julliard : ntdll: Move the console handle initialization to the Unix library.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: b9f531a0e81ebf7a0dfeac00d557632546b12f56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9f531a0e81ebf7a0dfeac00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 10:39:27 2020 +0200 ntdll: Move the console handle initialization to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 10 ++-------- dlls/ntdll/unix/env.c | 15 +++++++++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 4 +++- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index a72fc6943d..a68ef5786e 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -1286,14 +1286,8 @@ void init_user_process_params( SIZE_T data_size ) RtlFreeUnicodeString( &cmdline ); RtlReleasePath( load_path ); - if (isatty(0) || isatty(1) || isatty(2)) - params->ConsoleHandle = (HANDLE)2; /* see kernel32/kernel_private.h */ - if (!isatty(0)) - wine_server_fd_to_handle( 0, GENERIC_READ|SYNCHRONIZE, OBJ_INHERIT, &params->hStdInput ); - if (!isatty(1)) - wine_server_fd_to_handle( 1, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params->hStdOutput ); - if (!isatty(2)) - wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params->hStdError ); + unix_funcs->get_initial_console( &params->ConsoleHandle, &params->hStdInput, + &params->hStdOutput, &params->hStdError ); params->wShowWindow = 1; /* SW_SHOWNORMAL */ run_wineboot( &params->Environment ); diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 7bf57a228f..1ffe45ea3b 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -954,6 +954,21 @@ NTSTATUS CDECL get_dynamic_environment( WCHAR *env, SIZE_T *size ) } +/************************************************************************* + * get_initial_console + * + * Return the initial console handles. + */ +void CDECL get_initial_console( HANDLE *handle, HANDLE *std_in, HANDLE *std_out, HANDLE *std_err ) +{ + *handle = *std_in = *std_out = *std_err = 0; + if (isatty(0) || isatty(1) || isatty(2)) *handle = (HANDLE)2; /* see kernel32/kernel_private.h */ + if (!isatty(0)) server_fd_to_handle( 0, GENERIC_READ|SYNCHRONIZE, OBJ_INHERIT, std_in ); + if (!isatty(1)) server_fd_to_handle( 1, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, std_out ); + if (!isatty(2)) server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, std_err ); +} + + /************************************************************************* * get_initial_directory * diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index be71498343..892ff10c35 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1491,6 +1491,7 @@ static struct unix_funcs unix_funcs = ntdll_tan, get_initial_environment, get_dynamic_environment, + get_initial_console, get_initial_directory, get_unix_codepage, get_locales, diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index fe63606ed8..d6a15d5f7b 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -99,6 +99,7 @@ int CDECL mmap_enum_reserved_areas( int (CDECL *enum_func)(void *base, SIZE_T s extern NTSTATUS CDECL get_initial_environment( WCHAR **wargv[], WCHAR *env, SIZE_T *size ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL get_dynamic_environment( WCHAR *env, SIZE_T *size ) DECLSPEC_HIDDEN; extern void CDECL get_initial_directory( UNICODE_STRING *dir ) DECLSPEC_HIDDEN; +extern void CDECL get_initial_console( HANDLE *handle, HANDLE *std_in, HANDLE *std_out, HANDLE *std_err ) DECLSPEC_HIDDEN; extern void CDECL get_unix_codepage( CPTABLEINFO *table ) DECLSPEC_HIDDEN; extern void CDECL get_locales( WCHAR *sys, WCHAR *user ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL virtual_map_section( HANDLE handle, PVOID *addr_ptr, unsigned short zero_bits_64, SIZE_T commit_size, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index cec36b58c0..88010b695e 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -29,7 +29,7 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 64 +#define NTDLL_UNIXLIB_VERSION 65 struct unix_funcs { @@ -300,6 +300,8 @@ struct unix_funcs /* environment functions */ NTSTATUS (CDECL *get_initial_environment)( WCHAR **wargv[], WCHAR *env, SIZE_T *size ); NTSTATUS (CDECL *get_dynamic_environment)( WCHAR *env, SIZE_T *size ); + void (CDECL *get_initial_console)( HANDLE *handle, HANDLE *std_in, + HANDLE *std_out, HANDLE *std_err ); void (CDECL *get_initial_directory)( UNICODE_STRING *dir ); void (CDECL *get_unix_codepage)( CPTABLEINFO *table ); void (CDECL *get_locales)( WCHAR *sys, WCHAR *user );

1 0