May 2018 - Wine-Commits - list.winehq.org

Francois Gouget : testbot: Fix handling of test unit deletion + helper dll patch.
by Alexandre Julliard May 29, 2018

May 29, 2018

Module: tools Branch: master Commit: 4bf681b11dfafa2dd7f9f769e957d0fa5b6b43ec URL: https://source.winehq.org/git/tools.git/?a=commit;h=4bf681b11dfafa2dd7f9f76… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 29 00:42:49 2018 +0200 testbot: Fix handling of test unit deletion + helper dll patch. Take into account deleted test units when getting the full test unit list. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 8dde61b..2000c90 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -218,12 +218,7 @@ sub GetPatchImpact($;$) # Helper dlls are not test units next if (exists $TestInfo->{Files}->{"$Base.spec"}); - if ($AllUnits) - { - # All test units are impacted indirectly and must be rerun - $TestInfo->{Units}->{$Base} = 1; - } - elsif ($TestInfo->{Files}->{$File} and + if (($AllUnits or $TestInfo->{Files}->{$File}) and $TestInfo->{Files}->{$File} ne "rm") { # Only new/modified test units are impacted

1 0

Hugh McMaster : regedit: Pass NULL instead of the address of an empty WCHAR.
by Alexandre Julliard May 28, 2018

May 28, 2018

Module: wine Branch: master Commit: c7718d31c7887079206f1a9566bb413619008147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7718d31c7887079206f1a95… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 28 13:48:07 2018 +0000 regedit: Pass NULL instead of the address of an empty WCHAR. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 89a5ec0..3e5b9dd 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -192,9 +192,8 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, DWORD valueDataLen; LPWSTR buffer = NULL; LONG lRet; - WCHAR empty = 0; - lRet = RegQueryValueExW(hKey, valueName ? valueName : &empty, 0, lpType, 0, &valueDataLen); + lRet = RegQueryValueExW(hKey, valueName, NULL, lpType, NULL, &valueDataLen); if (lRet) { if (lRet == ERROR_FILE_NOT_FOUND && !valueName) { /* no default value here, make it up */ if (len) *len = 1; @@ -413,12 +412,11 @@ BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) BOOL result = FALSE; LONG lRet; HKEY hKey; - WCHAR empty = 0; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); if (lRet) return FALSE; - lRet = RegDeleteValueW(hKey, valueName ? valueName : &empty); + lRet = RegDeleteValueW(hKey, valueName); if (lRet && valueName) { error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); }

1 0

Hugh McMaster : regedit: Confirm whether to delete a registry value from framewnd.c.
by Alexandre Julliard May 28, 2018

May 28, 2018

1 0

Alexandre Julliard : makefiles: Don't run tests for disabled dlls.
by Alexandre Julliard May 28, 2018

May 28, 2018

Module: wine Branch: master Commit: 7715a1aaef26cd9779cf509a685d94de74a6692f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7715a1aaef26cd9779cf509a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 28 21:42:02 2018 +0200 makefiles: Don't run tests for disabled dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index f8a82b0..4fcc99e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3247,6 +3247,7 @@ static void output_test_module( struct makefile *make ) char *testres = replace_extension( make->testdll, ".dll", "_test.res" ); struct strarray dep_libs = empty_strarray; struct strarray all_libs = add_import_libs( make, &dep_libs, make->imports, 0 ); + int parent_disabled = 0; add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ strarray_addall( &all_libs, libs ); @@ -3321,16 +3322,19 @@ static void output_test_module( struct makefile *make ) } } - output_filenames_obj_dir( make, make->ok_files ); - output( ": %s%s ../%s%s\n", testmodule, dll_ext, make->testdll, dll_ext ); - if (!make->disabled) + if (strendswith( make->base_dir, "/tests" )) { - output( "check test:" ); - output_filenames_obj_dir( make, make->ok_files ); - output( "\n" ); - strarray_add( &make->phony_targets, "check" ); - strarray_add( &make->phony_targets, "test" ); + char *dir = xstrdup( make->base_dir ); + dir[strlen( dir ) - 6] = 0; + parent_disabled = strarray_exists( &disabled_dirs, dir ); } + output_filenames_obj_dir( make, make->ok_files ); + output( ": %s%s ../%s%s\n", testmodule, dll_ext, make->testdll, dll_ext ); + output( "check test:" ); + if (!make->disabled && !parent_disabled) output_filenames_obj_dir( make, make->ok_files ); + output( "\n" ); + strarray_add( &make->phony_targets, "check" ); + strarray_add( &make->phony_targets, "test" ); output( "testclean::\n" ); output( "\trm -f" ); output_filenames_obj_dir( make, make->ok_files );

1 0

Alex Henrie : include: Add wmemchr to wchar.h.
by Alexandre Julliard May 28, 2018

May 28, 2018

Module: wine Branch: master Commit: e1bfd4b4cb9c05039e29ae769d1582b63ed6fe46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1bfd4b4cb9c05039e29ae76… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 27 21:05:52 2018 -0600 include: Add wmemchr to wchar.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/wchar.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index a679724..4618c60 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -476,6 +476,14 @@ size_t __cdecl wcrtomb(char*,wchar_t,mbstate_t*); size_t __cdecl wcsrtombs(char*,const wchar_t**,size_t,mbstate_t*); int __cdecl wctob(wint_t); +static inline wchar_t *wmemchr(const wchar_t *s, wchar_t c, size_t n) +{ + const wchar_t *end; + for (end = s + n; s < end; s++) + if (*s == c) return (wchar_t*)s; + return NULL; +} + #ifdef __cplusplus } #endif

1 0

Józef Kucia : d3d10core/tests: Add test for clearing 1D render target views.
by Alexandre Julliard May 28, 2018

May 28, 2018

Module: wine Branch: master Commit: 7096136137b2a6dde0c80a39698e4f39b2231d38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7096136137b2a6dde0c80a39… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 11:33:14 2018 +0200 d3d10core/tests: Add test for clearing 1D render target views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 123 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 118 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 819285e..99a375e 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -570,6 +570,49 @@ static void get_buffer_readback(ID3D10Buffer *buffer, struct resource_readback * ID3D10Device_Release(device); } +static void get_texture1d_readback(ID3D10Texture1D *texture, unsigned int sub_resource_idx, + struct resource_readback *rb) +{ + D3D10_TEXTURE1D_DESC texture_desc; + unsigned int miplevel; + ID3D10Device *device; + HRESULT hr; + + memset(rb, 0, sizeof(*rb)); + rb->dimension = D3D10_RESOURCE_DIMENSION_TEXTURE1D; + + ID3D10Texture1D_GetDevice(texture, &device); + + ID3D10Texture1D_GetDesc(texture, &texture_desc); + texture_desc.Usage = D3D10_USAGE_STAGING; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_READ; + texture_desc.MiscFlags = 0; + if (FAILED(hr = ID3D10Device_CreateTexture1D(device, &texture_desc, NULL, (ID3D10Texture1D **)&rb->resource))) + { + trace("Failed to create texture, hr %#x.\n", hr); + ID3D10Device_Release(device); + return; + } + + miplevel = sub_resource_idx % texture_desc.MipLevels; + rb->width = max(1, texture_desc.Width >> miplevel); + rb->height = 1; + rb->sub_resource_idx = sub_resource_idx; + + ID3D10Device_CopyResource(device, rb->resource, (ID3D10Resource *)texture); + if (FAILED(hr = ID3D10Texture1D_Map((ID3D10Texture1D *)rb->resource, sub_resource_idx, + D3D10_MAP_READ, 0, &rb->map_desc.pData))) + { + trace("Failed to map sub-resource %u, hr %#x.\n", sub_resource_idx, hr); + ID3D10Resource_Release(rb->resource); + rb->resource = NULL; + } + rb->map_desc.RowPitch = 0; + + ID3D10Device_Release(device); +} + static void get_texture_readback(ID3D10Texture2D *texture, unsigned int sub_resource_idx, struct resource_readback *rb) { @@ -644,6 +687,9 @@ static void release_resource_readback(struct resource_readback *rb) case D3D10_RESOURCE_DIMENSION_BUFFER: ID3D10Buffer_Unmap((ID3D10Buffer *)rb->resource); break; + case D3D10_RESOURCE_DIMENSION_TEXTURE1D: + ID3D10Texture1D_Unmap((ID3D10Texture1D *)rb->resource, rb->sub_resource_idx); + break; case D3D10_RESOURCE_DIMENSION_TEXTURE2D: ID3D10Texture2D_Unmap((ID3D10Texture2D *)rb->resource, rb->sub_resource_idx); break; @@ -724,6 +770,30 @@ static void check_texture_color_(unsigned int line, ID3D10Texture2D *texture, check_texture_sub_resource_color_(line, texture, sub_resource_idx, NULL, expected_color, max_diff); } +#define check_texture1d_sub_resource_color(a, b, c, d, e) check_texture1d_sub_resource_color_(__LINE__, a, b, c, d, e) +static void check_texture1d_sub_resource_color_(unsigned int line, ID3D10Texture1D *texture, + unsigned int sub_resource_idx, const RECT *rect, DWORD expected_color, BYTE max_diff) +{ + struct resource_readback rb; + + get_texture1d_readback(texture, sub_resource_idx, &rb); + check_readback_data_color_(line, &rb, rect, expected_color, max_diff); + release_resource_readback(&rb); +} + +#define check_texture1d_color(t, c, d) check_texture1d_color_(__LINE__, t, c, d) +static void check_texture1d_color_(unsigned int line, ID3D10Texture1D *texture, + DWORD expected_color, BYTE max_diff) +{ + unsigned int sub_resource_idx, sub_resource_count; + D3D10_TEXTURE1D_DESC texture_desc; + + ID3D10Texture1D_GetDesc(texture, &texture_desc); + sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + check_texture1d_sub_resource_color_(line, texture, sub_resource_idx, NULL, expected_color, max_diff); +} + #define check_texture_sub_resource_float(a, b, c, d, e) check_texture_sub_resource_float_(__LINE__, a, b, c, d, e) static void check_texture_sub_resource_float_(unsigned int line, ID3D10Texture2D *texture, unsigned int sub_resource_idx, const RECT *rect, float expected_value, BYTE max_diff) @@ -10182,7 +10252,49 @@ static void test_swapchain_flip(void) DestroyWindow(window); } -static void test_clear_render_target_view(void) +static void test_clear_render_target_view_1d(void) +{ + static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; + static const float green[] = {0.0f, 1.0f, 0.0f, 0.5f}; + + struct d3d10core_test_context test_context; + D3D10_TEXTURE1D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + ID3D10Texture1D *texture; + ID3D10Device *device; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + texture_desc.Width = 64; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture1D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D10Device_ClearRenderTargetView(device, rtv, color); + check_texture1d_color(texture, 0xbf4c7f19, 1); + + ID3D10Device_ClearRenderTargetView(device, rtv, green); + check_texture1d_color(texture, 0x8000ff00, 1); + + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture1D_Release(texture); + release_test_context(&test_context); +} + +static void test_clear_render_target_view_2d(void) { static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; @@ -10215,11 +10327,11 @@ static void test_clear_render_target_view(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &srgb_texture); - ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); @@ -10253,7 +10365,7 @@ static void test_clear_render_target_view(void) texture_desc.Format = DXGI_FORMAT_R8G8B8A8_TYPELESS; hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2D; @@ -16964,7 +17076,8 @@ START_TEST(device) test_swapchain_formats(); test_swapchain_views(); test_swapchain_flip(); - test_clear_render_target_view(); + test_clear_render_target_view_1d(); + test_clear_render_target_view_2d(); test_clear_depth_stencil_view(); test_initial_depth_stencil_state(); test_draw_depth_only();

1 0

Alex Henrie : include: Add wmemcmp to wchar.h.
by Alexandre Julliard May 28, 2018

May 28, 2018

Module: wine Branch: master Commit: 0d5648b46383319a0a3c18c0d96755d13eadf003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d5648b46383319a0a3c18c0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 27 21:05:53 2018 -0600 include: Add wmemcmp to wchar.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/wchar.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 4618c60..984bd31 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -484,6 +484,17 @@ static inline wchar_t *wmemchr(const wchar_t *s, wchar_t c, size_t n) return NULL; } +static inline int wmemcmp(const wchar_t *s1, const wchar_t *s2, size_t n) +{ + size_t i; + for (i = 0; i < n; i++) + { + if (s1[i] > s2[i]) return 1; + if (s1[i] < s2[i]) return -1; + } + return 0; +} + #ifdef __cplusplus } #endif

1 0

Józef Kucia : winex11: Introduce GAMMA_RAMP_SIZE.
by Alexandre Julliard May 28, 2018

May 28, 2018

Module: wine Branch: master Commit: 913160d2a4b7e4291d0b4508f80c7ecb79c5b8a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=913160d2a4b7e4291d0b4508… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 10:26:42 2018 +0200 winex11: Introduce GAMMA_RAMP_SIZE. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/x11drv.h | 8 +++++--- dlls/winex11.drv/xvidmode.c | 12 ++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6781d60..85a05a9 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -114,11 +114,13 @@ typedef struct int exposures; /* count of graphics exposures operations */ } X11DRV_PDEVICE; +#define GAMMA_RAMP_SIZE 256 + struct x11drv_gamma_ramp { - WORD red[256]; - WORD green[256]; - WORD blue[256]; + WORD red[GAMMA_RAMP_SIZE]; + WORD green[GAMMA_RAMP_SIZE]; + WORD blue[GAMMA_RAMP_SIZE]; }; static inline X11DRV_PDEVICE *get_x11drv_dev( PHYSDEV dev ) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 0020b08..63282e7 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -202,7 +202,7 @@ void X11DRV_XF86VM_Init(void) pXF86VidModeGetGammaRampSize(gdi_display, DefaultScreen(gdi_display), &xf86vm_gammaramp_size); if (X11DRV_check_error()) xf86vm_gammaramp_size = 0; - if (xf86vm_gammaramp_size == 256) + if (xf86vm_gammaramp_size == GAMMA_RAMP_SIZE) xf86vm_use_gammaramp = TRUE; } #endif /* X_XF86VidModeSetGammaRamp */ @@ -250,16 +250,16 @@ sym_not_found: #ifdef X_XF86VidModeSetGamma -static void GenerateRampFromGamma(WORD ramp[256], float gamma) +static void GenerateRampFromGamma(WORD ramp[GAMMA_RAMP_SIZE], float gamma) { float r_gamma = 1/gamma; unsigned i; TRACE("gamma is %f\n", r_gamma); - for (i=0; i<256; i++) + for (i=0; i<GAMMA_RAMP_SIZE; i++) ramp[i] = pow(i/255.0, r_gamma) * 65535.0; } -static BOOL ComputeGammaFromRamp(WORD ramp[256], float *gamma) +static BOOL ComputeGammaFromRamp(WORD ramp[GAMMA_RAMP_SIZE], float *gamma) { float r_x, r_y, r_lx, r_ly, r_d, r_v, r_e, g_avg, g_min, g_max; unsigned i, f, l, g_n, c; @@ -342,7 +342,7 @@ static BOOL X11DRV_XF86VM_GetGammaRamp(struct x11drv_gamma_ramp *ramp) if (xf86vm_major < 2) return FALSE; /* no gamma control */ #ifdef X_XF86VidModeSetGammaRamp if (xf86vm_use_gammaramp) - return pXF86VidModeGetGammaRamp(gdi_display, DefaultScreen(gdi_display), 256, + return pXF86VidModeGetGammaRamp(gdi_display, DefaultScreen(gdi_display), GAMMA_RAMP_SIZE, ramp->red, ramp->green, ramp->blue); #endif if (pXF86VidModeGetGamma(gdi_display, DefaultScreen(gdi_display), &gamma)) @@ -367,7 +367,7 @@ static BOOL X11DRV_XF86VM_SetGammaRamp(struct x11drv_gamma_ramp *ramp) !ComputeGammaFromRamp(ramp->blue, &gamma.blue)) return FALSE; #ifdef X_XF86VidModeSetGammaRamp if (xf86vm_use_gammaramp) - return pXF86VidModeSetGammaRamp(gdi_display, DefaultScreen(gdi_display), 256, + return pXF86VidModeSetGammaRamp(gdi_display, DefaultScreen(gdi_display), GAMMA_RAMP_SIZE, ramp->red, ramp->green, ramp->blue); #endif return pXF86VidModeSetGamma(gdi_display, DefaultScreen(gdi_display), &gamma);

1 0

Józef Kucia : dxgi: Factor out d3d11_swapchain_create () function.
by Alexandre Julliard May 28, 2018

May 28, 2018

Module: wine Branch: master Commit: 02c49ea3c03b6403204a099587df0d895e36d7b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02c49ea3c03b6403204a0995… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 14:40:26 2018 +0200 dxgi: Factor out d3d11_swapchain_create() function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/factory.c | 56 ++++-------------------------------------- dlls/dxgi/swapchain.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 51 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 559a834..900906c 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -173,6 +173,8 @@ struct d3d11_swapchain IDXGIOutput *target; }; +HRESULT d3d11_swapchain_create(IWineDXGIDevice *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, + const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGISwapChain1 **swapchain) DECLSPEC_HIDDEN; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc, BOOL implicit) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 6986804..5c47c6d 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -250,8 +250,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGIOutput *output, IDXGISwapChain1 **swapchain) { - struct wined3d_swapchain *wined3d_swapchain; - struct wined3d_swapchain_desc wined3d_desc; unsigned int min_buffer_count; IWineDXGIDevice *dxgi_device; HRESULT hr; @@ -275,22 +273,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa switch (swapchain_desc->SwapEffect) { case DXGI_SWAP_EFFECT_DISCARD: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; - min_buffer_count = 1; - break; - case DXGI_SWAP_EFFECT_SEQUENTIAL: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_SEQUENTIAL; min_buffer_count = 1; break; case DXGI_SWAP_EFFECT_FLIP_DISCARD: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_DISCARD; - min_buffer_count = 2; - break; - case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; min_buffer_count = 2; break; @@ -305,49 +293,15 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa return DXGI_ERROR_INVALID_CALL; } - if (FAILED(hr = IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) - { - ERR("This is not the device we're looking for\n"); - return hr; - } - - if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) - FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); - if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) - FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); - if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) - FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); - if (fullscreen_desc && fullscreen_desc->Scaling) - FIXME("Unhandled mode scaling %#x.\n", fullscreen_desc->Scaling); - - wined3d_desc.backbuffer_width = swapchain_desc->Width; - wined3d_desc.backbuffer_height = swapchain_desc->Height; - wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(swapchain_desc->Format); - wined3d_desc.backbuffer_count = swapchain_desc->BufferCount; - wined3d_desc.backbuffer_usage = wined3d_usage_from_dxgi_usage(swapchain_desc->BufferUsage); - wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, - &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); - wined3d_desc.device_window = window; - wined3d_desc.windowed = fullscreen_desc ? fullscreen_desc->Windowed : TRUE; - wined3d_desc.enable_auto_depth_stencil = FALSE; - wined3d_desc.auto_depth_stencil_format = 0; - wined3d_desc.flags = wined3d_swapchain_flags_from_dxgi(swapchain_desc->Flags); - wined3d_desc.refresh_rate = fullscreen_desc ? dxgi_rational_to_uint(&fullscreen_desc->RefreshRate) : 0; - wined3d_desc.auto_restore_display_mode = TRUE; - - hr = IWineDXGIDevice_create_swapchain(dxgi_device, &wined3d_desc, FALSE, &wined3d_swapchain); - IWineDXGIDevice_Release(dxgi_device); - if (FAILED(hr)) + if (SUCCEEDED(IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) { - WARN("Failed to create swapchain, hr %#x.\n", hr); + hr = d3d11_swapchain_create(dxgi_device, window, swapchain_desc, fullscreen_desc, swapchain); + IWineDXGIDevice_Release(dxgi_device); return hr; } - wined3d_mutex_lock(); - *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); - wined3d_mutex_unlock(); - - return S_OK; + ERR("This is not the device we're looking for.\n"); + return DXGI_ERROR_UNSUPPORTED; } static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForCoreWindow(IWineDXGIFactory *iface, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index c85b742..7401a2e 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -733,3 +733,66 @@ cleanup: IWineDXGIDevice_Release(swapchain->device); return hr; } + +HRESULT d3d11_swapchain_create(IWineDXGIDevice *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, + const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGISwapChain1 **swapchain) +{ + struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_swapchain_desc wined3d_desc; + HRESULT hr; + + if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) + FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); + if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) + FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); + if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) + FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); + if (fullscreen_desc && fullscreen_desc->Scaling) + FIXME("Unhandled mode scaling %#x.\n", fullscreen_desc->Scaling); + + switch (swapchain_desc->SwapEffect) + { + case DXGI_SWAP_EFFECT_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; + break; + case DXGI_SWAP_EFFECT_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_SEQUENTIAL; + break; + case DXGI_SWAP_EFFECT_FLIP_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_DISCARD; + break; + case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; + break; + default: + WARN("Invalid swap effect %#x.\n", swapchain_desc->SwapEffect); + return DXGI_ERROR_INVALID_CALL; + } + + wined3d_desc.backbuffer_width = swapchain_desc->Width; + wined3d_desc.backbuffer_height = swapchain_desc->Height; + wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(swapchain_desc->Format); + wined3d_desc.backbuffer_count = swapchain_desc->BufferCount; + wined3d_desc.backbuffer_usage = wined3d_usage_from_dxgi_usage(swapchain_desc->BufferUsage); + wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, + &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); + wined3d_desc.device_window = window; + wined3d_desc.windowed = fullscreen_desc ? fullscreen_desc->Windowed : TRUE; + wined3d_desc.enable_auto_depth_stencil = FALSE; + wined3d_desc.auto_depth_stencil_format = 0; + wined3d_desc.flags = wined3d_swapchain_flags_from_dxgi(swapchain_desc->Flags); + wined3d_desc.refresh_rate = fullscreen_desc ? dxgi_rational_to_uint(&fullscreen_desc->RefreshRate) : 0; + wined3d_desc.auto_restore_display_mode = TRUE; + + if (FAILED(hr = IWineDXGIDevice_create_swapchain(device, &wined3d_desc, FALSE, &wined3d_swapchain))) + { + WARN("Failed to create swapchain, hr %#x.\n", hr); + return hr; + } + + wined3d_mutex_lock(); + *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); + wined3d_mutex_unlock(); + + return S_OK; +}

1 0

Józef Kucia : dxgi: Add IDXGISwapChain3 interface stub for D3D12.
by Alexandre Julliard May 28, 2018

May 28, 2018

Module: wine Branch: master Commit: 7d99d74572072ae60f1a5bf9cf986a01be86cec4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d99d74572072ae60f1a5bf9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 14:40:27 2018 +0200 dxgi: Add IDXGISwapChain3 interface stub for D3D12. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/dxgi_private.h | 7 +- dlls/dxgi/factory.c | 8 + dlls/dxgi/swapchain.c | 546 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 560 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d99d74572072ae60f1a…

1 0