Fixed 3 memset()s which used the wrong size (too large).
This commit is contained in:
parent
70d30cb54a
commit
accf3ee2e6
|
@ -114,7 +114,7 @@ static BOOL WINAPI set_hal_info(LPDDHALINFO lpDDHalInfo, BOOL reset)
|
||||||
if (lpDDHalInfo->lpD3DHALCallbacks)
|
if (lpDDHalInfo->lpD3DHALCallbacks)
|
||||||
memcpy(&d3d_hal_cbs1, (LPVOID)lpDDHalInfo->lpD3DHALCallbacks, sizeof(D3DHAL_CALLBACKS));
|
memcpy(&d3d_hal_cbs1, (LPVOID)lpDDHalInfo->lpD3DHALCallbacks, sizeof(D3DHAL_CALLBACKS));
|
||||||
else
|
else
|
||||||
memset(&d3d_hal_cbs1, 0, sizeof(D3DDEVICEDESC_V1));
|
memset(&d3d_hal_cbs1, 0, sizeof(D3DHAL_CALLBACKS));
|
||||||
dd_gbl.lpD3DHALCallbacks = (ULONG_PTR)&d3d_hal_cbs1;
|
dd_gbl.lpD3DHALCallbacks = (ULONG_PTR)&d3d_hal_cbs1;
|
||||||
|
|
||||||
if (lpDDHalInfo->dwFlags & DDHALINFO_GETDRIVERINFOSET) {
|
if (lpDDHalInfo->dwFlags & DDHALINFO_GETDRIVERINFOSET) {
|
||||||
|
|
|
@ -409,7 +409,7 @@ BOOL DIEnumDevicesCallbackAtoW(LPCDIDEVICEOBJECTINSTANCEA lpddi, LPVOID lpvRef)
|
||||||
|
|
||||||
data = (device_enumobjects_AtoWcb_data*) lpvRef;
|
data = (device_enumobjects_AtoWcb_data*) lpvRef;
|
||||||
|
|
||||||
memset(&ddtmp, 0, sizeof(DIDEVICEINSTANCEW));
|
memset(&ddtmp, 0, sizeof(ddtmp));
|
||||||
|
|
||||||
ddtmp.dwSize = sizeof(DIDEVICEINSTANCEW);
|
ddtmp.dwSize = sizeof(DIDEVICEINSTANCEW);
|
||||||
ddtmp.guidType = lpddi->guidType;
|
ddtmp.guidType = lpddi->guidType;
|
||||||
|
|
|
@ -265,7 +265,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid,
|
||||||
rc, MMSYSERR_INVALPARAM);
|
rc, MMSYSERR_INVALPARAM);
|
||||||
|
|
||||||
/* try bad structure size */
|
/* try bad structure size */
|
||||||
ZeroMemory(&aftd, sizeof(fd));
|
ZeroMemory(&aftd, sizeof(aftd));
|
||||||
rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 0);
|
rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 0);
|
||||||
ok(rc == MMSYSERR_INVALPARAM,
|
ok(rc == MMSYSERR_INVALPARAM,
|
||||||
"acmFormatTagEnum(): rc = %08x, should be %08x\n",
|
"acmFormatTagEnum(): rc = %08x, should be %08x\n",
|
||||||
|
|
Loading…
Reference in New Issue