Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[cgutman] 42455: - Send a gratuitous ARP packet when our IP address changes

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 7 05:21:56 2009 New Revision: 42455 URL: http://svn.reactos.org/svn/reactos?rev=42455&view=rev Log: - Send a gratuitous ARP packet when our IP address changes Modified: trunk/reactos/lib/drivers/ip/network/arp.c trunk/reactos/lib/drivers/ip/network/ip.c Modified: trunk/reactos/lib/drivers/ip/network/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/arp… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] Fri Aug 7 05:21:56 2009 @@ -122,6 +122,11 @@ USHORT ProtoType; TI_DbgPrint(DEBUG_ARP, ("Called.\n")); + + /* If Address is NULL then the caller wants an + * gratuitous ARP packet sent */ + if (!Address) + Address = &Interface->Unicast; switch (Address->Type) { case IP_ADDRESS_V4: Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Fri Aug 7 05:21:56 2009 @@ -222,8 +222,12 @@ if (!RouterAddRoute(&NetworkAddress, &IF->Netmask, NCE, 1)) { TI_DbgPrint(MIN_TRACE, ("Could not add route due to insufficient resources.\n")); - return; - } + } + + /* Send a gratuitous ARP packet to update the route caches of + * other computers */ + if (IF != Loopback) + ARPTransmit(NULL, IF); } BOOLEAN IPRegisterInterface(

15 years, 1 month

[tkreuzer] 42454: Fix a serious bug, that led to reading beyound the end of the mask bitmap, if it was not twice as big as the color bitmap.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 7 05:14:55 2009 New Revision: 42454 URL: http://svn.reactos.org/svn/reactos?rev=42454&view=rev Log: Fix a serious bug, that led to reading beyound the end of the mask bitmap, if it was not twice as big as the color bitmap. 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 Aug 7 05:14:55 2009 @@ -331,7 +331,7 @@ if (psoMask) { // CHECKME: Is this really required? if we have a color surface, - // we only need the and part of the mask. + // we only need the AND part of the mask. /* Check if the sizes match as they should */ if (psoMask->sizlBitmap.cx != psoColor->sizlBitmap.cx || psoMask->sizlBitmap.cy != psoColor->sizlBitmap.cy * 2) @@ -429,7 +429,7 @@ hbmp = EngCreateBitmap(psoMask->sizlBitmap, lDelta, pso->iBitmapFormat, - 0, + BMF_TOPDOWN | BMF_NOZEROINIT, NULL); pgp->psurfMask = SURFACE_ShareLockSurface(hbmp); @@ -443,7 +443,7 @@ RGB(0xff,0xff,0xff), RGB(0,0,0)); - rcl.bottom = pgp->Size.cy * 2; + rcl.bottom = psoMask->sizlBitmap.cy; IntEngCopyBits(&pgp->psurfMask->SurfObj, psoMask, NULL, @@ -472,7 +472,7 @@ pgp->psurfColor = SURFACE_ShareLockSurface(hbmp); if (pgp->psurfColor) { - rcl.bottom = pgp->Size.cy; + rcl.bottom = psoColor->sizlBitmap.cy; IntEngCopyBits(&pgp->psurfColor->SurfObj, psoColor, NULL,

15 years, 1 month

[cgutman] 42453: - Fix a bug resulting in ROS discarding all gratuitous ARP packets - Remove an unnecessary check

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 7 04:39:38 2009 New Revision: 42453 URL: http://svn.reactos.org/svn/reactos?rev=42453&view=rev Log: - Fix a bug resulting in ROS discarding all gratuitous ARP packets - Remove an unnecessary check Modified: trunk/reactos/lib/drivers/ip/network/arp.c Modified: trunk/reactos/lib/drivers/ip/network/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/arp… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] Fri Aug 7 04:39:38 2009 @@ -179,7 +179,6 @@ IP_ADDRESS Address; PVOID SenderHWAddress; PVOID SenderProtoAddress; - PVOID TargetProtoAddress; PNEIGHBOR_CACHE_ENTRY NCE; PNDIS_PACKET NdisPacket; PIP_INTERFACE Interface = (PIP_INTERFACE)Context; @@ -202,17 +201,6 @@ SenderHWAddress = (PVOID)((ULONG_PTR)Header + sizeof(ARP_HEADER)); SenderProtoAddress = (PVOID)((ULONG_PTR)SenderHWAddress + Header->HWAddrLen); - - /* Check if we have the target protocol address */ - - TargetProtoAddress = (PVOID)((ULONG_PTR)SenderProtoAddress + - Header->ProtoAddrLen + Header->HWAddrLen); - - if( !AddrLocateADEv4( *((PIPv4_RAW_ADDRESS)TargetProtoAddress), - &Address) ) { - TI_DbgPrint(DEBUG_ARP, ("Target address (0x%X) is not mine.\n", *((PULONG)TargetProtoAddress))); - return; - } /* Check if we know the sender */ @@ -230,7 +218,7 @@ Header->HWAddrLen, NUD_REACHABLE); } - if (Header->Opcode != ARP_OPCODE_REQUEST || !NCE) + if (Header->Opcode != ARP_OPCODE_REQUEST) return; /* This is a request for our address. Swap the addresses and

15 years, 1 month

[hyperion] 42452: See r42442. One of the affected files was duplicated, so we duplicate the fix

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Aug 7 04:24:46 2009 New Revision: 42452 URL: http://svn.reactos.org/svn/reactos?rev=42452&view=rev Log: See r42442. One of the affected files was duplicated, so we duplicate the fix Added: trunk/reactos/include/reactos/libs/libjpeg/libjpeg.reactos.diff Modified: trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h Modified: trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libjp… ============================================================================== --- trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h [iso-8859-1] Fri Aug 7 04:24:46 2009 @@ -24,7 +24,6 @@ #if (defined (_MSC_VER) && (_MSC_VER >= 800)) #define HAVE_UNSIGNED_CHAR -#define HAVE_ALL_INTS #define EXTERN(type) extern type __cdecl #endif @@ -240,7 +239,7 @@ /* a function referenced thru EXTERNs: */ #define GLOBAL(type) type JPEG_API /* a reference to a GLOBAL function: */ -#ifndef EXTERN +#ifndef EXTERN # define EXTERN(type) extern JPEG_IMPEXP type JPEG_API /* a reference to a "GLOBAL" function exported by sourcefiles of utility progs */ #endif /* EXTERN */ Added: trunk/reactos/include/reactos/libs/libjpeg/libjpeg.reactos.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libjp… ============================================================================== --- trunk/reactos/include/reactos/libs/libjpeg/libjpeg.reactos.diff (added) +++ trunk/reactos/include/reactos/libs/libjpeg/libjpeg.reactos.diff [iso-8859-1] Fri Aug 7 04:24:46 2009 @@ -1,0 +1,12 @@ +Index: include/reactos/libs/libjpeg/jmorecfg.h +=================================================================== +--- include/reactos/libs/libjpeg/jmorecfg.h (revision 42441) ++++ include/reactos/libs/libjpeg/jmorecfg.h (working copy) +@@ -24,7 +24,6 @@ + + #if (defined (_MSC_VER) && (_MSC_VER >= 800)) + #define HAVE_UNSIGNED_CHAR +-#define HAVE_ALL_INTS + #define EXTERN(type) extern type __cdecl + #endif +

15 years, 1 month

[hyperion] 42451: modified base/applications/network/netstat/netstat.c Another mysterious case of stdlib.h being automatically included for gcc but not cl, another module compiling with Visual C++

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Aug 7 04:15:25 2009 New Revision: 42451 URL: http://svn.reactos.org/svn/reactos?rev=42451&view=rev Log: modified base/applications/network/netstat/netstat.c Another mysterious case of stdlib.h being automatically included for gcc but not cl, another module compiling with Visual C++ Modified: trunk/reactos/base/applications/network/netstat/netstat.c Modified: trunk/reactos/base/applications/network/netstat/netstat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/netstat/netstat.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/netstat/netstat.c [iso-8859-1] Fri Aug 7 04:15:25 2009 @@ -17,6 +17,7 @@ #include <winsock.h> #include <tchar.h> #include <stdio.h> +#include <stdlib.h> #include <iphlpapi.h> #include "netstat.h"

15 years, 1 month

[hyperion] 42450: modified lib/3rdparty/libsamplerate/libsamplerate.rbuild We have lrint and lrintf, don't provide inline implementations Three cheers for libsamplerate, congratulations to it for compiling on Visual C++

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Aug 7 04:10:12 2009 New Revision: 42450 URL: http://svn.reactos.org/svn/reactos?rev=42450&view=rev Log: modified lib/3rdparty/libsamplerate/libsamplerate.rbuild We have lrint and lrintf, don't provide inline implementations Three cheers for libsamplerate, congratulations to it for compiling on Visual C++ Modified: trunk/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild Modified: trunk/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… ============================================================================== --- trunk/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild [iso-8859-1] Fri Aug 7 04:10:12 2009 @@ -1,6 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="libsamplerate" type="staticlibrary" allowwarnings="true"> + <define name="HAVE_LRINT" /> + <define name="HAVE_LRINTF" /> <include base="libsamplerate">.</include> <file>samplerate.c</file> <file>src_linear.c</file>

15 years, 1 month

[hyperion] 42449: Visual C++ doesn't like division by zero in constants: for now, don't define NAN, HUGE_VAL, HUGE_VALF, INFINITY for Visual C++

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Aug 7 04:03:25 2009 New Revision: 42449 URL: http://svn.reactos.org/svn/reactos?rev=42449&view=rev Log: Visual C++ doesn't like division by zero in constants: for now, don't define NAN, HUGE_VAL, HUGE_VALF, INFINITY for Visual C++ Modified: trunk/reactos/include/crt/math.h Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=424… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Fri Aug 7 04:03:25 2009 @@ -239,10 +239,12 @@ #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \ || !defined __STRICT_ANSI__ || defined __GLIBCPP__ +#if !defined(_MSC_VER) #define NAN (0.0F/0.0F) #define HUGE_VALF (1.0F/0.0F) #define HUGE_VALL (1.0L/0.0L) #define INFINITY (1.0F/0.0F) +#endif #define FP_NAN 0x0100

15 years, 1 month

[hyperion] 42448: modified dll/win32/opengl32/gl.c modified dll/win32/opengl32/opengl32.c Give prototypes to all functions Implement OpenGL thunks in assembler for Visual C++ Nope, environment is not compiler this time, either modified dll/win32/opengl32/opengl32.h Don't use dllexport, we have a spec file Congratulations opengl32, you now build with Visual C++

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Aug 7 03:50:19 2009 New Revision: 42448 URL: http://svn.reactos.org/svn/reactos?rev=42448&view=rev Log: modified dll/win32/opengl32/gl.c modified dll/win32/opengl32/opengl32.c Give prototypes to all functions Implement OpenGL thunks in assembler for Visual C++ Nope, environment is not compiler this time, either modified dll/win32/opengl32/opengl32.h Don't use dllexport, we have a spec file Congratulations opengl32, you now build with Visual C++ Modified: trunk/reactos/dll/win32/opengl32/gl.c trunk/reactos/dll/win32/opengl32/opengl32.c trunk/reactos/dll/win32/opengl32/opengl32.h Modified: trunk/reactos/dll/win32/opengl32/gl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/gl.c?re… ============================================================================== --- trunk/reactos/dll/win32/opengl32/gl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/gl.c [iso-8859-1] Fri Aug 7 03:50:19 2009 @@ -19,12 +19,12 @@ * * On other machines we use C to forward the calls (slow...) */ - + #include "opengl32.h" C_ASSERT(FIELD_OFFSET(TEB, glTable) == 0xbe8); -int WINAPI glEmptyFunc0() { return 0; } +int WINAPI glEmptyFunc0( void ) { return 0; } int WINAPI glEmptyFunc4( long l1 ) { return 0; } int WINAPI glEmptyFunc8( long l1, long l2 ) { return 0; } int WINAPI glEmptyFunc12( long l1, long l2, long l3 ) { return 0; } @@ -59,7 +59,7 @@ #if defined(_M_IX86) # define FOO(x) #x -#if __MINGW32__ +#ifdef __GNUC__ # define X(func, ret, typeargs, args, icdidx, tebidx, stack) \ __asm__(".align 4" "\n\t" \ ".globl _"#func"@"#stack "\n\t" \ @@ -67,6 +67,14 @@ " movl %fs:0x18, %eax" "\n\t" \ " movl 0xbe8(%eax), %eax" "\n\t" \ " jmp *"FOO((icdidx*4))"(%eax)" "\n\t"); +#elif defined(_MSC_VER) +# define X(func, ret, typeargs, args, icdidx, tebidx, stack) \ +__declspec(naked) ret WINAPI func typeargs \ +{ \ + __asm { mov eax, dword ptr fs:[18h] }; \ + __asm { mov eax, dword ptr [eax+0be8h] }; \ + __asm { jmp dword ptr [eax+icdidx*4] }; \ +} #else # define X(func, ret, typeargs, args, icdidx, tebidx, stack) \ ret WINAPI func typeargs \ Modified: trunk/reactos/dll/win32/opengl32/opengl32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.c [iso-8859-1] Fri Aug 7 03:50:19 2009 @@ -26,7 +26,7 @@ static BOOL -OPENGL32_ThreadAttach() +OPENGL32_ThreadAttach( void ) { GLTHREADDATA* lpData = NULL; PROC *dispatchTable = NULL; @@ -69,7 +69,7 @@ static void -OPENGL32_ThreadDetach() +OPENGL32_ThreadDetach( void ) { GLTHREADDATA* lpData = NULL; PROC *dispatchTable = NULL; @@ -96,7 +96,7 @@ static BOOL -OPENGL32_ProcessAttach() +OPENGL32_ProcessAttach( void ) { SECURITY_ATTRIBUTES attrib = { sizeof (SECURITY_ATTRIBUTES), /* nLength */ NULL, /* lpSecurityDescriptor */ @@ -136,7 +136,7 @@ static void -OPENGL32_ProcessDetach() +OPENGL32_ProcessDetach( void ) { GLDRIVERDATA *icd, *icd2; GLDCDATA *dcdata, *dcdata2; Modified: trunk/reactos/dll/win32/opengl32/opengl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.h [iso-8859-1] Fri Aug 7 03:50:19 2009 @@ -103,7 +103,7 @@ #ifdef APIENTRY #undef APIENTRY #endif /* APIENTRY */ -#define APIENTRY EXPORT __stdcall +#define APIENTRY __stdcall /* Called by the driver to set the dispatch table */ typedef DWORD (WINAPI *SetContextCallBack)( const ICDTable * ); @@ -192,7 +192,7 @@ BOOL APIENTRY rosglMakeCurrent( HDC hdc, HGLRC hglrc ); /* empty gl functions from gl.c */ -int WINAPI glEmptyFunc0(); +int WINAPI glEmptyFunc0( void ); int WINAPI glEmptyFunc4( long ); int WINAPI glEmptyFunc8( long, long ); int WINAPI glEmptyFunc12( long, long, long ); @@ -216,7 +216,7 @@ #ifdef OPENGL32_GL_FUNC_PROTOTYPES -#define X(func,ret,typeargs,args,icdidx,tebidx,stack) EXPORT ret WINAPI func typeargs; +#define X(func,ret,typeargs,args,icdidx,tebidx,stack) ret WINAPI func typeargs; GLFUNCS_MACRO #undef X

15 years, 1 month

[tkreuzer] 42447: [win32k] Implement GreMovePointer and GreSetPointerShape, calling the eng functions and use them instead of the former mess in IntSetCursor. Fix IntShowMousePointer, EngSetPointerShape to properly handle the color bitmap. We now have support for colored mouse cursors, like used by our paint.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 7 03:44:38 2009 New Revision: 42447 URL: http://svn.reactos.org/svn/reactos?rev=42447&view=rev Log: [win32k] Implement GreMovePointer and GreSetPointerShape, calling the eng functions and use them instead of the former mess in IntSetCursor. Fix IntShowMousePointer, EngSetPointerShape to properly handle the color bitmap. We now have support for colored mouse cursors, like used by our paint. Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c trunk/reactos/subsystems/win32/win32k/include/cursoricon.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.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 Aug 7 03:44:38 2009 @@ -240,16 +240,29 @@ if (pgp->psurfColor) { IntEngBitBltEx(psoDest, - &pgp->psurfColor->SurfObj, &pgp->psurfMask->SurfObj, + NULL, NULL, NULL, &rclSurf, (POINTL*)&rclPointer, + NULL, + NULL, + NULL, + ROP3_TO_ROP4(SRCAND), + FALSE); + + IntEngBitBltEx(psoDest, + &pgp->psurfColor->SurfObj, + NULL, + NULL, + NULL, + &rclSurf, (POINTL*)&rclPointer, NULL, NULL, - R4_MASK, + NULL, + ROP3_TO_ROP4(SRCINVERT), FALSE); } else @@ -302,7 +315,6 @@ { PDEVOBJ *ppdev; GDIPOINTER *pgp; - SIZEL Size; LONG lDelta; HBITMAP hbmp; RECTL rcl; @@ -312,6 +324,31 @@ ppdev = GDIDEV(pso); pgp = &ppdev->Pointer; + if (psoColor) + { + pgp->Size.cx = psoColor->sizlBitmap.cx; + pgp->Size.cy = psoColor->sizlBitmap.cy; + if (psoMask) + { + // CHECKME: Is this really required? if we have a color surface, + // we only need the and part of the mask. + /* Check if the sizes match as they should */ + if (psoMask->sizlBitmap.cx != psoColor->sizlBitmap.cx || + psoMask->sizlBitmap.cy != psoColor->sizlBitmap.cy * 2) + { + DPRINT("Sizes of mask (%ld,%ld) and color (%ld,%ld) don't match\n", + psoMask->sizlBitmap.cx, psoMask->sizlBitmap.cy, + psoColor->sizlBitmap.cx, psoColor->sizlBitmap.cy); +// return SPS_ERROR; + } + } + } + else + { + pgp->Size.cx = psoMask->sizlBitmap.cx; + pgp->Size.cy = psoMask->sizlBitmap.cy / 2; + } + IntHideMousePointer(ppdev, pso); if (pgp->psurfColor) @@ -336,30 +373,13 @@ } /* See if we are being asked to hide the pointer. */ - if (psoMask == NULL) + if (psoMask == NULL && psoColor == NULL) { return SPS_ACCEPT_NOEXCLUDE; } pgp->HotSpot.x = xHot; pgp->HotSpot.y = yHot; - - if (x != -1) - { - ppdev->ptlPointer.x = x; - ppdev->ptlPointer.y = y; - } - - pgp->Size.cx = abs(psoMask->lDelta) << 3; - pgp->Size.cy = (psoMask->cjBits / abs(psoMask->lDelta)) >> 1; - - Size.cx = pgp->Size.cx; - Size.cy = pgp->Size.cy << 1; - - rcl.left = 0; - rcl.top = 0; - rcl.right = Size.cx; - rcl.bottom = Size.cy; /* Calculate lDelta for our surfaces. */ switch (pso->iBitmapFormat) @@ -387,6 +407,11 @@ break; } + rcl.left = 0; + rcl.top = 0; + rcl.right = pgp->Size.cx; + rcl.bottom = pgp->Size.cy; + /* Create surface for saving the pixels under the cursor. */ hbmp = EngCreateBitmap(pgp->Size, lDelta, @@ -401,30 +426,35 @@ EXLATEOBJ exlo; PPALETTE ppal; - ppal = PALETTE_LockPalette(ppdev->DevInfo.hpalDefault); - EXLATEOBJ_vInitialize(&exlo, - &gpalMono, - ppal, - 0, - RGB(0xff,0xff,0xff), - RGB(0,0,0)); - - hbmp = EngCreateBitmap(Size, + hbmp = EngCreateBitmap(psoMask->sizlBitmap, lDelta, pso->iBitmapFormat, 0, NULL); pgp->psurfMask = SURFACE_ShareLockSurface(hbmp); - IntEngCopyBits(&pgp->psurfMask->SurfObj, - psoMask, - NULL, - &exlo.xlo, - &rcl, - (POINTL*)&rcl); - - EXLATEOBJ_vCleanup(&exlo); - if (ppal) - PALETTE_UnlockPalette(ppal); + + if(pgp->psurfMask) + { + ppal = PALETTE_LockPalette(ppdev->DevInfo.hpalDefault); + EXLATEOBJ_vInitialize(&exlo, + &gpalMono, + ppal, + 0, + RGB(0xff,0xff,0xff), + RGB(0,0,0)); + + rcl.bottom = pgp->Size.cy * 2; + IntEngCopyBits(&pgp->psurfMask->SurfObj, + psoMask, + NULL, + &exlo.xlo, + &rcl, + (POINTL*)&rcl); + + EXLATEOBJ_vCleanup(&exlo); + if (ppal) + PALETTE_UnlockPalette(ppal); + } } else { @@ -434,18 +464,22 @@ /* Create a color surface */ if (psoColor) { - hbmp = EngCreateBitmap(pgp->Size, + hbmp = EngCreateBitmap(psoColor->sizlBitmap, lDelta, pso->iBitmapFormat, BMF_TOPDOWN | BMF_NOZEROINIT, NULL); pgp->psurfColor = SURFACE_ShareLockSurface(hbmp); - IntEngCopyBits(&pgp->psurfColor->SurfObj, - psoColor, - NULL, - pxlo, - &rcl, - (POINTL*)&rcl); + if (pgp->psurfColor) + { + rcl.bottom = pgp->Size.cy; + IntEngCopyBits(&pgp->psurfColor->SurfObj, + psoColor, + NULL, + pxlo, + &rcl, + (POINTL*)&rcl); + } } else { @@ -454,6 +488,9 @@ if (x != -1) { + ppdev->ptlPointer.x = x; + ppdev->ptlPointer.y = y; + IntShowMousePointer(ppdev, pso); if (prcl != NULL) @@ -590,4 +627,115 @@ return ulResult; } +ULONG +NTAPI +GreSetPointerShape( + HDC hdc, + HBITMAP hbmMask, + HBITMAP hbmColor, + LONG xHot, + LONG yHot, + LONG x, + LONG y) +{ + PDC pdc; + PSURFACE psurf, psurfMask, psurfColor; + EXLATEOBJ exlo; + FLONG fl = 0; + ULONG ulResult = 0; + + pdc = DC_LockDc(hdc); + if (!pdc) + { + DPRINT1("Failed to lock the DC.\n"); + return 0; + } + + psurf = pdc->dclevel.pSurface; + if (!psurf) + { + DPRINT1("DC has no surface.\n"); + DC_UnlockDc(pdc); + return 0; + } + + /* Lock the mask bitmap */ + if (hbmMask) + psurfMask = SURFACE_ShareLockSurface(hbmMask); + else + psurfMask = NULL; + + /* Check for color bitmap */ + if (hbmColor) + { + /* We have one, lock it */ + psurfColor = SURFACE_ShareLockSurface(hbmColor); + + if (psurfColor) + { + /* Create an XLATEOBJ, no mono support */ + EXLATEOBJ_vInitialize(&exlo, psurfColor->ppal, psurf->ppal, 0, 0, 0); + } + } + else + psurfColor = NULL; + + /* Call the driver or eng function */ + ulResult = IntEngSetPointerShape(&psurf->SurfObj, + psurfMask ? &psurfMask->SurfObj : NULL, + psurfColor ? &psurfColor->SurfObj : NULL, + psurfColor ? &exlo.xlo : NULL, + xHot, + yHot, + x, + y, + &pdc->ppdev->Pointer.Exclude, + fl); + + /* Cleanup */ + if (hbmColor) + EXLATEOBJ_vCleanup(&exlo); + + if (psurfColor) + SURFACE_ShareUnlockSurface(psurfColor); + + if (psurfMask) + SURFACE_ShareUnlockSurface(psurfMask); + + /* Unlock the DC */ + DC_UnlockDc(pdc); + + /* Return result */ + return ulResult; +} + +VOID +NTAPI +GreMovePointer( + HDC hdc, + LONG x, + LONG y) +{ + PDC pdc; + PRECTL prcl; + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (!pdc) + { + DPRINT1("Failed to lock the DC.\n"); + return; + } + + /* Store the cursor exclude position in the PDEV */ + prcl = &pdc->ppdev->Pointer.Exclude; + + /* Call Eng/Drv function */ + IntEngMovePointer(&pdc->dclevel.pSurface->SurfObj, x, y, prcl); + + /* Unlock the DC */ + DC_UnlockDc(pdc); +} + + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] Fri Aug 7 03:44:38 2009 @@ -85,6 +85,24 @@ #define IntReleaseCurIconObject(CurIconObj) \ UserDereferenceObject(CurIconObj) +ULONG +NTAPI +GreSetPointerShape( + HDC hdc, + HBITMAP hbmMask, + HBITMAP hbmColor, + LONG xHot, + LONG yHot, + LONG x, + LONG y); + +VOID +NTAPI +GreMovePointer( + HDC hdc, + LONG x, + LONG y); + #endif /* _WIN32K_CURSORICON_H */ /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Fri Aug 7 03:44:38 2009 @@ -78,153 +78,70 @@ #define COLORCURSORS_ALLOWED FALSE -HCURSOR FASTCALL -IntSetCursor(PWINSTATION_OBJECT WinSta, PCURICON_OBJECT NewCursor, - BOOL ForceChange) -{ - SURFACE *psurf; - SURFOBJ *pso; - PDEVINFO DevInfo; - PSURFACE MaskBmpObj = NULL; +HCURSOR +FASTCALL +IntSetCursor( + PWINSTATION_OBJECT WinSta, + PCURICON_OBJECT NewCursor, + BOOL ForceChange) +{ PSYSTEM_CURSORINFO CurInfo; PCURICON_OBJECT OldCursor; - HCURSOR Ret = (HCURSOR)0; - HBITMAP hMask = 0; - SURFOBJ *soMask = NULL, *soColor = NULL; - XLATEOBJ *XlateObj = NULL; - HDC Screen; - PDC dc; - ULONG Status; + HCURSOR hOldCursor = (HCURSOR)0; + HDC hdcScreen; + BOOL bResult; CurInfo = IntGetSysCursorInfo(WinSta); OldCursor = CurInfo->CurrentCursorObject; if (OldCursor) { - Ret = (HCURSOR)OldCursor->Self; - } - - if (!ForceChange && OldCursor == NewCursor) - { - return Ret; - } - - if (!(Screen = IntGetScreenDC())) + hOldCursor = (HCURSOR)OldCursor->Self; + } + + /* Is the new cursor the same as the old cursor? */ + if (OldCursor == NewCursor) + { + /* Nothing to to do in this case */ + return hOldCursor; + } + + /* Get the screen DC */ + if(!(hdcScreen = IntGetScreenDC())) { return (HCURSOR)0; } - /* FIXME use the desktop's HDC instead of using ScreenDeviceContext */ - dc = DC_LockDc(Screen); - - if (!dc) - { - return Ret; - } - DevInfo = (PDEVINFO)&dc->ppdev->DevInfo; - - psurf = dc->dclevel.pSurface; - if (!psurf) - { - DC_UnlockDc(dc); - return (HCURSOR)0; - } - pso = &psurf->SurfObj; - - if (!NewCursor) - { - if (CurInfo->CurrentCursorObject || ForceChange) - { - if (CurInfo->CurrentCursorObject) - { - UserDereferenceObject(CurInfo->CurrentCursorObject); - if (CurInfo->ShowingCursor) - { - DPRINT("Removing pointer!\n"); - /* Remove the cursor if it was displayed */ - IntEngMovePointer(pso, -1, -1, &GDIDEV(pso)->Pointer.Exclude); - } - } - - CurInfo->CurrentCursorObject = NewCursor; /* i.e. CurrentCursorObject = NULL */ - CurInfo->ShowingCursor = 0; - } - - DC_UnlockDc(dc); - return Ret; - } - - /* TODO: Fixme. Logic is screwed above */ - - MaskBmpObj = SURFACE_LockSurface(NewCursor->IconInfo.hbmMask); - if (MaskBmpObj) - { - const int maskBpp = BitsPerFormat(MaskBmpObj->SurfObj.iBitmapFormat); - SURFACE_UnlockSurface(MaskBmpObj); - if (maskBpp != 1) - { - DPRINT1("SetCursor: The Mask bitmap must have 1BPP!\n"); - DC_UnlockDc(dc); - return Ret; - } - - if ((DevInfo->flGraphicsCaps2 & GCAPS2_ALPHACURSOR) && - pso->iBitmapFormat >= BMF_16BPP && - pso->iBitmapFormat <= BMF_32BPP && - NewCursor->Shadow && COLORCURSORS_ALLOWED) - { - /* FIXME - Create a color pointer, only 32bit bitmap, set alpha bits! - Do not pass a mask bitmap to DrvSetPointerShape()! - Create a XLATEOBJ that describes the colors of the bitmap. */ - DPRINT1("SetCursor: (Colored) alpha cursors are not supported!\n"); - } - else - { - if (NewCursor->IconInfo.hbmColor - && COLORCURSORS_ALLOWED) - { - /* FIXME - Create a color pointer, create only one 32bit bitmap! - Do not pass a mask bitmap to DrvSetPointerShape()! - Create a XLATEOBJ that describes the colors of the bitmap. - (16bit bitmaps are propably allowed) */ - DPRINT1("SetCursor: Cursors with colors are not supported!\n"); - } - else - { - MaskBmpObj = SURFACE_LockSurface(NewCursor->IconInfo.hbmMask); - if (MaskBmpObj) - { - RECTL DestRect = {0, 0, MaskBmpObj->SurfObj.sizlBitmap.cx, MaskBmpObj->SurfObj.sizlBitmap.cy}; - POINTL SourcePoint = {0, 0}; - - /* - * NOTE: For now we create the cursor in top-down bitmap, - * because VMware driver rejects it otherwise. This should - * be fixed later. - */ - hMask = EngCreateBitmap( - MaskBmpObj->SurfObj.sizlBitmap, abs(MaskBmpObj->SurfObj.lDelta), - MaskBmpObj->SurfObj.iBitmapFormat, BMF_TOPDOWN, - NULL); - if (!hMask) - { - SURFACE_UnlockSurface(MaskBmpObj); - DC_UnlockDc(dc); - return (HCURSOR)0; - } - soMask = EngLockSurface((HSURF)hMask); - IntEngCopyBits(soMask, &MaskBmpObj->SurfObj, NULL, NULL, - &DestRect, &SourcePoint); - SURFACE_UnlockSurface(MaskBmpObj); - } - } - } + + /* Do we have a new cursor? */ + if (NewCursor) + { + UserReferenceObject(NewCursor); + CurInfo->ShowingCursor = CURSOR_SHOWING; CurInfo->CurrentCursorObject = NewCursor; - UserReferenceObject(NewCursor); + + /* Call GDI to set the new screen cursor */ + bResult = GreSetPointerShape(hdcScreen, + NewCursor->IconInfo.hbmMask, + NewCursor->IconInfo.hbmColor, + NewCursor->IconInfo.xHotspot, + NewCursor->IconInfo.yHotspot, + gpsi->ptCursor.x, + gpsi->ptCursor.y); + + } else { + /* Check if were diplaying a cursor */ + if (OldCursor && CurInfo->ShowingCursor) + { + /* Remove the cursor */ + GreMovePointer(hdcScreen, -1, -1); + DPRINT("Removing pointer!\n"); + } + + CurInfo->CurrentCursorObject = NULL; CurInfo->ShowingCursor = 0; - CurInfo->CurrentCursorObject = NULL; } /* OldCursor is not in use anymore */ @@ -233,35 +150,10 @@ UserDereferenceObject(OldCursor); } - Status = IntEngSetPointerShape(pso, - soMask, - soColor, - XlateObj, - NewCursor->IconInfo.xHotspot, - NewCursor->IconInfo.yHotspot, - gpsi->ptCursor.x, - gpsi->ptCursor.y, - &(GDIDEV(pso)->Pointer.Exclude), - SPS_CHANGE); - - if (Status != SPS_ACCEPT_NOEXCLUDE) - { - DPRINT1("IntEngSetPointerShape returned %lx\n", Status); - } - - if (hMask) - { - EngUnlockSurface(soMask); - EngDeleteSurface((HSURF)hMask); - } - if (XlateObj) - { - EngDeleteXlate(XlateObj); - } - - DC_UnlockDc(dc); - return Ret; -} + /* Return handle of the old cursor */ + return hOldCursor; +} + BOOL FASTCALL IntSetupCurIconHandles(PWINSTATION_OBJECT WinSta)

15 years, 1 month

[hyperion] 42446: modified base/services/audiosrv/pnp_list_manager.c About the trillionth time Arch forgets that malloc is declared in stdlib.h One more module builds with Visual C++

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Aug 7 03:20:23 2009 New Revision: 42446 URL: http://svn.reactos.org/svn/reactos?rev=42446&view=rev Log: modified base/services/audiosrv/pnp_list_manager.c About the trillionth time Arch forgets that malloc is declared in stdlib.h One more module builds with Visual C++ Modified: trunk/reactos/base/services/audiosrv/pnp_list_manager.c Modified: trunk/reactos/base/services/audiosrv/pnp_list_manager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/pnp… ============================================================================== --- trunk/reactos/base/services/audiosrv/pnp_list_manager.c [iso-8859-1] (original) +++ trunk/reactos/base/services/audiosrv/pnp_list_manager.c [iso-8859-1] Fri Aug 7 03:20:23 2009 @@ -7,6 +7,7 @@ */ #include <assert.h> +#include <stdlib.h> #include <audiosrv/audiosrv.h> #include "audiosrv.h"

15 years, 1 month

← Newer
1
...
50
51
52
53
54
55
56
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009