Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 35138: Win32k Timers: - This is relative to bugs 3634 and 2393. Please leave additional information in bug report 2393. - Timer code should not be associated with message queues, since theses types of queues are subject to being destroyed. This creates a problem of loosing timers. - This is a first part of a rewrite of the timers. Moving the timers from the message queue to a linked list very similar to our DCE code. This will simplify timer handling too.
by jimtabor＠svn.reactos.org 06 Aug '08

06 Aug '08

Author: jimtabor Date: Tue Aug 5 21:05:17 2008 New Revision: 35138 URL: http://svn.reactos.org/svn/reactos?rev=35138&view=rev Log: Win32k Timers: - This is relative to bugs 3634 and 2393. Please leave additional information in bug report 2393. - Timer code should not be associated with message queues, since theses types of queues are subject to being destroyed. This creates a problem of loosing timers. - This is a first part of a rewrite of the timers. Moving the timers from the message queue to a linked list very similar to our DCE code. This will simplify timer handling too. Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] Tue Aug 5 21:05:17 2008 @@ -1,5 +1,17 @@ #ifndef _WIN32K_TIMER_H #define _WIN32K_TIMER_H + +typedef struct _TIMER +{ + LIST_ENTRY ptmrList; + PW32THREADINFO pti; + PWINDOW_OBJECT pWnd; // hWnd + UINT_PTR nID; // Specifies a nonzero timer identifier. + INT cmsCountdown; // uElapse + INT cmsRate; // uElapse + FLONG flags; + TIMERPROC pfn; // lpTimerFunc +} TIMER, *PTIMER; NTSTATUS FASTCALL InitTimerImpl(VOID); BOOL FASTCALL IntKillTimer(HWND Wnd, UINT_PTR IDEvent, BOOL SystemTimer); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Tue Aug 5 21:05:17 2008 @@ -1131,7 +1131,7 @@ ModuleName.MaximumLength); if (! NT_SUCCESS(Status)) { - ExFreePool(Hook->ModuleName.Buffer); + ExFreePool(Hook->ModuleName.Buffer); UserDereferenceObject(Hook); IntRemoveHook(Hook, WinStaObj, FALSE); if (NULL != Thread) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Tue Aug 5 21:05:17 2008 @@ -16,12 +16,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Window timers messages - * FILE: subsys/win32k/ntuser/timer.c + * FILE: subsystems/win32/win32k/ntuser/timer.c * PROGRAMER: Gunnar * Thomas Weidenmueller (w3seek(a)users.sourceforge.net) * REVISION HISTORY: 10/04/2003 Implemented System Timers @@ -36,6 +35,8 @@ #include <debug.h> /* GLOBALS *******************************************************************/ + +static PTIMER FirstpTmr = NULL; /* Windows 2000 has room for 32768 window-less timers */ #define NUM_WINDOW_LESS_TIMERS 1024 @@ -148,20 +149,40 @@ BOOL FASTCALL IntKillTimer(HWND Wnd, UINT_PTR IDEvent, BOOL SystemTimer) { + PWINDOW_OBJECT Window = NULL; + DPRINT("IntKillTimer wnd %x id %p systemtimer %s\n", Wnd, IDEvent, SystemTimer ? "TRUE" : "FALSE"); - if (! MsqKillTimer(PsGetCurrentThreadWin32Thread()->MessageQueue, Wnd, - IDEvent, SystemTimer ? WM_SYSTIMER : WM_TIMER)) - { - DPRINT1("Unable to locate timer in message queue\n"); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; + if (Wnd) + { + Window = UserGetWindowObject(Wnd); + + if (! MsqKillTimer(PsGetCurrentThreadWin32Thread()->MessageQueue, Wnd, + IDEvent, SystemTimer ? WM_SYSTIMER : WM_TIMER)) + { + // Give it another chance to find the timer. + if (Window && !( MsqKillTimer(Window->MessageQueue, Wnd, + IDEvent, SystemTimer ? WM_SYSTIMER : WM_TIMER))) + { + DPRINT1("Unable to locate timer in message queue for Window.\n"); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + } } /* window-less timer? */ if ((Wnd == NULL) && ! SystemTimer) { + if (! MsqKillTimer(PsGetCurrentThreadWin32Thread()->MessageQueue, Wnd, + IDEvent, SystemTimer ? WM_SYSTIMER : WM_TIMER)) + { + DPRINT1("Unable to locate timer in message queue for Window-less timer.\n"); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + /* Release the id */ IntLockWindowlessTimerBitmap(); @@ -194,6 +215,12 @@ /* yes we need this, since ExAllocatePool isn't supposed to zero out allocated memory */ RtlClearAllBits(&WindowLessTimersBitMap); + + if (!FirstpTmr) + { + FirstpTmr = ExAllocatePoolWithTag(PagedPool, sizeof(TIMER), TAG_TIMERBMP); + if (FirstpTmr) InitializeListHead(&FirstpTmr->ptmrList); + } return STATUS_SUCCESS; }

1 0

[cfinck] 35137: Tag the 0.3.6 release
by cfinck＠svn.reactos.org 05 Aug '08

05 Aug '08

Author: cfinck Date: Tue Aug 5 18:04:22 2008 New Revision: 35137 URL: http://svn.reactos.org/svn/reactos?rev=35137&view=rev Log: Tag the 0.3.6 release Added: tags/ReactOS-0.3.6/ - copied from r35136, branches/ros-branch-0_3_6/ Removed: branches/ros-branch-0_3_6/

1 0

[tkreuzer] 35136: use a do-nothing-seh as on arm
by tkreuzer＠svn.reactos.org 05 Aug '08

05 Aug '08

Author: tkreuzer Date: Tue Aug 5 16:50:25 2008 New Revision: 35136 URL: http://svn.reactos.org/svn/reactos?rev=35136&view=rev Log: use a do-nothing-seh as on arm Modified: branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/framebased.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/framebased.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/framebased.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/framebased.h [iso-8859-1] Tue Aug 5 16:50:25 2008 @@ -172,7 +172,7 @@ STMT_; \ } -#ifdef _ARM_ +#if defined(_ARM_) || defined(_x86_64) #define _SEH_TRY \ for(;;) \

1 0

[tkreuzer] 35135: implement byteswap intrinsics
by tkreuzer＠svn.reactos.org 05 Aug '08

05 Aug '08

Author: tkreuzer Date: Tue Aug 5 16:25:29 2008 New Revision: 35135 URL: http://svn.reactos.org/svn/reactos?rev=35135&view=rev Log: implement byteswap intrinsics Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] Tue Aug 5 16:25:29 2008 @@ -910,6 +910,44 @@ return retval; } +static __inline__ __attribute__((always_inline)) unsigned short _byteswap_ushort(unsigned short value) +{ + unsigned short retval; + __asm__("rorw $8, %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value)); + return retval; +} + +static __inline__ __attribute__((always_inline)) unsigned long _byteswap_ulong(unsigned long value) +{ + unsigned long retval; + __asm__("bswapl %[retval]" : [retval] "=rm" (retval) : "[retval]" (value)); + return retval; +} + +#ifdef _M_AMD64 +static __inline__ __attribute__((always_inline)) unsigned __int64 _byteswap_uint64(unsigned __int64 value) +{ + unsigned __int64 retval; + __asm__("bswapq %[retval]" : [retval] "=rm" (retval) : "[retval]" (value)); + return retval; +} +#else +static __inline__ __attribute__((always_inline)) unsigned __int64 _byteswap_uint64(unsigned __int64 value) +{ + union { + __int64 int64part; + struct { + unsigned long lowpart; + unsigned long hipart; + }; + } retval; + retval.int64part = value; + __asm__("bswapl %[lowpart]\n" + "bswapl %[hipart]\n" + : [lowpart] "=rm" (retval.hipart), [hipart] "=rm" (retval.lowpart) : "[lowpart]" (retval.lowpart), "[hipart]" (retval.hipart) ); + return retval.int64part; +} +#endif /*** 64-bit math ***/ static __inline__ __attribute__((always_inline)) long long __emul(const int a, const int b)

1 0

[sginsberg] 35134: - Remove memcmp NTOS export added in rev 34611 as real NT does not export it.
by sginsberg＠svn.reactos.org 05 Aug '08

05 Aug '08

Author: sginsberg Date: Tue Aug 5 16:08:43 2008 New Revision: 35134 URL: http://svn.reactos.org/svn/reactos?rev=35134&view=rev Log: - Remove memcmp NTOS export added in rev 34611 as real NT does not export it. Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.def… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Tue Aug 5 16:08:43 2008 @@ -1549,7 +1549,6 @@ mbtowc memchr memcpy -memcmp memmove memset qsort

1 0

[cfinck] 35133: Remove non-working apps from the Downloader list (according to http://www.reactos.org/wiki/index.php/Tests_for_0.3.6) and downgrade Abiword to 2.4.6 (currently runs best on ROS)
by cfinck＠svn.reactos.org 05 Aug '08

05 Aug '08

Author: cfinck Date: Tue Aug 5 16:07:19 2008 New Revision: 35133 URL: http://svn.reactos.org/svn/reactos?rev=35133&view=rev Log: Remove non-working apps from the Downloader list (according to http://www.reactos.org/wiki/index.php/Tests_for_0.3.6) and downgrade Abiword to 2.4.6 (currently runs best on ROS) Modified: branches/ros-branch-0_3_6/rosapps/applications/downloader/downloader.xml Modified: branches/ros-branch-0_3_6/rosapps/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_6/rosapps/applic… ============================================================================== --- branches/ros-branch-0_3_6/rosapps/applications/downloader/downloader.xml [iso-8859-1] (original) +++ branches/ros-branch-0_3_6/rosapps/applications/downloader/downloader.xml [iso-8859-1] Tue Aug 5 16:07:19 2008 @@ -14,13 +14,6 @@ <description>The most popular and one of the best free Web Browsers out there.</description> <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-2.0/win…</location> </application> - <application name="Opera"> - <regname>Opera</regname> - <licence>Freeware</licence> - <version>9.26</version> - <description>The most popular and one of the best free Web Browsers out there.</description> - <location>http://mirror.nwps.ws/opera/win/926/en/Opera_9.26_Classic_Setup.exe</location> - </application> <application name="Thunderbird 1.5"> <regname>Mozilla Thunderbird (1.5)</regname> <licence>MPL/GPL/LGPL</licence> @@ -34,12 +27,6 @@ <version>2.0.0.16</version> <description>The most popular and one of the best free Mail Clients out there.</description> <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-2.0…</location> - </application> - <application name="SeaMonkey"> - <regname>SeaMonkey (1.1.9)</regname> - <version>1.1.9</version> - <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.</description> - <location>http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.9/seamon…</location> </application> <application name="Mozilla ActiveX Control"> <regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname> @@ -63,52 +50,16 @@ <description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description> <location>http://svn.reactos.org/packages/samba-tng.exe</location> </application> - <application name="Miranda IM"> - <regname>Miranda IM</regname> - <version>0.7.4</version> - <description>Open source multiprotocol instant messaging application - May not work completely.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.7.4-unicode…</location> - </application> - <application name="Putty"> - <regname>PuTTY version 0.60</regname> - <licence>MIT</licence> - <version>0.60</version> - <description>A free SSH, Telnet, rlogin, and raw TCP client.</description> - <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.60-installer.exe</location> - </application> </category> <category name="Office" icon="2"> <application name="Abiword"> - <regname>"AbiWord 2.6.4 (remove only)"</regname> - <version>2.6.4</version> + <regname>"AbiWord 2.4.6 (remove only)"</regname> + <version>2.4.6</version> <description>Word processor.</description> - <location>http://www.abiword.org/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.4.…</location> - </application> - <application name="OpenOffice"> - <regname>OpenOffice.org 2.4</regname> - <version>2.4.0</version> - <description>THE Open Source Office Suite.</description> - <location>http://ftp.tu-chemnitz.de/pub/openoffice-extended/stable/2.4.0/OOo_2.4.0_Wi…</location> + <location>http://abisource.com/downloads/abiword/2.4.6/Windows/abiword-setup-2.4.6.exe</location> </application> </category> <category name="Graphics" icon="3"> - <application name="IrfanView"> - <regname>IrfanView (remove only)</regname> - <version>4.10</version> - <description>Viewer for all kinds of graphics/audio files/video files.</description> - <location>http://gd.tuwien.ac.at/graphics/irfanview/iview410_setup.exe</location> - </application> - <application name="IrfanView Plugins"> - <version>4.10</version> - <description>Additional Plugins for supporting more file types.</description> - <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_410_setup.exe</location> - </application> - <application name="TuxPaint"> - <regname>Tux Paint 0.9.19</regname> - <version>0.9.19</version> - <description>An Open Source bitmap graphics editor geared towards young children.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.19-win32-in…</location> - </application> <application name="zeckensack's glide wrapper"> <regname>GlidewrapZbag</regname> <version>0.84c</version> @@ -116,21 +67,7 @@ <location>http://www.zeckensack.de/glide/archive/GlideWrapper084c.exe</location> </application> </category> - <category name="Multimedia" icon="4"> - </category> <category name="Development" icon="5"> - <application name="ReactOS Build Environment"> - <regname>ReactOS Build Environment 1.2</regname> - <version>1.2</version> - <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.2.exe</location> - </application> - <application name="MinGW"> - <regname>MinGW 5.1.3</regname> - <version>5.1.3</version> - <description>A Port of the GNU toolchain with GCC, GDB, GNU make, etc.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location> - </application> <application name="FreeBASIC"> <regname>FreeBASIC 0.18.4b</regname> <version>0.18.4b</version> @@ -139,12 +76,6 @@ </application> </category> <category name="Games & Fun" icon="6"> - <application name="ScummVM"> - <regname>ScummVM 0.11.1</regname> - <version>0.11.1</version> - <description>SamNMax, Day of Tentacle, etc on ReactOS</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.11.1-win32.exe</location> - </application> <application name="Diablo 2 Shareware"> <regname>Diablo II Shareware</regname> <version>1.4</version> @@ -157,23 +88,11 @@ <description>Nice Clone of Chip's Challenge originally made for the Atari Lynx. Includes free CCLP2 Graphics Pack, so you dont need the copyrighted Original.</description> <location>http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0-win32-…</location> </application> - <application name="OpenTTD"> - <regname>OpenTTD 0.6.0</regname> - <version>0.6.0</version> - <description>Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.6.0-win32.exe</location> - </application> <application name="LBreakout2"> <regname>LBreakout2 2.4.1</regname> <version>2.4.1</version> <description>Breakout Clone using SDL libs.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.exe</location> - </application> - <application name="LGeneral"> - <regname>LGeneral 1.1</regname> - <version>1.1</version> - <description>Panzer General Clone using SDL libs.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lgeneral-1.1-win32.exe</location> </application> <application name="LMarbles"> <regname>LMarbles 1.0.6</regname> @@ -188,12 +107,6 @@ <description>WinBoard is a graphical chessboard for the Windows/ReactOS that can serve as a user interface for GNU Chess, Crafty, and other chess engines, for the Internet Chess Servers, and for electronic mail correspondence chess.</description> <location>http://ftp.gnu.org/gnu/winboard/winboard-4_2_7b.exe</location> </application> - </category> - <category name="Science" icon="11"> - </category> - <category name="Edutainment" icon="12"> - </category> - <category name="Engineering" icon="13"> </category> <category name="Tools" icon="7"> <application name="7-Zip">

1 0

[fireball] 35132: - Revert 35131 till a more complete fix is available.
by fireball＠svn.reactos.org 05 Aug '08

05 Aug '08

Author: fireball Date: Tue Aug 5 14:07:27 2008 New Revision: 35132 URL: http://svn.reactos.org/svn/reactos?rev=35132&view=rev Log: - Revert 35131 till a more complete fix is available. Modified: trunk/reactos/lib/3rdparty/libwine/debug.c Modified: trunk/reactos/lib/3rdparty/libwine/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/debug… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libwine/debug.c [iso-8859-1] Tue Aug 5 14:07:27 2008 @@ -42,16 +42,6 @@ IN ... ); -ULONG -__cdecl -vDbgPrintExWithPrefix( - IN LPCSTR Prefix, - IN ULONG ComponentId, - IN ULONG Level, - IN LPCSTR Format, - IN va_list ap); - - static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; #define MAX_DEBUG_OPTIONS 256 @@ -394,7 +384,10 @@ /* default implementation of wine_dbg_vprintf */ static int default_dbg_vprintf( const char *format, va_list args ) { - return vDbgPrintExWithPrefix(NULL, -1, 0, format, args); + char buffer[512]; + vsnprintf( buffer, sizeof(buffer), format, args ); + buffer[sizeof(buffer) - 1] = '\0'; + return DbgPrint( "%s", buffer ); }

1 0

[fireball] 35131: - Get rid of sprintf usage in default_dbg_vprintf. - This make tracing macro usage safe in crt sprintf implementation and simplify overall codepath (no need for intermediate buffer). - Solution inspired by hackbunny's suggestion, fixes bug 3632. See issue #3632 for more details.
by fireball＠svn.reactos.org 05 Aug '08

05 Aug '08

Author: fireball Date: Tue Aug 5 13:00:46 2008 New Revision: 35131 URL: http://svn.reactos.org/svn/reactos?rev=35131&view=rev Log: - Get rid of sprintf usage in default_dbg_vprintf. - This make tracing macro usage safe in crt sprintf implementation and simplify overall codepath (no need for intermediate buffer). - Solution inspired by hackbunny's suggestion, fixes bug 3632. See issue #3632 for more details. Modified: trunk/reactos/lib/3rdparty/libwine/debug.c Modified: trunk/reactos/lib/3rdparty/libwine/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/debug… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libwine/debug.c [iso-8859-1] Tue Aug 5 13:00:46 2008 @@ -42,6 +42,16 @@ IN ... ); +ULONG +__cdecl +vDbgPrintExWithPrefix( + IN LPCSTR Prefix, + IN ULONG ComponentId, + IN ULONG Level, + IN LPCSTR Format, + IN va_list ap); + + static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; #define MAX_DEBUG_OPTIONS 256 @@ -384,10 +394,7 @@ /* default implementation of wine_dbg_vprintf */ static int default_dbg_vprintf( const char *format, va_list args ) { - char buffer[512]; - vsnprintf( buffer, sizeof(buffer), format, args ); - buffer[sizeof(buffer) - 1] = '\0'; - return DbgPrint( "%s", buffer ); + return vDbgPrintExWithPrefix(NULL, -1, 0, format, args); }

1 0

[mkupfer] 35130: Short version of average16 added.
by mkupfer＠svn.reactos.org 05 Aug '08

05 Aug '08

Author: mkupfer Date: Tue Aug 5 11:40:24 2008 New Revision: 35130 URL: http://svn.reactos.org/svn/reactos?rev=35130&view=rev Log: Short version of average16 added. Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] Tue Aug 5 11:40:24 2008 @@ -499,7 +499,8 @@ return res; */ - return a; // FIXME: Depend on SetStretchMode + // This one is the short form of the correct one ;-) + return (((a ^ b) & 0xf7deU) >> 1) + (a & b); } //NOTE: If you change something here, please do the same in other dibXXbpp.c files!

1 0

[cgutman] 35129: - Use Status instead of IOSB.Status in some cases
by cgutman＠svn.reactos.org 05 Aug '08

05 Aug '08

Author: cgutman Date: Tue Aug 5 11:32:56 2008 New Revision: 35129 URL: http://svn.reactos.org/svn/reactos?rev=35129&view=rev Log: - Use Status instead of IOSB.Status in some cases Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/dll/win32/m… ============================================================================== --- branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Tue Aug 5 11:32:56 2008 @@ -515,6 +515,7 @@ /* Wait for return */ if (Status == STATUS_PENDING) { WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB.Status; } /* Set up Socket Data */ @@ -524,7 +525,7 @@ NtClose( SockEvent ); return MsafdReturnWithErrno - ( IOSB.Status, lpErrno, IOSB.Information, NULL ); + ( Status, lpErrno, 0, NULL ); } int @@ -568,6 +569,7 @@ /* Wait for return */ if (Status == STATUS_PENDING) { WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB.Status; } /* Set to Listening */ @@ -576,7 +578,7 @@ NtClose( SockEvent ); return MsafdReturnWithErrno - ( IOSB.Status, lpErrno, IOSB.Information, NULL ); + ( Status, lpErrno, 0, NULL ); } @@ -1249,7 +1251,7 @@ NtClose( SockEvent ); - return MsafdReturnWithErrno( IOSB.Status, lpErrno, 0, NULL ); + return MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); } int WSPAPI @@ -1312,13 +1314,14 @@ /* Wait for return */ if (Status == STATUS_PENDING) { WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB.Status; } AFD_DbgPrint(MID_TRACE,("Ending\n")); NtClose( SockEvent ); - return MsafdReturnWithErrno( IOSB.Status, lpErrno, 0, NULL ); + return MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); } @@ -1403,7 +1406,7 @@ } return MsafdReturnWithErrno - ( IOSB.Status, lpErrno, 0, NULL ); + ( Status, lpErrno, 0, NULL ); } @@ -1488,7 +1491,7 @@ } return MsafdReturnWithErrno - ( IOSB.Status, lpErrno, 0, NULL ); + ( Status, lpErrno, 0, NULL ); } INT

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