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

Henri Verbeet : vkd3d-shader: Rename the vkd3d_descriptor_range_type enumeration to vkd3d_shader_descriptor_range_type.
by Alexandre Julliard July 10, 2020

July 10, 2020

Module: vkd3d Branch: master Commit: 6e0ab34564fdd3e9690ff809d4a20dd182fd4522 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6e0ab34564fdd3e9690ff80… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 17:02:03 2020 +0430 vkd3d-shader: Rename the vkd3d_descriptor_range_type enumeration to vkd3d_shader_descriptor_range_type. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 16 ++++++++-------- libs/vkd3d-shader/dxbc.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d00ec45..50c64ca 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -418,19 +418,19 @@ struct vkd3d_static_sampler_desc enum vkd3d_shader_visibility shader_visibility; }; -enum vkd3d_descriptor_range_type +enum vkd3d_shader_descriptor_range_type { - VKD3D_DESCRIPTOR_RANGE_TYPE_SRV = 0, - VKD3D_DESCRIPTOR_RANGE_TYPE_UAV = 1, - VKD3D_DESCRIPTOR_RANGE_TYPE_CBV = 2, - VKD3D_DESCRIPTOR_RANGE_TYPE_SAMPLER = 3, + VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV = 0x0, + VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV = 0x1, + VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_CBV = 0x2, + VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SAMPLER = 0x3, - VKD3D_FORCE_32_BIT_ENUM(VKD3D_DESCRIPTOR_RANGE_TYPE), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE), }; struct vkd3d_descriptor_range { - enum vkd3d_descriptor_range_type range_type; + enum vkd3d_shader_descriptor_range_type range_type; unsigned int descriptor_count; unsigned int base_shader_register; unsigned int register_space; @@ -522,7 +522,7 @@ enum vkd3d_descriptor_range_flags struct vkd3d_descriptor_range1 { - enum vkd3d_descriptor_range_type range_type; + enum vkd3d_shader_descriptor_range_type range_type; unsigned int descriptor_count; unsigned int base_shader_register; unsigned int register_space; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5fba83b..a0f03cf 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3046,13 +3046,13 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_root_descriptor_ta { const struct vkd3d_descriptor_range *r = &descriptor_table->descriptor_ranges[i]; - if (r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_SRV - || r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_UAV - || r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_CBV) + if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV + || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV + || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_CBV) { have_srv_uav_cbv = true; } - else if (r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_SAMPLER) + else if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SAMPLER) { have_sampler = true; } @@ -3082,13 +3082,13 @@ static int validate_descriptor_table_v_1_1(const struct vkd3d_root_descriptor_ta { const struct vkd3d_descriptor_range1 *r = &descriptor_table->descriptor_ranges[i]; - if (r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_SRV - || r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_UAV - || r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_CBV) + if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV + || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV + || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_CBV) { have_srv_uav_cbv = true; } - else if (r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_SAMPLER) + else if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SAMPLER) { have_sampler = true; }

1 0

Henri Verbeet : vkd3d-shader: Rename the VKD3D_SWIZZLE macro to VKD3D_SHADER_SWIZZLE.
by Alexandre Julliard July 10, 2020

July 10, 2020

Module: vkd3d Branch: master Commit: edd585ea44c5e03616d18ce55c97fc75ad96125f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=edd585ea44c5e03616d18ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 17:02:02 2020 +0430 vkd3d-shader: Rename the VKD3D_SWIZZLE macro to VKD3D_SHADER_SWIZZLE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 33 ++++++++++++++++---------------- libs/vkd3d-shader/dxbc.c | 7 ++++--- libs/vkd3d-shader/spirv.c | 16 ++++++++-------- libs/vkd3d-shader/trace.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- libs/vkd3d/state.c | 7 ++++--- 6 files changed, 40 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=edd585ea44c5e03616d…

1 0

Henri Verbeet : vkd3d-compiler: Add an option to specify the source type.
by Alexandre Julliard July 10, 2020

July 10, 2020

Module: vkd3d Branch: master Commit: e4690d51cca0672ffad1b641bb87773f1173d728 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e4690d51cca0672ffad1b64… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 17:01:59 2020 +0430 vkd3d-compiler: Add an option to specify the source type. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index da03df2..4da3a99 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -104,6 +104,8 @@ static void print_usage(const char *program_name) " -o, --output=<file> Write the output to <file>.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" + " -x <type> Specify the type of the source. Valid values are\n" + " 'dxbc-tpf' and 'none'.\n" " -- Stop option processing. Any subsequent argument is\n" " interpreted as a filename.\n"; @@ -114,6 +116,7 @@ struct options { const char *filename; const char *output_filename; + enum vkd3d_shader_source_type source_type; bool print_version; struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; @@ -148,6 +151,14 @@ static void add_compile_option(struct options *options, o->value = value; } +static enum vkd3d_shader_source_type parse_source_type(const char *source) +{ + if (!strcmp(source, "dxbc-tpf") || !strcmp(source, "none")) + return VKD3D_SHADER_SOURCE_DXBC_TPF; + + return VKD3D_SHADER_SOURCE_NONE; +} + static bool parse_command_line(int argc, char **argv, struct options *options) { int option; @@ -162,10 +173,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) }; memset(options, 0, sizeof(*options)); + options->source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; for (;;) { - if ((option = getopt_long(argc, argv, "ho:V", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "ho:Vx:", long_options, NULL)) == -1) break; switch (option) @@ -184,6 +196,14 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->print_version = true; return true; + case 'x': + if ((options->source_type = parse_source_type(optarg)) == VKD3D_SHADER_SOURCE_NONE) + { + fprintf(stderr, "Invalid source type '%s' specified.\n", optarg); + return false; + } + break; + default: return false; } @@ -218,7 +238,7 @@ int main(int argc, char **argv) info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; - info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + info.source_type = options.source_type; info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; info.options = options.compile_options; info.option_count = options.compile_option_count;

1 0

Jacek Caban : kernel32: Use IOCTL_CONDRV_GET_OUTPUT_INFO in get_console_font_size.
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: 0c3c89b74decfdab8e0227d87e5eecdb3380806c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c3c89b74decfdab8e0227d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:20 2020 +0200 kernel32: Use IOCTL_CONDRV_GET_OUTPUT_INFO in get_console_font_size. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index e919fcf3f1..0a45a0e294 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1391,6 +1391,7 @@ BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_ static COORD get_console_font_size(HANDLE hConsole, DWORD index) { + struct condrv_output_info info; COORD c = {0,0}; if (index >= GetNumberOfConsoleFonts()) @@ -1399,16 +1400,12 @@ static COORD get_console_font_size(HANDLE hConsole, DWORD index) return c; } - SERVER_START_REQ(get_console_output_info) + if (DeviceIoControl( hConsole, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL )) { - req->handle = console_handle_unmap(hConsole); - if (!wine_server_call_err(req)) - { - c.X = reply->font_width; - c.Y = reply->font_height; - } + c.X = info.font_width; + c.Y = info.font_height; } - SERVER_END_REQ; + else SetLastError( ERROR_INVALID_HANDLE ); return c; }

1 0

Jacek Caban : kernel32: Use IOCT_CONDRV_GET_OUTPUT_INFO in GetCurrentConsoleFontEx.
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: 2789787f011e1a923dc22b6884433826e9350725 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2789787f011e1a923dc22b68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:32 2020 +0200 kernel32: Use IOCT_CONDRV_GET_OUTPUT_INFO in GetCurrentConsoleFontEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 57 ++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 0a45a0e294..e21c8a890e 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1326,11 +1326,11 @@ BOOL WINAPI SetConsoleKeyShortcuts(BOOL set, BYTE keys, VOID *a, DWORD b) BOOL WINAPI GetCurrentConsoleFontEx(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_INFOEX *fontinfo) { - BOOL ret; + DWORD size; struct { - unsigned int color_map[16]; - WCHAR face_name[LF_FACESIZE]; + struct condrv_output_info info; + WCHAR face_name[LF_FACESIZE - 1]; } data; if (fontinfo->cbSize != sizeof(CONSOLE_FONT_INFOEX)) @@ -1339,37 +1339,30 @@ BOOL WINAPI GetCurrentConsoleFontEx(HANDLE hConsole, BOOL maxwindow, CONSOLE_FON return FALSE; } - SERVER_START_REQ(get_console_output_info) + if (!DeviceIoControl( hConsole, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, + &data, sizeof(data), &size, NULL )) { - req->handle = console_handle_unmap(hConsole); - wine_server_set_reply( req, &data, sizeof(data) - sizeof(WCHAR) ); - if ((ret = !wine_server_call_err(req))) - { - fontinfo->nFont = 0; - if (maxwindow) - { - fontinfo->dwFontSize.X = min(reply->width, reply->max_width); - fontinfo->dwFontSize.Y = min(reply->height, reply->max_height); - } - else - { - fontinfo->dwFontSize.X = reply->win_right - reply->win_left + 1; - fontinfo->dwFontSize.Y = reply->win_bottom - reply->win_top + 1; - } - if (wine_server_reply_size( reply ) > sizeof(data.color_map)) - { - data_size_t len = wine_server_reply_size( reply ) - sizeof(data.color_map); - memcpy( fontinfo->FaceName, data.face_name, len ); - fontinfo->FaceName[len / sizeof(WCHAR)] = 0; - } - else - fontinfo->FaceName[0] = 0; - fontinfo->FontFamily = reply->font_pitch_family; - fontinfo->FontWeight = reply->font_weight; - } + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } - SERVER_END_REQ; - return ret; + + fontinfo->nFont = 0; + if (maxwindow) + { + fontinfo->dwFontSize.X = min( data.info.width, data.info.max_width ); + fontinfo->dwFontSize.Y = min( data.info.height, data.info.max_height ); + } + else + { + fontinfo->dwFontSize.X = data.info.win_right - data.info.win_left + 1; + fontinfo->dwFontSize.Y = data.info.win_bottom - data.info.win_top + 1; + } + size -= sizeof(data.info); + if (size) memcpy( fontinfo->FaceName, data.face_name, size ); + fontinfo->FaceName[size / sizeof(WCHAR)] = 0; + fontinfo->FontFamily = data.info.font_pitch_family; + fontinfo->FontWeight = data.info.font_weight; + return TRUE; } BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_INFO *fontinfo)

1 0

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

July 9, 2020

Module: wine Branch: master Commit: d25a267978de5949a283c5f76405175316f8f773 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d25a267978de5949a283c5f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:42 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetLargestConsoleWindowSize. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index f5612de407..83cbce38d5 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -159,18 +159,17 @@ static void fill_console_output( HANDLE handle, int i, int j, int len, CHAR_INFO /* helper function for GetLargestConsoleWindowSize */ static COORD get_largest_console_window_size( HANDLE handle ) { + struct condrv_output_info info; COORD c = { 0, 0 }; - SERVER_START_REQ( get_console_output_info ) + if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL )) { - req->handle = console_handle_unmap( handle ); - if (!wine_server_call_err( req )) - { - c.X = reply->max_width; - c.Y = reply->max_height; - } + SetLastError( ERROR_INVALID_HANDLE ); + return c; } - SERVER_END_REQ; + + c.X = info.max_width; + c.Y = info.max_height; TRACE( "(%p), returning %dx%d\n", handle, c.X, c.Y ); return c; }

1 0

Ziqing Hui : d3dx10/tests: Add more test images.
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: 9f59bdd9d2bd1bf4f87a35f80682f37bae94b051 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f59bdd9d2bd1bf4f87a35f8… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jul 8 11:10:19 2020 +0800 d3dx10/tests: Add more test images. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/Makefile.in | 2 +- dlls/d3dx10_43/tests/d3dx10.c | 155 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 153 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f59bdd9d2bd1bf4f87a…

1 0

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

July 9, 2020

Module: wine Branch: master Commit: 547855e623c561c23b205f18d017e53d5ee75b7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=547855e623c561c23b205f18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:48 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleCursorInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 83cbce38d5..fe4b798988 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -541,26 +541,22 @@ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleCP(void) */ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleCursorInfo( HANDLE handle, CONSOLE_CURSOR_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 ); - ret = !wine_server_call_err( req ); - if (ret && info) - { - info->dwSize = reply->cursor_size; - info->bVisible = reply->cursor_visible; - } + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } - SERVER_END_REQ; - if (!ret) return FALSE; if (!info) { SetLastError( ERROR_INVALID_ACCESS ); return FALSE; } + + info->dwSize = condrv_info.cursor_size; + info->bVisible = condrv_info.cursor_visible; TRACE("(%p) returning (%d,%d)\n", handle, info->dwSize, info->bVisible); return TRUE; }

1 0

Robin Kertels : d3dx9: Ignore filter in D3DXLoadSurfaceFromSurface() when rects match.
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: 625622ad4182061ee3111032ab0ae4a494b74e73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=625622ad4182061ee3111032… Author: Robin Kertels <robin.kertels(a)gmail.com> Date: Thu Jul 9 21:36:35 2020 +0200 d3dx9: Ignore filter in D3DXLoadSurfaceFromSurface() when rects match. This allows us to use IDirect3DDevice9_StretchRect and avoid GPU synchronization. It massively improves performance in Dead Space 1 which calls LoadSurfaceFromSurface every frame before presenting. 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/surface.c | 105 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 82 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index a5143cbee4..045d7267c9 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -2142,11 +2142,14 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, IDirect3DSurface9 *src_surface, const PALETTEENTRY *src_palette, const RECT *src_rect, DWORD filter, D3DCOLOR color_key) { + const struct pixel_format_desc *src_format_desc, *dst_format_desc; + D3DSURFACE_DESC src_desc, dst_desc; + struct volume src_size, dst_size; IDirect3DSurface9 *temp_surface; D3DTEXTUREFILTERTYPE d3d_filter; IDirect3DDevice9 *device; - D3DSURFACE_DESC src_desc; D3DLOCKED_RECT lock; + RECT dst_rect_temp; HRESULT hr; RECT s; @@ -2158,28 +2161,92 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, if (!dst_surface || !src_surface) return D3DERR_INVALIDCALL; + IDirect3DSurface9_GetDesc(src_surface, &src_desc); + src_format_desc = get_format_info(src_desc.Format); + if (!src_rect) + { + SetRect(&s, 0, 0, src_desc.Width, src_desc.Height); + src_rect = &s; + } + else if (src_rect->left == src_rect->right || src_rect->top == src_rect->bottom) + { + WARN("Empty src_rect specified.\n"); + return filter == D3DX_FILTER_NONE ? D3D_OK : E_FAIL; + } + else if (src_rect->left > src_rect->right || src_rect->right > src_desc.Width + || src_rect->left < 0 || src_rect->left > src_desc.Width + || src_rect->top > src_rect->bottom || src_rect->bottom > src_desc.Height + || src_rect->top < 0 || src_rect->top > src_desc.Height) + { + WARN("Invalid src_rect specified.\n"); + return D3DERR_INVALIDCALL; + } + + src_size.width = src_rect->right - src_rect->left; + src_size.height = src_rect->bottom - src_rect->top; + src_size.depth = 1; + + IDirect3DSurface9_GetDesc(dst_surface, &dst_desc); + dst_format_desc = get_format_info(dst_desc.Format); + if (!dst_rect) + { + SetRect(&dst_rect_temp, 0, 0, dst_desc.Width, dst_desc.Height); + dst_rect = &dst_rect_temp; + } + else if (dst_rect->left == dst_rect->right || dst_rect->top == dst_rect->bottom) + { + WARN("Empty dst_rect specified.\n"); + return filter == D3DX_FILTER_NONE ? D3D_OK : E_FAIL; + } + else if (dst_rect->left > dst_rect->right || dst_rect->right > dst_desc.Width + || dst_rect->left < 0 || dst_rect->left > dst_desc.Width + || dst_rect->top > dst_rect->bottom || dst_rect->bottom > dst_desc.Height + || dst_rect->top < 0 || dst_rect->top > dst_desc.Height) + { + WARN("Invalid dst_rect specified.\n"); + return D3DERR_INVALIDCALL; + } + + dst_size.width = dst_rect->right - dst_rect->left; + dst_size.height = dst_rect->bottom - dst_rect->top; + dst_size.depth = 1; + if (!dst_palette && !src_palette && !color_key) { - switch (filter) + if (src_desc.Format == dst_desc.Format + && dst_size.width == src_size.width + && dst_size.height == src_size.height + && color_key == 0 + && !(src_rect->left & (src_format_desc->block_width - 1)) + && !(src_rect->top & (src_format_desc->block_height - 1)) + && !(dst_rect->left & (dst_format_desc->block_width - 1)) + && !(dst_rect->top & (dst_format_desc->block_height - 1))) { - case D3DX_FILTER_NONE: - d3d_filter = D3DTEXF_NONE; - break; + d3d_filter = D3DTEXF_NONE; + } + else + { + switch (filter) + { + case D3DX_FILTER_NONE: + d3d_filter = D3DTEXF_NONE; + break; - case D3DX_FILTER_POINT: - d3d_filter = D3DTEXF_POINT; - break; + case D3DX_FILTER_POINT: + d3d_filter = D3DTEXF_POINT; + break; - case D3DX_FILTER_LINEAR: - d3d_filter = D3DTEXF_LINEAR; - break; + case D3DX_FILTER_LINEAR: + d3d_filter = D3DTEXF_LINEAR; + break; - default: - d3d_filter = ~0u; - break; + default: + d3d_filter = D3DTEXF_FORCE_DWORD; + break; + } } - if (d3d_filter != ~0u) + if (d3d_filter != D3DTEXF_FORCE_DWORD) { IDirect3DSurface9_GetDevice(src_surface, &device); hr = IDirect3DDevice9_StretchRect(device, src_surface, src_rect, dst_surface, dst_rect, d3d_filter); @@ -2189,14 +2256,6 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, } } - IDirect3DSurface9_GetDesc(src_surface, &src_desc); - - if (!src_rect) - { - SetRect(&s, 0, 0, src_desc.Width, src_desc.Height); - src_rect = &s; - } - if (FAILED(lock_surface(src_surface, NULL, &lock, &temp_surface, FALSE))) return D3DXERR_INVALIDDATA;

1 0

Ziqing Hui : d3dx10: Implement D3DX10GetImageInfoFromMemory().
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: 99aa8b5ddc1b81ee4f7b3dd6d13dd9ae46e08ff7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99aa8b5ddc1b81ee4f7b3dd6… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 9 21:35:48 2020 +0200 d3dx10: Implement D3DX10GetImageInfoFromMemory(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48856 Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/Makefile.in | 1 + dlls/d3dx10_43/d3dx10_43_main.c | 146 +++++++++++++++++++++++++++++++++++++++- dlls/d3dx10_43/tests/d3dx10.c | 7 +- 3 files changed, 147 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 2d0343f3b0..ca2d418be0 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -1,6 +1,7 @@ MODULE = d3dx10_43.dll IMPORTLIB = d3dx10 IMPORTS = d3d10_1 d3dcompiler dxguid +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 45247756b8..53781f5de6 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -32,9 +32,56 @@ #include "d3d10_1.h" #include "d3dx10.h" +#include "wincodec.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT sdk_version, IWICImagingFactory **imaging_factory); + +static const struct +{ + const GUID *wic_container_guid; + D3DX10_IMAGE_FILE_FORMAT d3dx_file_format; +} +file_formats[] = +{ + { &GUID_ContainerFormatBmp, D3DX10_IFF_BMP }, + { &GUID_ContainerFormatJpeg, D3DX10_IFF_JPG }, + { &GUID_ContainerFormatPng, D3DX10_IFF_PNG }, + { &GUID_ContainerFormatDds, D3DX10_IFF_DDS }, + { &GUID_ContainerFormatTiff, D3DX10_IFF_TIFF }, + { &GUID_ContainerFormatGif, D3DX10_IFF_GIF }, + { &GUID_ContainerFormatWmp, D3DX10_IFF_WMP }, +}; + +static D3DX10_IMAGE_FILE_FORMAT wic_container_guid_to_file_format(GUID *container_format) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(file_formats); ++i) + { + if (IsEqualGUID(file_formats[i].wic_container_guid, container_format)) + return file_formats[i].d3dx_file_format; + } + return D3DX10_IFF_FORCE_DWORD; +} + +static D3D10_RESOURCE_DIMENSION wic_dimension_to_d3dx10_dimension(WICDdsDimension wic_dimension) +{ + switch (wic_dimension) + { + case WICDdsTexture1D: + return D3D10_RESOURCE_DIMENSION_TEXTURE1D; + case WICDdsTexture2D: + case WICDdsTextureCube: + return D3D10_RESOURCE_DIMENSION_TEXTURE2D; + case WICDdsTexture3D: + return D3D10_RESOURCE_DIMENSION_TEXTURE3D; + default: + return D3D10_RESOURCE_DIMENSION_UNKNOWN; + } +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch (fdwReason) @@ -229,10 +276,105 @@ HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **devi HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *img_info, HRESULT *hresult) { - FIXME("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p.\n", + IWICBitmapFrameDecode *frame = NULL; + IWICImagingFactory *factory = NULL; + IWICDdsDecoder *dds_decoder = NULL; + IWICBitmapDecoder *decoder = NULL; + WICDdsParameters dds_params; + IWICStream *stream = NULL; + unsigned int frame_count; + GUID container_format; + HRESULT hr; + + TRACE("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p.\n", src_data, src_data_size, pump, img_info, hresult); - return E_NOTIMPL; + if (!src_data || !src_data_size || !img_info) + return E_FAIL; + if (pump) + FIXME("Thread pump is not supported yet.\n"); + + WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); + IWICImagingFactory_CreateStream(factory, &stream); + hr = IWICStream_InitializeFromMemory(stream, (BYTE *)src_data, src_data_size); + if (FAILED(hr)) + { + WARN("Failed to initialize stream.\n"); + goto end; + } + hr = IWICImagingFactory_CreateDecoderFromStream(factory, (IStream *)stream, NULL, 0, &decoder); + if (FAILED(hr)) + goto end; + + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &container_format); + if (FAILED(hr)) + goto end; + img_info->ImageFileFormat = wic_container_guid_to_file_format(&container_format); + if (img_info->ImageFileFormat == D3DX10_IFF_FORCE_DWORD) + { + hr = E_FAIL; + WARN("Unsupported image file format %s.\n", debugstr_guid(&container_format)); + goto end; + } + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + if (FAILED(hr) || !frame_count) + goto end; + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + if (FAILED(hr)) + goto end; + hr = IWICBitmapFrameDecode_GetSize(frame, &img_info->Width, &img_info->Height); + if (FAILED(hr)) + goto end; + + if (img_info->ImageFileFormat == D3DX10_IFF_DDS) + { + hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICDdsDecoder, (void **)&dds_decoder); + if (FAILED(hr)) + goto end; + hr = IWICDdsDecoder_GetParameters(dds_decoder, &dds_params); + if (FAILED(hr)) + goto end; + img_info->ArraySize = dds_params.ArraySize; + img_info->Depth = dds_params.Depth; + img_info->MipLevels = dds_params.MipLevels; + img_info->ResourceDimension = wic_dimension_to_d3dx10_dimension(dds_params.Dimension); + img_info->Format = dds_params.DxgiFormat; + img_info->MiscFlags = 0; + if (dds_params.Dimension == WICDdsTextureCube) + { + img_info->MiscFlags = D3D10_RESOURCE_MISC_TEXTURECUBE; + img_info->ArraySize *= 6; + } + } + else + { + img_info->ArraySize = 1; + img_info->Depth = 1; + img_info->MipLevels = 1; + img_info->ResourceDimension = D3D10_RESOURCE_DIMENSION_TEXTURE2D; + img_info->Format = DXGI_FORMAT_R8G8B8A8_UNORM; + img_info->MiscFlags = 0; + } + +end: + if (dds_decoder) + IWICDdsDecoder_Release(dds_decoder); + if (frame) + IWICBitmapFrameDecode_Release(frame); + if (decoder) + IWICBitmapDecoder_Release(decoder); + if (stream) + IWICStream_Release(stream); + if (factory) + IWICImagingFactory_Release(factory); + + if (hr != S_OK) + { + WARN("Invalid or unsupported image file.\n"); + return E_FAIL; + } + return S_OK; } D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 40f836d9ba..6012dff647 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1051,23 +1051,21 @@ static void test_get_image_info(void) CoInitialize(NULL); - todo_wine { hr = D3DX10GetImageInfoFromMemory(test_image[0].data, 0, NULL, &image_info, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromMemory(NULL, test_image[0].size, NULL, &image_info, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromMemory(&dword, sizeof(dword), NULL, &image_info, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - } for (i = 0; i < ARRAY_SIZE(test_image); ++i) { hr = D3DX10GetImageInfoFromMemory(test_image[i].data, test_image[i].size, NULL, &image_info, NULL); - todo_wine ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_WMP) + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); if (hr != S_OK) continue; - todo_wine { ok(image_info.Width == test_image[i].expected.Width, "Test %u: Got unexpected Width %u, expected %u.\n", i, image_info.Width, test_image[i].expected.Width); @@ -1095,7 +1093,6 @@ static void test_get_image_info(void) ok(image_info.ImageFileFormat == test_image[i].expected.ImageFileFormat, "Test %u: Got unexpected ImageFileFormat %u, expected %u.\n", i, image_info.ImageFileFormat, test_image[i].expected.ImageFileFormat); - } } CoUninitialize();

1 0