Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 42319: - Merge: gschneider * r42318 reactos/subsystems/win32/win32k/eng/mouse.c: Fix a typo in EngMovePointer.
by fireball＠svn.reactos.org 31 Jul '09

31 Jul '09

Author: fireball Date: Fri Jul 31 22:13:27 2009 New Revision: 42319 URL: http://svn.reactos.org/svn/reactos?rev=42319&view=rev Log: - Merge: gschneider * r42318 reactos/subsystems/win32/win32k/eng/mouse.c: Fix a typo in EngMovePointer. Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c 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] Fri Jul 31 22:13:27 2009 @@ -399,7 +399,7 @@ if (prcl != NULL) { prcl->left = x - pgp->HotSpot.x; - prcl->top = y - pgp->HotSpot.x; + prcl->top = y - pgp->HotSpot.y; prcl->right = prcl->left + pgp->Size.cx; prcl->bottom = prcl->top + pgp->Size.cy; }

1 0

[gschneider] 42318: Fix a typo in EngMovePointer
by gschneider＠svn.reactos.org 31 Jul '09

31 Jul '09

Author: gschneider Date: Fri Jul 31 21:55:16 2009 New Revision: 42318 URL: http://svn.reactos.org/svn/reactos?rev=42318&view=rev Log: Fix a typo in EngMovePointer Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Fri Jul 31 21:55:16 2009 @@ -513,7 +513,7 @@ if (prcl != NULL) { prcl->left = x - pgp->HotSpot.x; - prcl->top = y - pgp->HotSpot.x; + prcl->top = y - pgp->HotSpot.y; prcl->right = prcl->left + pgp->Size.cx; prcl->bottom = prcl->top + pgp->Size.cy; }

1 0

[sginsberg] 42317: - ...mised this one
by sginsberg＠svn.reactos.org 31 Jul '09

31 Jul '09

Author: sginsberg Date: Fri Jul 31 20:40:19 2009 New Revision: 42317 URL: http://svn.reactos.org/svn/reactos?rev=42317&view=rev Log: - ...mised this one Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/co… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/coord.c [iso-8859-1] Fri Jul 31 20:40:19 2009 @@ -14,8 +14,8 @@ __asm__ __volatile__ ("fistpl %0" : "=m" (out) : "t" (in) : "st"); #else #define FLOAT_TO_INT(in,out) \ - __asm fld in \ - __asm fistp out + __asm fld in; \ + __asm fistp out; #endif LONG

1 0

[gschneider] 42316: Remove leftover debug print
by gschneider＠svn.reactos.org 31 Jul '09

31 Jul '09

Author: gschneider Date: Fri Jul 31 20:32:33 2009 New Revision: 42316 URL: http://svn.reactos.org/svn/reactos?rev=42316&view=rev Log: Remove leftover debug print Modified: trunk/reactos/dll/win32/user32/windows/icon.c Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] Fri Jul 31 20:32:33 2009 @@ -110,7 +110,6 @@ } else { - FIXME("loading %d bpp color cursor\n", IconImage->icHeader.biBitCount); IconInfo.hbmColor = CreateDIBitmap(hDC, &IconImage->icHeader, CBM_INIT, ImageData, (BITMAPINFO*)IconImage, DIB_RGB_COLORS);

1 0

[sginsberg] 42315: - Fix gdi32 build due to missing "; "
by sginsberg＠svn.reactos.org 31 Jul '09

31 Jul '09

Author: sginsberg Date: Fri Jul 31 20:30:37 2009 New Revision: 42315 URL: http://svn.reactos.org/svn/reactos?rev=42315&view=rev Log: - Fix gdi32 build due to missing ";" Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c 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] Fri Jul 31 20:30:37 2009 @@ -1539,7 +1539,7 @@ { PDC_ATTR pDc_Attr; HGDIOBJ hOldObj = NULL; - UINT uType + UINT uType; // PTEB pTeb; if(!GdiGetHandleUserData(hDC, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr))

1 0

[sginsberg] 42314: - delayimp.h: Use FORCEINLINE instead of static __inline__ - winbase.h: Make winbase.h usable by MSVC - winuser.h: Add missing const specifiers to GetTabbedTextExtentA/W, TabbedTextOutA/W, ToAscii/Ex and ToUnicode/Ex - Make gdi32, user32, beepmidi and csrss drmk build in msvc - Fix most msvc issues in win32k -- a few remain - Make ntoskrnl compile with /W1 again
by sginsberg＠svn.reactos.org 31 Jul '09

31 Jul '09

Author: sginsberg Date: Fri Jul 31 20:21:24 2009 New Revision: 42314 URL: http://svn.reactos.org/svn/reactos?rev=42314&view=rev Log: - delayimp.h: Use FORCEINLINE instead of static __inline__ - winbase.h: Make winbase.h usable by MSVC - winuser.h: Add missing const specifiers to GetTabbedTextExtentA/W, TabbedTextOutA/W, ToAscii/Ex and ToUnicode/Ex - Make gdi32, user32, beepmidi and csrss drmk build in msvc - Fix most msvc issues in win32k -- a few remain - Make ntoskrnl compile with /W1 again Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.c trunk/reactos/dll/win32/gdi32/misc/wingl.c trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp trunk/reactos/include/psdk/delayimp.h trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/winuser.h trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/ntoskrnl/mm/pool.c trunk/reactos/subsystems/win32/csrss/api/handle.c trunk/reactos/subsystems/win32/csrss/api/wapi.c trunk/reactos/subsystems/win32/win32k/eng/engbrush.c trunk/reactos/subsystems/win32/win32k/eng/engmisc.c trunk/reactos/subsystems/win32/win32k/eng/mem.c trunk/reactos/subsystems/win32/win32k/ldr/loader.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c trunk/reactos/subsystems/win32/win32k/objects/drawing.c trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -142,11 +142,13 @@ while ( ( node != NULL ) && ( arp_notes <= POLYPHONY ) ) { - DPRINT("playing..\n"); BEEP_SET_PARAMETERS beep_data; DWORD actually_playing = 0; double frequency = node->note; + + DPRINT("playing..\n"); + frequency = frequency / 12; frequency = pow(2, frequency); frequency = 8.1758 * frequency; @@ -481,9 +483,9 @@ { HANDLE heap = GetProcessHeap(); + NoteNode* node; + DPRINT("PlayNote\n"); - - NoteNode* node; if ( velocity == 0 ) { @@ -757,8 +759,8 @@ Exported function that receives messages from WINMM (the MME API.) */ +MMRESULT FAR PASCAL -MMRESULT modMessage( UINT device_id, UINT message, @@ -839,7 +841,8 @@ Driver entrypoint. */ -FAR PASCAL LONG +LONG +FAR PASCAL DriverProc( DWORD driver_id, HDRVR driver_handle, Modified: trunk/reactos/dll/win32/gdi32/misc/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/wingl… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/wingl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/wingl.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -28,11 +28,11 @@ -typedef int WINAPI (*CHOOSEPIXELFMT) (HDC, CONST PIXELFORMATDESCRIPTOR *); -typedef BOOL WINAPI (*SETPIXELFMT) (HDC, int, CONST PIXELFORMATDESCRIPTOR *); -typedef BOOL WINAPI (*SWAPBUFFERS) (HDC hdc); -typedef int WINAPI (*DESCRIBEPIXELFMT) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR); -typedef int WINAPI (*GETPIXELFMT) (HDC); +typedef int (WINAPI *CHOOSEPIXELFMT) (HDC, CONST PIXELFORMATDESCRIPTOR *); +typedef BOOL (WINAPI *SETPIXELFMT) (HDC, int, CONST PIXELFORMATDESCRIPTOR *); +typedef BOOL (WINAPI *SWAPBUFFERS) (HDC hdc); +typedef int (WINAPI *DESCRIBEPIXELFMT) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR); +typedef int (WINAPI *GETPIXELFMT) (HDC); static CHOOSEPIXELFMT glChoosePixelFormat = NULL; 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] Fri Jul 31 20:21:24 2009 @@ -1539,6 +1539,7 @@ { PDC_ATTR pDc_Attr; HGDIOBJ hOldObj = NULL; + UINT uType // PTEB pTeb; if(!GdiGetHandleUserData(hDC, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) @@ -1553,7 +1554,7 @@ return NULL; } - UINT uType = GDI_HANDLE_GET_TYPE(hGdiObj); + uType = GDI_HANDLE_GET_TYPE(hGdiObj); switch (uType) { Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -61,9 +61,11 @@ static __inline PVOID DesktopPtrToUser(PVOID Ptr) { + PCLIENTINFO pci; + PDESKTOPINFO pdi; GetW32ThreadInfo(); - PCLIENTINFO pci = GetWin32ClientInfo(); - PDESKTOPINFO pdi = pci->pDeskInfo; + pci = GetWin32ClientInfo(); + pdi = pci->pDeskInfo; ASSERT(Ptr != NULL); ASSERT(pdi != NULL); Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -1234,9 +1234,10 @@ { HMENU hmenu = LoadMenuW(User32Instance, L"SYSMENU"); LRESULT Result = (LRESULT)hmenu; + MENUINFO menuinfo = {0}; + MENUITEMINFOW info = {0}; // removing space for checkboxes from menu - MENUINFO menuinfo = {0}; menuinfo.cbSize = sizeof(menuinfo); menuinfo.fMask = MIM_STYLE; GetMenuInfo(hmenu, &menuinfo); @@ -1244,7 +1245,6 @@ SetMenuInfo(hmenu, &menuinfo); // adding bitmaps to menu items - MENUITEMINFOW info = {0}; info.cbSize = sizeof(info); info.fMask |= MIIM_BITMAP; info.hbmpItem = HBMMENU_POPUP_MINIMIZE; Modified: trunk/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drm/drmk… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -24,7 +24,8 @@ /* * @unimplemented */ -NTAPI NTSTATUS +NTSTATUS +NTAPI DrmAddContentHandlers( IN ULONG ContentId, IN PVOID *paHandlers, @@ -41,7 +42,8 @@ /* * @unimplemented */ -NTAPI NTSTATUS +NTSTATUS +NTAPI DrmCreateContentMixed( IN PULONG paContentId, IN ULONG cContentId, @@ -57,7 +59,8 @@ /* * @unimplemented */ -NTAPI NTSTATUS +NTSTATUS +NTAPI DrmDestroyContent( IN ULONG ContentId) { @@ -72,7 +75,8 @@ /* * @unimplemented */ -NTAPI NTSTATUS +NTSTATUS +NTAPI DrmForwardContentToDeviceObject( IN ULONG ContentId, IN PVOID Reserved, @@ -90,7 +94,8 @@ /* * @unimplemented */ -NTAPI NTSTATUS +NTSTATUS +NTAPI DrmForwardContentToFileObject( IN ULONG ContentId, IN PFILE_OBJECT FileObject) @@ -106,7 +111,8 @@ /* * @unimplemented */ -NTAPI NTSTATUS +NTSTATUS +NTAPI DrmForwardContentToInterface( IN ULONG ContentId, IN PUNKNOWN pUnknown, @@ -122,7 +128,8 @@ /* * @unimplemented */ -NTAPI NTSTATUS +NTSTATUS +NTAPI DrmGetContentRights( IN ULONG ContentId, OUT PDRMRIGHTS DrmRights) @@ -130,4 +137,3 @@ UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } - Modified: trunk/reactos/include/psdk/delayimp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/delayimp.h?re… ============================================================================== --- trunk/reactos/include/psdk/delayimp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/delayimp.h [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -65,7 +65,7 @@ typedef FARPROC (WINAPI *PfnDliHook)(unsigned, PDelayLoadInfo); -static __inline__ +FORCEINLINE unsigned IndexFromPImgThunkData(PCImgThunkData pData, PCImgThunkData pBase) { @@ -74,7 +74,7 @@ extern const IMAGE_DOS_HEADER __ImageBase; -static __inline__ +FORCEINLINE PVOID PFromRva(RVA rva) { Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -1872,6 +1872,15 @@ VOID WINAPI InitializeSListHead(PSLIST_HEADER); USHORT WINAPI QueryDepthSList(PSLIST_HEADER); +#ifdef _MSC_VER + +// +// Intrinsics are a mess -- *sigh* +// +long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand); +#pragma intrinsic(_InterlockedCompareExchange) +#endif + #if !defined(InterlockedAnd) #define InterlockedAnd InterlockedAnd_Inline FORCEINLINE Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -4090,8 +4090,8 @@ #define GetSysModalWindow() (NULL) HMENU WINAPI GetSystemMenu(HWND,BOOL); int WINAPI GetSystemMetrics(int); -DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,LPINT); -DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,LPINT); +DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,CONST LPINT); +DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,CONST LPINT); LONG WINAPI GetWindowLongA(HWND,int); LONG WINAPI GetWindowLongW(HWND,int); #ifdef _WIN64 @@ -4411,13 +4411,13 @@ #endif /* (_WIN32_WINNT >= 0x0500) */ BOOL WINAPI SystemParametersInfoA(UINT,UINT,PVOID,UINT); BOOL WINAPI SystemParametersInfoW(UINT,UINT,PVOID,UINT); -LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,LPINT,int); -LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,LPINT,int); +LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,CONST LPINT,int); +LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,CONST LPINT,int); WORD WINAPI TileWindows(HWND,UINT,LPCRECT,UINT,const HWND *); -int WINAPI ToAscii(UINT,UINT,PBYTE,LPWORD,UINT); -int WINAPI ToAsciiEx(UINT,UINT,PBYTE,LPWORD,UINT,HKL); -int WINAPI ToUnicode(UINT,UINT,PBYTE,LPWSTR,int,UINT); -int WINAPI ToUnicodeEx(UINT,UINT,PBYTE,LPWSTR,int,UINT,HKL); +int WINAPI ToAscii(UINT,UINT,CONST PBYTE,LPWORD,UINT); +int WINAPI ToAsciiEx(UINT,UINT,CONST PBYTE,LPWORD,UINT,HKL); +int WINAPI ToUnicode(UINT,UINT,CONST PBYTE,LPWSTR,int,UINT); +int WINAPI ToUnicodeEx(UINT,UINT,CONST PBYTE,LPWSTR,int,UINT,HKL); BOOL WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT); BOOL WINAPI TrackPopupMenu(HMENU,UINT,int,int,int,HWND,LPCRECT); BOOL WINAPI TrackPopupMenuEx(HMENU,UINT,int,int,HWND,LPTPMPARAMS); Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -379,7 +379,11 @@ // // Quickly deal with big page allocations // - if (PAGE_ALIGN(P) == P) return (VOID)MiFreePoolPages(P); + if (PAGE_ALIGN(P) == P) + { + (VOID)MiFreePoolPages(P); + return; + } // // Get the entry for this pool allocation @@ -497,7 +501,8 @@ // In this case, release the nonpaged pool lock, and free the page // KeReleaseQueuedSpinLock(LockQueueNonPagedPoolLock, OldIrql); - return (VOID)MiFreePoolPages(Entry); + (VOID)MiFreePoolPages(Entry); + return; } // Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=423… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -291,7 +291,7 @@ #endif ExFreePagedPool(Block); } - else if (Block) return ExFreeArmPoolWithTag(Block, Tag); + else if (Block) ExFreeArmPoolWithTag(Block, Tag); else { /* Warn only for NULL pointers */ Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -180,7 +180,7 @@ RtlCopyMemory(Block, ProcessData->HandleTable, ProcessData->HandleTableSize * sizeof(CSRSS_HANDLE)); - Block = _InterlockedExchangePointer((volatile void*)&ProcessData->HandleTable, Block); + Block = _InterlockedExchangePointer((void* volatile)&ProcessData->HandleTable, Block); RtlFreeHeap( CsrssApiHeap, 0, Block ); ProcessData->HandleTableSize += 64; } Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/wapi.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -123,7 +123,7 @@ IN HANDLE hApiListenPort) { NTSTATUS Status; - HANDLE ServerPort = (HANDLE) 0; + HANDLE ServerPort = NULL, ServerThread = NULL; PCSRSS_PROCESS_DATA ProcessData = NULL; REMOTE_PORT_VIEW LpcRead; LpcRead.Length = sizeof(LpcRead); @@ -167,7 +167,6 @@ return Status; } - HANDLE ServerThread = (HANDLE) 0; Status = RtlCreateUserThread(NtCurrentProcess(), NULL, FALSE, Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -156,7 +156,9 @@ } /* Copy the bits to the new format bitmap */ - rclDest = (RECTL){0, 0, psoPattern->sizlBitmap.cx, psoPattern->sizlBitmap.cy}; + rclDest.left = rclDest.top = 0; + rclDest.right = psoPattern->sizlBitmap.cx; + rclDest.bottom = psoPattern->sizlBitmap.cy; EngCopyBits(psoRealize, psoPattern, NULL, pxlo, &rclDest, &ptlSrc); /* Unlock the bitmap again */ Modified: trunk/reactos/subsystems/win32/win32k/eng/engmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -250,7 +250,7 @@ OUT PUSHORT AnsiCodePage) { /* Forward to kernel */ - return RtlGetDefaultCodePage(AnsiCodePage, OemCodePage); + RtlGetDefaultCodePage(AnsiCodePage, OemCodePage); } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/eng/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mem.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -175,7 +175,7 @@ VOID APIENTRY EngUnsecureMem(HANDLE Mem) { - return MmUnsecureVirtualMemory((PVOID) Mem); + MmUnsecureVirtualMemory((PVOID) Mem); } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ld… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ldr/loader.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ldr/loader.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -228,8 +228,9 @@ DPRINT1("ZwSetSystemInformation failed with Status 0x%lx\n", Status); } else { + PDRIVERS DriverInfo; hImageHandle = (HANDLE)GdiDriverInfo.ImageAddress; - PDRIVERS DriverInfo = ExAllocatePool(PagedPool, sizeof(DRIVERS)); + DriverInfo = ExAllocatePool(PagedPool, sizeof(DRIVERS)); DriverInfo->DriverName.MaximumLength = GdiDriverInfo.DriverName.MaximumLength; DriverInfo->DriverName.Length = GdiDriverInfo.DriverName.Length; DriverInfo->DriverName.Buffer = ExAllocatePool(PagedPool, GdiDriverInfo.DriverName.MaximumLength); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -292,6 +292,7 @@ NULL); if(NT_SUCCESS(Status)) { + BOOL ret; if (Menu->MenuInfo.Wnd) { Window = UserGetWindowObject(Menu->MenuInfo.Wnd); @@ -301,7 +302,7 @@ } } // UserDereferenceObject(Menu); - BOOL ret = UserDeleteObject(Menu->MenuInfo.Self, otMenu); + ret = UserDeleteObject(Menu->MenuInfo.Self, otMenu); ObDereferenceObject(WindowStation); return ret; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -872,9 +872,10 @@ DPRINT("NtUserProcessConnect\n"); if (pUserConnect && ( Size == sizeof(USERCONNECT) )) { + PPROCESSINFO W32Process; UserEnterShared(); GetW32ThreadInfo(); - PPROCESSINFO W32Process = PsGetCurrentProcessWin32Process(); + W32Process = PsGetCurrentProcessWin32Process(); _SEH2_TRY { pUserConnect->siClient.psi = gpsi; Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -127,8 +127,8 @@ CONST LPXFORM lpXForm, DWORD Mode) { + XFORM xformWorld2Wnd; ASSERT(pDc); - XFORM xformWorld2Wnd; switch (Mode) { Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -658,7 +658,8 @@ pdcattrNew->ulDirty_ = pdcattrOld->ulDirty_; pdcattrNew->iCS_CP = pdcattrOld->iCS_CP; - pdcNew->erclWindow = (RECTL){0, 0, 1, 1}; + pdcNew->erclWindow.left = pdcNew->erclWindow.top = 0; + pdcNew->erclWindow.right = pdcNew->erclWindow.bottom = 1; DC_UnlockDc(pdcNew); DC_UnlockDc(pdcOld); Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -713,8 +713,9 @@ } static +POINT FASTCALL -POINT app_boundary_point(Rect r, int angle) +app_boundary_point(Rect r, int angle) { int cx, cy; double tangent; Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -25,14 +25,17 @@ if (!(Device->flFlags & PDEV_DRIVER_PUNTED_CALL) && (Surface->dhsurf)) { if (Device->DriverFunctions.SynchronizeSurface) - return Device->DriverFunctions.SynchronizeSurface(Surface, Rect, fl); + { + Device->DriverFunctions.SynchronizeSurface(Surface, Rect, fl); + } else { if (Device->DriverFunctions.Synchronize) - return Device->DriverFunctions.Synchronize(Surface->dhpdev, Rect); + { + Device->DriverFunctions.Synchronize(Surface->dhpdev, Rect); + } } } - return; } VOID Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -349,6 +349,9 @@ POBJ newObject = NULL; HANDLE CurrentProcessId, LockedProcessId; UCHAR TypeIndex; + UINT Index; + PGDI_TABLE_ENTRY Entry; + LONG TypeInfo; GDIDBG_INITLOOPTRACE(); @@ -372,10 +375,6 @@ DPRINT1("Not enough memory to allocate gdi object!\n"); return NULL; } - - UINT Index; - PGDI_TABLE_ENTRY Entry; - LONG TypeInfo; CurrentProcessId = PsGetCurrentProcessId(); LockedProcessId = (HANDLE)((ULONG_PTR)CurrentProcessId | 0x1); Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -64,8 +64,9 @@ FASTCALL PATH_Delete(HPATH hPath) { + PPATH pPath; if (!hPath) return FALSE; - PPATH pPath = PATH_LockPath( hPath ); + pPath = PATH_LockPath( hPath ); if (!pPath) return FALSE; PATH_DestroyGdiPath( pPath ); PATH_UnlockPath( pPath ); Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Fri Jul 31 20:21:24 2009 @@ -2081,7 +2081,7 @@ REGION_Delete(PROSRGNDATA pRgn) { if ( pRgn == prgnDefault) return; - return REGION_FreeRgn(pRgn); + REGION_FreeRgn(pRgn); }

1 0

[gschneider] 42313: - Use system wide caret width and height if one of those parameters is zero - Ref: http://msdn.microsoft.com/en-us/library/ms648399(VS.85).aspx - Allows to show the caret in riched20a components (Wordpad f.e.) See issue #1559 for more details.
by gschneider＠svn.reactos.org 31 Jul '09

31 Jul '09

Author: gschneider Date: Fri Jul 31 19:11:21 2009 New Revision: 42313 URL: http://svn.reactos.org/svn/reactos?rev=42313&view=rev Log: - Use system wide caret width and height if one of those parameters is zero - Ref: http://msdn.microsoft.com/en-us/library/ms648399(VS.85).aspx - Allows to show the caret in riched20a components (Wordpad f.e.) See issue #1559 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] Fri Jul 31 19:11:21 2009 @@ -355,6 +355,14 @@ } else { + if (nWidth == 0) + { + nWidth = UserGetSystemMetrics(SM_CXBORDER); + } + if (nHeight == 0) + { + nHeight = UserGetSystemMetrics(SM_CYBORDER); + } ThreadQueue->CaretInfo->Bitmap = (HBITMAP)0; ThreadQueue->CaretInfo->Size.cx = nWidth; ThreadQueue->CaretInfo->Size.cy = nHeight;

1 0

[dgorbachev] 42312: Fix _M_X86 -> _M_IX86.
by dgorbachev＠svn.reactos.org 31 Jul '09

31 Jul '09

Author: dgorbachev Date: Fri Jul 31 18:32:22 2009 New Revision: 42312 URL: http://svn.reactos.org/svn/reactos?rev=42312&view=rev Log: Fix _M_X86 -> _M_IX86. Modified: trunk/reactos/ntoskrnl/ex/shutdown.c Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] Fri Jul 31 18:32:22 2009 @@ -28,7 +28,7 @@ while (TRUE) { KeRaiseIrql(SYNCH_LEVEL, &OldIrql); -#if defined(_M_X86) +#if defined(_M_IX86) Ke386HaltProcessor(); #else HalProcessorIdle();

1 0

[gschneider] 42311: - Implement Floodfill: iterative four neighbors version - Details for this algorithm are described in the comments - Nice with the paint clone since the bucket fill tool works now
by gschneider＠svn.reactos.org 31 Jul '09

31 Jul '09

Author: gschneider Date: Fri Jul 31 17:41:09 2009 New Revision: 42311 URL: http://svn.reactos.org/svn/reactos?rev=42311&view=rev Log: - Implement Floodfill: iterative four neighbors version - Details for this algorithm are described in the comments - Nice with the paint clone since the bucket fill tool works now Added: trunk/reactos/subsystems/win32/win32k/dib/floodfill.c (with props) Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.h trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] Fri Jul 31 17:41:09 2009 @@ -133,6 +133,7 @@ BOOLEAN DIB_32BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); +BOOLEAN DIB_XXBPP_FloodFill(SURFOBJ*, BRUSHOBJ*, RECTL*, POINTL*, XLATEOBJ*, COLORREF, UINT); extern unsigned char notmask[2]; extern unsigned char altnotmask[2]; Added: trunk/reactos/subsystems/win32/win32k/dib/floodfill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/floodfill.c (added) +++ trunk/reactos/subsystems/win32/win32k/dib/floodfill.c [iso-8859-1] Fri Jul 31 17:41:09 2009 @@ -1,0 +1,168 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS win32 subsystem + * PURPOSE: Flood filling support + * FILE: subsystems/win32/win32k/dib/floodfill.c + * PROGRAMMER: Gregor Schneider, <grschneider AT gmail DOT com> + */ + +#include <w32k.h> + +#define NDEBUG +#include <debug.h> + +/* +* This floodfill algorithm is an iterative four neighbors version. It works with an internal stack like data structure. +* The stack is kept in an array, sized for the worst case scenario of having to add all pixels of the surface. +* This avoids having to allocate and free memory blocks all the time. The stack grows from the end of the array towards the start. +* All pixels are checked before being added, against belonging to the fill rule (FLOODFILLBORDER or FLOODFILLSURFACE) +* and the position in respect to the clip region. This guarantees all pixels lying on the stack belong to the filled surface. +* Further optimisations of the algorithm are possible. +*/ + +/* Floodfil helper structures and functions */ +typedef struct _floodItem +{ + ULONG x; + ULONG y; +} FLOODITEM; + +static ULONG floodLen = 0; +static FLOODITEM *floodStart = NULL, *floodData = NULL; + +static __inline BOOL initFlood(RECTL *DstRect) +{ + ULONG width = DstRect->right - DstRect->left; + ULONG height = DstRect->bottom - DstRect->top; + floodData = ExAllocatePoolWithTag(NonPagedPool, width * height * sizeof(FLOODITEM), TAG_DIB); + if (floodData == NULL) + { + return FALSE; + } + floodStart = (FLOODITEM*)((PBYTE)floodData + (width * height * sizeof(FLOODITEM))); + return TRUE; +} +static __inline VOID finalizeFlood() +{ + ExFreePoolWithTag(floodData, TAG_DIB); +} +static __inline VOID addItemFlood(ULONG x, + ULONG y, + SURFOBJ *DstSurf, + RECTL *DstRect, + XLATEOBJ* ColorTranslation, + COLORREF Color, + BOOL isSurf) +{ + if (x >= DstRect->left && x <= DstRect->right && + y >= DstRect->top && y <= DstRect->bottom) + { + if (isSurf == TRUE && XLATEOBJ_iXlate(ColorTranslation, + DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y)) != Color) + { + return; + } + else if (isSurf == FALSE && XLATEOBJ_iXlate(ColorTranslation, + DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y)) == Color) + { + return; + } + floodStart--; + floodStart->x = x; + floodStart->y = y; + floodLen++; + } +} +static __inline VOID removeItemFlood() +{ + floodStart++; + floodLen--; +} +static __inline BOOL isEmptyFlood() +{ + if (floodLen == 0) + { + return TRUE; + } + return FALSE; +} + +BOOLEAN DIB_XXBPP_FloodFill(SURFOBJ *DstSurf, + BRUSHOBJ *Brush, + RECTL *DstRect, + POINTL *Origin, + XLATEOBJ *ColorTranslation, + COLORREF Color, + UINT FillType) +{ + ULONG x, y; + ULONG BrushColor; + + BrushColor = Brush->iSolidColor; + x = Origin->x; + y = Origin->y; + + if (FillType == FLOODFILLBORDER) + { + /* Check if the start pixel has the border color */ + if (XLATEOBJ_iXlate(ColorTranslation, + DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y)) == Color) + { + return FALSE; + } + + if (initFlood(DstRect) == FALSE) + { + return FALSE; + } + addItemFlood(x, y, DstSurf, DstRect, ColorTranslation, Color, FALSE); + while (!isEmptyFlood()) + { + x = floodStart->x; + y = floodStart->y; + removeItemFlood(); + + DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_PutPixel(DstSurf, x, y, BrushColor); + addItemFlood(x, y + 1, DstSurf, DstRect, ColorTranslation, Color, FALSE); + addItemFlood(x, y - 1, DstSurf, DstRect, ColorTranslation, Color, FALSE); + addItemFlood(x + 1, y, DstSurf, DstRect, ColorTranslation, Color, FALSE); + addItemFlood(x - 1, y, DstSurf, DstRect, ColorTranslation, Color, FALSE); + } + finalizeFlood(); + } + else if (FillType == FLOODFILLSURFACE) + { + /* Check if the start pixel has the surface color */ + if (XLATEOBJ_iXlate(ColorTranslation, + DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y)) != Color) + { + return FALSE; + } + + if (initFlood(DstRect) == FALSE) + { + return FALSE; + } + addItemFlood(x, y, DstSurf, DstRect, ColorTranslation, Color, TRUE); + while (!isEmptyFlood()) + { + x = floodStart->x; + y = floodStart->y; + removeItemFlood(); + + DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_PutPixel(DstSurf, x, y, BrushColor); + addItemFlood(x, y + 1, DstSurf, DstRect, ColorTranslation, Color, TRUE); + addItemFlood(x, y - 1, DstSurf, DstRect, ColorTranslation, Color, TRUE); + addItemFlood(x + 1, y, DstSurf, DstRect, ColorTranslation, Color, TRUE); + addItemFlood(x - 1, y, DstSurf, DstRect, ColorTranslation, Color, TRUE); + + } + finalizeFlood(); + } + else + { + DPRINT1("Unsupported FloodFill type!\n"); + return FALSE; + } + return TRUE; +} Propchange: trunk/reactos/subsystems/win32/win32k/dib/floodfill.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Fri Jul 31 17:41:09 2009 @@ -1072,12 +1072,11 @@ PDC dc; PDC_ATTR pdcattr; SURFACE *psurf = NULL; - PBRUSH pbrFill = NULL; + HPALETTE Pal = 0; + XLATEOBJ *XlateObj = NULL; BOOL Ret = FALSE; RECTL DestRect; POINTL Pt; - - DPRINT1("FIXME: NtGdiExtFloodFill is UNIMPLEMENTED\n"); dc = DC_LockDc(hDC); if (!dc) @@ -1110,17 +1109,21 @@ else goto cleanup; - pbrFill = dc->dclevel.pbrFill; - if (!pbrFill) + psurf = dc->dclevel.pSurface; + if (!psurf) { Ret = FALSE; goto cleanup; } - psurf = dc->dclevel.pSurface; - if (!psurf) - { - Ret = FALSE; - goto cleanup; + + Pal = dc->dclevel.pSurface->hDIBPalette; + if (!Pal) Pal = pPrimarySurface->DevInfo.hpalDefault; + XlateObj = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, 0, NULL, Pal); + + if (XlateObj != NULL) + { + Ret = DIB_XXBPP_FloodFill(&psurf->SurfObj, &dc->eboFill.BrushObject, &DestRect, &Pt, XlateObj, Color, FillType); + EngDeleteXlate(XlateObj); } cleanup: 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] Fri Jul 31 17:41:09 2009 @@ -31,6 +31,7 @@ <file>dib32bpp.c</file> <file>dibXXbpp.c</file> <file>dib.c</file> + <file>floodfill.c</file> <if property="ARCH" value="i386"> <directory name="i386">

1 0

[janderwald] 42310: - Partly Implement KsRegisterFilterWithNoKSPins - Implement _KsEdit
by janderwald＠svn.reactos.org 31 Jul '09

31 Jul '09

Author: janderwald Date: Fri Jul 31 12:10:26 2009 New Revision: 42310 URL: http://svn.reactos.org/svn/reactos?rev=42310&view=rev Log: - Partly Implement KsRegisterFilterWithNoKSPins - Implement _KsEdit Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/bag.c Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Fri Jul 31 12:10:26 2009 @@ -1848,23 +1848,6 @@ KSDDKAPI NTSTATUS NTAPI -_KsEdit( - IN KSOBJECT_BAG ObjectBag, - IN OUT PVOID* PointerToPointerToItem, - IN ULONG NewSize, - IN ULONG OldSize, - IN ULONG Tag) -{ - UNIMPLEMENTED - return STATUS_UNSUCCESSFUL; -} - -/* - @unimplemented -*/ -KSDDKAPI -NTSTATUS -NTAPI KsGetBusEnumIdentifier( IN PIRP Irp) { @@ -2093,6 +2076,62 @@ IN KSPIN_MEDIUM* MediumList, IN GUID* CategoryList OPTIONAL) { + ULONG Size, Index; + NTSTATUS Status; + PWSTR SymbolicLinkList; + //PUCHAR Buffer; + HANDLE hKey; + UNICODE_STRING InterfaceString; + //UNICODE_STRING FilterData = RTL_CONSTANT_STRING(L"FilterData"); + + if (!InterfaceClassGUID || !PinCount || !PinDirection || !MediumList) + { + /* all these parameters are required */ + return STATUS_INVALID_PARAMETER; + } + + /* calculate filter data value size */ + Size = PinCount * sizeof(KSPIN_MEDIUM); + if (CategoryList) + { + /* add category list */ + Size += PinCount * sizeof(GUID); + } + + /* FIXME generate filter data blob */ UNIMPLEMENTED - return STATUS_UNSUCCESSFUL; -} + + /* get symbolic link list */ + Status = IoGetDeviceInterfaces(InterfaceClassGUID, DeviceObject, DEVICE_INTERFACE_INCLUDE_NONACTIVE, &SymbolicLinkList); + if (NT_SUCCESS(Status)) + { + /* initialize first symbolic link */ + RtlInitUnicodeString(&InterfaceString, SymbolicLinkList); + + /* open first device interface registry key */ + Status = IoOpenDeviceInterfaceRegistryKey(&InterfaceString, GENERIC_WRITE, &hKey); + + if (NT_SUCCESS(Status)) + { + /* write filter data */ + //Status = ZwSetValueKey(hKey, &FilterData, 0, REG_BINARY, Buffer, Size); + + /* close the key */ + ZwClose(hKey); + } + + if (PinCount) + { + /* update medium cache */ + for(Index = 0; Index < PinCount; Index++) + { + KsCacheMedium(&InterfaceString, &MediumList[Index], PinDirection[Index]); + } + } + + /* free the symbolic link list */ + ExFreePool(SymbolicLinkList); + } + + return Status; +} Modified: trunk/reactos/drivers/ksfilter/ks/bag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/bag.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] Fri Jul 31 12:10:26 2009 @@ -298,5 +298,94 @@ FreeItem(Bag); } - - +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +_KsEdit( + IN KSOBJECT_BAG ObjectBag, + IN OUT PVOID* PointerToPointerToItem, + IN ULONG NewSize, + IN ULONG OldSize, + IN ULONG Tag) +{ + PKSIOBJECT_BAG Bag; + PKSIOBJECT_BAG_ENTRY BagEntry; + PVOID Item; + NTSTATUS Status; + + /* get real object bag */ + Bag = (PKSIOBJECT_BAG)ObjectBag; + + /* acquire bag mutex */ + KeWaitForSingleObject(Bag->BagMutex, Executive, KernelMode, FALSE, NULL); + + + if (*PointerToPointerToItem) + { + /* search object bag for this entry */ + BagEntry = KspFindObjectBagItem(&Bag->ObjectList, *PointerToPointerToItem); + } + else + { + /* pointer to null, allocate new entry */ + BagEntry = NULL; + } + + if (!BagEntry || NewSize > OldSize) + { + /* entry does not exist or new entry must be allocated */ + Item = AllocateItem(NonPagedPool, NewSize); + + if (!Item) + { + /* not enough resources */ + KeReleaseMutex(Bag->BagMutex, FALSE); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* now add the item to the object bag */ + Status = KsAddItemToObjectBag((KSOBJECT_BAG)Bag, Item, NULL); + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* failed to add item */ + FreeItem(Item); + KeReleaseMutex(Bag->BagMutex, FALSE); + return Status; + } + + if (*PointerToPointerToItem) + { + /* object exists */ + if (OldSize >= NewSize) + { + /* copy old contents */ + RtlMoveMemory(Item, *PointerToPointerToItem, NewSize); + } + else + { + /* copy new contents */ + RtlMoveMemory(Item, *PointerToPointerToItem, OldSize); + } + } + + if (BagEntry) + { + /* remove old entry */ + KsRemoveItemFromObjectBag(ObjectBag, BagEntry->Item, TRUE); + } + + /* store item */ + *PointerToPointerToItem = Item; + } + + /* release bag mutex */ + KeReleaseMutex(Bag->BagMutex, FALSE); + + return STATUS_SUCCESS; +} + +

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