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

Ziqing Hui : windowscodecs: Support uncompressed format in DdsFrameDecode_CopyPixels().
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: e7abfd6f3001b30dd846448c3d36f9a27853540a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7abfd6f3001b30dd846448c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Aug 27 13:37:06 2020 +0800 windowscodecs: Support uncompressed format in DdsFrameDecode_CopyPixels(). 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 | 20 ++++++++++++-------- dlls/windowscodecs/tests/ddsformat.c | 11 ++++++----- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 7e3bd44bd8..46e1074f25 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -687,7 +687,7 @@ static ULONG WINAPI DdsFrameDecode_Release(IWICBitmapFrameDecode *iface) TRACE("(%p) refcount=%u\n", iface, ref); if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This->pixel_data); + if (This->pixel_data != This->block_data) HeapFree(GetProcessHeap(), 0, This->pixel_data); HeapFree(GetProcessHeap(), 0, This->block_data); HeapFree(GetProcessHeap(), 0, This); } @@ -746,7 +746,7 @@ static HRESULT WINAPI DdsFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, DdsFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); UINT bpp, frame_stride, frame_size; INT x, y, width, height; - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p,%s,%u,%u,%p)\n", iface, debug_wic_rect(prc), cbStride, cbBufferSize, pbBuffer); @@ -777,13 +777,17 @@ static HRESULT WINAPI DdsFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, EnterCriticalSection(&This->lock); if (!This->pixel_data) { - This->pixel_data = HeapAlloc(GetProcessHeap(), 0, frame_size); - if (!This->pixel_data) { - hr = E_OUTOFMEMORY; - goto end; + if (is_compressed(This->info.format)) { + This->pixel_data = HeapAlloc(GetProcessHeap(), 0, frame_size); + if (!This->pixel_data) { + hr = E_OUTOFMEMORY; + goto end; + } + decode_block(This->block_data, This->info.width_in_blocks * This->info.height_in_blocks, This->info.format, + This->info.width, This->info.height, (DWORD *)This->pixel_data); + } else { + This->pixel_data = This->block_data; } - decode_block(This->block_data, This->info.width_in_blocks * This->info.height_in_blocks, This->info.format, - This->info.width, This->info.height, (DWORD *)This->pixel_data); } hr = copy_pixels(bpp, This->pixel_data, This->info.width, This->info.height, frame_stride, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 37ed17bd79..139aaee7ed 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1069,11 +1069,6 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra /* CopyPixels tests */ - if (!is_compressed(format_info.DxgiFormat)) { - skip("Skip CopyPixels tests for uncompressed image\n"); - return; - } - bpp = test_data[i].pixel_format_bpp; stride = rect.Width * bpp / 8; frame_stride = frame_width * bpp / 8; @@ -1082,6 +1077,8 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, 0, 0, NULL); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat24bppBGR) || + IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) { hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect_test_a, stride, sizeof(buffer), buffer); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect_test_b, stride, sizeof(buffer), buffer); @@ -1118,6 +1115,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, stride * rect.Height, buffer); ok(hr == S_OK, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + } 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); @@ -1130,6 +1128,8 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra memcpy(pixels, test_data[i].data + block_offset, frame_size); } + todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat24bppBGR) || + IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) { 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); @@ -1155,6 +1155,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra "Test %u, frame %u: Pixels mismatch\n", i, frame_index); }; } + } } static void test_dds_decoder_frame(IWICBitmapDecoder *decoder, int i)

1 0

Ziqing Hui : windowscodecs: Correctly set pixel format of uncompressed DDS images.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: abd7454ecc394e63eee1944cd64685e7c582ae81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abd7454ecc394e63eee1944c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Aug 27 13:37:19 2020 +0800 windowscodecs: Correctly set pixel format of uncompressed DDS images. 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 | 10 ++++++---- dlls/windowscodecs/tests/ddsformat.c | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 46e1074f25..2a9fc5c4bc 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -464,7 +464,6 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h if (header->depth) info->depth = header->depth; if (header->mipMapCount) info->mip_levels = header->mipMapCount; - format_info = get_dds_format(&header->ddspf); if (has_extended_header(header)) { if (header_dxt10->arraySize) info->array_size = header_dxt10->arraySize; info->format = header_dxt10->dxgiFormat; @@ -472,20 +471,23 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h info->alpha_mode = header_dxt10->miscFlags2 & 0x00000008; info->data_offset = sizeof(DWORD) + sizeof(*header) + sizeof(*header_dxt10); if (is_compressed(info->format)) { + info->pixel_format = (info->alpha_mode == WICDdsAlphaModePremultiplied) ? + &GUID_WICPixelFormat32bppPBGRA : &GUID_WICPixelFormat32bppBGRA; info->pixel_format_bpp = 32; } else { + info->pixel_format = &GUID_WICPixelFormatUndefined; info->pixel_format_bpp = 0; - FIXME("Pixel format bpp is incorrect for uncompressed DDS image with extended header\n"); + FIXME("Pixel format is incorrect for uncompressed DDS image with extended header\n"); } } else { + format_info = get_dds_format(&header->ddspf); info->format = format_info->dxgi_format; info->dimension = get_dimension(header, NULL); info->alpha_mode = get_alpha_mode_from_fourcc(header->ddspf.fourCC); info->data_offset = sizeof(DWORD) + sizeof(*header); + info->pixel_format = format_info->wic_format; info->pixel_format_bpp = format_info->wic_format_bpp; } - info->pixel_format = (info->alpha_mode == WICDdsAlphaModePremultiplied) ? - &GUID_WICPixelFormat32bppPBGRA : &GUID_WICPixelFormat32bppBGRA; if (header->ddspf.flags & (DDPF_RGB | DDPF_ALPHA | DDPF_LUMINANCE)) { info->bytes_per_block = header->ddspf.rgbBitCount / 8; diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 139aaee7ed..b1beebf2fb 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -407,7 +407,7 @@ static struct test_data { { 1, 1, 1, 1, 1, DXGI_FORMAT_B8G8R8X8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, { test_dds_32bpp_argb, sizeof(test_dds_32bpp_argb), WINCODEC_ERR_BADHEADER, 1, 4, 32, &GUID_WICPixelFormat32bppBGRA, { 1, 1, 1, 1, 1, DXGI_FORMAT_B8G8R8A8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_64bpp, sizeof(test_dds_64bpp), WINCODEC_ERR_BADHEADER, 1, 8, 64, &GUID_WICPixelFormat64bppBGRA, + { test_dds_64bpp, sizeof(test_dds_64bpp), WINCODEC_ERR_BADHEADER, 1, 8, 64, &GUID_WICPixelFormat64bppRGBA, { 1, 1, 1, 1, 1, DXGI_FORMAT_R16G16B16A16_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, { test_dds_96bpp, sizeof(test_dds_96bpp), WINCODEC_ERR_BADHEADER, 1, 12, 96, &GUID_WICPixelFormat96bppRGBFloat, { 1, 1, 1, 1, 1, DXGI_FORMAT_R32G32B32_FLOAT, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, @@ -941,8 +941,8 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod hr = IWICBitmapFrameDecode_GetPixelFormat(frame_decode, &pixel_format); ok(hr == S_OK, "Test %u, frame %u: GetPixelFormat failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - todo_wine_if(!IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat32bppBGRA) && - !IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat32bppPBGRA)) + todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat24bppBGR) || + IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) ok(IsEqualGUID(&pixel_format, test_data[i].expected_pixel_format), "Test %u, frame %u: Expected pixel format %s, got %s\n", i, frame_index, debugstr_guid(test_data[i].expected_pixel_format), debugstr_guid(&pixel_format));

1 0

Ziqing Hui : windowscodecs: Add more supported formats and fix RGB masks for RGBA1010102.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: e216385fa76aef1192c3164a9f994e2310cdede4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e216385fa76aef1192c3164a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Aug 27 13:37:32 2020 +0800 windowscodecs: Add more supported formats and fix RGB masks for RGBA1010102. 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 | 14 ++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 9 +++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 2a9fc5c4bc..9e6886e7ea 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -214,21 +214,31 @@ static struct dds_format { &GUID_WICPixelFormat128bppRGBAFloat, 128, DXGI_FORMAT_R32G32B32A32_FLOAT }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0xFF,0xFF00,0xFF0000,0xFF000000 }, &GUID_WICPixelFormat32bppRGBA, 32, DXGI_FORMAT_R8G8B8A8_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0xFF,0xFF00,0xFF0000,0 }, + &GUID_WICPixelFormat32bppRGB, 32, DXGI_FORMAT_UNKNOWN }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0xFF0000,0xFF00,0xFF,0xFF000000 }, &GUID_WICPixelFormat32bppBGRA, 32, DXGI_FORMAT_B8G8R8A8_UNORM }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0xFF0000,0xFF00,0xFF,0 }, &GUID_WICPixelFormat32bppBGR, 32, DXGI_FORMAT_B8G8R8X8_UNORM }, /* The red and blue masks are swapped for DXGI_FORMAT_R10G10B10A2_UNORM. - * For "correct" one, the RGB masks should be 0x3FF00000,0xFFC00,0x3FF. + * For "correct" one, the RGB masks should be 0x3FF,0xFFC00,0x3FF00000. * see: https://walbourn.github.io/dds-update-and-1010102-problems */ + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0x3FF00000,0xFFC00,0x3FF,0xC0000000 }, + &GUID_WICPixelFormat32bppR10G10B10A2, 32, DXGI_FORMAT_R10G10B10A2_UNORM }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0x3FF,0xFFC00,0x3FF00000,0xC0000000 }, - &GUID_WICPixelFormat32bppRGBA1010102, 32, DXGI_FORMAT_R10G10B10A2_UNORM }, + &GUID_WICPixelFormat32bppRGBA1010102, 32, DXGI_FORMAT_UNKNOWN }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB , 0, 32, 0xFFFF,0xFFFF0000,0,0 }, &GUID_WICPixelFormatUndefined, 0, DXGI_FORMAT_R16G16_UNORM }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB , 0, 32, 0xFFFFFFFF,0,0,0 }, &GUID_WICPixelFormat32bppGrayFloat, 32, DXGI_FORMAT_R32_FLOAT }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB , 0, 24, 0xFF0000,0x00FF00,0x0000FF,0 }, + &GUID_WICPixelFormat24bppBGR, 24, DXGI_FORMAT_UNKNOWN }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB , 0, 24, 0x0000FF,0x00FF00,0xFF0000,0 }, + &GUID_WICPixelFormat24bppRGB, 24, DXGI_FORMAT_UNKNOWN }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 16, 0xF800,0x7E0,0x1F,0 }, &GUID_WICPixelFormat16bppBGR565, 16, DXGI_FORMAT_B5G6R5_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 16, 0x7C00,0x3E0,0x1F,0 }, + &GUID_WICPixelFormat16bppBGR555, 16, DXGI_FORMAT_UNKNOWN }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 16, 0x7C00,0x3E0,0x1F,0x8000 }, &GUID_WICPixelFormat16bppBGRA5551, 16, DXGI_FORMAT_B5G5R5A1_UNORM }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 16, 0xF00,0xF0,0xF,0xF000 }, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index b1beebf2fb..2e7304b9d4 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -941,8 +941,7 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod hr = IWICBitmapFrameDecode_GetPixelFormat(frame_decode, &pixel_format); ok(hr == S_OK, "Test %u, frame %u: GetPixelFormat failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat24bppBGR) || - IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) + todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) ok(IsEqualGUID(&pixel_format, test_data[i].expected_pixel_format), "Test %u, frame %u: Expected pixel format %s, got %s\n", i, frame_index, debugstr_guid(test_data[i].expected_pixel_format), debugstr_guid(&pixel_format)); @@ -1077,8 +1076,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, 0, 0, NULL); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); - todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat24bppBGR) || - IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) { + todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) { hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect_test_a, stride, sizeof(buffer), buffer); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect_test_b, stride, sizeof(buffer), buffer); @@ -1128,8 +1126,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra memcpy(pixels, test_data[i].data + block_offset, frame_size); } - todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat24bppBGR) || - IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) { + todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) { 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);

1 0

Nikolay Sivov : ole32: Remove unused helper.
by Alexandre Julliard 28 Aug '20

28 Aug '20

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

Nikolay Sivov : combase: Move server class registration.
by Alexandre Julliard 28 Aug '20

28 Aug '20

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

Nikolay Sivov : combase: Move global apartment state cleanup.
by Alexandre Julliard 28 Aug '20

28 Aug '20

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

Nikolay Sivov : combase: Move thread data cleanup.
by Alexandre Julliard 28 Aug '20

28 Aug '20

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

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

28 Aug '20

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

Julian Rüger : po: Update German translation.
by Alexandre Julliard 28 Aug '20

28 Aug '20

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

Jeff Smith : qcap/tests: Refactor interface testing.
by Alexandre Julliard 28 Aug '20

28 Aug '20

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