Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-05 00:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed handling of NULL arguments in ChangeDisplaySettings(Ex)(). Patch by blight.

Browse source 
svn path=/trunk/; revision=10030
This commit is contained in:
Thomas Bluemel 2004-07-08 00:46:22 +00:00
parent 580f2e7a68
commit 76cd746a0f
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
reactos/lib/user32/misc/display.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id: display.c,v 1.9 2004/04/09 20:03:14 navaraf Exp $
/* $Id: display.c,v 1.10 2004/07/08 00:46:22 weiden Exp $
*
* PROJECT: ReactOS user32.dll
* FILE: lib/user32/misc/dde.c
@ -241,19 +241,30 @@ ChangeDisplaySettingsExA(
{
LONG rc;
UNICODE_STRING DeviceName;
PUNICODE_STRING pDeviceName = &DeviceName;
DEVMODEW DevModeW;
LPDEVMODEW pDevModeW = &DevModeW;
if ( !RtlCreateUnicodeStringFromAsciiz ( &DeviceName, (PCSZ)lpszDeviceName ) )
if (lpszDeviceName != NULL)
{
SetLastError ( ERROR_OUTOFMEMORY );
return DISP_CHANGE_BADPARAM; /* FIXME what to return? */
if ( !RtlCreateUnicodeStringFromAsciiz ( pDeviceName, (PCSZ)lpszDeviceName ) )
{
SetLastError ( ERROR_OUTOFMEMORY );
return DISP_CHANGE_BADPARAM; /* FIXME what to return? */
}
}
else
pDeviceName = NULL;
RosRtlDevModeA2W ( &DevModeW, lpDevMode );
if (lpDevMode != NULL)
RosRtlDevModeA2W ( pDevModeW, lpDevMode );
else
pDevModeW = NULL;
rc = NtUserChangeDisplaySettings ( &DeviceName, &DevModeW, hwnd, dwflags, lParam );
rc = NtUserChangeDisplaySettings ( pDeviceName, pDevModeW, hwnd, dwflags, lParam );
RtlFreeUnicodeString ( &DeviceName );
if (lpszDeviceName != NULL)
RtlFreeUnicodeString ( &DeviceName );
return rc;
}
@ -286,12 +297,17 @@ ChangeDisplaySettingsExW(
{
LONG rc;
UNICODE_STRING DeviceName;
PUNICODE_STRING pDeviceName = &DeviceName;
RtlInitUnicodeString ( &DeviceName, lpszDeviceName );
if (lpszDeviceName != NULL)
RtlInitUnicodeString ( pDeviceName, lpszDeviceName );
else
pDeviceName = NULL;
rc = NtUserChangeDisplaySettings ( &DeviceName, lpDevMode, hwnd, dwflags, lParam );
rc = NtUserChangeDisplaySettings ( pDeviceName, lpDevMode, hwnd, dwflags, lParam );
RtlFreeUnicodeString ( &DeviceName );
if (lpszDeviceName != NULL)
RtlFreeUnicodeString ( pDeviceName );
return rc;
}