August 2023 - Wine-Commits - list.winehq.org

Alexandre Julliard : ddraw/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: 62cd08f3879c902d0568addbc268ce71681809bb URL: https://gitlab.winehq.org/wine/wine/-/commit/62cd08f3879c902d0568addbc268ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:47:29 2023 +0200 ddraw/tests: Use nameless unions/structs. --- dlls/ddraw/tests/d3d.c | 84 ++-- dlls/ddraw/tests/ddraw1.c | 584 +++++++++++++------------- dlls/ddraw/tests/ddraw2.c | 648 ++++++++++++++--------------- dlls/ddraw/tests/ddraw4.c | 910 ++++++++++++++++++++--------------------- dlls/ddraw/tests/ddraw7.c | 922 +++++++++++++++++++++--------------------- dlls/ddraw/tests/ddrawmodes.c | 56 +-- dlls/ddraw/tests/dsurface.c | 284 ++++++------- dlls/ddraw/tests/refcount.c | 6 +- dlls/ddraw/tests/visual.c | 70 ++-- 9 files changed, 1782 insertions(+), 1782 deletions(-)

1 0

Alexandre Julliard : dxgi/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: df20791bdbf3f34814c66958d299b2b07907e33f URL: https://gitlab.winehq.org/wine/wine/-/commit/df20791bdbf3f34814c66958d299b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:47:39 2023 +0200 dxgi/tests: Use nameless unions/structs. --- dlls/dxgi/tests/dxgi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 91e78c5a56c..020c6485d50 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -1211,8 +1211,8 @@ static void test_check_interface_support(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); trace("UMD version: %u.%u.%u.%u.\n", - HIWORD(U(driver_version).HighPart), LOWORD(U(driver_version).HighPart), - HIWORD(U(driver_version).LowPart), LOWORD(U(driver_version).LowPart)); + HIWORD(driver_version.HighPart), LOWORD(driver_version.HighPart), + HIWORD(driver_version.LowPart), LOWORD(driver_version.LowPart)); hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Device1, (void **)&iface); if (SUCCEEDED(hr))

1 0

Alexandre Julliard : d3dx9/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: 47cd5b149943ccdd828e2ffae4306d07d4db320c URL: https://gitlab.winehq.org/wine/wine/-/commit/47cd5b149943ccdd828e2ffae4306d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:46:20 2023 +0200 d3dx9/tests: Use nameless unions/structs. --- dlls/d3dx9_36/tests/core.c | 26 +- dlls/d3dx9_36/tests/line.c | 20 +- dlls/d3dx9_36/tests/math.c | 764 +++++++++++++++++++++---------------------- dlls/d3dx9_36/tests/mesh.c | 24 +- dlls/d3dx9_36/tests/shader.c | 224 ++++++------- 5 files changed, 529 insertions(+), 529 deletions(-)

1 0

Alexandre Julliard : d3dx10/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: 8bec6d399fa113fd6a42e2e6b97ec8c86dd1c7ee URL: https://gitlab.winehq.org/wine/wine/-/commit/8bec6d399fa113fd6a42e2e6b97ec8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:46:01 2023 +0200 d3dx10/tests: Use nameless unions/structs. --- dlls/d3dx10_43/tests/d3dx10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index e9c215d3c45..5853669d9c5 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1731,8 +1731,8 @@ float4 main(float4 color : COLOR) : SV_TARGET srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; srv_desc.ViewDimension = D3D10_SRV_DIMENSION_BUFFER; - U(srv_desc).Buffer.ElementOffset = 0; - U(srv_desc).Buffer.ElementWidth = 64; + srv_desc.Buffer.ElementOffset = 0; + srv_desc.Buffer.ElementWidth = 64; for (i = 0; i < D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) {

1 0

Alexandre Julliard : d3d8/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: 8d86c6d9d9f4d159e6592158c1f615f09d78e1e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d86c6d9d9f4d159e6592158c1f615… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:44:55 2023 +0200 d3d8/tests: Use nameless unions/structs. --- dlls/d3d8/tests/stateblock.c | 16 ++++++++-------- dlls/d3d8/tests/visual.c | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index 4a27738d5d4..d9a610d5438 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -957,14 +957,14 @@ static void compare_matrix(const char *name, unsigned int chain_stage, "\t\t%.8e, %.8e, %.8e, %.8e,\n" "\t} received\n", chain_stage, name, - U(*expected).m[0][0], U(*expected).m[1][0], U(*expected).m[2][0], U(*expected).m[3][0], - U(*expected).m[0][1], U(*expected).m[1][1], U(*expected).m[2][1], U(*expected).m[3][1], - U(*expected).m[0][2], U(*expected).m[1][2], U(*expected).m[2][2], U(*expected).m[3][2], - U(*expected).m[0][3], U(*expected).m[1][3], U(*expected).m[2][3], U(*expected).m[3][3], - U(*received).m[0][0], U(*received).m[1][0], U(*received).m[2][0], U(*received).m[3][0], - U(*received).m[0][1], U(*received).m[1][1], U(*received).m[2][1], U(*received).m[3][1], - U(*received).m[0][2], U(*received).m[1][2], U(*received).m[2][2], U(*received).m[3][2], - U(*received).m[0][3], U(*received).m[1][3], U(*received).m[2][3], U(*received).m[3][3]); + expected->m[0][0], expected->m[1][0], expected->m[2][0], expected->m[3][0], + expected->m[0][1], expected->m[1][1], expected->m[2][1], expected->m[3][1], + expected->m[0][2], expected->m[1][2], expected->m[2][2], expected->m[3][2], + expected->m[0][3], expected->m[1][3], expected->m[2][3], expected->m[3][3], + received->m[0][0], received->m[1][0], received->m[2][0], received->m[3][0], + received->m[0][1], received->m[1][1], received->m[2][1], received->m[3][1], + received->m[0][2], received->m[1][2], received->m[2][2], received->m[3][2], + received->m[0][3], received->m[1][3], received->m[2][3], received->m[3][3]); } static void transform_check_data(IDirect3DDevice8 *device, const struct state_test *test, diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index f80ff86010e..b7688e9251a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -7736,8 +7736,8 @@ static void test_pointsize(void) ok(color == 0x00ffff00, "pSprite: Pixel (64 + 4),(64 - 4) has color 0x%08x, expected 0x00ffff00\n", color); IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - U(matrix).m[0][0] = 1.0f / 64.0f; - U(matrix).m[1][1] = -1.0f / 64.0f; + matrix.m[0][0] = 1.0f / 64.0f; + matrix.m[1][1] = -1.0f / 64.0f; hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &matrix); ok(SUCCEEDED(hr), "Failed to set projection matrix, hr %#lx.\n", hr); @@ -7756,7 +7756,7 @@ static void test_pointsize(void) ok(SUCCEEDED(hr), "Failed setting point scale attenuation coefficient, hr %#lx.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_POINTSCALE_C, *(DWORD *)&c); ok(SUCCEEDED(hr), "Failed setting point scale attenuation coefficient, hr %#lx.\n", hr); - hr = IDirect3DDevice8_SetVertexShaderConstant(device, 0, &S(U(matrix))._11, 4); + hr = IDirect3DDevice8_SetVertexShaderConstant(device, 0, &matrix._11, 4); ok(SUCCEEDED(hr), "Failed to set vertex shader constants, hr %#lx.\n", hr); if (caps.MaxPointSize < 63.0f) @@ -12222,8 +12222,8 @@ START_TEST(visual) /* Only Windows XP's default VGA driver should have an empty description */ ok(identifier.Description[0] || broken(!strcmp(identifier.Driver, "vga.dll")), "Empty driver description.\n"); trace("Driver version %d.%d.%d.%d\n", - HIWORD(U(identifier.DriverVersion).HighPart), LOWORD(U(identifier.DriverVersion).HighPart), - HIWORD(U(identifier.DriverVersion).LowPart), LOWORD(U(identifier.DriverVersion).LowPart)); + HIWORD(identifier.DriverVersion.HighPart), LOWORD(identifier.DriverVersion.HighPart), + HIWORD(identifier.DriverVersion.LowPart), LOWORD(identifier.DriverVersion.LowPart)); IDirect3D8_Release(d3d);

1 0

Alexandre Julliard : d3drm/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: 43add3496349e8d355bb03518eb2545c2af031d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/43add3496349e8d355bb03518eb254… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:45:34 2023 +0200 d3drm/tests: Use nameless unions/structs. --- dlls/d3drm/tests/d3drm.c | 42 +++++++++++----------- dlls/d3drm/tests/vector.c | 88 +++++++++++++++++++++++------------------------ 2 files changed, 65 insertions(+), 65 deletions(-)

1 0

Alexandre Julliard : d3d11/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: e293a6c669bc5a85f0db9c2310f402fa67d0a9e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/e293a6c669bc5a85f0db9c2310f402… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:44:26 2023 +0200 d3d11/tests: Use nameless unions/structs. --- dlls/d3d11/tests/d3d11.c | 578 +++++++++++++++++++++++------------------------ 1 file changed, 289 insertions(+), 289 deletions(-)

1 0

Alexandre Julliard : d3d9/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: 43d4956c27a0546f014dfd7c907a39006dc52bfa URL: https://gitlab.winehq.org/wine/wine/-/commit/43d4956c27a0546f014dfd7c907a39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:45:17 2023 +0200 d3d9/tests: Use nameless unions/structs. --- dlls/d3d9/tests/d3d9ex.c | 8 ++++---- dlls/d3d9/tests/stateblock.c | 16 ++++++++-------- dlls/d3d9/tests/visual.c | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 2056117f4d7..bde3dc62ef6 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -562,7 +562,7 @@ static void test_get_adapter_displaymode_ex(void) devmode = startmode; devmode.dmFields = DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT; - S2(U1(devmode)).dmDisplayOrientation = DMDO_180; + devmode.dmDisplayOrientation = DMDO_180; retval = ChangeDisplaySettingsExW(NULL, &devmode, NULL, 0, NULL); if (retval == DISP_CHANGE_BADMODE) { @@ -573,7 +573,7 @@ static void test_get_adapter_displaymode_ex(void) ok(retval == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsEx failed with %ld.\n", retval); /* try retrieve orientation info with EnumDisplaySettingsEx*/ devmode.dmFields = 0; - S2(U1(devmode)).dmDisplayOrientation = 0; + devmode.dmDisplayOrientation = 0; ok(EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &devmode, EDS_ROTATEDMODE), "EnumDisplaySettingsEx failed.\n"); @@ -605,8 +605,8 @@ static void test_get_adapter_displaymode_ex(void) ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0\n"); /* Check that orientation is returned correctly by GetAdapterDisplayModeEx * and EnumDisplaySettingsEx(). */ - ok(S2(U1(devmode)).dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, - "rotation is %d instead of %ld\n", rotation, S2(U1(devmode)).dmDisplayOrientation); + ok(devmode.dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, + "rotation is %d instead of %ld\n", rotation, devmode.dmDisplayOrientation); trace("GetAdapterDisplayModeEx returned Width = %d, Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d\n", mode_ex.Width, mode_ex.Height, mode_ex.RefreshRate, mode_ex.Format, mode_ex.ScanLineOrdering, rotation); diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index f42c880c372..def69105f14 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -1017,14 +1017,14 @@ static void compare_matrix(const char *name, unsigned int chain_stage, "\t\t%.8e, %.8e, %.8e, %.8e,\n" "\t} received\n", chain_stage, name, - U(*expected).m[0][0], U(*expected).m[1][0], U(*expected).m[2][0], U(*expected).m[3][0], - U(*expected).m[0][1], U(*expected).m[1][1], U(*expected).m[2][1], U(*expected).m[3][1], - U(*expected).m[0][2], U(*expected).m[1][2], U(*expected).m[2][2], U(*expected).m[3][2], - U(*expected).m[0][3], U(*expected).m[1][3], U(*expected).m[2][3], U(*expected).m[3][3], - U(*received).m[0][0], U(*received).m[1][0], U(*received).m[2][0], U(*received).m[3][0], - U(*received).m[0][1], U(*received).m[1][1], U(*received).m[2][1], U(*received).m[3][1], - U(*received).m[0][2], U(*received).m[1][2], U(*received).m[2][2], U(*received).m[3][2], - U(*received).m[0][3], U(*received).m[1][3], U(*received).m[2][3], U(*received).m[3][3]); + expected->m[0][0], expected->m[1][0], expected->m[2][0], expected->m[3][0], + expected->m[0][1], expected->m[1][1], expected->m[2][1], expected->m[3][1], + expected->m[0][2], expected->m[1][2], expected->m[2][2], expected->m[3][2], + expected->m[0][3], expected->m[1][3], expected->m[2][3], expected->m[3][3], + received->m[0][0], received->m[1][0], received->m[2][0], received->m[3][0], + received->m[0][1], received->m[1][1], received->m[2][1], received->m[3][1], + received->m[0][2], received->m[1][2], received->m[2][2], received->m[3][2], + received->m[0][3], received->m[1][3], received->m[2][3], received->m[3][3]); } static void transform_check_data(IDirect3DDevice9 *device, const struct state_test *test, diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 29b95419bed..a7d88adbc00 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5560,8 +5560,8 @@ static void texture_transform_flags_test(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); /* What happens if 4 coords are used, but only 2 given ?*/ - U(mat).m[2][0] = 1.0f; - U(mat).m[3][1] = 1.0f; + mat.m[2][0] = 1.0f; + mat.m[3][1] = 1.0f; hr = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE0, &mat); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT4); @@ -12122,8 +12122,8 @@ static void test_pointsize(void) ok(color == 0x00ffff00, "pSprite: Pixel (64+4),(64-4) has color 0x%08x, expected 0x00ffff00\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - U(matrix).m[0][0] = 1.0f / 64.0f; - U(matrix).m[1][1] = -1.0f / 64.0f; + matrix.m[0][0] = 1.0f / 64.0f; + matrix.m[1][1] = -1.0f / 64.0f; hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &matrix); ok(SUCCEEDED(hr), "SetTransform failed, hr %#lx.\n", hr); @@ -12142,7 +12142,7 @@ static void test_pointsize(void) ok(SUCCEEDED(hr), "Failed setting point scale attenuation coefficient, hr %#lx.\n", hr); if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) { - hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, &S(U(matrix))._11, 4); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, &matrix._11, 4); ok(SUCCEEDED(hr), "Failed to set vertex shader constants, hr %#lx.\n", hr); } @@ -28062,8 +28062,8 @@ START_TEST(visual) trace("Device name string: \"%s\"\n", identifier.DeviceName); ok(identifier.DeviceName[0], "Empty device name.\n"); trace("Driver version %d.%d.%d.%d\n", - HIWORD(U(identifier.DriverVersion).HighPart), LOWORD(U(identifier.DriverVersion).HighPart), - HIWORD(U(identifier.DriverVersion).LowPart), LOWORD(U(identifier.DriverVersion).LowPart)); + HIWORD(identifier.DriverVersion.HighPart), LOWORD(identifier.DriverVersion.HighPart), + HIWORD(identifier.DriverVersion.LowPart), LOWORD(identifier.DriverVersion.LowPart)); IDirect3D9_Release(d3d);

1 0

Alexandre Julliard : d3d10_1/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: aa73def84efe315ebb90269fe7860c58e0ff1d57 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa73def84efe315ebb90269fe7860c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:43:28 2023 +0200 d3d10_1/tests: Use nameless unions/structs. --- dlls/d3d10_1/tests/d3d10_1.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 3218b21b2f0..e7c55a6d324 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -374,8 +374,8 @@ static void test_create_shader_resource_view(void) srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; srv_desc.ViewDimension = D3D10_1_SRV_DIMENSION_BUFFER; - U(srv_desc).Buffer.ElementOffset = 0; - U(srv_desc).Buffer.ElementWidth = 64; + srv_desc.Buffer.ElementOffset = 0; + srv_desc.Buffer.ElementWidth = 64; hr = ID3D10Device1_CreateShaderResourceView1(device, NULL, &srv_desc, &srview); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); @@ -437,9 +437,9 @@ static void test_create_shader_resource_view(void) ok(srv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", srv_desc.Format); ok(srv_desc.ViewDimension == D3D10_1_SRV_DIMENSION_TEXTURE2D, "Got unexpected view dimension %#x.\n", srv_desc.ViewDimension); - ok(U(srv_desc).Texture2D.MostDetailedMip == 0, "Got unexpected MostDetailedMip %u.\n", - U(srv_desc).Texture2D.MostDetailedMip); - ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); + ok(srv_desc.Texture2D.MostDetailedMip == 0, "Got unexpected MostDetailedMip %u.\n", + srv_desc.Texture2D.MostDetailedMip); + ok(srv_desc.Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", srv_desc.Texture2D.MipLevels); check_interface(srview, &IID_ID3D10ShaderResourceView, TRUE, FALSE); /* Not available on all Windows versions. */

1 0

Alexandre Julliard : d3d10core/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: e441577a596dd39bc99bf30fb909841f33627fb0 URL: https://gitlab.winehq.org/wine/wine/-/commit/e441577a596dd39bc99bf30fb90984… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:44:01 2023 +0200 d3d10core/tests: Use nameless unions/structs. --- dlls/d3d10core/tests/d3d10core.c | 274 +++++++++++++++++++-------------------- 1 file changed, 137 insertions(+), 137 deletions(-)

1 0