ddraw: Clear application-passed lpSurface pointers.
This commit is contained in:
parent
fc6ec997e2
commit
61ee3323ad
@ -6224,6 +6224,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s
|
|||||||
desc->u1.lPitch = wined3d_surface_get_pitch(wined3d_surface);
|
desc->u1.lPitch = wined3d_surface_get_pitch(wined3d_surface);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
desc->lpSurface = NULL;
|
||||||
|
|
||||||
wined3d_surface_incref(wined3d_surface);
|
wined3d_surface_incref(wined3d_surface);
|
||||||
surface->wined3d_surface = wined3d_surface;
|
surface->wined3d_surface = wined3d_surface;
|
||||||
|
@ -4576,6 +4576,7 @@ static void test_create_surface_pitch(void)
|
|||||||
ok(U1(surface_desc).lPitch == test_data[i].pitch_out32,
|
ok(U1(surface_desc).lPitch == test_data[i].pitch_out32,
|
||||||
"Test %u: Got unexpected pitch %u, expected %u.\n",
|
"Test %u: Got unexpected pitch %u, expected %u.\n",
|
||||||
i, U1(surface_desc).lPitch, test_data[i].pitch_out32);
|
i, U1(surface_desc).lPitch, test_data[i].pitch_out32);
|
||||||
|
ok(!surface_desc.lpSurface, "Test %u: Got unexpected lpSurface %p.\n", i, surface_desc.lpSurface);
|
||||||
|
|
||||||
IDirectDrawSurface_Release(surface);
|
IDirectDrawSurface_Release(surface);
|
||||||
}
|
}
|
||||||
|
@ -5652,6 +5652,7 @@ static void test_create_surface_pitch(void)
|
|||||||
ok(U1(surface_desc).lPitch == test_data[i].pitch_out32,
|
ok(U1(surface_desc).lPitch == test_data[i].pitch_out32,
|
||||||
"Test %u: Got unexpected pitch %u, expected %u.\n",
|
"Test %u: Got unexpected pitch %u, expected %u.\n",
|
||||||
i, U1(surface_desc).lPitch, test_data[i].pitch_out32);
|
i, U1(surface_desc).lPitch, test_data[i].pitch_out32);
|
||||||
|
ok(!surface_desc.lpSurface, "Test %u: Got unexpected lpSurface %p.\n", i, surface_desc.lpSurface);
|
||||||
|
|
||||||
IDirectDrawSurface_Release(surface);
|
IDirectDrawSurface_Release(surface);
|
||||||
}
|
}
|
||||||
|
@ -6649,6 +6649,7 @@ static void test_create_surface_pitch(void)
|
|||||||
ok(U1(surface_desc).lPitch == test_data[i].pitch_out32,
|
ok(U1(surface_desc).lPitch == test_data[i].pitch_out32,
|
||||||
"Test %u: Got unexpected pitch %u, expected %u.\n",
|
"Test %u: Got unexpected pitch %u, expected %u.\n",
|
||||||
i, U1(surface_desc).lPitch, test_data[i].pitch_out32);
|
i, U1(surface_desc).lPitch, test_data[i].pitch_out32);
|
||||||
|
ok(!surface_desc.lpSurface, "Test %u: Got unexpected lpSurface %p.\n", i, surface_desc.lpSurface);
|
||||||
|
|
||||||
IDirectDrawSurface4_Release(surface);
|
IDirectDrawSurface4_Release(surface);
|
||||||
}
|
}
|
||||||
|
@ -6472,6 +6472,7 @@ static void test_create_surface_pitch(void)
|
|||||||
ok(U1(surface_desc).lPitch == test_data[i].pitch_out32,
|
ok(U1(surface_desc).lPitch == test_data[i].pitch_out32,
|
||||||
"Test %u: Got unexpected pitch %u, expected %u.\n",
|
"Test %u: Got unexpected pitch %u, expected %u.\n",
|
||||||
i, U1(surface_desc).lPitch, test_data[i].pitch_out32);
|
i, U1(surface_desc).lPitch, test_data[i].pitch_out32);
|
||||||
|
ok(!surface_desc.lpSurface, "Test %u: Got unexpected lpSurface %p.\n", i, surface_desc.lpSurface);
|
||||||
|
|
||||||
IDirectDrawSurface7_Release(surface);
|
IDirectDrawSurface7_Release(surface);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user