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

Alistair Leslie-Hughes : include: Add more eAVEncH264VProfile enums.
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: 12f1ebdfeca06d7dbc8e7b99bf3c21a09a565162 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12f1ebdfeca06d7dbc8e7b99… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 28 18:25:27 2020 +1000 include: Add more eAVEncH264VProfile enums. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/codecapi.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/codecapi.h b/include/codecapi.h index 1d9fd7e255..9719389b08 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -30,6 +30,14 @@ enum eAVEncH264VProfile eAVEncH264VProfile_High10 = 110, eAVEncH264VProfile_444 = 244, eAVEncH264VProfile_Extended = 88, + eAVEncH264VProfile_ScalableBase = 83, + eAVEncH264VProfile_ScalableHigh = 86, + eAVEncH264VProfile_MultiviewHigh = 118, + eAVEncH264VProfile_StereoHigh = 128, + eAVEncH264VProfile_ConstrainedBase = 256, + eAVEncH264VProfile_UCConstrainedHigh = 257, + eAVEncH264VProfile_UCScalableConstrainedBase = 258, + eAVEncH264VProfile_UCScalableConstrainedHigh = 259 }; enum eAVEncH264VLevel

1 0

Nikolay Sivov : combase: Move server class registration.
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: fad7818e2865cf8ad2f2380f9094a9ac797180bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=fad7818e2865cf8ad2f2380f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 28 11:05:18 2020 +0300 combase: Move server class registration. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 10 +- dlls/combase/combase.c | 274 ++++++++++++++++++++++++++++++- dlls/combase/combase.spec | 9 +- dlls/combase/combase_private.h | 9 +- dlls/combase/rpc.c | 170 +++++++++++++++++++ dlls/ole32/compobj.c | 361 ----------------------------------------- dlls/ole32/compobj_private.h | 8 - dlls/ole32/ole32.spec | 10 +- dlls/ole32/rpc.c | 179 -------------------- 9 files changed, 457 insertions(+), 573 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fad7818e2865cf8ad2f2…

1 0

Ziqing Hui : windowscodecs/tests: Fix tests for CopyBlocks.
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: 87ddb4ba37422726a1e3a5b08c852ac58d55a255 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87ddb4ba37422726a1e3a5b0… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Aug 27 13:35:01 2020 +0800 windowscodecs/tests: Fix tests for CopyBlocks. Using strncmp() to compare pixel data buffer leads to incorrect tests. Also, we should clear the pixel data buffer before editing and comparing them. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 1a7ef95ada..1ce249c4b4 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -678,6 +678,19 @@ static BOOL color_buffer_match(DWORD *color_buffer_a, DWORD *color_buffer_b, UIN return TRUE; } +static void copy_pixels(void *src_buffer, UINT src_stride, void *dst_buffer, UINT dst_stride, UINT size) +{ + char *src = src_buffer, *dst = dst_buffer; + UINT i; + + for (i = 0; i < size; i++) + { + *dst = src[i]; + if (i % src_stride == src_stride - 1) dst += dst_stride - src_stride; + dst ++; + } +} + static void test_dds_decoder_initialize(void) { int i; @@ -1031,22 +1044,28 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra if (depth > 1) depth /= 2; } + memset(buffer, 0, sizeof(buffer)); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyBlocks failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - ok(!strncmp((const char *)test_data[i].data + block_offset, (const char *)buffer, format_info.BytesPerBlock), + ok(!memcmp(test_data[i].data + block_offset, buffer, format_info.BytesPerBlock), "Test %u, frame %u: Block data mismatch\n", i, frame_index); + memset(buffer, 0, sizeof(buffer)); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, frame_stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyBlocks failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - ok(!strncmp((const char *)test_data[i].data + block_offset, (const char *)buffer, frame_size), + ok(!memcmp(test_data[i].data + block_offset, buffer, frame_size), "Test %u, frame %u: Block data mismatch\n", i, frame_index); + memset(buffer, 0, sizeof(buffer)); + memset(pixels, 0, sizeof(pixels)); + copy_pixels(test_data[i].data + block_offset, frame_stride, pixels, frame_stride * 2, frame_size); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, frame_stride * 2, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyBlocks failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - ok(!strncmp((const char *)test_data[i].data + block_offset, (const char *)buffer, frame_size), + todo_wine_if(width_in_blocks > 1) + ok(!memcmp(pixels, buffer, frame_size), "Test %u, frame %u: Block data mismatch\n", i, frame_index); /* CopyPixels tests */ @@ -1104,6 +1123,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, sizeof(buffer), NULL); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); + memset(buffer, 0, sizeof(pixels)); if (is_compressed(format_info.DxgiFormat)) { decode_block(test_data[i].data + block_offset, width_in_blocks * height_in_blocks, format_info.DxgiFormat, frame_width, frame_height, (DWORD *)pixels); @@ -1111,6 +1131,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra memcpy(pixels, test_data[i].data + block_offset, frame_size); } + memset(buffer, 0, sizeof(buffer)); hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyPixels failed, hr %#x\n", i, frame_index, hr); if (hr == S_OK) { @@ -1118,11 +1139,12 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra ok(color_buffer_match((DWORD *)pixels, (DWORD *)buffer, 1), "Test %u, frame %u: Pixels mismatch\n", i, frame_index); } else { - ok(!strncmp((const char *)pixels, (const char *)buffer, bpp / 8), + ok(!memcmp(pixels, buffer, bpp / 8), "Test %u, frame %u: Pixels mismatch\n", i, frame_index); } } + memset(buffer, 0, sizeof(buffer)); hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, frame_stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyPixels failed, hr %#x\n", i, frame_index, hr); if (hr == S_OK) { @@ -1130,7 +1152,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra ok(color_buffer_match((DWORD *)pixels, (DWORD *)buffer, frame_size / (bpp / 8)), "Test %u, frame %u: Pixels mismatch\n", i, frame_index); } else { - ok(!strncmp((const char *)pixels, (const char *)buffer, frame_size), + ok(!memcmp(pixels, buffer, frame_size), "Test %u, frame %u: Pixels mismatch\n", i, frame_index); }; }

1 0

Nikolay Sivov : combase: Move thread data cleanup.
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: 2452c8c6cdf2206933b95c742f56cfb6190a579e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2452c8c6cdf2206933b95c74… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 28 11:05:20 2020 +0300 combase: Move thread data cleanup. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 33 +++++++++++++++++++++++++++++++++ dlls/ole32/compobj.c | 29 ----------------------------- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index da8e97df93..da91d66cc5 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -403,6 +403,36 @@ HRESULT WINAPI InternalTlsAllocData(struct tlsdata **data) return S_OK; } +static void com_cleanup_tlsdata(void) +{ + struct tlsdata *tlsdata = NtCurrentTeb()->ReservedForOle; + struct init_spy *cursor, *cursor2; + + if (!tlsdata) + return; + + if (tlsdata->apt) + apartment_release(tlsdata->apt); + if (tlsdata->errorinfo) + IErrorInfo_Release(tlsdata->errorinfo); + if (tlsdata->state) + IUnknown_Release(tlsdata->state); + + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &tlsdata->spies, struct init_spy, entry) + { + list_remove(&cursor->entry); + if (cursor->spy) + IInitializeSpy_Release(cursor->spy); + heap_free(cursor); + } + + if (tlsdata->context_token) + IObjContext_Release(tlsdata->context_token); + + heap_free(tlsdata); + NtCurrentTeb()->ReservedForOle = NULL; +} + /*********************************************************************** * FreePropVariantArray (combase.@) */ @@ -2955,6 +2985,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) apartment_global_cleanup(); DeleteCriticalSection(&registered_classes_cs); break; + case DLL_THREAD_DETACH: + com_cleanup_tlsdata(); + break; } return TRUE; diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 748c5c1bdf..39ccc86b35 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -489,31 +489,6 @@ HRESULT WINAPI ManualResetEvent_CreateInstance(IClassFactory *iface, IUnknown *o return hr; } -static void COM_TlsDestroy(void) -{ - struct oletls *info = NtCurrentTeb()->ReservedForOle; - if (info) - { - struct init_spy *cursor, *cursor2; - - if (info->apt) apartment_release(info->apt); - if (info->errorinfo) IErrorInfo_Release(info->errorinfo); - if (info->state) IUnknown_Release(info->state); - - LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &info->spies, struct init_spy, entry) - { - list_remove(&cursor->entry); - if (cursor->spy) IInitializeSpy_Release(cursor->spy); - heap_free(cursor); - } - - if (info->context_token) IObjContext_Release(info->context_token); - - HeapFree(GetProcessHeap(), 0, info); - NtCurrentTeb()->ReservedForOle = NULL; - } -} - /****************************************************************************** * CoBuildVersion [OLE32.@] * @@ -1324,10 +1299,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID reserved) release_std_git(); RPC_UnregisterAllChannelHooks(); break; - - case DLL_THREAD_DETACH: - COM_TlsDestroy(); - break; } return TRUE; }

1 0

Nikolay Sivov : ole32: Remove unused helper.
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: d1b67b228caba0967086e5d61b072f435434b40e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1b67b228caba0967086e5d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 28 11:05:17 2020 +0300 ole32: Remove unused helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 37 ------------------------------------- dlls/ole32/compobj_private.h | 1 - 2 files changed, 38 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index dfd81a8d0f..18580e9b23 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -772,43 +772,6 @@ HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY return S_OK; } -/* open HKCR\\AppId\\{string form of appid clsid} key */ -HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey) -{ - static const WCHAR szAppId[] = { 'A','p','p','I','d',0 }; - static const WCHAR szAppIdKey[] = { 'A','p','p','I','d','\\',0 }; - DWORD res; - WCHAR buf[CHARS_IN_GUID]; - WCHAR keyname[ARRAY_SIZE(szAppIdKey) + CHARS_IN_GUID]; - DWORD size; - HKEY hkey; - DWORD type; - HRESULT hr; - - /* read the AppID value under the class's key */ - hr = COM_OpenKeyForCLSID(clsid, NULL, KEY_READ, &hkey); - if (FAILED(hr)) - return hr; - - size = sizeof(buf); - res = RegQueryValueExW(hkey, szAppId, NULL, &type, (LPBYTE)buf, &size); - RegCloseKey(hkey); - if (res == ERROR_FILE_NOT_FOUND) - return REGDB_E_KEYMISSING; - else if (res != ERROR_SUCCESS || type!=REG_SZ) - return REGDB_E_READREGDB; - - lstrcpyW(keyname, szAppIdKey); - lstrcatW(keyname, buf); - res = open_classes_key(HKEY_CLASSES_ROOT, keyname, access, subkey); - if (res == ERROR_FILE_NOT_FOUND) - return REGDB_E_KEYMISSING; - else if (res != ERROR_SUCCESS) - return REGDB_E_READREGDB; - - return S_OK; -} - /*** * This internal method is used to scan the registered class list to * find a class object. diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 6e14d69e42..7a571352d3 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -189,7 +189,6 @@ extern void release_std_git(void) DECLSPEC_HIDDEN; extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *key) DECLSPEC_HIDDEN; -HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey) DECLSPEC_HIDDEN; HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;

1 0

Ziqing Hui : windowscodecs: Fix DdsFrameDecode_Dds_CopyBlocks().
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: fa398d6ec0b2f9b7d4b6ed272b83bf2ee1c06a5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa398d6ec0b2f9b7d4b6ed27… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Aug 27 13:36:47 2020 +0800 windowscodecs: Fix DdsFrameDecode_Dds_CopyBlocks(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 42 ++++++++++++++---------------------- dlls/windowscodecs/tests/ddsformat.c | 1 - 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 72c884b0ed..7e3bd44bd8 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -891,8 +891,7 @@ static HRESULT WINAPI DdsFrameDecode_Dds_CopyBlocks(IWICDdsFrameDecode *iface, { DdsFrameDecode *This = impl_from_IWICDdsFrameDecode(iface); int x, y, width, height; - UINT bytes_per_block, frame_stride, frame_size, i; - BYTE *data, *dst_buffer; + UINT bytes_per_block, frame_stride, frame_size; TRACE("(%p,%p,%u,%u,%p)\n", iface, boundsInBlocks, stride, bufferSize, buffer); @@ -901,35 +900,26 @@ static HRESULT WINAPI DdsFrameDecode_Dds_CopyBlocks(IWICDdsFrameDecode *iface, bytes_per_block = This->info.bytes_per_block; frame_stride = This->info.width_in_blocks * bytes_per_block; frame_size = frame_stride * This->info.height_in_blocks; + if (!boundsInBlocks) { if (stride < frame_stride) return E_INVALIDARG; if (bufferSize < frame_size) return E_INVALIDARG; - memcpy(buffer, This->block_data, frame_size); - return S_OK; - } - - x = boundsInBlocks->X; - y = boundsInBlocks->Y; - width = boundsInBlocks->Width; - height = boundsInBlocks->Height; - if (x < 0 || y < 0 || width <= 0 || height <= 0 || - x + width > This->info.width_in_blocks || - y + height > This->info.height_in_blocks) { - return E_INVALIDARG; - } - if (stride < width * bytes_per_block) return E_INVALIDARG; - if (bufferSize < stride * height) return E_INVALIDARG; - - data = This->block_data + (x + y * This->info.width_in_blocks) * bytes_per_block; - dst_buffer = buffer; - for (i = 0; i < height; i++) - { - memcpy(dst_buffer, data, (size_t)width * bytes_per_block); - data += This->info.width_in_blocks * bytes_per_block; - dst_buffer += stride; + } else { + x = boundsInBlocks->X; + y = boundsInBlocks->Y; + width = boundsInBlocks->Width; + height = boundsInBlocks->Height; + if (x < 0 || y < 0 || width <= 0 || height <= 0 || + x + width > This->info.width_in_blocks || + y + height > This->info.height_in_blocks) { + return E_INVALIDARG; + } + if (stride < width * bytes_per_block) return E_INVALIDARG; + if (bufferSize < stride * height) return E_INVALIDARG; } - return S_OK; + return copy_pixels(This->info.bytes_per_block * 8, This->block_data, This->info.width_in_blocks, + This->info.height_in_blocks, frame_stride, boundsInBlocks, stride, bufferSize, buffer); } static const IWICDdsFrameDecodeVtbl DdsFrameDecode_Dds_Vtbl = { diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 1ce249c4b4..37ed17bd79 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1064,7 +1064,6 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, frame_stride * 2, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyBlocks failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - todo_wine_if(width_in_blocks > 1) ok(!memcmp(pixels, buffer, frame_size), "Test %u, frame %u: Block data mismatch\n", i, frame_index);

1 0

Martin Storsjo : winedump: Fix the dumping of arm64 packed float restoration.
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: 7ca68a86313e39d21cc92eac84a00841318143ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ca68a86313e39d21cc92eac… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 28 12:45:36 2020 +0300 winedump: Fix the dumping of arm64 packed float restoration. This previously dumped one register pair too few. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index f03c523be0..fef95c6bb6 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1412,7 +1412,7 @@ static void dump_arm64_packed_info( const struct runtime_function_arm64 *func ) { if (func->u.s.RegF % 2 == 0) printf( " %04x: str d%u,[sp,#%#x]\n", pos++, 8 + func->u.s.RegF, intsz + fpsz - 8 ); - for (i = func->u.s.RegF / 2 - 1; i >= 0; i--) + for (i = (func->u.s.RegF - 1)/ 2; i >= 0; i--) { if (!i && !intsz) printf( " %04x: stp d8,d9,[sp,-#%#x]!\n", pos++, savesz );

1 0

Jeff Smith : qcap/tests: Refactor interface testing.
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: 84f89605feb04c04d0ad31beb043915c269d1806 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84f89605feb04c04d0ad31be… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Fri Aug 28 10:51:59 2020 -0500 qcap/tests: Refactor interface testing. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/videocapture.c | 50 +++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 80d4899410..326601a398 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -174,7 +174,30 @@ static void test_stream_config(IPin *pin) IAMStreamConfig_Release(stream_config); } -static void test_capture(IBaseFilter *filter) +static void test_pin_interfaces(IPin *pin) +{ + todo_wine check_interface(pin, &IID_IAMBufferNegotiation, TRUE); + check_interface(pin, &IID_IAMStreamConfig, TRUE); + todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); + todo_wine check_interface(pin, &IID_IKsPin, TRUE); + check_interface(pin, &IID_IKsPropertySet, TRUE); + todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + todo_wine check_interface(pin, &IID_ISpecifyPropertyPages, TRUE); + + check_interface(pin, &IID_IAMCrossbar, FALSE); + check_interface(pin, &IID_IAMDroppedFrames, FALSE); + check_interface(pin, &IID_IAMFilterMiscFlags, FALSE); + check_interface(pin, &IID_IAMPushSource, FALSE); + check_interface(pin, &IID_IAMTVTuner, FALSE); + check_interface(pin, &IID_IAMVideoCompression, FALSE); + check_interface(pin, &IID_IAMVideoProcAmp, FALSE); + check_interface(pin, &IID_IPersistPropertyBag, FALSE); + check_interface(pin, &IID_IStreamBuilder, FALSE); +} + +static void test_pins(IBaseFilter *filter) { IEnumPins *enum_pins; IPin *pin; @@ -189,32 +212,18 @@ static void test_capture(IBaseFilter *filter) IPin_QueryDirection(pin, &pin_direction); if (pin_direction == PINDIR_OUTPUT) { + test_pin_interfaces(pin); test_media_types(pin); test_stream_config(pin); - - todo_wine check_interface(pin, &IID_IAMBufferNegotiation, TRUE); - check_interface(pin, &IID_IAMStreamConfig, TRUE); - todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); - check_interface(pin, &IID_IKsPropertySet, TRUE); - todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); - check_interface(pin, &IID_IPin, TRUE); - todo_wine check_interface(pin, &IID_IQualityControl, TRUE); - todo_wine check_interface(pin, &IID_ISpecifyPropertyPages, TRUE); - - check_interface(pin, &IID_IAMCrossbar, FALSE); - check_interface(pin, &IID_IAMDroppedFrames, FALSE); - check_interface(pin, &IID_IAMFilterMiscFlags, FALSE); - check_interface(pin, &IID_IAMPushSource, FALSE); - check_interface(pin, &IID_IAMTVTuner, FALSE); - check_interface(pin, &IID_IAMVideoCompression, FALSE); - check_interface(pin, &IID_IAMVideoProcAmp, FALSE); - check_interface(pin, &IID_IPersistPropertyBag, FALSE); } IPin_Release(pin); } IEnumPins_Release(enum_pins); +} +static void test_filter_interfaces(IBaseFilter *filter) +{ check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); check_interface(filter, &IID_IAMVideoControl, TRUE); check_interface(filter, &IID_IAMVideoProcAmp, TRUE); @@ -287,7 +296,8 @@ START_TEST(videocapture) hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IBaseFilter, (void**)&filter); if (hr == S_OK) { - test_capture(filter); + test_filter_interfaces(filter); + test_pins(filter); test_misc_flags(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: f348b87bf83189bac9ea967695d06fc34c0bc02e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f348b87bf83189bac9ea9676… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Aug 28 14:28:49 2020 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po/de.po index 7dd56b5b30..c4ba82b064 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-08-14 13:26+0200\n" +"PO-Revision-Date: 2020-08-28 14:28+0200\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -6809,10 +6809,8 @@ msgid "Connection reset by peer.\n" msgstr "Verbindung von Gegenstelle zurückgesetzt.\n" #: winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Nicht implementiert" +msgstr "Nicht implementiert.\n" #: winerror.mc:3760 msgid "No Signature found in file.\n"

1 0

Nikolay Sivov : combase: Move global apartment state cleanup.
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: 904f5fd0f612748799b7d74c2b490cfcefb2ba6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=904f5fd0f612748799b7d74c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 28 11:05:19 2020 +0300 combase: Move global apartment state cleanup. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 2 +- dlls/combase/combase.c | 1 + dlls/combase/combase.spec | 1 - dlls/combase/combase_private.h | 1 + dlls/ole32/compobj.c | 1 - dlls/ole32/compobj_private.h | 1 - 6 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 356935ae26..12637c8acd 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -1271,7 +1271,7 @@ HWND WINAPI apartment_getwindow(const struct apartment *apt) return apt->win; } -void WINAPI apartment_global_cleanup(void) +void apartment_global_cleanup(void) { if (apt_win_class) UnregisterClassW((const WCHAR *)MAKEINTATOM(apt_win_class), hProxyDll); diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 6d058ea6fa..da8e97df93 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2952,6 +2952,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) break; case DLL_PROCESS_DETACH: if (reserved) break; + apartment_global_cleanup(); DeleteCriticalSection(&registered_classes_cs); break; } diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 401979119b..a888e6deee 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -357,6 +357,5 @@ @ stdcall leave_apartment(ptr) @ stdcall apartment_findfromoxid(int64) @ stdcall apartment_getwindow(ptr) -@ stdcall apartment_global_cleanup() @ stdcall apartment_createwindowifneeded(ptr) @ stdcall apartment_findfromtid(long) diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 61b7665749..e62204d289 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -105,6 +105,7 @@ static inline struct apartment* com_get_current_apt(void) HWND WINAPI apartment_getwindow(const struct apartment *apt) DECLSPEC_HIDDEN; HRESULT WINAPI apartment_createwindowifneeded(struct apartment *apt) DECLSPEC_HIDDEN; void apartment_freeunusedlibraries(struct apartment *apt, DWORD unload_delay) DECLSPEC_HIDDEN; +void apartment_global_cleanup(void) DECLSPEC_HIDDEN; /* RpcSs interface */ HRESULT rpcss_get_next_seqid(DWORD *id) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index ef9888d9e3..748c5c1bdf 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1323,7 +1323,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID reserved) if (reserved) break; release_std_git(); RPC_UnregisterAllChannelHooks(); - apartment_global_cleanup(); break; case DLL_THREAD_DETACH: diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index e68d7b3b3d..953574423a 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -248,7 +248,6 @@ extern HRESULT WINAPI enter_apartment(struct oletls *info, DWORD model) DECLSPEC void WINAPI leave_apartment(struct oletls *info) DECLSPEC_HIDDEN; extern struct apartment * WINAPI apartment_get_current_or_mta(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI apartment_get_local_server_stream(struct apartment *apt, IStream **ret) DECLSPEC_HIDDEN; -extern void WINAPI apartment_global_cleanup(void) DECLSPEC_HIDDEN; /* DCOM messages used by the apartment window (not compatible with native) */ #define DM_EXECUTERPC (WM_USER + 0) /* WPARAM = 0, LPARAM = (struct dispatch_params *) */

1 0