July 2020 - Wine-Commits - list.winehq.org

Jacek Caban : server: Remove no longer needed get_console_output_info request.
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: 0a57d3853bd0b3bfd25b7d171e8c9bddca22f52a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a57d3853bd0b3bfd25b7d17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:29:20 2020 +0200 server: Remove no longer needed get_console_output_info request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 38 +------------------------------------ server/console.c | 43 ------------------------------------------ server/protocol.def | 27 -------------------------- server/request.h | 23 ---------------------- server/trace.c | 32 ------------------------------- 5 files changed, 1 insertion(+), 162 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a57d3853bd0b3bfd25b…

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleScreenBufferInfoEx.
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: 94c1640bb38edd76bab13b29f1444bce20edcacc URL: https://source.winehq.org/git/wine.git/?a=commit;h=94c1640bb38edd76bab13b29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:29:05 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleScreenBufferInfoEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 15f6ea7d3e..37ca8b599b 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -669,7 +669,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfo( HANDLE handle, CONSOLE BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfoEx( HANDLE handle, CONSOLE_SCREEN_BUFFER_INFOEX *info ) { - BOOL ret; + struct condrv_output_info condrv_info; if (info->cbSize != sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)) { @@ -677,29 +677,28 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfoEx( HANDLE handle, return FALSE; } - SERVER_START_REQ( get_console_output_info ) + if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &condrv_info, + sizeof(condrv_info), NULL, NULL )) { - req->handle = console_handle_unmap( handle ); - wine_server_set_reply( req, info->ColorTable, sizeof(info->ColorTable) ); - if ((ret = !wine_server_call_err( req ))) - { - info->dwSize.X = reply->width; - info->dwSize.Y = reply->height; - info->dwCursorPosition.X = reply->cursor_x; - info->dwCursorPosition.Y = reply->cursor_y; - info->wAttributes = reply->attr; - info->srWindow.Left = reply->win_left; - info->srWindow.Top = reply->win_top; - info->srWindow.Right = reply->win_right; - info->srWindow.Bottom = reply->win_bottom; - info->dwMaximumWindowSize.X = min( reply->width, reply->max_width ); - info->dwMaximumWindowSize.Y = min( reply->height, reply->max_height ); - info->wPopupAttributes = reply->popup_attr; - info->bFullscreenSupported = FALSE; - } + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } - SERVER_END_REQ; - return ret; + + info->dwSize.X = condrv_info.width; + info->dwSize.Y = condrv_info.height; + info->dwCursorPosition.X = condrv_info.cursor_x; + info->dwCursorPosition.Y = condrv_info.cursor_y; + info->wAttributes = condrv_info.attr; + info->srWindow.Left = condrv_info.win_left; + info->srWindow.Top = condrv_info.win_top; + info->srWindow.Right = condrv_info.win_right; + info->srWindow.Bottom = condrv_info.win_bottom; + info->dwMaximumWindowSize.X = min( condrv_info.width, condrv_info.max_width ); + info->dwMaximumWindowSize.Y = min( condrv_info.height, condrv_info.max_height ); + info->wPopupAttributes = condrv_info.popup_attr; + info->bFullscreenSupported = FALSE; + memcpy( info->ColorTable, condrv_info.color_map, sizeof(info->ColorTable) ); + return TRUE; }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleScreenBufferInfo.
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: 587ca81f8de4fec07217b4e55e370f3fb6095773 URL: https://source.winehq.org/git/wine.git/?a=commit;h=587ca81f8de4fec07217b4e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:57 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleScreenBufferInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index fe4b798988..15f6ea7d3e 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -634,33 +634,32 @@ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleOutputCP(void) */ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfo( HANDLE handle, CONSOLE_SCREEN_BUFFER_INFO *info ) { - BOOL ret; + struct condrv_output_info condrv_info; - SERVER_START_REQ( get_console_output_info ) + if (!DeviceIoControl( handle , IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, + &condrv_info, sizeof(condrv_info), NULL, NULL )) { - req->handle = console_handle_unmap( handle ); - if ((ret = !wine_server_call_err( req ))) - { - info->dwSize.X = reply->width; - info->dwSize.Y = reply->height; - info->dwCursorPosition.X = reply->cursor_x; - info->dwCursorPosition.Y = reply->cursor_y; - info->wAttributes = reply->attr; - info->srWindow.Left = reply->win_left; - info->srWindow.Right = reply->win_right; - info->srWindow.Top = reply->win_top; - info->srWindow.Bottom = reply->win_bottom; - info->dwMaximumWindowSize.X = min(reply->width, reply->max_width); - info->dwMaximumWindowSize.Y = min(reply->height, reply->max_height); - } + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } - SERVER_END_REQ; + + info->dwSize.X = condrv_info.width; + info->dwSize.Y = condrv_info.height; + info->dwCursorPosition.X = condrv_info.cursor_x; + info->dwCursorPosition.Y = condrv_info.cursor_y; + info->wAttributes = condrv_info.attr; + info->srWindow.Left = condrv_info.win_left; + info->srWindow.Right = condrv_info.win_right; + info->srWindow.Top = condrv_info.win_top; + info->srWindow.Bottom = condrv_info.win_bottom; + info->dwMaximumWindowSize.X = min(condrv_info.width, condrv_info.max_width); + info->dwMaximumWindowSize.Y = min(condrv_info.height, condrv_info.max_height); TRACE( "(%p,(%d,%d) (%d,%d) %d (%d,%d-%d,%d) (%d,%d)\n", handle, info->dwSize.X, info->dwSize.Y, info->dwCursorPosition.X, info->dwCursorPosition.Y, - info->wAttributes, info->srWindow.Left, info->srWindow.Top, info->srWindow.Right, + info->wAttributes, info->srWindow.Left, info->srWindow.Top, info->srWindow.Right, info->srWindow.Bottom, info->dwMaximumWindowSize.X, info->dwMaximumWindowSize.Y ); - return ret; + return TRUE; }

1 0

Robin Kertels : d3dx9/tests: Add a few D3DXLoadSurfaceFromSurface() tests with different rects.
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: ea7cf679150f790d2e375d99ee226ea4881b490a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea7cf679150f790d2e375d99… Author: Robin Kertels <robin.kertels(a)gmail.com> Date: Thu Jul 9 21:36:36 2020 +0200 d3dx9/tests: Add a few D3DXLoadSurfaceFromSurface() tests with different rects. Signed-off-by: Robin Kertels <robin.kertels(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/surface.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index e9b9e04178..4590a758d7 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1032,6 +1032,43 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_LINEAR, 0); ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); + /* rects */ + SetRect(&rect, 2, 2, 1, 1); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, &rect, D3DX_DEFAULT, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, &rect, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, &rect, newsurf, NULL, NULL, D3DX_DEFAULT, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, &rect, newsurf, NULL, NULL, D3DX_FILTER_POINT, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + SetRect(&rect, 1, 1, 1, 1); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, &rect, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, &rect, D3DX_DEFAULT, 0); + ok(hr == E_FAIL, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, E_FAIL); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, &rect, newsurf, NULL, NULL, D3DX_DEFAULT, 0); + ok(hr == E_FAIL, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, E_FAIL); + if (0) + { + /* Somehow it crashes with a STATUS_INTEGER_DIVIDE_BY_ZERO exception + * on Windows. */ + hr = D3DXLoadSurfaceFromSurface(surf, NULL, &rect, newsurf, NULL, NULL, D3DX_FILTER_POINT, 0); + ok(hr == E_FAIL, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, E_FAIL); + } + SetRect(&rect, 1, 1, 2, 2); + SetRect(&destrect, 1, 1, 2, 2); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, &rect, newsurf, NULL, &destrect, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, &rect, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, &destrect, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); + IDirect3DSurface9_Release(newsurf); check_release((IUnknown*)surf, 0);

1 0

Matteo Bruni : d3dx9: Simplify D3DXSphereBoundProbe() a bit.
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: 18ae539c914a9b5a89f63d8cf9c2a21273eccc6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=18ae539c914a9b5a89f63d8c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 9 21:35:49 2020 +0200 d3dx9: Simplify D3DXSphereBoundProbe() a bit. Spurred by a patch by Alex Henrie. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 19 ++++++++++--------- dlls/d3dx9_36/tests/mesh.c | 32 ++++++++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 5e0bb98efc..22f86f10d0 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2409,20 +2409,21 @@ BOOL WINAPI D3DXIntersectTri(const D3DXVECTOR3 *p0, const D3DXVECTOR3 *p1, const return FALSE; } -BOOL WINAPI D3DXSphereBoundProbe(const D3DXVECTOR3 *pcenter, float radius, - const D3DXVECTOR3 *prayposition, const D3DXVECTOR3 *praydirection) +BOOL WINAPI D3DXSphereBoundProbe(const D3DXVECTOR3 *center, float radius, + const D3DXVECTOR3 *ray_position, const D3DXVECTOR3 *ray_direction) { - D3DXVECTOR3 difference; - FLOAT a, b, c, d; + D3DXVECTOR3 difference = {0}; + float a, b, c, d; - a = D3DXVec3LengthSq(praydirection); - if (!D3DXVec3Subtract(&difference, prayposition, pcenter)) return FALSE; - b = D3DXVec3Dot(&difference, praydirection); + D3DXVec3Subtract(&difference, ray_position, center); c = D3DXVec3LengthSq(&difference) - radius * radius; + if (c < 0.0f) + return TRUE; + a = D3DXVec3LengthSq(ray_direction); + b = D3DXVec3Dot(&difference, ray_direction); d = b * b - a * c; - if ( ( d <= 0.0f ) || ( sqrt(d) <= b ) ) return FALSE; - return TRUE; + return d >= 0.0f && (b <= 0.0f || d > b * b); } /************************************************************************* diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index c357200656..42deb32b93 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -435,18 +435,42 @@ static void D3DXBoundProbeTest(void) radius = sqrt(77.0f); center.x = 1.0f; center.y = 2.0f; center.z = 3.0f; raydirection.x = 2.0f; raydirection.y = -4.0f; raydirection.z = 2.0f; - rayposition.x = 5.0f; rayposition.y = 5.0f; rayposition.z = 9.0f; result = D3DXSphereBoundProbe(&center, radius, &rayposition, &raydirection); - ok(result == TRUE, "expected TRUE, received FALSE\n"); + ok(result == TRUE, "Got unexpected result %#x.\n", result); rayposition.x = 45.0f; rayposition.y = -75.0f; rayposition.z = 49.0f; result = D3DXSphereBoundProbe(&center, radius, &rayposition, &raydirection); - ok(result == FALSE, "expected FALSE, received TRUE\n"); + ok(result == FALSE, "Got unexpected result %#x.\n", result); + + raydirection.x = -2.0f; raydirection.y = 4.0f; raydirection.z = -2.0f; + result = D3DXSphereBoundProbe(&center, radius, &rayposition, &raydirection); + ok(result == TRUE, "Got unexpected result %#x.\n", result); rayposition.x = 5.0f; rayposition.y = 11.0f; rayposition.z = 9.0f; result = D3DXSphereBoundProbe(&center, radius, &rayposition, &raydirection); - ok(result == FALSE, "expected FALSE, received TRUE\n"); + ok(result == FALSE, "Got unexpected result %#x.\n", result); + + raydirection.x = 2.0f; raydirection.y = -4.0f; raydirection.z = 2.0f; + result = D3DXSphereBoundProbe(&center, radius, &rayposition, &raydirection); + ok(result == FALSE, "Got unexpected result %#x.\n", result); + + radius = 1.0f; + rayposition.x = 2.0f; rayposition.y = 2.0f; rayposition.z = 3.0f; + result = D3DXSphereBoundProbe(&center, radius, &rayposition, &raydirection); + ok(result == FALSE, "Got unexpected result %#x.\n", result); + + raydirection.x = 0.0f; raydirection.y = 0.0f; raydirection.z = 1.0f; + result = D3DXSphereBoundProbe(&center, radius, &rayposition, &raydirection); + ok(result == TRUE, "Got unexpected result %#x.\n", result); + + if (0) + { + /* All these crash on native. */ + D3DXSphereBoundProbe(&center, radius, &rayposition, NULL); + D3DXSphereBoundProbe(&center, radius, NULL, &raydirection); + D3DXSphereBoundProbe(NULL, radius, &rayposition, &raydirection); + } } static void D3DXComputeBoundingBoxTest(void)

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_GET_OUTPUT_INFO in WINECON_GetServerConfig.
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: 56ee3a8ad12b02e2c53a2f3737bcd6ba15fd4737 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56ee3a8ad12b02e2c53a2f37… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:29:12 2020 +0200 wineconsole: Use IOCTL_CONDRV_GET_OUTPUT_INFO in WINECON_GetServerConfig. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 6ccba13c8a..88c9ca400a 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -611,7 +611,7 @@ static void WINECON_Delete(struct inner_data* data) static BOOL WINECON_GetServerConfig(struct inner_data* data) { struct condrv_input_info input_info; - BOOL ret; + struct condrv_output_info output_info; DWORD mode; if (!DeviceIoControl(data->hConIn, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, @@ -625,22 +625,19 @@ static BOOL WINECON_GetServerConfig(struct inner_data* data) data->curcfg.insert_mode = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS); - SERVER_START_REQ(get_console_output_info) - { - req->handle = wine_server_obj_handle( data->hConOut ); - ret = !wine_server_call_err( req ); - data->curcfg.cursor_size = reply->cursor_size; - data->curcfg.cursor_visible = reply->cursor_visible; - data->curcfg.def_attr = reply->attr; - data->curcfg.sb_width = reply->width; - data->curcfg.sb_height = reply->height; - data->curcfg.win_width = reply->win_right - reply->win_left + 1; - data->curcfg.win_height = reply->win_bottom - reply->win_top + 1; - } - SERVER_END_REQ; - WINECON_DumpConfig("first cfg: ", &data->curcfg); + if (!DeviceIoControl(data->hConOut, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, + &output_info, sizeof(output_info), NULL, NULL)) + return FALSE; + data->curcfg.cursor_size = output_info.cursor_size; + data->curcfg.cursor_visible = output_info.cursor_visible; + data->curcfg.def_attr = output_info.attr; + data->curcfg.sb_width = output_info.width; + data->curcfg.sb_height = output_info.height; + data->curcfg.win_width = output_info.win_right - output_info.win_left + 1; + data->curcfg.win_height = output_info.win_bottom - output_info.win_top + 1; - return ret; + WINECON_DumpConfig("first cfg: ", &data->curcfg); + return TRUE; } /******************************************************************

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_GET_OUTPUT_INFO ioctl.
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: af3320c57576166e0d306c1e4d9d4d3964ad58b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af3320c57576166e0d306c1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:13 2020 +0200 server: Introduce IOCTL_CONDRV_GET_OUTPUT_INFO ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 27 +++++++++++++++++++++ server/console.c | 65 ++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 81 insertions(+), 11 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 36412f5731..4d681f6ea7 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -29,6 +29,9 @@ #define IOCTL_CONDRV_PEEK CTL_CODE(FILE_DEVICE_CONSOLE, 12, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_PROPERTIES) +/* console output ioctls */ +#define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) + /* console renderer ioctls */ #define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES) @@ -41,6 +44,30 @@ struct condrv_input_info unsigned int input_count; /* number of available input records */ }; +/* IOCTL_CONDRV_GET_OUTPUT_INFO result */ +struct condrv_output_info +{ + short int cursor_size; /* size of cursor (percentage filled) */ + short int cursor_visible; /* cursor visibility flag */ + short int cursor_x; /* position of cursor (x, y) */ + short int cursor_y; + short int width; /* width of the screen buffer */ + short int height; /* height of the screen buffer */ + short int attr; /* default fill attributes (screen colors) */ + short int popup_attr; /* pop-up color attributes */ + short int win_left; /* window actually displayed by renderer */ + short int win_top; /* the rect area is expressed within the */ + short int win_right; /* boundaries of the screen buffer */ + short int win_bottom; + short int max_width; /* maximum size (width x height) for the window */ + short int max_height; + short int font_width; /* font size (width x height) */ + short int font_height; + short int font_weight; /* font weight */ + short int font_pitch_family; /* font pitch & family */ + unsigned int color_map[16]; /* color table */ +}; + /* IOCTL_CONDRV_GET_RENDERER_EVENTS result */ struct condrv_renderer_event { diff --git a/server/console.c b/server/console.c index d67cec5f4c..22af8e3b35 100644 --- a/server/console.c +++ b/server/console.c @@ -553,18 +553,18 @@ static struct screen_buffer *create_console_output( struct console_input *consol memset( screen_buffer->color_map, 0, sizeof(screen_buffer->color_map) ); list_add_head( &screen_buffer_list, &screen_buffer->entry ); - if (fd == -1) - screen_buffer->fd = NULL; + if (fd != -1) + screen_buffer->fd = create_anonymous_fd( &screen_buffer_fd_ops, fd, &screen_buffer->obj, + FILE_SYNCHRONOUS_IO_NONALERT ); else + screen_buffer->fd = alloc_pseudo_fd( &screen_buffer_fd_ops, &screen_buffer->obj, + FILE_SYNCHRONOUS_IO_NONALERT ); + if (!screen_buffer->fd) { - if (!(screen_buffer->fd = create_anonymous_fd( &screen_buffer_fd_ops, fd, &screen_buffer->obj, - FILE_SYNCHRONOUS_IO_NONALERT ))) - { - release_object( screen_buffer ); - return NULL; - } - allow_fd_caching(screen_buffer->fd); + release_object( screen_buffer ); + return NULL; } + allow_fd_caching(screen_buffer->fd); if (!(screen_buffer->data = malloc( screen_buffer->width * screen_buffer->height * sizeof(*screen_buffer->data) ))) @@ -1634,8 +1634,51 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { - set_error( STATUS_INVALID_HANDLE ); - return 0; + struct screen_buffer *screen_buffer = get_fd_user( fd ); + + switch (code) + { + case IOCTL_CONDRV_GET_OUTPUT_INFO: + { + struct condrv_output_info *info; + data_size_t size; + + size = min( sizeof(*info) + screen_buffer->font.face_len, get_reply_max_size() ); + if (size < sizeof(*info)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (!(info = set_reply_data_size( size ))) return 0; + + info->cursor_size = screen_buffer->cursor_size; + info->cursor_visible = screen_buffer->cursor_visible; + info->cursor_x = screen_buffer->cursor_x; + info->cursor_y = screen_buffer->cursor_y; + info->width = screen_buffer->width; + info->height = screen_buffer->height; + info->attr = screen_buffer->attr; + info->popup_attr = screen_buffer->popup_attr; + info->win_left = screen_buffer->win.left; + info->win_top = screen_buffer->win.top; + info->win_right = screen_buffer->win.right; + info->win_bottom = screen_buffer->win.bottom; + info->max_width = screen_buffer->max_width; + info->max_height = screen_buffer->max_height; + info->font_width = screen_buffer->font.width; + info->font_height = screen_buffer->font.height; + info->font_weight = screen_buffer->font.weight; + info->font_pitch_family = screen_buffer->font.pitch_family; + memcpy( info->color_map, screen_buffer->color_map, sizeof(info->color_map) ); + size -= sizeof(*info); + if (size) memcpy( info + 1, screen_buffer->font.face_name, size ); + return 1; + } + + default: + set_error( STATUS_INVALID_HANDLE ); + return 0; + } } static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )

1 0

Paul Gofman : ntdll: Fixup instruction pointer for EXCEPTION_BREAKPOINT in the Unix part on x86/x86_64.
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: e722660114e268179344e2e076a8e10b0f8ab3f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e722660114e268179344e2e0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 9 18:36:52 2020 +0300 ntdll: Fixup instruction pointer for EXCEPTION_BREAKPOINT in the Unix part on x86/x86_64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 3 --- dlls/ntdll/signal_x86_64.c | 3 --- dlls/ntdll/tests/exception.c | 53 ++++++++++++++++++++++++++++++++--------- dlls/ntdll/unix/signal_i386.c | 13 +++++++++- dlls/ntdll/unix/signal_x86_64.c | 13 ++++++++++ 5 files changed, 67 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 5e0c0bd090..a130638cb3 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -230,9 +230,6 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) context->SegEs, context->SegFs, context->SegGs, context->EFlags ); } - /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ - if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Eip--; - if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) NtContinue( context, FALSE ); diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c7c8b96405..57f9aee810 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -564,9 +564,6 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) context->R12, context->R13, context->R14, context->R15 ); } - /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ - if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; - if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) NtContinue( context, FALSE ); diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index f39e6f9794..c78f491108 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1671,6 +1671,9 @@ static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGIST CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) { ok(hook_called, "Hook was not called.\n"); + + ok(rec->ExceptionCode == 0x80000003, "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode); + got_exception = 1; dbg_except_continue_handler_eip = (void *)context->Eip; ++context->Eip; @@ -1682,11 +1685,22 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE EXCEPTION_RECORD *rec = e->ExceptionRecord; CONTEXT *context = e->ContextRecord; - trace("dbg_except_continue_vectored_handler, code %#x, eip %#x.\n", rec->ExceptionCode, context->Eip); + trace("dbg_except_continue_vectored_handler, code %#x, eip %#x, ExceptionAddress %p.\n", + rec->ExceptionCode, context->Eip, rec->ExceptionAddress); + + ok(rec->ExceptionCode == 0x80000003, "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode); got_exception = 1; - ++context->Eip; + if ((ULONG_PTR)rec->ExceptionAddress == context->Eip + 1) + { + /* XP and Vista+ have ExceptionAddress == Eip + 1, Eip is adjusted even + * for software raised breakpoint exception. + * Win2003 has Eip not adjusted and matching ExceptionAddress. + * Win2008 has Eip not adjuated and ExceptionAddress not filled for + * software raised exception. */ + context->Eip = (ULONG_PTR)rec->ExceptionAddress; + } return EXCEPTION_CONTINUE_EXECUTION; } @@ -1775,7 +1789,7 @@ static void test_kiuserexceptiondispatcher(void) ok(hook_exception_address == code_mem || broken(!hook_exception_address) /* Win2008 */, "Got unexpected exception address %p, expected %p.\n", hook_exception_address, code_mem); - todo_wine ok(hook_KiUserExceptionDispatcher_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", + ok(hook_KiUserExceptionDispatcher_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", hook_KiUserExceptionDispatcher_eip, code_mem); ok(dbg_except_continue_handler_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", dbg_except_continue_handler_eip, code_mem); @@ -1796,7 +1810,7 @@ static void test_kiuserexceptiondispatcher(void) pRtlRaiseException(&record); ok(got_exception, "Handler was not called.\n"); - ok(hook_called, "Hook was not called.\n"); + ok(hook_called || broken(!hook_called) /* 2003 */, "Hook was not called.\n"); RemoveVectoredExceptionHandler(dbg_except_continue_vectored_handler); ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), @@ -2832,13 +2846,13 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE trace("dbg_except_continue_vectored_handler, code %#x, Rip %#lx.\n", rec->ExceptionCode, context->Rip); + ok(rec->ExceptionCode == 0x80000003, "Got unexpected exception code %#x.\n", rec->ExceptionCode); + got_exception = 1; - if (NtCurrentTeb()->Peb->BeingDebugged || !strcmp( winetest_platform, "wine" )) - { - todo_wine_if(!NtCurrentTeb()->Peb->BeingDebugged) - ok(NtCurrentTeb()->Peb->BeingDebugged, "context->Rip misplaced for dbg breakpoint exception.\n"); + dbg_except_continue_handler_rip = (void *)context->Rip; + if (NtCurrentTeb()->Peb->BeingDebugged) ++context->Rip; - } + return EXCEPTION_CONTINUE_EXECUTION; } @@ -2934,7 +2948,7 @@ static void test_kiuserexceptiondispatcher(void) ok(hook_exception_address == code_mem || broken(!hook_exception_address) /* Win2008 */, "Got unexpected exception address %p, expected %p.\n", hook_exception_address, code_mem); - todo_wine ok(hook_KiUserExceptionDispatcher_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", + ok(hook_KiUserExceptionDispatcher_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", hook_KiUserExceptionDispatcher_rip, code_mem); ok(dbg_except_continue_handler_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", dbg_except_continue_handler_rip, code_mem); @@ -2969,10 +2983,27 @@ static void test_kiuserexceptiondispatcher(void) ok(got_exception, "Handler was not called.\n"); ok(hook_called, "Hook was not called.\n"); - NtCurrentTeb()->Peb->BeingDebugged = 0; + ok(hook_exception_address == (BYTE *)hook_KiUserExceptionDispatcher_rip + 1 + || broken(!hook_exception_address) /* 2008 */, "Got unexpected addresses %p, %p.\n", + hook_KiUserExceptionDispatcher_rip, hook_exception_address); RemoveVectoredExceptionHandler(dbg_except_continue_vectored_handler); + memcpy(pKiUserExceptionDispatcher, patched_KiUserExceptionDispatcher_bytes, + sizeof(patched_KiUserExceptionDispatcher_bytes)); + got_exception = 0; + hook_called = FALSE; + run_exception_test(dbg_except_continue_handler, NULL, except_code, ARRAY_SIZE(except_code), PAGE_EXECUTE_READ); + + ok(got_exception, "Handler was not called.\n"); + ok(hook_called, "Hook was not called.\n"); + ok(hook_KiUserExceptionDispatcher_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", + hook_KiUserExceptionDispatcher_rip, code_mem); + ok(dbg_except_continue_handler_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", + dbg_except_continue_handler_rip, code_mem); + + NtCurrentTeb()->Peb->BeingDebugged = 0; + ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), old_protect2, &old_protect2); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 1e0774e84d..44195fc205 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1584,11 +1584,22 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * SS_sig(sigcontext) = get_ds(); stack->rec_ptr = &stack->rec; /* arguments for KiUserExceptionDispatcher */ stack->context_ptr = &stack->context; + + if (stack->rec.ExceptionCode == EXCEPTION_BREAKPOINT) + { + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ + stack->context.Eip--; + } } __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, "add $4,%esp\n\t" - "jmp *8(%esp)") + "movl (%esp),%eax\n\t" /* rec */ + "cmpl $0x80000003,(%eax)\n\t" /* ExceptionCode */ + "jne 1f\n\t" + "movl 4(%esp),%eax\n\t" /* context */ + "decl 0xb8(%eax)\n\t" /* Eip */ + "1:\tjmp *8(%esp)") /********************************************************************** * get_fpu_code diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 6e103a78fb..eed622851f 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1958,6 +1958,12 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * return; } + if (stack->rec.ExceptionCode == EXCEPTION_BREAKPOINT) + { + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ + stack->context.Rip--; + } + /* now modify the sigcontext to return to the raise function */ RIP_sig(sigcontext) = (ULONG_PTR)raise_func_trampoline; R8_sig(sigcontext) = (ULONG_PTR)pKiUserExceptionDispatcher; @@ -1983,6 +1989,13 @@ void WINAPI do_call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *c { memmove(&stack->context, context, sizeof(*context)); memcpy(&stack->rec, rec, sizeof(*rec)); + + if (stack->rec.ExceptionCode == EXCEPTION_BREAKPOINT) + { + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ + stack->context.Rip--; + } + user_exception_dispatcher_trampoline( stack, dispatcher ); }

1 0

Alexandre Julliard : ntdll: Use stack buffers to retrieve the drive info from mountmgr.
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: b14eee69c7240658252bc96b6302e98948f2c62c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b14eee69c7240658252bc96b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 10:17:50 2020 +0200 ntdll: Use stack buffers to retrieve the drive info from mountmgr. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 74 ++++++++++++-------------------------------------- 1 file changed, 18 insertions(+), 56 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 9356fb03f4..a0ad361fcb 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1946,9 +1946,8 @@ static int find_dos_device( const char *path ) return -1; } -static struct mountmgr_unix_drive *get_mountmgr_fs_info( HANDLE handle, int fd ) +static NTSTATUS get_mountmgr_fs_info( HANDLE handle, int fd, struct mountmgr_unix_drive *drive, ULONG size ) { - struct mountmgr_unix_drive *drive; OBJECT_ATTRIBUTES attr; UNICODE_STRING string; char *unix_name; @@ -1957,25 +1956,16 @@ static struct mountmgr_unix_drive *get_mountmgr_fs_info( HANDLE handle, int fd ) NTSTATUS status; int letter; - if (server_get_unix_name( handle, &unix_name )) - return NULL; + if ((status = server_get_unix_name( handle, &unix_name ))) return status; letter = find_dos_device( unix_name ); RtlFreeHeap( GetProcessHeap(), 0, unix_name ); - if (!(drive = RtlAllocateHeap( GetProcessHeap(), 0, 1024 ))) - return NULL; - if (letter == -1) { struct stat st; - if (fstat( fd, &st ) == -1) - { - RtlFreeHeap( GetProcessHeap(), 0, drive ); - return NULL; - } - + fstat( fd, &st ); drive->unix_dev = st.st_dev; drive->letter = 0; } @@ -1984,36 +1974,16 @@ static struct mountmgr_unix_drive *get_mountmgr_fs_info( HANDLE handle, int fd ) RtlInitUnicodeString( &string, MOUNTMGR_DEVICE_NAME ); InitializeObjectAttributes( &attr, &string, 0, NULL, NULL ); - if (NtOpenFile( &mountmgr, GENERIC_READ | SYNCHRONIZE, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT )) - { - RtlFreeHeap( GetProcessHeap(), 0, drive ); - return NULL; - } + status = NtOpenFile( &mountmgr, GENERIC_READ | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT ); + if (status) return status; status = NtDeviceIoControlFile( mountmgr, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, - drive, sizeof(*drive), drive, 1024 ); - if (status == STATUS_BUFFER_OVERFLOW) - { - if (!(drive = RtlReAllocateHeap( GetProcessHeap(), 0, drive, drive->size ))) - { - RtlFreeHeap( GetProcessHeap(), 0, drive ); - NtClose( mountmgr ); - return NULL; - } - status = NtDeviceIoControlFile( mountmgr, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, - drive, sizeof(*drive), drive, drive->size ); - } + drive, sizeof(*drive), drive, size ); NtClose( mountmgr ); - - if (status) - { - WARN("failed to retrieve filesystem type from mountmgr, status %#x\n", status); - RtlFreeHeap( GetProcessHeap(), 0, drive ); - return NULL; - } - - return drive; + if (status == STATUS_BUFFER_OVERFLOW) status = STATUS_SUCCESS; + else if (status) WARN("failed to retrieve filesystem type from mountmgr, status %#x\n", status); + return status; } @@ -4106,15 +4076,12 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, if (fd_get_file_info( fd, options, &st, &attr ) == -1) io->u.Status = errno_to_status( errno ); else { - struct mountmgr_unix_drive *drive; + struct mountmgr_unix_drive drive; FILE_ID_INFORMATION *info = ptr; info->VolumeSerialNumber = 0; - if ((drive = get_mountmgr_fs_info( handle, fd ))) - { - info->VolumeSerialNumber = drive->serial; - RtlFreeHeap( GetProcessHeap(), 0, drive ); - } + if (!(io->u.Status = get_mountmgr_fs_info( handle, fd, &drive, sizeof(drive) ))) + info->VolumeSerialNumber = drive.serial; memset( &info->FileId, 0, sizeof(info->FileId) ); *(ULONGLONG *)&info->FileId = st.st_ino; } @@ -6212,7 +6179,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io static const WCHAR udfW[] = {'U','D','F'}; FILE_FS_ATTRIBUTE_INFORMATION *info = buffer; - struct mountmgr_unix_drive *drive; + struct mountmgr_unix_drive drive; enum mountmgr_fs_type fs_type = MOUNTMGR_FS_TYPE_NTFS; if (length < sizeof(FILE_FS_ATTRIBUTE_INFORMATION)) @@ -6221,11 +6188,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io break; } - if ((drive = get_mountmgr_fs_info( handle, fd ))) - { - fs_type = drive->fs_type; - RtlFreeHeap( GetProcessHeap(), 0, drive ); - } + if (!get_mountmgr_fs_info( handle, fd, &drive, sizeof(drive) )) fs_type = drive.fs_type; else { struct statfs stfs; @@ -6298,7 +6261,8 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io case FileFsVolumeInformation: { FILE_FS_VOLUME_INFORMATION *info = buffer; - struct mountmgr_unix_drive *drive; + ULONGLONG data[64]; + struct mountmgr_unix_drive *drive = (struct mountmgr_unix_drive *)data; const WCHAR *label; if (length < sizeof(FILE_FS_VOLUME_INFORMATION)) @@ -6307,7 +6271,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io break; } - if (!(drive = get_mountmgr_fs_info( handle, fd ))) + if (get_mountmgr_fs_info( handle, fd, drive, sizeof(data) )) { io->u.Status = STATUS_NOT_IMPLEMENTED; break; @@ -6320,8 +6284,6 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io length - offsetof( FILE_FS_VOLUME_INFORMATION, VolumeLabel ) ); info->SupportsObjects = (drive->fs_type == MOUNTMGR_FS_TYPE_NTFS); memcpy( info->VolumeLabel, label, info->VolumeLabelLength ); - RtlFreeHeap( GetProcessHeap(), 0, drive ); - io->Information = offsetof( FILE_FS_VOLUME_INFORMATION, VolumeLabel ) + info->VolumeLabelLength; io->u.Status = STATUS_SUCCESS; break;

1 0

Huw Davies : include: Update some members of KUSER_SHARED_DATA.
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: b72270cb16bc670bbf46be6fdc8dffc525d82f35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b72270cb16bc670bbf46be6f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 9 16:15:40 2020 +0100 include: Update some members of KUSER_SHARED_DATA. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 36 ++++++++++++++++++++++++++++++++---- server/mapping.c | 2 +- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 23ac630f41..59af860708 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1246,6 +1246,7 @@ typedef struct _KUSER_SHARED_DATA { ULONG SuiteMask; /* 0x2d0 */ BOOLEAN KdDebuggerEnabled; /* 0x2d4 */ UCHAR NXSupportPolicy; /* 0x2d5 */ + USHORT CyclesPerYield; /* 0x2d6 */ volatile ULONG ActiveConsoleId; /* 0x2d8 */ volatile ULONG DismountCount; /* 0x2dc */ ULONG ComPlusPackage; /* 0x2e0 */ @@ -1253,16 +1254,43 @@ typedef struct _KUSER_SHARED_DATA { ULONG NumberOfPhysicalPages; /* 0x2e8 */ BOOLEAN SafeBootMode; /* 0x2ec */ UCHAR VirtualizationFlags; /* 0x2ed */ - ULONG TraceLogging; /* 0x2f0 */ + union { + ULONG SharedDataFlags; /* 0x2f0 */ + struct { + ULONG DbgErrorPortPresent : 1; + ULONG DbgElevationEnabed : 1; + ULONG DbgVirtEnabled : 1; + ULONG DbgInstallerDetectEnabled : 1; + ULONG DbgLkgEnabled : 1; + ULONG DbgDynProcessorEnabled : 1; + ULONG DbgConsoleBrokerEnabled : 1; + ULONG DbgSecureBootEnabled : 1; + ULONG DbgMultiSessionSku : 1; + ULONG DbgMultiUsersInSessionSku : 1; + ULONG DbgStateSeparationEnabled : 1; + ULONG SpareBits : 21; + } DUMMYSTRUCTNAME2; + } DUMMYUNIONNAME2; + ULONG DataFlagsPad[1]; /* 0x2f4 */ ULONGLONG TestRetInstruction; /* 0x2f8 */ - ULONG SystemCall; /* 0x300 */ - ULONG SystemCallReturn; /* 0x304 */ - ULONGLONG SystemCallPad[3]; /* 0x308 */ + LONGLONG QpcFrequency; /* 0x300 */ + ULONG SystemCall; /* 0x308 */ + union { + ULONG AllFlags; /* 0x30c */ + struct { + ULONG Win32Process : 1; + ULONG Sgx2Enclave : 1; + ULONG VbsBasicEnclave : 1; + ULONG SpareBits : 29; + } DUMMYSTRUCTNAME; + } UserCetAvailableEnvironments; + ULONGLONG SystemCallPad[2]; /* 0x310 */ union { volatile KSYSTEM_TIME TickCount; /* 0x320 */ volatile ULONG64 TickCountQuad; } DUMMYUNIONNAME; ULONG Cookie; /* 0x330 */ + ULONG CookiePad[1]; /* 0x334 */ LONGLONG ConsoleSessionForegroundProcessId; /* 0x338 */ ULONGLONG TimeUpdateLock; /* 0x340 */ ULONGLONG BaselineSystemTimeQpc; /* 0x348 */ diff --git a/server/mapping.c b/server/mapping.c index ce70b696bd..db0debe0af 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -967,7 +967,7 @@ struct object *create_user_data_mapping( struct object *root, const struct unico if (ptr != MAP_FAILED) { user_shared_data = ptr; - user_shared_data->SystemCallPad[0] = 1; + user_shared_data->SystemCall = 1; } return &mapping->obj; }

1 0