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

Jacek Caban : winemac: Directly use win32u for GDI functions in mouse.c.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 8534fe2d714d71a748b3f2da38bfb558fdb82a47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8534fe2d714d71a748b3f2da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 14:15:28 2022 +0200 winemac: Directly use win32u for GDI functions in mouse.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/mouse.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index d101d2513c8..e22cbe5e23f 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -290,7 +290,7 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, } xor_bits = (unsigned long*)((char*)and_bits + info->bmiHeader.biSizeImage / 2); - if (!GetDIBits(hdc, icon->hbmMask, 0, height * 2, and_bits, info, DIB_RGB_COLORS)) + if (!NtGdiGetDIBitsInternal(hdc, icon->hbmMask, 0, height * 2, and_bits, info, DIB_RGB_COLORS, 0, 0)) { WARN("GetDIBits failed\n"); HeapFree(GetProcessHeap(), 0, and_bits); @@ -579,7 +579,8 @@ static CFArrayRef create_color_cursor(HDC hdc, const ICONINFOEXW *iinfo, HANDLE info->bmiHeader.biBitCount = 32; color_size = width * height * 4; info->bmiHeader.biSizeImage = color_size; - hbmColor = CreateDIBSection(hdc, info, DIB_RGB_COLORS, (VOID **) &color_bits, NULL, 0); + hbmColor = NtGdiCreateDIBSection(hdc, NULL, 0, info, DIB_RGB_COLORS, + 0, 0, 0, (void **)&color_bits); if (!hbmColor) { WARN("failed to create DIB section for cursor color data\n"); @@ -597,7 +598,8 @@ static CFArrayRef create_color_cursor(HDC hdc, const ICONINFOEXW *iinfo, HANDLE mask_size = ((width + 31) / 32 * 4) * height; /* width_bytes * height */ info->bmiHeader.biSizeImage = mask_size; - hbmMask = CreateDIBSection(hdc, info, DIB_RGB_COLORS, (VOID **) &mask_bits, NULL, 0); + hbmMask = NtGdiCreateDIBSection(hdc, NULL, 0, info, DIB_RGB_COLORS, + 0, 0, 0, (void **)&mask_bits); if (!hbmMask) { WARN("failed to create DIB section for cursor mask data\n"); @@ -625,8 +627,8 @@ cleanup: else TRACE("returning cursor with %d frames\n", nFrames); /* Cleanup all of the resources used to obtain the frame data */ - if (hbmColor) DeleteObject(hbmColor); - if (hbmMask) DeleteObject(hbmMask); + if (hbmColor) NtGdiDeleteObjectApp(hbmColor); + if (hbmMask) NtGdiDeleteObjectApp(hbmMask); HeapFree(GetProcessHeap(), 0, info); return frames; } @@ -748,15 +750,15 @@ void macdrv_SetCursor(HCURSOR cursor) if ((cursor_name = copy_system_cursor_name(&info))) { - DeleteObject(info.hbmColor); - DeleteObject(info.hbmMask); + NtGdiDeleteObjectApp(info.hbmColor); + NtGdiDeleteObjectApp(info.hbmMask); } else { BITMAP bm; HDC hdc; - GetObjectW(info.hbmMask, sizeof(bm), &bm); + NtGdiExtGetObjectW(info.hbmMask, sizeof(bm), &bm); if (!info.hbmColor) bm.bmHeight = max(1, bm.bmHeight / 2); /* make sure hotspot is valid */ @@ -766,18 +768,18 @@ void macdrv_SetCursor(HCURSOR cursor) info.yHotspot = bm.bmHeight / 2; } - hdc = CreateCompatibleDC(0); + hdc = NtGdiCreateCompatibleDC(0); if (info.hbmColor) { cursor_frames = create_color_cursor(hdc, &info, cursor, bm.bmWidth, bm.bmHeight); - DeleteObject(info.hbmColor); + NtGdiDeleteObjectApp(info.hbmColor); } else cursor_frames = create_monochrome_cursor(hdc, &info, bm.bmWidth, bm.bmHeight); - DeleteObject(info.hbmMask); - DeleteDC(hdc); + NtGdiDeleteObjectApp(info.hbmMask); + NtGdiDeleteObjectApp(hdc); } if (cursor_name || cursor_frames)

1 0

Jacek Caban : winemac: Directly use win32u for GDI functions in opengl.c.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 948bd8e6c5c1d3950a824c14f004c148c15f99b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=948bd8e6c5c1d3950a824c14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 14:16:30 2022 +0200 winemac: Directly use win32u for GDI functions in opengl.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/opengl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index f553b93da5a..bf7effa7aeb 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -3071,7 +3071,7 @@ static HDC macdrv_wglGetPbufferDCARB(struct wgl_pbuffer *pbuffer) HDC hdc; struct wgl_pbuffer *prev; - hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); + hdc = NtGdiOpenDCW(NULL, NULL, NULL, 0, TRUE, NULL, NULL, NULL); if (!hdc) return 0; pthread_mutex_lock(&dc_pbuffers_mutex); @@ -3932,7 +3932,7 @@ static int macdrv_wglReleasePbufferDCARB(struct wgl_pbuffer *pbuffer, HDC hdc) pthread_mutex_unlock(&dc_pbuffers_mutex); - return hdc && DeleteDC(hdc); + return hdc && NtGdiDeleteObjectApp(hdc); }

1 0

Jacek Caban : winemac: Directly use win32u for GDI functions in surface.c.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 2f66b367b703d0e1bdd8f5d9ae1d7fb2fb685ba3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f66b367b703d0e1bdd8f5d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 14:18:11 2022 +0200 winemac: Directly use win32u for GDI functions in surface.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/surface.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 6b0abb10780..9605e704c92 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -82,14 +82,14 @@ static void update_blit_data(struct macdrv_window_surface *surface) if (surface->drawn) { - HRGN blit = CreateRectRgn(0, 0, 0, 0); + HRGN blit = NtGdiCreateRectRgn(0, 0, 0, 0); - if (CombineRgn(blit, surface->drawn, 0, RGN_COPY) > NULLREGION && - (!surface->region || CombineRgn(blit, blit, surface->region, RGN_AND) > NULLREGION) && + if (NtGdiCombineRgn(blit, surface->drawn, 0, RGN_COPY) > NULLREGION && + (!surface->region || NtGdiCombineRgn(blit, blit, surface->region, RGN_AND) > NULLREGION) && OffsetRgn(blit, surface->header.rect.left, surface->header.rect.top) > NULLREGION) surface->blit_data = get_region_data(blit, 0); - DeleteObject(blit); + NtGdiDeleteObjectApp(blit); } } @@ -148,12 +148,12 @@ static void macdrv_surface_set_region(struct window_surface *window_surface, HRG if (region) { - if (!surface->region) surface->region = CreateRectRgn(0, 0, 0, 0); - CombineRgn(surface->region, region, 0, RGN_COPY); + if (!surface->region) surface->region = NtGdiCreateRectRgn(0, 0, 0, 0); + NtGdiCombineRgn(surface->region, region, 0, RGN_COPY); } else { - if (surface->region) DeleteObject(surface->region); + if (surface->region) NtGdiDeleteObjectApp(surface->region); surface->region = 0; } update_blit_data(surface); @@ -178,12 +178,14 @@ static void macdrv_surface_flush(struct window_surface *window_surface) rect = cgrect_from_rect(surface->bounds); rect = CGRectOffset(rect, surface->header.rect.left, surface->header.rect.top); - if (!IsRectEmpty(&surface->bounds) && (region = CreateRectRgnIndirect(&surface->bounds))) + if (!IsRectEmpty(&surface->bounds) && + (region = NtGdiCreateRectRgn(surface->bounds.left, surface->bounds.top, + surface->bounds.right, surface->bounds.bottom))) { if (surface->drawn) { - CombineRgn(surface->drawn, surface->drawn, region, RGN_OR); - DeleteObject(region); + NtGdiCombineRgn(surface->drawn, surface->drawn, region, RGN_OR); + NtGdiDeleteObjectApp(region); } else surface->drawn = region; @@ -205,8 +207,8 @@ static void macdrv_surface_destroy(struct window_surface *window_surface) struct macdrv_window_surface *surface = get_mac_surface(window_surface); TRACE("freeing %p bits %p\n", surface, surface->bits); - if (surface->region) DeleteObject(surface->region); - if (surface->drawn) DeleteObject(surface->drawn); + if (surface->region) NtGdiDeleteObjectApp(surface->region); + if (surface->drawn) NtGdiDeleteObjectApp(surface->drawn); HeapFree(GetProcessHeap(), 0, surface->blit_data); HeapFree(GetProcessHeap(), 0, surface->bits); pthread_mutex_destroy(&surface->mutex); @@ -283,11 +285,11 @@ struct window_surface *create_surface(macdrv_window window, const RECT *rect, reset_bounds(&surface->bounds); if (old_mac_surface && old_mac_surface->drawn) { - surface->drawn = CreateRectRgnIndirect(rect); + surface->drawn = NtGdiCreateRectRgn(rect->left, rect->top, rect->right, rect->bottom); OffsetRgn(surface->drawn, -rect->left, -rect->top); - if (CombineRgn(surface->drawn, surface->drawn, old_mac_surface->drawn, RGN_AND) <= NULLREGION) + if (NtGdiCombineRgn(surface->drawn, surface->drawn, old_mac_surface->drawn, RGN_AND) <= NULLREGION) { - DeleteObject(surface->drawn); + NtGdiDeleteObjectApp(surface->drawn); surface->drawn = 0; } } @@ -456,10 +458,10 @@ void surface_clip_to_visible_rect(struct window_surface *window_surface, const R rect = *visible_rect; OffsetRect(&rect, -rect.left, -rect.top); - if ((region = CreateRectRgnIndirect(&rect))) + if ((region = NtGdiCreateRectRgn(rect.left, rect.top, rect.right, rect.bottom))) { - CombineRgn(surface->drawn, surface->drawn, region, RGN_AND); - DeleteObject(region); + NtGdiCombineRgn(surface->drawn, surface->drawn, region, RGN_AND); + NtGdiDeleteObjectApp(region); update_blit_data(surface); }

1 0

Jacek Caban : winemac: Directly use win32u for GDI functions in window.c.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 795ba50a0997179081275cb9ae828568f87138c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=795ba50a0997179081275cb9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 14:20:03 2022 +0200 winemac: Directly use win32u for GDI functions in window.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 56 ++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index d5bcce654e8..e0dc2352d37 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -384,16 +384,16 @@ static void sync_window_region(struct macdrv_win_data *data, HRGN win_region) if (hrgn == (HRGN)1) /* hack: win_region == 1 means retrieve region from server */ { - if (!(hrgn = CreateRectRgn(0, 0, 0, 0))) return; + if (!(hrgn = NtGdiCreateRectRgn(0, 0, 0, 0))) return; if (GetWindowRgn(data->hwnd, hrgn) == ERROR) { - DeleteObject(hrgn); + NtGdiDeleteObjectApp(hrgn); hrgn = 0; } } if (hrgn && GetWindowLongW(data->hwnd, GWL_EXSTYLE) & WS_EX_LAYOUTRTL) - MirrorRgn(data->hwnd, hrgn); + NtUserMirrorRgn(data->hwnd, hrgn); if (hrgn) { OffsetRgn(hrgn, data->window_rect.left - data->whole_rect.left, @@ -428,7 +428,7 @@ static void sync_window_region(struct macdrv_win_data *data, HRGN win_region) HeapFree(GetProcessHeap(), 0, region_data); data->shaped = (region_data != NULL); - if (hrgn && hrgn != win_region) DeleteObject(hrgn); + if (hrgn && hrgn != win_region) NtGdiDeleteObjectApp(hrgn); } @@ -678,10 +678,10 @@ static void create_cocoa_window(struct macdrv_win_data *data) BYTE alpha; DWORD layered_flags; - if ((win_rgn = CreateRectRgn(0, 0, 0, 0)) && + if ((win_rgn = NtGdiCreateRectRgn(0, 0, 0, 0)) && GetWindowRgn(data->hwnd, win_rgn) == ERROR) { - DeleteObject(win_rgn); + NtGdiDeleteObjectApp(win_rgn); win_rgn = 0; } data->shaped = (win_rgn != 0); @@ -720,7 +720,7 @@ static void create_cocoa_window(struct macdrv_win_data *data) sync_window_opacity(data, key, alpha, FALSE, layered_flags); done: - if (win_rgn) DeleteObject(win_rgn); + if (win_rgn) NtGdiDeleteObjectApp(win_rgn); } @@ -1053,7 +1053,7 @@ RGNDATA *get_region_data(HRGN hrgn, HDC hdc_lptodp) RECT *rect; CGRect *cgrect; - if (!hrgn || !(size = GetRegionData(hrgn, 0, NULL))) return NULL; + if (!hrgn || !(size = NtGdiGetRegionData(hrgn, 0, NULL))) return NULL; if (sizeof(CGRect) > sizeof(RECT)) { /* add extra size for CGRect array */ @@ -1061,7 +1061,7 @@ RGNDATA *get_region_data(HRGN hrgn, HDC hdc_lptodp) size += count * (sizeof(CGRect) - sizeof(RECT)); } if (!(data = HeapAlloc(GetProcessHeap(), 0, size))) return NULL; - if (!GetRegionData(hrgn, size, data)) + if (!NtGdiGetRegionData(hrgn, size, data)) { HeapFree(GetProcessHeap(), 0, data); return NULL; @@ -1071,7 +1071,8 @@ RGNDATA *get_region_data(HRGN hrgn, HDC hdc_lptodp) cgrect = (CGRect *)data->Buffer; if (hdc_lptodp) /* map to device coordinates */ { - LPtoDP(hdc_lptodp, (POINT *)rect, data->rdh.nCount * 2); + NtGdiTransformPoints(hdc_lptodp, (POINT *)rect, (POINT *)rect, + data->rdh.nCount * 2, NtGdiLPtoDP); for (i = 0; i < data->rdh.nCount; i++) { if (rect[i].right < rect[i].left) @@ -1213,16 +1214,16 @@ static void move_window_bits(HWND hwnd, macdrv_window window, const RECT *old_re hdc_src = hdc_dst = GetDCEx(hwnd, 0, DCX_CACHE); } - rgn = CreateRectRgnIndirect(&dst_rect); - SelectClipRgn(hdc_dst, rgn); - DeleteObject(rgn); + rgn = NtGdiCreateRectRgn(dst_rect.left, dst_rect.top, dst_rect.right, dst_rect.bottom); + NtGdiExtSelectClipRgn(hdc_dst, rgn, RGN_COPY); + NtGdiDeleteObjectApp(rgn); ExcludeUpdateRgn(hdc_dst, hwnd); TRACE("copying bits for win %p/%p %s -> %s\n", hwnd, window, wine_dbgstr_rect(&src_rect), wine_dbgstr_rect(&dst_rect)); - BitBlt(hdc_dst, dst_rect.left, dst_rect.top, - dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top, - hdc_src, src_rect.left, src_rect.top, SRCCOPY); + NtGdiBitBlt(hdc_dst, dst_rect.left, dst_rect.top, + dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top, + hdc_src, src_rect.left, src_rect.top, SRCCOPY, 0, 0); ReleaseDC(hwnd, hdc_dst); if (hdc_src != hdc_dst) ReleaseDC(parent, hdc_src); @@ -1919,26 +1920,27 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, dst_bits = surface->funcs->get_info(surface, bmi); - if (!(dib = CreateDIBSection(info->hdcDst, bmi, DIB_RGB_COLORS, &src_bits, NULL, 0))) goto done; - if (!(hdc = CreateCompatibleDC(0))) goto done; + if (!(dib = NtGdiCreateDIBSection(info->hdcDst, NULL, 0, bmi, DIB_RGB_COLORS, + 0, 0, 0, &src_bits))) goto done; + if (!(hdc = NtGdiCreateCompatibleDC(0))) goto done; - SelectObject(hdc, dib); + NtGdiSelectBitmap(hdc, dib); if (info->prcDirty) { IntersectRect(&rect, &rect, info->prcDirty); surface->funcs->lock(surface); memcpy(src_bits, dst_bits, bmi->bmiHeader.biSizeImage); surface->funcs->unlock(surface); - PatBlt(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS); + NtGdiPatBlt(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS); } src_rect = rect; if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); - DPtoLP( info->hdcSrc, (POINT *)&src_rect, 2 ); + NtGdiTransformPoints(info->hdcSrc, (POINT *)&src_rect, (POINT *)&src_rect, 2, NtGdiDPtoLP); - if (!(ret = GdiAlphaBlend(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, - info->hdcSrc, src_rect.left, src_rect.top, - src_rect.right - src_rect.left, src_rect.bottom - src_rect.top, - blend))) + if (!(ret = NtGdiAlphaBlend(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, + info->hdcSrc, src_rect.left, src_rect.top, + src_rect.right - src_rect.left, src_rect.bottom - src_rect.top, + blend, 0))) goto done; if ((data = get_win_data(hwnd))) @@ -1960,8 +1962,8 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, done: window_surface_release(surface); - if (hdc) DeleteDC(hdc); - if (dib) DeleteObject(dib); + if (hdc) NtGdiDeleteObjectApp(hdc); + if (dib) NtGdiDeleteObjectApp(dib); return ret; }

1 0

Alexandre Julliard : Release 7.9.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 230e953e31f7228d10c8b0a0d2e8cf4f9af9a231 URL: https://source.winehq.org/git/wine.git/?a=commit;h=230e953e31f7228d10c8b0a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 20 22:24:58 2022 +0200 Release 7.9. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 1022 ++++++++++++++++++++++++++----------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 5 files changed, 457 insertions(+), 590 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=230e953e31f7228d10c8…

1 0

Tag wine-7.9 : Alexandre Julliard : Release 7.9
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: refs/tags/wine-7.9 Tag: 485d1a5629492ffd4d5c64d8ca6f3d2fafccc4e5 URL: https://source.winehq.org/git/wine.git/?a=tag;h=485d1a5629492ffd4d5c64d8ca6… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 20 22:24:58 2022 +0200 Release 7.9

1 0

Andrew Eikum : mfplat: Consolidate stream and file IMFByteStream vtables.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 4c999efdfb6df56e48deec14444442415d8d1ae2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c999efdfb6df56e48deec14… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 5 09:54:13 2022 -0500 mfplat: Consolidate stream and file IMFByteStream vtables. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 99 ++++++++++++++++++++++-------------------------------- 1 file changed, 40 insertions(+), 59 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 24d39d81b62..9e6ff26b2f7 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -3954,7 +3954,7 @@ static HRESULT WINAPI bytestream_stream_GetCapabilities(IMFByteStream *iface, DW return S_OK; } -static HRESULT WINAPI bytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) +static HRESULT WINAPI bytestream_file_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) { struct bytestream *stream = impl_from_IMFByteStream(iface); @@ -3965,14 +3965,14 @@ static HRESULT WINAPI bytestream_GetCapabilities(IMFByteStream *iface, DWORD *ca return S_OK; } -static HRESULT WINAPI bytestream_SetLength(IMFByteStream *iface, QWORD length) +static HRESULT WINAPI bytestream_file_SetLength(IMFByteStream *iface, QWORD length) { FIXME("%p, %s\n", iface, wine_dbgstr_longlong(length)); return E_NOTIMPL; } -static HRESULT WINAPI bytestream_file_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +static HRESULT WINAPI bytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) { struct bytestream *stream = impl_from_IMFByteStream(iface); @@ -4070,7 +4070,7 @@ static HRESULT WINAPI bytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *r return bytestream_complete_io_request(stream, ASYNC_STREAM_OP_READ, result, byte_read); } -static HRESULT WINAPI bytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) +static HRESULT WINAPI bytestream_file_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) { FIXME("%p, %p, %lu, %p\n", iface, data, count, written); @@ -4096,22 +4096,44 @@ static HRESULT WINAPI bytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult * return bytestream_complete_io_request(stream, ASYNC_STREAM_OP_WRITE, result, written); } -static HRESULT WINAPI bytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, - DWORD flags, QWORD *current) +static HRESULT WINAPI bytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN origin, LONGLONG offset, + DWORD flags, QWORD *current) { - FIXME("%p, %u, %s, 0x%08lx, %p\n", iface, seek, wine_dbgstr_longlong(offset), flags, current); + struct bytestream *stream = impl_from_IMFByteStream(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %u, %s, %#lx, %p.\n", iface, origin, wine_dbgstr_longlong(offset), flags, current); + + EnterCriticalSection(&stream->cs); + + switch (origin) + { + case msoBegin: + stream->position = offset; + break; + case msoCurrent: + stream->position += offset; + break; + default: + WARN("Unknown origin mode %d.\n", origin); + hr = E_INVALIDARG; + } + + *current = stream->position; + + LeaveCriticalSection(&stream->cs); + + return hr; } -static HRESULT WINAPI bytestream_Flush(IMFByteStream *iface) +static HRESULT WINAPI bytestream_file_Flush(IMFByteStream *iface) { FIXME("%p\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI bytestream_Close(IMFByteStream *iface) +static HRESULT WINAPI bytestream_file_Close(IMFByteStream *iface) { FIXME("%p\n", iface); @@ -4136,21 +4158,21 @@ static const IMFByteStreamVtbl bytestream_file_vtbl = bytestream_QueryInterface, bytestream_AddRef, bytestream_Release, - bytestream_GetCapabilities, + bytestream_file_GetCapabilities, bytestream_file_GetLength, - bytestream_SetLength, - bytestream_file_GetCurrentPosition, + bytestream_file_SetLength, + bytestream_GetCurrentPosition, bytestream_SetCurrentPosition, bytestream_file_IsEndOfStream, bytestream_file_Read, bytestream_BeginRead, bytestream_EndRead, - bytestream_Write, + bytestream_file_Write, bytestream_BeginWrite, bytestream_EndWrite, bytestream_Seek, - bytestream_Flush, - bytestream_Close + bytestream_file_Flush, + bytestream_file_Close }; static HRESULT WINAPI bytestream_stream_GetLength(IMFByteStream *iface, QWORD *length) @@ -4187,17 +4209,6 @@ static HRESULT WINAPI bytestream_stream_SetLength(IMFByteStream *iface, QWORD le return hr; } -static HRESULT WINAPI bytestream_stream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) -{ - struct bytestream *stream = impl_from_IMFByteStream(iface); - - TRACE("%p, %p.\n", iface, position); - - *position = stream->position; - - return S_OK; -} - static HRESULT WINAPI bytestream_stream_IsEndOfStream(IMFByteStream *iface, BOOL *ret) { struct bytestream *stream = impl_from_IMFByteStream(iface); @@ -4260,36 +4271,6 @@ static HRESULT WINAPI bytestream_stream_Write(IMFByteStream *iface, const BYTE * return hr; } -static HRESULT WINAPI bytestream_stream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN origin, LONGLONG offset, - DWORD flags, QWORD *current) -{ - struct bytestream *stream = impl_from_IMFByteStream(iface); - HRESULT hr = S_OK; - - TRACE("%p, %u, %s, %#lx, %p.\n", iface, origin, wine_dbgstr_longlong(offset), flags, current); - - EnterCriticalSection(&stream->cs); - - switch (origin) - { - case msoBegin: - stream->position = offset; - break; - case msoCurrent: - stream->position += offset; - break; - default: - WARN("Unknown origin mode %d.\n", origin); - hr = E_INVALIDARG; - } - - *current = stream->position; - - LeaveCriticalSection(&stream->cs); - - return hr; -} - static HRESULT WINAPI bytestream_stream_Flush(IMFByteStream *iface) { struct bytestream *stream = impl_from_IMFByteStream(iface); @@ -4314,7 +4295,7 @@ static const IMFByteStreamVtbl bytestream_stream_vtbl = bytestream_stream_GetCapabilities, bytestream_stream_GetLength, bytestream_stream_SetLength, - bytestream_stream_GetCurrentPosition, + bytestream_GetCurrentPosition, bytestream_SetCurrentPosition, bytestream_stream_IsEndOfStream, bytestream_stream_Read, @@ -4323,7 +4304,7 @@ static const IMFByteStreamVtbl bytestream_stream_vtbl = bytestream_stream_Write, bytestream_BeginWrite, bytestream_EndWrite, - bytestream_stream_Seek, + bytestream_Seek, bytestream_stream_Flush, bytestream_stream_Close, };

1 0

Andrew Eikum : mfplat: Simplify IMFByteStream async Read/Write methods.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 411ef13e7c2bbc43afcfc8fe1a1e251b79a059be URL: https://source.winehq.org/git/wine.git/?a=commit;h=411ef13e7c2bbc43afcfc8fe… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 5 10:33:14 2022 -0500 mfplat: Simplify IMFByteStream async Read/Write methods. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 9e6ff26b2f7..8cdf0d1c71f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -4373,7 +4373,6 @@ static HRESULT WINAPI bytestream_stream_read_callback_Invoke(IRtwqAsyncCallback { struct bytestream *stream = impl_from_read_callback_IRtwqAsyncCallback(iface); struct async_stream_op *op; - LARGE_INTEGER position; IUnknown *object; HRESULT hr; @@ -4384,13 +4383,8 @@ static HRESULT WINAPI bytestream_stream_read_callback_Invoke(IRtwqAsyncCallback EnterCriticalSection(&stream->cs); - position.QuadPart = op->position; - if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) - { - if (SUCCEEDED(hr = IStream_Read(stream->stream, op->u.dest, op->requested_length, &op->actual_length))) - stream->position += op->actual_length; - } - + hr = IMFByteStream_Read(&stream->IMFByteStream_iface, op->u.dest, op->requested_length, &op->actual_length); + if(FAILED(hr)) TRACE("Read failed: %#lx\n", hr); IMFAsyncResult_SetStatus(op->caller, hr); list_add_tail(&stream->pending, &op->entry); @@ -4405,7 +4399,6 @@ static HRESULT WINAPI bytestream_stream_write_callback_Invoke(IRtwqAsyncCallback { struct bytestream *stream = impl_from_read_callback_IRtwqAsyncCallback(iface); struct async_stream_op *op; - LARGE_INTEGER position; IUnknown *object; HRESULT hr; @@ -4416,13 +4409,8 @@ static HRESULT WINAPI bytestream_stream_write_callback_Invoke(IRtwqAsyncCallback EnterCriticalSection(&stream->cs); - position.QuadPart = op->position; - if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) - { - if (SUCCEEDED(hr = IStream_Write(stream->stream, op->u.src, op->requested_length, &op->actual_length))) - stream->position += op->actual_length; - } - + hr = IMFByteStream_Write(&stream->IMFByteStream_iface, op->u.src, op->requested_length, &op->actual_length); + if(FAILED(hr)) TRACE("Write failed: %#lx\n", hr); IMFAsyncResult_SetStatus(op->caller, hr); list_add_tail(&stream->pending, &op->entry);

1 0

Andrew Eikum : mfplat: Consolidate stream and file IMFByteStream Read/Write callback vtables.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 0c2f1121cc8caa5815ea48ccbe7f891f6891f39e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c2f1121cc8caa5815ea48cc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 5 10:35:28 2022 -0500 mfplat: Consolidate stream and file IMFByteStream Read/Write callback vtables. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 52 ++++++++++------------------------------------------ 1 file changed, 10 insertions(+), 42 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 8cdf0d1c71f..1e4e026d1d7 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -4369,7 +4369,7 @@ static const IMFAttributesVtbl bytestream_attributes_vtbl = mfattributes_CopyAllItems }; -static HRESULT WINAPI bytestream_stream_read_callback_Invoke(IRtwqAsyncCallback *iface, IRtwqAsyncResult *result) +static HRESULT WINAPI bytestream_read_callback_Invoke(IRtwqAsyncCallback *iface, IRtwqAsyncResult *result) { struct bytestream *stream = impl_from_read_callback_IRtwqAsyncCallback(iface); struct async_stream_op *op; @@ -4395,7 +4395,7 @@ static HRESULT WINAPI bytestream_stream_read_callback_Invoke(IRtwqAsyncCallback return S_OK; } -static HRESULT WINAPI bytestream_stream_write_callback_Invoke(IRtwqAsyncCallback *iface, IRtwqAsyncResult *result) +static HRESULT WINAPI bytestream_write_callback_Invoke(IRtwqAsyncCallback *iface, IRtwqAsyncResult *result) { struct bytestream *stream = impl_from_read_callback_IRtwqAsyncCallback(iface); struct async_stream_op *op; @@ -4421,22 +4421,22 @@ static HRESULT WINAPI bytestream_stream_write_callback_Invoke(IRtwqAsyncCallback return S_OK; } -static const IRtwqAsyncCallbackVtbl bytestream_stream_read_callback_vtbl = +static const IRtwqAsyncCallbackVtbl bytestream_read_callback_vtbl = { bytestream_callback_QueryInterface, bytestream_read_callback_AddRef, bytestream_read_callback_Release, bytestream_callback_GetParameters, - bytestream_stream_read_callback_Invoke, + bytestream_read_callback_Invoke, }; -static const IRtwqAsyncCallbackVtbl bytestream_stream_write_callback_vtbl = +static const IRtwqAsyncCallbackVtbl bytestream_write_callback_vtbl = { bytestream_callback_QueryInterface, bytestream_write_callback_AddRef, bytestream_write_callback_Release, bytestream_callback_GetParameters, - bytestream_stream_write_callback_Invoke, + bytestream_write_callback_Invoke, }; /*********************************************************************** @@ -4462,8 +4462,8 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt object->IMFByteStream_iface.lpVtbl = &bytestream_stream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &bytestream_attributes_vtbl; - object->read_callback.lpVtbl = &bytestream_stream_read_callback_vtbl; - object->write_callback.lpVtbl = &bytestream_stream_write_callback_vtbl; + object->read_callback.lpVtbl = &bytestream_read_callback_vtbl; + object->write_callback.lpVtbl = &bytestream_write_callback_vtbl; InitializeCriticalSection(&object->cs); list_init(&object->pending); @@ -4487,38 +4487,6 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt return S_OK; } -static HRESULT WINAPI bytestream_file_read_callback_Invoke(IRtwqAsyncCallback *iface, IRtwqAsyncResult *result) -{ - FIXME("%p, %p.\n", iface, result); - - return E_NOTIMPL; -} - -static HRESULT WINAPI bytestream_file_write_callback_Invoke(IRtwqAsyncCallback *iface, IRtwqAsyncResult *result) -{ - FIXME("%p, %p.\n", iface, result); - - return E_NOTIMPL; -} - -static const IRtwqAsyncCallbackVtbl bytestream_file_read_callback_vtbl = -{ - bytestream_callback_QueryInterface, - bytestream_read_callback_AddRef, - bytestream_read_callback_Release, - bytestream_callback_GetParameters, - bytestream_file_read_callback_Invoke, -}; - -static const IRtwqAsyncCallbackVtbl bytestream_file_write_callback_vtbl = -{ - bytestream_callback_QueryInterface, - bytestream_write_callback_AddRef, - bytestream_write_callback_Release, - bytestream_callback_GetParameters, - bytestream_file_write_callback_Invoke, -}; - static HRESULT WINAPI bytestream_file_getservice_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) { struct bytestream *stream = impl_bytestream_from_IMFGetService(iface); @@ -4625,8 +4593,8 @@ static HRESULT create_file_bytestream(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPE object->IMFByteStream_iface.lpVtbl = &bytestream_file_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &bytestream_attributes_vtbl; object->IMFGetService_iface.lpVtbl = &bytestream_file_getservice_vtbl; - object->read_callback.lpVtbl = &bytestream_file_read_callback_vtbl; - object->write_callback.lpVtbl = &bytestream_file_write_callback_vtbl; + object->read_callback.lpVtbl = &bytestream_read_callback_vtbl; + object->write_callback.lpVtbl = &bytestream_write_callback_vtbl; InitializeCriticalSection(&object->cs); list_init(&object->pending); object->capabilities = capabilities;

1 0

Andrew Eikum : mfplat/tests: Add tests for IMFByteStream position.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 0416d2f167dc852fca9a41ecf398b32409665657 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0416d2f167dc852fca9a41ec… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 5 11:02:57 2022 -0500 mfplat/tests: Add tests for IMFByteStream position. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3f7ab161b59..28b89de4b1f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1972,6 +1972,7 @@ static void test_MFCreateMFByteStreamOnStream(void) ULONG ref, size; HRESULT hr; UINT count; + QWORD to; if(!pMFCreateMFByteStreamOnStream) { @@ -2055,11 +2056,45 @@ static void test_MFCreateMFByteStreamOnStream(void) ok(hr == S_OK, "Failed to get stream capabilities, hr %#lx.\n", hr); ok(caps == (MFBYTESTREAM_IS_READABLE | MFBYTESTREAM_IS_SEEKABLE), "Unexpected caps %#lx.\n", caps); + /* IMFByteStream maintains position separately from IStream */ + caps = 0; + hr = IStream_Read(stream, &caps, sizeof(caps), &size); + ok(hr == S_OK, "Failed to read from raw stream, hr %#lx.\n", hr); + ok(size == 4, "Unexpected size.\n"); + ok(caps == 0xffff0000, "Unexpected content.\n"); + caps = 0; hr = IMFByteStream_Read(bytestream, (BYTE *)&caps, sizeof(caps), &size); ok(hr == S_OK, "Failed to read from stream, hr %#lx.\n", hr); + ok(size == 4, "Unexpected size.\n"); ok(caps == 0xffff0000, "Unexpected content.\n"); + caps = 0; + hr = IStream_Read(stream, &caps, sizeof(caps), &size); + ok(hr == S_OK, "Failed to read from raw stream, hr %#lx.\n", hr); + ok(size == 0, "Unexpected size.\n"); + ok(caps == 0, "Unexpected content.\n"); + + hr = IMFByteStream_Seek(bytestream, msoBegin, 0, 0, &to); + ok(hr == S_OK, "Failed to read from stream, hr %#lx.\n", hr); + + hr = IStream_Read(stream, &caps, sizeof(caps), &size); + ok(hr == S_OK, "Failed to read from raw stream, hr %#lx.\n", hr); + ok(size == 0, "Unexpected size.\n"); + ok(caps == 0, "Unexpected content.\n"); + + caps = 0; + hr = IMFByteStream_Read(bytestream, (BYTE *)&caps, sizeof(caps), &size); + ok(hr == S_OK, "Failed to read from stream, hr %#lx.\n", hr); + ok(size == 4, "Unexpected size.\n"); + ok(caps == 0xffff0000, "Unexpected content.\n"); + + caps = 0; + hr = IMFByteStream_Read(bytestream, (BYTE *)&caps, sizeof(caps), &size); + ok(hr == S_OK, "Failed to read from stream, hr %#lx.\n", hr); + ok(size == 0, "Unexpected size.\n"); + ok(caps == 0, "Unexpected content.\n"); + IMFAttributes_Release(attributes); IMFByteStream_Release(bytestream); IStream_Release(stream);

1 0