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

[PATCH 4/4] kernel32/tests: Add a PE test image that resembles format of some of 8k demos.
by Dmitry Timoshkov May 6, 2020

May 6, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/loader.c | 40 ++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 5474d54324..4bafd0f634 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -228,7 +228,7 @@ static DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size, { SetLastError(0xdeadbeef); ret = WriteFile(hfile, &nt_header->OptionalHeader, - min(nt_header->FileHeader.SizeOfOptionalHeader, sizeof(IMAGE_OPTIONAL_HEADER)), + sizeof(IMAGE_OPTIONAL_HEADER), &dummy, NULL); ok(ret, "WriteFile error %d\n", GetLastError()); if (nt_header->FileHeader.SizeOfOptionalHeader > sizeof(IMAGE_OPTIONAL_HEADER)) @@ -244,6 +244,8 @@ static DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size, assert(nt_header->FileHeader.NumberOfSections <= 1); if (nt_header->FileHeader.NumberOfSections) { + SetFilePointer(hfile, dos_size + sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER) + nt_header->FileHeader.SizeOfOptionalHeader, NULL, FILE_BEGIN); + section.SizeOfRawData = 10; if (nt_header->OptionalHeader.SectionAlignment >= page_size) @@ -268,6 +270,17 @@ static DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size, ret = WriteFile(hfile, section_data, sizeof(section_data), &dummy, NULL); ok(ret, "WriteFile error %d\n", GetLastError()); } + + /* Minimal PE image that Windows7+ is able to load: 268 bytes */ + size = GetFileSize(hfile, NULL); + if (size < 268) + { + file_align = 268 - size; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, filler, file_align, &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + } + size = GetFileSize(hfile, NULL); CloseHandle(hfile); return size; @@ -417,7 +430,8 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE ok( image.LoaderFlags == (cor_header != NULL), "%u: LoaderFlags wrong %08x\n", id, image.LoaderFlags ); ok( image.ImageFileSize == file_size || broken(!image.ImageFileSize), /* winxpsp1 */ "%u: ImageFileSize wrong %08x / %08x\n", id, image.ImageFileSize, file_size ); - ok( image.CheckSum == nt_header->OptionalHeader.CheckSum, "%u: CheckSum wrong %08x / %08x\n", id, + ok( image.CheckSum == nt_header->OptionalHeader.CheckSum || broken(truncated), + "%u: CheckSum wrong %08x / %08x\n", id, image.CheckSum, nt_header->OptionalHeader.CheckSum ); if (nt_header->OptionalHeader.SizeOfCode || nt_header->OptionalHeader.AddressOfEntryPoint) @@ -768,6 +782,7 @@ static void test_Loader(void) /* Mandatory are all fields up to SizeOfHeaders, everything else * is really optional (at least that's true for XP). */ +#if 0 /* 32-bit Windows 8 crashes inside of LoadLibrary */ { sizeof(dos_header), 1, FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), 0x200, 0x200, sizeof(dos_header) + sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER) + FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum) + sizeof(IMAGE_SECTION_HEADER) + 0x10, @@ -775,6 +790,7 @@ static void test_Loader(void) { ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT, ERROR_INVALID_ADDRESS, ERROR_NOACCESS } }, +#endif { sizeof(dos_header), 0, FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), 0x200, 0x200, 0xd0, /* beyond of the end of file */ @@ -843,6 +859,14 @@ static void test_Loader(void) 0x40, /* minimal image size that Windows7 accepts */ 0, { ERROR_SUCCESS } + }, + /* the following data mimics the PE image which 8k demos have */ + { 0x04, + 0, 0x08, + 0x04 /* also serves as e_lfanew in the truncated MZ header */, 0x04, + 0x200000, + 0x40, + { ERROR_SUCCESS } } }; int i; @@ -1077,6 +1101,18 @@ static void test_Loader(void) ok(ret, "FreeLibrary error %d\n", GetLastError()); } + SetLastError(0xdeadbeef); + ret = DeleteFileA(dll_name); + ok(ret, "DeleteFile error %d\n", GetLastError()); + + nt_header.OptionalHeader.AddressOfEntryPoint = 0x12345678; + file_size = create_test_dll( &dos_header, td[i].size_of_dos_header, &nt_header, dll_name ); + if (!file_size) + { + ok(0, "could not create %s\n", dll_name); + break; + } + query_image_section( i, dll_name, &nt_header, NULL ); } else -- 2.26.2

2 1

[PATCH 1/4] ntdll/tests: Add tests for RtlSetCurrentEnvironment().
by Zebediah Figura May 6, 2020

May 6, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/env.c | 67 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e2..98a9f7bb569 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -515,6 +515,72 @@ static void test_process_params(void) } } +static NTSTATUS set_env_var(WCHAR **env, const WCHAR *var, const WCHAR *value) +{ + UNICODE_STRING var_string, value_string; + RtlInitUnicodeString(&var_string, var); + RtlInitUnicodeString(&value_string, value); + return RtlSetEnvironmentVariable(env, &var_string, &value_string); +} + +static void check_env_var_(int line, const char *var, const char *value) +{ + char buffer[20]; + DWORD size = GetEnvironmentVariableA(var, buffer, sizeof(buffer)); + if (value) + { + ok_(__FILE__, line)(size == strlen(value), "wrong size %u\n", size); + ok_(__FILE__, line)(!strcmp(buffer, value), "wrong value %s\n", debugstr_a(buffer)); + } + else + { + ok_(__FILE__, line)(!size, "wrong size %u\n", size); + ok_(__FILE__, line)(GetLastError() == ERROR_ENVVAR_NOT_FOUND, "got error %u\n", GetLastError()); + } +} +#define check_env_var(a, b) check_env_var_(__LINE__, a, b) + +static void test_RtlSetCurrentEnvironment(void) +{ + NTSTATUS status; + WCHAR *old_env, *env, *prev; + BOOL ret; + + status = RtlCreateEnvironment(FALSE, &env); + ok(!status, "got %#x\n", status); + + ret = SetEnvironmentVariableA("testenv1", "heis"); + ok(ret, "got error %u\n", GetLastError()); + ret = SetEnvironmentVariableA("testenv2", "dyo"); + ok(ret, "got error %u\n", GetLastError()); + + status = set_env_var(&env, L"testenv1", L"unus"); + ok(!status, "got %#x\n", status); + status = set_env_var(&env, L"testenv3", L"tres"); + ok(!status, "got %#x\n", status); + + old_env = NtCurrentTeb()->Peb->ProcessParameters->Environment; + + RtlSetCurrentEnvironment(env, &prev); + ok(prev == old_env, "got wrong previous env %p\n", prev); + ok(NtCurrentTeb()->Peb->ProcessParameters->Environment == env, "got wrong current env\n"); + + check_env_var("testenv1", "unus"); + check_env_var("testenv2", NULL); + check_env_var("testenv3", "tres"); + check_env_var("PATH", NULL); + + RtlSetCurrentEnvironment(old_env, NULL); + ok(NtCurrentTeb()->Peb->ProcessParameters->Environment == old_env, "got wrong current env\n"); + + check_env_var("testenv1", "heis"); + check_env_var("testenv2", "dyo"); + check_env_var("testenv3", NULL); + + SetEnvironmentVariableA("testenv1", NULL); + SetEnvironmentVariableA("testenv2", NULL); +} + START_TEST(env) { HMODULE mod = GetModuleHandleA("ntdll.dll"); @@ -535,4 +601,5 @@ START_TEST(env) testSet(); testExpand(); test_process_params(); + test_RtlSetCurrentEnvironment(); } -- 2.26.2

2 5

[PATCH 3/4] kernel32: On process entry store PEB address in %ebx.
by Dmitry Timoshkov May 6, 2020

May 6, 2020

8k demo custom PE loader depends on this. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/process.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6f704c521b..da4cafd343 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -94,12 +94,19 @@ __ASM_GLOBAL_FUNC( call_process_entry, __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-4\n\t") + "subl $12,%esp\n\t" "pushl 4(%ebp)\n\t" /* deliberately mis-align the stack by 8, Doom 3 needs this */ "pushl 4(%ebp)\n\t" /* Driller expects readable address at this offset */ "pushl 4(%ebp)\n\t" "pushl 8(%ebp)\n\t" + "movl 8(%ebp),%ebx\n\t" "call *12(%ebp)\n\t" - "leave\n\t" + "leal -4(%ebp),%esp\n\t" + "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") + "popl %ebp\n\t" __ASM_CFI(".cfi_def_cfa %esp,4\n\t") __ASM_CFI(".cfi_same_value %ebp\n\t") "ret" ) -- 2.26.2

1 0

[PATCH 2/4] ntdll: If PE image size is larger than the backed file size then treat file as removable.
by Dmitry Timoshkov May 6, 2020

May 6, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/virtual.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 7700385eb7..e62c133f7f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1588,6 +1588,10 @@ static NTSTATUS map_image( HANDLE hmapping, ACCESS_MASK access, int fd, int top_ /* unaligned sections, this happens for native subsystem binaries */ /* in that case Windows simply maps in the whole file */ + /* if the image size is larger than the backed file size we can't mmap it */ + if (total_size > ROUND_SIZE( 0, st.st_size )) + removable = TRUE; + if (map_file_into_view( view, fd, 0, total_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, removable ) != STATUS_SUCCESS) goto error; -- 2.26.2

1 0

[PATCH 1/4] server: All fields up to CheckSum are mandatory regardless of SizeOfOptionalHeader value.
by Dmitry Timoshkov May 6, 2020

May 6, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- server/mapping.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 6990a1913d..ea2cd55513 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -592,11 +592,12 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mz_size = size; pos = mz.dos.e_lfanew; + /* zero out Optional header in the case it's not present or partial */ + memset( &nt, 0, sizeof(nt) ); + size = pread( unix_fd, &nt, sizeof(nt), pos ); if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_PROTECT; - /* zero out Optional header in the case it's not present or partial */ - size = min( size, sizeof(nt.Signature) + sizeof(nt.FileHeader) + nt.FileHeader.SizeOfOptionalHeader ); - if (size < sizeof(nt)) memset( (char *)&nt + size, 0, sizeof(nt) - size ); + if (nt.Signature != IMAGE_NT_SIGNATURE) { IMAGE_OS2_HEADER *os2 = (IMAGE_OS2_HEADER *)&nt; @@ -609,6 +610,10 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s switch (nt.opt.hdr32.Magic) { case IMAGE_NT_OPTIONAL_HDR32_MAGIC: + /* All fields up to CheckSum are mandatory regardless of SizeOfOptionalHeader value */ + size = max( nt.FileHeader.SizeOfOptionalHeader, offsetof(IMAGE_OPTIONAL_HEADER32, CheckSum) ); + if (size < sizeof(nt.opt.hdr32)) memset( (char *)&nt.opt.hdr32 + size, 0, sizeof(nt.opt.hdr32) - size ); + switch (nt.FileHeader.Machine) { case IMAGE_FILE_MACHINE_I386: @@ -654,6 +659,10 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s break; case IMAGE_NT_OPTIONAL_HDR64_MAGIC: + /* All fields up to CheckSum are mandatory regardless of SizeOfOptionalHeader value */ + size = max( nt.FileHeader.SizeOfOptionalHeader, offsetof(IMAGE_OPTIONAL_HEADER64, CheckSum) ); + if (size < sizeof(nt.opt.hdr64)) memset( (char *)&nt.opt.hdr64 + size, 0, sizeof(nt.opt.hdr64) - size ); + if (!(cpu_mask & CPU_64BIT_MASK)) return STATUS_INVALID_IMAGE_WIN_64; switch (nt.FileHeader.Machine) { -- 2.26.2

1 0

[PATCH v2 1/2] dmime: Support more common chunks
by Alistair Leslie-Hughes May 6, 2020

May 6, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/dmobject.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/dmime/dmobject.c b/dlls/dmime/dmobject.c index 9ea31ab32a6b..8108657f0f5e 100644 --- a/dlls/dmime/dmobject.c +++ b/dlls/dmime/dmobject.c @@ -544,6 +544,21 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, &desc->vVersion, sizeof(desc->vVersion)) == S_OK) desc->dwValidData |= DMUS_OBJ_VERSION; break; + case DMUS_FOURCC_NAME_CHUNK: + if ((supported & DMUS_OBJ_NAME) && stream_chunk_get_data(stream, &chunk, + &desc->wszName, chunk.size) == S_OK) + desc->dwValidData |= DMUS_OBJ_NAME; + break; + case DMUS_FOURCC_FILE_CHUNK: + if ((supported & DMUS_OBJ_FILENAME) && stream_chunk_get_data(stream, &chunk, + &desc->wszFileName, chunk.size) == S_OK) + desc->dwValidData |= DMUS_OBJ_FILENAME; + break; + case DMUS_FOURCC_DATE_CHUNK: + if ((supported & DMUS_OBJ_DATE) && stream_chunk_get_data(stream, &chunk, + &desc->ftDate, sizeof(desc->ftDate)) == S_OK) + desc->dwValidData |= DMUS_OBJ_DATE; + break; case FOURCC_LIST: if (chunk.type == DMUS_FOURCC_UNFO_LIST && (supported & DMUS_OBJ_NAME)) unfo_get_name(stream, &chunk, desc, supported & DMUS_OBJ_NAME_INAM); -- 2.26.2

1 0

[PATCH 5/5] wined3d: Fix an uninitialised variable warning.
by Zhiyi Zhang May 5, 2020

May 5, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index a1aa3c0bb96..c21ecfd5c32 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -257,7 +257,7 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G }; GLint type, name, samples, width, height, old_texture, level, face, fmt, tex_target; - const char *tex_type_str; + const char *tex_type_str = NULL; unsigned int i; gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, @@ -310,8 +310,6 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G } else { - tex_type_str = NULL; - for (i = 0; i < ARRAY_SIZE(texture_type); ++i) { if (!gl_info->supported[texture_type[i].extension]) -- 2.25.1

4 4

[PATCH 1/5] quartz/videorenderer: Factor out get_bitmap_header().
by Zebediah Figura May 5, 2020

May 5, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/videorenderer.c | 85 +++++++++++++------------------------ 1 file changed, 30 insertions(+), 55 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 54a646fbc04..77afc9fcef5 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -79,6 +79,14 @@ static inline struct video_renderer *impl_from_BaseControlVideo(BaseControlVideo return CONTAINING_RECORD(iface, struct video_renderer, baseControlVideo); } +static const BITMAPINFOHEADER *get_bitmap_header(const AM_MEDIA_TYPE *mt) +{ + if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + return &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; + else + return &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; +} + static void VideoRenderer_AutoShowWindow(struct video_renderer *This) { if (!This->init && (!This->WindowPos.right || !This->WindowPos.top)) @@ -144,9 +152,7 @@ static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) { struct video_renderer *filter = impl_from_strmbase_renderer(iface); - const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; LPBYTE pbSrcStream = NULL; - BITMAPINFOHEADER *bih; HRESULT hr; HDC dc; @@ -159,11 +165,6 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa return hr; } - if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) - bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; - else - bih = &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; - dc = GetDC(filter->baseControlWindow.hwnd); StretchDIBits(dc, filter->DestRect.left, filter->DestRect.top, filter->DestRect.right - filter->DestRect.left, @@ -171,7 +172,7 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa filter->SourceRect.left, filter->SourceRect.top, filter->SourceRect.right - filter->SourceRect.left, filter->SourceRect.bottom - filter->SourceRect.top, - pbSrcStream, (BITMAPINFO *)bih, DIB_RGB_COLORS, SRCCOPY); + pbSrcStream, (BITMAPINFO *)get_bitmap_header(&filter->renderer.sink.pin.mt), DIB_RGB_COLORS, SRCCOPY); ReleaseDC(filter->baseControlWindow.hwnd, dc); if (filter->renderer.filter.state == State_Paused) @@ -190,53 +191,31 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa return S_OK; } -static HRESULT WINAPI VideoRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *pmt) +static HRESULT WINAPI VideoRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { - struct video_renderer *This = impl_from_strmbase_renderer(iface); + struct video_renderer *filter = impl_from_strmbase_renderer(iface); + const BITMAPINFOHEADER *bitmap_header; - if (!IsEqualIID(&pmt->majortype, &MEDIATYPE_Video)) + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) return S_FALSE; - if (IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB32) || - IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB24) || - IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB565) || - IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB8)) - { - LONG height; + if (!IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB565) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8)) + return S_FALSE; - if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) - { - VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pmt->pbFormat; - This->SourceRect.left = 0; - This->SourceRect.top = 0; - This->SourceRect.right = This->VideoWidth = format->bmiHeader.biWidth; - height = format->bmiHeader.biHeight; - if (height < 0) - This->SourceRect.bottom = This->VideoHeight = -height; - else - This->SourceRect.bottom = This->VideoHeight = height; - } - else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) - { - VIDEOINFOHEADER2 *format2 = (VIDEOINFOHEADER2 *)pmt->pbFormat; - - This->SourceRect.left = 0; - This->SourceRect.top = 0; - This->SourceRect.right = This->VideoWidth = format2->bmiHeader.biWidth; - height = format2->bmiHeader.biHeight; - if (height < 0) - This->SourceRect.bottom = This->VideoHeight = -height; - else - This->SourceRect.bottom = This->VideoHeight = height; - } - else - { - WARN("Format type %s not supported\n", debugstr_guid(&pmt->formattype)); - return S_FALSE; - } - return S_OK; - } - return S_FALSE; + if (!IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo) + && !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) + return S_FALSE; + + bitmap_header = get_bitmap_header(mt); + + filter->VideoWidth = bitmap_header->biWidth; + filter->VideoHeight = abs(bitmap_header->biHeight); + SetRect(&filter->SourceRect, 0, 0, filter->VideoWidth, filter->VideoHeight); + + return S_OK; } static void video_renderer_destroy(struct strmbase_renderer *iface) @@ -360,7 +339,6 @@ static HRESULT WINAPI VideoRenderer_GetSourceRect(BaseControlVideo* iface, RECT static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo *iface, LONG *size, LONG *image) { struct video_renderer *filter = impl_from_BaseControlVideo(iface); - const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; const BITMAPINFOHEADER *bih; size_t image_size; BYTE *sample_data; @@ -369,10 +347,7 @@ static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo *iface, LONG EnterCriticalSection(&filter->renderer.csRenderLock); - if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) - bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; - else /* if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) */ - bih = &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; + bih = get_bitmap_header(&filter->renderer.sink.pin.mt); image_size = bih->biWidth * bih->biHeight * bih->biBitCount / 8; if (!image) -- 2.26.2

1 4

[PATCH] dmime: Parse Wave track stream
by Alistair Leslie-Hughes May 5, 2020

May 5, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/dmime_private.h | 7 + dlls/dmime/wavetrack.c | 264 ++++++++++++++++++++++++++++++++++++- 2 files changed, 269 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 9759039a03e9..fddb66e89f60 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -86,6 +86,13 @@ typedef struct _DMUS_PRIVATE_TEMPO_ITEM { DMUS_IO_TEMPO_ITEM item; } DMUS_PRIVATE_TEMPO_ITEM, *LPDMUS_PRIVATE_TEMPO_ITEM; +struct DMUS_PRIVATE_WAVE_ITEM { + struct list entry; /* for listing elements */ + DMUS_IO_WAVE_TRACK_HEADER header; + + IDirectMusicObject *object; +}; + typedef struct _DMUS_PRIVATE_SEGMENT_ITEM { struct list entry; /* for listing elements */ DMUS_IO_SEGMENT_ITEM_HEADER header; diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 1c6b08b52355..84d0bfa10dd5 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -20,6 +20,8 @@ #include "dmime_private.h" #include "dmobject.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(dmime); /***************************************************************************** @@ -32,6 +34,8 @@ typedef struct IDirectMusicWaveTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; struct dmobject dmobj; /* IPersistStream only */ LONG ref; + + struct list items; } IDirectMusicWaveTrack; /* IDirectMusicWaveTrack IDirectMusicTrack8 part: */ @@ -40,6 +44,11 @@ static inline IDirectMusicWaveTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, IDirectMusicTrack8_iface); } +static inline IDirectMusicWaveTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI wave_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { @@ -81,6 +90,19 @@ static ULONG WINAPI wave_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { + struct list *cursor, *cursor2; + struct DMUS_PRIVATE_WAVE_ITEM *item; + + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->items) { + item = LIST_ENTRY(cursor, struct DMUS_PRIVATE_WAVE_ITEM, entry); + list_remove(cursor); + + if (item->object) + IDirectMusicObject_Release(item->object); + + heap_free(item); + } + HeapFree(GetProcessHeap(), 0, This); DMIME_UnlockModule(); } @@ -280,10 +302,247 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { wave_track_Join }; +static HRESULT stream_parse_reference(IStream *stream, const struct chunk_entry *parent, + IDirectMusicObject **object) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = parent}; + DMUS_IO_REFERENCE reference; + DMUS_OBJECTDESC description; + IDirectMusicGetLoader *getloader; + IDirectMusicLoader *loader; + + memset(&description, 0, sizeof(description)); + + *object = NULL; + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if(chunk.id != DMUS_FOURCC_REF_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &reference, chunk.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + + TRACE("REFERENCE guidClassID %s, dwValidData 0x%08x\n", debugstr_dmguid(&reference.guidClassID), + reference.dwValidData); + + description.dwValidData = DMUS_OBJ_CLASS; + description.guidClass = reference.guidClassID; + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { + switch (chunk.id) { + case DMUS_FOURCC_GUID_CHUNK: { + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &description.guidObject, + chunk.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + description.dwValidData |= DMUS_OBJ_OBJECT; + break; + } + case DMUS_FOURCC_DATE_CHUNK: { + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &description.ftDate, + chunk.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + description.dwValidData |= DMUS_OBJ_DATE; + break; + } + case DMUS_FOURCC_NAME_CHUNK: { + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &description.wszName, + chunk.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + description.dwValidData |= DMUS_OBJ_NAME; + break; + } + case DMUS_FOURCC_FILE_CHUNK: { + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &description.wszFileName, + chunk.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + description.dwValidData |= DMUS_OBJ_FILENAME; + break; + } + case DMUS_FOURCC_VERSION_CHUNK: { + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &description.vVersion, + chunk.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + description.dwValidData |= DMUS_OBJ_VERSION; + break; + } + case DMUS_FOURCC_CATEGORY_CHUNK: { + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &description.wszCategory, + chunk.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + description.dwValidData |= DMUS_OBJ_CATEGORY; + break; + } + } + } + + dump_DMUS_OBJECTDESC(&description); + + hr = IStream_QueryInterface (stream, &IID_IDirectMusicGetLoader, (void**)&getloader); + if (FAILED(hr)) + return hr; + + hr = IDirectMusicGetLoader_GetLoader (getloader, &loader); + if (FAILED(hr)) + return hr; + IDirectMusicGetLoader_Release (getloader); + + hr = IDirectMusicLoader_GetObject (loader, &description, &IID_IDirectMusicObject, (void**)&object); + IDirectMusicLoader_Release (loader); + + return SUCCEEDED(hr) ? S_OK : hr; +} + +static HRESULT parse_wave_item(IDirectMusicWaveTrack *This, IStream *stream, + struct chunk_entry *wave, struct DMUS_PRIVATE_WAVE_ITEM *item) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = wave}; + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if(chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVE_LIST) + { + struct chunk_entry child = {.parent = &chunk}; + DMUS_IO_WAVE_ITEM_HEADER header; + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if(child.id != DMUS_FOURCC_WAVEITEM_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, child.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_IO_WAVE_ITEM_HEADER\n"); + TRACE(" - lVolume %d\n", header.lVolume); + TRACE(" - dwVariations %d\n", header.dwVariations); + TRACE(" - rtTime %d\n", header.rtTime); + TRACE(" - rtStartOffset %d\n", header.rtStartOffset); + TRACE(" - rtReserved %d\n", header.rtReserved); + TRACE(" - rtDuration %d\n", header.rtDuration); + TRACE(" - dwLoopStart %d\n", header.dwLoopStart); + TRACE(" - dwLoopEnd %d\n", header.dwLoopEnd); + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); + TRACE(" - wVolumeRange %d\n", header.wVolumeRange); + TRACE(" - wPitchRange %d\n", header.wPitchRange); + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if(child.id == FOURCC_LIST && child.type == DMUS_FOURCC_REF_LIST) + { + hr = stream_parse_reference(stream, &child, &item->object); + } + } + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return SUCCEEDED(hr) ? S_OK : hr; +} + +static HRESULT parse_wavetrack_list(IDirectMusicWaveTrack *This, IStream *stream, + struct chunk_entry *wave) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = wave}; + struct DMUS_PRIVATE_WAVE_ITEM *item = NULL; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(wave)); + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if (chunk.id != DMUS_FOURCC_WAVETRACK_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + item = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct DMUS_PRIVATE_WAVE_ITEM)); + if (!item) + return E_OUTOFMEMORY; + + list_add_tail (&This->items, &item->entry); + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVEPART_LIST) + { + struct chunk_entry child = {.parent = wave}; + DMUS_IO_WAVE_PART_HEADER header; + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if (child.id != DMUS_FOURCC_WAVEPART_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, child.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_IO_WAVE_PART_HEADER\n"); + TRACE(" - lVolume %d\n", header.lVolume); + TRACE(" - dwVariations %d\n", header.dwVariations); + TRACE(" - dwPChannel %d\n", header.dwPChannel); + TRACE(" - dwLockToPart %d\n", header.dwLockToPart); + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); + TRACE(" - dwIndex %d\n", header.dwIndex); + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if(child.id != FOURCC_LIST || child.type != DMUS_FOURCC_WAVEITEM_LIST) + return DMUS_E_UNSUPPORTED_STREAM; + + hr = parse_wave_item(This, stream, &child, item); + } + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return SUCCEEDED(hr) ? S_OK : hr; +} + static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicWaveTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVETRACK_LIST) + hr = parse_wavetrack_list(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = { @@ -313,6 +572,7 @@ HRESULT WINAPI create_dmwavetrack(REFIID lpcGUID, void **ppobj) dmobject_init(&track->dmobj, &CLSID_DirectMusicWaveTrack, (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; + list_init(&track->items); DMIME_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); -- 2.26.2

3 2

[PATCH 4/5] wined3d: Move device window to the correct output in wined3d_swapchain_state_resize_target().
by Zhiyi Zhang May 5, 2020

May 5, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 43 +++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 86f8277a27d..dd0419412af 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1472,7 +1472,9 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta struct wined3d_output *output, const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; + struct wined3d_output_desc output_desc; RECT original_window_rect, window_rect; + int x, y, width, height; HWND window; HRESULT hr; @@ -1488,37 +1490,42 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta AdjustWindowRectEx(&window_rect, GetWindowLongW(window, GWL_STYLE), FALSE, GetWindowLongW(window, GWL_EXSTYLE)); - SetRect(&window_rect, 0, 0, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); GetWindowRect(window, &original_window_rect); - OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); - } - else if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) - { - actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, output, &actual_mode))) - { - wined3d_mutex_unlock(); - return hr; - } - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); + + x = original_window_rect.left; + y = original_window_rect.top; + width = window_rect.right - window_rect.left; + height = window_rect.bottom - window_rect.top; } else { - if (FAILED(hr = wined3d_output_get_display_mode(output, &actual_mode, NULL))) + if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { - ERR("Failed to get display mode, hr %#x.\n", hr); + actual_mode = *mode; + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, output, &actual_mode))) + { + ERR("Failed to set display mode, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } + } + + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + { + ERR("Failed to get output description, hr %#x.\n", hr); wined3d_mutex_unlock(); return hr; } - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); + x = output_desc.desktop_rect.left; + y = output_desc.desktop_rect.top; + width = output_desc.desktop_rect.right - output_desc.desktop_rect.left; + height = output_desc.desktop_rect.bottom - output_desc.desktop_rect.top; } wined3d_mutex_unlock(); - MoveWindow(window, window_rect.left, window_rect.top, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); + MoveWindow(window, x, y, width, height, TRUE); return WINED3D_OK; } -- 2.25.1

2 1