Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 42349: - Wooops, fix dxg and dxapi build after 42346.
by sginsberg＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: sginsberg Date: Sun Aug 2 23:04:13 2009 New Revision: 42349 URL: http://svn.reactos.org/svn/reactos?rev=42349&view=rev Log: - Wooops, fix dxg and dxapi build after 42346. Modified: trunk/reactos/drivers/directx/dxapi/dxapi_driver.h trunk/reactos/drivers/directx/dxg/dxg_int.h Modified: trunk/reactos/drivers/directx/dxapi/dxapi_driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxapi/dxap… ============================================================================== --- trunk/reactos/drivers/directx/dxapi/dxapi_driver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxapi/dxapi_driver.h [iso-8859-1] Sun Aug 2 23:04:13 2009 @@ -10,6 +10,7 @@ #include <windef.h> #include <winerror.h> #include <wingdi.h> +#define NT_BUILD_ENVIRONMENT #include <winddi.h> #include <prntfont.h> #include <dde.h> Modified: trunk/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg_in… ============================================================================== --- trunk/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] Sun Aug 2 23:04:13 2009 @@ -11,6 +11,7 @@ #define STARTF_USESIZE 2 #define STARTF_USEPOSITION 4 #define INTERNAL_CALL NTAPI +#define NT_BUILD_ENVIRONMENT #include <stdarg.h> #include <windef.h>

1 0

[fireball] 42348: - Create stock bitmap in win32k and use it whenever a stock bitmap is selected into the DC. - Bring in GDIOBJ_ConvertToStockObj from trunk. - Fixes arwinss issue nr. 7.
by fireball＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: fireball Date: Sun Aug 2 22:53:12 2009 New Revision: 42348 URL: http://svn.reactos.org/svn/reactos?rev=42348&view=rev Log: - Create stock bitmap in win32k and use it whenever a stock bitmap is selected into the DC. - Bring in GDIOBJ_ConvertToStockObj from trunk. - Fixes arwinss issue nr. 7. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/include/psdk/ntrosgdi.h branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h branches/arwinss/reactos/subsystems/win32/win32k/main/init.c branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Sun Aug 2 22:53:12 2009 @@ -19,6 +19,9 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(rosgdidrv); + +/* GLOBALS ****************************************************************/ +HANDLE hStockBitmap; /* FUNCTIONS **************************************************************/ @@ -123,6 +126,10 @@ hKernelDC = (*pdev)->hKernelDC; else hKernelDC = 0; + + /* Save stock bitmap's handle */ + if (dcInfo.dwType == OBJ_MEMDC && !hStockBitmap) + hStockBitmap = GetCurrentObject( hdc, OBJ_BITMAP ); /* Call the win32 kernel */ bRet = RosGdiCreateDC(&dcInfo, &hKernelDC, driver, device, output, initData); @@ -453,8 +460,18 @@ HBITMAP CDECL RosDrv_SelectBitmap( NTDRV_PDEVICE *physDev, HBITMAP hbitmap ) { - RosGdiSelectBitmap(physDev->hKernelDC, hbitmap); - + BOOL bRes, bStock = FALSE; + + /* Check if it's a stock bitmap */ + if (hbitmap == hStockBitmap) bStock = TRUE; + + /* Select the bitmap into the DC */ + bRes = RosGdiSelectBitmap(physDev->hKernelDC, hbitmap, bStock); + + /* If there was an error, return 0 */ + if (!bRes) return 0; + + /* Return handle of selected bitmap as a success*/ return hbitmap; } Modified: branches/arwinss/reactos/include/psdk/ntrosgdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/nt… ============================================================================== --- branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] Sun Aug 2 22:53:12 2009 @@ -101,7 +101,7 @@ BOOL APIENTRY RosGdiDeleteDC( HDC physDev ); BOOL APIENTRY RosGdiGetDCOrgEx( HDC physDev, LPPOINT lpp ); BOOL APIENTRY RosGdiPaintRgn( HDC physDev, HRGN hrgn ); -VOID APIENTRY RosGdiSelectBitmap( HDC physDev, HBITMAP hbitmap ); +BOOL APIENTRY RosGdiSelectBitmap( HDC physDev, HBITMAP hbitmap, BOOL stock ); VOID APIENTRY RosGdiSelectBrush( HDC physDev, LOGBRUSH *pLogBrush ); HFONT APIENTRY RosGdiSelectFont( HDC physDev, HFONT hfont, HANDLE gdiFont ); VOID APIENTRY RosGdiSelectPen( HDC physDev, LOGPEN *pLogPen, EXTLOGPEN *pExtLogPen ); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c [iso-8859-1] Sun Aug 2 22:53:12 2009 @@ -11,6 +11,9 @@ #include <win32k.h> #define NDEBUG #include <debug.h> + +/* GLOBALS *******************************************************************/ +HGDIOBJ hStockBmp; /* PUBLIC FUNCTIONS **********************************************************/ @@ -293,5 +296,17 @@ return bRet; } +VOID +CreateStockBitmap() +{ + SIZE slSize; + + /* Create 1x1 bitmap */ + slSize.cx = 1; slSize.cy = 1; + hStockBmp = GreCreateBitmap(slSize, 1, 1, 0, NULL); + + /* Convert it to a stock object */ + GDIOBJ_ConvertToStockObj(&hStockBmp); +} /* EOF */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Sun Aug 2 22:53:12 2009 @@ -185,21 +185,26 @@ return FALSE; } -VOID APIENTRY RosGdiSelectBitmap( HDC physDev, HBITMAP hbitmap ) +BOOL APIENTRY RosGdiSelectBitmap( HDC physDev, HBITMAP hbitmap, BOOL bStock ) { PDC pDC; PSURFACE pSurface; HGDIOBJ hBmpKern; - SIZEL slSize; - - hBmpKern = GDI_MapUserHandle(hbitmap); - if (!hBmpKern) - { - DPRINT1("Trying to select an unknown bitmap %x to the DC %x!\n", hbitmap, physDev); - - /* It probably is a stock bitmap, so select it */ - slSize.cx = 1; slSize.cy = 1; - hBmpKern = GreCreateBitmap(slSize, 1, 1, 0, NULL); + + if (bStock) + { + /* Selecting stock bitmap */ + hBmpKern = hStockBmp; + } + else + { + /* Selecting usual bitmap */ + hBmpKern = GDI_MapUserHandle(hbitmap); + if (!hBmpKern) + { + DPRINT1("Trying to select an unknown bitmap %x to the DC %x!\n", hbitmap, physDev); + return FALSE; + } } DPRINT("Selecting %x bitmap to hdc %x\n", hBmpKern, physDev); @@ -220,6 +225,8 @@ /* Release the DC object */ DC_Unlock(pDC); + + return TRUE; } VOID APIENTRY RosGdiSelectBrush( HDC physDev, LOGBRUSH *pLogBrush ) Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c [iso-8859-1] Sun Aug 2 22:53:12 2009 @@ -1050,6 +1050,139 @@ } BOOL APIENTRY +GDIOBJ_ConvertToStockObj(HGDIOBJ *phObj) +{ + /* + * FIXME !!!!! THIS FUNCTION NEEDS TO BE FIXED - IT IS NOT SAFE WHEN OTHER THREADS + * MIGHT ATTEMPT TO LOCK THE OBJECT DURING THIS CALL!!! + */ + PGDI_TABLE_ENTRY Entry; + HANDLE ProcessId, LockedProcessId, PrevProcId; + PTHREADINFO Thread; + HGDIOBJ hObj; + + GDIDBG_INITLOOPTRACE(); + + ASSERT(phObj); + hObj = *phObj; + + DPRINT("GDIOBJ_ConvertToStockObj: hObj: 0x%08x\n", hObj); + + Thread = PsGetCurrentThreadWin32Thread(); + + if (!GDI_HANDLE_IS_STOCKOBJ(hObj)) + { + ProcessId = PsGetCurrentProcessId(); + LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); + + Entry = GDI_HANDLE_GET_ENTRY(GdiHandleTable, hObj); + +LockHandle: + /* lock the object, we must not convert stock objects, so don't check!!! */ + PrevProcId = InterlockedCompareExchangePointer((PVOID*)&Entry->ProcessId, LockedProcessId, ProcessId); + if (PrevProcId == ProcessId) + { + LONG NewType, PrevType, OldType; + + /* we're locking an object that belongs to our process. First calculate + the new object type including the stock object flag and then try to + exchange it.*/ + /* On Windows the higher 16 bit of the type field don't contain the + full type from the handle, but the base type. + (type = BRSUH, PEN, EXTPEN, basetype = BRUSH) */ + OldType = ((ULONG)hObj & GDI_HANDLE_BASETYPE_MASK) | ((ULONG)hObj >> GDI_ENTRY_UPPER_SHIFT); + /* We are currently not using bits 24..31 (flags) of the type field, but for compatibility + we copy them as we can't get them from the handle */ + OldType |= Entry->Type & GDI_ENTRY_FLAGS_MASK; + + /* As the object should be a stock object, set it's flag, but only in the lower 16 bits */ + NewType = OldType | GDI_ENTRY_STOCK_MASK; + + /* Try to exchange the type field - but only if the old (previous type) matches! */ + PrevType = InterlockedCompareExchange(&Entry->Type, NewType, OldType); + if (PrevType == OldType && Entry->KernelData != NULL) + { + PTHREADINFO PrevThread; + PBASEOBJECT Object; + + /* We successfully set the stock object flag. + KernelData should never be NULL here!!! */ + ASSERT(Entry->KernelData); + + Object = Entry->KernelData; + + PrevThread = Object->Tid; + if (Object->cExclusiveLock == 0 || PrevThread == Thread) + { + /* dereference the process' object counter */ + if (PrevProcId != GDI_GLOBAL_PROCESS) + { + PEPROCESS OldProcess; + PPROCESSINFO W32Process; + NTSTATUS Status; + + /* FIXME */ + Status = PsLookupProcessByProcessId((HANDLE)((ULONG_PTR)PrevProcId & ~0x1), &OldProcess); + if (NT_SUCCESS(Status)) + { + W32Process = (PPROCESSINFO)OldProcess->Win32Process; + if (W32Process != NULL) + { + InterlockedDecrement(&W32Process->GDIHandleCount); + } + ObDereferenceObject(OldProcess); + } + } + + hObj = (HGDIOBJ)((ULONG)(hObj) | GDI_HANDLE_STOCK_MASK); + *phObj = hObj; + Object->hHmgr = hObj; + + /* remove the process id lock and make it global */ + (void)InterlockedExchangePointer((PVOID*)&Entry->ProcessId, GDI_GLOBAL_PROCESS); + + /* we're done, successfully converted the object */ + return TRUE; + } + else + { + GDIDBG_TRACELOOP(hObj, PrevThread, Thread); + + /* WTF?! The object is already locked by a different thread! + Release the lock, wait a bit and try again! + FIXME - we should give up after some time unless we want to wait forever! */ + (void)InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId); + + DelayExecution(); + goto LockHandle; + } + } + else + { + DPRINT1("Attempted to convert object 0x%x that is deleted! Should never get here!!!\n", hObj); + DPRINT1("OldType = 0x%x, Entry->Type = 0x%x, NewType = 0x%x, Entry->KernelData = 0x%x\n", OldType, Entry->Type, NewType, Entry->KernelData); + } + } + else if (PrevProcId == LockedProcessId) + { + GDIDBG_TRACELOOP(hObj, PrevProcId, ProcessId); + + /* the object is currently locked, wait some time and try again. + FIXME - we shouldn't loop forever! Give up after some time! */ + DelayExecution(); + /* try again */ + goto LockHandle; + } + else + { + DPRINT1("Attempted to convert invalid handle: 0x%x\n", hObj); + } + } + + return FALSE; +} + +BOOL APIENTRY GDIOBJ_SetOwnership(HGDIOBJ ObjectHandle, PEPROCESS NewOwner) { PGDI_TABLE_ENTRY Entry; Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] Sun Aug 2 22:53:12 2009 @@ -62,6 +62,10 @@ INT FASTCALL BitsPerFormat(ULONG Format); +/* bitmap.c */ +extern HGDIOBJ hStockBmp; +VOID CreateStockBitmap(); + /* font.c */ VOID NTAPI GreTextOut(PDC pDC, INT x, INT y, UINT flags, Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Sun Aug 2 22:53:12 2009 @@ -345,6 +345,9 @@ /* Initialize handle-mapping */ GDI_InitHandleMapping(); + /* Create stock objects */ + CreateStockBitmap(); + /* Init video driver implementation */ InitDcImpl(); Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sun Aug 2 22:53:12 2009 @@ -17,7 +17,7 @@ RosGdiDeleteDC 1 RosGdiGetDCOrgEx 2 RosGdiPaintRgn 2 -RosGdiSelectBitmap 2 +RosGdiSelectBitmap 3 RosGdiSelectBrush 2 RosGdiSelectFont 3 RosGdiSelectPen 3

1 0

[fireball] 42347: - Remove _NTDRIVER_ define, in arwinss freetype is built as a usual usermode dll.
by fireball＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: fireball Date: Sun Aug 2 22:51:16 2009 New Revision: 42347 URL: http://svn.reactos.org/svn/reactos?rev=42347&view=rev Log: - Remove _NTDRIVER_ define, in arwinss freetype is built as a usual usermode dll. Modified: branches/arwinss/reactos/dll/3rdparty/freetype/freetype.rbuild Modified: branches/arwinss/reactos/dll/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/3rdparty/fr… ============================================================================== --- branches/arwinss/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] Sun Aug 2 22:51:16 2009 @@ -4,7 +4,6 @@ <importlibrary definition="freetype.def" /> <include base="freetype">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__NTDRIVER__" /> <define name="__NO_CTYPE_INLINES" /> <define name="FT2_BUILD_LIBRARY" /> <if property="NSWPAT" value="0">

1 0

[sginsberg] 42346: - probe.h: "NTOSKRNL unfortunately doesn't export RtlRaiseStatus!" -- no, but it does export ExRaiseStatus, so use it instead from win32k instead of "W32kRaiseStatus". Also use ExRaiseAccessViolation instead of RtlRaiseStatus(STATUS_ACCESS_VIOLATION) to save some space. - ddraw.h: Don't check if WINNT is defined, our winnt.h defines _WINNT_H. Also fix the way CO_E_NOTINITIALIZED is defined. - Define NT_BUILD_ENVIRONMENT in win32k so the define in ddraw.h doesn't conflict with
by sginsberg＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: sginsberg Date: Sun Aug 2 22:35:19 2009 New Revision: 42346 URL: http://svn.reactos.org/svn/reactos?rev=42346&view=rev Log: - probe.h: "NTOSKRNL unfortunately doesn't export RtlRaiseStatus!" -- no, but it does export ExRaiseStatus, so use it instead from win32k instead of "W32kRaiseStatus". Also use ExRaiseAccessViolation instead of RtlRaiseStatus(STATUS_ACCESS_VIOLATION) to save some space. - ddraw.h: Don't check if WINNT is defined, our winnt.h defines _WINNT_H. Also fix the way CO_E_NOTINITIALIZED is defined. - Define NT_BUILD_ENVIRONMENT in win32k so the define in ddraw.h doesn't conflict with winerror.h. Not sure if this is correct, but our headers are a mess. - Add a hack to disable C4276 (caused by napi.h) until a more proper fix is devised. - Win32K now fully compiles in MSVC. Modified: trunk/reactos/include/dxsdk/ddraw.h trunk/reactos/include/reactos/probe.h trunk/reactos/subsystems/win32/win32k/misc/err.c trunk/reactos/subsystems/win32/win32k/pch.h trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/include/dxsdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddraw.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/ddraw.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/ddraw.h [iso-8859-1] Sun Aug 2 22:35:19 2009 @@ -8,8 +8,8 @@ #include <objbase.h> #else #define IUnknown void -#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) - #define CO_E_NOTINITIALIZED 0x800401F0 +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(_WINNT_H) + #define CO_E_NOTINITIALIZED 0x800401F0L #endif #endif Modified: trunk/reactos/include/reactos/probe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/probe.h?re… ============================================================================== --- trunk/reactos/include/reactos/probe.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/probe.h [iso-8859-1] Sun Aug 2 22:35:19 2009 @@ -12,14 +12,6 @@ #if defined(_WIN32K_) static const LARGE_STRING __emptyLargeString = {0, 0, 0, NULL}; -#endif - -#if defined(_WIN32K_) -/* - * NOTE: NTOSKRNL unfortunately doesn't export RtlRaiseStatus! - */ -VOID NTAPI W32kRaiseStatus(NTSTATUS Status); -#define RtlRaiseStatus W32kRaiseStatus #endif /* @@ -29,7 +21,7 @@ do { \ if ((ULONG_PTR)(Ptr) + sizeof(Type) - 1 < (ULONG_PTR)(Ptr) || \ (ULONG_PTR)(Ptr) + sizeof(Type) - 1 >= (ULONG_PTR)MmUserProbeAddress) { \ - RtlRaiseStatus (STATUS_ACCESS_VIOLATION); \ + ExRaiseAccessViolation(); \ } \ *(volatile Type *)(Ptr) = *(volatile Type *)(Ptr); \ } while (0) @@ -60,7 +52,7 @@ #define ProbeForReadGenericType(Ptr, Type, Default) \ (((ULONG_PTR)(Ptr) + sizeof(Type) - 1 < (ULONG_PTR)(Ptr) || \ (ULONG_PTR)(Ptr) + sizeof(Type) - 1 >= (ULONG_PTR)MmUserProbeAddress) ? \ - ExRaiseStatus (STATUS_ACCESS_VIOLATION), Default : \ + ExRaiseAccessViolation(), Default : \ *(const volatile Type *)(Ptr)) #define ProbeForReadBoolean(Ptr) ProbeForReadGenericType(Ptr, BOOLEAN, FALSE) @@ -90,7 +82,7 @@ do { \ if ((ULONG_PTR)(Ptr) + sizeof(HANDLE) - 1 < (ULONG_PTR)(Ptr) || \ (ULONG_PTR)(Ptr) + sizeof(HANDLE) - 1 >= (ULONG_PTR)MmUserProbeAddress) { \ - RtlRaiseStatus (STATUS_ACCESS_VIOLATION); \ + ExRaiseAccessViolation(); \ } \ *(volatile HANDLE *)(Ptr) = NULL; \ } while (0) @@ -113,7 +105,7 @@ ArraySize = ItemSize * ItemCount; if (ArraySize / ItemSize != ItemCount) { - RtlRaiseStatus (STATUS_INVALID_PARAMETER); + ExRaiseStatus(STATUS_INVALID_PARAMETER); } /* Probe the array */ @@ -135,7 +127,7 @@ ArraySize = ItemSize * ItemCount; if (ArraySize / ItemSize != ItemCount) { - RtlRaiseStatus (STATUS_INVALID_PARAMETER); + ExRaiseStatus(STATUS_INVALID_PARAMETER); } /* Probe the array */ Modified: trunk/reactos/subsystems/win32/win32k/misc/err.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/err.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/err.c [iso-8859-1] Sun Aug 2 22:35:19 2009 @@ -61,22 +61,4 @@ return 0; } -VOID -APIENTRY -W32kRaiseStatus(NTSTATUS Status) -{ - EXCEPTION_RECORD ExceptionRecord; - - /* Create an exception record */ - ExceptionRecord.ExceptionCode = Status; - ExceptionRecord.ExceptionRecord = NULL; - ExceptionRecord.NumberParameters = 0; - ExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - - RtlRaiseException(&ExceptionRecord); - - /* If we returned, raise a status */ - W32kRaiseStatus(Status); -} - /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] Sun Aug 2 22:35:19 2009 @@ -36,6 +36,7 @@ #include <winerror.h> #include <wingdi.h> +#define NT_BUILD_ENVIRONMENT #include <winddi.h> #include <winuser.h> #include <prntfont.h> 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 Aug 2 22:35:19 2009 @@ -10,6 +10,7 @@ <include base="ReactOS">include/reactos/subsys</include> <include base="ReactOS">include/reactos/drivers</include> <compilerflag compilerset="gcc">-fms-extensions</compilerflag> + <compilerflag compilerset="msc">/wd4276</compilerflag> <define name="LANGPACK" /> <define name="_WIN32K_" /> <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269

1 0

[jmorlan] 42345: ReadFile: When reading from a console handle with processed input mode enabled, simulate EOF if the first character read is ^Z (Bug 4745)
by jmorlan＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: jmorlan Date: Sun Aug 2 20:56:05 2009 New Revision: 42345 URL: http://svn.reactos.org/svn/reactos?rev=42345&view=rev Log: ReadFile: When reading from a console handle with processed input mode enabled, simulate EOF if the first character read is ^Z (Bug 4745) Modified: trunk/reactos/dll/win32/kernel32/file/rw.c Modified: trunk/reactos/dll/win32/kernel32/file/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/rw… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/rw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/rw.c [iso-8859-1] Sun Aug 2 20:56:05 2009 @@ -148,11 +148,22 @@ if (IsConsoleHandle(hFile)) { - return ReadConsoleA(hFile, + if (ReadConsoleA(hFile, lpBuffer, nNumberOfBytesToRead, lpNumberOfBytesRead, - NULL); + NULL)) + { + DWORD dwMode; + GetConsoleMode(hFile, &dwMode); + if ((dwMode & ENABLE_PROCESSED_INPUT) && *(char *)lpBuffer == 0x1a) + { + /* EOF character entered; simulate end-of-file */ + *lpNumberOfBytesRead = 0; + } + return TRUE; + } + return FALSE; } if (lpOverlapped != NULL)

1 0

[janderwald] 42344: [PORTCLS] - Fix lots of COM object leaks - IPortWaveCyclic & IPortTopology drivers now shutdown cleanly - Implement freeing of all registered physical connections and release of the registered power management interface [SYSAUDIO] - Close handles to audio filters
by janderwald＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: janderwald Date: Sun Aug 2 20:20:39 2009 New Revision: 42344 URL: http://svn.reactos.org/svn/reactos?rev=42344&view=rev Log: [PORTCLS] - Fix lots of COM object leaks - IPortWaveCyclic & IPortTopology drivers now shutdown cleanly - Implement freeing of all registered physical connections and release of the registered power management interface [SYSAUDIO] - Close handles to audio filters Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c trunk/reactos/drivers/wdm/audio/sysaudio/main.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c [iso-8859-1] Sun Aug 2 20:20:39 2009 @@ -16,6 +16,7 @@ IPortTopology* Port; SUBDEVICE_DESCRIPTOR * Descriptor; + ISubdevice *SubDevice; }IPortFilterTopologyImpl; @@ -112,24 +113,12 @@ IN PIRP Irp) { PIO_STACK_LOCATION IoStack; - ISubdevice *SubDevice = NULL; - SUBDEVICE_DESCRIPTOR * Descriptor; - NTSTATUS Status; IPortFilterTopologyImpl * This = (IPortFilterTopologyImpl *)iface; IoStack = IoGetCurrentIrpStackLocation(Irp); ASSERT(IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY); - Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&SubDevice); - ASSERT(Status == STATUS_SUCCESS); - ASSERT(SubDevice != NULL); - - Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &Descriptor); - ASSERT(Status == STATUS_SUCCESS); - ASSERT(Descriptor != NULL); - - SubDevice->lpVtbl->Release(SubDevice); - - return PcPropertyHandler(Irp, Descriptor); + + return PcPropertyHandler(Irp, This->Descriptor); } /* @@ -181,18 +170,21 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - //PMINIPORTTOPOLOGY Miniport; - //IPortFilterTopologyImpl * This = (IPortFilterTopologyImpl *)iface; - - /* release reference to port */ - //This->Port->lpVtbl->Release(This->Port); - - /* get the miniport driver */ - //Miniport = GetTopologyMiniport(This->Port); - /* release miniport driver */ - //Miniport->lpVtbl->Release(Miniport); - - Irp->IoStatus.Status = STATUS_SUCCESS; + NTSTATUS Status = STATUS_SUCCESS; + IPortFilterTopologyImpl * This = (IPortFilterTopologyImpl *)iface; + + /* FIXME handle DirectSound */ + + if (This->ref == 1) + { + /* release reference to port */ + This->SubDevice->lpVtbl->Release(This->SubDevice); + + /* time to shutdown the audio system */ + Status = This->SubDevice->lpVtbl->ReleaseChildren(This->SubDevice); + } + + Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -244,9 +236,6 @@ { ULONG Index; PKSPROPERTY Property; - NTSTATUS Status; - ISubdevice * SubDevice = NULL; - PSUBDEVICE_DESCRIPTOR Descriptor = NULL; IPortFilterTopologyImpl * This = (IPortFilterTopologyImpl*)iface; Property = (PKSPROPERTY)InputBuffer; @@ -254,28 +243,14 @@ if (InputBufferLength < sizeof(KSPROPERTY)) return FALSE; - - /* get private interface */ - Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&SubDevice); - if (!NT_SUCCESS(Status)) - return FALSE; - - /* get descriptor */ - Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &Descriptor); - if (!NT_SUCCESS(Status)) - { - SubDevice->lpVtbl->Release(SubDevice); - return FALSE; - } - - for(Index = 0; Index < Descriptor->FilterPropertySet.FreeKsPropertySetOffset; Index++) - { - if (IsEqualGUIDAligned(&Property->Set, Descriptor->FilterPropertySet.Properties[Index].Set)) + for(Index = 0; Index < This->Descriptor->FilterPropertySet.FreeKsPropertySetOffset; Index++) + { + if (IsEqualGUIDAligned(&Property->Set, This->Descriptor->FilterPropertySet.Properties[Index].Set)) { FastPropertyHandler(FileObject, (PKSPROPERTY)InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, StatusBlock, 1, - &Descriptor->FilterPropertySet.Properties[Index], - Descriptor, SubDevice); + &This->Descriptor->FilterPropertySet.Properties[Index], + This->Descriptor, This->SubDevice); } } return TRUE; @@ -342,17 +317,14 @@ /* get the subdevice descriptor */ Status = ISubDevice->lpVtbl->GetDescriptor(ISubDevice, &Descriptor); - /* release subdevice interface */ - ISubDevice->lpVtbl->Release(ISubDevice); + /* store subdevice interface */ + This->SubDevice = ISubDevice; if (!NT_SUCCESS(Status)) return STATUS_UNSUCCESSFUL; /* save descriptor */ This->Descriptor = Descriptor; - - /* increment reference count */ - Port->lpVtbl->AddRef(Port); /* store port object */ This->Port = Port; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Sun Aug 2 20:20:39 2009 @@ -17,6 +17,7 @@ IPortWaveCyclic* Port; IPortPinWaveCyclic ** Pins; SUBDEVICE_DESCRIPTOR * Descriptor; + ISubdevice * SubDevice; }IPortFilterWaveCyclicImpl; @@ -161,24 +162,12 @@ IN PIRP Irp) { PIO_STACK_LOCATION IoStack; - ISubdevice *SubDevice = NULL; - SUBDEVICE_DESCRIPTOR * Descriptor; - NTSTATUS Status; IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; IoStack = IoGetCurrentIrpStackLocation(Irp); ASSERT(IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY); - Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&SubDevice); - ASSERT(Status == STATUS_SUCCESS); - ASSERT(SubDevice != NULL); - - Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &Descriptor); - ASSERT(Status == STATUS_SUCCESS); - ASSERT(Descriptor != NULL); - - SubDevice->lpVtbl->Release(SubDevice); - - return PcPropertyHandler(Irp, Descriptor); + + return PcPropertyHandler(Irp, This->Descriptor); } /* @@ -231,7 +220,7 @@ IN PIRP Irp) { ULONG Index; - //PMINIPORTWAVECYCLIC Miniport; + NTSTATUS Status = STATUS_SUCCESS; IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; for(Index = 0; Index < This->Descriptor->Factory.PinDescriptorCount; Index++) @@ -240,16 +229,18 @@ ASSERT(This->Pins[Index] == NULL); } - /* release reference to port */ - //This->Port->lpVtbl->Release(This->Port); - - /* get the miniport driver */ - //Miniport = GetWaveCyclicMiniport(This->Port); - /* release miniport driver */ - //Miniport->lpVtbl->Release(Miniport); - - - Irp->IoStatus.Status = STATUS_SUCCESS; + DPRINT("IPortFilterWaveCyclic_fnClose ref %u\n", This->ref); + + if (This->ref == 1) + { + /* release reference to port */ + This->SubDevice->lpVtbl->Release(This->SubDevice); + + /* time to shutdown the audio system */ + Status = This->SubDevice->lpVtbl->ReleaseChildren(This->SubDevice); + } + + Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -358,18 +349,16 @@ NTSTATUS Status; IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl*)iface; - This->Port = Port; - /* get our private interface */ - Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&ISubDevice); + Status = Port->lpVtbl->QueryInterface(Port, &IID_ISubdevice, (PVOID*)&ISubDevice); if (!NT_SUCCESS(Status)) return STATUS_UNSUCCESSFUL; /* get the subdevice descriptor */ Status = ISubDevice->lpVtbl->GetDescriptor(ISubDevice, &Descriptor); - /* release subdevice interface */ - ISubDevice->lpVtbl->Release(ISubDevice); + /* store subdevice interface */ + This->SubDevice = ISubDevice; if (!NT_SUCCESS(Status)) return STATUS_UNSUCCESSFUL; @@ -383,8 +372,8 @@ if (!This->Pins) return STATUS_UNSUCCESSFUL; - /* increment reference count */ - Port->lpVtbl->AddRef(Port); + /* store port driver */ + This->Port = Port; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Sun Aug 2 20:20:39 2009 @@ -194,10 +194,39 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PPCLASS_DEVICE_EXTENSION DeviceExtension; + PLIST_ENTRY Entry; + PPHYSICAL_CONNECTION Connection; DPRINT("PortClsShutdown called\n"); - //DbgBreakPoint(); - - /* TODO */ + + /* get device extension */ + DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + while(!IsListEmpty(&DeviceExtension->PhysicalConnectionList)) + { + /* get connection entry */ + Entry = RemoveHeadList(&DeviceExtension->PhysicalConnectionList); + Connection = (PPHYSICAL_CONNECTION)CONTAINING_RECORD(Entry, PHYSICAL_CONNECTION, Entry); + + if (Connection->FromSubDevice) + { + /* release subdevice */ + Connection->FromSubDevice->lpVtbl->Release(Connection->FromSubDevice); + } + + if (Connection->ToSubDevice) + { + /* release subdevice */ + Connection->ToSubDevice->lpVtbl->Release(Connection->ToSubDevice); + } + FreeItem(Connection, TAG_PORTCLASS); + } + + if (DeviceExtension->AdapterPowerManagement) + { + /* release adapter power management */ + DPRINT1("Power %u\n", DeviceExtension->AdapterPowerManagement->lpVtbl->Release(DeviceExtension->AdapterPowerManagement)); + } Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Sun Aug 2 20:20:39 2009 @@ -777,6 +777,12 @@ /* free work item ctx */ FreeItem(Ctx, TAG_PORTCLASS); + /* release reference to port driver */ + This->Port->lpVtbl->Release(This->Port); + + /* release reference to filter instance */ + This->Filter->lpVtbl->Release(This->Filter); + if (This->Stream) { Stream = This->Stream; @@ -1013,11 +1019,6 @@ IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; - Port->lpVtbl->AddRef(Port); - Filter->lpVtbl->AddRef(Filter); - - This->Port = Port; - This->Filter = Filter; This->KsPinDescriptor = KsPinDescriptor; This->ConnectDetails = ConnectDetails; This->Miniport = GetWaveCyclicMiniport(Port); @@ -1115,11 +1116,18 @@ return Status; } + Port->lpVtbl->AddRef(Port); + Filter->lpVtbl->AddRef(Filter); + + This->Port = Port; + This->Filter = Filter; + //This->Stream->lpVtbl->SetFormat(This->Stream, (PKSDATAFORMAT)This->Format); DPRINT1("Setting state to acquire %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_ACQUIRE)); DPRINT1("Setting state to pause %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE)); This->State = KSSTATE_PAUSE; + //This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, This->Delay); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Sun Aug 2 20:20:39 2009 @@ -124,7 +124,6 @@ IPortTopology* iface) { IPortTopologyImpl * This = (IPortTopologyImpl*)iface; - return InterlockedIncrement(&This->ref); } @@ -136,6 +135,7 @@ IPortTopologyImpl * This = (IPortTopologyImpl*)iface; InterlockedDecrement(&This->ref); + DPRINT("Reference Count %u\n", This->ref); if (This->ref == 0) { @@ -208,9 +208,7 @@ This->pDeviceObject = DeviceObject; This->bInitialized = TRUE; - /* increment reference on miniport adapter */ - Miniport->lpVtbl->AddRef(Miniport); - + /* now initialize the miniport driver */ Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface); if (!NT_SUCCESS(Status)) { @@ -394,10 +392,17 @@ ISubDevice_fnReleaseChildren( IN ISubdevice *iface) { - //IPortTopologyImpl * This = (IPortTopologyImpl*)CONTAINING_RECORD(iface, IPortTopologyImpl, lpVtblSubDevice); - - UNIMPLEMENTED - return STATUS_UNSUCCESSFUL; + IPortTopologyImpl * This = (IPortTopologyImpl*)CONTAINING_RECORD(iface, IPortTopologyImpl, lpVtblSubDevice); + + DPRINT1("ISubDevice_fnReleaseChildren with ref %u\n", This->ref); + + /* release the filter */ + This->Filter->lpVtbl->Release(This->Filter); + + /* release the miniport */ + DPRINT("Refs %u %u\n", This->pMiniport->lpVtbl->Release(This->pMiniport), This->ref); + + return STATUS_SUCCESS; } static Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] Sun Aug 2 20:20:39 2009 @@ -266,12 +266,6 @@ if (This->ref == 0) { - if (This->pPinCount) - This->pPinCount->lpVtbl->Release(This->pPinCount); - - if (This->pPowerNotify) - This->pPowerNotify->lpVtbl->Release(This->pPowerNotify); - FreeItem(This, TAG_PORTCLASS); return 0; } @@ -342,9 +336,6 @@ This->pDeviceObject = DeviceObject; This->bInitialized = TRUE; This->pResourceList = ResourceList; - - /* increment reference on miniport adapter */ - Miniport->lpVtbl->AddRef(Miniport); Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface); if (!NT_SUCCESS(Status)) @@ -644,10 +635,29 @@ ISubDevice_fnReleaseChildren( IN ISubdevice *iface) { - //IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)CONTAINING_RECORD(iface, IPortWaveCyclicImpl, lpVtblSubDevice); - - UNIMPLEMENTED - return STATUS_UNSUCCESSFUL; + IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)CONTAINING_RECORD(iface, IPortWaveCyclicImpl, lpVtblSubDevice); + + DPRINT("ISubDevice_fnReleaseChildren ref %u\n", This->ref); + + /* release the filter */ + This->Filter->lpVtbl->Release(This->Filter); + + if (This->pPinCount) + { + /* release pincount interface */ + This->pPinCount->lpVtbl->Release(This->pPinCount); + } + + if (This->pPowerNotify) + { + /* release power notify interface */ + This->pPowerNotify->lpVtbl->Release(This->pPowerNotify); + } + + /* now release the miniport */ + This->pMiniport->lpVtbl->Release(This->pMiniport); + + return STATUS_SUCCESS; } static Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] Sun Aug 2 20:20:39 2009 @@ -47,8 +47,17 @@ DeviceEntry = (PKSAUDIO_DEVICE_ENTRY)CONTAINING_RECORD(Entry, KSAUDIO_DEVICE_ENTRY, Entry); DPRINT1("Freeing item %wZ\n", &DeviceEntry->DeviceName); + + /* dereference audio device file object */ + ObDereferenceObject(DeviceEntry->FileObject); + + /* close audio device handle */ + ZwClose(DeviceEntry->Handle); + /* free device string */ RtlFreeUnicodeString(&DeviceEntry->DeviceName); - + /* free pins */ + ExFreePool(DeviceEntry->Pins); + /* free audio device entry */ ExFreePool(DeviceEntry); }

1 0

[fireball] 42343: - Remove unnecessary hack from RosDrv_GetTextMetrics. Text output now is nearly perfect. See arwinss issue nr. 6.
by fireball＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: fireball Date: Sun Aug 2 20:18:58 2009 New Revision: 42343 URL: http://svn.reactos.org/svn/reactos?rev=42343&view=rev Log: - Remove unnecessary hack from RosDrv_GetTextMetrics. Text output now is nearly perfect. See arwinss issue nr. 6. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Sun Aug 2 20:18:58 2009 @@ -313,16 +313,8 @@ BOOL CDECL RosDrv_GetTextMetrics(NTDRV_PDEVICE *physDev, TEXTMETRICW *metrics) { - UNIMPLEMENTED; - - // HACK - metrics->tmMaxCharWidth = 9; - metrics->tmHeight = 18; - metrics->tmExternalLeading = 0; - - - return TRUE; - //return FALSE; + /* Let GDI font engine do the work */ + return FALSE; } BOOL CDECL RosDrv_LineTo( NTDRV_PDEVICE *physDev, INT x, INT y ) @@ -482,8 +474,7 @@ /* We don't have a kernelmode font engine */ if (gdiFont == 0) { - UNIMPLEMENTED; - //RosGdiSelectFont(physDev->hKernelDC, hfont, gdiFont); + /*RosGdiSelectFont(physDev->hKernelDC, hfont, gdiFont);*/ } else { @@ -612,10 +603,6 @@ return; } - // FIXME: What to do with origin? - //XSetClipRectangles( gdi_display, physDev->gc, physDev->dc_rect.left, physDev->dc_rect.top, - // (XRectangle *)data->Buffer, data->rdh.nCount, YXBanded ); - /* Set clipping */ RosGdiSetDeviceClipping(physDev->hKernelDC, data->rdh.nCount, (RECTL *)data->Buffer, (RECTL *)&data->rdh.rcBound);

1 0

[sginsberg] 42342: - npapi.h: Correct definitions of function pointer prototypes. - ntifs.h & cmdata.h : Don't use array size of 0. Fixes C4200. - wdm.h: Correct definition of 64-bit SLIST_HEADER. Add explicit casts to avoid /W4 warnings in RtlEnlargedUnsignedDivide. - winddk.h: Add MSVC intrinsic __readfsbyte for KeGetCurrentProcessorNumber. Misc fixes. - Fix various msvc issues in cmd, setupapi, usetup, win32csr, winlogon, msafd, ws2_32 and ext2lib, most notably: - cmd & doskey: Don't use fish
by sginsberg＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: sginsberg Date: Sun Aug 2 19:38:27 2009 New Revision: 42342 URL: http://svn.reactos.org/svn/reactos?rev=42342&view=rev Log: - npapi.h: Correct definitions of function pointer prototypes. - ntifs.h & cmdata.h : Don't use array size of 0. Fixes C4200. - wdm.h: Correct definition of 64-bit SLIST_HEADER. Add explicit casts to avoid /W4 warnings in RtlEnlargedUnsignedDivide. - winddk.h: Add MSVC intrinsic __readfsbyte for KeGetCurrentProcessorNumber. Misc fixes. - Fix various msvc issues in cmd, setupapi, usetup, win32csr, winlogon, msafd, ws2_32 and ext2lib, most notably: - cmd & doskey: Don't use fishy gcc extension to allocate variable-sized arrays from the stack. Use the heap instead. - Disable warning C4733 for mingw_main too (was only done for mingw_wmain previously). - advapi32: Pass the correct handles to TRACE -- spotted by MSVC. - Set the specified register in ecx in MSVC versions of Ke386Wrmsr and Ke386Rdmsr instead of reading from/writing to a random MSR. Yay /W4. Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/memory.c trunk/reactos/base/shell/cmd/misc.c trunk/reactos/base/shell/cmd/mklink.c trunk/reactos/base/shell/cmd/parser.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/dll/cpl/desk/preview.c trunk/reactos/dll/cpl/desk/settings.c trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/install.c trunk/reactos/dll/win32/ws2_32/misc/ns.c trunk/reactos/dll/win32/ws2_32/misc/stubs.c trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/psdk/npapi.h trunk/reactos/lib/3rdparty/mingw/mingw.rbuild trunk/reactos/lib/cmlib/cmdata.h trunk/reactos/lib/fslib/ext2lib/Mke2fs.c trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/subsystems/win32/csrss/win32csr/alias.c Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -19,15 +19,27 @@ static VOID PrintHistory(VOID) { DWORD Length = GetConsoleCommandHistoryLength(pszExeName); + DWORD BufferLength; + PBYTE HistBuf; + TCHAR *Hist; + TCHAR *HistEnd; + /* On Windows, the ANSI version of GetConsoleCommandHistory requires * a buffer twice as large as the actual history length. */ - BYTE HistBuf[Length * (sizeof(WCHAR) / sizeof(TCHAR))]; - TCHAR *Hist = (TCHAR *)HistBuf; - TCHAR *HistEnd = (TCHAR *)&HistBuf[Length]; - - if (GetConsoleCommandHistory(Hist, sizeof HistBuf, pszExeName)) + BufferLength = Length * (sizeof(WCHAR) / sizeof(TCHAR)) * sizeof(BYTE); + + HistBuf = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + BufferLength); + if (!HistBuf) return; + Hist = (TCHAR *)HistBuf; + HistEnd = (TCHAR *)&HistBuf[Length]; + + if (GetConsoleCommandHistory(Hist, BufferLength, pszExeName)) for (; Hist < HistEnd; Hist += _tcslen(Hist) + 1) _tprintf(_T("%s\n"), Hist); + + HeapFree(GetProcessHeap(), 0, HistBuf); } static INT SetMacro(LPTSTR definition) @@ -65,23 +77,39 @@ static VOID PrintMacros(LPTSTR pszExeName, LPTSTR Indent) { DWORD Length = GetConsoleAliasesLength(pszExeName); - BYTE AliasBuf[Length]; - TCHAR *Alias = (TCHAR *)AliasBuf; - TCHAR *AliasEnd = (TCHAR *)&AliasBuf[Length]; - - if (GetConsoleAliases(Alias, sizeof AliasBuf, pszExeName)) + PBYTE AliasBuf; + TCHAR *Alias; + TCHAR *AliasEnd; + + AliasBuf = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + Length * sizeof(BYTE)); + if (!AliasBuf) return; + Alias = (TCHAR *)AliasBuf; + AliasEnd = (TCHAR *)&AliasBuf[Length]; + + if (GetConsoleAliases(Alias, Length * sizeof(BYTE), pszExeName)) for (; Alias < AliasEnd; Alias += _tcslen(Alias) + 1) _tprintf(_T("%s%s\n"), Indent, Alias); + + HeapFree(GetProcessHeap(), 0, AliasBuf); } static VOID PrintAllMacros(VOID) { DWORD Length = GetConsoleAliasExesLength(); - BYTE ExeNameBuf[Length]; - TCHAR *ExeName = (TCHAR *)ExeNameBuf; - TCHAR *ExeNameEnd = (TCHAR *)&ExeNameBuf[Length]; - - if (GetConsoleAliasExes(ExeName, sizeof ExeNameBuf)) + PBYTE ExeNameBuf; + TCHAR *ExeName; + TCHAR *ExeNameEnd; + + ExeNameBuf = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + Length * sizeof(BYTE)); + if (!ExeNameBuf) return; + ExeName = (TCHAR *)ExeNameBuf; + ExeNameEnd = (TCHAR *)&ExeNameBuf[Length]; + + if (GetConsoleAliasExes(ExeName, Length * sizeof(BYTE))) { for (; ExeName < ExeNameEnd; ExeName += _tcslen(ExeName) + 1) { @@ -90,6 +118,8 @@ _tprintf(_T("\n")); } } + + HeapFree(GetProcessHeap(), 0, ExeNameBuf); } static VOID ReadFromFile(LPTSTR param) 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 Aug 2 19:38:27 2009 @@ -3133,6 +3133,7 @@ FileCopyPage(PINPUT_RECORD Ir) { COPYCONTEXT CopyContext; + unsigned int mem_bar_width; MUIDisplayPage(FILE_COPY_PAGE); @@ -3153,7 +3154,7 @@ MUIGetString(STRING_SETUPCOPYINGFILES)); // fit memory bars to screen width, distribute them uniform - unsigned int mem_bar_width = (xScreen - 26) / 5; + mem_bar_width = (xScreen - 26) / 5; mem_bar_width -= mem_bar_width % 2; // make even /* ATTENTION: The following progress bars are debug stuff, which should not be translated!! */ /* Create the paged pool progress bar */ Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -484,14 +484,23 @@ INT DoCommand(LPTSTR first, LPTSTR rest, PARSED_COMMAND *Cmd) { - TCHAR com[_tcslen(first) + _tcslen(rest) + 2]; /* full command line */ + TCHAR *com; TCHAR *cp; LPTSTR param; /* pointer to command's parameters */ INT cl; LPCOMMAND cmdptr; BOOL nointernal = FALSE; + INT ret; TRACE ("DoCommand: (\'%s\' \'%s\')\n", debugstr_aw(first), debugstr_aw(rest)); + + /* full command line */ + com = cmd_alloc((_tcslen(first) + _tcslen(rest) + 2) * sizeof(TCHAR)); + if (com == NULL) + { + error_out_of_memory(); + return 1; + } /* If present in the first word, these characters end the name of an * internal command and become the beginning of its parameters. */ @@ -526,11 +535,15 @@ if (_tcsicmp(cmdptr->name, _T("echo")) != 0) while (_istspace(*param)) param++; - return cmdptr->func(param); - } - } - - return Execute(com, first, rest, Cmd); + ret = cmdptr->func(param); + cmd_free(com); + return ret; + } + } + + ret = Execute(com, first, rest, Cmd); + cmd_free(com); + return ret; } Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -125,20 +125,36 @@ if (bUnicodeOutput) { #ifndef _UNICODE - WCHAR buffer[len]; + WCHAR *buffer = cmd_alloc(len * sizeof(WCHAR)); + if (!buffer) + { + error_out_of_memory(); + return; + } len = MultiByteToWideChar(OutputCodePage, 0, str, len, buffer, len, NULL, NULL); str = (PVOID)buffer; #endif WriteFile(hOutput, str, len * sizeof(WCHAR), &dwWritten, NULL); +#ifndef _UNICODE + cmd_free(buffer); +#endif } else { #ifdef _UNICODE - CHAR buffer[len * MB_LEN_MAX]; + CHAR *buffer = cmd_alloc(len * MB_LEN_MAX * sizeof(CHAR)); + if (!buffer) + { + error_out_of_memory(); + return; + } len = WideCharToMultiByte(OutputCodePage, 0, str, len, buffer, len * MB_LEN_MAX, NULL, NULL); str = (PVOID)buffer; #endif WriteFile(hOutput, str, len, &dwWritten, NULL); +#ifdef _UNICODE + cmd_free(buffer); +#endif } } Modified: trunk/reactos/base/shell/cmd/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/memory.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/memory.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/memory.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -25,6 +25,7 @@ TCHAR szAvailPageFile[40]; TCHAR szTotalVirtual[40]; TCHAR szAvailVirtual[40]; + BOOL (WINAPI *GlobalMemoryStatusEx)(LPMEMORYSTATUSEX); if (!_tcsncmp (param, _T("/?"), 2)) { @@ -32,8 +33,8 @@ return 0; } - BOOL (WINAPI *GlobalMemoryStatusEx)(LPMEMORYSTATUSEX) - = GetProcAddress(GetModuleHandle(_T("KERNEL32")), "GlobalMemoryStatusEx"); + GlobalMemoryStatusEx + = (BOOL (WINAPI *)(LPMEMORYSTATUSEX))GetProcAddress(GetModuleHandle(_T("KERNEL32")), "GlobalMemoryStatusEx"); if (GlobalMemoryStatusEx) { msex.dwLength = sizeof(MEMORYSTATUSEX); Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -38,7 +38,8 @@ /* * get a character out-of-band and honor Ctrl-Break characters */ -TCHAR cgetchar (VOID) +TCHAR +cgetchar (VOID) { HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); INPUT_RECORD irBuffer; Modified: trunk/reactos/base/shell/cmd/mklink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/mklink.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/mklink.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/mklink.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -39,9 +39,9 @@ HMODULE hNTDLL = GetModuleHandle(_T("NTDLL")); BOOLEAN (WINAPI *RtlDosPathNameToNtPathName_U)(PCWSTR, PUNICODE_STRING, PCWSTR *, CURDIR *) - = (BOOLEAN (WINAPI *)())GetProcAddress(hNTDLL, "RtlDosPathNameToNtPathName_U"); + = (BOOLEAN (WINAPI *)(PCWSTR, PUNICODE_STRING, PCWSTR *, CURDIR *))GetProcAddress(hNTDLL, "RtlDosPathNameToNtPathName_U"); VOID (WINAPI *RtlFreeUnicodeString)(PUNICODE_STRING) - = (VOID (WINAPI *)())GetProcAddress(hNTDLL, "RtlFreeUnicodeString"); + = (VOID (WINAPI *)(PUNICODE_STRING))GetProcAddress(hNTDLL, "RtlFreeUnicodeString"); TCHAR TargetFullPath[MAX_PATH]; #ifdef UNICODE @@ -177,9 +177,9 @@ * so load dynamically */ BOOL (WINAPI *CreateSymbolicLink)(LPCTSTR, LPCTSTR, DWORD) #ifdef UNICODE - = (BOOL (WINAPI *)())GetProcAddress(hKernel32, "CreateSymbolicLinkW"); + = (BOOL (WINAPI *)(LPCTSTR, LPCTSTR, DWORD))GetProcAddress(hKernel32, "CreateSymbolicLinkW"); #else - = (BOOL (WINAPI *)())GetProcAddress(hKernel32, "CreateSymbolicLinkA"); + = (BOOL (WINAPI *)(LPCTSTR, LPCTSTR, DWORD))GetProcAddress(hKernel32, "CreateSymbolicLinkA"); #endif if (CreateSymbolicLink && CreateSymbolicLink(Name[0], Name[1], Flags)) { @@ -193,9 +193,9 @@ * so load dynamically */ BOOL (WINAPI *CreateHardLink)(LPCTSTR, LPCTSTR, LPSECURITY_ATTRIBUTES) #ifdef UNICODE - = (BOOL (WINAPI *)())GetProcAddress(hKernel32, "CreateHardLinkW"); + = (BOOL (WINAPI *)(LPCTSTR, LPCTSTR, LPSECURITY_ATTRIBUTES))GetProcAddress(hKernel32, "CreateHardLinkW"); #else - = (BOOL (WINAPI *)())GetProcAddress(hKernel32, "CreateHardLinkA"); + = (BOOL (WINAPI *)(LPCTSTR, LPCTSTR, LPSECURITY_ATTRIBUTES))GetProcAddress(hKernel32, "CreateHardLinkA"); #endif if (CreateHardLink && CreateHardLink(Name[0], Name[1], NULL)) { Modified: trunk/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/parser.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -326,10 +326,11 @@ static PARSED_COMMAND *ParseIf(void) { PARSED_COMMAND *Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + int Type; memset(Cmd, 0, sizeof(PARSED_COMMAND)); Cmd->Type = C_IF; - int Type = CurrentTokenType; + Type = CurrentTokenType; if (_tcsicmp(CurrentToken, _T("/I")) == 0) { Cmd->If.Flags |= IFFLAG_IGNORECASE; @@ -619,8 +620,9 @@ if (CurChar == _T('@')) { + PARSED_COMMAND *Cmd; ParseChar(); - PARSED_COMMAND *Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); Cmd->Type = C_QUIET; Cmd->Next = NULL; /* @ acts like a unary operator with low precedence, Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -34,7 +34,7 @@ DWORD dwSize = sizeof(szBuffer); HMODULE hLibrary; SERVICE_STATUS_PROCESS Info; - typedef BOOL WINAPI (*PLAYSOUNDW)(LPCWSTR,HMODULE,DWORD); + typedef BOOL (WINAPI *PLAYSOUNDW)(LPCWSTR,HMODULE,DWORD); PLAYSOUNDW Play; ULONG Index = 0; Modified: trunk/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/preview.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -332,7 +332,7 @@ hUser32 = LoadLibrary(_T("user32.dll")); if(hUser32 == NULL) - return FALSE; + return; DrawCaptionTemp = (DCT_PROC)GetProcAddress(hUser32, (LPCSTR)DCT_ORD); DrawMenuBarTemp = (DMBT_PROC)GetProcAddress(hUser32, (LPCSTR)DMBT_ORD); Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -626,10 +626,9 @@ SettingsPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam) { PGLOBAL_DATA pGlobalData; + TCHAR Message[1024], Title[256]; pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); - - TCHAR Message[1024], Title[256]; switch(uMsg) { Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=42… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/add.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -188,9 +188,11 @@ while (RegEnumKeyEx(hKey, dwIndex, szLayoutID, &dwSize, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { + INT iIndex; + GetLayoutName(szLayoutID, KeyName); - INT iIndex = (INT) SendMessage(hItemsList, CB_ADDSTRING, 0, (LPARAM)KeyName); + iIndex = (INT) SendMessage(hItemsList, CB_ADDSTRING, 0, (LPARAM)KeyName); pstrLayoutID = (PTSTR)HeapAlloc(hProcessHeap, 0, sizeof(szLayoutID)); lstrcpy(pstrLayoutID, szLayoutID); Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -4104,7 +4104,7 @@ static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ); TRACE("(%p,%s,%p,%p,%p,%p=%d)\n", - hkey, debugstr_w(name), reserved, type, data, count, + hkeyorg, debugstr_w(name), reserved, type, data, count, (count && data) ? *count : 0 ); if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; @@ -4885,7 +4885,7 @@ DWORD ret; NTSTATUS Status; - TRACE("(%p,%s,%d,%s,%d)\n", hKey, debugstr_a(lpSubKey), dwType, debugstr_a(lpData), cbData ); + TRACE("(%p,%s,%d,%s,%d)\n", hKeyOriginal, debugstr_a(lpSubKey), dwType, debugstr_a(lpData), cbData ); if (dwType != REG_SZ || !lpData) return ERROR_INVALID_PARAMETER; Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -683,7 +683,7 @@ fd_set *readfds, fd_set *writefds, fd_set *exceptfds, - struct timeval *timeout, + const LPTIMEVAL timeout, LPINT lpErrno) { IO_STATUS_BLOCK IOSB; Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -1409,6 +1409,17 @@ { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; HKEY key = INVALID_HANDLE_VALUE; + LPWSTR lpGuidString = NULL; + LPWSTR DriverKey = NULL; /* {GUID}\Index */ + LPWSTR pDeviceInstance; /* Points into DriverKey, on the Index field */ + DWORD Index; /* Index used in the DriverKey name */ + DWORD rc; + HKEY hHWProfileKey = INVALID_HANDLE_VALUE; + HKEY hEnumKey = NULL; + HKEY hClassKey = NULL; + HKEY hDeviceKey = INVALID_HANDLE_VALUE; + HKEY hKey = NULL; + HKEY RootKey; TRACE("%p %p %lu %lu %lu %p %s\n", DeviceInfoSet, DeviceInfoData, Scope, HwProfile, KeyType, InfHandle, debugstr_w(InfSectionName)); @@ -1449,18 +1460,6 @@ SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; } - - LPWSTR lpGuidString = NULL; - LPWSTR DriverKey = NULL; /* {GUID}\Index */ - LPWSTR pDeviceInstance; /* Points into DriverKey, on the Index field */ - DWORD Index; /* Index used in the DriverKey name */ - DWORD rc; - HKEY hHWProfileKey = INVALID_HANDLE_VALUE; - HKEY hEnumKey = NULL; - HKEY hClassKey = NULL; - HKEY hDeviceKey = INVALID_HANDLE_VALUE; - HKEY hKey = NULL; - HKEY RootKey; if (Scope == DICS_FLAG_GLOBAL) RootKey = set->HKLM; @@ -1670,6 +1669,7 @@ { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; BOOL ret = FALSE; + SP_DEVINFO_DATA DevInfo; TRACE("%p %s %s %s %p %x %p\n", DeviceInfoSet, debugstr_w(DeviceName), debugstr_guid(ClassGuid), debugstr_w(DeviceDescription), @@ -1707,8 +1707,6 @@ SetLastError(ERROR_INVALID_FLAGS); return FALSE; } - - SP_DEVINFO_DATA DevInfo; if (CreationFlags & DICD_GENERATE_ID) { Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -96,9 +96,9 @@ typedef BOOL (*iterate_fields_func)( HINF hinf, PCWSTR field, void *arg ); static BOOL GetLineText( HINF hinf, PCWSTR section_name, PCWSTR key_name, PWSTR *value); -typedef HRESULT WINAPI (*COINITIALIZE)(IN LPVOID pvReserved); -typedef HRESULT WINAPI (*COCREATEINSTANCE)(IN REFCLSID rclsid, IN LPUNKNOWN pUnkOuter, IN DWORD dwClsContext, IN REFIID riid, OUT LPVOID *ppv); -typedef HRESULT WINAPI (*COUNINITIALIZE)(VOID); +typedef HRESULT (WINAPI *COINITIALIZE)(IN LPVOID pvReserved); +typedef HRESULT (WINAPI *COCREATEINSTANCE)(IN REFCLSID rclsid, IN LPUNKNOWN pUnkOuter, IN DWORD dwClsContext, IN REFIID riid, OUT LPVOID *ppv); +typedef HRESULT (WINAPI *COUNINITIALIZE)(VOID); /* Unicode constants */ static const WCHAR AddService[] = {'A','d','d','S','e','r','v','i','c','e',0}; Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -632,8 +632,9 @@ void free_servent(struct servent* s) { + char* next; HFREE(s->s_name); - char* next = s->s_aliases[0]; + next = s->s_aliases[0]; while(next) { HFREE(next); next++; } s->s_port = 0; HFREE(s->s_proto); @@ -660,10 +661,11 @@ DNS_STATUS dns_status = {0}; /* include/WinDNS.h -- look up DNS_RECORD on MSDN */ PDNS_RECORD dp = 0; + PWINSOCK_THREAD_BLOCK p; addr = GH_INVALID; - PWINSOCK_THREAD_BLOCK p = NtCurrentTeb()->WinSockData; + p = NtCurrentTeb()->WinSockData; if( !p ) { Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -510,13 +510,13 @@ IN USHORT hostshort, OUT USHORT FAR* lpnetshort) { - if (!WSAINITIALIZED) - { - WSASetLastError(WSANOTINITIALISED); - return SOCKET_ERROR; - } - PCATALOG_ENTRY provider; + if (!WSAINITIALIZED) + { + WSASetLastError(WSANOTINITIALISED); + return SOCKET_ERROR; + } + if (!ReferenceProviderByHandle((HANDLE)s, &provider)) { WSASetLastError(WSAENOTSOCK); @@ -599,13 +599,13 @@ IN USHORT netshort, OUT USHORT FAR* lphostshort) { - if (!WSAINITIALIZED) - { - WSASetLastError(WSANOTINITIALISED); - return SOCKET_ERROR; - } - PCATALOG_ENTRY provider; + if (!WSAINITIALIZED) + { + WSASetLastError(WSANOTINITIALISED); + return SOCKET_ERROR; + } + if (!ReferenceProviderByHandle((HANDLE)s, &provider)) { WSASetLastError(WSAENOTSOCK); Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -1093,7 +1093,7 @@ ULONG FileAttributes; ULONG FileNameLength; ULONG EaSize; - WCHAR FileName[0]; + WCHAR FileName[ANYSIZE_ARRAY]; } FILE_FULL_DIRECTORY_INFORMATION, *PFILE_FULL_DIRECTORY_INFORMATION; typedef struct _FILE_ID_FULL_DIR_INFORMATION { Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4234… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -575,13 +575,13 @@ ULONGLONG Reserved:59; ULONGLONG Region:3; } Header8; + struct { ULONGLONG Depth:16; ULONGLONG Sequence:48; ULONGLONG HeaderType:1; ULONGLONG Init:1; ULONGLONG Reserved:2; ULONGLONG NextEntry:60; - struct { } Header16; } SLIST_HEADER, *PSLIST_HEADER; #else @@ -1956,8 +1956,8 @@ IN OUT PULONG Remainder) { if (Remainder) - *Remainder = Dividend.QuadPart % Divisor; - return Dividend.QuadPart / Divisor; + *Remainder = (ULONG)(Dividend.QuadPart % Divisor); + return (ULONG)(Dividend.QuadPart / Divisor); } //DECLSPEC_DEPRECATED_DDK Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -5128,9 +5128,17 @@ ULONG Spare1; } KFLOATING_SAVE, *PKFLOATING_SAVE; -static __inline +#ifdef _MSC_VER +// +// FIXME: Intrinsics +// +unsigned char __readfsbyte(const unsigned long Offset); +#pragma intrinsic(__readfsbyte) +#endif + + +FORCEINLINE ULONG -DDKAPI KeGetCurrentProcessorNumber(VOID) { #if defined(__GNUC__) @@ -5145,7 +5153,7 @@ #if _MSC_FULL_VER >= 13012035 return (ULONG)__readfsbyte(FIELD_OFFSET(KPCR, Number)); #else - __asm { movzx eax, _PCR KPCR.Number } + __asm { movzx eax, fs:[0] KPCR.Number } #endif #else #error Unknown compiler @@ -5945,7 +5953,7 @@ OldBlink = Entry->Blink; OldFlink->Blink = OldBlink; OldBlink->Flink = OldFlink; - return (OldFlink == OldBlink); + return (BOOLEAN)(OldFlink == OldBlink); } static __inline PLIST_ENTRY Modified: trunk/reactos/include/psdk/npapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/npapi.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/npapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/npapi.h [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -56,45 +56,45 @@ #define WNNC_START 0x0000000c #define WNNC_WAIT_FOR_START 0x00000001 -typedef DWORD APIENTRY (*PF_NPGetCaps)(DWORD ndex); +typedef DWORD (APIENTRY *PF_NPGetCaps)(DWORD ndex); /* get user */ -typedef DWORD APIENTRY (*PF_NPGetUser)(LPWSTR lpName, LPWSTR lpUserName, +typedef DWORD (APIENTRY *PF_NPGetUser)(LPWSTR lpName, LPWSTR lpUserName, LPDWORD lpnBufferLen); /* enumeration-related */ -typedef DWORD APIENTRY (*PF_NPOpenEnum)(DWORD dwScope, DWORD dwType, DWORD dwUsage, +typedef DWORD (APIENTRY *PF_NPOpenEnum)(DWORD dwScope, DWORD dwType, DWORD dwUsage, LPNETRESOURCEW lpNetResource, LPHANDLE lphEnum); -typedef DWORD APIENTRY (*PF_NPEnumResource)(HANDLE hEnum, LPDWORD lpcCount, +typedef DWORD (APIENTRY *PF_NPEnumResource)(HANDLE hEnum, LPDWORD lpcCount, LPVOID lpBuffer, LPDWORD lpBufferSize); -typedef DWORD APIENTRY (*PF_NPCloseEnum)(HANDLE hEnum); +typedef DWORD (APIENTRY *PF_NPCloseEnum)(HANDLE hEnum); typedef DWORD (APIENTRY *PF_NPGetResourceInformation)(LPNETRESOURCEW lpNetResource, LPVOID lpBuffer, LPDWORD lpcbBuffer, LPWSTR* lplpSystem); /* connection-related */ -typedef DWORD APIENTRY (*PF_NPAddConnection)(LPNETRESOURCEW lpNetResource, +typedef DWORD (APIENTRY *PF_NPAddConnection)(LPNETRESOURCEW lpNetResource, LPWSTR lpPassword, LPWSTR lpUserName); -typedef DWORD APIENTRY (*PF_NPAddConnection3)(HWND hwndOwner, +typedef DWORD (APIENTRY *PF_NPAddConnection3)(HWND hwndOwner, LPNETRESOURCEW lpNetResource, LPWSTR lpPassword, LPWSTR lpUserName, DWORD dwFlags); -typedef DWORD APIENTRY (*PF_NPCancelConnection)(LPWSTR lpName, BOOL fForce); -typedef DWORD APIENTRY (*PF_NPGetConnection)(LPWSTR lpLocalName, +typedef DWORD (APIENTRY *PF_NPCancelConnection)(LPWSTR lpName, BOOL fForce); +typedef DWORD (APIENTRY *PF_NPGetConnection)(LPWSTR lpLocalName, LPWSTR lpRemoteName, LPDWORD lpnBufferLen); /* network name manipulation */ -typedef DWORD APIENTRY (*PF_NPGetUniversalName)(LPWSTR lpLocalPath, +typedef DWORD (APIENTRY *PF_NPGetUniversalName)(LPWSTR lpLocalPath, DWORD dwInfoLevel, LPVOID lpBuffer, LPDWORD lpnBufferSize); -typedef DWORD APIENTRY (*PF_NPFormatNetworkName)(LPWSTR lpRemoteName, +typedef DWORD (APIENTRY *PF_NPFormatNetworkName)(LPWSTR lpRemoteName, LPWSTR lpFormattedName, LPDWORD lpnLength, DWORD dwFlags, DWORD dwAveCharPerLine); /* dialogs */ -typedef DWORD APIENTRY (*PF_NPDeviceMode)(HWND hParent); +typedef DWORD (APIENTRY *PF_NPDeviceMode)(HWND hParent); /* search dialog */ #define WNSRCH_REFRESH_FIRST_LEVEL 0x00000001 -typedef DWORD APIENTRY (*PF_NPSearchDialog)(HWND hwndParent, +typedef DWORD (APIENTRY *PF_NPSearchDialog)(HWND hwndParent, LPNETRESOURCEW lpNetResource, LPVOID lpBuffer, DWORD cbBuffer, LPDWORD lpnFlags); @@ -109,10 +109,10 @@ #define WNPS_DIR 1 #define WNPS_MULT 2 -typedef DWORD APIENTRY (*PF_NPGetPropertyText)(DWORD iButton, DWORD nPropSel, +typedef DWORD (APIENTRY *PF_NPGetPropertyText)(DWORD iButton, DWORD nPropSel, LPWSTR lpName, LPWSTR lpButtonName, DWORD nButtonNameLen, DWORD nType); -typedef DWORD APIENTRY (*PF_NPPropertyDialog)(HWND hwndParent, DWORD iButtonDlg, +typedef DWORD (APIENTRY *PF_NPPropertyDialog)(HWND hwndParent, DWORD iButtonDlg, DWORD nPropSel, LPWSTR lpFileName, DWORD nType); /* admin */ @@ -123,9 +123,9 @@ #define WNDN_RMDIR 2 #define WNDN_MVDIR 3 -typedef DWORD APIENTRY (*PF_NPGetDirectoryType)(LPWSTR lpName, LPINT lpType, +typedef DWORD (APIENTRY *PF_NPGetDirectoryType)(LPWSTR lpName, LPINT lpType, BOOL bFlushCache); -typedef DWORD APIENTRY (*PF_NPDirectoryNotify)(HWND hwnd, LPWSTR lpDir, +typedef DWORD (APIENTRY *PF_NPDirectoryNotify)(HWND hwnd, LPWSTR lpDir, DWORD dwOper); /* permission editor dialogs */ @@ -133,16 +133,16 @@ #define WNPERMC_AUDIT 0x00000002 #define WNPERMC_OWNER 0x00000004 -typedef DWORD APIENTRY (*PF_NPFMXGetPermCaps)(LPWSTR lpDriveName); +typedef DWORD (APIENTRY *PF_NPFMXGetPermCaps)(LPWSTR lpDriveName); #define WNPERM_DLG_PERM 0 #define WNPERM_DLG_AUDIT 1 #define WNPERM_DLG_OWNER 2 -typedef DWORD APIENTRY (*PF_NPFMXEditPerm)(LPWSTR lpDriveName, HWND hwndFMX, +typedef DWORD (APIENTRY *PF_NPFMXEditPerm)(LPWSTR lpDriveName, HWND hwndFMX, DWORD nDialogType); -typedef DWORD APIENTRY (*PF_NPFMXGetPermHelp)(LPWSTR lpDriveName, +typedef DWORD (APIENTRY *PF_NPFMXGetPermHelp)(LPWSTR lpDriveName, DWORD nDialogType, BOOL fDirectory, LPVOID lpFileNameBuffer, LPDWORD lpBufferSize, LPDWORD lpnHelpContext); @@ -160,11 +160,11 @@ #define WN_NT_PASSWORD_CHANGED 0x00000002 /* notifications */ -typedef DWORD APIENTRY (*PF_NPLogonNotify)(PLUID lpLogonId, +typedef DWORD (APIENTRY *PF_NPLogonNotify)(PLUID lpLogonId, LPCWSTR lpAuthentInfoType, LPVOID lpAuthentInfo, LPCWSTR lpPreviousAuthentInfoType, LPVOID lpPreviousAuthentInfo, LPWSTR lpStationName, LPVOID StationHandle, LPWSTR *lpLogonScript); -typedef DWORD APIENTRY (*PF_NPPasswordChangeNotify)(LPCWSTR lpAuthentInfoType, +typedef DWORD (APIENTRY *PF_NPPasswordChangeNotify)(LPCWSTR lpAuthentInfoType, LPVOID lpAuthentInfo, LPCWSTR lpPreviousAuthentInfoType, LPVOID lpPreviousAuthentInfo, LPWSTR lpStationName, LPVOID StationHandle, DWORD dwChangeInfo); @@ -201,9 +201,9 @@ BOOL fForce; } NOTIFYCANCEL, *LPNOTIFYCANCEL; -typedef DWORD APIENTRY (*PF_AddConnectNotify)(LPNOTIFYINFO lpNotifyInfo, +typedef DWORD (APIENTRY *PF_AddConnectNotify)(LPNOTIFYINFO lpNotifyInfo, LPNOTIFYADD lpAddInfo); -typedef DWORD APIENTRY (*PF_CancelConnectNotify)(LPNOTIFYINFO lpNotifyInfo, +typedef DWORD (APIENTRY *PF_CancelConnectNotify)(LPNOTIFYINFO lpNotifyInfo, LPNOTIFYADD lpAddInfo); #endif /* ndef __WINE_NPAPI_H__ */ Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -31,6 +31,7 @@ <module name="mingw_main" type="staticlibrary" isstartuplib="true" crt="dll"> <define name="_CRTBLD" /> <include base="ReactOS">include/reactos/mingw-w64</include> + <compilerflag compilerset="msc">/wd4733</compilerflag> <file>crt0_c.c</file> <file>crtexe.c</file> <file>dllargv.c</file> Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=423… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -114,7 +114,7 @@ ULONG WorkVar; USHORT NameLength; USHORT ClassLength; - WCHAR Name[0]; + WCHAR Name[ANYSIZE_ARRAY]; } CM_KEY_NODE, *PCM_KEY_NODE; // @@ -122,7 +122,7 @@ // typedef struct _VALUE_LIST_CELL { - HCELL_INDEX ValueOffset[0]; + HCELL_INDEX ValueOffset[ANYSIZE_ARRAY]; } VALUE_LIST_CELL, *PVALUE_LIST_CELL; // @@ -137,7 +137,7 @@ ULONG Type; USHORT Flags; USHORT Unused1; - WCHAR Name[0]; + WCHAR Name[ANYSIZE_ARRAY]; } CM_KEY_VALUE, *PCM_KEY_VALUE; // @@ -152,7 +152,7 @@ ULONG ReferenceCount; ULONG DescriptorLength; //SECURITY_DESCRIPTOR_RELATIVE Descriptor; - UCHAR Data[0]; + UCHAR Data[ANYSIZE_ARRAY]; } CM_KEY_SECURITY, *PCM_KEY_SECURITY; #ifdef CMLIB_HOST Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Mke2fs.c… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -814,6 +814,10 @@ /* File Sys Structure */ EXT2_FILESYS FileSys; ULONG Percent; + ULONG rsv; + ULONG blocks; + ULONG start; + ULONG ret_blk; Callback(PROGRESS, 0, (PVOID)&Percent); @@ -917,10 +921,8 @@ } /* rsv must be a power of two (64kB is MD RAID sb alignment) */ - ULONG rsv = 65536 / FileSys.blocksize; - ULONG blocks = Ext2Sb.s_blocks_count; - ULONG start; - ULONG ret_blk; + rsv = 65536 / FileSys.blocksize; + blocks = Ext2Sb.s_blocks_count; #ifdef ZAP_BOOTBLOCK zap_sector(&FileSys, 0, 2); Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -123,6 +123,7 @@ IN ULONG Var1, IN ULONG Var2) { + __asm mov ecx, Register; __asm mov eax, Var1; __asm mov edx, Var2; __asm wrmsr; @@ -134,6 +135,7 @@ IN ULONG Var1, IN ULONG Var2) { + __asm mov ecx, Register; __asm mov eax, Var1; __asm mov edx, Var2; __asm rdmsr; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/alias.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/alias.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -104,14 +104,17 @@ PALIAS_ENTRY IntGetAliasEntry(PALIAS_HEADER Header, LPCWSTR lpSrcName) { + PALIAS_ENTRY RootHeader; + if (Header == NULL) return NULL; - PALIAS_ENTRY RootHeader = Header->Data; + RootHeader = Header->Data; while(RootHeader) { + INT diff; DPRINT("IntGetAliasEntry>lpSource %S\n", RootHeader->lpSource); - INT diff = _wcsicmp(RootHeader->lpSource, lpSrcName); + diff = _wcsicmp(RootHeader->lpSource, lpSrcName); if (!diff) return RootHeader;

1 0

[fireball] 42341: - Initialize size field of font_mapping structure, this fixes freetype font loading errors (see arwinss issue nr. 6). - Add mapping lookup, in case that process already mapped it, so mapping will just be reused. - Add unmapping support, so if process closes, no mapping leaks occur.
by fireball＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: fireball Date: Sun Aug 2 19:32:22 2009 New Revision: 42341 URL: http://svn.reactos.org/svn/reactos?rev=42341&view=rev Log: - Initialize size field of font_mapping structure, this fixes freetype font loading errors (see arwinss issue nr. 6). - Add mapping lookup, in case that process already mapped it, so mapping will just be reused. - Add unmapping support, so if process closes, no mapping leaks occur. Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] Sun Aug 2 19:32:22 2009 @@ -469,10 +469,12 @@ { struct list entry; int refcount; - dev_t dev; - ino_t ino; + DWORD volumeserial; + DWORD indexhigh; + DWORD indexlow; void *data; size_t size; + HANDLE file; }; static struct list mappings_list = LIST_INIT( mappings_list ); @@ -2983,22 +2985,25 @@ static struct font_mapping *map_font_file( const char *name ) { struct font_mapping *mapping; - //struct stat st; + BY_HANDLE_FILE_INFORMATION hfi; HANDLE file, mapped_file; file = CreateFileA( name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 ); if (!file) return NULL; + if (!GetFileInformationByHandle( file, &hfi )) + return NULL; + LIST_FOR_EACH_ENTRY( mapping, &mappings_list, struct font_mapping, entry ) { -#if 0 - if (mapping->dev == st.st_dev && mapping->ino == st.st_ino) + if (mapping->volumeserial == hfi.dwVolumeSerialNumber && + mapping->indexhigh == hfi.nFileIndexHigh && + mapping->indexlow == hfi.nFileIndexLow ) { mapping->refcount++; CloseHandle( file ); return mapping; } -#endif } if (!(mapping = HeapAlloc( GetProcessHeap(), 0, sizeof(*mapping) ))) goto error; @@ -3013,9 +3018,11 @@ return NULL; } mapping->refcount = 1; - //mapping->dev = st.st_dev; - //mapping->ino = st.st_ino; - //mapping->size = st.st_size; + mapping->volumeserial = hfi.dwVolumeSerialNumber; + mapping->indexhigh = hfi.nFileIndexHigh; + mapping->indexlow = hfi.nFileIndexLow; + mapping->file = mapped_file; + mapping->size = hfi.nFileSizeLow; list_add_tail( &mappings_list, &mapping->entry ); return mapping; @@ -3026,14 +3033,14 @@ static void unmap_font_file( struct font_mapping *mapping ) { -#if 0 if (!--mapping->refcount) { list_remove( &mapping->entry ); - munmap( mapping->data, mapping->size ); + if (!UnmapViewOfFile(mapping->data)) + ERR("Unmapping view of file failed with error %x\n", GetLastError()); + CloseHandle(mapping->file); HeapFree( GetProcessHeap(), 0, mapping ); } -#endif } static LONG load_VDMX(GdiFont*, LONG);

1 0

[fireball] 42340: - Move GDIPOINTER inside DEVOBJ, where it belongs. - Bring in and use mouse safety functions from trunk.
by fireball＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: fireball Date: Sun Aug 2 19:06:38 2009 New Revision: 42340 URL: http://svn.reactos.org/svn/reactos?rev=42340&view=rev Log: - Move GDIPOINTER inside DEVOBJ, where it belongs. - Bring in and use mouse safety functions from trunk. Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c branches/arwinss/reactos/subsystems/win32/win32k/include/devobj.h branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c [iso-8859-1] Sun Aug 2 19:06:38 2009 @@ -17,7 +17,6 @@ /* PUBLIC FUNCTIONS **********************************************************/ -GDIPOINTER Pointer; POINTL ptlPointer; VOID @@ -33,7 +32,7 @@ ASSERT(ppdev); ASSERT(psoDest); - pgp = &Pointer; + pgp = &ppdev->Pointer; if (!pgp->Enabled) { @@ -83,8 +82,7 @@ ASSERT(ppdev); ASSERT(psoDest); - - pgp = &Pointer; + pgp = &ppdev->Pointer; if (pgp->Enabled) { @@ -169,6 +167,91 @@ ROP3_TO_ROP4(SRCINVERT), FALSE); } +} + +/* + * FUNCTION: Notify the mouse driver that drawing is about to begin in + * a rectangle on a particular surface. + */ +INT FASTCALL +MouseSafetyOnDrawStart(SURFOBJ *pso, + LONG HazardX1, + LONG HazardY1, + LONG HazardX2, + LONG HazardY2) +{ + LONG tmp; + PDEVOBJ *ppdev; + GDIPOINTER *pgp; + + ASSERT(pso != NULL); + + ppdev = GDIDEV(pso); + if (!ppdev) return FALSE; + + pgp = &ppdev->Pointer; + + if (pgp->Exclude.right == -1) + return FALSE; + + ppdev->SafetyRemoveCount++; + + if (ppdev->SafetyRemoveLevel != 0) + return FALSE; + + if (HazardX1 > HazardX2) + { + tmp = HazardX2; + HazardX2 = HazardX1; + HazardX1 = tmp; + } + if (HazardY1 > HazardY2) + { + tmp = HazardY2; + HazardY2 = HazardY1; + HazardY1 = tmp; + } + + if (pgp->Exclude.right >= HazardX1 + && pgp->Exclude.left <= HazardX2 + && pgp->Exclude.bottom >= HazardY1 + && pgp->Exclude.top <= HazardY2) + { + ppdev->SafetyRemoveLevel = ppdev->SafetyRemoveCount; + ppdev->pfnMovePointer(pso, -1, -1, NULL); + } + + return TRUE; +} + +/* + * FUNCTION: Notify the mouse driver that drawing has finished on a surface. + */ +INT FASTCALL +MouseSafetyOnDrawEnd(SURFOBJ *pso) +{ + PDEVOBJ *ppdev; + GDIPOINTER *pgp; + + ASSERT(pso != NULL); + + ppdev = (PDEVOBJ*)pso->hdev; + + if (!ppdev) return FALSE; + + pgp = &ppdev->Pointer; + + if (pgp->Exclude.right == -1) + return FALSE; + + if (--ppdev->SafetyRemoveCount >= ppdev->SafetyRemoveLevel) + return FALSE; + + ppdev->pfnMovePointer(pso, ptlPointer.x, ptlPointer.y, &pgp->Exclude); + + ppdev->SafetyRemoveLevel = 0; + + return TRUE; } /* @@ -197,7 +280,7 @@ ASSERT(pso); ppdev = GDIDEV(pso); - pgp = &Pointer; + pgp = &ppdev->Pointer; IntHideMousePointer(ppdev, pso); @@ -386,7 +469,7 @@ ppdev = GDIDEV(pso); ASSERT(ppdev); - pgp = &Pointer; + pgp = &ppdev->Pointer; IntHideMousePointer(ppdev, pso); Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/devobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/devobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/devobj.h [iso-8859-1] Sun Aug 2 19:06:38 2009 @@ -17,8 +17,13 @@ }; ULONG DisplayNumber; DEVMODEW DMW; - PFILE_OBJECT VideoFileObject; + PFILE_OBJECT VideoFileObject; BOOLEAN PreparedDriver; + GDIPOINTER Pointer; + /* Stuff to keep track of software cursors; win32k gdi part */ + UINT SafetyRemoveLevel; /* at what level was the cursor removed? + 0 for not removed */ + UINT SafetyRemoveCount; } PDEVOBJ, *PPDEVOBJ; extern PPDEVOBJ pPrimarySurface; Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] Sun Aug 2 19:06:38 2009 @@ -212,6 +212,8 @@ BRUSHOBJ* pbo, LONG x, LONG y, LONG deltax, LONG deltay, POINTL* Translate); +/* Mouse pointer */ + BOOL NTAPI GreSetCursor(ICONINFO* NewCursor, PSYSTEM_CURSORINFO CursorInfo); @@ -222,5 +224,14 @@ LONG y, RECTL *prcl); +INT FASTCALL +MouseSafetyOnDrawStart(SURFOBJ *pso, + LONG HazardX1, + LONG HazardY1, + LONG HazardX2, + LONG HazardY2); + +INT FASTCALL +MouseSafetyOnDrawEnd(SURFOBJ *pso); #endif Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h [iso-8859-1] Sun Aug 2 19:06:38 2009 @@ -45,7 +45,4 @@ #define SURFACE_LockBitmapBits(x) #define SURFACE_UnlockBitmapBits(x) -#define MouseSafetyOnDrawStart(srf, a, b, c, d) -#define MouseSafetyOnDrawEnd(srf) - #endif Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Sun Aug 2 19:06:38 2009 @@ -36,6 +36,7 @@ /* Eng and GRE stuff */ #include <driver.h> #include <engevent.h> +#include <cursor.h> #include <devobj.h> #include <gdiobj.h> #include <surfobj.h> @@ -46,7 +47,6 @@ #include <floatobj.h> #include <xformobj.h> #include <xlateobj.h> -#include <cursor.h> #include <gre.h> #include <monitor.h>

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