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

Matteo Bruni : wined3d: Introduce WINED3DUSAGE_MANAGED.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 1f8431658e5d75eab399db697c20ef5023d403a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f8431658e5d75eab399db697c20ef… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 29 14:42:00 2022 -0500 wined3d: Introduce WINED3DUSAGE_MANAGED. We would like to use two different textures for the CPU and GPU parts of managed textures, which means that wined3d_resource_access_is_managed() as such will no longer be useful. --- dlls/d3d8/d3d8_private.h | 5 +++++ dlls/d3d9/d3d9_private.h | 5 +++++ dlls/ddraw/surface.c | 1 + dlls/wined3d/buffer.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/resource.c | 7 ++++--- dlls/wined3d/texture.c | 8 +++----- dlls/wined3d/utils.c | 1 + include/wine/wined3d.h | 1 + 9 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 0fb3bd5b73e..656f7f1859d 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -308,6 +308,9 @@ static inline DWORD d3dusage_from_wined3dusage(unsigned int wined3d_usage, unsig static inline D3DPOOL d3dpool_from_wined3daccess(unsigned int access, unsigned int usage) { + if (usage & WINED3DUSAGE_MANAGED) + return D3DPOOL_MANAGED; + switch (access & (WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU)) { default: @@ -358,6 +361,8 @@ static inline unsigned int wined3d_usage_from_d3d(D3DPOOL pool, DWORD usage) usage &= WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) usage |= WINED3DUSAGE_SCRATCH; + else if (pool == D3DPOOL_MANAGED) + usage |= WINED3DUSAGE_MANAGED; return usage; } diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index caa146ccd85..858568f5e1c 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -318,6 +318,9 @@ static inline DWORD d3dusage_from_wined3dusage(unsigned int wined3d_usage, unsig static inline D3DPOOL d3dpool_from_wined3daccess(unsigned int access, unsigned int usage) { + if (usage & WINED3DUSAGE_MANAGED) + return D3DPOOL_MANAGED; + switch (access & (WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU)) { default: @@ -378,6 +381,8 @@ static inline unsigned int wined3d_usage_from_d3d(D3DPOOL pool, DWORD usage) usage &= WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) usage |= WINED3DUSAGE_SCRATCH; + else if (pool == D3DPOOL_MANAGED) + usage |= WINED3DUSAGE_MANAGED; return usage; } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 038539632e1..e4382a74ecd 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6441,6 +6441,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; /* Managed textures have the system memory flag set. */ desc->ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; + wined3d_desc.usage |= WINED3DUSAGE_MANAGED; } else if (desc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) { diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index a3c725136dd..3a2263d109f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1296,7 +1296,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d buffer, buffer->resource.size, buffer->resource.usage, buffer->resource.heap_memory); if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING - || wined3d_resource_access_is_managed(access)) + || (desc->usage & WINED3DUSAGE_MANAGED)) { /* SWvp and managed buffers always return the same pointer in buffer * maps and retain data in DISCARD maps. Keep a system memory copy of diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 498e2075875..f215da6d310 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5525,7 +5525,7 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) { TRACE("Checking resource %p for eviction.\n", resource); - if (wined3d_resource_access_is_managed(resource->access) && !resource->map_count) + if ((resource->usage & WINED3DUSAGE_MANAGED) && !resource->map_count) { TRACE("Evicting %p.\n", resource); wined3d_cs_emit_unload_resource(device->cs, resource); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 857750d6bd7..08edce3630c 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -32,6 +32,7 @@ static void resource_check_usage(DWORD usage, unsigned int access) | WINED3DUSAGE_STATICDECL | WINED3DUSAGE_OVERLAY | WINED3DUSAGE_SCRATCH + | WINED3DUSAGE_MANAGED | WINED3DUSAGE_PRIVATE | WINED3DUSAGE_LEGACY_CUBEMAP | ~WINED3DUSAGE_MASK; @@ -97,8 +98,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * return WINED3DERR_INVALIDCALL; } - /* Dynamic usage is incompatible with GPU writes. */ - if (usage & WINED3DUSAGE_DYNAMIC) + /* Dynamic and managed usages are incompatible with GPU writes. */ + if (usage & (WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_MANAGED)) { WARN("Bind flags %s are incompatible with resource usage %s.\n", wined3d_debug_bind_flags(bind_flags), debug_d3dusage(usage)); @@ -268,7 +269,7 @@ DWORD CDECL wined3d_resource_set_priority(struct wined3d_resource *resource, DWO { DWORD prev; - if (!wined3d_resource_access_is_managed(resource->access)) + if (!(resource->usage & WINED3DUSAGE_MANAGED)) { WARN("Called on non-managed resource %p, ignoring.\n", resource); return 0; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 39ef6376203..15d87e02183 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1736,7 +1736,7 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) /* The d3d9:texture test shows that SetLOD is ignored on non-managed * textures. The call always returns 0, and GetLOD always returns 0. */ resource = &texture->resource; - if (!wined3d_resource_access_is_managed(resource->access)) + if (!(resource->usage & WINED3DUSAGE_MANAGED)) { TRACE("Ignoring LOD on texture with resource access %s.\n", wined3d_debug_resource_access(resource->access)); @@ -3872,11 +3872,9 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc } format = wined3d_get_format(device->adapter, desc->format, desc->bind_flags); - if (desc->usage & WINED3DUSAGE_DYNAMIC && (wined3d_resource_access_is_managed(desc->access) - || desc->usage & WINED3DUSAGE_SCRATCH)) + if ((desc->usage & WINED3DUSAGE_DYNAMIC) && (desc->usage & (WINED3DUSAGE_MANAGED | WINED3DUSAGE_SCRATCH))) { - WARN("Attempted to create a dynamic texture with access %s and usage %s.\n", - wined3d_debug_resource_access(desc->access), debug_d3dusage(desc->usage)); + WARN("Attempted to create a dynamic texture with usage %s.\n", debug_d3dusage(desc->usage)); return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 06c95135678..47500460a2e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4950,6 +4950,7 @@ const char *debug_d3dusage(DWORD usage) WINED3DUSAGE_TO_STR(WINED3DUSAGE_OWNDC); WINED3DUSAGE_TO_STR(WINED3DUSAGE_STATICDECL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_OVERLAY); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_MANAGED); WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_FILTER); WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_GENMIPMAP); WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_LEGACYBUMPMAP); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5d51de70863..1348b6fe368 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -953,6 +953,7 @@ enum wined3d_memory_segment_group #define WINED3DUSAGE_OWNDC 0x02000000 #define WINED3DUSAGE_STATICDECL 0x04000000 #define WINED3DUSAGE_OVERLAY 0x08000000 +#define WINED3DUSAGE_MANAGED 0x20000000 #define WINED3DUSAGE_QUERY_GENMIPMAP 0x00000400 #define WINED3DUSAGE_QUERY_LEGACYBUMPMAP 0x00008000

1 0

Zhiyi Zhang : comctl32/tests: Add IME tests for edit control.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 80bec58649772ae29c532381e8f6b4439875c27a URL: https://gitlab.winehq.org/wine/wine/-/commit/80bec58649772ae29c532381e8f6b4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 comctl32/tests: Add IME tests for edit control. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/Makefile.in | 2 +- dlls/comctl32/tests/edit.c | 211 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 212 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 4669efcf2b5..3f80250081c 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = comctl32.dll -IMPORTS = ole32 user32 gdi32 advapi32 +IMPORTS = ole32 user32 gdi32 advapi32 imm32 C_SRCS = \ animate.c \ diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 4bfbecc713b..e13976a2387 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -20,6 +20,7 @@ #include <windows.h> #include <commctrl.h> +#include <imm.h> #include "wine/test.h" #include "v6util.h" @@ -3441,6 +3442,215 @@ static void test_change_focus(void) DestroyWindow(hwnd); } +static const struct message wm_ime_composition_seq[] = +{ + {WM_IME_STARTCOMPOSITION, sent}, + {WM_IME_COMPOSITION, sent | wparam, 'W'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'W'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'i'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'n'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'e'}, + {WM_IME_ENDCOMPOSITION, sent}, + {WM_CHAR, sent | wparam, 'W'}, + {WM_CHAR, sent | wparam, 'i'}, + {WM_CHAR, sent | wparam, 'n'}, + {WM_CHAR, sent | wparam, 'e'}, + {0} +}; + +static const struct message wm_ime_char_seq[] = +{ + {WM_IME_CHAR, sent | wparam, '0'}, + {WM_CHAR, sent | wparam, '0'}, + {0} +}; + +static const struct message eimes_getcompstratonce_seq[] = +{ + {WM_IME_STARTCOMPOSITION, sent}, + {WM_IME_COMPOSITION, sent | wparam, 'W'}, + {WM_IME_ENDCOMPOSITION, sent}, + {0} +}; + +static LRESULT CALLBACK edit_ime_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + static LONG defwndproc_counter = 0; + struct message msg = {0}; + LRESULT ret; + + msg.message = message; + msg.flags = sent | wparam; + if (defwndproc_counter) + msg.flags |= defwinproc; + msg.wParam = wParam; + + if (message < 0xc000 && + message != WM_GETTEXTLENGTH && + message != WM_GETTEXT && + message != WM_GETFONT && + message != WM_GETICON && + message != WM_IME_SETCONTEXT && + message != WM_IME_NOTIFY && + message != WM_CTLCOLOREDIT && + message != WM_PAINT && + message != WM_ERASEBKGND && + message != WM_NCHITTEST && + message != WM_SETCURSOR && + message != WM_MOUSEMOVE && + message != WM_MOUSEACTIVATE && + message != WM_KEYUP && + (message < EM_GETSEL || message > EM_GETIMESTATUS)) + { + add_message(sequences, COMBINED_SEQ_INDEX, &msg); + } + + defwndproc_counter++; + if (IsWindowUnicode(hwnd)) + ret = CallWindowProcW(oldproc, hwnd, message, wParam, lParam); + else + ret = CallWindowProcA(oldproc, hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + +static void test_ime(void) +{ + WNDPROC old_proc; + LRESULT lr; + HIMC himc; + HWND hwnd; + BOOL ret; + MSG msg; + + hwnd = create_editcontrol(WS_POPUP | WS_VISIBLE, 0); + + /* Test EM_{GET|SET}IMESTATUS */ + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); + + /* Note that EM_SETIMESTATUS always return 1, which is contrary to what MSDN says about + * returning the previous LPARAM value */ + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + todo_wine + ok(lr == EIMES_GETCOMPSTRATONCE, "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_CANCELCOMPSTRINFOCUS); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + todo_wine + ok(lr == EIMES_CANCELCOMPSTRINFOCUS, "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_COMPLETECOMPSTRKILLFOCUS); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + todo_wine + ok(lr == EIMES_COMPLETECOMPSTRKILLFOCUS, "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE + | EIMES_CANCELCOMPSTRINFOCUS | EIMES_COMPLETECOMPSTRKILLFOCUS); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + todo_wine + ok(lr == (EIMES_GETCOMPSTRATONCE | EIMES_CANCELCOMPSTRINFOCUS | EIMES_COMPLETECOMPSTRKILLFOCUS), + "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); + + /* Invalid EM_{GET|SET}IMESTATUS status types and flags */ + lr = SendMessageA(hwnd, EM_GETIMESTATUS, 0, 0); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING + 1, 0); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_SETIMESTATUS, 0, EIMES_GETCOMPSTRATONCE); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING + 1, EIMES_GETCOMPSTRATONCE); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0xFFFFFFFF); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + todo_wine + ok(lr == 0xFFFF, "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); + + /* Test IME messages when EIMES_GETCOMPSTRATONCE is not set */ + old_proc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)edit_ime_subclass_proc); + SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)old_proc); + + himc = ImmGetContext(hwnd); + ret = ImmSetCompositionStringA(himc, SCS_SETSTR, "Wine", 4, NULL, 0); + ok(ret, "ImmSetCompositionStringA failed.\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = ImmNotifyIME(himc, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + ok(ret, "ImmNotifyIME failed.\n"); + /* Note that the following message loop is necessary to get the WM_CHAR messages because they + * are posted. Same for the later message loops in this function. */ + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_composition_seq, "WM_IME_COMPOSITION", TRUE); + + /* Test that WM_IME_CHAR is passed to DefWindowProc() to get WM_CHAR */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageA(hwnd, WM_IME_CHAR, '0', 1); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_char_seq, "WM_IME_CHAR", TRUE); + + /* Test IME messages when EIMES_GETCOMPSTRATONCE is set */ + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + todo_wine + ok(lr == EIMES_GETCOMPSTRATONCE, "Got unexpected lr %#Ix.\n", lr); + + ret = ImmSetCompositionStringA(himc, SCS_SETSTR, "Wine", 4, NULL, 0); + ok(ret, "ImmSetCompositionStringA failed.\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = ImmNotifyIME(himc, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + ok(ret, "ImmNotifyIME failed.\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(sequences, COMBINED_SEQ_INDEX, eimes_getcompstratonce_seq, + "WM_IME_COMPOSITION with EIMES_GETCOMPSTRATONCE", TRUE); + + /* Test that WM_IME_CHAR is passed to DefWindowProc() to get WM_CHAR with EIMES_GETCOMPSTRATONCE */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageA(hwnd, WM_IME_CHAR, '0', 1); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_char_seq, "WM_IME_CHAR", TRUE); + + ImmReleaseContext(hwnd, himc); + DestroyWindow(hwnd); +} + START_TEST(edit) { ULONG_PTR ctx_cookie; @@ -3487,6 +3697,7 @@ START_TEST(edit) test_wordbreak_proc(); test_change_focus(); test_cue_banner(); + test_ime(); UnregisterWindowClasses();

1 0

Zhiyi Zhang : comctl32/edit: Implement EM_SETIMESTATUS.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 873f2557365670e7c0313fde2e531a471f318e84 URL: https://gitlab.winehq.org/wine/wine/-/commit/873f2557365670e7c0313fde2e531a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 comctl32/edit: Implement EM_SETIMESTATUS. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/edit.c | 10 +++++++++- dlls/comctl32/tests/edit.c | 10 ---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index f89e11c9203..01212df3525 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -25,7 +25,7 @@ * - EDITBALLOONTIP structure * - EM_HIDEBALLOONTIP/Edit_HideBalloonTip * - EM_SHOWBALLOONTIP/Edit_ShowBalloonTip - * - EM_GETIMESTATUS, EM_SETIMESTATUS + * - EM_GETIMESTATUS * - EN_ALIGN_LTR_EC * - EN_ALIGN_RTL_EC * - ES_OEMCONVERT @@ -143,6 +143,7 @@ typedef struct */ UINT composition_len; /* length of composition, 0 == no composition */ int composition_start; /* the character position for the composition */ + UINT ime_status; /* IME status flag */ /* * Uniscribe Data */ @@ -4810,6 +4811,13 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR result = EDIT_EM_GetCueBanner(es, (WCHAR *)wParam, (DWORD)lParam); break; + case EM_SETIMESTATUS: + if (wParam == EMSIS_COMPOSITIONSTRING) + es->ime_status = lParam & 0xFFFF; + + result = 1; + break; + /* End of the EM_ messages which were in numerical order; what order * are these in? vaguely alphabetical? */ diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index e13976a2387..de17fb26f93 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3534,21 +3534,18 @@ static void test_ime(void) /* Note that EM_SETIMESTATUS always return 1, which is contrary to what MSDN says about * returning the previous LPARAM value */ lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); todo_wine ok(lr == EIMES_GETCOMPSTRATONCE, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_CANCELCOMPSTRINFOCUS); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); todo_wine ok(lr == EIMES_CANCELCOMPSTRINFOCUS, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_COMPLETECOMPSTRKILLFOCUS); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); todo_wine @@ -3556,7 +3553,6 @@ static void test_ime(void) lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE | EIMES_CANCELCOMPSTRINFOCUS | EIMES_COMPLETECOMPSTRKILLFOCUS); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); todo_wine @@ -3564,7 +3560,6 @@ static void test_ime(void) "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); @@ -3579,26 +3574,22 @@ static void test_ime(void) ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, 0, EIMES_GETCOMPSTRATONCE); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING + 1, EIMES_GETCOMPSTRATONCE); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0xFFFFFFFF); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); todo_wine ok(lr == 0xFFFF, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); @@ -3626,7 +3617,6 @@ static void test_ime(void) /* Test IME messages when EIMES_GETCOMPSTRATONCE is set */ lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); todo_wine

1 0

Zhiyi Zhang : comctl32/edit: Implement EM_GETIMESTATUS.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 3b97566f0bd833bf12f8fadd2dc9123e59506005 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b97566f0bd833bf12f8fadd2dc912… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 comctl32/edit: Implement EM_GETIMESTATUS. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/edit.c | 5 ++++- dlls/comctl32/tests/edit.c | 8 -------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 01212df3525..fbec6972fee 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -25,7 +25,6 @@ * - EDITBALLOONTIP structure * - EM_HIDEBALLOONTIP/Edit_HideBalloonTip * - EM_SHOWBALLOONTIP/Edit_ShowBalloonTip - * - EM_GETIMESTATUS * - EN_ALIGN_LTR_EC * - EN_ALIGN_RTL_EC * - ES_OEMCONVERT @@ -4818,6 +4817,10 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR result = 1; break; + case EM_GETIMESTATUS: + result = wParam == EMSIS_COMPOSITIONSTRING ? es->ime_status : 1; + break; + /* End of the EM_ messages which were in numerical order; what order * are these in? vaguely alphabetical? */ diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index de17fb26f93..94d17ba8730 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3536,26 +3536,22 @@ static void test_ime(void) lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE); ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); - todo_wine ok(lr == EIMES_GETCOMPSTRATONCE, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_CANCELCOMPSTRINFOCUS); ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); - todo_wine ok(lr == EIMES_CANCELCOMPSTRINFOCUS, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_COMPLETECOMPSTRKILLFOCUS); ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); - todo_wine ok(lr == EIMES_COMPLETECOMPSTRKILLFOCUS, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE | EIMES_CANCELCOMPSTRINFOCUS | EIMES_COMPLETECOMPSTRKILLFOCUS); ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); - todo_wine ok(lr == (EIMES_GETCOMPSTRATONCE | EIMES_CANCELCOMPSTRINFOCUS | EIMES_COMPLETECOMPSTRKILLFOCUS), "Got unexpected lr %#Ix.\n", lr); @@ -3566,11 +3562,9 @@ static void test_ime(void) /* Invalid EM_{GET|SET}IMESTATUS status types and flags */ lr = SendMessageA(hwnd, EM_GETIMESTATUS, 0, 0); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING + 1, 0); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, 0, EIMES_GETCOMPSTRATONCE); @@ -3586,7 +3580,6 @@ static void test_ime(void) lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0xFFFFFFFF); ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); - todo_wine ok(lr == 0xFFFF, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); @@ -3619,7 +3612,6 @@ static void test_ime(void) lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE); ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); - todo_wine ok(lr == EIMES_GETCOMPSTRATONCE, "Got unexpected lr %#Ix.\n", lr); ret = ImmSetCompositionStringA(himc, SCS_SETSTR, "Wine", 4, NULL, 0);

1 0

Zhiyi Zhang : comctl32/edit: Let DefWindowProcW() handle WM_IME_CHAR.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: b3b1cec07703c2ae2c330465d9d6fb7ac1794497 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3b1cec07703c2ae2c330465d9d6fb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 comctl32/edit: Let DefWindowProcW() handle WM_IME_CHAR. So that WM_IME_CHAR will be converted to WM_CHAR in DefWindowProcW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/edit.c | 1 - dlls/comctl32/tests/edit.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index fbec6972fee..2fb97b174b3 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -4859,7 +4859,6 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR } break; - case WM_IME_CHAR: case WM_CHAR: { WCHAR charW = wParam; diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 94d17ba8730..e588df8170b 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3606,7 +3606,7 @@ static void test_ime(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); SendMessageA(hwnd, WM_IME_CHAR, '0', 1); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_char_seq, "WM_IME_CHAR", TRUE); + ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_char_seq, "WM_IME_CHAR", FALSE); /* Test IME messages when EIMES_GETCOMPSTRATONCE is set */ lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE); @@ -3627,7 +3627,7 @@ static void test_ime(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); SendMessageA(hwnd, WM_IME_CHAR, '0', 1); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_char_seq, "WM_IME_CHAR", TRUE); + ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_char_seq, "WM_IME_CHAR", FALSE); ImmReleaseContext(hwnd, himc); DestroyWindow(hwnd);

1 0

Zhiyi Zhang : comctl32/edit: Handle IME composition result string only when EIMES_GETCOMPSTRATONCE is set.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: a1aff0ec8c88ee8dabb7ea7c77cb35de91139cae URL: https://gitlab.winehq.org/wine/wine/-/commit/a1aff0ec8c88ee8dabb7ea7c77cb35… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 comctl32/edit: Handle IME composition result string only when EIMES_GETCOMPSTRATONCE is set. If EIMES_GETCOMPSTRATONCE is not set, WM_IME_COMPOSITION with LPARAM set to GCS_RESULTSTR should be passed to the default window procedure according to MSDN. Fix some windows based on edit control not being able to input Chinese. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/edit.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 2fb97b174b3..5b900825981 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -5062,6 +5062,12 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_IME_COMPOSITION: + if (lParam & GCS_RESULTSTR && !(es->ime_status & EIMES_GETCOMPSTRATONCE)) + { + DefWindowProcW(hwnd, msg, wParam, lParam); + break; + } + EDIT_ImeComposition(hwnd, lParam, es); break;

1 0

Rémi Bernon : qasf: Implement IWMReaderCallbackAdvanced stub interface.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 35d40291b104b2df2ad3e70e5374fa2481c266fe URL: https://gitlab.winehq.org/wine/wine/-/commit/35d40291b104b2df2ad3e70e5374fa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 22:19:00 2022 +0200 qasf: Implement IWMReaderCallbackAdvanced stub interface. --- dlls/qasf/asfreader.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index 6bfe61fd5d3..ea9647accf2 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -471,6 +471,7 @@ static const IFileSourceFilterVtbl file_source_vtbl = struct asf_callback { IWMReaderCallback IWMReaderCallback_iface; + IWMReaderCallbackAdvanced IWMReaderCallbackAdvanced_iface; LONG ref; struct asf_reader *filter; @@ -491,6 +492,8 @@ static HRESULT WINAPI reader_callback_QueryInterface(IWMReaderCallback *iface, c || IsEqualGUID(iid, &IID_IWMStatusCallback) || IsEqualGUID(iid, &IID_IWMReaderCallback)) *out = &callback->IWMReaderCallback_iface; + else if (IsEqualGUID(iid, &IID_IWMReaderCallbackAdvanced)) + *out = &callback->IWMReaderCallbackAdvanced_iface; else { *out = NULL; @@ -628,6 +631,85 @@ static const IWMReaderCallbackVtbl reader_callback_vtbl = reader_callback_OnSample, }; +static inline struct asf_callback *impl_from_IWMReaderCallbackAdvanced(IWMReaderCallbackAdvanced *iface) +{ + return CONTAINING_RECORD(iface, struct asf_callback, IWMReaderCallbackAdvanced_iface); +} + +static HRESULT WINAPI reader_callback_advanced_QueryInterface(IWMReaderCallbackAdvanced *iface, REFIID riid, LPVOID * ppv) +{ + struct asf_callback *impl = impl_from_IWMReaderCallbackAdvanced(iface); + return IUnknown_QueryInterface(&impl->IWMReaderCallback_iface, riid, ppv); +} + +static ULONG WINAPI reader_callback_advanced_AddRef(IWMReaderCallbackAdvanced *iface) +{ + struct asf_callback *impl = impl_from_IWMReaderCallbackAdvanced(iface); + return IUnknown_AddRef(&impl->IWMReaderCallback_iface); +} + +static ULONG WINAPI reader_callback_advanced_Release(IWMReaderCallbackAdvanced *iface) +{ + struct asf_callback *impl = impl_from_IWMReaderCallbackAdvanced(iface); + return IUnknown_Release(&impl->IWMReaderCallback_iface); +} + +static HRESULT WINAPI reader_callback_advanced_OnStreamSample(IWMReaderCallbackAdvanced *iface, + WORD stream, QWORD time, QWORD duration, DWORD flags, INSSBuffer *sample, void *context) +{ + FIXME("iface %p, stream %u, time %I64u, duration %I64u, flags %#lx, sample %p, context %p stub!\n", + iface, stream, time, duration, flags, sample, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI reader_callback_advanced_OnTime(IWMReaderCallbackAdvanced *iface, + QWORD time, void *context) +{ + FIXME("iface %p stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI reader_callback_advanced_OnStreamSelection(IWMReaderCallbackAdvanced *iface, + WORD count, WORD *stream_numbers, WMT_STREAM_SELECTION *selections, void *context) +{ + FIXME("iface %p stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI reader_callback_advanced_OnOutputPropsChanged(IWMReaderCallbackAdvanced *iface, + DWORD output, WM_MEDIA_TYPE *mt, void *context) +{ + FIXME("iface %p stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI reader_callback_advanced_AllocateForStream(IWMReaderCallbackAdvanced *iface, + WORD stream, DWORD size, INSSBuffer **out, void *context) +{ + FIXME("iface %p stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI reader_callback_advanced_AllocateForOutput(IWMReaderCallbackAdvanced *iface, + DWORD output, DWORD size, INSSBuffer **out, void *context) +{ + FIXME("iface %p, output %lu, size %lu, out %p, context %p stub!\n", iface, output, size, out, context); + return E_NOTIMPL; +} + +static const IWMReaderCallbackAdvancedVtbl reader_callback_advanced_vtbl = +{ + reader_callback_advanced_QueryInterface, + reader_callback_advanced_AddRef, + reader_callback_advanced_Release, + reader_callback_advanced_OnStreamSample, + reader_callback_advanced_OnTime, + reader_callback_advanced_OnStreamSelection, + reader_callback_advanced_OnOutputPropsChanged, + reader_callback_advanced_AllocateForStream, + reader_callback_advanced_AllocateForOutput, +}; + static HRESULT asf_callback_create(struct asf_reader *filter, IWMReaderCallback **out) { struct asf_callback *callback; @@ -636,6 +718,7 @@ static HRESULT asf_callback_create(struct asf_reader *filter, IWMReaderCallback return E_OUTOFMEMORY; callback->IWMReaderCallback_iface.lpVtbl = &reader_callback_vtbl; + callback->IWMReaderCallbackAdvanced_iface.lpVtbl = &reader_callback_advanced_vtbl; callback->filter = filter; callback->ref = 1;

1 0

Rémi Bernon : qasf: Implement ASF Reader filter buffer allocation.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: a3ad00da09697d4ca631d399b878cbd2a6bc5dd2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3ad00da09697d4ca631d399b878cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 10 20:13:37 2022 +0200 qasf: Implement ASF Reader filter buffer allocation. --- dlls/qasf/asfreader.c | 157 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 155 insertions(+), 2 deletions(-) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index ea9647accf2..0fdf4a23e12 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -27,6 +27,129 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); +struct buffer +{ + INSSBuffer INSSBuffer_iface; + LONG refcount; + IMediaSample *sample; +}; + +static struct buffer *impl_from_INSSBuffer(INSSBuffer *iface) +{ + return CONTAINING_RECORD(iface, struct buffer, INSSBuffer_iface); +} + +static HRESULT WINAPI buffer_QueryInterface(INSSBuffer *iface, REFIID iid, void **out) +{ + struct buffer *impl = impl_from_INSSBuffer(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_INSSBuffer)) + *out = &impl->INSSBuffer_iface; + else + { + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI buffer_AddRef(INSSBuffer *iface) +{ + struct buffer *impl = impl_from_INSSBuffer(iface); + ULONG ref = InterlockedIncrement(&impl->refcount); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI buffer_Release(INSSBuffer *iface) +{ + struct buffer *impl = impl_from_INSSBuffer(iface); + ULONG ref = InterlockedDecrement(&impl->refcount); + + TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); + + if (!ref) + { + IMediaSample_Release(impl->sample); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI buffer_GetLength(INSSBuffer *iface, DWORD *size) +{ + struct buffer *impl = impl_from_INSSBuffer(iface); + TRACE("iface %p, size %p.\n", iface, size); + *size = IMediaSample_GetActualDataLength(impl->sample); + return S_OK; +} + +static HRESULT WINAPI buffer_SetLength(INSSBuffer *iface, DWORD size) +{ + struct buffer *impl = impl_from_INSSBuffer(iface); + TRACE("iface %p, size %lu.\n", iface, size); + return IMediaSample_SetActualDataLength(impl->sample, size); +} + +static HRESULT WINAPI buffer_GetMaxLength(INSSBuffer *iface, DWORD *size) +{ + struct buffer *impl = impl_from_INSSBuffer(iface); + TRACE("iface %p, size %p.\n", iface, size); + *size = IMediaSample_GetSize(impl->sample); + return S_OK; +} + +static HRESULT WINAPI buffer_GetBuffer(INSSBuffer *iface, BYTE **data) +{ + struct buffer *impl = impl_from_INSSBuffer(iface); + TRACE("iface %p, data %p.\n", iface, data); + return IMediaSample_GetPointer(impl->sample, data); +} + +static HRESULT WINAPI buffer_GetBufferAndLength(INSSBuffer *iface, BYTE **data, DWORD *size) +{ + struct buffer *impl = impl_from_INSSBuffer(iface); + TRACE("iface %p, data %p, size %p.\n", iface, data, size); + *size = IMediaSample_GetSize(impl->sample); + return IMediaSample_GetPointer(impl->sample, data); +} + +static const INSSBufferVtbl buffer_vtbl = +{ + buffer_QueryInterface, + buffer_AddRef, + buffer_Release, + buffer_GetLength, + buffer_SetLength, + buffer_GetMaxLength, + buffer_GetBuffer, + buffer_GetBufferAndLength, +}; + +static HRESULT buffer_create(IMediaSample *sample, INSSBuffer **out) +{ + struct buffer *buffer; + + if (!(buffer = calloc(1, sizeof(struct buffer)))) + return E_OUTOFMEMORY; + + buffer->INSSBuffer_iface.lpVtbl = &buffer_vtbl; + buffer->refcount = 1; + buffer->sample = sample; + + *out = &buffer->INSSBuffer_iface; + TRACE("Created buffer %p for sample %p\n", *out, sample); + + return S_OK; +} + struct asf_stream { struct strmbase_source source; @@ -228,6 +351,12 @@ static HRESULT asf_reader_init_stream(struct strmbase_filter *iface) break; } + if (FAILED(hr = IWMReaderAdvanced_SetAllocateForOutput(reader_advanced, i, TRUE))) + { + WARN("Failed to enable allocation for stream %u, hr %#lx\n", i, hr); + break; + } + if (FAILED(hr = IWMReader_GetOutputFormat(filter->reader, stream->index, 0, &props))) { WARN("Failed to get stream %u output format, hr %#lx\n", i, hr); @@ -693,8 +822,32 @@ static HRESULT WINAPI reader_callback_advanced_AllocateForStream(IWMReaderCallba static HRESULT WINAPI reader_callback_advanced_AllocateForOutput(IWMReaderCallbackAdvanced *iface, DWORD output, DWORD size, INSSBuffer **out, void *context) { - FIXME("iface %p, output %lu, size %lu, out %p, context %p stub!\n", iface, output, size, out, context); - return E_NOTIMPL; + struct asf_reader *filter = impl_from_IWMReaderCallbackAdvanced(iface)->filter; + struct asf_stream *stream = filter->streams + output; + IMediaSample *sample; + HRESULT hr; + + TRACE("iface %p, output %lu, size %lu, out %p, context %p.\n", iface, output, size, out, context); + + *out = NULL; + + if (!stream->source.pin.peer) + return VFW_E_NOT_CONNECTED; + + if (FAILED(hr = IMemAllocator_GetBuffer(stream->source.pAllocator, &sample, NULL, NULL, 0))) + { + WARN("Failed to get a sample, hr %#lx.\n", hr); + return hr; + } + + if (size > IMediaSample_GetSize(sample)) + { + WARN("Allocated media sample is too small, size %lu.\n", size); + IMediaSample_Release(sample); + return VFW_E_BUFFER_OVERFLOW; + } + + return buffer_create(sample, out); } static const IWMReaderCallbackAdvancedVtbl reader_callback_advanced_vtbl =

1 0

Rémi Bernon : qasf: Implement ASF Reader filter IWMReaderCallback_OnSample.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: fa41879fb08c445a85a9f7d06c9fc1b2d5ea1979 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa41879fb08c445a85a9f7d06c9fc1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 24 09:38:01 2022 +0200 qasf: Implement ASF Reader filter IWMReaderCallback_OnSample. --- dlls/qasf/asfreader.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index 0fdf4a23e12..29a695de77f 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -150,6 +150,12 @@ static HRESULT buffer_create(IMediaSample *sample, INSSBuffer **out) return S_OK; } +static struct buffer *unsafe_impl_from_INSSBuffer(INSSBuffer *iface) +{ + if (iface->lpVtbl != &buffer_vtbl) return NULL; + return impl_from_INSSBuffer(iface); +} + struct asf_stream { struct strmbase_source source; @@ -746,9 +752,35 @@ static HRESULT WINAPI reader_callback_OnStatus(IWMReaderCallback *iface, WMT_STA static HRESULT WINAPI reader_callback_OnSample(IWMReaderCallback *iface, DWORD output, QWORD time, QWORD duration, DWORD flags, INSSBuffer *sample, void *context) { - FIXME("iface %p, output %lu, time %I64u, duration %I64u, flags %#lx, sample %p, context %p stub!\n", + struct asf_reader *filter = impl_from_IWMReaderCallback(iface)->filter; + REFERENCE_TIME start_time = time, end_time = time + duration; + struct asf_stream *stream = filter->streams + output; + struct buffer *buffer; + HRESULT hr = S_OK; + + TRACE("iface %p, output %lu, time %I64u, duration %I64u, flags %#lx, sample %p, context %p.\n", iface, output, time, duration, flags, sample, context); - return E_NOTIMPL; + + if (!stream->source.pin.peer) + { + WARN("Output %lu pin is not connected, discarding %p.\n", output, sample); + return S_OK; + } + + if (!(buffer = unsafe_impl_from_INSSBuffer(sample))) + WARN("Unexpected buffer iface %p, discarding.\n", sample); + else + { + IMediaSample_SetTime(buffer->sample, &start_time, &end_time); + IMediaSample_SetDiscontinuity(buffer->sample, !!(flags & WM_SF_DISCONTINUITY)); + IMediaSample_SetSyncPoint(buffer->sample, !!(flags & WM_SF_CLEANPOINT)); + + hr = IMemInputPin_Receive(stream->source.pMemInputPin, buffer->sample); + + TRACE("Receive returned hr %#lx.\n", hr); + } + + return hr; } static const IWMReaderCallbackVtbl reader_callback_vtbl =

1 0

Rémi Bernon : qasf: Implement ASF Reader SourceSeeking stubs.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 9b2606f3ffd652b87c5cd1b9d7552e112750567f URL: https://gitlab.winehq.org/wine/wine/-/commit/9b2606f3ffd652b87c5cd1b9d7552e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 27 10:45:33 2022 +0200 qasf: Implement ASF Reader SourceSeeking stubs. --- dlls/qasf/asfreader.c | 131 ++++++++++++++++++++++++++++++++++++++++++++ dlls/qasf/tests/asfreader.c | 1 - 2 files changed, 131 insertions(+), 1 deletion(-) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index 29a695de77f..7bc57a2d500 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -27,6 +27,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); +static inline const char *debugstr_time(REFERENCE_TIME time) +{ + ULONGLONG abstime = time >= 0 ? time : -time; + unsigned int i = 0, j = 0; + char buffer[23], rev[23]; + + while (abstime || i <= 8) + { + buffer[i++] = '0' + (abstime % 10); + abstime /= 10; + if (i == 7) buffer[i++] = '.'; + } + if (time < 0) buffer[i++] = '-'; + + while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +} + struct buffer { INSSBuffer INSSBuffer_iface; @@ -159,6 +180,7 @@ static struct buffer *unsafe_impl_from_INSSBuffer(INSSBuffer *iface) struct asf_stream { struct strmbase_source source; + struct SourceSeeking seek; DWORD index; }; @@ -266,6 +288,93 @@ static HRESULT asf_stream_get_media_type(struct strmbase_pin *iface, unsigned in return hr; } +static HRESULT asf_stream_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct asf_stream *stream = impl_from_strmbase_pin(iface); + + if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &stream->seek.IMediaSeeking_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static inline struct asf_stream *impl_from_IMediaSeeking(IMediaSeeking *iface) +{ + return CONTAINING_RECORD(iface, struct asf_stream, seek.IMediaSeeking_iface); +} + +static HRESULT WINAPI media_seeking_ChangeCurrent(IMediaSeeking *iface) +{ + FIXME("iface %p stub!\n", iface); + return S_OK; +} + +static HRESULT WINAPI media_seeking_ChangeStop(IMediaSeeking *iface) +{ + FIXME("iface %p stub!\n", iface); + return S_OK; +} + +static HRESULT WINAPI media_seeking_ChangeRate(IMediaSeeking *iface) +{ + FIXME("iface %p stub!\n", iface); + return S_OK; +} + +static HRESULT WINAPI media_seeking_QueryInterface(IMediaSeeking *iface, REFIID riid, void **ppv) +{ + struct asf_stream *impl = impl_from_IMediaSeeking(iface); + return IUnknown_QueryInterface(&impl->source.pin.IPin_iface, riid, ppv); +} + +static ULONG WINAPI media_seeking_AddRef(IMediaSeeking *iface) +{ + struct asf_stream *impl = impl_from_IMediaSeeking(iface); + return IUnknown_AddRef(&impl->source.pin.IPin_iface); +} + +static ULONG WINAPI media_seeking_Release(IMediaSeeking *iface) +{ + struct asf_stream *impl = impl_from_IMediaSeeking(iface); + return IUnknown_Release(&impl->source.pin.IPin_iface); +} + +static HRESULT WINAPI media_seeking_SetPositions(IMediaSeeking *iface, + LONGLONG *current, DWORD current_flags, LONGLONG *stop, DWORD stop_flags) +{ + FIXME("iface %p, current %s, current_flags %#lx, stop %s, stop_flags %#lx stub!\n", + iface, current ? debugstr_time(*current) : "<null>", current_flags, + stop ? debugstr_time(*stop) : "<null>", stop_flags); + return SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); +} + +static const IMediaSeekingVtbl media_seeking_vtbl = +{ + media_seeking_QueryInterface, + media_seeking_AddRef, + media_seeking_Release, + SourceSeekingImpl_GetCapabilities, + SourceSeekingImpl_CheckCapabilities, + SourceSeekingImpl_IsFormatSupported, + SourceSeekingImpl_QueryPreferredFormat, + SourceSeekingImpl_GetTimeFormat, + SourceSeekingImpl_IsUsingTimeFormat, + SourceSeekingImpl_SetTimeFormat, + SourceSeekingImpl_GetDuration, + SourceSeekingImpl_GetStopPosition, + SourceSeekingImpl_GetCurrentPosition, + SourceSeekingImpl_ConvertTimeFormat, + media_seeking_SetPositions, + SourceSeekingImpl_GetPositions, + SourceSeekingImpl_GetAvailable, + SourceSeekingImpl_SetRate, + SourceSeekingImpl_GetRate, + SourceSeekingImpl_GetPreroll, +}; + static inline struct asf_reader *impl_from_strmbase_filter(struct strmbase_filter *iface) { return CONTAINING_RECORD(iface, struct asf_reader, filter); @@ -492,6 +601,7 @@ static const struct strmbase_source_ops source_ops = { .base.pin_query_accept = asf_stream_query_accept, .base.pin_get_media_type = asf_stream_get_media_type, + .base.pin_query_interface = asf_stream_query_interface, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideBufferSize = asf_reader_DecideBufferSize, @@ -668,8 +778,10 @@ static HRESULT WINAPI reader_callback_OnStatus(IWMReaderCallback *iface, WMT_STA { struct asf_reader *filter = impl_from_IWMReaderCallback(iface)->filter; AM_MEDIA_TYPE stream_media_type = {{0}}; + IWMHeaderInfo *header_info; DWORD i, stream_count; WCHAR name[MAX_PATH]; + QWORD duration; HRESULT hr; TRACE("iface %p, status %d, result %#lx, type %d, value %p, context %p.\n", @@ -689,6 +801,20 @@ static HRESULT WINAPI reader_callback_OnStatus(IWMReaderCallback *iface, WMT_STA stream_count = ARRAY_SIZE(filter->streams); } + if (FAILED(hr = IWMReader_QueryInterface(filter->reader, &IID_IWMHeaderInfo, + (void **)&header_info))) + duration = 0; + else + { + WMT_ATTR_DATATYPE type = WMT_TYPE_QWORD; + WORD index = 0, size = sizeof(duration); + + if (FAILED(IWMHeaderInfo_GetAttributeByName(header_info, &index, L"Duration", + &type, (BYTE *)&duration, &size ))) + duration = 0; + IWMHeaderInfo_Release(header_info); + } + for (i = 0; i < stream_count; ++i) { struct asf_stream *stream = filter->streams + i; @@ -702,6 +828,11 @@ static HRESULT WINAPI reader_callback_OnStatus(IWMReaderCallback *iface, WMT_STA FreeMediaType(&stream_media_type); strmbase_source_init(&stream->source, &filter->filter, name, &source_ops); + strmbase_seeking_init(&stream->seek, &media_seeking_vtbl, media_seeking_ChangeStop, + media_seeking_ChangeCurrent, media_seeking_ChangeRate); + stream->seek.llCurrent = 0; + stream->seek.llDuration = duration; + stream->seek.llStop = duration; } filter->stream_count = stream_count; BaseFilterImpl_IncrementPinVersion(&filter->filter); diff --git a/dlls/qasf/tests/asfreader.c b/dlls/qasf/tests/asfreader.c index ed78a856003..3a2e18a3054 100644 --- a/dlls/qasf/tests/asfreader.c +++ b/dlls/qasf/tests/asfreader.c @@ -258,7 +258,6 @@ static void check_pin(IPin *pin, IBaseFilter *expect_filter, PIN_DIRECTION expec check_interface(pin, &IID_IPin, TRUE); check_interface(pin, &IID_IUnknown, TRUE); - todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); todo_wine check_interface(pin, &IID_IQualityControl, TRUE);

1 0