Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 33463: - Fix a typo, spotted by Stefan Ginsberg.
by fireball＠svn.reactos.org 12 May '08

12 May '08

Author: fireball Date: Mon May 12 03:11:31 2008 New Revision: 33463 URL: http://svn.reactos.org/svn/reactos?rev=33463&view=rev Log: - Fix a typo, spotted by Stefan Ginsberg. Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Mon May 12 03:11:31 2008 @@ -273,7 +273,7 @@ SystemWatchDogTimerHandler, SystemWatchDogTimerInformation, SystemLogicalProcessorInformation, - SystemWo64SharedInformationObosolete, + SystemWow64SharedInformationObosolete, SystemRegisterFirmwareTableInformationHandler, SystemFirmwareTableInformation, SystemModuleInformationEx,

1 0

[fireball] 33462: - A partial branch (only "reactos" module in it) for NoCc testing/development.
by fireball＠svn.reactos.org 12 May '08

12 May '08

Author: fireball Date: Mon May 12 02:31:32 2008 New Revision: 33462 URL: http://svn.reactos.org/svn/reactos?rev=33462&view=rev Log: - A partial branch (only "reactos" module in it) for NoCc testing/development. Added: branches/nocc/ - copied from r33461, trunk/reactos/

1 0

[jimtabor] 33461: Fixed ExtCreatePen and started CreatePen. Tested with wine gdi32 cross test. Isolated problem in win32k.
by jimtabor＠svn.reactos.org 12 May '08

12 May '08

Author: jimtabor Date: Mon May 12 02:31:15 2008 New Revision: 33461 URL: http://svn.reactos.org/svn/reactos?rev=33461&view=rev Log: Fixed ExtCreatePen and started CreatePen. Tested with wine gdi32 cross test. Isolated problem in win32k. Modified: trunk/reactos/dll/win32/gdi32/objects/brush.c trunk/reactos/dll/win32/gdi32/objects/pen.c Modified: trunk/reactos/dll/win32/gdi32/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/br… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/brush.c [iso-8859-1] Mon May 12 02:31:15 2008 @@ -16,18 +16,83 @@ DWORD dwStyleCount, CONST DWORD *lpStyle) { - /* Call NTGDI (hack... like most of gdi32..sigh) */ - return NtGdiExtCreatePen(dwPenStyle, - dwWidth, - lplb->lbStyle, - lplb->lbColor, - lplb->lbHatch, - 0, - dwStyleCount, - (PULONG)lpStyle, - 0, - FALSE, - NULL); + PVOID lpPackedDIB = NULL; + HPEN hPen = NULL; + PBITMAPINFO pConvertedInfo = NULL; + UINT ConvertedInfoSize = 0, lbStyle; + BOOL Hit = FALSE; + + if ((dwPenStyle & PS_STYLE_MASK) == PS_USERSTYLE) + { + if(!lpStyle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + } + else + { + if (dwStyleCount || lpStyle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + } + + lbStyle = lplb->lbStyle; + + if (lplb->lbStyle > BS_HATCHED) + { + if (lplb->lbStyle == BS_PATTERN) + { + pConvertedInfo = (PBITMAPINFO)lplb->lbHatch; + if (!pConvertedInfo) return 0; + } + else + { + if ((lplb->lbStyle == BS_DIBPATTERN) || (lplb->lbStyle == BS_DIBPATTERNPT)) + { + if (lplb->lbStyle == BS_DIBPATTERN) + { + lbStyle = BS_DIBPATTERNPT; + lpPackedDIB = GlobalLock((HGLOBAL)lplb->lbHatch); + if (lpPackedDIB == NULL) return 0; + } + pConvertedInfo = ConvertBitmapInfo((PBITMAPINFO)lpPackedDIB, + lplb->lbColor, + &ConvertedInfoSize, + TRUE); + Hit = TRUE; // We converted DIB. + } + else + pConvertedInfo = (PBITMAPINFO)lpStyle; + } + } + else + pConvertedInfo = (PBITMAPINFO)lplb->lbHatch; + + + hPen = NtGdiExtCreatePen(dwPenStyle, + dwWidth, + lbStyle, + lplb->lbColor, + lplb->lbHatch, + (ULONG_PTR)pConvertedInfo, + dwStyleCount, + (PULONG)lpStyle, + ConvertedInfoSize, + FALSE, + NULL); + + + if (lplb->lbStyle == BS_DIBPATTERN) GlobalUnlock((HGLOBAL)lplb->lbHatch); + + if (Hit) + { + if ((PBITMAPINFO)lpPackedDIB != pConvertedInfo) + RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo); + } + return hPen; } /* Modified: trunk/reactos/dll/win32/gdi32/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pe… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/pen.c [iso-8859-1] Mon May 12 02:31:15 2008 @@ -24,6 +24,11 @@ COLORREF crColor) { /* FIXME Some part need be done in user mode */ + if (nPenStyle > PS_DASHDOTDOT) + { + if (nPenStyle == PS_NULL) return GetStockObject(NULL_PEN); + if (nPenStyle != PS_INSIDEFRAME) nPenStyle = PS_SOLID; + } return NtGdiCreatePen(nPenStyle, nWidth, crColor, NULL); }

1 0

[jimtabor] 33460: Fixed wine all of gdi32 dc tests and only 2 of gdiobj tests left todo.
by jimtabor＠svn.reactos.org 12 May '08

12 May '08

Author: jimtabor Date: Sun May 11 23:59:20 2008 New Revision: 33460 URL: http://svn.reactos.org/svn/reactos?rev=33460&view=rev Log: Fixed wine all of gdi32 dc tests and only 2 of gdiobj tests left todo. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/dc.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Sun May 11 23:59:20 2008 @@ -1657,74 +1657,46 @@ */ DEVMODEW * STDCALL -GdiConvertToDevmodeW(DEVMODEA *dm) -{ - LPDEVMODEW dmw; - - dmw = HEAP_alloc(sizeof(DEVMODEW)); - #define COPYS(f,len) MultiByteToWideChar ( CP_THREAD_ACP, 0, (LPSTR)dm->f, len, dmw->f, len ) - #define COPYN(f) dmw->f = dm->f - COPYS(dmDeviceName, CCHDEVICENAME ); - COPYN(dmSpecVersion); - COPYN(dmDriverVersion); - switch ( dm->dmSize ) +GdiConvertToDevmodeW(DEVMODEA *dmA) +{ + DEVMODEW *dmW; + WORD dmW_size, dmA_size; + + dmA_size = dmA->dmSize; + + /* this is the minimal dmSize that XP accepts */ + if (dmA_size < FIELD_OFFSET(DEVMODEA, dmFields)) + return NULL; + + if (dmA_size > sizeof(DEVMODEA)) + dmA_size = sizeof(DEVMODEA); + + dmW_size = dmA_size + CCHDEVICENAME; + if (dmA_size >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) + dmW_size += CCHFORMNAME; + + dmW = HeapAlloc(GetProcessHeap(), 0, dmW_size + dmA->dmDriverExtra); + if (!dmW) return NULL; + + MultiByteToWideChar(CP_ACP, 0, (const char*) dmA->dmDeviceName, CCHDEVICENAME, + dmW->dmDeviceName, CCHDEVICENAME); + /* copy slightly more, to avoid long computations */ + memcpy(&dmW->dmSpecVersion, &dmA->dmSpecVersion, dmA_size - CCHDEVICENAME); + + if (dmA_size >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) { - case SIZEOF_DEVMODEA_300: - dmw->dmSize = SIZEOF_DEVMODEW_300; - break; - case SIZEOF_DEVMODEA_400: - dmw->dmSize = SIZEOF_DEVMODEW_400; - break; - case SIZEOF_DEVMODEA_500: - default: /* FIXME what to do??? */ - dmw->dmSize = SIZEOF_DEVMODEW_500; - break; + MultiByteToWideChar(CP_ACP, 0, (const char*) dmA->dmFormName, CCHFORMNAME, + dmW->dmFormName, CCHFORMNAME); + if (dmA_size > FIELD_OFFSET(DEVMODEA, dmLogPixels)) + memcpy(&dmW->dmLogPixels, &dmA->dmLogPixels, dmA_size - FIELD_OFFSET(DEVMODEA, dmLogPixels)); } - 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 ( dm->dmSize <= SIZEOF_DEVMODEA_300 ) - { - return dmw; // we're done with 0x300 fields - } - - COPYN(dmICMMethod); - COPYN(dmICMIntent); - COPYN(dmMediaType); - COPYN(dmDitherType); - COPYN(dmReserved1); - COPYN(dmReserved2); - - if ( dm->dmSize <= SIZEOF_DEVMODEA_400 ) - { - return dmw; // we're done with 0x400 fields - } - - COPYN(dmPanningWidth); - COPYN(dmPanningHeight); - - return dmw; - - #undef COPYN - #undef COPYS + + if (dmA->dmDriverExtra) + memcpy((char *)dmW + dmW_size, (const char *)dmA + dmA_size, dmA->dmDriverExtra); + + dmW->dmSize = dmW_size; + + return dmW; } /* Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Sun May 11 23:59:20 2008 @@ -386,6 +386,8 @@ { HGDIOBJ hGO = NULL; PDC_ATTR Dc_Attr; + + if (!hDC) return hGO; if (!GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return NULL;

1 0

[jimtabor] 33459: Fix typo spoted by Stefan100.
by jimtabor＠svn.reactos.org 12 May '08

12 May '08

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;

1 0

[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 11 May '08

11 May '08

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>

1 0

[tkreuzer] 33457: fix a header name
by tkreuzer＠svn.reactos.org 11 May '08

11 May '08

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

1 0

[tkreuzer] 33456: patch by hyperion: convert pointer calculations with FIELD_OFFSET macro
by tkreuzer＠svn.reactos.org 11 May '08

11 May '08

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…

1 0

[tkreuzer] 33455: use "%p" to DPRINT a pointer instead of casting it to int and using "%08x"
by tkreuzer＠svn.reactos.org 11 May '08

11 May '08

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];

1 0

[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 11 May '08

11 May '08

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;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs