April 2020 - Wine-commits - list.winehq.org

Jacek Caban : makefiles: Remove no longer needed explicit ucrtbase imports.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: af12270ac679315f45a39fe3d70f539fe716055a URL: https://source.winehq.org/git/wine.git/?a=commit;h=af12270ac679315f45a39fe3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 6 20:05:17 2020 +0200 makefiles: Remove no longer needed explicit ucrtbase imports. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/Makefile.in | 2 +- dlls/d3dx9_25/Makefile.in | 2 +- dlls/d3dx9_26/Makefile.in | 2 +- dlls/d3dx9_27/Makefile.in | 2 +- dlls/d3dx9_28/Makefile.in | 2 +- dlls/d3dx9_29/Makefile.in | 2 +- dlls/d3dx9_30/Makefile.in | 2 +- dlls/d3dx9_31/Makefile.in | 2 +- dlls/d3dx9_32/Makefile.in | 2 +- dlls/d3dx9_33/Makefile.in | 2 +- dlls/d3dx9_34/Makefile.in | 2 +- dlls/d3dx9_35/Makefile.in | 2 +- dlls/d3dx9_36/Makefile.in | 2 +- dlls/d3dx9_37/Makefile.in | 2 +- dlls/d3dx9_38/Makefile.in | 2 +- dlls/d3dx9_39/Makefile.in | 2 +- dlls/d3dx9_40/Makefile.in | 2 +- dlls/d3dx9_41/Makefile.in | 2 +- dlls/d3dx9_42/Makefile.in | 2 +- dlls/d3dx9_43/Makefile.in | 2 +- dlls/dsound/Makefile.in | 2 +- dlls/gdiplus/Makefile.in | 2 +- dlls/msvcp140/Makefile.in | 1 - dlls/vbscript/Makefile.in | 2 +- dlls/vcruntime140/Makefile.in | 1 - 25 files changed, 23 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af12270ac679315f45a3…

1 0

Alistair Leslie-Hughes : winmm: Use CreateFileA instead of OpenFile.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 5ee2ef52175c8bf506c4eb9a67bde4cb72a93853 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ee2ef52175c8bf506c4eb9a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 6 13:23:49 2020 -0500 winmm: Use CreateFileA instead of OpenFile. OpenFile has a filepath limit of 128. Use CreateFile which doesn't have this limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48832 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27324 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/mmio.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 6f14301975..48bbd3ed48 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -48,6 +48,40 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmio); static WINE_MMIO *MMIOList; +/* From kernel32 */ +static HANDLE create_file_OF( LPCSTR path, INT mode ) +{ + DWORD access, sharing, creation; + + if (mode & OF_CREATE) + { + creation = CREATE_ALWAYS; + access = GENERIC_READ | GENERIC_WRITE; + } + else + { + creation = OPEN_EXISTING; + switch(mode & 0x03) + { + case OF_READ: access = GENERIC_READ; break; + case OF_WRITE: access = GENERIC_WRITE; break; + case OF_READWRITE: access = GENERIC_READ | GENERIC_WRITE; break; + default: access = 0; break; + } + } + + switch(mode & 0x70) + { + case OF_SHARE_EXCLUSIVE: sharing = 0; break; + case OF_SHARE_DENY_WRITE: sharing = FILE_SHARE_READ; break; + case OF_SHARE_DENY_READ: sharing = FILE_SHARE_WRITE; break; + case OF_SHARE_DENY_NONE: + case OF_SHARE_COMPAT: + default: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; + } + return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); +} + /************************************************************************** * mmioDosIOProc [internal] */ @@ -76,9 +110,14 @@ static LRESULT CALLBACK mmioDosIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage, /* if filename NULL, assume open file handle in adwInfo[0] */ if (szFileName) { - OFSTRUCT ofs; - lpmmioinfo->adwInfo[0] = OpenFile(szFileName, &ofs, lpmmioinfo->dwFlags & 0xFFFF); - } + HANDLE file; + + file = create_file_OF( szFileName, lpmmioinfo->dwFlags ); + if (file != INVALID_HANDLE_VALUE) + lpmmioinfo->adwInfo[0] = HandleToLong(file); + else + lpmmioinfo->adwInfo[0] = HFILE_ERROR; + } if (lpmmioinfo->adwInfo[0] == HFILE_ERROR) ret = MMIOERR_FILENOTFOUND; }

1 0

Jacek Caban : include: Avoid _onexit_t redefinition.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: d45e36f5f8253a3e122f874ceb707387f1ef5b33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d45e36f5f8253a3e122f874c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 6 20:26:49 2020 +0200 include: Avoid _onexit_t redefinition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48888 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_startup.h | 3 +++ include/msvcrt/stdlib.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/include/msvcrt/corecrt_startup.h b/include/msvcrt/corecrt_startup.h index 064f6fca27..58450b94ca 100644 --- a/include/msvcrt/corecrt_startup.h +++ b/include/msvcrt/corecrt_startup.h @@ -32,7 +32,10 @@ typedef struct _onexit_table_t { _PVFV *_end; } _onexit_table_t; +#ifndef _CRT_ONEXIT_T_DEFINED +#define _CRT_ONEXIT_T_DEFINED typedef int (__cdecl *_onexit_t)(void); +#endif struct _exception; typedef int (__cdecl *_UserMathErrorFunctionPointer)(struct _exception *); diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index f73f2ae384..2ce4789350 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -136,7 +136,10 @@ errno_t __cdecl _get_errno(int*); errno_t __cdecl _set_doserrno(int); errno_t __cdecl _set_errno(int); +#ifndef _CRT_ONEXIT_T_DEFINED +#define _CRT_ONEXIT_T_DEFINED typedef int (__cdecl *_onexit_t)(void); +#endif int __cdecl _atodbl(_CRT_DOUBLE*,char*);

1 0

Andrew Eikum : winmm/tests: Test mmioOpen with long file name.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: ca092dcf819174699f9bb1af45a285dff2f6ac81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca092dcf819174699f9bb1af… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 6 13:24:04 2020 -0500 winmm/tests: Test mmioOpen with long file name. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mmio.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 5501c319c5..e3984fbaf3 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -471,6 +471,58 @@ static void test_mmioOpen(char *fname) mmioClose(hmmio, 0); } +static void test_mmioOpen_create(void) +{ + HMMIO hmmio; + HANDLE handle; + WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; + /* According to docs, filename must be no more than 128 bytes, but it will + * actually allow longer than that. */ + WCHAR filename[] = L"very_long_filename_" + L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; + + GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + SetCurrentDirectoryW(temp_dir); + + DeleteFileW(filename); + + /* open with MMIO_DENYNONE */ + hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); + ok(hmmio != NULL, "mmioOpen failed\n"); + + /* MMIO_DENYNONE lets us open it here, too */ + handle = CreateFileW(filename, GENERIC_READ, + FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); + CloseHandle(handle); + + mmioClose(hmmio, 0); + + DeleteFileW(filename); + + /* open with MMIO_EXCLUSIVE */ + hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); + ok(hmmio != NULL, "mmioOpen failed\n"); + + /* should fail due to MMIO_EXCLUSIVE */ + handle = CreateFileW(filename, GENERIC_READ, + FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); + if(handle != INVALID_HANDLE_VALUE) + CloseHandle(handle); + + mmioClose(hmmio, 0); + + DeleteFileW(filename); + + SetCurrentDirectoryW(cwd); +} + static void test_mmioSetBuffer(char *fname) { char buf[256]; @@ -1016,6 +1068,7 @@ START_TEST(mmio) test_mmioDescend(fname); test_mmioOpen(NULL); test_mmioOpen(fname); + test_mmioOpen_create(); test_mmioSetBuffer(NULL); test_mmioSetBuffer(fname); test_mmioOpen_fourcc();

1 0

Chip Davis : d3d9/tests: Use compare_uint() in a couple more places.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: ea70874aa10a663c3045dafab34533ccb488938f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea70874aa10a663c3045dafa… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 10:57:55 2020 -0500 d3d9/tests: Use compare_uint() in a couple more places. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 92116b3eb8..f873f3ae9b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1514,7 +1514,7 @@ static void test_clear_different_size_surfaces(void) depth = (WORD *)((BYTE *)lr.pBits + y * lr.Pitch); for (x = 0; x < 4; ++x) { - ok(abs(depth[x] - 0x7fff) <= 2, "Got depth 0x%04x at %u, %u.\n", depth[x], x, y); + ok(compare_uint(depth[x], 0x7fff, 2), "Got depth 0x%04x at %u, %u.\n", depth[x], x, y); } } hr = IDirect3DSurface9_UnlockRect(ds); @@ -1729,7 +1729,7 @@ static void color_fill_test(void) /* Windows drivers disagree on how to promote the 8 bit per channel * input argument to 16 bit for D3DFMT_G16R16. */ ok(color_match(surface_data[0], formats[i].fill_value, 2) && - abs((expected_a) - (fill_a)) < 3, + compare_uint(expected_a, fill_a, 2), "Expected clear value 0x%08x, got 0x%08x, fmt=%s.\n", formats[i].fill_value, surface_data[0], formats[i].name); hr = IDirect3DSurface9_UnlockRect(surface);

1 0

Chip Davis : d3d10core/tests: Use compare_uint() in a few more places.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 4b19ef0b74747814cec30bd4d6d6bfedda746a97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b19ef0b74747814cec30bd4… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 10:58:45 2020 -0500 d3d10core/tests: Use compare_uint() in a few more places. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 8332257d37..97a00a0715 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -814,7 +814,7 @@ static void check_readback_data_u8_(unsigned int line, struct resource_readback for (x = rect->left; x < rect->right; ++x) { value = get_readback_u8(rb, x, y); - if (abs((int)value - (int)expected_value) > max_diff) + if (!compare_uint(value, expected_value, max_diff)) goto done; } } @@ -846,7 +846,7 @@ static void check_readback_data_u16_(unsigned int line, struct resource_readback for (x = rect->left; x < rect->right; ++x) { value = get_readback_u16(rb, x, y); - if (abs((int)value - (int)expected_value) > max_diff) + if (!compare_uint(value, expected_value, max_diff)) goto done; } } @@ -878,7 +878,7 @@ static void check_readback_data_u24_(unsigned int line, struct resource_readback for (x = rect->left; x < rect->right; ++x) { value = get_readback_u32(rb, x, y) >> shift; - if (abs((int)value - (int)expected_value) > max_diff) + if (!compare_uint(value, expected_value, max_diff)) goto done; } } @@ -15855,7 +15855,7 @@ static void test_depth_bias(void) u32 = get_readback_data(&rb, 0, y, sizeof(*u32)); u32_value = *u32 >> shift; expected_value = depth * 16777215.0f + 0.5f; - all_match = abs(u32_value - expected_value) <= 3; + all_match = compare_uint(u32_value, expected_value, 3); ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", u32_value, u32_value / 16777215.0f, @@ -15864,7 +15864,7 @@ static void test_depth_bias(void) case DXGI_FORMAT_D16_UNORM: u16 = get_readback_data(&rb, 0, y, sizeof(*u16)); expected_value = depth * 65535.0f + 0.5f; - all_match = abs(*u16 - expected_value) <= 1; + all_match = compare_uint(*u16, expected_value, 1); ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f);

1 0

Chip Davis : d3d11/tests: Use compare_uint() in a few more places.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: bd9e3dde1e860842a7a478915e43a695505cf71a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd9e3dde1e860842a7a47891… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:00:44 2020 -0500 d3d11/tests: Use compare_uint() in a few more places. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 37ec829cd7..3ae05537a1 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1011,7 +1011,7 @@ static void check_readback_data_u8_(unsigned int line, struct resource_readback for (x = rect->left; x < rect->right; ++x) { value = get_readback_u8(rb, x, y, z); - if (abs((int)value - (int)expected_value) > max_diff) + if (!compare_uint(value, expected_value, max_diff)) goto done; } } @@ -1046,7 +1046,7 @@ static void check_readback_data_u16_(unsigned int line, struct resource_readback for (x = rect->left; x < rect->right; ++x) { value = get_readback_u16(rb, x, y, z); - if (abs((int)value - (int)expected_value) > max_diff) + if (!compare_uint(value, expected_value, max_diff)) goto done; } } @@ -1081,7 +1081,7 @@ static void check_readback_data_u24_(unsigned int line, struct resource_readback for (x = rect->left; x < rect->right; ++x) { value = get_readback_u32(rb, x, y, z) >> shift; - if (abs((int)value - (int)expected_value) > max_diff) + if (!compare_uint(value, expected_value, max_diff)) goto done; } } @@ -25841,7 +25841,7 @@ static void test_depth_bias(void) u32 = get_readback_data(&rb, 0, y, 0, sizeof(*u32)); u32_value = *u32 >> shift; expected_value = depth * 16777215.0f + 0.5f; - all_match = abs(u32_value - expected_value) <= 3; + all_match = compare_uint(u32_value, expected_value, 3); ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", u32_value, u32_value / 16777215.0f, @@ -25850,7 +25850,7 @@ static void test_depth_bias(void) case DXGI_FORMAT_D16_UNORM: u16 = get_readback_data(&rb, 0, y, 0, sizeof(*u16)); expected_value = depth * 65535.0f + 0.5f; - all_match = abs(*u16 - expected_value) <= 1; + all_match = compare_uint(*u16, expected_value, 1); ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f);

1 0

Chip Davis : d3d11: Introduce a function to convert D3D10 map types to wined3d map flags.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 43a4037d33d72d87611457fe7f990b1766a20a3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=43a4037d33d72d87611457fe… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:05:55 2020 -0500 d3d11: Introduce a function to convert D3D10 map types to wined3d map flags. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 2 +- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/texture.c | 6 +++--- dlls/d3d11/utils.c | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index f2b950f357..b33be57d43 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -310,7 +310,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0, - &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)); + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)); *data = wined3d_map_desc.data; wined3d_mutex_unlock(); diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 1e8d86fede..48c76959fa 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -69,6 +69,7 @@ DWORD wined3d_usage_from_d3d11(enum D3D11_USAGE usage) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *resource) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type) DECLSPEC_HIDDEN; +DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN; DWORD wined3d_clear_flags_from_d3d11_clear_flags(UINT clear_flags) DECLSPEC_HIDDEN; unsigned int wined3d_access_from_d3d11(D3D11_USAGE usage, UINT cpu_access) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 36d07beb23..1682aa05d9 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -356,7 +356,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture1d_Map(ID3D10Texture1D *iface, UIN wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx, - &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)))) + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) { *data = wined3d_map_desc.data; } @@ -858,7 +858,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UIN wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx, - &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)))) + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) { mapped_texture->pData = wined3d_map_desc.data; mapped_texture->RowPitch = wined3d_map_desc.row_pitch; @@ -1355,7 +1355,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx, - &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)))) + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) { mapped_texture->pData = wined3d_map_desc.data; mapped_texture->RowPitch = wined3d_map_desc.row_pitch; diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 065436cb4f..0e483fd4bb 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -756,6 +756,11 @@ DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type) } } +DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) +{ + return wined3d_map_flags_from_d3d11_map_type((D3D11_MAP)map_type); +} + DWORD wined3d_clear_flags_from_d3d11_clear_flags(UINT clear_flags) { DWORD wined3d_clear_flags = 0;

1 0

Chip Davis : d3d11: Introduce a function to convert D3D10 DSV dimensions to D3D11.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: ace51383aebd053e0c83ae7faef55b8e45bde854 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ace51383aebd053e0c83ae7f… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:05:56 2020 -0500 d3d11: Introduce a function to convert D3D10 DSV dimensions to D3D11. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4683ce5f3b..bc411b0b9f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5428,6 +5428,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic return S_OK; } +static D3D11_DSV_DIMENSION d3d11_dsv_dimension_from_d3d10(D3D10_DSV_DIMENSION dim) +{ + return (D3D11_DSV_DIMENSION)dim; +} + static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Device1 *iface, ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc, ID3D10DepthStencilView **view) { @@ -5442,7 +5447,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Devic if (desc) { d3d11_desc.Format = desc->Format; - d3d11_desc.ViewDimension = desc->ViewDimension; + d3d11_desc.ViewDimension = d3d11_dsv_dimension_from_d3d10(desc->ViewDimension); d3d11_desc.Flags = 0; memcpy(&d3d11_desc.u, &desc->u, sizeof(d3d11_desc.u)); }

1 0

Chip Davis : d3d11: Introduce a function to convert a wined3d feature level to a D3D feature level.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: ad61b1a62035bd74a46534262bb2868cf3d38d9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad61b1a62035bd74a4653426… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:05:58 2020 -0500 d3d11: Introduce a function to convert a wined3d feature level to a D3D feature level. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index bc411b0b9f..6f8257078d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -6078,6 +6078,11 @@ static inline struct d3d_device *device_from_wined3d_device_parent(struct wined3 return CONTAINING_RECORD(device_parent, struct d3d_device, device_parent); } +static D3D_FEATURE_LEVEL d3d_feature_level_from_wined3d(enum wined3d_feature_level level) +{ + return (D3D_FEATURE_LEVEL)level; +} + static void CDECL device_parent_wined3d_device_created(struct wined3d_device_parent *device_parent, struct wined3d_device *wined3d_device) { @@ -6088,7 +6093,7 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par wined3d_device_incref(wined3d_device); device->wined3d_device = wined3d_device; - device->feature_level = wined3d_device_get_feature_level(wined3d_device); + device->feature_level = d3d_feature_level_from_wined3d(wined3d_device_get_feature_level(wined3d_device)); set_default_depth_stencil_state(wined3d_device); }

1 0