March 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Remove the no longer needed exec_process() function.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: 34884bf5d071418e3c25e521236361e62e308025 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34884bf5d071418e3c25e521… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 24 10:53:59 2021 +0100 ntdll: Remove the no longer needed exec_process() function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 6 +- dlls/ntdll/unix/process.c | 155 ----------------------------------------- dlls/ntdll/unix/unix_private.h | 1 - include/wine/server_protocol.h | 19 +---- server/process.c | 33 --------- server/protocol.def | 7 -- server/request.h | 5 -- server/trace.c | 9 --- 8 files changed, 6 insertions(+), 229 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34884bf5d071418e3c25…

1 0

Alexandre Julliard : ntdll: Don't set the DllPath parameter by default.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: 47fed8f5bc89344af054b70c2d3a7bea02b2113c URL: https://source.winehq.org/git/wine.git/?a=commit;h=47fed8f5bc89344af054b70c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 24 10:54:05 2021 +0100 ntdll: Don't set the DllPath parameter by default. Recent Windows versions don't set it either. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 10 +++----- dlls/ntdll/env.c | 59 +++++++++++++++++++++++------------------------ dlls/ntdll/loader.c | 32 ++++++++++++------------- dlls/ntdll/unix/env.c | 1 - 4 files changed, 47 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=47fed8f5bc89344af054…

1 0

Huw Davies : riched20: Don't call update_caret() from the host.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: ff36ab092d239268f62f9ebcd38eeb500381b44b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff36ab092d239268f62f9ebc… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 24 09:08:29 2021 +0000 riched20: Don't call update_caret() from the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 1 - dlls/riched20/paint.c | 1 + dlls/riched20/txthost.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 293ac0bad5a..4f66220d230 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1795,7 +1795,6 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (!(format & SFF_SELECTION)) { ME_ClearTempStyle(editor); } - update_caret(editor); ME_SendSelChange(editor); ME_SendRequestResize(editor, FALSE); diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 4be76e441d0..0addf7d5656 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -131,6 +131,7 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) /* Ensure that the cursor is visible */ editor_ensure_visible( editor, &editor->pCursors[0] ); + update_caret( editor ); ITextHost_TxViewChange(editor->texthost, update_now); ME_SendSelChange(editor); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index ab13879c664..9e384d0c503 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1186,7 +1186,6 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, PAINTSTRUCT ps; HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); - update_caret( editor ); hdc = BeginPaint( editor->hWnd, &ps ); if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) ME_SendOldNotify( editor, EN_UPDATE );

1 0

Huw Davies : riched20: Send EN_UPDATE from text services.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: 4e0fa60f2223937d385aacf85ce48d9c4361ea89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e0fa60f2223937d385aacf8… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 24 09:08:30 2021 +0000 riched20: Send EN_UPDATE from text services. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 5 ++++- dlls/riched20/txthost.c | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 0addf7d5656..4704f43c2c3 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -132,11 +132,14 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) editor_ensure_visible( editor, &editor->pCursors[0] ); update_caret( editor ); + + if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) + ME_SendOldNotify( editor, EN_UPDATE ); + ITextHost_TxViewChange(editor->texthost, update_now); ME_SendSelChange(editor); - /* send EN_CHANGE if the event mask asks for it */ if(editor->nEventMask & ENM_CHANGE) { editor->nEventMask &= ~ENM_CHANGE; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 9e384d0c503..1fd989d5ed4 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1187,8 +1187,6 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); hdc = BeginPaint( editor->hWnd, &ps ); - if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) - ME_SendOldNotify( editor, EN_UPDATE ); brush = SelectObject( hdc, brush ); /* Erase area outside of the formatting rectangle */

1 0

Huw Davies : riched20: Use TxDraw() to implement the host's WM_PAINT handler.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: 7ebe1aec24dd21bf3afb3e993ecb05d947f966b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ebe1aec24dd21bf3afb3e99… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 24 09:08:31 2021 +0000 riched20: Use TxDraw() to implement the host's WM_PAINT handler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/txthost.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 075fe534783..929e10a3179 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -390,7 +390,7 @@ extern const struct ITextServicesVtbl text_services_stdcall_vtbl DECLSPEC_HIDDEN #define TXTSERV_VTABLE(This) (This)->lpVtbl #endif #define ITextServices_TxSendMessage(This,a,b,c,d) TXTSERV_VTABLE(This)->TxSendMessage(This,a,b,c,d) -#define ITextServices_TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) TXTSERV_VTABLE(This)->ITextServices_TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) +#define ITextServices_TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) TXTSERV_VTABLE(This)->TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) #define ITextServices_TxGetHScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetHScroll(This,a,b,c,d,e) #define ITextServices_TxGetVScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetVScroll(This,a,b,c,d,e) #define ITextServices_OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) TXTSERV_VTABLE(This)->OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 1fd989d5ed4..2c832db6a76 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1219,7 +1219,8 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, ps.rcPaint.right = editor->rcFormat.right; } - editor_draw( editor, hdc, &ps.rcPaint ); + ITextServices_TxDraw( host->text_srv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, NULL, NULL, + &ps.rcPaint, NULL, 0, TXTVIEW_ACTIVE ); DeleteObject( SelectObject( hdc, brush ) ); EndPaint( editor->hWnd, &ps ); return 0;

1 0

Huw Davies : riched20: Remove direct accesses to the editor from the window proc.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: f0e350d68546fe10fa1f41bac184007d7000ddf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0e350d68546fe10fa1f41ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 24 09:08:32 2021 +0000 riched20: Remove direct accesses to the editor from the window proc. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txthost.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 2c832db6a76..81f925c0578 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -970,7 +970,6 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode ) { struct host *host; - ME_TextEditor *editor; HRESULT hr = S_OK; LRESULT res = 0; @@ -999,7 +998,6 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, return res; } - editor = host->editor; switch (msg) { case WM_CHAR: @@ -1042,7 +1040,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, RECT rc; HBRUSH brush; - if (GetUpdateRect( editor->hWnd, &rc, TRUE )) + if (GetUpdateRect( hwnd, &rc, TRUE )) { brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); FillRect( hdc, &rc, brush ); @@ -1182,47 +1180,49 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, case WM_PAINT: { HDC hdc; - RECT rc; + RECT rc, client; PAINTSTRUCT ps; HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); - hdc = BeginPaint( editor->hWnd, &ps ); + ITextHostImpl_TxGetClientRect( &host->ITextHost_iface, &client ); + + hdc = BeginPaint( hwnd, &ps ); brush = SelectObject( hdc, brush ); /* Erase area outside of the formatting rectangle */ - if (ps.rcPaint.top < editor->rcFormat.top) + if (ps.rcPaint.top < client.top) { rc = ps.rcPaint; - rc.bottom = editor->rcFormat.top; + rc.bottom = client.top; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.top = editor->rcFormat.top; + ps.rcPaint.top = client.top; } - if (ps.rcPaint.bottom > editor->rcFormat.bottom) + if (ps.rcPaint.bottom > client.bottom) { rc = ps.rcPaint; - rc.top = editor->rcFormat.bottom; + rc.top = client.bottom; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.bottom = editor->rcFormat.bottom; + ps.rcPaint.bottom = client.bottom; } - if (ps.rcPaint.left < editor->rcFormat.left) + if (ps.rcPaint.left < client.left) { rc = ps.rcPaint; - rc.right = editor->rcFormat.left; + rc.right = client.left; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.left = editor->rcFormat.left; + ps.rcPaint.left = client.left; } - if (ps.rcPaint.right > editor->rcFormat.right) + if (ps.rcPaint.right > client.right) { rc = ps.rcPaint; - rc.left = editor->rcFormat.right; + rc.left = client.right; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.right = editor->rcFormat.right; + ps.rcPaint.right = client.right; } ITextServices_TxDraw( host->text_srv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, NULL, NULL, &ps.rcPaint, NULL, 0, TXTVIEW_ACTIVE ); DeleteObject( SelectObject( hdc, brush ) ); - EndPaint( editor->hWnd, &ps ); + EndPaint( hwnd, &ps ); return 0; } case EM_REPLACESEL: @@ -1473,7 +1473,7 @@ static BOOL register_classes( HINSTANCE instance ) wcW.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; wcW.lpfnWndProc = RichEditWndProcW; wcW.cbClsExtra = 0; - wcW.cbWndExtra = sizeof(ME_TextEditor *); + wcW.cbWndExtra = sizeof(struct host *); wcW.hInstance = NULL; /* hInstance would register DLL-local class */ wcW.hIcon = NULL; wcW.hCursor = LoadCursorW( NULL, (LPWSTR)IDC_IBEAM ); @@ -1499,7 +1499,7 @@ static BOOL register_classes( HINSTANCE instance ) wcA.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; wcA.lpfnWndProc = RichEditWndProcA; wcA.cbClsExtra = 0; - wcA.cbWndExtra = sizeof(ME_TextEditor *); + wcA.cbWndExtra = sizeof(struct host *); wcA.hInstance = NULL; /* hInstance would register DLL-local class */ wcA.hIcon = NULL; wcA.hCursor = LoadCursorW( NULL, (LPWSTR)IDC_IBEAM );

1 0

Huw Davies : riched20: Add support for WM_PRINTCLIENT.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: a41b81115f53d0a7921f3e2de4c3083e7e338c64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a41b81115f53d0a7921f3e2d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 24 09:08:33 2021 +0000 riched20: Add support for WM_PRINTCLIENT. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txthost.c | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 81f925c0578..b624fcd377c 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1178,51 +1178,62 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, break; case WM_PAINT: + case WM_PRINTCLIENT: { HDC hdc; - RECT rc, client; + RECT rc, client, update; PAINTSTRUCT ps; HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); ITextHostImpl_TxGetClientRect( &host->ITextHost_iface, &client ); - hdc = BeginPaint( hwnd, &ps ); + if (msg == WM_PAINT) + { + hdc = BeginPaint( hwnd, &ps ); + update = ps.rcPaint; + } + else + { + hdc = (HDC)wparam; + update = client; + } + brush = SelectObject( hdc, brush ); /* Erase area outside of the formatting rectangle */ - if (ps.rcPaint.top < client.top) + if (update.top < client.top) { - rc = ps.rcPaint; + rc = update; rc.bottom = client.top; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.top = client.top; + update.top = client.top; } - if (ps.rcPaint.bottom > client.bottom) + if (update.bottom > client.bottom) { - rc = ps.rcPaint; + rc = update; rc.top = client.bottom; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.bottom = client.bottom; + update.bottom = client.bottom; } - if (ps.rcPaint.left < client.left) + if (update.left < client.left) { - rc = ps.rcPaint; + rc = update; rc.right = client.left; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.left = client.left; + update.left = client.left; } - if (ps.rcPaint.right > client.right) + if (update.right > client.right) { - rc = ps.rcPaint; + rc = update; rc.left = client.right; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.right = client.right; + update.right = client.right; } ITextServices_TxDraw( host->text_srv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, NULL, NULL, - &ps.rcPaint, NULL, 0, TXTVIEW_ACTIVE ); + &update, NULL, 0, TXTVIEW_ACTIVE ); DeleteObject( SelectObject( hdc, brush ) ); - EndPaint( hwnd, &ps ); + if (msg == WM_PAINT) EndPaint( hwnd, &ps ); return 0; } case EM_REPLACESEL:

1 0

Nikolay Sivov : mfplat/tests: Add a test for d3d11 texture buffer updates.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: e66bfc835137e92b9d30085652a21b9caed9deeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e66bfc835137e92b9d300856… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 24 12:37:17 2021 +0300 mfplat/tests: Add a test for d3d11 texture buffer updates. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 138 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index fdfcf8a5d4b..879240ae1a4 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -93,6 +93,109 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO IUnknown_Release(unk); } +struct d3d11_resource_readback +{ + ID3D11Resource *resource; + D3D11_MAPPED_SUBRESOURCE map_desc; + ID3D11DeviceContext *immediate_context; + unsigned int width, height, depth, sub_resource_idx; +}; + +static void init_d3d11_resource_readback(ID3D11Resource *resource, ID3D11Resource *readback_resource, + unsigned int width, unsigned int height, unsigned int depth, unsigned int sub_resource_idx, + ID3D11Device *device, struct d3d11_resource_readback *rb) +{ + HRESULT hr; + + rb->resource = readback_resource; + rb->width = width; + rb->height = height; + rb->depth = depth; + rb->sub_resource_idx = sub_resource_idx; + + ID3D11Device_GetImmediateContext(device, &rb->immediate_context); + + ID3D11DeviceContext_CopyResource(rb->immediate_context, rb->resource, resource); + if (FAILED(hr = ID3D11DeviceContext_Map(rb->immediate_context, + rb->resource, sub_resource_idx, D3D11_MAP_READ, 0, &rb->map_desc))) + { + trace("Failed to map resource, hr %#x.\n", hr); + ID3D11Resource_Release(rb->resource); + rb->resource = NULL; + ID3D11DeviceContext_Release(rb->immediate_context); + rb->immediate_context = NULL; + } +} + +static void get_d3d11_texture2d_readback(ID3D11Texture2D *texture, unsigned int sub_resource_idx, + struct d3d11_resource_readback *rb) +{ + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11Resource *rb_texture; + unsigned int miplevel; + ID3D11Device *device; + HRESULT hr; + + memset(rb, 0, sizeof(*rb)); + + ID3D11Texture2D_GetDevice(texture, &device); + + ID3D11Texture2D_GetDesc(texture, &texture_desc); + texture_desc.Usage = D3D11_USAGE_STAGING; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; + texture_desc.MiscFlags = 0; + if (FAILED(hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&rb_texture))) + { + trace("Failed to create texture, hr %#x.\n", hr); + ID3D11Device_Release(device); + return; + } + + miplevel = sub_resource_idx % texture_desc.MipLevels; + init_d3d11_resource_readback((ID3D11Resource *)texture, rb_texture, + max(1, texture_desc.Width >> miplevel), + max(1, texture_desc.Height >> miplevel), + 1, sub_resource_idx, device, rb); + + ID3D11Device_Release(device); +} + +static void release_d3d11_resource_readback(struct d3d11_resource_readback *rb) +{ + ID3D11DeviceContext_Unmap(rb->immediate_context, rb->resource, rb->sub_resource_idx); + ID3D11Resource_Release(rb->resource); + ID3D11DeviceContext_Release(rb->immediate_context); +} + +static void *get_d3d11_readback_data(struct d3d11_resource_readback *rb, + unsigned int x, unsigned int y, unsigned int z, unsigned byte_width) +{ + return (BYTE *)rb->map_desc.pData + z * rb->map_desc.DepthPitch + y * rb->map_desc.RowPitch + x * byte_width; +} + +static DWORD get_d3d11_readback_u32(struct d3d11_resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) +{ + return *(DWORD *)get_d3d11_readback_data(rb, x, y, z, sizeof(DWORD)); +} + +static DWORD get_d3d11_readback_color(struct d3d11_resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) +{ + return get_d3d11_readback_u32(rb, x, y, z); +} + +static DWORD get_d3d11_texture_color(ID3D11Texture2D *texture, unsigned int x, unsigned int y) +{ + struct d3d11_resource_readback rb; + DWORD color; + + get_d3d11_texture2d_readback(texture, 0, &rb); + color = get_d3d11_readback_color(&rb, x, y, 0); + release_d3d11_resource_readback(&rb); + + return color; +} + static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context); @@ -6201,6 +6304,7 @@ static ID3D11Device *create_d3d11_device(void) static void test_dxgi_surface_buffer(void) { + DWORD max_length, cur_length, color; IMFDXGIBuffer *dxgi_buffer; D3D11_TEXTURE2D_DESC desc; ID3D11Texture2D *texture; @@ -6280,6 +6384,40 @@ static void test_dxgi_surface_buffer(void) IMFDXGIBuffer_Release(dxgi_buffer); + /* Texture updates. */ + color = get_d3d11_texture_color(texture, 0, 0); + ok(!color, "Unexpected texture color %#x.\n", color); + + max_length = cur_length = 0; + data = NULL; + hr = IMFMediaBuffer_Lock(buffer, &data, &max_length, &cur_length); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(max_length && max_length == cur_length, "Unexpected length %u.\n", max_length); +} + if (data) *(DWORD *)data = ~0u; + + color = get_d3d11_texture_color(texture, 0, 0); + ok(!color, "Unexpected texture color %#x.\n", color); + + hr = IMFMediaBuffer_Unlock(buffer); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + color = get_d3d11_texture_color(texture, 0, 0); +todo_wine + ok(color == ~0u, "Unexpected texture color %#x.\n", color); + + hr = IMFMediaBuffer_Lock(buffer, &data, &max_length, &cur_length); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(*(DWORD *)data == ~0u, "Unexpected buffer %#x.\n", *(DWORD *)data); + + hr = IMFMediaBuffer_Unlock(buffer); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFMediaBuffer_Release(buffer); ID3D11Texture2D_Release(texture);

1 0

Nikolay Sivov : mfplat: Fix SetCurrentLength() for d3d9 buffer.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: ff056c3f86b3c0d582b4bf41bc74571dbf1ff6d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff056c3f86b3c0d582b4bf41… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 24 12:37:18 2021 +0300 mfplat: Fix SetCurrentLength() for d3d9 buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 13 ++++++++++++- dlls/mfplat/tests/mfplat.c | 18 +++++++++++++----- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 6a4f4605450..8dd076c1e9f 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -406,6 +406,17 @@ static HRESULT WINAPI d3d9_surface_buffer_Unlock(IMFMediaBuffer *iface) return hr; } +static HRESULT WINAPI d3d9_surface_buffer_SetCurrentLength(IMFMediaBuffer *iface, DWORD current_length) +{ + struct memory_buffer *buffer = impl_from_IMFMediaBuffer(iface); + + TRACE("%p, %u.\n", iface, current_length); + + buffer->current_length = current_length; + + return S_OK; +} + static const IMFMediaBufferVtbl d3d9_surface_1d_buffer_vtbl = { memory_1d_2d_buffer_QueryInterface, @@ -414,7 +425,7 @@ static const IMFMediaBufferVtbl d3d9_surface_1d_buffer_vtbl = d3d9_surface_buffer_Lock, d3d9_surface_buffer_Unlock, memory_buffer_GetCurrentLength, - memory_buffer_SetCurrentLength, + d3d9_surface_buffer_SetCurrentLength, memory_buffer_GetMaxLength, }; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 879240ae1a4..8355be18b9f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5852,6 +5852,7 @@ static void test_MFCreateDXSurfaceBuffer(void) { IDirect3DSurface9 *backbuffer = NULL, *surface; IDirect3DSwapChain9 *swapchain; + DWORD length, max_length; IDirect3DDevice9 *device; IMF2DBuffer2 *_2dbuffer2; IMFMediaBuffer *buffer; @@ -5859,7 +5860,6 @@ static void test_MFCreateDXSurfaceBuffer(void) BYTE *data, *data2; IMFGetService *gs; IDirect3D9 *d3d; - DWORD length; HWND window; HRESULT hr; LONG pitch; @@ -5904,17 +5904,25 @@ static void test_MFCreateDXSurfaceBuffer(void) IDirect3DSurface9_Release(surface); IMFGetService_Release(gs); - length = 0; - hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + max_length = 0; + hr = IMFMediaBuffer_GetMaxLength(buffer, &max_length); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(!!length, "Unexpected length %u.\n", length); + ok(!!max_length, "Unexpected length %u.\n", max_length); hr = IMFMediaBuffer_GetCurrentLength(buffer, &length); ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); ok(!length, "Unexpected length %u.\n", length); - hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + hr = IMFMediaBuffer_SetCurrentLength(buffer, 2 * max_length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer, &length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + ok(length == 2 * max_length, "Unexpected length %u.\n", length); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, &length); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(length == max_length, "Unexpected length.\n"); /* Unlock twice. */ hr = IMFMediaBuffer_Unlock(buffer);

1 0

Nikolay Sivov : mfplat: Fix SetCurrentLength() for d3d11 buffer.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: dae643d2edfb402b2396424b6ad6f6aa649e07f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dae643d2edfb402b2396424b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 24 12:37:19 2021 +0300 mfplat: Fix SetCurrentLength() for d3d11 buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 13 ++++++++++++- dlls/mfplat/tests/mfplat.c | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 8dd076c1e9f..3710843fd52 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -856,6 +856,17 @@ static HRESULT WINAPI dxgi_surface_buffer_Unlock(IMFMediaBuffer *iface) return E_NOTIMPL; } +static HRESULT WINAPI dxgi_surface_buffer_SetCurrentLength(IMFMediaBuffer *iface, DWORD current_length) +{ + struct memory_buffer *buffer = impl_from_IMFMediaBuffer(iface); + + TRACE("%p, %u.\n", iface, current_length); + + buffer->current_length = current_length; + + return S_OK; +} + static HRESULT WINAPI dxgi_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) { FIXME("%p, %p, %p.\n", iface, scanline0, pitch); @@ -977,7 +988,7 @@ static const IMFMediaBufferVtbl dxgi_surface_1d_buffer_vtbl = dxgi_surface_buffer_Lock, dxgi_surface_buffer_Unlock, memory_buffer_GetCurrentLength, - memory_buffer_SetCurrentLength, + dxgi_surface_buffer_SetCurrentLength, memory_buffer_GetMaxLength, }; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 8355be18b9f..1c236bdb655 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6350,6 +6350,22 @@ static void test_dxgi_surface_buffer(void) check_interface(buffer, &IID_IMFDXGIBuffer, TRUE); check_interface(buffer, &IID_IMFGetService, FALSE); + max_length = 0; + hr = IMFMediaBuffer_GetMaxLength(buffer, &max_length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!max_length, "Unexpected length %u.\n", max_length); + + hr = IMFMediaBuffer_GetCurrentLength(buffer, &cur_length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + ok(!cur_length, "Unexpected length %u.\n", cur_length); + + hr = IMFMediaBuffer_SetCurrentLength(buffer, 2 * max_length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer, &cur_length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + ok(cur_length == 2 * max_length, "Unexpected length %u.\n", cur_length); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFDXGIBuffer, (void **)&dxgi_buffer); ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr);

1 0