November 2020 - Wine-Commits

Zebediah Figura : qcap: Directly pass AM_MEDIA_TYPE and VIDEOINFOHEADER pointers to the get_caps() operation.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: fa0ff00e57f2523200ae6bd3f8f0d1ec9e8e81f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa0ff00e57f2523200ae6bd3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 25 17:43:36 2020 -0600 qcap: Directly pass AM_MEDIA_TYPE and VIDEOINFOHEADER pointers to the get_caps() operation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_private.h | 3 ++- dlls/qcap/v4l.c | 11 ++++------- dlls/qcap/vfwcapture.c | 26 +++++++++++++++++++++++++- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index 1d2b49d7394..834994d8cac 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -48,7 +48,8 @@ struct video_capture_funcs HRESULT (*set_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); HRESULT (*get_format)(struct video_capture_device *device, AM_MEDIA_TYPE *mt); HRESULT (*get_media_type)(struct video_capture_device *device, unsigned int index, AM_MEDIA_TYPE *mt); - HRESULT (*get_caps)(struct video_capture_device *device, LONG index, AM_MEDIA_TYPE **mt, VIDEO_STREAM_CONFIG_CAPS *caps); + HRESULT (*get_caps)(struct video_capture_device *device, LONG index, AM_MEDIA_TYPE *mt, + VIDEOINFOHEADER *format, VIDEO_STREAM_CONFIG_CAPS *caps); LONG (*get_caps_count)(struct video_capture_device *device); HRESULT (*get_prop_range)(struct video_capture_device *device, VideoProcAmpProperty property, LONG *min, LONG *max, LONG *step, LONG *default_value, LONG *flags); diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index d525989172a..db838f1efe4 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -374,17 +374,14 @@ static void fill_caps(__u32 pixelformat, __u32 width, __u32 height, } static HRESULT v4l_device_get_caps(struct video_capture_device *device, LONG index, - AM_MEDIA_TYPE **type, VIDEO_STREAM_CONFIG_CAPS *vscc) + AM_MEDIA_TYPE *type, VIDEOINFOHEADER *format, VIDEO_STREAM_CONFIG_CAPS *vscc) { if (index >= device->caps_count) return S_FALSE; - *type = CreateMediaType(&device->caps[index].media_type); - if (!*type) - return E_OUTOFMEMORY; - - if (vscc) - memcpy(vscc, &device->caps[index].config, sizeof(VIDEO_STREAM_CONFIG_CAPS)); + *vscc = device->caps[index].config; + *type = device->caps[index].media_type; + *format = device->caps[index].video_info; return S_OK; } diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 5c1ce9af980..62d692226c5 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -375,10 +375,34 @@ static HRESULT WINAPI AMStreamConfig_GetStreamCaps(IAMStreamConfig *iface, int index, AM_MEDIA_TYPE **pmt, BYTE *vscc) { struct vfw_capture *filter = impl_from_IAMStreamConfig(iface); + VIDEOINFOHEADER *format; + AM_MEDIA_TYPE *mt; + HRESULT hr; TRACE("filter %p, index %d, pmt %p, vscc %p.\n", filter, index, pmt, vscc); - return capture_funcs->get_caps(filter->device, index, pmt, (VIDEO_STREAM_CONFIG_CAPS *)vscc); + if (!(mt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) + return E_OUTOFMEMORY; + + if (!(format = CoTaskMemAlloc(sizeof(VIDEOINFOHEADER)))) + { + CoTaskMemFree(mt); + return E_OUTOFMEMORY; + } + + if ((hr = capture_funcs->get_caps(filter->device, index, mt, + format, (VIDEO_STREAM_CONFIG_CAPS *)vscc)) == S_OK) + { + mt->cbFormat = sizeof(VIDEOINFOHEADER); + mt->pbFormat = (BYTE *)format; + *pmt = mt; + } + else + { + CoTaskMemFree(format); + CoTaskMemFree(mt); + } + return hr; } static const IAMStreamConfigVtbl IAMStreamConfig_VTable =

1 0

Zebediah Figura : qcap: Directly pass a VIDEOINFOHEADER pointer to the get_format() operation.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 82abcec541a5f85d1c2c798f8ebebd85837e9c22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82abcec541a5f85d1c2c798f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 25 17:43:38 2020 -0600 qcap: Directly pass a VIDEOINFOHEADER pointer to the get_format() operation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_private.h | 2 +- dlls/qcap/v4l.c | 5 +++-- dlls/qcap/vfwcapture.c | 24 ++++++++++++++++++++++-- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index e2f032d2079..50bc2525f0e 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -46,7 +46,7 @@ struct video_capture_funcs void (*destroy)(struct video_capture_device *device); HRESULT (*check_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); HRESULT (*set_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); - HRESULT (*get_format)(struct video_capture_device *device, AM_MEDIA_TYPE *mt); + void (*get_format)(struct video_capture_device *device, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format); HRESULT (*get_media_type)(struct video_capture_device *device, unsigned int index, AM_MEDIA_TYPE *mt); void (*get_caps)(struct video_capture_device *device, LONG index, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format, VIDEO_STREAM_CONFIG_CAPS *caps); diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index e0a6593a024..dd002f7b3ea 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -209,9 +209,10 @@ static HRESULT v4l_device_set_format(struct video_capture_device *device, const return set_caps(device, caps); } -static HRESULT v4l_device_get_format(struct video_capture_device *device, AM_MEDIA_TYPE *mt) +static void v4l_device_get_format(struct video_capture_device *device, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format) { - return CopyMediaType(mt, &device->current_caps->media_type); + *mt = device->current_caps->media_type; + *format = device->current_caps->video_info; } static HRESULT v4l_device_get_media_type(struct video_capture_device *device, diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 09cb7e36cc2..e98e97b7816 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -337,6 +337,7 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt) static HRESULT WINAPI AMStreamConfig_GetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE **mt) { struct vfw_capture *filter = impl_from_IAMStreamConfig(iface); + VIDEOINFOHEADER *format; HRESULT hr; TRACE("filter %p, mt %p.\n", filter, mt); @@ -347,11 +348,30 @@ static HRESULT WINAPI AMStreamConfig_GetFormat(IAMStreamConfig *iface, AM_MEDIA_ EnterCriticalSection(&filter->filter.csFilter); if (filter->source.pin.peer) + { hr = CopyMediaType(*mt, &filter->source.pin.mt); - else if (SUCCEEDED(hr = capture_funcs->get_format(filter->device, *mt))) - strmbase_dump_media_type(*mt); + } + else + { + if ((format = CoTaskMemAlloc(sizeof(VIDEOINFOHEADER)))) + { + capture_funcs->get_format(filter->device, *mt, format); + (*mt)->cbFormat = sizeof(VIDEOINFOHEADER); + (*mt)->pbFormat = (BYTE *)format; + hr = S_OK; + } + else + { + hr = E_OUTOFMEMORY; + } + } LeaveCriticalSection(&filter->filter.csFilter); + + if (SUCCEEDED(hr)) + strmbase_dump_media_type(*mt); + else + CoTaskMemFree(*mt); return hr; }

1 0

Rémi Bernon : ntdll/tests: Add tests for NtOpenProcess return status.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 3326c578f3db6928e08d7d0d24e282b27be4b8cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3326c578f3db6928e08d7d0d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 26 10:11:34 2020 +0100 ntdll/tests: Add tests for NtOpenProcess return status. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index d3b932bec1d..6687b8b6767 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -73,6 +73,7 @@ static NTSTATUS (WINAPI *pNtQuerySystemTime)( LARGE_INTEGER * ); static NTSTATUS (WINAPI *pRtlWaitOnAddress)( const void *, const void *, SIZE_T, const LARGE_INTEGER * ); static void (WINAPI *pRtlWakeAddressAll)( const void * ); static void (WINAPI *pRtlWakeAddressSingle)( const void * ); +static NTSTATUS (WINAPI *pNtOpenProcess)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, const CLIENT_ID * ); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -2034,6 +2035,56 @@ static void test_wait_on_address(void) ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); } +static void test_process(void) +{ + OBJECT_ATTRIBUTES attr; + CLIENT_ID cid; + NTSTATUS status; + HANDLE process; + + if (!pNtOpenProcess) + { + win_skip( "NtOpenProcess not supported, skipping test\n" ); + return; + } + + InitializeObjectAttributes( &attr, NULL, 0, 0, NULL ); + + cid.UniqueProcess = 0; + cid.UniqueThread = 0; + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, NULL, &cid ); + todo_wine ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcess returned %x\n", status ); + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, NULL ); + todo_wine ok( status == STATUS_INVALID_PARAMETER_MIX, "NtOpenProcess returned %x\n", status ); + + cid.UniqueProcess = 0; + cid.UniqueThread = 0; + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + todo_wine ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); + + cid.UniqueProcess = ULongToHandle( 0xdeadbeef ); + cid.UniqueThread = ULongToHandle( 0xdeadbeef ); + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + todo_wine ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); + + cid.UniqueProcess = ULongToHandle( GetCurrentThreadId() ); + cid.UniqueThread = 0; + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + todo_wine ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); + + cid.UniqueProcess = ULongToHandle( GetCurrentProcessId() ); + cid.UniqueThread = 0; + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + ok( !status, "NtOpenProcess returned %x\n", status ); + pNtClose( process ); + + cid.UniqueProcess = ULongToHandle( GetCurrentProcessId() ); + cid.UniqueThread = ULongToHandle( GetCurrentThreadId() ); + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + ok( !status, "NtOpenProcess returned %x\n", status ); + pNtClose( process ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2082,6 +2133,7 @@ START_TEST(om) pRtlWaitOnAddress = (void *)GetProcAddress(hntdll, "RtlWaitOnAddress"); pRtlWakeAddressAll = (void *)GetProcAddress(hntdll, "RtlWakeAddressAll"); pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle"); + pNtOpenProcess = (void *)GetProcAddress(hntdll, "NtOpenProcess"); test_case_sensitive(); test_namespace_pipe(); @@ -2096,4 +2148,5 @@ START_TEST(om) test_keyed_events(); test_null_device(); test_wait_on_address(); + test_process(); }

1 0

Zebediah Figura : qcap: Validate the index in AMStreamConfig_GetStreamCaps().
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: d00c6af248a47fe0ed9b2bc7cbf399152bfe73bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d00c6af248a47fe0ed9b2bc7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 25 17:43:37 2020 -0600 qcap: Validate the index in AMStreamConfig_GetStreamCaps(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_private.h | 2 +- dlls/qcap/v4l.c | 6 +----- dlls/qcap/vfwcapture.c | 22 ++++++++-------------- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index 834994d8cac..e2f032d2079 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -48,7 +48,7 @@ struct video_capture_funcs HRESULT (*set_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); HRESULT (*get_format)(struct video_capture_device *device, AM_MEDIA_TYPE *mt); HRESULT (*get_media_type)(struct video_capture_device *device, unsigned int index, AM_MEDIA_TYPE *mt); - HRESULT (*get_caps)(struct video_capture_device *device, LONG index, AM_MEDIA_TYPE *mt, + void (*get_caps)(struct video_capture_device *device, LONG index, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format, VIDEO_STREAM_CONFIG_CAPS *caps); LONG (*get_caps_count)(struct video_capture_device *device); HRESULT (*get_prop_range)(struct video_capture_device *device, VideoProcAmpProperty property, diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index db838f1efe4..e0a6593a024 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -373,16 +373,12 @@ static void fill_caps(__u32 pixelformat, __u32 width, __u32 height, caps->pixelformat = pixelformat; } -static HRESULT v4l_device_get_caps(struct video_capture_device *device, LONG index, +static void v4l_device_get_caps(struct video_capture_device *device, LONG index, AM_MEDIA_TYPE *type, VIDEOINFOHEADER *format, VIDEO_STREAM_CONFIG_CAPS *vscc) { - if (index >= device->caps_count) - return S_FALSE; - *vscc = device->caps[index].config; *type = device->caps[index].media_type; *format = device->caps[index].video_info; - return S_OK; } static LONG v4l_device_get_caps_count(struct video_capture_device *device) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 62d692226c5..09cb7e36cc2 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -377,10 +377,12 @@ static HRESULT WINAPI AMStreamConfig_GetStreamCaps(IAMStreamConfig *iface, struct vfw_capture *filter = impl_from_IAMStreamConfig(iface); VIDEOINFOHEADER *format; AM_MEDIA_TYPE *mt; - HRESULT hr; TRACE("filter %p, index %d, pmt %p, vscc %p.\n", filter, index, pmt, vscc); + if (index > capture_funcs->get_caps_count(filter->device)) + return S_FALSE; + if (!(mt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) return E_OUTOFMEMORY; @@ -390,19 +392,11 @@ static HRESULT WINAPI AMStreamConfig_GetStreamCaps(IAMStreamConfig *iface, return E_OUTOFMEMORY; } - if ((hr = capture_funcs->get_caps(filter->device, index, mt, - format, (VIDEO_STREAM_CONFIG_CAPS *)vscc)) == S_OK) - { - mt->cbFormat = sizeof(VIDEOINFOHEADER); - mt->pbFormat = (BYTE *)format; - *pmt = mt; - } - else - { - CoTaskMemFree(format); - CoTaskMemFree(mt); - } - return hr; + capture_funcs->get_caps(filter->device, index, mt, format, (VIDEO_STREAM_CONFIG_CAPS *)vscc); + mt->cbFormat = sizeof(VIDEOINFOHEADER); + mt->pbFormat = (BYTE *)format; + *pmt = mt; + return S_OK; } static const IAMStreamConfigVtbl IAMStreamConfig_VTable =

1 0

Rémi Bernon : server: Return STATUS_INVALID_CID from NtOpenProcess.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: e0a1bdf2bcdd58422d7f4c7f49c6dff5e441d47d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0a1bdf2bcdd58422d7f4c7f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 26 10:11:35 2020 +0100 server: Return STATUS_INVALID_CID from NtOpenProcess. When appropriate, instead of STATUS_INVALID_PARAMETER. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 6 +++--- server/process.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 6687b8b6767..4f711f6b6b8 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2060,17 +2060,17 @@ static void test_process(void) cid.UniqueProcess = 0; cid.UniqueThread = 0; status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); - todo_wine ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); + ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); cid.UniqueProcess = ULongToHandle( 0xdeadbeef ); cid.UniqueThread = ULongToHandle( 0xdeadbeef ); status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); - todo_wine ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); + ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); cid.UniqueProcess = ULongToHandle( GetCurrentThreadId() ); cid.UniqueThread = 0; status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); - todo_wine ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); + ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); cid.UniqueProcess = ULongToHandle( GetCurrentProcessId() ); cid.UniqueThread = 0; diff --git a/server/process.c b/server/process.c index d5b9a2548cf..5b3e29e5dfd 100644 --- a/server/process.c +++ b/server/process.c @@ -778,7 +778,7 @@ struct process *get_process_from_id( process_id_t id ) struct object *obj = get_ptid_entry( id ); if (obj && obj->ops == &process_ops) return (struct process *)grab_object( obj ); - set_error( STATUS_INVALID_PARAMETER ); + set_error( STATUS_INVALID_CID ); return NULL; }

1 0

Rémi Bernon : ntdll: Return failure from RtlQueryProcessDebugInformation.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 97825b9c5311fd8f9b39fb6904fff06266de89b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97825b9c5311fd8f9b39fb69… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 26 11:26:53 2020 +0100 ntdll: Return failure from RtlQueryProcessDebugInformation. Some DRM call it with GetCurrentThreadId(), although they don't seem to mind about the result. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugbuffer.c | 13 +++++++++++-- dlls/ntdll/tests/rtl.c | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/debugbuffer.c b/dlls/ntdll/debugbuffer.c index 3ac765d454e..9f5d214aacb 100644 --- a/dlls/ntdll/debugbuffer.c +++ b/dlls/ntdll/debugbuffer.c @@ -114,7 +114,16 @@ NTSTATUS WINAPI RtlDestroyQueryDebugBuffer(IN PDEBUG_BUFFER iBuf) NTSTATUS WINAPI RtlQueryProcessDebugInformation(IN ULONG iProcessId, IN ULONG iDebugInfoMask, IN OUT PDEBUG_BUFFER iBuf) { - NTSTATUS nts = STATUS_SUCCESS; + CLIENT_ID cid; + NTSTATUS status; + HANDLE process; + + cid.UniqueProcess = ULongToHandle( iProcessId ); + cid.UniqueThread = 0; + + if ((status = NtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, NULL, &cid ))) return status; + NtClose( process ); + FIXME("(%d, %x, %p): stub\n", iProcessId, iDebugInfoMask, iBuf); iBuf->InfoClassMask = iDebugInfoMask; @@ -139,5 +148,5 @@ NTSTATUS WINAPI RtlQueryProcessDebugInformation(IN ULONG iProcessId, IN ULONG iD } TRACE("returns:%p\n", iBuf); dump_DEBUG_BUFFER(iBuf); - return nts; + return status; } diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 897be4fcd12..28dd02fd118 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -132,6 +132,24 @@ static void InitFunctionPtrs(void) ok(strlen(src) == 15, "Source must be 16 bytes long!\n"); } +static void test_RtlQueryProcessDebugInformation(void) +{ + DEBUG_BUFFER *buffer; + NTSTATUS status; + + buffer = RtlCreateQueryDebugBuffer( 0, 0 ); + ok( buffer != NULL, "RtlCreateQueryDebugBuffer returned NULL" ); + + status = RtlQueryProcessDebugInformation( GetCurrentThreadId(), PDI_HEAPS | PDI_HEAP_BLOCKS, buffer ); + ok( status == STATUS_INVALID_CID, "RtlQueryProcessDebugInformation returned %x\n", status ); + + status = RtlQueryProcessDebugInformation( GetCurrentProcessId(), PDI_HEAPS | PDI_HEAP_BLOCKS, buffer ); + ok( !status, "RtlQueryProcessDebugInformation returned %x\n", status ); + + status = RtlDestroyQueryDebugBuffer( buffer ); + ok( !status, "RtlDestroyQueryDebugBuffer returned %x\n", status ); +} + #define COMP(str1,str2,cmplen,len) size = RtlCompareMemory(str1, str2, cmplen); \ ok(size == len, "Expected %ld, got %ld\n", size, (SIZE_T)len) @@ -3668,6 +3686,7 @@ START_TEST(rtl) { InitFunctionPtrs(); + test_RtlQueryProcessDebugInformation(); test_RtlCompareMemory(); test_RtlCompareMemoryUlong(); test_RtlMoveMemory();

1 0

Alexandre Julliard : include: Force aligning stack pointer also for Mingw builds.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 5a0c9270b1225da86782bffd9eb798a39723d70f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a0c9270b1225da86782bffd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 26 16:01:49 2020 +0100 include: Force aligning stack pointer also for Mingw builds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50189 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt.h | 22 +++++++--------------- include/windef.h | 22 +++++++--------------- 2 files changed, 14 insertions(+), 30 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index 587dcce2a54..eee028c2028 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -61,7 +61,8 @@ #define __has_attribute(x) 0 #endif -#if !defined(_MSC_VER) && !defined(__stdcall) +#ifndef _MSC_VER +# undef __stdcall # ifdef __i386__ # ifdef __GNUC__ # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) @@ -87,27 +88,18 @@ # endif /* __i386__ */ #endif /* __stdcall */ -#if !defined(_MSC_VER) && !defined(__cdecl) +#ifndef _MSC_VER +# undef __cdecl # if defined(__i386__) && defined(__GNUC__) -# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__)) # else # define __cdecl __attribute__((__cdecl__)) # endif -# elif defined(__x86_64__) && defined (__GNUC__) -# if __has_attribute(__force_align_arg_pointer__) -# define __cdecl __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__)) -# else -# define __cdecl __attribute__((ms_abi)) -# endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) -# define __cdecl __attribute__((pcs("aapcs-vfp"))) -# elif defined(__aarch64__) && defined (__GNUC__) -# define __cdecl __attribute__((ms_abi)) # else -# define __cdecl +# define __cdecl __stdcall # endif -#endif /* __cdecl */ +#endif #ifndef __ms_va_list # if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) diff --git a/include/windef.h b/include/windef.h index db5c60641d4..b8e5ed692b1 100644 --- a/include/windef.h +++ b/include/windef.h @@ -54,7 +54,8 @@ extern "C" { # endif #endif -#if !defined(_MSC_VER) && !defined(__stdcall) +#ifndef _MSC_VER +# undef __stdcall # ifdef __i386__ # ifdef __GNUC__ # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) @@ -80,27 +81,18 @@ extern "C" { # endif /* __i386__ */ #endif /* __stdcall */ -#if !defined(_MSC_VER) && !defined(__cdecl) +#ifndef _MSC_VER +# undef __cdecl # if defined(__i386__) && defined(__GNUC__) -# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__)) # else # define __cdecl __attribute__((__cdecl__)) # endif -# elif defined(__x86_64__) && defined (__GNUC__) -# if __has_attribute(__force_align_arg_pointer__) -# define __cdecl __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__)) -# else -# define __cdecl __attribute__((ms_abi)) -# endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) -# define __cdecl __attribute__((pcs("aapcs-vfp"))) -# elif defined(__aarch64__) && defined (__GNUC__) -# define __cdecl __attribute__((ms_abi)) # else -# define __cdecl +# define __cdecl __stdcall # endif -#endif /* __cdecl */ +#endif #if !defined(_MSC_VER) && !defined(__fastcall) # define __fastcall __stdcall

1 0

Rémi Bernon : gdi32/tests: Add locale-dependent face matching test.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: c57a53147f4c86ec37e1abc05ff171114a224771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c57a53147f4c86ec37e1abc0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 23 13:20:49 2020 +0100 gdi32/tests: Add locale-dependent face matching test. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 19 ++++++++++++++----- dlls/gdi32/tests/wine_langnames3.sfd | 4 ++-- dlls/gdi32/tests/wine_langnames3.ttf | Bin 2048 -> 2076 bytes 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 94910ff60fc..2988ab45ea7 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -7269,12 +7269,21 @@ static void test_lang_names(void) /* either because it's the primary language, or because it's a secondary */ ok( efnd.total == min( 2, i + 1 ), "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); - strcpy( font.lfFaceName, "Wine Lang Cond (fr)" ); - memset( &efnd, 0, sizeof(efnd) ); - EnumFontFamiliesExA( dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0 ); + wcscpy( font_w.lfFaceName, L"Wine Police d'\xe9" "criture (fr)" ); + memset( &efnd_w, 0, sizeof(efnd_w) ); + EnumFontFamiliesExW( dc, &font_w, enum_fullname_data_proc_w, (LPARAM)&efnd_w, 0 ); /* as wine_langnames3.sfd does not specify (en) name, (fr) is preferred */ - if (i == 2) ok( efnd.total == 1, "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); - else ok( efnd.total == 0, "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); + if (i == 2) ok( efnd_w.total == 1, "%d: EnumFontFamiliesExW unexpected count %u.\n", i, efnd_w.total ); + else ok( efnd_w.total == 0, "%d: EnumFontFamiliesExW unexpected count %u.\n", i, efnd_w.total ); + + /* case matching should not depend on the current locale */ + if (i == 2) + { + wcscpy( font_w.lfFaceName, L"Wine POLICE D'\xc9" "CRITURE (fr)" ); + memset( &efnd_w, 0, sizeof(efnd_w) ); + EnumFontFamiliesExW( dc, &font_w, enum_fullname_data_proc_w, (LPARAM)&efnd_w, 0 ); + todo_wine ok( efnd_w.total == 1, "%d: EnumFontFamiliesExW unexpected count %u.\n", i, efnd_w.total ); + } strcpy( font.lfFaceName, "Wine Lang Cond (ko)" ); memset( &efnd, 0, sizeof(efnd) ); diff --git a/dlls/gdi32/tests/wine_langnames3.sfd b/dlls/gdi32/tests/wine_langnames3.sfd index ea0dbff57d9..55536fa58c1 100644 --- a/dlls/gdi32/tests/wine_langnames3.sfd +++ b/dlls/gdi32/tests/wine_langnames3.sfd @@ -39,8 +39,8 @@ MarkAttachClasses: 1 DEI: 91125 LangName: 1036 \ "" \ - "Wine Lang Cond (fr)" \ - "Reg (fr)" \ + "Wine Police d'+AOkA-criture (fr)" \ + "R+AOkA-guli+AOgA-re (fr)" \ "" \ "Wine Lang Cond Reg (fr)" LangName: 1042 \ diff --git a/dlls/gdi32/tests/wine_langnames3.ttf b/dlls/gdi32/tests/wine_langnames3.ttf index dd76bd478bb..408d127fb1e 100644 Binary files a/dlls/gdi32/tests/wine_langnames3.ttf and b/dlls/gdi32/tests/wine_langnames3.ttf differ

1 0

Rémi Bernon : gdi32: Compare font face names using RtlDowncaseUnicodeChar.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: c06cacff1127b3903f982389b97e7a7ffa82fb17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c06cacff1127b3903f982389… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 23 13:20:50 2020 +0100 gdi32: Compare font face names using RtlDowncaseUnicodeChar. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 68 +++++++++++++++++++++++++++++++------------------ dlls/gdi32/tests/font.c | 2 +- 2 files changed, 44 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c06cacff1127b3903f98…

1 0

Alexandre Julliard : krnl386: Move the 16-bit stack out of the WOW32Reserved field.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: b636f9816f898ddd368d6366fd822a1a4b17e515 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b636f9816f898ddd368d6366… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 26 13:25:06 2020 +0100 krnl386: Move the 16-bit stack out of the WOW32Reserved field. Based on a patch by Sebastian Lackner. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_i386.c | 6 +++--- dlls/krnl386.exe16/kernel16_private.h | 1 + dlls/krnl386.exe16/thunk.c | 4 ++-- dlls/krnl386.exe16/wowthunk.c | 2 +- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/toolhelp.dll16/toolhelp.c | 4 ++-- include/wine/winbase16.h | 6 +++--- tools/winebuild/relay.c | 2 +- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 864b7f76643..45b3bd95df6 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -213,16 +213,16 @@ static BOOL i386_stack_walk(struct cpu_stack_walk *csw, STACKFRAME64 *frame, /* Init done */ set_curr_mode((frame->AddrPC.Mode == AddrModeFlat) ? stm_32bit : stm_16bit); - /* cur_switch holds address of WOW32Reserved field in TEB in debuggee + /* cur_switch holds address of SystemReserved1[0] field in TEB in debuggee * address space */ if (NtQueryInformationThread(csw->hThread, ThreadBasicInformation, &info, sizeof(info), NULL) == STATUS_SUCCESS) { - curr_switch = (DWORD_PTR)info.TebBaseAddress + FIELD_OFFSET(TEB, WOW32Reserved); + curr_switch = (DWORD_PTR)info.TebBaseAddress + FIELD_OFFSET(TEB, SystemReserved1); if (!sw_read_mem(csw, curr_switch, &p, sizeof(p))) { - WARN("Can't read TEB:WOW32Reserved\n"); + WARN("Can't read TEB:SystemReserved1\n"); goto done_err; } next_switch = p; diff --git a/dlls/krnl386.exe16/kernel16_private.h b/dlls/krnl386.exe16/kernel16_private.h index 8c93b1dc0a2..279058ac68f 100644 --- a/dlls/krnl386.exe16/kernel16_private.h +++ b/dlls/krnl386.exe16/kernel16_private.h @@ -298,6 +298,7 @@ struct tagSYSLEVEL; struct kernel_thread_data { + SEGPTR stack; /* 16-bit stack pointer */ WORD stack_sel; /* 16-bit stack selector */ WORD htask16; /* Win16 task handle */ DWORD sys_count[4]; /* syslevel mutex entry counters */ diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index ad2c52fab46..98dbf31a770 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -1229,7 +1229,7 @@ void WINAPI __regs_K32Thk1632Prolog( CONTEXT *context ) DWORD argSize = context->Ebp - context->Esp; char *stack16 = (char *)context->Esp - 4; STACK16FRAME *frame16 = (STACK16FRAME *)stack16 - 1; - STACK32FRAME *frame32 = NtCurrentTeb()->WOW32Reserved; + STACK32FRAME *frame32 = (STACK32FRAME *)kernel_get_thread_data()->stack; char *stack32 = (char *)frame32 - argSize; WORD stackSel = SELECTOROF(frame32->frame16); DWORD stackBase = GetSelectorBase(stackSel); @@ -1282,7 +1282,7 @@ void WINAPI __regs_K32Thk1632Epilog( CONTEXT *context ) TRACE("before SYSTHUNK hack: EBP: %08x ESP: %08x cur_stack: %04x:%04x\n", context->Ebp, context->Esp, CURRENT_SS, CURRENT_SP); - NtCurrentTeb()->WOW32Reserved = frame16->frame32; + kernel_get_thread_data()->stack = (SEGPTR)frame16->frame32; context->Esp = (DWORD)stack16 + nArgsPopped; context->Ebp = frame16->ebp; diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index 2b4deb34e99..73d1565c573 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -127,7 +127,7 @@ static DWORD call16_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RE { /* unwinding: restore the stack pointer in the TEB, and leave the Win16 mutex */ STACK32FRAME *frame32 = CONTAINING_RECORD(frame, STACK32FRAME, frame); - NtCurrentTeb()->WOW32Reserved = (void *)frame32->frame16; + kernel_get_thread_data()->stack = frame32->frame16; _LeaveWin16Lock(); } else if (record->ExceptionCode == EXCEPTION_ACCESS_VIOLATION || diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 58b79940773..eb4a6653f5e 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -630,7 +630,7 @@ static inline void *init_handler( const ucontext_t *sigcontext ) * SS is still non-system segment. This is why both CS and SS * are checked. */ - return teb->WOW32Reserved; + return teb->SystemReserved1[0]; } return (void *)(ESP_sig(sigcontext) & ~3); } diff --git a/dlls/toolhelp.dll16/toolhelp.c b/dlls/toolhelp.dll16/toolhelp.c index 5d7bf8f016e..57a95fb8d8f 100644 --- a/dlls/toolhelp.dll16/toolhelp.c +++ b/dlls/toolhelp.dll16/toolhelp.c @@ -491,8 +491,8 @@ BOOL16 WINAPI TaskNext16( TASKENTRY *lpte ) lpte->hTaskParent = pTask->hParent; lpte->hInst = pTask->hInstance; lpte->hModule = pTask->hModule; - lpte->wSS = SELECTOROF( pTask->teb->WOW32Reserved ); - lpte->wSP = OFFSETOF( pTask->teb->WOW32Reserved ); + lpte->wSS = SELECTOROF( pTask->teb->SystemReserved1[0] ); + lpte->wSP = OFFSETOF( pTask->teb->SystemReserved1[0] ); lpte->wStackTop = pInstData->stacktop; lpte->wStackMinimum = pInstData->stackmin; lpte->wStackBottom = pInstData->stackbottom; diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index a3ff69b264d..71493395f3a 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -562,9 +562,9 @@ BOOL16 WINAPI WritePrivateProfileSection16(LPCSTR,LPCSTR,LPCSTR); BOOL16 WINAPI WritePrivateProfileStruct16(LPCSTR,LPCSTR,LPVOID,UINT16,LPCSTR); BOOL16 WINAPI WriteProfileSection16(LPCSTR,LPCSTR); -#define CURRENT_STACK16 ((STACK16FRAME *)MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved)) +#define CURRENT_STACK16 ((STACK16FRAME *)MapSL((SEGPTR)NtCurrentTeb()->SystemReserved1[0])) #define CURRENT_DS (CURRENT_STACK16->ds) -#define CURRENT_SP (((WORD *)&NtCurrentTeb()->WOW32Reserved)[0]) -#define CURRENT_SS (((WORD *)&NtCurrentTeb()->WOW32Reserved)[1]) +#define CURRENT_SP (((WORD *)NtCurrentTeb()->SystemReserved1)[0]) +#define CURRENT_SS (((WORD *)NtCurrentTeb()->SystemReserved1)[1]) #endif /* __WINE_WINE_WINBASE16_H */ diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 29d0a74c833..dc0960761a5 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -31,7 +31,7 @@ #include "build.h" /* offset of the stack pointer relative to %fs:(0) */ -#define STACKOFFSET 0xc0 /* FIELD_OFFSET(TEB,WOW32Reserved) */ +#define STACKOFFSET 0x10c /* FIELD_OFFSET(TEB,SystemReserved1) */ /* fix this if the x86_thread_data structure is changed */ #define GS_OFFSET 0x1d8 /* FIELD_OFFSET(TEB,SystemReserved2) + FIELD_OFFSET(struct x86_thread_data,gs) */

1 0