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

[PATCH 3/3] windowscodecs: Implement DdsFrameDecode_GetSize().
by Ziqing Hui May 28, 2020

May 28, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 9 +++++++-- dlls/windowscodecs/tests/ddsformat.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-)

2 1

[PATCH 2/3] windowscodecs: Implement DdsDecoder_Dds_GetFrame().
by Ziqing Hui May 28, 2020

May 28, 2020

DdsDecoder_GetFrame() is implemented on top of DdsDecoder_Dds_GetFrame(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 80 ++++++++++++++++++++++++++++++---- 1 file changed, 72 insertions(+), 8 deletions(-)

2 1

[PATCH 1/3] windowscodecs: Get DDS parameters when initialize.
by Ziqing Hui May 28, 2020

May 28, 2020

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

2 1

[PATCH 2/3] mscoree: RegQueryValueExW() wants bytes, not chars.
by Serge Gautherie May 28, 2020

May 28, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/mscoree/metahost.c | 2 +- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 9a29966..7702994 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -477,7 +477,7 @@ static BOOL get_install_root(LPWSTR install_dir) if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, dotnet_key, 0, KEY_READ, &key)) return FALSE; - len = MAX_PATH; + len = MAX_PATH * sizeof(WCHAR); if (RegQueryValueExW(key, install_root, 0, NULL, (LPBYTE)install_dir, &len)) { RegCloseKey(key); diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 81fe561..4679d79 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -80,7 +80,7 @@ static BOOL get_install_root(LPWSTR install_dir) if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, dotnet_key, 0, KEY_READ, &key)) return FALSE; - len = MAX_PATH; + len = MAX_PATH * sizeof(WCHAR); if (RegQueryValueExW(key, install_root, 0, NULL, (LPBYTE)install_dir, &len)) { RegCloseKey(key); -- 2.10.0.windows.1

2 1

[PATCH 04/12] gdiplus/tests: Introduce compare_uint helper.
by Jacek Caban May 28, 2020

May 28, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdiplus/tests/image.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)

2 1

[PATCH 3/3] mshtml: Add IHTMLTableCell::width property implementation.
by Jacek Caban May 28, 2020

May 28, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmltable.c | 25 +++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 23 +++++++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-)

1 0

[PATCH 2/3] mshtml: Add IHTMLTableCell::height property implementation.
by Jacek Caban May 28, 2020

May 28, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmltable.c | 25 +++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 25 ++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 5 deletions(-)

1 0

[PATCH 1/3] mshtml: Use return_nsstr_variant in HTMLTable_get_width.
by Jacek Caban May 28, 2020

May 28, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlnode.c | 4 ++-- dlls/mshtml/htmltable.c | 38 +++--------------------------------- dlls/mshtml/mshtml_private.h | 4 +++- dlls/mshtml/nsembed.c | 22 ++++++++++++++++----- dlls/mshtml/tests/dom.c | 10 ++++++++++ 5 files changed, 35 insertions(+), 43 deletions(-)

1 0

[PATCH 1/6] include: Add Media Engine events constants.
by Nikolay Sivov May 28, 2020

May 28, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mfmediaengine.idl | 43 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index e5d91a57322..4ea3d834cf2 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -94,6 +94,49 @@ typedef enum MF_MEDIA_ENGINE_CREATEFLAGS MF_MEDIA_ENGINE_CREATEFLAGS_MASK = 0x1f } MF_MEDIA_ENGINE_CREATEFLAGS; +typedef enum MF_MEDIA_ENGINE_EVENT +{ + MF_MEDIA_ENGINE_EVENT_LOADSTART = 1, + MF_MEDIA_ENGINE_EVENT_PROGRESS = 2, + MF_MEDIA_ENGINE_EVENT_SUSPEND = 3, + MF_MEDIA_ENGINE_EVENT_ABORT = 4, + MF_MEDIA_ENGINE_EVENT_ERROR = 5, + MF_MEDIA_ENGINE_EVENT_EMPTIED = 6, + MF_MEDIA_ENGINE_EVENT_STALLED = 7, + MF_MEDIA_ENGINE_EVENT_PLAY = 8, + MF_MEDIA_ENGINE_EVENT_PAUSE = 9, + MF_MEDIA_ENGINE_EVENT_LOADEDMETADATA = 10, + MF_MEDIA_ENGINE_EVENT_LOADEDDATA = 11, + MF_MEDIA_ENGINE_EVENT_WAITING = 12, + MF_MEDIA_ENGINE_EVENT_PLAYING = 13, + MF_MEDIA_ENGINE_EVENT_CANPLAY = 14, + MF_MEDIA_ENGINE_EVENT_CANPLAYTHROUGH = 15, + MF_MEDIA_ENGINE_EVENT_SEEKING = 16, + MF_MEDIA_ENGINE_EVENT_SEEKED = 17, + MF_MEDIA_ENGINE_EVENT_TIMEUPDATE = 18, + MF_MEDIA_ENGINE_EVENT_ENDED = 19, + MF_MEDIA_ENGINE_EVENT_RATECHANGE = 20, + MF_MEDIA_ENGINE_EVENT_DURATIONCHANGE = 21, + MF_MEDIA_ENGINE_EVENT_VOLUMECHANGE = 22, + MF_MEDIA_ENGINE_EVENT_FORMATCHANGE = 1000, + MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS = 1001, + MF_MEDIA_ENGINE_EVENT_TIMELINE_MARKER = 1002, + MF_MEDIA_ENGINE_EVENT_BALANCECHANGE = 1003, + MF_MEDIA_ENGINE_EVENT_DOWNLOADCOMPLETE = 1004, + MF_MEDIA_ENGINE_EVENT_BUFFERINGSTARTED = 1005, + MF_MEDIA_ENGINE_EVENT_BUFFERINGENDED = 1006, + MF_MEDIA_ENGINE_EVENT_FRAMESTEPCOMPLETED = 1007, + MF_MEDIA_ENGINE_EVENT_NOTIFYSTABLESTATE = 1008, + MF_MEDIA_ENGINE_EVENT_FIRSTFRAMEREADY = 1009, + MF_MEDIA_ENGINE_EVENT_TRACKSCHANGE = 1010, + MF_MEDIA_ENGINE_EVENT_OPMINFO = 1011, + MF_MEDIA_ENGINE_EVENT_RESOURCELOST = 1012, + MF_MEDIA_ENGINE_EVENT_DELAYLOADEVENT_CHANGED = 1013, + MF_MEDIA_ENGINE_EVENT_STREAMRENDERINGERROR = 1014, + MF_MEDIA_ENGINE_EVENT_SUPPORTEDRATES_CHANGED = 1015, + MF_MEDIA_ENGINE_EVENT_AUDIOENDPOINTCHANGE = 1016, +} MF_MEDIA_ENGINE_EVENT; + [ object, uuid(fc0e10d2-ab2a-4501-a951-06bb1075184c), -- 2.26.2

2 6

[PATCH v2] ddraw: Get new window size from the primary output after display mode changes.
by Zhiyi Zhang May 28, 2020

May 28, 2020

MonitorFromWindow() may return a different monitor if switching to a smaller display mode. Fix Railroad Tycoon II crashes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 185998. Make patch smaller. dlls/ddraw/ddraw.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 6f640ef422a..e92ac25c40e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4926,8 +4926,7 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); - MONITORINFO monitor_info; - HMONITOR monitor; + struct wined3d_output_desc output_desc; RECT *r; TRACE("device_parent %p.\n", device_parent); @@ -4938,15 +4937,13 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic return; } - monitor = MonitorFromWindow(ddraw->swapchain_window, MONITOR_DEFAULTTOPRIMARY); - monitor_info.cbSize = sizeof(monitor_info); - if (!GetMonitorInfoW(monitor, &monitor_info)) + if (FAILED(wined3d_output_get_desc(ddraw->wined3d_output, &output_desc))) { - ERR("Failed to get monitor info.\n"); + ERR("Failed to get output description.\n"); return; } - r = &monitor_info.rcMonitor; + r = &output_desc.desktop_rect; TRACE("Resizing window %p to %s.\n", ddraw->swapchain_window, wine_dbgstr_rect(r)); if (!SetWindowPos(ddraw->swapchain_window, HWND_TOP, r->left, r->top, -- 2.25.1

2 1