Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[jimtabor] 33459: Fix typo spoted by Stefan100.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun May 11 20:55:34 2008 New Revision: 33459 URL: http://svn.reactos.org/svn/reactos?rev=33459&view=rev Log: Fix typo spoted by Stefan100. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Sun May 11 20:55:34 2008 @@ -271,7 +271,7 @@ } DEVCAPS, *PDEVCAPS; /* Gdi Handle Cache Types and Structures */ -#define GDI_CACHED_HADNLE_TYPES 4 +#define GDI_CACHED_HANDLE_TYPES 4 #define CACHE_BRUSH_ENTRIES 10 #define CACHE_PEN_ENTRIES 8 #define CACHE_REGION_ENTRIES 8 @@ -288,7 +288,7 @@ typedef struct _GDIHANDLECACHE { ULONG ulLock; - ULONG ulNumHandles[GDI_CACHED_HADNLE_TYPES]; + ULONG ulNumHandles[GDI_CACHED_HANDLE_TYPES]; HANDLE Handle[CACHE_BRUSH_ENTRIES+CACHE_PEN_ENTRIES+CACHE_REGION_ENTRIES+CACHE_LFONT_ENTRIES]; } GDIHANDLECACHE, *PGDIHANDLECACHE;

16 years, 4 months

[tkreuzer] 33458: NtUserEnumDisplaySettings returns NTSTATUS not BOOL, it doesn't set LastError value. Fix parameter validation and return value, based on tests in w32knapi.Move NtUserEnumDisplayMonitors and NtUserEnumDisplaySettings from windc to a new file display.c (Int functions should go there, too). adapt user32 functions accordingly. As a result w32knapi test doesn't crash anymore.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 11 18:51:55 2008 New Revision: 33458 URL: http://svn.reactos.org/svn/reactos?rev=33458&view=rev Log: NtUserEnumDisplaySettings returns NTSTATUS not BOOL, it doesn't set LastError value. Fix parameter validation and return value, based on tests in w32knapi.Move NtUserEnumDisplayMonitors and NtUserEnumDisplaySettings from windc to a new file display.c (Int functions should go there, too). adapt user32 functions accordingly. As a result w32knapi test doesn't crash anymore. Added: trunk/reactos/subsystems/win32/win32k/ntuser/display.c (with props) Modified: trunk/reactos/dll/win32/user32/misc/display.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/dll/win32/user32/misc/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/disp… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] Sun May 11 18:51:55 2008 @@ -199,89 +199,96 @@ BOOL STDCALL EnumDisplaySettingsExA( - LPCSTR lpszDeviceName, - DWORD iModeNum, - LPDEVMODEA lpDevMode, - DWORD dwFlags) -{ - BOOL rc; - UNICODE_STRING DeviceName; - DEVMODEW lpDevModeW; - - if ( !RtlCreateUnicodeStringFromAsciiz ( &DeviceName, (PCSZ)lpszDeviceName ) ) - { - SetLastError ( ERROR_OUTOFMEMORY ); - return FALSE; - } - - memset(&lpDevModeW,0,sizeof(DEVMODEW)); - lpDevModeW.dmSize = sizeof(DEVMODEW); - - rc = NtUserEnumDisplaySettings ( &DeviceName, iModeNum, &lpDevModeW, - dwFlags ); - if (!rc) - goto done; - -#define COPYS(f,len) WideCharToMultiByte( CP_THREAD_ACP, 0, lpDevModeW.f, len, (LPSTR)lpDevMode->f, len, NULL, NULL ) -#define COPYN(f) lpDevMode->f = lpDevModeW.f - COPYS(dmDeviceName, CCHDEVICENAME ); - COPYN(dmSpecVersion); - COPYN(dmDriverVersion); - switch ( lpDevModeW.dmSize ) - { - case SIZEOF_DEVMODEW_300: - lpDevMode->dmSize = SIZEOF_DEVMODEA_300; - break; - case SIZEOF_DEVMODEW_400: - lpDevMode->dmSize = SIZEOF_DEVMODEA_400; - break; - case SIZEOF_DEVMODEW_500: - default: /* FIXME what to do??? */ - lpDevMode->dmSize = SIZEOF_DEVMODEA_500; - break; - } - COPYN(dmDriverExtra); - COPYN(dmFields); - COPYN(dmPosition.x); - COPYN(dmPosition.y); - COPYN(dmScale); - COPYN(dmCopies); - COPYN(dmDefaultSource); - COPYN(dmPrintQuality); - COPYN(dmColor); - COPYN(dmDuplex); - COPYN(dmYResolution); - COPYN(dmTTOption); - COPYN(dmCollate); - COPYS(dmFormName,CCHFORMNAME); - COPYN(dmLogPixels); - COPYN(dmBitsPerPel); - COPYN(dmPelsWidth); - COPYN(dmPelsHeight); - COPYN(dmDisplayFlags); // aka dmNup - COPYN(dmDisplayFrequency); - - if ( lpDevModeW.dmSize <= SIZEOF_DEVMODEW_300 ) - goto done; // we're done with 0x300 fields - - COPYN(dmICMMethod); - COPYN(dmICMIntent); - COPYN(dmMediaType); - COPYN(dmDitherType); - COPYN(dmReserved1); - COPYN(dmReserved2); - - if ( lpDevModeW.dmSize <= SIZEOF_DEVMODEW_400 ) - goto done; // we're done with 0x400 fields - - COPYN(dmPanningWidth); - COPYN(dmPanningHeight); - -done: - RtlFreeUnicodeString ( &DeviceName ); - - - return rc; + LPCSTR lpszDeviceName, + DWORD iModeNum, + LPDEVMODEA lpDevMode, + DWORD dwFlags) +{ + NTSTATUS Status; + UNICODE_STRING usDeviceName, *pusDeviceName = NULL; + DEVMODEW DevModeW; + + if (lpszDeviceName) + { + if (!RtlCreateUnicodeStringFromAsciiz(&usDeviceName, (PCSZ)lpszDeviceName)) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + pusDeviceName = &usDeviceName; + } + + memset(&DevModeW,0, sizeof(DEVMODEW)); + DevModeW.dmSize = sizeof(DEVMODEW); + + Status = NtUserEnumDisplaySettings(pusDeviceName, iModeNum, &DevModeW, dwFlags); + + if (pusDeviceName) + { + RtlFreeUnicodeString (&usDeviceName); + } + + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + +#define COPYS(f,len) WideCharToMultiByte( CP_THREAD_ACP, 0, DevModeW.f, len, (LPSTR)lpDevMode->f, len, NULL, NULL ) +#define COPYN(f) lpDevMode->f = DevModeW.f + COPYS(dmDeviceName, CCHDEVICENAME ); + COPYN(dmSpecVersion); + COPYN(dmDriverVersion); + switch (DevModeW.dmSize) + { + case SIZEOF_DEVMODEW_300: + lpDevMode->dmSize = SIZEOF_DEVMODEA_300; + break; + case SIZEOF_DEVMODEW_400: + lpDevMode->dmSize = SIZEOF_DEVMODEA_400; + break; + case SIZEOF_DEVMODEW_500: + default: /* FIXME what to do??? */ + lpDevMode->dmSize = SIZEOF_DEVMODEA_500; + break; + } + COPYN(dmDriverExtra); + COPYN(dmFields); + COPYN(dmPosition.x); + COPYN(dmPosition.y); + COPYN(dmScale); + COPYN(dmCopies); + COPYN(dmDefaultSource); + COPYN(dmPrintQuality); + COPYN(dmColor); + COPYN(dmDuplex); + COPYN(dmYResolution); + COPYN(dmTTOption); + COPYN(dmCollate); + COPYS(dmFormName,CCHFORMNAME); + COPYN(dmLogPixels); + COPYN(dmBitsPerPel); + COPYN(dmPelsWidth); + COPYN(dmPelsHeight); + COPYN(dmDisplayFlags); // aka dmNup + COPYN(dmDisplayFrequency); + + if (DevModeW.dmSize <= SIZEOF_DEVMODEW_300) + return TRUE; // we're done with 0x300 fields + + COPYN(dmICMMethod); + COPYN(dmICMIntent); + COPYN(dmMediaType); + COPYN(dmDitherType); + COPYN(dmReserved1); + COPYN(dmReserved2); + + if (DevModeW.dmSize <= SIZEOF_DEVMODEW_400) + return TRUE; // we're done with 0x400 fields + + COPYN(dmPanningWidth); + COPYN(dmPanningHeight); + + return TRUE; } @@ -305,19 +312,23 @@ BOOL STDCALL EnumDisplaySettingsExW( - LPCWSTR lpszDeviceName, - DWORD iModeNum, - LPDEVMODEW lpDevMode, - DWORD dwFlags) -{ - BOOL rc; - UNICODE_STRING DeviceName; - - RtlInitUnicodeString ( &DeviceName, lpszDeviceName ); - - rc = NtUserEnumDisplaySettings ( &DeviceName, iModeNum, lpDevMode, dwFlags ); - - return rc; + LPCWSTR lpszDeviceName, + DWORD iModeNum, + LPDEVMODEW lpDevMode, + DWORD dwFlags) +{ + NTSTATUS Status; + UNICODE_STRING usDeviceName, *pusDeviceName = NULL; + + if (lpszDeviceName) + { + RtlInitUnicodeString(&usDeviceName, lpszDeviceName); + pusDeviceName = &usDeviceName; + } + + Status = NtUserEnumDisplaySettings(pusDeviceName, iModeNum, lpDevMode, dwFlags); + + return NT_SUCCESS(Status); } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun May 11 18:51:55 2008 @@ -1064,7 +1064,7 @@ OPTIONAL IN DWORD listSize ); -BOOL +NTSTATUS NTAPI NtUserEnumDisplaySettings( PUNICODE_STRING lpszDeviceName, Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] Sun May 11 18:51:55 2008 @@ -201,7 +201,7 @@ LPCSTR InData, LPVOID OutData); -BOOL +NTSTATUS FASTCALL IntEnumDisplaySettings( IN PUNICODE_STRING pDeviceName OPTIONAL, Added: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/display.c (added) +++ trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Sun May 11 18:51:55 2008 @@ -1,0 +1,189 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/ntuser/display.c + * PURPOSE: display settings + * COPYRIGHT: Copyright 2007 ReactOS + * + */ + +/* INCLUDES ******************************************************************/ + +#include <w32k.h> + +#define NDEBUG +#include <debug.h> + +#define SIZEOF_DEVMODEW_300 188 +#define SIZEOF_DEVMODEW_400 212 +#define SIZEOF_DEVMODEW_500 220 + +/* PUBLIC FUNCTIONS ***********************************************************/ + +NTSTATUS +NTAPI +NtUserEnumDisplaySettings( + PUNICODE_STRING pusDeviceName, + DWORD iModeNum, + LPDEVMODEW lpDevMode, /* FIXME is this correct? */ + DWORD dwFlags ) +{ + NTSTATUS Status; + LPDEVMODEW pSafeDevMode; + PUNICODE_STRING pusSafeDeviceName = NULL; + UNICODE_STRING usSafeDeviceName; + USHORT Size = 0, ExtraSize = 0; + + /* Copy the devmode */ + _SEH_TRY + { + ProbeForRead(lpDevMode, sizeof(DEVMODEW), 1); + Size = lpDevMode->dmSize; + ExtraSize = lpDevMode->dmDriverExtra; + } + _SEH_HANDLE + { + DPRINT("FIXME ? : Out of range of DEVMODEW size \n"); + _SEH_YIELD(return _SEH_GetExceptionCode()); + } + _SEH_END; + + if (Size != sizeof(DEVMODEW)) + { + return STATUS_BUFFER_TOO_SMALL; + } + + pSafeDevMode = ExAllocatePool(PagedPool, Size + ExtraSize); + if (pSafeDevMode == NULL) + { + return STATUS_NO_MEMORY; + } + pSafeDevMode->dmSize = Size; + pSafeDevMode->dmDriverExtra = ExtraSize; + + /* Copy the device name */ + if (pusDeviceName != NULL) + { + Status = IntSafeCopyUnicodeString(&usSafeDeviceName, pusDeviceName); + if (!NT_SUCCESS(Status)) + { + ExFreePool(pSafeDevMode); + return Status; + } + pusSafeDeviceName = &usSafeDeviceName; + } + + /* Call internal function */ + Status = IntEnumDisplaySettings(pusSafeDeviceName, iModeNum, pSafeDevMode, dwFlags); + + if (pusSafeDeviceName != NULL) + RtlFreeUnicodeString(pusSafeDeviceName); + + if (!NT_SUCCESS(Status)) + { + ExFreePool(pSafeDevMode); + return Status; + } + + /* Copy some information back */ + _SEH_TRY + { + ProbeForWrite(lpDevMode,Size + ExtraSize, 1); + lpDevMode->dmPelsWidth = pSafeDevMode->dmPelsWidth; + lpDevMode->dmPelsHeight = pSafeDevMode->dmPelsHeight; + lpDevMode->dmBitsPerPel = pSafeDevMode->dmBitsPerPel; + lpDevMode->dmDisplayFrequency = pSafeDevMode->dmDisplayFrequency; + lpDevMode->dmDisplayFlags = pSafeDevMode->dmDisplayFlags; + + /* output private/extra driver data */ + if (ExtraSize > 0) + { + memcpy((PCHAR)lpDevMode + Size, (PCHAR)pSafeDevMode + Size, ExtraSize); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + ExFreePool(pSafeDevMode); + return Status; +} + + +LONG +NTAPI +NtUserChangeDisplaySettings( + PUNICODE_STRING lpszDeviceName, + LPDEVMODEW lpDevMode, + HWND hwnd, + DWORD dwflags, + LPVOID lParam) +{ + NTSTATUS Status; + DEVMODEW DevMode; + PUNICODE_STRING pSafeDeviceName = NULL; + UNICODE_STRING SafeDeviceName; + LONG Ret; + + /* Check arguments */ +#ifdef CDS_VIDEOPARAMETERS + + if (dwflags != CDS_VIDEOPARAMETERS && lParam != NULL) +#else + + if (lParam != NULL) +#endif + + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return DISP_CHANGE_BADPARAM; + } + if (hwnd != NULL) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return DISP_CHANGE_BADPARAM; + } + + /* Copy devmode */ + Status = MmCopyFromCaller(&DevMode.dmSize, &lpDevMode->dmSize, sizeof (DevMode.dmSize)); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return DISP_CHANGE_BADPARAM; + } + DevMode.dmSize = min(sizeof (DevMode), DevMode.dmSize); + Status = MmCopyFromCaller(&DevMode, lpDevMode, DevMode.dmSize); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return DISP_CHANGE_BADPARAM; + } + if (DevMode.dmDriverExtra > 0) + { + DbgPrint("(%s:%i) WIN32K: %s lpDevMode->dmDriverExtra is IGNORED!\n", __FILE__, __LINE__, __FUNCTION__); + DevMode.dmDriverExtra = 0; + } + + /* Copy the device name */ + if (lpszDeviceName != NULL) + { + Status = IntSafeCopyUnicodeString(&SafeDeviceName, lpszDeviceName); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return DISP_CHANGE_BADPARAM; + } + pSafeDeviceName = &SafeDeviceName; + } + + /* Call internal function */ + Ret = IntChangeDisplaySettings(pSafeDeviceName, &DevMode, dwflags, lParam); + + if (pSafeDeviceName != NULL) + RtlFreeUnicodeString(pSafeDeviceName); + + return Ret; +} + Propchange: trunk/reactos/subsystems/win32/win32k/ntuser/display.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Sun May 11 18:51:55 2008 @@ -890,179 +890,6 @@ return NtUserGetDCEx(hWnd, NULL, NULL == hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE); } -BOOL -STDCALL -NtUserEnumDisplaySettings( - PUNICODE_STRING lpszDeviceName, - DWORD iModeNum, - LPDEVMODEW lpDevMode, /* FIXME is this correct? */ - DWORD dwFlags ) -{ - NTSTATUS Status; - LPDEVMODEW pSafeDevMode; - PUNICODE_STRING pSafeDeviceName = NULL; - UNICODE_STRING SafeDeviceName; - USHORT Size = 0, ExtraSize = 0; - - /* Copy the devmode */ - _SEH_TRY - { - ProbeForRead(lpDevMode, sizeof(DEVMODEW), 1); - Size = lpDevMode->dmSize; - ExtraSize = lpDevMode->dmDriverExtra; - } - _SEH_HANDLE - { - DPRINT1("FIXME ? : Out of range of DEVMODEW size \n"); - SetLastNtError(_SEH_GetExceptionCode()); - _SEH_YIELD(return FALSE); - } - _SEH_END; - - - pSafeDevMode = ExAllocatePool(PagedPool, Size + ExtraSize); - if (pSafeDevMode == NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - pSafeDevMode->dmSize = Size; - pSafeDevMode->dmDriverExtra = ExtraSize; - - /* Copy the device name */ - if (lpszDeviceName != NULL) - { - Status = IntSafeCopyUnicodeString(&SafeDeviceName, lpszDeviceName); - if (!NT_SUCCESS(Status)) - { - ExFreePool(pSafeDevMode); - SetLastNtError(Status); - return FALSE; - } - pSafeDeviceName = &SafeDeviceName; - } - - /* Call internal function */ - if (!IntEnumDisplaySettings(pSafeDeviceName, iModeNum, pSafeDevMode, dwFlags)) - { - if (pSafeDeviceName != NULL) - RtlFreeUnicodeString(pSafeDeviceName); - ExFreePool(pSafeDevMode); - return FALSE; - } - if (pSafeDeviceName != NULL) - RtlFreeUnicodeString(pSafeDeviceName); - - /* Copy some information back */ - _SEH_TRY - { - ProbeForWrite(lpDevMode,Size, 1); - lpDevMode->dmPelsWidth = pSafeDevMode->dmPelsWidth; - lpDevMode->dmPelsHeight = pSafeDevMode->dmPelsHeight; - lpDevMode->dmBitsPerPel = pSafeDevMode->dmBitsPerPel; - lpDevMode->dmDisplayFrequency = pSafeDevMode->dmDisplayFrequency; - lpDevMode->dmDisplayFlags = pSafeDevMode->dmDisplayFlags; - } - _SEH_HANDLE - { - DPRINT1("Warning crash here \n"); - SetLastNtError(_SEH_GetExceptionCode()); - _SEH_YIELD(return FALSE); - } - _SEH_END; - - - /* output private/extra driver data */ - if (ExtraSize > 0) - { - Status = MmCopyToCaller((PCHAR)lpDevMode + Size, (PCHAR)pSafeDevMode + Size, ExtraSize); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - ExFreePool(pSafeDevMode); - return FALSE; - } - } - - ExFreePool(pSafeDevMode); - return TRUE; -} - -LONG -STDCALL -NtUserChangeDisplaySettings( - PUNICODE_STRING lpszDeviceName, - LPDEVMODEW lpDevMode, - HWND hwnd, - DWORD dwflags, - LPVOID lParam) -{ - NTSTATUS Status; - DEVMODEW DevMode; - PUNICODE_STRING pSafeDeviceName = NULL; - UNICODE_STRING SafeDeviceName; - LONG Ret; - - /* Check arguments */ -#ifdef CDS_VIDEOPARAMETERS - - if (dwflags != CDS_VIDEOPARAMETERS && lParam != NULL) -#else - - if (lParam != NULL) -#endif - - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return DISP_CHANGE_BADPARAM; - } - if (hwnd != NULL) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return DISP_CHANGE_BADPARAM; - } - - /* Copy devmode */ - Status = MmCopyFromCaller(&DevMode.dmSize, &lpDevMode->dmSize, sizeof (DevMode.dmSize)); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return DISP_CHANGE_BADPARAM; - } - DevMode.dmSize = min(sizeof (DevMode), DevMode.dmSize); - Status = MmCopyFromCaller(&DevMode, lpDevMode, DevMode.dmSize); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return DISP_CHANGE_BADPARAM; - } - if (DevMode.dmDriverExtra > 0) - { - DbgPrint("(%s:%i) WIN32K: %s lpDevMode->dmDriverExtra is IGNORED!\n", __FILE__, __LINE__, __FUNCTION__); - DevMode.dmDriverExtra = 0; - } - - /* Copy the device name */ - if (lpszDeviceName != NULL) - { - Status = IntSafeCopyUnicodeString(&SafeDeviceName, lpszDeviceName); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return DISP_CHANGE_BADPARAM; - } - pSafeDeviceName = &SafeDeviceName; - } - - /* Call internal function */ - Ret = IntChangeDisplaySettings(pSafeDeviceName, &DevMode, dwflags, lParam); - - if (pSafeDeviceName != NULL) - RtlFreeUnicodeString(pSafeDeviceName); - - return Ret; -} - /*! * Select logical palette into device context. * \param hDC handle to the device context Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Sun May 11 18:51:55 2008 @@ -2843,7 +2843,8 @@ * \todo Don't ignore pDeviceName * \todo Implement non-raw mode (only return settings valid for driver and monitor) */ -BOOL FASTCALL +NTSTATUS +FASTCALL IntEnumDisplaySettings( IN PUNICODE_STRING pDeviceName OPTIONAL, IN DWORD iModeNum, @@ -2856,11 +2857,12 @@ PDEVMODEW CachedMode = NULL; DEVMODEW DevMode; ULONG DisplayNumber; - - if (!NT_SUCCESS(GetDisplayNumberFromDeviceName(pDeviceName, &DisplayNumber))) - { - SetLastWin32Error(STATUS_NO_SUCH_DEVICE); - return FALSE; + NTSTATUS Status; + + Status = GetDisplayNumberFromDeviceName(pDeviceName, &DisplayNumber); + if (!NT_SUCCESS(Status)) + { + return Status; } DPRINT("DevMode->dmSize = %d\n", pDevMode->dmSize); @@ -2869,8 +2871,7 @@ pDevMode->dmSize != SIZEOF_DEVMODEW_400 && pDevMode->dmSize != SIZEOF_DEVMODEW_500) { - SetLastWin32Error(STATUS_INVALID_PARAMETER); - return FALSE; + return STATUS_BUFFER_TOO_SMALL; } if (iModeNum == ENUM_CURRENT_SETTINGS) @@ -2887,8 +2888,7 @@ CachedMode = &DevMode; else { - SetLastWin32Error(0); /* FIXME: use error code */ - return FALSE; + return STATUS_UNSUCCESSFUL; // FIXME: what status? } /* FIXME: Maybe look for the matching devmode supplied by the * driver so we can provide driver private/extra data? @@ -2923,13 +2923,13 @@ if (!FindDriverFileNames(&DriverFileNames, DisplayNumber)) { DPRINT1("FindDriverFileNames failed\n"); - return FALSE; + return STATUS_UNSUCCESSFUL; } if (!IntPrepareDriverIfNeeded()) { DPRINT1("IntPrepareDriverIfNeeded failed\n"); - return FALSE; + return STATUS_UNSUCCESSFUL; } /* @@ -3009,8 +3009,7 @@ if (CachedDeviceName.Buffer != NULL) RtlFreeUnicodeString(&CachedDeviceName); - SetLastWin32Error(STATUS_NO_MEMORY); - return FALSE; + return STATUS_NO_MEMORY; } if (CachedDevModes != NULL) { @@ -3053,8 +3052,7 @@ CachedMode = CachedDevModes; if (CachedMode >= CachedDevModesEnd) { - SetLastWin32Error(STATUS_NO_MORE_ENTRIES); - return FALSE; + return STATUS_NO_MORE_ENTRIES; } while (iModeNum-- > 0 && CachedMode < CachedDevModesEnd) { @@ -3063,8 +3061,7 @@ } if (CachedMode >= CachedDevModesEnd) { - SetLastWin32Error(STATUS_NO_MORE_ENTRIES); - return FALSE; + return STATUS_NO_MORE_ENTRIES; } } @@ -3074,7 +3071,7 @@ RtlZeroMemory(pDevMode + pDevMode->dmSize, pDevMode->dmDriverExtra); RtlCopyMemory(pDevMode + min(pDevMode->dmSize, CachedMode->dmSize), CachedMode + CachedMode->dmSize, min(pDevMode->dmDriverExtra, CachedMode->dmDriverExtra)); - return TRUE; + return STATUS_SUCCESS; } static NTSTATUS FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sun May 11 18:51:55 2008 @@ -111,6 +111,7 @@ <file>csr.c</file> <file>cursoricon.c</file> <file>desktop.c</file> + <file>display.c</file> <file>event.c</file> <file>focus.c</file> <file>guicheck.c</file>

16 years, 4 months

[tkreuzer] 33457: fix a header name

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 11 18:25:02 2008 New Revision: 33457 URL: http://svn.reactos.org/svn/reactos?rev=33457&view=rev Log: fix a header name Added: trunk/reactos/include/ddk/ntdd1394.h - copied unchanged from r33441, trunk/reactos/include/ddk/ntdd1934.h

16 years, 4 months

[tkreuzer] 33456: patch by hyperion: convert pointer calculations with FIELD_OFFSET macro

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 11 18:15:44 2008 New Revision: 33456 URL: http://svn.reactos.org/svn/reactos?rev=33456&view=rev Log: patch by hyperion: convert pointer calculations with FIELD_OFFSET macro Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…

16 years, 4 months

[tkreuzer] 33455: use "%p" to DPRINT a pointer instead of casting it to int and using "%08x"

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 11 17:28:20 2008 New Revision: 33455 URL: http://svn.reactos.org/svn/reactos?rev=33455&view=rev Log: use "%p" to DPRINT a pointer instead of casting it to int and using "%08x" Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Sun May 11 17:28:20 2008 @@ -294,7 +294,7 @@ if( vkPtr->VirtualKey != 0xff ) { DPRINT( "Found dead key with no trailer in the table.\n" ); - DPRINT( "VK: %04x, ADDR: %08x\n", wVirtKey, (int)vkPtr ); + DPRINT( "VK: %04x, ADDR: %p\n", wVirtKey, vkPtr ); return FALSE; } *pwcTranslatedChar = vkPtr->wch[CapsMod];

16 years, 4 months

[tkreuzer] 33454: - Use InterlockedExchangePointer instead of InterlockedExchange for a pointer. - Don't cast a DWORD to HANDLE directly - ViewSize param of MmMapViewOfSection is SIZE_T, not ULONG

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 11 17:23:45 2008 New Revision: 33454 URL: http://svn.reactos.org/svn/reactos?rev=33454&view=rev Log: - Use InterlockedExchangePointer instead of InterlockedExchange for a pointer. - Don't cast a DWORD to HANDLE directly - ViewSize param of MmMapViewOfSection is SIZE_T, not ULONG Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sun May 11 17:23:45 2008 @@ -542,12 +542,12 @@ return; } IntReferenceMessageQueue(NewQueue); - InterlockedExchange((LONG*)&NewQueue->Desktop, (LONG)pdo); - } - Old = (PUSER_MESSAGE_QUEUE)InterlockedExchange((LONG*)&pdo->ActiveMessageQueue, (LONG)NewQueue); + (void)InterlockedExchangePointer((PVOID*)&NewQueue->Desktop, pdo); + } + Old = (PUSER_MESSAGE_QUEUE)InterlockedExchangePointer((PVOID*)&pdo->ActiveMessageQueue, NewQueue); if(Old != NULL) { - InterlockedExchange((LONG*)&Old->Desktop, 0); + (void)InterlockedExchangePointer((PVOID*)&Old->Desktop, 0); IntDereferenceMessageQueue(Old); } } @@ -1660,7 +1660,7 @@ RETURN(0); } - Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread); + Status = PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)dwThreadId, &Thread); if(!NT_SUCCESS(Status)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); @@ -1774,7 +1774,7 @@ PW32THREADINFO ti; PW32HEAP_USER_MAPPING HeapMapping, *PrevLink = &PsGetCurrentProcessWin32Process()->HeapMappings.Next; PVOID UserBase = NULL; - ULONG ViewSize = 0; + SIZE_T ViewSize = 0; LARGE_INTEGER Offset; NTSTATUS Status;

16 years, 4 months

[tkreuzer] 33453: a "real" InterlockedExchangePointer wants PVOID* and nothing else.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 11 17:09:53 2008 New Revision: 33453 URL: http://svn.reactos.org/svn/reactos?rev=33453&view=rev Log: a "real" InterlockedExchangePointer wants PVOID* and nothing else. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Sun May 11 17:09:53 2008 @@ -467,7 +467,7 @@ Class->Next = BaseClass->Next; /* replace the base class */ - (void)InterlockedExchangePointer(ClassLink, + (void)InterlockedExchangePointer((PVOID*)ClassLink, Class); /* destroy the obsolete copy on the shared heap */ @@ -552,7 +552,7 @@ } /* link in the new base class */ - (void)InterlockedExchangePointer(BaseClassLink, + (void)InterlockedExchangePointer((PVOID*)BaseClassLink, Class); } @@ -620,7 +620,7 @@ ASSERT(CurrentClass == Class); - (void)InterlockedExchangePointer(PrevLink, + (void)InterlockedExchangePointer((PVOID*)PrevLink, Class->Next); ASSERT(Class->Base == BaseClass); @@ -658,7 +658,7 @@ NewClass->Base = NewClass; /* replace the class in the list */ - (void)InterlockedExchangePointer(*ClassLinkPtr, + (void)InterlockedExchangePointer((PVOID*)*ClassLinkPtr, NewClass); *ClassLinkPtr = &NewClass->Next; @@ -719,7 +719,7 @@ if (FreeOnFailure) { /* unlink the base class */ - (void)InterlockedExchangePointer(Link, + (void)InterlockedExchangePointer((PVOID*)Link, Class->Next); /* we can free the old base class now */ @@ -1191,7 +1191,7 @@ List = &pi->LocalClassList; Class->Next = *List; - (void)InterlockedExchangePointer(List, + (void)InterlockedExchangePointer((PVOID*)List, Class); Ret = Class->Atom; @@ -1850,7 +1850,7 @@ ASSERT(Class->System); Class->Next = pi->SystemClassList; - (void)InterlockedExchangePointer(&pi->SystemClassList, + (void)InterlockedExchangePointer((PVOID*)&pi->SystemClassList, Class); } else

16 years, 4 months

[tkreuzer] 33452: - a bunch of tests for NtUserEnumDisplaySettings - one test for NtGdiGetFontResourceInfoInternalW

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 11 16:49:56 2008 New Revision: 33452 URL: http://svn.reactos.org/svn/reactos?rev=33452&view=rev Log: - a bunch of tests for NtUserEnumDisplaySettings - one test for NtGdiGetFontResourceInfoInternalW Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetFontResourceInfoInternalW.c (with props) trunk/rostests/apitests/w32knapi/ntuser/NtUserEnumDisplaySettings.c (with props) Modified: trunk/rostests/apitests/w32knapi/testlist.c trunk/rostests/apitests/w32knapi/w32knapi.rbuild Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetFontResourceInfoInternalW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetFontResourceInfoInternalW.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetFontResourceInfoInternalW.c [iso-8859-1] Sun May 11 16:49:56 2008 @@ -1,0 +1,43 @@ + +INT +Test_NtGdiGetFontResourceInfoInternalW(PTESTINFO pti) +{ + WCHAR szFullFileName[MAX_PATH+1]; + BOOL bRet; + DWORD dwBufSize; + LOGFONTW logfont; + UNICODE_STRING NtFileName; + + GetCurrentDirectoryW(MAX_PATH, szFullFileName); + wcscat(szFullFileName, L"\\test.otf"); + + ASSERT(AddFontResourceW(szFullFileName) != 0); + + ASSERT(RtlDosPathNameToNtPathName_U(szFullFileName, + &NtFileName, + NULL, + NULL)); + + dwBufSize = sizeof(logfont); + memset(&logfont, 0x0, dwBufSize); + + bRet = NtGdiGetFontResourceInfoInternalW( + NtFileName.Buffer, + (NtFileName.Length / sizeof(WCHAR)) +1, + 1, + dwBufSize, + &dwBufSize, + &logfont, + 2); + + TEST(bRet != FALSE); + + printf("lfHeight = %ld\n", logfont.lfHeight); + printf("lfWidth = %ld\n", logfont.lfWidth); + printf("lfFaceName = %ls\n", logfont.lfFaceName); + + RemoveFontResourceW(szFullFileName); + + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetFontResourceInfoInternalW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserEnumDisplaySettings.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserEnumDisplaySettings.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserEnumDisplaySettings.c [iso-8859-1] Sun May 11 16:49:56 2008 @@ -1,0 +1,99 @@ + +static struct +{ + DEVMODEW devmode; + CHAR buffer[0xffff]; +} data; + +INT +TEST_NtUserEnumDisplaySettings(PTESTINFO pti) +{ + UNICODE_STRING usDeviceName; + WCHAR szName[] = L"DISPLAY"; + NTSTATUS Status; + INT i; + + SetLastError(ERROR_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, 0, 0, 0); + TEST(Status == STATUS_ACCESS_VIOLATION); + TEST(GetLastError() == ERROR_SUCCESS); + + data.devmode.dmDriverExtra = 0; + for (i = 0; i < 2 * sizeof(DEVMODEW); i++) + { + data.devmode.dmSize = i; + Status = NtUserEnumDisplaySettings(NULL, 1000, (DEVMODEW*)&data, 0); + if (i != sizeof(DEVMODEW)) + { + TEST(Status == STATUS_BUFFER_TOO_SMALL); + } + } + TEST(GetLastError() == ERROR_SUCCESS); + + usDeviceName.Buffer = NULL; + usDeviceName.Length = 0; + usDeviceName.MaximumLength = 0; + Status = NtUserEnumDisplaySettings(&usDeviceName, ENUM_CURRENT_SETTINGS, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_BUFFER_TOO_SMALL); + Status = NtUserEnumDisplaySettings(&usDeviceName, -4, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_BUFFER_TOO_SMALL); + + data.devmode.dmSize = sizeof(DEVMODEW); + data.devmode.dmDriverExtra = 0xffff; + Status = NtUserEnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + + data.devmode.dmSize = sizeof(DEVMODEW); + data.devmode.dmDriverExtra = 0; + Status = NtUserEnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + + usDeviceName.Buffer = NULL; + usDeviceName.Length = 0; + usDeviceName.MaximumLength = 0; + Status = NtUserEnumDisplaySettings(&usDeviceName, ENUM_CURRENT_SETTINGS, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_INVALID_PARAMETER_1); + Status = NtUserEnumDisplaySettings(&usDeviceName, -4, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_INVALID_PARAMETER_1); + + Status = NtUserEnumDisplaySettings(NULL, 0, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, 1, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, 2, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, 4, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, 8, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + + Status = NtUserEnumDisplaySettings(NULL, 247, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, 248, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_INVALID_PARAMETER_2); + + Status = NtUserEnumDisplaySettings(NULL, -1, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, -2, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, -3, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, -4, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_INVALID_PARAMETER_2); + + Status = NtUserEnumDisplaySettings(&usDeviceName, ENUM_CURRENT_SETTINGS, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_INVALID_PARAMETER_1); + + usDeviceName.Buffer = szName; + usDeviceName.Length = wcslen(szName); + usDeviceName.MaximumLength = usDeviceName.Length; + Status = NtUserEnumDisplaySettings(&usDeviceName, ENUM_CURRENT_SETTINGS, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_INVALID_PARAMETER_1); + + Status = NtUserEnumDisplaySettings(&usDeviceName, 1000, (DEVMODEW*)&data, 123456); + TEST(Status == STATUS_INVALID_PARAMETER_1); + + TEST(GetLastError() == ERROR_SUCCESS); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserEnumDisplaySettings.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] Sun May 11 16:49:56 2008 @@ -15,6 +15,7 @@ //#include "ntgdi/NtGdiEnumFontChunk.c" #include "ntgdi/NtGdiEnumFontOpen.c" #include "ntgdi/NtGdiGetBitmapBits.c" +#include "ntgdi/NtGdiGetFontResourceInfoInternalW.c" #include "ntgdi/NtGdiGetRandomRgn.c" #include "ntgdi/NtGdiSelectBitmap.c" #include "ntgdi/NtGdiSelectBrush.c" @@ -34,6 +35,7 @@ #include "ntuser/NtUserCallOneParam.c" #include "ntuser/NtUserCountClipboardFormats.c" //#include "ntuser/NtUserCreateWindowEx.c" +#include "ntuser/NtUserEnumDisplaySettings.c" #include "ntuser/NtUserFindExistingCursorIcon.c" #include "ntuser/NtUserRedrawWindow.c" #include "ntuser/NtUserScrollDC.c" @@ -51,13 +53,14 @@ /* ntgdi */ { L"NtGdiArcInternal", Test_NtGdiArcInternal }, { L"NtGdiBitBlt", Test_NtGdiBitBlt }, -{ L"NtGdiCreateBitmap", Test_NtGdiCreateBitmap }, + { L"NtGdiCreateBitmap", Test_NtGdiCreateBitmap }, { L"NtGdiCreateCompatibleBitmap", Test_NtGdiCreateCompatibleBitmap }, { L"NtGdiDoPalette", Test_NtGdiDoPalette }, { L"NtGdiEngCreatePalette", Test_NtGdiEngCreatePalette }, // { L"NtGdiEnumFontChunk", Test_NtGdiEnumFontChunk }, { L"NtGdiEnumFontOpen", Test_NtGdiEnumFontOpen }, { L"NtGdiGetBitmapBits", Test_NtGdiGetBitmapBits }, + { L"NtGdiGetFontResourceInfoInternalW", Test_NtGdiGetFontResourceInfoInternalW }, { L"NtGdiGetRandomRgn", Test_NtGdiGetRandomRgn }, { L"NtGdiSetBitmapBits", Test_NtGdiSetBitmapBits }, { L"NtGdiSelectBitmap", Test_NtGdiSelectBitmap }, @@ -78,6 +81,7 @@ { L"NtUserCallOneParam", Test_NtUserCallOneParam }, { L"NtUserCountClipboardFormats", Test_NtUserCountClipboardFormats }, // { L"NtUserCreateWindowEx", Test_NtUserCreateWindowEx }, + { L"NtUserEnumDisplaySettings", TEST_NtUserEnumDisplaySettings }, { L"NtUserFindExistingCursorIcon", Test_NtUserFindExistingCursoricon }, { L"NtUserRedrawWindow", Test_NtUserRedrawWindow }, { L"NtUserScrollDC", Test_NtUserScrollDC }, Modified: trunk/rostests/apitests/w32knapi/w32knapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.rbuild [iso-8859-1] Sun May 11 16:49:56 2008 @@ -4,6 +4,7 @@ <define name="_WIN32_WINNT">0x0501</define> <define name="WINVER">0x501</define> <library>apitest</library> + <library>ntdll</library> <library>kernel32</library> <library>user32</library> <library>gdi32</library>

16 years, 4 months

[hpoussin] 33451: Add generic list scrolling See issue #3234 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun May 11 16:32:00 2008 New Revision: 33451 URL: http://svn.reactos.org/svn/reactos?rev=33451&view=rev Log: Add generic list scrolling See issue #3234 for more details. Modified: trunk/reactos/base/setup/usetup/genlist.c Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Sun May 11 16:32:00 2008 @@ -46,6 +46,8 @@ { LIST_ENTRY ListHead; + PLIST_ENTRY FirstShown; + PLIST_ENTRY LastShown; SHORT Left; SHORT Top; SHORT Right; @@ -230,13 +232,14 @@ coPos.Y = GenericList->Top + 1; Width = GenericList->Right - GenericList->Left - 1; - Entry = GenericList->ListHead.Flink; + Entry = GenericList->FirstShown; while (Entry != &GenericList->ListHead) { ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); if (coPos.Y == GenericList->Bottom) break; + GenericList->LastShown = Entry; FillConsoleOutputAttribute (StdOutput, (GenericList->CurrentEntry == ListEntry) ? @@ -289,6 +292,7 @@ SHORT Right, SHORT Bottom) { + List->FirstShown = List->ListHead.Flink; List->Left = Left; List->Top = Top; List->Right = Right; @@ -314,6 +318,11 @@ if (List->CurrentEntry->Entry.Flink != &List->ListHead) { Entry = List->CurrentEntry->Entry.Flink; + if (List->LastShown == &List->CurrentEntry->Entry) + { + List->FirstShown = List->FirstShown->Flink; + List->LastShown = List->LastShown->Flink; + } List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); DrawListEntries(List); } @@ -331,6 +340,11 @@ if (List->CurrentEntry->Entry.Blink != &List->ListHead) { Entry = List->CurrentEntry->Entry.Blink; + if (List->FirstShown == &List->CurrentEntry->Entry) + { + List->FirstShown = List->FirstShown->Blink; + List->LastShown = List->LastShown->Blink; + } List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); DrawListEntries(List); }

16 years, 4 months

[hpoussin] 33450: Better encapsulation of generic list

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun May 11 16:17:57 2008 New Revision: 33450 URL: http://svn.reactos.org/svn/reactos?rev=33450&view=rev Log: Better encapsulation of generic list Modified: trunk/reactos/base/setup/usetup/genlist.c trunk/reactos/base/setup/usetup/genlist.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Sun May 11 16:17:57 2008 @@ -33,6 +33,28 @@ /* FUNCTIONS ****************************************************************/ +typedef struct _GENERIC_LIST_ENTRY +{ + LIST_ENTRY Entry; + PGENERIC_LIST List; + PVOID UserData; + CHAR Text[1]; +} GENERIC_LIST_ENTRY; + + +typedef struct _GENERIC_LIST +{ + LIST_ENTRY ListHead; + + SHORT Left; + SHORT Top; + SHORT Right; + SHORT Bottom; + + PGENERIC_LIST_ENTRY CurrentEntry; + PGENERIC_LIST_ENTRY BackupEntry; +} GENERIC_LIST; + PGENERIC_LIST CreateGenericList(VOID) { @@ -98,6 +120,7 @@ return FALSE; strcpy (Entry->Text, Text); + Entry->List = List; Entry->UserData = UserData; InsertTailList(&List->ListHead, @@ -313,6 +336,59 @@ } } + +VOID +SetCurrentListEntry(PGENERIC_LIST List, PGENERIC_LIST_ENTRY Entry) +{ + if (Entry->List != List) + return; + List->CurrentEntry = Entry; +} + + +PGENERIC_LIST_ENTRY +GetCurrentListEntry(PGENERIC_LIST List) +{ + return List->CurrentEntry; +} + + +PGENERIC_LIST_ENTRY +GetFirstListEntry(PGENERIC_LIST List) +{ + PLIST_ENTRY Entry = List->ListHead.Flink; + + if (Entry == &List->ListHead) + return NULL; + return CONTAINING_RECORD(Entry, GENERIC_LIST_ENTRY, Entry); +} + + +PGENERIC_LIST_ENTRY +GetNextListEntry(PGENERIC_LIST_ENTRY Entry) +{ + PLIST_ENTRY Next = Entry->Entry.Flink; + + if (Next == &Entry->List->ListHead) + return NULL; + return CONTAINING_RECORD(Next, GENERIC_LIST_ENTRY, Entry); +} + + +PVOID +GetListEntryUserData(PGENERIC_LIST_ENTRY List) +{ + return List->UserData; +} + + +LPCSTR +GetListEntryText(PGENERIC_LIST_ENTRY List) +{ + return List->Text; +} + + VOID GenericListKeyPress (PGENERIC_LIST GenericList, CHAR AsciChar) { @@ -355,12 +431,6 @@ DrawListEntries(GenericList); } -PGENERIC_LIST_ENTRY -GetGenericListEntry(PGENERIC_LIST List) -{ - return List->CurrentEntry; -} - VOID SaveGenericListState(PGENERIC_LIST List) Modified: trunk/reactos/base/setup/usetup/genlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] Sun May 11 16:17:57 2008 @@ -27,28 +27,10 @@ #ifndef __GENLIST_H__ #define __GENLIST_H__ -typedef struct _GENERIC_LIST_ENTRY -{ - LIST_ENTRY Entry; - PVOID UserData; - CHAR Text[1]; -} GENERIC_LIST_ENTRY, *PGENERIC_LIST_ENTRY; - - -typedef struct _GENERIC_LIST -{ - LIST_ENTRY ListHead; - - SHORT Left; - SHORT Top; - SHORT Right; - SHORT Bottom; - - PGENERIC_LIST_ENTRY CurrentEntry; - PGENERIC_LIST_ENTRY BackupEntry; -} GENERIC_LIST, *PGENERIC_LIST; - - +struct _GENERIC_LIST_ENTRY; +typedef struct _GENERIC_LIST_ENTRY *PGENERIC_LIST_ENTRY; +struct _GENERIC_LIST; +typedef struct _GENERIC_LIST *PGENERIC_LIST; PGENERIC_LIST CreateGenericList(VOID); @@ -76,8 +58,23 @@ VOID ScrollUpGenericList(PGENERIC_LIST List); +VOID +SetCurrentListEntry(PGENERIC_LIST List, PGENERIC_LIST_ENTRY Entry); + PGENERIC_LIST_ENTRY -GetGenericListEntry(PGENERIC_LIST List); +GetCurrentListEntry(PGENERIC_LIST List); + +PGENERIC_LIST_ENTRY +GetFirstListEntry(PGENERIC_LIST List); + +PGENERIC_LIST_ENTRY +GetNextListEntry(PGENERIC_LIST_ENTRY Entry); + +PVOID +GetListEntryUserData(PGENERIC_LIST_ENTRY List); + +LPCSTR +GetListEntryText(PGENERIC_LIST_ENTRY List); VOID SaveGenericListState(PGENERIC_LIST List); Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun May 11 16:17:57 2008 @@ -563,7 +563,6 @@ VOID UpdateKBLayout(VOID) { - PLIST_ENTRY Entry; PGENERIC_LIST_ENTRY ListEntry; LPCWSTR pszNewLayout; @@ -574,22 +573,20 @@ LayoutList = CreateKeyboardLayoutList(SetupInf, DefaultKBLayout); } - Entry = LayoutList->ListHead.Flink; + ListEntry = GetFirstListEntry(LayoutList); /* Search for default layout (if provided) */ if (pszNewLayout != NULL) { - while (Entry != &LayoutList->ListHead) - { - ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); - - if (!wcscmp(pszNewLayout, ListEntry->UserData)) - { - LayoutList->CurrentEntry = ListEntry; + while (ListEntry != NULL) + { + if (!wcscmp(pszNewLayout, GetListEntryUserData(ListEntry))) + { + SetCurrentListEntry(LayoutList, ListEntry); break; } - Entry = Entry->Flink; + ListEntry = GetNextListEntry(ListEntry); } } } @@ -647,7 +644,7 @@ } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - SelectedLanguageId = (PWCHAR)LanguageList->CurrentEntry->UserData; + SelectedLanguageId = (PWCHAR)GetListEntryUserData(GetCurrentListEntry(LanguageList)); if (wcscmp(SelectedLanguageId, DefaultLanguage)) { @@ -1019,10 +1016,10 @@ MUIDisplayPage(DEVICE_SETTINGS_PAGE); - CONSOLE_SetTextXY(25, 11, GetGenericListEntry(ComputerList)->Text); - CONSOLE_SetTextXY(25, 12, GetGenericListEntry(DisplayList)->Text); - CONSOLE_SetTextXY(25, 13, GetGenericListEntry(KeyboardList)->Text); - CONSOLE_SetTextXY(25, 14, GetGenericListEntry(LayoutList)->Text); + CONSOLE_SetTextXY(25, 11, GetListEntryText(GetCurrentListEntry((ComputerList)))); + CONSOLE_SetTextXY(25, 12, GetListEntryText(GetCurrentListEntry((DisplayList)))); + CONSOLE_SetTextXY(25, 13, GetListEntryText(GetCurrentListEntry((KeyboardList)))); + CONSOLE_SetTextXY(25, 14, GetListEntryText(GetCurrentListEntry((LayoutList)))); CONSOLE_InvertTextXY(24, Line, 48, 1); Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Sun May 11 16:17:57 2008 @@ -485,15 +485,15 @@ DPRINT("ProcessComputerFiles() called\n"); - Entry = GetGenericListEntry(List); + Entry = GetCurrentListEntry(List); if (Entry == NULL) { - DPRINT("GetGenericListEntry() failed\n"); + DPRINT("GetCurrentListEntry() failed\n"); return FALSE; } wcscpy(SectionName, L"Files."); - wcscat(SectionName, (const wchar_t*) Entry->UserData); + wcscat(SectionName, (const wchar_t*)GetListEntryUserData(Entry)); *AdditionalSectionName = SectionName; return TRUE; @@ -514,14 +514,14 @@ DPRINT("ProcessDisplayRegistry() called\n"); - Entry = GetGenericListEntry(List); + Entry = GetCurrentListEntry(List); if (Entry == NULL) { - DPRINT("GetGenericListEntry() failed\n"); - return FALSE; - } - - if (!SetupFindFirstLineW(InfFile, L"Display", (WCHAR*) Entry->UserData, &Context)) + DPRINT("GetCurrentListEntry() failed\n"); + return FALSE; + } + + if (!SetupFindFirstLineW(InfFile, L"Display", (WCHAR*)GetListEntryUserData(Entry), &Context)) { DPRINT("SetupFindFirstLineW() failed\n"); return FALSE; @@ -629,11 +629,11 @@ HANDLE KeyHandle; NTSTATUS Status; - Entry = GetGenericListEntry(List); + Entry = GetCurrentListEntry(List); if (Entry == NULL) return FALSE; - LanguageId = (PWCHAR)Entry->UserData; + LanguageId = (PWCHAR)GetListEntryUserData(Entry); if (LanguageId == NULL) return FALSE; @@ -877,11 +877,11 @@ NTSTATUS Status; PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - Entry = GetGenericListEntry(List); + Entry = GetCurrentListEntry(List); if (Entry == NULL) return FALSE; - LanguageId = (PWCHAR)Entry->UserData; + LanguageId = (PWCHAR)GetListEntryUserData(Entry); if (LanguageId == NULL) return FALSE;

16 years, 4 months

← Newer
1
...
31
32
33
34
35
36
37
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008