- Wine-Commits - list.winehq.org

Alexandros Frantzis : win32u: Cancel auto-repeat only if the repeat key is released.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: 7a25bd885e52cd176cee4dceeaf88607eaa13ec9 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a25bd885e52cd176cee4dceeaf886… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Mar 15 13:59:52 2024 +0200 win32u: Cancel auto-repeat only if the repeat key is released. This fixes the behavior to match other systems, where releasing an unrelated key does not affect the repeating key. --- dlls/win32u/message.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index f7f751ef883..417f67452d7 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2433,7 +2433,9 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, case WM_KEYUP: case WM_SYSKEYUP: - kill_system_timer( thread_info->key_repeat_msg.hwnd, SYSTEM_TIMER_KEY_REPEAT ); + /* Only stop repeat if the scan codes match. */ + if ((thread_info->key_repeat_msg.lParam & 0x01ff0000) == (msg->lParam & 0x01ff0000)) + kill_system_timer( thread_info->key_repeat_msg.hwnd, SYSTEM_TIMER_KEY_REPEAT ); break; } }

1 0

Nikolay Sivov : wshom/network: Implement UserDomain property.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: 9d3e458c55391141971217ec0088931d598236aa URL: https://gitlab.winehq.org/wine/wine/-/commit/9d3e458c55391141971217ec008893… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 15 19:27:06 2024 +0100 wshom/network: Implement UserDomain property. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56434 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wshom.ocx/network.c | 7 +++++-- dlls/wshom.ocx/shell.c | 20 +++++++++++++------- dlls/wshom.ocx/tests/wshom.c | 8 ++++++++ dlls/wshom.ocx/wshom_private.h | 1 + 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c index f2a88c2117f..1f7996d2952 100644 --- a/dlls/wshom.ocx/network.c +++ b/dlls/wshom.ocx/network.c @@ -114,9 +114,12 @@ static HRESULT WINAPI WshNetwork2_Invoke(IWshNetwork2 *iface, DISPID dispIdMembe static HRESULT WINAPI WshNetwork2_get_UserDomain(IWshNetwork2 *iface, BSTR *user_domain) { - FIXME("%p stub\n", user_domain); + TRACE("%p, %p.\n", iface, user_domain); - return E_NOTIMPL; + if (!user_domain) + return E_POINTER; + + return get_env_var(L"USERDOMAIN", user_domain); } static HRESULT WINAPI WshNetwork2_get_UserName(IWshNetwork2 *iface, BSTR *user_name) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 69db995cd0d..dd21e03b898 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -538,16 +538,10 @@ static HRESULT WINAPI WshEnvironment_Invoke(IWshEnvironment *iface, DISPID dispI return hr; } -static HRESULT WINAPI WshEnvironment_get_Item(IWshEnvironment *iface, BSTR name, BSTR *value) +HRESULT get_env_var(const WCHAR *name, BSTR *value) { - WshEnvironment *This = impl_from_IWshEnvironment(iface); DWORD len; - TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), value); - - if (!value) - return E_POINTER; - len = GetEnvironmentVariableW(name, NULL, 0); if (len) { @@ -561,6 +555,18 @@ static HRESULT WINAPI WshEnvironment_get_Item(IWshEnvironment *iface, BSTR name, return *value ? S_OK : E_OUTOFMEMORY; } +static HRESULT WINAPI WshEnvironment_get_Item(IWshEnvironment *iface, BSTR name, BSTR *value) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), value); + + if (!value) + return E_POINTER; + + return get_env_var(name, value); +} + static HRESULT WINAPI WshEnvironment_put_Item(IWshEnvironment *iface, BSTR name, BSTR value) { WshEnvironment *This = impl_from_IWshEnvironment(iface); diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index ed0f4e186a3..58736ff601f 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -745,6 +745,14 @@ static void test_wshnetwork(void) SysFreeString(name); SysFreeString(str); + str = NULL; + hr = IWshNetwork2_get_UserDomain(nw2, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + hr = IWshNetwork2_get_UserDomain(nw2, &str); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!str, "Unexpected pointer.\n"); + SysFreeString(str); + IWshNetwork2_Release(nw2); IDispatch_Release(disp); } diff --git a/dlls/wshom.ocx/wshom_private.h b/dlls/wshom.ocx/wshom_private.h index 8e7792c871c..19e3fff5b2c 100644 --- a/dlls/wshom.ocx/wshom_private.h +++ b/dlls/wshom.ocx/wshom_private.h @@ -46,6 +46,7 @@ struct provideclassinfo { }; extern void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo); +HRESULT get_env_var(const WCHAR *name, BSTR *value); HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); HRESULT WINAPI WshNetworkFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**);

1 0

Paul Gofman : server: Ignore some ICMP-originated socket errors for connectionless sockets.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: 4d56a33ab0b8f6f808a3a507e76c29b905dd6d83 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d56a33ab0b8f6f808a3a507e76c29… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 14 20:05:31 2024 -0600 server: Ignore some ICMP-originated socket errors for connectionless sockets. --- server/sock.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/server/sock.c b/server/sock.c index 3ad1ce39194..8a95caded8b 100644 --- a/server/sock.c +++ b/server/sock.c @@ -813,7 +813,7 @@ static void post_sock_messages( struct sock *sock ) } } -static inline int sock_error( struct sock *sock ) +static inline int sock_error( struct sock *sock, int *poll_event ) { int error = 0; socklen_t len = sizeof(error); @@ -839,8 +839,14 @@ static inline int sock_error( struct sock *sock ) error = sock->errors[AFD_POLL_BIT_ACCEPT]; break; - case SOCK_CONNECTED: case SOCK_CONNECTIONLESS: + if (error == ENETUNREACH || error == EHOSTUNREACH || error == ECONNRESET) + { + if (poll_event) *poll_event &= ~POLLERR; + return 0; + } + /* fallthrough */ + case SOCK_CONNECTED: if (error == ECONNRESET || error == EPIPE) { sock->reset = 1; @@ -1346,7 +1352,7 @@ static void sock_poll_event( struct fd *fd, int event ) fprintf(stderr, "socket %p select event: %x\n", sock, event); if (event & (POLLERR | POLLHUP)) - error = sock_error( sock ); + error = sock_error( sock, &event ); switch (sock->state) { @@ -3115,7 +3121,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } - error = sock_error( sock ); + error = sock_error( sock, NULL ); if (!error) { for (i = 0; i < ARRAY_SIZE( sock->errors ); ++i)

1 0

Esme Povirk : user32/tests: Add another missing message for TrackPopupMenu.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: 552cc456d1889ab3ee0dd5ead6c7520c34d030c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/552cc456d1889ab3ee0dd5ead6c752… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Mar 15 20:27:05 2024 +0000 user32/tests: Add another missing message for TrackPopupMenu. --- dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 23e9f043ed8..e11e4a09f7e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2176,6 +2176,7 @@ static const struct message WmTrackPopupMenuMinimizeWindow[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */ { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_ACTIVATE, hook|optional }, /* win11 */ + { WM_NCACTIVATE, sent|optional }, /* win11 */ { WM_CANCELMODE, sent }, { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent|defwinproc },

1 0

Eric Pouech : winedbg: Fallback to PE image when reading memory (minidump).
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: aabf6334f373b2c072896e02af62be80411e611f URL: https://gitlab.winehq.org/wine/wine/-/commit/aabf6334f373b2c072896e02af62be… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Mar 15 10:48:04 2024 +0100 winedbg: Fallback to PE image when reading memory (minidump). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/tgt_minidump.c | 65 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 8ca2bd7e5b6..d7cfb73a088 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -25,6 +25,7 @@ #include "debugger.h" #include "wingdi.h" +#include "winnt.h" #include "winuser.h" #include "tlhelp32.h" #include "wine/debug.h" @@ -143,6 +144,70 @@ static BOOL tgt_process_minidump_read(HANDLE hProcess, const void* addr, return TRUE; } } + /* The memory isn't present in minidump. Try to fetch read-only area from PE image. */ + { + IMAGEHLP_MODULEW64 im = {.SizeOfStruct = sizeof(im)}; + + if (SymGetModuleInfoW64(dbg_curr_process->handle, (DWORD_PTR)addr, &im)) + { + WCHAR *image_name; + HANDLE file, map = 0; + void *pe_mapping = NULL; + BOOL found = FALSE; + const IMAGE_NT_HEADERS *nthdr = NULL; + + image_name = im.LoadedImageName[0] ? im.LoadedImageName : im.ImageName; + if ((file = CreateFileW(image_name, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE && + ((map = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, NULL)) != 0) && + ((pe_mapping = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0)) != NULL) && + (nthdr = RtlImageNtHeader(pe_mapping)) != NULL) + { + DWORD_PTR rva = (DWORD_PTR)addr - im.BaseOfImage; + ptrdiff_t size_hdr = (const BYTE*)(IMAGE_FIRST_SECTION(nthdr) + nthdr->FileHeader.NumberOfSections) - (const BYTE*)pe_mapping; + + /* in the PE header ? */ + if (rva < size_hdr) + { + if (rva + len > size_hdr) + len = size_hdr - rva; + memcpy(buffer, (const BYTE*)pe_mapping + rva, len); + if (rlen) *rlen = len; + found = TRUE; + } + else /* in read only section ? */ + { + /* Note: RtlImageRvaToSection checks RVA against raw size, so we won't + * get section when rva falls into the (raw size, virtual size( interval. + */ + const IMAGE_SECTION_HEADER *section = RtlImageRvaToSection(nthdr, NULL, rva); + if (section && !(section->Characteristics & IMAGE_SCN_MEM_WRITE)) + { + DWORD_PTR offset = rva - section->VirtualAddress; + DWORD nw = len; + + if (offset + nw > section->SizeOfRawData) + nw = section->SizeOfRawData - offset; + memcpy(buffer, (const char*)pe_mapping + section->PointerToRawData + offset, nw); + if (nw < len) /* fill with O? */ + { + if (offset + len > section->Misc.VirtualSize) + len = section->Misc.VirtualSize - offset; + memset((char*)buffer + nw, 0, len - nw); + nw = len; + } + if (rlen) *rlen = nw; + found = TRUE; + } + } + } + if (pe_mapping) UnmapViewOfFile(pe_mapping); + if (map) CloseHandle(map); + if (file != INVALID_HANDLE_VALUE) CloseHandle(file); + if (found) return TRUE; + } + } + /* FIXME: this is a dirty hack to let the last frame in a bt to work * However, we need to check who's to blame, this code or the current * dbghelp!StackWalk implementation

1 0

Rémi Bernon : mfplat/mediatype: Implement MFInitMediaTypeFromVideoInfoHeader2.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: 4319ada73674ca0403b06e1655f4a2757139f87a URL: https://gitlab.winehq.org/wine/wine/-/commit/4319ada73674ca0403b06e1655f4a2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 17 12:30:53 2024 +0100 mfplat/mediatype: Implement MFInitMediaTypeFromVideoInfoHeader2. --- dlls/mfplat/mediatype.c | 26 ++++++++++++++++++++++++-- dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 4 ++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index afe611000a5..a85eaaa411b 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -25,6 +25,7 @@ #include "uuids.h" #include "strmif.h" #include "initguid.h" +#include "dvdmedia.h" #include "ks.h" #include "ksmedia.h" #include "amvideo.h" @@ -3747,9 +3748,9 @@ HRESULT WINAPI MFCreateVideoMediaTypeFromVideoInfoHeader(const KS_VIDEOINFOHEADE } /*********************************************************************** - * MFInitMediaTypeFromVideoInfoHeader (mfplat.@) + * MFInitMediaTypeFromVideoInfoHeader2 (mfplat.@) */ -HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader(IMFMediaType *media_type, const VIDEOINFOHEADER *vih, UINT32 size, +HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader2(IMFMediaType *media_type, const VIDEOINFOHEADER2 *vih, UINT32 size, const GUID *subtype) { HRESULT hr = S_OK; @@ -3793,6 +3794,27 @@ HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader(IMFMediaType *media_type, cons return hr; } +/*********************************************************************** + * MFInitMediaTypeFromVideoInfoHeader (mfplat.@) + */ +HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader(IMFMediaType *media_type, const VIDEOINFOHEADER *vih, UINT32 size, + const GUID *subtype) +{ + VIDEOINFOHEADER2 vih2 = + { + .rcSource = vih->rcSource, + .rcTarget = vih->rcTarget, + .dwBitRate = vih->dwBitRate, + .dwBitErrorRate = vih->dwBitErrorRate, + .AvgTimePerFrame = vih->AvgTimePerFrame, + .bmiHeader = vih->bmiHeader, + }; + + TRACE("%p, %p, %u, %s.\n", media_type, vih, size, debugstr_guid(subtype)); + + return MFInitMediaTypeFromVideoInfoHeader2(media_type, &vih2, sizeof(vih2), subtype); +} + static HRESULT init_am_media_type_audio_format(AM_MEDIA_TYPE *am_type, UINT32 user_size, IMFMediaType *media_type) { UINT32 num_channels, value; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index d7f75351960..44d1b89fff5 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -123,7 +123,7 @@ @ stub MFInitMediaTypeFromMFVideoFormat @ stub MFInitMediaTypeFromMPEG1VideoInfo @ stub MFInitMediaTypeFromMPEG2VideoInfo -@ stub MFInitMediaTypeFromVideoInfoHeader2 +@ stdcall MFInitMediaTypeFromVideoInfoHeader2(ptr ptr long ptr) @ stdcall MFInitMediaTypeFromVideoInfoHeader(ptr ptr long ptr) @ stdcall MFInitMediaTypeFromWaveFormatEx(ptr ptr long) @ stub MFInitVideoFormat diff --git a/include/mfapi.h b/include/mfapi.h index ef5bec16369..27b0f4fd841 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -507,6 +507,8 @@ typedef enum struct tagVIDEOINFOHEADER; typedef struct tagVIDEOINFOHEADER VIDEOINFOHEADER; +struct tagVIDEOINFOHEADER2; +typedef struct tagVIDEOINFOHEADER2 VIDEOINFOHEADER2; typedef struct _AMMediaType AM_MEDIA_TYPE; HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); @@ -593,6 +595,8 @@ HRESULT WINAPI MFInitAMMediaTypeFromMFMediaType(IMFMediaType *media_type, GUID f HRESULT WINAPI MFInitMediaTypeFromAMMediaType(IMFMediaType *mediatype, const AM_MEDIA_TYPE *am_type); HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader(IMFMediaType *media_type, const VIDEOINFOHEADER *vih, UINT32 size, const GUID *subtype); +HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader2(IMFMediaType *media_type, const VIDEOINFOHEADER2 *vih, + UINT32 size, const GUID *subtype); HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WAVEFORMATEX *format, UINT32 size); HRESULT WINAPI MFInitVideoFormat_RGB(MFVIDEOFORMAT *format, DWORD width, DWORD height, DWORD d3dformat); HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result);

1 0

Rémi Bernon : mfplat/mediatype: Implement implicit MFInitMediaTypeFromVideoInfoHeader subtype.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: e497f0e88d32fc2a5f566cca4abd83004437c108 URL: https://gitlab.winehq.org/wine/wine/-/commit/e497f0e88d32fc2a5f566cca4abd83… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 17 14:07:00 2024 +0100 mfplat/mediatype: Implement implicit MFInitMediaTypeFromVideoInfoHeader subtype. --- dlls/mfplat/mediatype.c | 37 +++++++++++++++++++++++++++++-------- dlls/mfplat/tests/mfplat.c | 28 +++++++--------------------- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 66c0aaa2c62..afe611000a5 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2697,13 +2697,14 @@ struct uncompressed_video_format static int __cdecl uncompressed_video_format_compare(const void *a, const void *b) { - const GUID *guid = a; - const struct uncompressed_video_format *format = b; - return memcmp(guid, format->subtype, sizeof(*guid)); + const struct uncompressed_video_format *a_format = a, *b_format = b; + return memcmp(a_format->subtype, b_format->subtype, sizeof(GUID)); } -static const struct uncompressed_video_format video_formats[] = +static struct uncompressed_video_format video_formats[] = { + { &MFVideoFormat_RGB1, 1, 0, 1, 0, BI_RGB }, + { &MFVideoFormat_RGB4, 4, 0, 1, 0, BI_RGB }, { &MFVideoFormat_RGB24, 24, 3, 1, 0, BI_RGB }, { &MFVideoFormat_ARGB32, 32, 3, 1, 0, BI_RGB }, { &MFVideoFormat_RGB32, 32, 3, 1, 0, BI_RGB }, @@ -2736,14 +2737,26 @@ static const struct uncompressed_video_format video_formats[] = { &MEDIASUBTYPE_RGB32, 32, 3, 1, 0, BI_RGB }, }; +static BOOL WINAPI mf_video_formats_init(INIT_ONCE *once, void *param, void **context) +{ + qsort(video_formats, ARRAY_SIZE(video_formats), sizeof(*video_formats), uncompressed_video_format_compare); + return TRUE; +} + static struct uncompressed_video_format *mf_get_video_format(const GUID *subtype) { - return bsearch(subtype, video_formats, ARRAY_SIZE(video_formats), sizeof(*video_formats), + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + struct uncompressed_video_format key = {.subtype = subtype}; + + InitOnceExecuteOnce(&init_once, mf_video_formats_init, NULL, NULL); + + return bsearch(&key, video_formats, ARRAY_SIZE(video_formats), sizeof(*video_formats), uncompressed_video_format_compare); } static unsigned int mf_get_stride_for_format(const struct uncompressed_video_format *format, unsigned int width) { + if (format->bpp < 8) return (width * format->bpp) / 8; return (width * (format->bpp / 8) + format->alignment) & ~format->alignment; } @@ -3743,14 +3756,22 @@ HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader(IMFMediaType *media_type, cons DWORD height; LONG stride; - FIXME("%p, %p, %u, %s.\n", media_type, vih, size, debugstr_guid(subtype)); + TRACE("%p, %p, %u, %s.\n", media_type, vih, size, debugstr_guid(subtype)); IMFMediaType_DeleteAllItems(media_type); if (!subtype) { - FIXME("Implicit subtype is not supported.\n"); - return E_NOTIMPL; + switch (vih->bmiHeader.biBitCount) + { + case 1: subtype = &MFVideoFormat_RGB1; break; + case 4: subtype = &MFVideoFormat_RGB4; break; + case 8: subtype = &MFVideoFormat_RGB8; break; + case 16: subtype = &MFVideoFormat_RGB555; break; + case 24: subtype = &MFVideoFormat_RGB24; break; + case 32: subtype = &MFVideoFormat_RGB32; break; + default: return E_INVALIDARG; + } } height = abs(vih->bmiHeader.biHeight); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 2c48852b4d4..30f6d4b248e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -9854,10 +9854,8 @@ static void test_MFInitMediaTypeFromVideoInfoHeader(void) memset(&vih, 0, sizeof(vih)); hr = MFInitMediaTypeFromVideoInfoHeader(media_type, &vih, 0, NULL); - todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = MFInitMediaTypeFromVideoInfoHeader(media_type, &vih, sizeof(vih), NULL); - todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = MFInitMediaTypeFromVideoInfoHeader(media_type, &vih, sizeof(vih), &GUID_NULL); @@ -9974,7 +9972,6 @@ static void test_MFInitMediaTypeFromVideoInfoHeader(void) /* biBitCount is used for implicit RGB format if GUID is NULL */ hr = MFInitMediaTypeFromVideoInfoHeader(media_type, &vih, sizeof(vih), NULL); - todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); for (vih.bmiHeader.biBitCount = 1; vih.bmiHeader.biBitCount <= 32; vih.bmiHeader.biBitCount++) @@ -9984,35 +9981,31 @@ static void test_MFInitMediaTypeFromVideoInfoHeader(void) hr = MFInitMediaTypeFromVideoInfoHeader(media_type, &vih, sizeof(vih), NULL); if (vih.bmiHeader.biBitCount != 1 && vih.bmiHeader.biBitCount != 4 && vih.bmiHeader.biBitCount != 8 && vih.bmiHeader.biBitCount != 16 && vih.bmiHeader.biBitCount != 24 && vih.bmiHeader.biBitCount != 32) - todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); else { - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); memset(&guid, 0xcd, sizeof(guid)); hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (vih.bmiHeader.biBitCount == 32) - todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_RGB32), "Unexpected guid %s.\n", debugstr_guid(&guid)); + ok(IsEqualGUID(&guid, &MFVideoFormat_RGB32), "Unexpected guid %s.\n", debugstr_guid(&guid)); else if (vih.bmiHeader.biBitCount == 24) - todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_RGB24), "Unexpected guid %s.\n", debugstr_guid(&guid)); + ok(IsEqualGUID(&guid, &MFVideoFormat_RGB24), "Unexpected guid %s.\n", debugstr_guid(&guid)); else if (vih.bmiHeader.biBitCount == 16) - todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_RGB555), "Unexpected guid %s.\n", debugstr_guid(&guid)); + ok(IsEqualGUID(&guid, &MFVideoFormat_RGB555), "Unexpected guid %s.\n", debugstr_guid(&guid)); else if (vih.bmiHeader.biBitCount == 8) - todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_RGB8), "Unexpected guid %s.\n", debugstr_guid(&guid)); + ok(IsEqualGUID(&guid, &MFVideoFormat_RGB8), "Unexpected guid %s.\n", debugstr_guid(&guid)); else if (vih.bmiHeader.biBitCount == 4) - todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_RGB4), "Unexpected guid %s.\n", debugstr_guid(&guid)); + ok(IsEqualGUID(&guid, &MFVideoFormat_RGB4), "Unexpected guid %s.\n", debugstr_guid(&guid)); else if (vih.bmiHeader.biBitCount == 1) - todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_RGB1), "Unexpected guid %s.\n", debugstr_guid(&guid)); + ok(IsEqualGUID(&guid, &MFVideoFormat_RGB1), "Unexpected guid %s.\n", debugstr_guid(&guid)); value32 = 0xdeadbeef; hr = IMFMediaType_GetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, &value32); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (vih.bmiHeader.biBitCount > 1) - todo_wine ok(value32 == 16 * vih.bmiHeader.biBitCount / 8, "Unexpected value %#x.\n", value32); else todo_wine ok(value32 == -4, "Unexpected value %#x.\n", value32); @@ -10025,27 +10018,20 @@ static void test_MFInitMediaTypeFromVideoInfoHeader(void) value32 = 0xdeadbeef; hr = IMFMediaType_GetUINT32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, &value32); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(value32 == 1, "Unexpected value %#x.\n", value32); value32 = 0xdeadbeef; hr = IMFMediaType_GetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value32); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(value32 == 1, "Unexpected value %#x.\n", value32); value32 = 0xdeadbeef; vih.bmiHeader.biHeight = 32; hr = MFInitMediaTypeFromVideoInfoHeader(media_type, &vih, sizeof(vih), NULL); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, &value32); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (vih.bmiHeader.biBitCount > 1) - todo_wine ok(value32 == -16 * vih.bmiHeader.biBitCount / 8, "Unexpected value %#x.\n", value32); else todo_wine ok(value32 == -4, "Unexpected value %#x.\n", value32);

1 0

Rémi Bernon : mfplat/tests: Add tests for MFInitMediaTypeFromVideoInfoHeader2.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: d307cfede9ad66d64b3b39ac85e6814122f078d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/d307cfede9ad66d64b3b39ac85e681… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 17 13:16:57 2024 +0100 mfplat/tests: Add tests for MFInitMediaTypeFromVideoInfoHeader2. --- dlls/mfplat/tests/mfplat.c | 259 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 259 insertions(+)

1 0

Rémi Bernon : mfplat/mediatype: Implement MFInitAMMediaTypeFromMFMediaType for FORMAT_VideoInfo2.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: 8dd24ad2a450c15ba4853d8af4e7e7b5d9afeab5 URL: https://gitlab.winehq.org/wine/wine/-/commit/8dd24ad2a450c15ba4853d8af4e7e7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 17 16:48:58 2024 +0100 mfplat/mediatype: Implement MFInitAMMediaTypeFromMFMediaType for FORMAT_VideoInfo2. --- dlls/mfplat/mediatype.c | 106 ++++++++++++++++++++++++++++----------------- dlls/mfplat/tests/mfplat.c | 8 ++-- 2 files changed, 71 insertions(+), 43 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index a85eaaa411b..1832e0147bc 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3903,11 +3903,51 @@ static HRESULT init_am_media_type_audio_format(AM_MEDIA_TYPE *am_type, UINT32 us return S_OK; } -static HRESULT init_am_media_type_video_format(AM_MEDIA_TYPE *am_type, UINT32 user_size, IMFMediaType *media_type) +static void init_video_info_header2(VIDEOINFOHEADER2 *vih, const GUID *subtype, IMFMediaType *media_type) { + struct uncompressed_video_format *video_format = mf_get_video_format(subtype); UINT32 image_size, bitrate, sample_size; UINT64 frame_size, frame_rate; INT32 width, height; + + vih->bmiHeader.biSize = sizeof(vih->bmiHeader); + vih->bmiHeader.biPlanes = 1; + vih->bmiHeader.biBitCount = video_format ? video_format->bpp : 0; + + if (video_format && video_format->compression != -1) + vih->bmiHeader.biCompression = video_format->compression; + else + vih->bmiHeader.biCompression = subtype->Data1; + + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BITRATE, &bitrate))) + vih->dwBitRate = bitrate; + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BIT_ERROR_RATE, &bitrate))) + vih->dwBitErrorRate = bitrate; + if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_RATE, &frame_rate)) && (frame_rate >> 32)) + vih->AvgTimePerFrame = round(10000000. * (UINT32)frame_rate / (frame_rate >> 32)); + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_SAMPLE_SIZE, &sample_size))) + vih->bmiHeader.biSizeImage = sample_size; + + if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size))) + { + BOOL bottom_up = vih->bmiHeader.biCompression == BI_RGB || vih->bmiHeader.biCompression == BI_BITFIELDS; + + if (FAILED(IMFMediaType_GetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, (UINT32 *)&width))) + width = (frame_size >> 32) * (bottom_up ? -1 : 1); + else if (video_format) + width /= video_format->bpp / 8; + height = (UINT32)frame_size; + + vih->bmiHeader.biWidth = abs(width); + vih->bmiHeader.biHeight = height * (bottom_up && width >= 0 ? -1 : 1); + + if (SUCCEEDED(MFCalculateImageSize(subtype, abs(width), height, &image_size))) + vih->bmiHeader.biSizeImage = image_size; + } +} + +static HRESULT init_am_media_type_video_format(AM_MEDIA_TYPE *am_type, UINT32 user_size, IMFMediaType *media_type) +{ HRESULT hr; if (IsEqualGUID(&am_type->formattype, &FORMAT_WaveFormatEx)) @@ -3920,7 +3960,7 @@ static HRESULT init_am_media_type_video_format(AM_MEDIA_TYPE *am_type, UINT32 us if (IsEqualGUID(&am_type->formattype, &FORMAT_VideoInfo) || IsEqualGUID(&am_type->formattype, &GUID_NULL)) { - struct uncompressed_video_format *video_format = mf_get_video_format(&am_type->subtype); + VIDEOINFOHEADER2 vih = {{0}}; VIDEOINFOHEADER *format; am_type->cbFormat = sizeof(*format) + user_size; @@ -3929,53 +3969,41 @@ static HRESULT init_am_media_type_video_format(AM_MEDIA_TYPE *am_type, UINT32 us format = (VIDEOINFOHEADER *)am_type->pbFormat; memset(format, 0, sizeof(*format)); - format->bmiHeader.biSize = sizeof(format->bmiHeader) + user_size; - format->bmiHeader.biPlanes = 1; - format->bmiHeader.biBitCount = video_format ? video_format->bpp : 0; - - if (video_format && video_format->compression != -1) - format->bmiHeader.biCompression = video_format->compression; - else - format->bmiHeader.biCompression = am_type->subtype.Data1; - - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BITRATE, &bitrate))) - format->dwBitRate = bitrate; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BIT_ERROR_RATE, &bitrate))) - format->dwBitErrorRate = bitrate; - if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_RATE, &frame_rate)) && (frame_rate >> 32)) - format->AvgTimePerFrame = round(10000000. * (UINT32)frame_rate / (frame_rate >> 32)); - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_SAMPLE_SIZE, &sample_size))) - format->bmiHeader.biSizeImage = sample_size; - - if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size))) - { - BOOL bottom_up = format->bmiHeader.biCompression == BI_RGB || format->bmiHeader.biCompression == BI_BITFIELDS; - - if (FAILED(IMFMediaType_GetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, (UINT32 *)&width))) - width = (frame_size >> 32) * (bottom_up ? -1 : 1); - else if (video_format) - width /= video_format->bpp / 8; - height = (UINT32)frame_size; - - format->bmiHeader.biWidth = abs(width); - format->bmiHeader.biHeight = height * (bottom_up && width >= 0 ? -1 : 1); - - if (SUCCEEDED(MFCalculateImageSize(&am_type->subtype, abs(width), height, &image_size))) - format->bmiHeader.biSizeImage = image_size; - } + init_video_info_header2(&vih, &am_type->subtype, media_type); + format->rcSource = vih.rcSource; + format->rcTarget = vih.rcTarget; + format->dwBitRate = vih.dwBitRate; + format->dwBitErrorRate = vih.dwBitErrorRate; + format->AvgTimePerFrame = vih.AvgTimePerFrame; + format->bmiHeader = vih.bmiHeader; if (user_size && FAILED(hr = IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, (BYTE *)(format + 1), user_size, NULL))) return hr; + format->bmiHeader.biSize += user_size; am_type->formattype = FORMAT_VideoInfo; am_type->subtype = get_am_subtype_for_mf_subtype(am_type->subtype); } else if (IsEqualGUID(&am_type->formattype, &FORMAT_VideoInfo2)) { - FIXME("Not implemented!\n"); - am_type->formattype = GUID_NULL; - return E_NOTIMPL; + VIDEOINFOHEADER2 *format; + + am_type->cbFormat = sizeof(*format) + user_size; + if (!(am_type->pbFormat = CoTaskMemAlloc(am_type->cbFormat))) + return E_OUTOFMEMORY; + format = (VIDEOINFOHEADER2 *)am_type->pbFormat; + memset(format, 0, sizeof(*format)); + + init_video_info_header2(format, &am_type->subtype, media_type); + + if (user_size && FAILED(hr = IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, + (BYTE *)(format + 1), user_size, NULL))) + return hr; + format->bmiHeader.biSize += user_size; + + am_type->formattype = FORMAT_VideoInfo2; + am_type->subtype = get_am_subtype_for_mf_subtype(am_type->subtype); } else { diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index bd4ea469678..634dd87ae09 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7213,11 +7213,11 @@ static void test_MFInitAMMediaTypeFromMFMediaType(void) ok(am_type.cbFormat == sizeof(VIDEOINFOHEADER), "got %lu\n", am_type.cbFormat); CoTaskMemFree(am_type.pbFormat); hr = MFInitAMMediaTypeFromMFMediaType(media_type, FORMAT_VideoInfo2, &am_type); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(IsEqualGUID(&am_type.majortype, &MFMediaType_Video), "got %s.\n", debugstr_guid(&am_type.majortype)); - todo_wine ok(IsEqualGUID(&am_type.subtype, &MEDIASUBTYPE_RGB32), "got %s.\n", debugstr_guid(&am_type.subtype)); - todo_wine ok(IsEqualGUID(&am_type.formattype, &FORMAT_VideoInfo2), "got %s.\n", debugstr_guid(&am_type.formattype)); - todo_wine ok(am_type.cbFormat == sizeof(VIDEOINFOHEADER2), "got %lu\n", am_type.cbFormat); + ok(IsEqualGUID(&am_type.subtype, &MEDIASUBTYPE_RGB32), "got %s.\n", debugstr_guid(&am_type.subtype)); + ok(IsEqualGUID(&am_type.formattype, &FORMAT_VideoInfo2), "got %s.\n", debugstr_guid(&am_type.formattype)); + ok(am_type.cbFormat == sizeof(VIDEOINFOHEADER2), "got %lu\n", am_type.cbFormat); CoTaskMemFree(am_type.pbFormat); hr = MFInitAMMediaTypeFromMFMediaType(media_type, FORMAT_MFVideoFormat, &am_type); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Eric Pouech : winedbg: Reload module without virtual flag.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: 6b9c1682b1243618d8cc67a8130cc172b8fb0c17 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b9c1682b1243618d8cc67a8130cc1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Mar 8 12:14:52 2024 +0100 winedbg: Reload module without virtual flag. So that we can get to debug info. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/tgt_minidump.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index d7cfb73a088..ac8d9be71b2 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -496,7 +496,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) mm->SizeOfImage); else SymLoadModuleExW(hProc, NULL, nameW, NULL, get_addr64(mm->BaseOfImage), - mm->SizeOfImage, NULL, SLMFLAG_VIRTUAL); + mm->SizeOfImage, NULL, 0); } } if (MiniDumpReadDumpStream(data->mapping, ModuleListStream, NULL, &stream, NULL)) @@ -518,7 +518,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) mm->SizeOfImage); else SymLoadModuleExW(hProc, NULL, nameW, NULL, get_addr64(mm->BaseOfImage), - mm->SizeOfImage, NULL, SLMFLAG_VIRTUAL); + mm->SizeOfImage, NULL, 0); } } if (MiniDumpReadDumpStream(data->mapping, ExceptionStream, NULL, &stream, NULL))

1 0