May 2020 - Wine-Devel - list.winehq.org

[PATCH] ntdll: Fix number of arguments passed to mmap_remove_reserved_area in apple_create_wine_thread.
by Gijs Vermeulen May 22, 2020

May 22, 2020

This fixes a regression introduced by 625209433fa82e233a828329e9e109602f9c0ef0 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index d4480e86f0..a19f0c0149 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1067,7 +1067,7 @@ static void apple_create_wine_thread( void *arg ) if (!pthread_attr_getstacksize( &attr, &info.desired_size ) && mmap_enum_reserved_areas( apple_alloc_thread_stack, &info, 1 )) { - mmap_remove_reserved_area( info.stack, info.desired_size, 0 ); + mmap_remove_reserved_area( info.stack, info.desired_size ); pthread_attr_setstackaddr( &attr, (char*)info.stack + info.desired_size ); } #endif -- 2.26.2

1 0

[PATCH] include: Add IMFTopologyNodeAttributeEditor definition.
by Nikolay Sivov May 22, 2020

May 22, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mfidl.idl | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 4e7a43f5fff..89b1bdd05b8 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -230,6 +230,29 @@ interface IMFTopology : IMFAttributes HRESULT GetOutputNodeCollection([out] IMFCollection **collection); } +typedef struct _MFTOPONODE_ATTRIBUTE_UPDATE +{ + TOPOID NodeId; + GUID guidAttributeKey; + MF_ATTRIBUTE_TYPE attrType; + [switch_type(DWORD), switch_is(attrType)] union + { + [case(MF_ATTRIBUTE_UINT32)] UINT32 u32; + [case(MF_ATTRIBUTE_UINT64)] UINT64 u64; + [case(MF_ATTRIBUTE_DOUBLE)] double d; + }; +} MFTOPONODE_ATTRIBUTE_UPDATE; + +[ + object, + uuid(676aa6dd-238a-410d-bb99-65668d01605a), +] +interface IMFTopologyNodeAttributeEditor : IUnknown +{ + HRESULT UpdateNodeAttributes([in] TOPOID id, [in] DWORD count, + [in, size_is(count)] MFTOPONODE_ATTRIBUTE_UPDATE *attr_updates); +} + [ object, uuid(de9a6157-f660-4643-b56a-df9f7998c7cd), @@ -1104,6 +1127,7 @@ cpp_quote("EXTERN_GUID(MF_TOPOLOGY_STATIC_PLAYBACK_OPTIMIZATIONS, 0xb86cac42, 0x cpp_quote("EXTERN_GUID(MF_RATE_CONTROL_SERVICE, 0x866fa297, 0xb802, 0x4bf8, 0x9d, 0xc9, 0x5e, 0x3b, 0x6a, 0x9f, 0x53, 0xc9);") cpp_quote("EXTERN_GUID(MF_LOCAL_MFT_REGISTRATION_SERVICE, 0xddf5cf9c, 0x4506, 0x45aa, 0xab, 0xf0, 0x6d, 0x5d, 0x94, 0xdd, 0x1b, 0x4a);") cpp_quote("EXTERN_C const GUID MF_SCRUBBING_SERVICE;") +cpp_quote("EXTERN_GUID(MF_TOPONODE_ATTRIBUTE_EDITOR_SERVICE, 0x65656e1a, 0x077f, 0x4472, 0x83, 0xef, 0x31, 0x6f, 0x11, 0xd5, 0x08, 0x7a);") cpp_quote("EXTERN_GUID(MR_POLICY_VOLUME_SERVICE, 0x1abaa2ac, 0x9d3b, 0x47c6, 0xab, 0x48, 0xc5, 0x95, 0x06, 0xde, 0x78, 0x4d);") cpp_quote("EXTERN_GUID(MR_CAPTURE_POLICY_VOLUME_SERVICE, 0x24030acd, 0x107a, 0x4265, 0x97, 0x5c, 0x41, 0x4e, 0x33, 0xe6, 0x5f, 0x2a);") cpp_quote("EXTERN_GUID(MR_STREAM_VOLUME_SERVICE, 0xf8b5fa2f, 0x32ef, 0x46f5, 0xb1, 0x72, 0x13, 0x21, 0x21, 0x2f, 0xb2, 0xc4);") -- 2.26.2

1 0

[PATCH] MAINTAINERS: Changing my name.
by Esme Povirk May 22, 2020

May 22, 2020

Also my X11 Driver knowledge is quite stale, so I'm removing myself there. Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> --- MAINTAINERS | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index cfbeaeb12b6..6cc16996650 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -53,7 +53,7 @@ P: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/comctl32/ Common Item Dialog -P: Vincent Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <vincent(a)codeweavers.com> F: dlls/comdlg32/itemdlg.c F: dlls/comdlg32/tests/itemdlg.c @@ -122,7 +122,7 @@ M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/dwrite/ DotNet Runtime -M: Vincent Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <vincent(a)codeweavers.com> F: dlls/mscoree/ GDI @@ -130,7 +130,7 @@ M: Huw Davies <huw(a)codeweavers.com> F: dlls/gdi32/ GDIPlus -M: Vincent Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <vincent(a)codeweavers.com> F: dlls/gdiplus/ GPhoto Driver @@ -202,7 +202,7 @@ F: dlls/ole32/stubmanager.c F: dlls/ole32/usrmarshal.c OLE Storage -M: Vincent Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <vincent(a)codeweavers.com> F: dlls/ole32/filelockbytes.c F: dlls/ole32/memlockbytes.c F: dlls/ole32/stg_stream.c @@ -243,7 +243,7 @@ F: dlls/rpcrt4 F: tools/widl TWAIN -P: Vincent Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <vincent(a)codeweavers.com> F: dlls/twain_32/ F: dlls/sane.ds/ F: dlls/gphoto2.ds/ @@ -271,7 +271,7 @@ F: dlls/mshtml/ F: dlls/shdocvw/ Windows Imaging Component -M: Vincent Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <vincent(a)codeweavers.com> F: dlls/windowscodecs/ F: dlls/windowscodecsext/ @@ -315,7 +315,6 @@ F: dlls/wpcap/ X11 Driver M: Alexandre Julliard <julliard(a)winehq.org> -P: Vincent Povirk <vincent(a)codeweavers.com> F: dlls/winex11.drv/ XML parsing @@ -329,7 +328,7 @@ P: Alex Henrie <alexhenrie24(a)gmail.com> P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> P: Jacek Caban <jacek(a)codeweavers.com> -P: Vincent Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <vincent(a)codeweavers.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: * F: */ -- 2.17.1

1 0

[PATCH 1/3] mspatcha: Implement NormalizeFileForPatchSignature.
by Jeff Smith May 22, 2020

May 22, 2020

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/mspatcha/Makefile.in | 3 +- dlls/mspatcha/mspatcha_main.c | 8 +- dlls/mspatcha/signature.c | 291 +++++++++++++++++++++++++++++ dlls/mspatcha/signature.h | 29 +++ dlls/mspatcha/tests/Makefile.in | 3 +- dlls/mspatcha/tests/signature.c | 319 ++++++++++++++++++++++++++++++++ 6 files changed, 648 insertions(+), 5 deletions(-) create mode 100644 dlls/mspatcha/signature.c create mode 100644 dlls/mspatcha/signature.h create mode 100644 dlls/mspatcha/tests/signature.c diff --git a/dlls/mspatcha/Makefile.in b/dlls/mspatcha/Makefile.in index a380f3f1a4..c0e3fc6adb 100644 --- a/dlls/mspatcha/Makefile.in +++ b/dlls/mspatcha/Makefile.in @@ -6,6 +6,7 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ lzxd_dec.c \ mspatcha_main.c \ - pa19.c + pa19.c \ + signature.c RC_SRCS = version.rc diff --git a/dlls/mspatcha/mspatcha_main.c b/dlls/mspatcha/mspatcha_main.c index 167c3fda9b..34dc46b216 100644 --- a/dlls/mspatcha/mspatcha_main.c +++ b/dlls/mspatcha/mspatcha_main.c @@ -38,6 +38,7 @@ #include "wine/debug.h" #include "pa19.h" +#include "signature.h" WINE_DEFAULT_DEBUG_CHANNEL(mspatcha); @@ -283,8 +284,9 @@ INT WINAPI NormalizeFileForPatchSignature(PVOID file_buffer, ULONG file_size, UL ULONG new_coff_base, ULONG new_coff_time, ULONG ignore_range_count, PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count, PPATCH_RETAIN_RANGE retain_range) { - FIXME("stub - %p, %u, %x, %p, %u, %u, %u, %p, %u, %p\n", file_buffer, file_size, flags, options, new_coff_base, + TRACE("%p, %u, %x, %p, %u, %u, %u, %p, %u, %p\n", file_buffer, file_size, flags, options, new_coff_base, new_coff_time, ignore_range_count, ignore_range, retain_range_count, retain_range); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + + return normalize_for_patch_signature(file_buffer, file_size, flags, new_coff_base, new_coff_time, + ignore_range_count, ignore_range, retain_range_count, retain_range); } diff --git a/dlls/mspatcha/signature.c b/dlls/mspatcha/signature.c new file mode 100644 index 0000000000..6f6c085de7 --- /dev/null +++ b/dlls/mspatcha/signature.c @@ -0,0 +1,291 @@ +/* + * PatchAPI patch signature calculation + * + * Copyright 2020 Jeff Smith + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "wine/heap.h" + +#include "patchapi.h" + +#include "signature.h" + +/* + * Check for PE32 signatures and return file offset if found. + */ +DWORD get_pe_offset(LPCVOID file_buffer, ULONG file_size) +{ + PIMAGE_NT_HEADERS32 image; + PIMAGE_DOS_HEADER dos_header = (PIMAGE_DOS_HEADER)file_buffer; + + if (file_size < 512 || dos_header->e_magic != IMAGE_DOS_SIGNATURE) + return 0; + image = (PIMAGE_NT_HEADERS32)((PBYTE)file_buffer + dos_header->e_lfanew); + if (image->Signature != IMAGE_NT_SIGNATURE || + image->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) + return 0; + + return dos_header->e_lfanew; +} + +struct image_ctx +{ + PVOID data; + DWORD data_size; + PIMAGE_NT_HEADERS32 image; + PIMAGE_SECTION_HEADER first_header; + DWORD section_count; + PIMAGE_DATA_DIRECTORY data_dir; +}; + +static void init_image_ctx(struct image_ctx *ctx, PVOID data, DWORD data_size, DWORD pe_offset) +{ + ctx->data = data; + ctx->data_size = data_size; + ctx->image = (PIMAGE_NT_HEADERS32)((PBYTE)data + pe_offset); + ctx->first_header = (PIMAGE_SECTION_HEADER) + ((PBYTE)&ctx->image->OptionalHeader + ctx->image->FileHeader.SizeOfOptionalHeader); + ctx->section_count = ctx->image->FileHeader.NumberOfSections; + ctx->data_dir = ctx->image->OptionalHeader.DataDirectory; +} + +static PIMAGE_SECTION_HEADER match_section(struct image_ctx *ctx, DWORD address, PDWORD section_offset) +{ + PIMAGE_SECTION_HEADER header; + + for (header = ctx->first_header; header < ctx->first_header + ctx->section_count; header++) + { + if (address >= header->VirtualAddress) + { + DWORD offset = address - header->VirtualAddress; + if (offset < header->SizeOfRawData) + { + *section_offset = offset; + return header; + } + } + } + + return NULL; +} + +static PVOID rva_to_pointer(struct image_ctx *ctx, DWORD address) +{ + PIMAGE_SECTION_HEADER header; + DWORD section_offset; + + header = match_section(ctx, address, &section_offset); + if (!header) + return NULL; + + return (PBYTE)ctx->data + header->PointerToRawData + section_offset; +} + +struct reloc_entry { + BYTE type; + DWORD rva; +}; + +static void decode_reloc_table(PBYTE reloc_data, size_t reloc_data_size, + struct reloc_entry **reloc_table, DWORD *reloc_count) +{ + PIMAGE_BASE_RELOCATION base_block; + DWORD block_entries; + PWORD type_offset; + DWORD i; + + DWORD total_entries = 0; + DWORD offset = 0; + + /* Calculate number of entries */ + while (offset < reloc_data_size) + { + base_block = (PIMAGE_BASE_RELOCATION)(reloc_data + offset); + if (base_block->SizeOfBlock < 8) + break; + total_entries += (base_block->SizeOfBlock - sizeof(*base_block)) / sizeof(WORD); + offset += base_block->SizeOfBlock; + } + + if (offset != reloc_data_size) + return; + + /* Allocate space for entries */ + *reloc_table = heap_calloc(total_entries, sizeof(**reloc_table)); + + total_entries = 0; + offset = 0; + + /* Decode entries */ + while (offset < reloc_data_size) + { + base_block = (PIMAGE_BASE_RELOCATION)(reloc_data + offset); + block_entries = (base_block->SizeOfBlock - sizeof(*base_block)) / sizeof(WORD); + type_offset = (PWORD)(base_block + 1); + + for (i = 0; i < block_entries; i++) + { + if (type_offset[i]) + { + (*reloc_table)[total_entries].type = (type_offset[i] >> 12) & 0xf; + (*reloc_table)[total_entries].rva = (type_offset[i] & 0xfff) + + base_block->VirtualAddress; + total_entries++; + } + } + + offset += base_block->SizeOfBlock; + } + + *reloc_count = total_entries; +} + +static void rebase_pe(struct image_ctx *ctx, DWORD base_adjust, PIMAGE_DATA_DIRECTORY base_reloc_dir) +{ + PVOID reloc_data; + struct reloc_entry *reloc_table = NULL; + DWORD reloc_count = 0; + DWORD i; + + reloc_data = rva_to_pointer(ctx, base_reloc_dir->VirtualAddress); + if (!reloc_data) + return; + + decode_reloc_table(reloc_data, base_reloc_dir->Size, &reloc_table, &reloc_count); + if (!reloc_table) + return; + + for (i = 0; i < reloc_count; i++) + { + PVOID reloc_pointer = rva_to_pointer(ctx, reloc_table[i].rva); + if (reloc_table[i].type == IMAGE_REL_BASED_HIGHLOW && reloc_pointer) + *(PDWORD)reloc_pointer += base_adjust; + } + + heap_free(reloc_table); +} + +/* + * Normalize PE32 executable images. + * + * TODO: + * - Support PATCH_OPTION_NO_BINDFIX and PATCH_OPTION_NO_LOCKFIX flags. + */ +BOOL normalize_pe(PVOID file_buffer, ULONG file_size, DWORD pe_offset, + ULONG flags, ULONG new_coff_base, ULONG new_coff_time) +{ + struct image_ctx ctx; + BOOL changed = FALSE; + + init_image_ctx(&ctx, file_buffer, file_size, pe_offset); + + /* Update PE timestamp as needed */ + if (!(flags & PATCH_OPTION_NO_REBASE) && new_coff_time != 0 && + new_coff_time != ctx.image->FileHeader.TimeDateStamp) + { + ctx.image->FileHeader.TimeDateStamp = new_coff_time; + changed = TRUE; + } + + /* Rebase PE image as needed */ + if (!(flags & PATCH_OPTION_NO_REBASE) && new_coff_base != 0) + { + PIMAGE_DATA_DIRECTORY base_reloc_dir = ctx.data_dir + IMAGE_DIRECTORY_ENTRY_BASERELOC; + DWORD base_adjust = new_coff_base - ctx.image->OptionalHeader.ImageBase; + PIMAGE_SECTION_HEADER header; + DWORD section_offset = 0; + + header = match_section(&ctx, base_reloc_dir->VirtualAddress, &section_offset); + section_offset += base_reloc_dir->Size; + if (base_adjust && header && section_offset <= header->SizeOfRawData && + (header->PointerToRawData + section_offset <= file_size)) + { + ctx.image->OptionalHeader.ImageBase = new_coff_base; + rebase_pe(&ctx, base_adjust, base_reloc_dir); + changed = TRUE; + } + } + + /* Update PE checksum as needed */ + if (flags & PATCH_OPTION_NO_CHECKSUM) + { + if (ctx.image->OptionalHeader.CheckSum != 0) + { + ctx.image->OptionalHeader.CheckSum = 0; + changed = TRUE; + } + } + else if (changed) + { + PWORD wptr = (PWORD)file_buffer; + DWORD sum = 0; + DWORD i; + + for (i = 0; i < file_size; i += 2, wptr++) + { + /* Skip both words of the old checksum */ + if (wptr == (PWORD)&ctx.image->OptionalHeader.CheckSum) + { + i += 2; + wptr++; + continue; + } + + sum += *wptr; + if (HIWORD(sum) != 0) + sum = LOWORD(sum) + HIWORD(sum); + } + ctx.image->OptionalHeader.CheckSum = sum + file_size; + } + + return changed; +} + +INT normalize_for_patch_signature(PVOID file_buffer, ULONG file_size, + ULONG flags, ULONG new_coff_base, ULONG new_coff_time, + ULONG ignore_range_count, PPATCH_IGNORE_RANGE ignore_range, + ULONG retain_range_count, PPATCH_RETAIN_RANGE retain_range) +{ + BOOL changed = FALSE; + DWORD pe_offset; + DWORD i; + + pe_offset = get_pe_offset(file_buffer, file_size); + if (pe_offset) + changed = normalize_pe(file_buffer, file_size, pe_offset, flags, new_coff_base, new_coff_time); + + for (i = 0; i < ignore_range_count; i++) + { + if (ignore_range[i].OffsetInOldFile + ignore_range[i].LengthInBytes > file_size) + continue; + memset((PBYTE)file_buffer + ignore_range[i].OffsetInOldFile, 0, ignore_range[i].LengthInBytes); + changed = TRUE; + } + + for (i = 0; i < retain_range_count; i++) + { + if (retain_range[i].OffsetInOldFile + retain_range[i].LengthInBytes > file_size) + continue; + memset((PBYTE)file_buffer + retain_range[i].OffsetInOldFile, 0, retain_range[i].LengthInBytes); + changed = TRUE; + } + + return (changed) ? 2 : 1; +} diff --git a/dlls/mspatcha/signature.h b/dlls/mspatcha/signature.h new file mode 100644 index 0000000000..b55ab84b7c --- /dev/null +++ b/dlls/mspatcha/signature.h @@ -0,0 +1,29 @@ +/* + * PatchAPI patch signature calculation + * + * Copyright 2020 Jeff Smith + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +DWORD get_pe_offset(LPCVOID file_buffer, ULONG file_size); + +BOOL normalize_pe(PVOID file_buffer, ULONG file_size, DWORD pe_offset, + ULONG flags, ULONG new_coff_base, ULONG new_coff_time); + +INT normalize_for_patch_signature(PVOID file_buffer, ULONG file_size, + ULONG flags, ULONG new_coff_base, ULONG new_coff_time, + ULONG ignore_range_count, PPATCH_IGNORE_RANGE ignore_range, + ULONG retain_range_count, PPATCH_RETAIN_RANGE retain_range); diff --git a/dlls/mspatcha/tests/Makefile.in b/dlls/mspatcha/tests/Makefile.in index ef1d19271c..c855492c1a 100644 --- a/dlls/mspatcha/tests/Makefile.in +++ b/dlls/mspatcha/tests/Makefile.in @@ -2,7 +2,8 @@ TESTDLL = mspatcha.dll IMPORTS = mspatcha C_SRCS = \ - apply_patch.c + apply_patch.c \ + signature.c RC_SRCS = \ mspatcha.rc diff --git a/dlls/mspatcha/tests/signature.c b/dlls/mspatcha/tests/signature.c new file mode 100644 index 0000000000..bd2f9dc8be --- /dev/null +++ b/dlls/mspatcha/tests/signature.c @@ -0,0 +1,319 @@ +/* + * Unit tests for Patch API functions + * + * Copyright 2020 Jeff Smith + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" + +#include "patchapi.h" + +static BOOL (WINAPI *pNormalizeFileForPatchSignature)(PVOID, ULONG, ULONG, PATCH_OPTION_DATA*, ULONG, + ULONG, ULONG, PPATCH_IGNORE_RANGE, ULONG, PPATCH_RETAIN_RANGE); + +static BYTE array[1024]; + +static BOOL init_function_pointers(void) +{ + HMODULE mspatcha = LoadLibraryA("mspatcha.dll"); + if (!mspatcha) + { + win_skip("mspatcha.dll not found\n"); + return FALSE; + } + pNormalizeFileForPatchSignature = (void *)GetProcAddress(mspatcha, "NormalizeFileForPatchSignature"); + + return TRUE; +} + +static void test_normalize_ignore_range(void) +{ + PATCH_IGNORE_RANGE ir_bad_good[] = { + /* Range partially outside the region to normalize */ + {7, 2}, + /* Range within the region to normalize */ + {3, 2} + }; + + BOOL result; + + if (!pNormalizeFileForPatchSignature) + return; + + /* Skip partially out-of-bounds ignore */ + memcpy(array, "abcdefgh", 8); + result = pNormalizeFileForPatchSignature(array, 8, 0, NULL, 0, 0, 1, ir_bad_good, 0, NULL); + ok(result == 1, "Expected %d, got %d\n", 1, result); + ok(!memcmp(array, "abcdefgh", 8), "Buffer should not have been modified\n"); + + /* Skip partially out-of-bounds ignore, apply in-bounds ignore */ + memcpy(array, "abcdefgh", 8); + result = pNormalizeFileForPatchSignature(array, 8, 0, NULL, 0, 0, 2, ir_bad_good, 0, NULL); + ok(result == 2, "Expected %d, got %d\n", 2, result); + ok(!memcmp(array, "abc\0\0fgh", 8), "Buffer not modified correctly\n"); + + /* Blanking a region already consisting of 0's is considered a change */ + memset(array, 0, 8); + result = pNormalizeFileForPatchSignature(array, 8, 0, NULL, 0, 0, 2, ir_bad_good, 0, NULL); + ok(result == 2, "Expected %d, got %d\n", 2, result); + ok(!memcmp(array, "\0\0\0\0\0\0\0\0", 8), "Buffer should not have been modified\n"); +} + +static void test_normalize_retain_range(void) +{ + PATCH_RETAIN_RANGE rr_bad_good[] = { + /* Range partially outside the region to normalize */ + {7, 2, 3}, + /* Range within the region to normalize */ + {1, 2, 5} + }; + + BOOL result; + + if (!pNormalizeFileForPatchSignature) + return; + + /* Skip partially out-of-bounds retain */ + memcpy(array, "abcdefgh", 8); + result = pNormalizeFileForPatchSignature(array, 8, 0, NULL, 0, 0, 0, NULL, 1, rr_bad_good); + ok(result == 1, "Expected %d, got %d\n", 1, result); + ok(!memcmp(array, "abcdefgh", 8), "Buffer should not have been modified\n"); + + /* Skip partially out-of-bounds retain, apply in-bounds retain */ + memcpy(array, "abcdefgh", 8); + result = pNormalizeFileForPatchSignature(array, 8, 0, NULL, 0, 0, 0, NULL, 2, rr_bad_good); + ok(result == 2, "Expected %d, got %d\n", 2, result); + ok(!memcmp(array, "a\0\0defgh", 8), "Buffer not modified correctly\n"); + + /* Blanking a region already consisting of 0's is considered a change */ + memset(array, 0, 8); + result = pNormalizeFileForPatchSignature(array, 8, 0, NULL, 0, 0, 0, NULL, 2, rr_bad_good); + ok(result == 2, "Expected %d, got %d\n", 2, result); + ok(!memcmp(array, "\0\0\0\0\0\0\0\0", 8), "Buffer should not have been modified\n"); +} + +static void setup_pe(PVOID buffer, PIMAGE_NT_HEADERS32 *header) +{ + PIMAGE_DOS_HEADER dos_header = (PIMAGE_DOS_HEADER)buffer; + PIMAGE_NT_HEADERS32 nt_header = (PIMAGE_NT_HEADERS32)(dos_header + 1); + + dos_header->e_magic = IMAGE_DOS_SIGNATURE; + dos_header->e_lfanew = sizeof(*dos_header); + + nt_header->Signature = IMAGE_NT_SIGNATURE; + nt_header->FileHeader.NumberOfSections = 0; + nt_header->FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER32); + nt_header->OptionalHeader.Magic = IMAGE_NT_OPTIONAL_HDR32_MAGIC; + nt_header->OptionalHeader.NumberOfRvaAndSizes = IMAGE_NUMBEROF_DIRECTORY_ENTRIES; + + if (header) + *header = nt_header; +} + +static void setup_pe_with_sections(PVOID buffer, PIMAGE_NT_HEADERS32 *header, PDWORD *reloc_target) +{ + PIMAGE_SECTION_HEADER section_headers; + PIMAGE_BASE_RELOCATION base_relocation; + PWORD type_offset; + DWORD dir_entry = IMAGE_DIRECTORY_ENTRY_BASERELOC; + + DWORD code_rva_base = 0x1000; + DWORD reloc_rva_base = 0x2000; + DWORD code_raw_base = 0x200; + DWORD reloc_raw_base = 0x300; + DWORD image_base_init = 0x400000; + WORD reloc_target_offset = 0x30; + + setup_pe(buffer, header); + + (*header)->FileHeader.NumberOfSections = 2; + (*header)->OptionalHeader.ImageBase = image_base_init; + (*header)->OptionalHeader.DataDirectory[dir_entry].VirtualAddress = reloc_rva_base; + (*header)->OptionalHeader.DataDirectory[dir_entry].Size = 12; + section_headers = (PIMAGE_SECTION_HEADER)((*header) + 1); + memcpy(section_headers[0].Name, ".text\0\0\0", 8); + section_headers[0].Misc.VirtualSize = 0xf2; + section_headers[0].VirtualAddress = code_rva_base; + section_headers[0].SizeOfRawData = 0x100; + section_headers[0].PointerToRawData = code_raw_base; + memcpy(section_headers[1].Name, ".reloc\0\0", 8); + section_headers[1].Misc.VirtualSize = 0xf2; + section_headers[1].VirtualAddress = reloc_rva_base; + section_headers[1].SizeOfRawData = 0x100; + section_headers[1].PointerToRawData = reloc_raw_base; + base_relocation = (PIMAGE_BASE_RELOCATION)(&array[reloc_raw_base]); + base_relocation->VirtualAddress = code_rva_base; + base_relocation->SizeOfBlock = 12; + type_offset = (PWORD)(base_relocation + 1); + *type_offset = (IMAGE_REL_BASED_HIGHLOW << 12) | reloc_target_offset; + + if (reloc_target) + *reloc_target = (PDWORD)(&array[code_raw_base + reloc_target_offset]); +} + +static void test_normalize_flags(void) +{ + struct { + BOOL init_magic_64; + DWORD init_checksum; + DWORD init_timestamp; + ULONG buffer_size; + ULONG flags; + ULONG image_base; + ULONG timestamp; + BOOL exp_result; + DWORD exp_checksum; + DWORD exp_timestamp; + } test[] = + { + {FALSE, 0xdeadbeef, 0xdeadbeef, + 512, 0, 0, 0, + 1, 0xdeadbeef, 0xdeadbeef}, + /* No rebase */ + {FALSE, 0xdeadbeef, 0xdeadbeef, + 512, PATCH_OPTION_NO_REBASE, 0, 0, + 1, 0xdeadbeef, 0xdeadbeef}, + + /* Blank checksum */ + {FALSE, 0xdeadbeef, 0xdeadbeef, + 512, PATCH_OPTION_NO_CHECKSUM, 0, 0, + 2, 0, 0xdeadbeef}, + /* Blank checksum, no rebase */ + {FALSE, 0xdeadbeef, 0xdeadbeef, + 512, PATCH_OPTION_NO_CHECKSUM | PATCH_OPTION_NO_REBASE, 0, 0, + 2, 0, 0xdeadbeef}, + /* Blank checksum, already 0 */ + {FALSE, 0, 0xdeadbeef, + 512, PATCH_OPTION_NO_CHECKSUM, 0, 0, + 1, 0, 0xdeadbeef}, + /* Blank checksum fail - filesize too small */ + {FALSE, 0xdeadbeef, 0xdeadbeef, + 511, PATCH_OPTION_NO_CHECKSUM, 0, 0, + 1, 0xdeadbeef, 0xdeadbeef}, + /* Blank checksum fail - PE32+ magic */ + {TRUE, 0xdeadbeef, 0xdeadbeef, + 512, PATCH_OPTION_NO_CHECKSUM, 0, 0, + 1, 0xdeadbeef, 0xdeadbeef}, + + /* Set timestamp */ + {FALSE, 0xdeadbeef, 0xdeadbeef, + 512, 0, 0, 0x12345678, + 2, 0xa61e, 0x12345678}, + /* Set timestamp, no rebase */ + {FALSE, 0xdeadbeef, 0xdeadbeef, + 512, PATCH_OPTION_NO_REBASE, 0, 0x12345678, + 1, 0xdeadbeef, 0xdeadbeef}, + /* Set timestamp, to same value */ + {FALSE, 0xdeadbeef, 0x12345678, + 512, 0, 0, 0x12345678, + 1, 0xdeadbeef, 0x12345678}, + /* Set timestamp, no_rebase, blank checksum */ + {FALSE, 0xdeadbeef, 0xdeadbeef, + 512, PATCH_OPTION_NO_CHECKSUM | PATCH_OPTION_NO_REBASE, 0, 0x12345678, + 2, 0, 0xdeadbeef}, + }; + + PIMAGE_NT_HEADERS32 header; + BOOL result; + DWORD i; + + if (!pNormalizeFileForPatchSignature) + return; + + for (i = 0; i < ARRAY_SIZE(test); i++) + { + memset(array, 0xcc, 512); + setup_pe(array, &header); + if (test[i].init_magic_64) + header->OptionalHeader.Magic = IMAGE_NT_OPTIONAL_HDR64_MAGIC; + header->FileHeader.TimeDateStamp = test[i].init_timestamp; + header->OptionalHeader.CheckSum = test[i].init_checksum; + result = pNormalizeFileForPatchSignature(array, test[i].buffer_size, test[i].flags, NULL, + test[i].image_base, test[i].timestamp, 0, NULL, 0, NULL); + + ok(result == test[i].exp_result, "[%d] Expected %d, got %d\n", i, test[i].exp_result, result); + ok(header->FileHeader.TimeDateStamp == test[i].exp_timestamp, + "[%d] Expected timestamp %#x, got %#x\n", i, + test[i].exp_timestamp, header->FileHeader.TimeDateStamp); + ok(header->OptionalHeader.CheckSum == test[i].exp_checksum, + "[%d] Expected checksum %#x, got %#x\n", i, + test[i].exp_checksum, header->OptionalHeader.CheckSum); + } +} + +static void test_normalize_rebase(void) +{ + PIMAGE_NT_HEADERS32 header; + BOOL result; + PDWORD reloc_target; + DWORD image_base_initial; + DWORD image_base_new = 0x500000; + DWORD reloc_target_value = 0x3fffffff; + DWORD reloc_target_exp; + + if (!pNormalizeFileForPatchSignature) + return; + + memset(array, 0, 1024); + setup_pe_with_sections(array, &header, &reloc_target); + *reloc_target = reloc_target_value; + reloc_target_exp = reloc_target_value + (image_base_new - header->OptionalHeader.ImageBase); + result = pNormalizeFileForPatchSignature(array, 1024, 0, NULL, image_base_new, 0, 0, NULL, 0, NULL); + ok(result == 2, "Expected %d, got %d\n", 2, result); + ok(header->OptionalHeader.ImageBase == image_base_new, "Expected %#x, got %#x\n", + image_base_new, header->OptionalHeader.ImageBase); + ok(*reloc_target == reloc_target_exp, "Expected %#x, got %#x\n", reloc_target_exp, *reloc_target); + + /* Relocation table extends beyond virtual size, but within raw data size */ + memset(array, 0, 1024); + setup_pe_with_sections(array, &header, NULL); + header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress += 0xf4; + result = pNormalizeFileForPatchSignature(array, 1024, 0, NULL, image_base_new, 0, 0, NULL, 0, NULL); + ok(result == 2, "Expected %d, got %d\n", 2, result); + ok(header->OptionalHeader.ImageBase == image_base_new, "Expected %#x, got %#x\n", + image_base_new, header->OptionalHeader.ImageBase); + + /* Relocation table starts within raw data size, but ends beyond */ + memset(array, 0, 1024); + setup_pe_with_sections(array, &header, NULL); + image_base_initial = header->OptionalHeader.ImageBase; + header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress += 0xf8; + result = pNormalizeFileForPatchSignature(array, 1024, 0, NULL, image_base_new, 0, 0, NULL, 0, NULL); + ok(result == 1, "Expected %d, got %d\n", 2, result); + ok(header->OptionalHeader.ImageBase == image_base_initial, "Expected %#x, got %#x\n", + image_base_initial, header->OptionalHeader.ImageBase); + + /* Relocation table extends beyond end of file */ + memset(array, 0, 1024); + setup_pe_with_sections(array, &header, NULL); + image_base_initial = header->OptionalHeader.ImageBase; + result = pNormalizeFileForPatchSignature(array, 779, 0, NULL, image_base_new, 0, 0, NULL, 0, NULL); + ok(result == 1, "Expected %d, got %d\n", 1, result); + ok(header->OptionalHeader.ImageBase == image_base_initial, "Expected %#x, got %#x\n", + image_base_initial, header->OptionalHeader.ImageBase); +} + +START_TEST(signature) +{ + if (!init_function_pointers()) + return; + + test_normalize_ignore_range(); + test_normalize_retain_range(); + test_normalize_flags(); + test_normalize_rebase(); +} -- 2.23.0

1 2

[PATCH 1/2] mf/topology: Setting tee node input type does not create input stream.
by Nikolay Sivov May 22, 2020

May 22, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 91 +++++++++++++++++++++++++++++++++++- dlls/mf/topology.c | 114 ++++++++++++++++++++++++++++----------------- 2 files changed, 162 insertions(+), 43 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index bf14ccf0feb..c79ae69f91d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -114,11 +114,11 @@ static const IUnknownVtbl test_unk_vtbl = static void test_topology(void) { + IMFMediaType *mediatype, *mediatype2, *mediatype3; IMFCollection *collection, *collection2; IUnknown test_unk2 = { &test_unk_vtbl }; IUnknown test_unk = { &test_unk_vtbl }; IMFTopologyNode *node, *node2, *node3; - IMFMediaType *mediatype, *mediatype2; IMFTopology *topology, *topology2; MF_TOPOLOGY_TYPE node_type; UINT32 count, index; @@ -516,6 +516,9 @@ static void test_topology(void) ok(mediatype2 == mediatype, "Unexpected mediatype instance.\n"); IMFMediaType_Release(mediatype2); + hr = IMFTopologyNode_GetOutputPrefType(node, 0, &mediatype2); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMFTopologyNode_GetInputCount(node, &count); ok(hr == S_OK, "Failed to get output count, hr %#x.\n", hr); ok(count == 0, "Unexpected count %u.\n", count); @@ -529,6 +532,23 @@ static void test_topology(void) hr = IMFTopologyNode_SetOutputPrefType(node, 4, mediatype); ok(hr == S_OK, "Failed to set preferred type, hr %#x.\n", hr); + hr = IMFTopologyNode_GetOutputPrefType(node, 0, &mediatype2); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMediaType(&mediatype2); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + /* Changing output type does not change input type. */ + hr = IMFTopologyNode_SetOutputPrefType(node, 4, mediatype2); + ok(hr == S_OK, "Failed to set preferred type, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetInputPrefType(node, 0, &mediatype3); + ok(hr == S_OK, "Failed to get preferred type, hr %#x.\n", hr); + ok(mediatype3 == mediatype, "Unexpected mediatype instance.\n"); + IMFMediaType_Release(mediatype3); + + IMFMediaType_Release(mediatype2); + hr = IMFTopologyNode_GetInputCount(node, &count); ok(hr == S_OK, "Failed to get output count, hr %#x.\n", hr); ok(count == 0, "Unexpected count %u.\n", count); @@ -546,6 +566,10 @@ static void test_topology(void) hr = IMFTopologyNode_SetInputPrefType(node, 3, mediatype); ok(hr == S_OK, "Failed to set preferred type, hr %#x.\n", hr); + hr = IMFTopologyNode_GetInputCount(node, &count); + ok(hr == S_OK, "Failed to get input count, hr %#x.\n", hr); + ok(count == 4, "Unexpected count %u.\n", count); + hr = IMFTopologyNode_SetOutputPrefType(node, 4, mediatype); ok(hr == S_OK, "Failed to set preferred type, hr %#x.\n", hr); @@ -800,6 +824,70 @@ static void test_topology(void) IMFTopology_Release(topology); } +static void test_topology_tee_node(void) +{ + IMFTopologyNode *src_node, *tee_node; + IMFMediaType *mediatype, *mediatype2; + IMFTopology *topology; + unsigned int count; + HRESULT hr; + + hr = MFCreateTopology(&topology); + ok(hr == S_OK, "Failed to create topology, hr %#x.\n", hr); + + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &tee_node); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetInputPrefType(tee_node, 0, mediatype); + ok(hr == S_OK, "Failed to set type, hr %#x.\n", hr); + + /* Even though tee node has only one input and source has only one output, + it's possible to connect to higher inputs/outputs. */ + + /* SRC(0) -> TEE(0) */ + hr = IMFTopologyNode_ConnectOutput(src_node, 0, tee_node, 0); + ok(hr == S_OK, "Failed to connect nodes, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetInputCount(tee_node, &count); + ok(hr == S_OK, "Failed to get count, hr %#x.\n", hr); + ok(count == 1, "Unexpected count %u.\n", count); + + hr = IMFTopologyNode_GetInputPrefType(tee_node, 0, &mediatype2); + ok(hr == S_OK, "Failed to get type, hr %#x.\n", hr); + ok(mediatype2 == mediatype, "Unexpected type.\n"); + IMFMediaType_Release(mediatype2); + + /* SRC(0) -> TEE(1) */ + hr = IMFTopologyNode_ConnectOutput(src_node, 0, tee_node, 1); + ok(hr == S_OK, "Failed to connect nodes, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetInputCount(tee_node, &count); + ok(hr == S_OK, "Failed to get count, hr %#x.\n", hr); + ok(count == 2, "Unexpected count %u.\n", count); + + hr = IMFTopologyNode_SetInputPrefType(tee_node, 1, mediatype); + ok(hr == MF_E_INVALIDTYPE, "Unexpected hr %#x.\n", hr); + + /* SRC(1) -> TEE(1) */ + hr = IMFTopologyNode_ConnectOutput(src_node, 1, tee_node, 1); + ok(hr == S_OK, "Failed to connect nodes, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetOutputCount(src_node, &count); + ok(hr == S_OK, "Failed to get count, hr %#x.\n", hr); + ok(count == 2, "Unexpected count %u.\n", count); + + IMFMediaType_Release(mediatype); + IMFTopologyNode_Release(src_node); + IMFTopologyNode_Release(tee_node); + IMFTopology_Release(topology); +} + static HRESULT WINAPI test_getservice_QI(IMFGetService *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IMFGetService) || IsEqualIID(riid, &IID_IUnknown)) @@ -3725,6 +3813,7 @@ static void test_MFGetTopoNodeCurrentType(void) START_TEST(mf) { test_topology(); + test_topology_tee_node(); test_topology_loader(); test_MFGetService(); test_sequencer_source(); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 0b4d7344422..91635fd6b8b 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -61,6 +61,7 @@ struct topology_node MF_TOPOLOGY_TYPE node_type; TOPOID id; IUnknown *object; + IMFMediaType *input_type; /* Only for tee nodes. */ struct node_streams inputs; struct node_streams outputs; CRITICAL_SECTION cs; @@ -950,6 +951,8 @@ static ULONG WINAPI topology_node_Release(IMFTopologyNode *iface) { if (node->object) IUnknown_Release(node->object); + if (node->input_type) + IMFMediaType_Release(node->input_type); for (i = 0; i < node->inputs.count; ++i) { if (node->inputs.streams[i].preferred_type) @@ -1361,14 +1364,7 @@ static HRESULT WINAPI topology_node_GetInputCount(IMFTopologyNode *iface, DWORD TRACE("%p, %p.\n", iface, count); - switch (node->node_type) - { - case MF_TOPOLOGY_TEE_NODE: - *count = 0; - break; - default: - *count = node->inputs.count; - } + *count = node->inputs.count; return S_OK; } @@ -1384,6 +1380,15 @@ static HRESULT WINAPI topology_node_GetOutputCount(IMFTopologyNode *iface, DWORD return S_OK; } +static void topology_node_set_stream_type(struct node_stream *stream, IMFMediaType *mediatype) +{ + if (stream->preferred_type) + IMFMediaType_Release(stream->preferred_type); + stream->preferred_type = mediatype; + if (stream->preferred_type) + IMFMediaType_AddRef(stream->preferred_type); +} + static HRESULT topology_node_connect_output(struct topology_node *node, DWORD output_index, struct topology_node *connection, DWORD input_index) { @@ -1406,7 +1411,16 @@ static HRESULT topology_node_connect_output(struct topology_node *node, DWORD ou hr = topology_node_reserve_streams(&node->outputs, output_index); if (SUCCEEDED(hr)) + { + size_t old_count = connection->inputs.count; hr = topology_node_reserve_streams(&connection->inputs, input_index); + if (SUCCEEDED(hr) && !old_count && connection->input_type) + { + topology_node_set_stream_type(connection->inputs.streams, connection->input_type); + IMFMediaType_Release(connection->input_type); + connection->input_type = NULL; + } + } if (SUCCEEDED(hr)) { @@ -1524,13 +1538,7 @@ static HRESULT WINAPI topology_node_SetOutputPrefType(IMFTopologyNode *iface, DW if (node->node_type != MF_TOPOLOGY_OUTPUT_NODE) { if (SUCCEEDED(hr = topology_node_reserve_streams(&node->outputs, index))) - { - if (node->outputs.streams[index].preferred_type) - IMFMediaType_Release(node->outputs.streams[index].preferred_type); - node->outputs.streams[index].preferred_type = mediatype; - if (node->outputs.streams[index].preferred_type) - IMFMediaType_AddRef(node->outputs.streams[index].preferred_type); - } + topology_node_set_stream_type(&node->outputs.streams[index], mediatype); } else hr = E_NOTIMPL; @@ -1540,6 +1548,18 @@ static HRESULT WINAPI topology_node_SetOutputPrefType(IMFTopologyNode *iface, DW return hr; } +static HRESULT topology_node_get_pref_type(struct node_streams *streams, unsigned int index, IMFMediaType **mediatype) +{ + *mediatype = streams->streams[index].preferred_type; + if (*mediatype) + { + IMFMediaType_AddRef(*mediatype); + return S_OK; + } + + return E_FAIL; +} + static HRESULT WINAPI topology_node_GetOutputPrefType(IMFTopologyNode *iface, DWORD index, IMFMediaType **mediatype) { struct topology_node *node = impl_from_IMFTopologyNode(iface); @@ -1550,13 +1570,7 @@ static HRESULT WINAPI topology_node_GetOutputPrefType(IMFTopologyNode *iface, DW EnterCriticalSection(&node->cs); if (index < node->outputs.count) - { - *mediatype = node->outputs.streams[index].preferred_type; - if (*mediatype) - IMFMediaType_AddRef(*mediatype); - else - hr = E_FAIL; - } + hr = topology_node_get_pref_type(&node->outputs, index, mediatype); else hr = E_INVALIDARG; @@ -1574,25 +1588,40 @@ static HRESULT WINAPI topology_node_SetInputPrefType(IMFTopologyNode *iface, DWO EnterCriticalSection(&node->cs); - if (node->node_type != MF_TOPOLOGY_SOURCESTREAM_NODE && !(index > 0 && node->node_type == MF_TOPOLOGY_TEE_NODE)) + switch (node->node_type) { - if (SUCCEEDED(hr = topology_node_reserve_streams(&node->inputs, index))) - { - if (index >= node->inputs.count) + case MF_TOPOLOGY_TEE_NODE: + if (index) { - memset(&node->inputs.streams[node->inputs.count], 0, - (index - node->inputs.count + 1) * sizeof(*node->inputs.streams)); - node->inputs.count = index + 1; + hr = MF_E_INVALIDTYPE; + break; + } + if (node->inputs.count) + topology_node_set_stream_type(&node->inputs.streams[index], mediatype); + else + { + if (node->input_type) + IMFMediaType_Release(node->input_type); + node->input_type = mediatype; + if (node->input_type) + IMFMediaType_AddRef(node->input_type); + } + break; + case MF_TOPOLOGY_SOURCESTREAM_NODE: + hr = E_NOTIMPL; + break; + default: + if (SUCCEEDED(hr = topology_node_reserve_streams(&node->inputs, index))) + { + if (index >= node->inputs.count) + { + memset(&node->inputs.streams[node->inputs.count], 0, + (index - node->inputs.count + 1) * sizeof(*node->inputs.streams)); + node->inputs.count = index + 1; + } + topology_node_set_stream_type(&node->inputs.streams[index], mediatype); } - if (node->inputs.streams[index].preferred_type) - IMFMediaType_Release(node->inputs.streams[index].preferred_type); - node->inputs.streams[index].preferred_type = mediatype; - if (node->inputs.streams[index].preferred_type) - IMFMediaType_AddRef(node->inputs.streams[index].preferred_type); - } } - else - hr = node->node_type == MF_TOPOLOGY_TEE_NODE ? MF_E_INVALIDTYPE : E_NOTIMPL; LeaveCriticalSection(&node->cs); @@ -1610,11 +1639,12 @@ static HRESULT WINAPI topology_node_GetInputPrefType(IMFTopologyNode *iface, DWO if (index < node->inputs.count) { - *mediatype = node->inputs.streams[index].preferred_type; - if (*mediatype) - IMFMediaType_AddRef(*mediatype); - else - hr = E_FAIL; + hr = topology_node_get_pref_type(&node->inputs, index, mediatype); + } + else if (node->node_type == MF_TOPOLOGY_TEE_NODE && node->input_type) + { + *mediatype = node->input_type; + IMFMediaType_AddRef(*mediatype); } else hr = E_INVALIDARG; -- 2.26.2

2 2

[PATCH 2/2] math.h: Add scalbn declaration.
by Jacek Caban May 22, 2020

May 22, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/math.h | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH 1/2] math.h: Provide copysign declaration for ucrt.
by Jacek Caban May 22, 2020

May 22, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/math.h | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH] ntoskrnl.exe: Protect the two relocated pages independently.
by Zebediah Figura May 22, 2020

May 22, 2020

They may have different protection flags. This fixes a regression introduced by 22dfb0df10b44d1c21b3d04b59312670c2318431. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49198 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e7d343a2ab..3bbb3c4928 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3362,8 +3362,8 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len, ULONG page_size ) while (rel < end - 1 && rel->SizeOfBlock) { - void *page = get_rva( module, rel->VirtualAddress ); - DWORD old_prot; + char *page = get_rva( module, rel->VirtualAddress ); + DWORD old_prot1, old_prot2; if (rel->VirtualAddress >= len) { @@ -3373,10 +3373,12 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len, ULONG page_size ) /* Relocation entries may hang over the end of the page, so we need to * protect two pages. */ - VirtualProtect( page, page_size * 2, PAGE_READWRITE, &old_prot ); + VirtualProtect( page, page_size, PAGE_READWRITE, &old_prot1 ); + VirtualProtect( page + page_size, page_size, PAGE_READWRITE, &old_prot2 ); rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta ); - VirtualProtect( page, page_size * 2, old_prot, &old_prot ); + VirtualProtect( page, page_size, old_prot1, &old_prot1 ); + VirtualProtect( page + page_size, page_size, old_prot2, &old_prot2 ); if (!rel) return STATUS_INVALID_IMAGE_FORMAT; } -- 2.26.2

1 0

[PATCH] windowscodecs/tests: Add tests for DdsDecoder_GetFrame() and DdsFrameDecode_GetSize().
by Ziqing Hui May 22, 2020

May 22, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 127 ++++++++++++++++++++------- 1 file changed, 96 insertions(+), 31 deletions(-)

2 1

[PATCH 1/2] ntoskrnl.exe: Support 'or Ev, Gv' opcode for x86_64.
by Paul Gofman May 22, 2020

May 22, 2020

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntoskrnl.exe/instr.c | 53 +++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index dad4e5d660..848a566d02 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -35,6 +35,12 @@ #define KSHARED_USER_DATA_PAGE_SIZE 0x1000 +enum instr_op +{ + INSTR_OP_MOV, + INSTR_OP_OR, +}; + #ifdef __i386__ WINE_DEFAULT_DEBUG_CHANNEL(int); @@ -503,20 +509,42 @@ static inline int get_op_size( int long_op, int rex ) } /* store an operand into a register */ -static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int long_op, int rex ) +static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int long_op, int rex, + enum instr_op op ) { int index = REGMODRM_REG( regmodrm, rex ); BYTE *reg = (BYTE *)get_int_reg( context, index ); - memcpy( reg, addr, get_op_size( long_op, rex ) ); + int op_size = get_op_size( long_op, rex ); + int i; + + switch (op) + { + case INSTR_OP_MOV: + memcpy( reg, addr, op_size ); + break; + case INSTR_OP_OR: + for (i = 0; i < op_size; ++i) + reg[i] |= addr[i]; + break; + } } /* store an operand into a byte register */ -static void store_reg_byte( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int rex ) +static void store_reg_byte( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int rex, enum instr_op op ) { int index = REGMODRM_REG( regmodrm, rex ); BYTE *reg = (BYTE *)get_int_reg( context, index ); if (!rex && index >= 4 && index < 8) reg -= (4 * sizeof(DWORD64) - 1); /* special case: ah, ch, dh, bh */ - *reg = *addr; + + switch (op) + { + case INSTR_OP_MOV: + *reg = *addr; + break; + case INSTR_OP_OR: + *reg |= *addr; + break; + } } /*********************************************************************** @@ -798,7 +826,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); memcpy( &temp, wine_user_shared_data + offset, data_size ); - store_reg_word( context, instr[2], (BYTE *)&temp, long_op, rex ); + store_reg_word( context, instr[2], (BYTE *)&temp, long_op, rex, INSTR_OP_MOV ); context->Rip += prefixlen + len + 2; return ExceptionContinueExecution; } @@ -809,6 +837,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) case 0x8a: /* mov Eb, Gb */ case 0x8b: /* mov Ev, Gv */ + case 0x0b: /* or Ev, Gv */ { BYTE *data = INSTR_GetOperandAddr( context, instr + 1, prefixlen + 1, long_addr, rex, segprefix, &len ); @@ -820,8 +849,18 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); switch (*instr) { - case 0x8a: store_reg_byte( context, instr[1], wine_user_shared_data + offset, rex ); break; - case 0x8b: store_reg_word( context, instr[1], wine_user_shared_data + offset, long_op, rex ); break; + case 0x8a: + store_reg_byte( context, instr[1], wine_user_shared_data + offset, + rex, INSTR_OP_MOV ); + break; + case 0x8b: + store_reg_word( context, instr[1], wine_user_shared_data + offset, + long_op, rex, INSTR_OP_MOV ); + break; + case 0x0b: + store_reg_word( context, instr[1], wine_user_shared_data + offset, + long_op, rex, INSTR_OP_OR ); + break; } context->Rip += prefixlen + len + 1; return ExceptionContinueExecution; -- 2.26.2

1 1