Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[jimtabor] 54150: [Win32k] - Fix timer resolution for once a millisecond. Now pass wine test_timers_no_wnd.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Oct 15 21:01:24 2011 New Revision: 54150 URL: http://svn.reactos.org/svn/reactos?rev=54150&view=rev Log: [Win32k] - Fix timer resolution for once a millisecond. Now pass wine test_timers_no_wnd. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c 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] Sat Oct 15 21:01:24 2011 @@ -187,7 +187,7 @@ PTIMER pTmr; UINT Ret = IDEvent; LARGE_INTEGER DueTime; - DueTime.QuadPart = (LONGLONG)(-5000000); + DueTime.QuadPart = (LONGLONG)(-9000); // 1024hz .9765625 ms #if 0 /* Windows NT/2k/XP behaviour */ @@ -448,7 +448,7 @@ KeQueryTickCount(&TickCount); Time = MsqCalculateMessageTime(&TickCount); - DueTime.QuadPart = (LONGLONG)(-500000); + DueTime.QuadPart = (LONGLONG)(-9000); // 1024hz .9765625 ms while(pLE != &TimersListHead) {

12 years, 11 months

[tkreuzer] 54149: [PSDK] - don't define _cdecl and __cdecl to nothing on MSVC builds. - define cdecl and CDECL to nothing - add #pragma once - this file is full of hacks

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 15 19:54:51 2011 New Revision: 54149 URL: http://svn.reactos.org/svn/reactos?rev=54149&view=rev Log: [PSDK] - don't define _cdecl and __cdecl to nothing on MSVC builds. - define cdecl and CDECL to nothing - add #pragma once - this file is full of hacks Modified: trunk/reactos/include/psdk/windef.h Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Sat Oct 15 19:54:51 2011 @@ -5,6 +5,7 @@ */ #ifndef _WINDEF_ #define _WINDEF_ +#pragma once #define _WINDEF_H // wine ... @@ -106,8 +107,6 @@ #define PACKED #else #define PACKED -#define _cdecl -#define __cdecl #endif #ifdef __GNUC__ @@ -141,9 +140,9 @@ #define near #define pascal __stdcall -//#define cdecl _cdecl +#define cdecl #ifndef CDECL -#define CDECL _cdecl +#define CDECL #endif #if !defined(__x86_64__) //defined(_STDCALL_SUPPORTED)

12 years, 11 months

[rharabien] 54148: - Fix build

by rharabien＠svn.reactos.org

Author: rharabien Date: Sat Oct 15 18:45:48 2011 New Revision: 54148 URL: http://svn.reactos.org/svn/reactos?rev=54148&view=rev Log: - Fix build Modified: trunk/reactos/ntoskrnl/ob/obwait.c Modified: trunk/reactos/ntoskrnl/ob/obwait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obwait.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] Sat Oct 15 18:45:48 2011 @@ -118,7 +118,7 @@ { /* Return the exception code */ Status = _SEH2_GetExceptionCode(); - SEH2_YIELD(goto Quickie); + _SEH2_YIELD(goto Quickie); } _SEH2_END;

12 years, 11 months

[rharabien] 54147: [NTOSKRNL] - Don't exit from NtWaitForMultipleObjects with kernel lock held

by rharabien＠svn.reactos.org

Author: rharabien Date: Sat Oct 15 18:41:45 2011 New Revision: 54147 URL: http://svn.reactos.org/svn/reactos?rev=54147&view=rev Log: [NTOSKRNL] - Don't exit from NtWaitForMultipleObjects with kernel lock held Modified: trunk/reactos/ntoskrnl/ob/obwait.c Modified: trunk/reactos/ntoskrnl/ob/obwait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obwait.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] Sat Oct 15 18:41:45 2011 @@ -117,7 +117,8 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); + Status = _SEH2_GetExceptionCode(); + SEH2_YIELD(goto Quickie); } _SEH2_END;

12 years, 11 months

[akhaldi] 54146: [WINE/WS2_32] * Sync config.h with recent Wine and remove some now unneeded defines. By Samuel Serapion. See issue #6174 for more details.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 15 13:50:26 2011 New Revision: 54146 URL: http://svn.reactos.org/svn/reactos?rev=54146&view=rev Log: [WINE/WS2_32] * Sync config.h with recent Wine and remove some now unneeded defines. By Samuel Serapion. See issue #6174 for more details. Modified: trunk/reactos/dll/win32/ws2_32/misc/async.c trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/dll/win32/ws2_32/misc/async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/asyn… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/async.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/async.c [iso-8859-1] Sat Oct 15 13:50:26 2011 @@ -36,9 +36,6 @@ #include <windows.h> #define WS_FD_SETSIZE FD_SETSIZE -#define HAVE_GETPROTOBYNAME -#define HAVE_GETPROTOBYNUMBER -#define HAVE_GETSERVBYPORT typedef struct hostent WS_hostent; typedef struct servent WS_servent; typedef struct protoent WS_protoent; Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Sat Oct 15 13:50:26 2011 @@ -1,6 +1,3 @@ -/* include/config.h. Generated by configure. */ -/* include/config.h.in. Generated from configure.ac by autoheader. */ - #include "reactos/buildno.h" #define __WINE_CONFIG_H @@ -8,407 +5,497 @@ /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ #define DECLSPEC_HOTPATCH -/* Specifies the compiler flag that forces a short wchar_t */ -#define CC_FLAG_SHORT_WCHAR "-fshort-wchar" +/* Define to the file extension for executables. */ +#define EXEEXT ".exe" + +/* Define to 1 if you have the <alias.h> header file. */ +/* #undef HAVE_ALIAS_H */ + +/* Define to 1 if you have the <alsa/asoundlib.h> header file. */ +/*#undef HAVE_ALSA_ASOUNDLIB_H */ + +/* Define to 1 if you have the <AL/al.h> header file. */ +/* #undef HAVE_AL_AL_H */ + +/* Define to 1 if you have the <ApplicationServices/ApplicationServices.h> + header file. */ +/* #undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H */ + +/* Define to 1 if you have the <arpa/inet.h> header file. */ +/* #undef HAVE_ARPA_INET_H */ + +/* Define to 1 if you have the <arpa/nameser.h> header file. */ +/* #undef HAVE_ARPA_NAMESER_H */ + +/* Define to 1 if you have the `asctime_r' function. */ +/* #undef HAVE_ASCTIME_R */ + +/* Define to 1 if you have the <asm/types.h> header file. */ +/* #undef HAVE_ASM_TYPES_H */ + +/* Define to 1 if you have the <AudioToolbox/AudioConverter.h> header file. */ +/* #undef HAVE_AUDIOTOOLBOX_AUDIOCONVERTER_H */ + +/* Define to 1 if you have the <AudioUnit/AudioComponent.h> header file. */ +/* #undef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H */ + +/* Define to 1 if you have the <AudioUnit/AudioUnit.h> header file. */ +/* #undef HAVE_AUDIOUNIT_AUDIOUNIT_H */ + +/* Define to 1 if you have the <audio/audiolib.h> header file. */ +/* #undef HAVE_AUDIO_AUDIOLIB_H */ + +/* Define to 1 if you have the <audio/soundlib.h> header file. */ +/* #undef HAVE_AUDIO_SOUNDLIB_H */ + +/* Define to 1 if you have the `AUGraphAddNode' function. */ +/* #undef HAVE_AUGRAPHADDNODE */ + +/* Define to 1 if you have the <capi20.h> header file. */ +/* #undef HAVE_CAPI20_H */ + +/* Define to 1 if you have the <Carbon/Carbon.h> header file. */ +/* #undef HAVE_CARBON_CARBON_H */ + +/* Define to 1 if you have the `chsize' function. */ +#define HAVE_CHSIZE 1 + +/* Define to 1 if you have the <CL/cl.h> header file. */ +/* #undef HAVE_CL_CL_H */ + +/* Define to 1 if you have the <CoreAudio/CoreAudio.h> header file. */ +/* #undef HAVE_COREAUDIO_COREAUDIO_H */ + +/* Define to 1 if you have the <cups/cups.h> header file. */ +/* #undef HAVE_CUPS_CUPS_H */ + +/* Define to 1 if you have the <curses.h> header file. */ +/* #undef HAVE_CURSES_H */ + +/* Define if you have the daylight variable */ +#define HAVE_DAYLIGHT 1 + +/* Define to 1 if you have the <dbus/dbus.h> header file. */ +/* #undef HAVE_DBUS_DBUS_H */ + +/* Define to 1 if you have the <direct.h> header file. */ +#define HAVE_DIRECT_H 1 + +/* Define to 1 if you have the <dirent.h> header file. */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the <DiskArbitration/DiskArbitration.h> header + file. */ +/* #undef HAVE_DISKARBITRATION_DISKARBITRATION_H */ + +/* Define to 1 if you have the `dladdr' function. */ +/* #undef HAVE_DLADDR */ + +/* Define to 1 if you have the <dlfcn.h> header file. */ +/* #undef HAVE_DLFCN_H */ + +/* Define to 1 if you have the `dlopen' function. */ +/* #undef HAVE_DLOPEN */ + +/* Define to 1 if you have the <elf.h> header file. */ +/* #undef HAVE_ELF_H */ + +/* Define to 1 if you have the `epoll_create' function. */ +/* #undef HAVE_EPOLL_CREATE */ + +/* Define to 1 if you have the `ffs' function. */ +/* #undef HAVE_FFS */ + +/* Define to 1 if you have the `finite' function. */ +#define HAVE_FINITE 1 + +/* Define to 1 if you have the <float.h> header file. */ +#define HAVE_FLOAT_H 1 + +/* Define to 1 if you have the `fnmatch' function. */ +/* #undef HAVE_FNMATCH */ + +/* Define to 1 if you have the <fnmatch.h> header file. */ +/* #undef HAVE_FNMATCH_H */ + +/* Define to 1 if you have the <fontconfig/fontconfig.h> header file. */ +/* #undef HAVE_FONTCONFIG_FONTCONFIG_H */ + +/* Define to 1 if you have the `fork' function. */ +/* #undef HAVE_FORK */ + +/* Define to 1 if you have the `fpclass' function. */ +#define HAVE_FPCLASS 1 + +/* Define if FreeType 2 is installed */ +#define HAVE_FREETYPE 1 + +/* Define to 1 if you have the <freetype/freetype.h> header file. */ +#define HAVE_FREETYPE_FREETYPE_H 1 + +/* Define to 1 if you have the <freetype/ftglyph.h> header file. */ +#define HAVE_FREETYPE_FTGLYPH_H 1 + +/* Define to 1 if you have the <freetype/ftlcdfil.h> header file. */ +#define HAVE_FREETYPE_FTLCDFIL_H 1 + +/* Define to 1 if you have the <freetype/ftmodapi.h> header file. */ +#define HAVE_FREETYPE_FTMODAPI_H 1 + +/* Define to 1 if you have the <freetype/ftoutln.h> header file. */ +#define HAVE_FREETYPE_FTOUTLN_H 1 + +/* Define to 1 if you have the <freetype/ftsnames.h> header file. */ +#define HAVE_FREETYPE_FTSNAMES_H 1 + +/* Define if you have the <freetype/fttrigon.h> header file. */ +#define HAVE_FREETYPE_FTTRIGON_H 1 + +/* Define to 1 if you have the <freetype/fttypes.h> header file. */ +/*#undef HAVE_FREETYPE_FTTYPES_H*/ + +/* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */ +#define HAVE_FREETYPE_FTWINFNT_H 1 + +/* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */ +/* #undef HAVE_FREETYPE_INTERNAL_SFNT_H */ + +/* Define to 1 if you have the <freetype/ttnameid.h> header file. */ +#define HAVE_FREETYPE_TTNAMEID_H 1 + +/* Define to 1 if you have the <freetype/tttables.h> header file. */ +#define HAVE_FREETYPE_TTTABLES_H 1 + +/* Define to 1 if the system has the type `fsblkcnt_t'. */ +/* #undef HAVE_FSBLKCNT_T */ + +/* Define to 1 if the system has the type `fsfilcnt_t'. */ +/* #undef HAVE_FSFILCNT_T */ + +/* Define to 1 if you have the `fstatfs' function. */ +/* #undef HAVE_FSTATFS */ + +/* Define to 1 if you have the `fstatvfs' function. */ +/* #undef HAVE_FSTATVFS */ + +/* Define to 1 if you have the <ft2build.h> header file. */ +#define HAVE_FT2BUILD_H 1 + +/* Define to 1 if you have the `ftruncate' function. */ +#define HAVE_FTRUNCATE 1 + +/* Define to 1 if you have the `FT_Load_Sfnt_Table' function. */ +/* #undef HAVE_FT_LOAD_SFNT_TABLE */ + +/* Define to 1 if the system has the type `FT_TrueTypeEngineType'. */ +#define HAVE_FT_TRUETYPEENGINETYPE 1 + +/* Define to 1 if you have the `futimes' function. */ +/* #undef HAVE_FUTIMES */ + +/* Define to 1 if you have the `futimesat' function. */ +/* #undef HAVE_FUTIMESAT */ + +/* Define to 1 if you have the `getaddrinfo' function. */ +#define HAVE_GETADDRINFO 1 + +/* Define to 1 if you have the `getattrlist' function. */ +/* #undef HAVE_GETATTRLIST */ + +/* Define to 1 if you have the `getdirentries' function. */ +/* #undef HAVE_GETDIRENTRIES */ + +/* Define to 1 if you have the `getnameinfo' function. */ +#define HAVE_GETNAMEINFO 1 + +/* Define to 1 if you have the `getnetbyname' function. */ +/* #undef HAVE_GETNETBYNAME */ + +/* Define to 1 if you have the <getopt.h> header file. */ +#define HAVE_GETOPT_H 1 + +/* Define to 1 if you have the `getopt_long' function. */ +#define HAVE_GETOPT_LONG 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getprotobyname' function. */ +#define HAVE_GETPROTOBYNAME 1 + +/* Define to 1 if you have the `getprotobynumber' function. */ +#define HAVE_GETPROTOBYNUMBER ` + +/* Define to 1 if you have the `getpwuid' function. */ +/* #undef HAVE_GETPWUID */ + +/* Define to 1 if you have the `getservbyport' function. */ +#define HAVE_GETSERVBYPORT 1 + +/* Define to 1 if you have the <gettext-po.h> header file. */ +/* #undef HAVE_GETTEXT_PO_H */ + +/* Define to 1 if you have the `gettimeofday' function. */ +/* #undef HAVE_GETTIMEOFDAY */ + +/* Define to 1 if you have the `getuid' function. */ +/* #undef HAVE_GETUID */ + +/* Define to 1 if you have the <GL/glu.h> header file. */ +/* #undef HAVE_GL_GLU_H */ + +/* Define to 1 if you have the <GL/glx.h> header file. */ +/* #undef HAVE_GL_GLX_H */ + +/* Define to 1 if you have the <GL/gl.h> header file. */ +/* #undef HAVE_GL_GL_H */ + +/* Define if we have libgphoto2 development environment */ +/*#undef HAVE_GPHOTO2*/ + +/* Define to 1 if you have the <grp.h> header file. */ +/*#undef HAVE_GRP_H*/ + +/* Define to 1 if you have the <gsm/gsm.h> header file. */ +/*#undef HAVE_GSM_GSM_H*/ + +/* Define to 1 if you have the <gsm.h> header file. */ +/* #undef HAVE_GSM_H*/ + +/* Define to 1 if you have the <hal/libhal.h> header file. */ +/* #undef HAVE_HAL_LIBHAL_H*/ + +/* Define to 1 if you have the <ieeefp.h> header file. */ +/* #undef HAVE_IEEEFP_H */ + +/* Define to 1 if you have the <ifaddrs.h> header file. */ +/* #undef HAVE_IFADDRS_H */ + +/* Define to 1 if you have the <inet/mib2.h> header file. */ +/*#undef HAVE_INET_MIB2_H*/ + +/* Define to 1 if you have the `inet_network' function. */ +/* #undef HAVE_INET_NETWORK */ + +/* Define to 1 if you have the `inet_ntop' function. */ +#define HAVE_INET_NTOP 1 + +/* Define to 1 if you have the `inet_pton' function. */ +/* #undef HAVE_INET_PTON */ + +/* Define to 1 if you have the <inttypes.h> header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `IOHIDManagerCreate' function. */ +/* #undef HAVE_IOHIDMANAGERCREATE */ + +/* Define to 1 if you have the <IOKit/hid/IOHIDLib.h> header file. */ +/* #undef HAVE_IOKIT_HID_IOHIDLIB_H */ + +/* Define to 1 if you have the <IOKit/IOKitLib.h> header file. */ +/* #undef HAVE_IOKIT_IOKITLIB_H */ + +/* Define to 1 if you have the <io.h> header file. */ +#define HAVE_IO_H 1 + +/* Define to 1 if you have the `isinf' function. */ +#define HAVE_ISINF 1 + +/* Define to 1 if you have the `isnan' function. */ +#define HAVE_ISNAN 1 + +/* Define to 1 if you have the <jack/jack.h> header file. */ +/* #undef HAVE_JACK_JACK_H */ + +/* Define to 1 if you have the <jpeglib.h> header file. */ +#define HAVE_JPEGLIB_H 1 + +/* Define to 1 if you have the `kqueue' function. */ +/* #undef HAVE_KQUEUE */ + +/* Define to 1 if you have the <kstat.h> header file. */ +/* #undef HAVE_KSTAT_H */ + +/* Define to 1 if you have the <lber.h> header file. */ +/* #undef HAVE_LBER_H */ + +/* Define if you have the LittleCMS development environment */ +/* #undef HAVE_LCMS */ + +/* Define to 1 if you have the <lcms.h> header file. */ +/* #undef HAVE_LCMS_H */ + +/* Define to 1 if you have the <lcms/lcms.h> header file. */ +/* #undef HAVE_LCMS_LCMS_H */ + +/* Define if you have the OpenLDAP development environment */ +/* #undef HAVE_LDAP */ + +/* Define to 1 if you have the `ldap_count_references' function. */ +/* #undef HAVE_LDAP_COUNT_REFERENCES */ + +/* Define to 1 if you have the `ldap_first_reference' function. */ +/* #undef HAVE_LDAP_FIRST_REFERENCE */ + +/* Define to 1 if you have the <ldap.h> header file. */ +/* #undef HAVE_LDAP_H */ + +/* Define to 1 if you have the `ldap_next_reference' function. */ +/* #undef HAVE_LDAP_NEXT_REFERENCE */ + +/* Define to 1 if you have the `ldap_parse_reference' function. */ +/* #undef HAVE_LDAP_PARSE_REFERENCE */ + +/* Define to 1 if you have the `ldap_parse_sortresponse_control' function. */ +/* #undef HAVE_LDAP_PARSE_SORTRESPONSE_CONTROL */ + +/* Define to 1 if you have the `ldap_parse_sort_control' function. */ +/* #undef HAVE_LDAP_PARSE_SORT_CONTROL */ + +/* Define to 1 if you have the `ldap_parse_vlvresponse_control' function. */ +/* #undef HAVE_LDAP_PARSE_VLVRESPONSE_CONTROL */ + +/* Define to 1 if you have the `ldap_parse_vlv_control' function. */ +/* #undef HAVE_LDAP_PARSE_VLV_CONTROL */ + +/* Define if you have libaudioIO */ +/* #undef HAVE_LIBAUDIOIO */ + +/* Define to 1 if you have the `gettextpo' library (-lgettextpo). */ +/* #undef HAVE_LIBGETTEXTPO */ + +/* Define to 1 if you have the `i386' library (-li386). */ +/* #undef HAVE_LIBI386 */ + +/* Define to 1 if you have the `kstat' library (-lkstat). */ +/* #undef HAVE_LIBKSTAT */ + +/* Define to 1 if you have the `ossaudio' library (-lossaudio). */ +/* #undef HAVE_LIBOSSAUDIO */ + +/* Define if you have the libxml2 library */ +#define HAVE_LIBXML2 1 + +/* Define to 1 if you have the <libxml/parser.h> header file. */ +#define HAVE_LIBXML_PARSER_H 1 + +/* Define if you have the X Shape extension */ +/* #undef HAVE_LIBXSHAPE */ + +/* Define to 1 if you have the <libxslt/pattern.h> header file. */ +#define HAVE_LIBXSLT_PATTERN_H 1 + +/* Define to 1 if you have the <libxslt/transform.h> header file. */ +#define HAVE_LIBXSLT_TRANSFORM_H 1 + +/* Define if you have the X Shm extension */ +/* #undef HAVE_LIBXXSHM */ + +/* Define to 1 if you have the <link.h> header file. */ +/* #undef HAVE_LINK_H */ + +/* Define if <linux/joystick.h> defines the Linux 2.2 joystick API */ +/* #undef HAVE_LINUX_22_JOYSTICK_API */ + +/* Define to 1 if you have the <linux/capi.h> header file. */ +/* #undef HAVE_LINUX_CAPI_H */ + +/* Define to 1 if you have the <linux/cdrom.h> header file. */ +/* #undef HAVE_LINUX_CDROM_H */ + +/* Define to 1 if you have the <linux/compiler.h> header file. */ +/* #undef HAVE_LINUX_COMPILER_H */ + +/* Define if Linux-style gethostbyname_r and gethostbyaddr_r are available */ +/* #undef HAVE_LINUX_GETHOSTBYNAME_R_6 */ + +/* Define to 1 if you have the <linux/hdreg.h> header file. */ +/* #undef HAVE_LINUX_HDREG_H */ + +/* Define to 1 if you have the <linux/input.h> header file. */ +/* #undef HAVE_LINUX_INPUT_H */ + +/* Define to 1 if you have the <linux/ioctl.h> header file. */ +/* #undef HAVE_LINUX_IOCTL_H */ + +/* Define to 1 if you have the <linux/ipx.h> header file. */ +/* #undef HAVE_LINUX_IPX_H */ + +/* Define to 1 if you have the <linux/irda.h> header file. */ +/* #undef HAVE_LINUX_IRDA_H */ + +/* Define to 1 if you have the <linux/joystick.h> header file. */ +/* #undef HAVE_LINUX_JOYSTICK_H */ + +/* Define to 1 if you have the <linux/major.h> header file. */ +/* #undef HAVE_LINUX_MAJOR_H */ + +/* Define to 1 if you have the <linux/param.h> header file. */ +/* #undef HAVE_LINUX_PARAM_H */ + +/* Define to 1 if you have the <linux/serial.h> header file. */ +/* #undef HAVE_LINUX_SERIAL_H */ + +/* Define to 1 if you have the <linux/types.h> header file. */ +/* #undef HAVE_LINUX_TYPES_H */ + +/* Define to 1 if you have the <linux/ucdrom.h> header file. */ +/* #undef HAVE_LINUX_UCDROM_H */ + +/* Define to 1 if you have the <linux/videodev.h> header file. */ +/* #undef HAVE_LINUX_VIDEODEV_H */ + +/* Define to 1 if the system has the type `long long'. */ +#define HAVE_LONG_LONG 1 + +/* Define to 1 if you have the `lstat' function. */ +/* #undef HAVE_LSTAT */ + +/* Define to 1 if you have the <machine/cpu.h> header file. */ +/* #undef HAVE_MACHINE_CPU_H */ + +/* Define to 1 if you have the <machine/limits.h> header file. */ +/* #undef HAVE_MACHINE_LIMITS_H */ + +/* Define to 1 if you have the <machine/soundcard.h> header file. */ +/* #undef HAVE_MACHINE_SOUNDCARD_H */ + +/* Define to 1 if you have the <machine/sysarch.h> header file. */ +/* #undef HAVE_MACHINE_SYSARCH_H */ + +/* Define to 1 if you have the <mach/machine.h> header file. */ +/* #undef HAVE_MACH_MACHINE_H */ + +/* Define to 1 if you have the <mach/mach.h> header file. */ +/* #undef HAVE_MACH_MACH_H */ + +/* Define to 1 if you have the <mach-o/dyld_images.h> header file. */ +/* #undef HAVE_MACH_O_DYLD_IMAGES_H */ + +/* Define to 1 if you have the <mach-o/nlist.h> header file. */ +/* #undef HAVE_MACH_O_NLIST_H */ + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the <memory.h> header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mmap' function. */ +/* #undef HAVE_MMAP */ + +/* Define to 1 if you have the <mntent.h> header file. */ +/* #undef HAVE_MNTENT_H */ + +/* Define to 1 if the system has the type `mode_t'. */ +#define HAVE_MODE_T 1 + +/* Define to 1 if you have the `mousemask' function. */ +/* #undef HAVE_MOUSEMASK */ /* Define to 1 if you have the <mpg123.h> header file. */ #define HAVE_MPG123_H 1 -/* Define if you have ALSA 1.x including devel headers */ -/* #undef HAVE_ALSA */ - -/* Define to 1 if you have the <alsa/asoundlib.h> header file. */ -/* #undef HAVE_ALSA_ASOUNDLIB_H */ - -/* Define to 1 if you have the <arpa/inet.h> header file. */ -/* #undef HAVE_ARPA_INET_H */ - -/* Define to 1 if you have the <arpa/nameser.h> header file. */ -/* #undef HAVE_ARPA_NAMESER_H */ - -/* Define if you have ARTS sound server */ -/* #undef HAVE_ARTS */ - -/* Define to 1 if you have the <asm/types.h> header file. */ -/* #undef HAVE_ASM_TYPES_H */ - -/* Define to 1 if you have the <audio/audiolib.h> header file. */ -/* #undef HAVE_AUDIO_AUDIOLIB_H */ - -/* Define to 1 if you have the <audio/soundlib.h> header file. */ -/* #undef HAVE_AUDIO_SOUNDLIB_H */ - -/* Define to 1 if you have the <capi20.h> header file. */ -/* #undef HAVE_CAPI20_H */ - -/* Define if you have capi4linux libs and headers */ -/* #undef HAVE_CAPI4LINUX */ - -/* Define to 1 if you have the `chsize' function. */ -#define HAVE_CHSIZE 1 - -/* Define to 1 if you have the `clone' function. */ -/* #undef HAVE_CLONE */ - -/* Define to 1 if you have the `connect' function. */ -/* #undef HAVE_CONNECT */ - -/* Define to 1 if you have the <cups/cups.h> header file. */ -/* #undef HAVE_CUPS_CUPS_H */ - -/* Define to 1 if you have the <curses.h> header file. */ -/* #undef HAVE_CURSES_H */ - -/* Define if you have the daylight variable */ -#define HAVE_DAYLIGHT 1 - -/* Define to 1 if you have the <direct.h> header file. */ -//#define HAVE_DIRECT_H 1 - -/* Define to 1 if you have the <dlfcn.h> header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define if you have dlopen */ -/* #undef HAVE_DLOPEN */ - -/* Define to 1 if you have the <elf.h> header file. */ -/* #undef HAVE_ELF_H */ - -/* Define to 1 if you have the `epoll_create' function. */ -/* #undef HAVE_EPOLL_CREATE */ - -/* Define if you have EsounD sound server */ -/* #undef HAVE_ESD */ - -/* Define to 1 if you have the `ffs' function. */ -/* #undef HAVE_FFS */ - -/* Define to 1 if you have the `finite' function. */ -#define HAVE_FINITE 1 - -/* Define to 1 if you have the <float.h> header file. */ -#define HAVE_FLOAT_H 1 - -/* Define to 1 if you have the <fontconfig/fontconfig.h> header file. */ -/* #undef HAVE_FONTCONFIG_FONTCONFIG_H */ - -/* Define to 1 if you have the `fork' function. */ -/* #undef HAVE_FORK */ - -/* Define to 1 if you have the `fpclass' function. */ -#define HAVE_FPCLASS 1 - -/* Define if FreeType 2 is installed */ -#define HAVE_FREETYPE 1 - -/* Define to 1 if you have the <freetype/freetype.h> header file. */ -#define HAVE_FREETYPE_FREETYPE_H 1 - -/* Define to 1 if you have the <freetype/ftglyph.h> header file. */ -#define HAVE_FREETYPE_FTGLYPH_H 1 - -/* Define to 1 if you have the <freetype/ftlcdfil.h> header file. */ -#define HAVE_FREETYPE_FTLCDFIL_H 1 - -/* Define to 1 if you have the <freetype/ftmodapi.h> header file. */ -#define HAVE_FREETYPE_FTMODAPI_H 1 - -/* Define to 1 if you have the <freetype/ftnames.h> header file. */ -/* #undef HAVE_FREETYPE_FTNAMES_H */ - -/* Define to 1 if you have the <freetype/ftoutln.h> header file. */ -#define HAVE_FREETYPE_FTOUTLN_H 1 - -/* Define to 1 if you have the <freetype/ftsnames.h> header file. */ -#define HAVE_FREETYPE_FTSNAMES_H 1 - -/* Define if you have the <freetype/fttrigon.h> header file. */ -#define HAVE_FREETYPE_FTTRIGON_H 1 - -/* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */ -#define HAVE_FREETYPE_FTWINFNT_H 1 - -/* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */ -/* #undef HAVE_FREETYPE_INTERNAL_SFNT_H */ - -/* Define to 1 if you have the <freetype/ttnameid.h> header file. */ -#define HAVE_FREETYPE_TTNAMEID_H 1 - -/* Define to 1 if you have the <freetype/tttables.h> header file. */ -#define HAVE_FREETYPE_TTTABLES_H 1 - -/* Define to 1 if the system has the type `fsblkcnt_t'. */ -/* #undef HAVE_FSBLKCNT_T */ - -/* Define to 1 if the system has the type `fsfilcnt_t'. */ -/* #undef HAVE_FSFILCNT_T */ - -/* Define to 1 if you have the `fstatfs' function. */ -/* #undef HAVE_FSTATFS */ - -/* Define to 1 if you have the `fstatvfs' function. */ -/* #undef HAVE_FSTATVFS */ - -/* Define to 1 if you have the <ft2build.h> header file. */ -#define HAVE_FT2BUILD_H 1 - -/* Define to 1 if you have the `FT_Load_Sfnt_Table' function. */ -/* #undef HAVE_FT_LOAD_SFNT_TABLE */ - -/* Define to 1 if the system has the type `FT_TrueTypeEngineType'. */ -#define HAVE_FT_TRUETYPEENGINETYPE 1 - -/* Define to 1 if you have the `ftruncate' function. */ -#define HAVE_FTRUNCATE 1 - -/* Define to 1 if you have the `futimes' function. */ -/* #undef HAVE_FUTIMES */ - -/* Define to 1 if you have the `futimesat' function. */ -/* #undef HAVE_FUTIMESAT */ - -/* Define to 1 if you have the `getaddrinfo' function. */ -/* #undef HAVE_GETADDRINFO */ - -/* Define to 1 if you have the `gethostbyname' function. */ -/* #undef HAVE_GETHOSTBYNAME */ - -/* Define to 1 if you have the `getnetbyname' function. */ -/* #undef HAVE_GETNETBYNAME */ - -/* Define to 1 if you have the <getopt.h> header file. */ -#define HAVE_GETOPT_H 1 - -/* Define to 1 if you have the `getopt_long' function. */ -#define HAVE_GETOPT_LONG 1 - -/* Define to 1 if you have the `getpagesize' function. */ -#define HAVE_GETPAGESIZE 1 - -/* Define to 1 if you have the `getprotobyname' function. */ -/* #undef HAVE_GETPROTOBYNAME */ - -/* Define to 1 if you have the `getprotobynumber' function. */ -/* #undef HAVE_GETPROTOBYNUMBER */ - -/* Define to 1 if you have the `getpwuid' function. */ -/* #undef HAVE_GETPWUID */ - -/* Define to 1 if you have the `getservbyport' function. */ -/* #undef HAVE_GETSERVBYPORT */ - -/* Define to 1 if you have the `gettid' function. */ -/* #undef HAVE_GETTID */ - -/* Define to 1 if you have the `gettimeofday' function. */ -/* #undef HAVE_GETTIMEOFDAY */ - -/* Define to 1 if you have the `getuid' function. */ -/* #undef HAVE_GETUID */ - -/* Define to 1 if you have the <gif_lib.h> header file. */ -/* #undef HAVE_GIF_LIB_H */ - -/* Define to 1 if you have the <GL/glext.h> header file. */ -/* #undef HAVE_GL_GLEXT_H */ - -/* Define to 1 if you have the <GL/glx.h> header file. */ -/* #undef HAVE_GL_GLX_H */ - -/* Define to 1 if you have the <GL/gl.h> header file. */ -/* #undef HAVE_GL_GL_H */ - -/* Define to 1 if the ICU libraries are installed */ -/* #undef HAVE_ICU */ - -/* Define to 1 if you have the <ieeefp.h> header file. */ -/* #undef HAVE_IEEEFP_H */ - -/* Define to 1 if you have the `inet_aton' function. */ -/* #undef HAVE_INET_ATON */ - -/* Define to 1 if you have the `inet_network' function. */ -/* #undef HAVE_INET_NETWORK */ - -/* Define to 1 if you have the <inttypes.h> header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the <IOKit/IOKitLib.h> header file. */ -/* #undef HAVE_IOKIT_IOKITLIB_H */ - -/* Define to 1 if you have the <io.h> header file. */ -//#define HAVE_IO_H 1 - -/* Define to 1 if you have the <jack/jack.h> header file. */ -/* #undef HAVE_JACK_JACK_H */ - -/* Define to 1 if you have the <jpeglib.h> header file. */ -/* #undef HAVE_JPEGLIB_H */ - -/* Define to 1 if you have the <lber.h> header file. */ -/* #undef HAVE_LBER_H */ - -/* Define if you have the LittleCMS development environment */ -/* #undef HAVE_LCMS */ - -/* Define to 1 if you have the <lcms.h> header file. */ -/* #undef HAVE_LCMS_H */ - -/* Define to 1 if you have the <lcms/lcms.h> header file. */ -/* #undef HAVE_LCMS_LCMS_H */ - -/* Define if you have the OpenLDAP development environment */ -/* #undef HAVE_LDAP */ - -/* Define to 1 if you have the <ldap.h> header file. */ -/* #undef HAVE_LDAP_H */ - -/* Define if you have libaudioIO */ -/* #undef HAVE_LIBAUDIOIO */ - -/* Define to 1 if you have the <libaudioio.h> header file. */ -/* #undef HAVE_LIBAUDIOIO_H */ - -/* Define if you have the curses library (-lcurses) */ -/* #undef HAVE_LIBCURSES */ - -/* Define to 1 if you have the `i386' library (-li386). */ -/* #undef HAVE_LIBI386 */ - -/* Define if you have the ncurses library (-lncurses) */ -/* #undef HAVE_LIBNCURSES */ - -/* Define to 1 if you have the `nsl' library (-lnsl). */ -/* #undef HAVE_LIBNSL */ - -/* Define to 1 if you have the `ossaudio' library (-lossaudio). */ -/* #undef HAVE_LIBOSSAUDIO */ - -/* Define to 1 if you have the `poll' library (-lpoll). */ -/* #undef HAVE_LIBPOLL */ - -/* Define to 1 if you have the `resolv' library (-lresolv). */ -/* #undef HAVE_LIBRESOLV */ - -/* Define to 1 if you have the `socket' library (-lsocket). */ -/* #undef HAVE_LIBSOCKET */ - -/* Define if you have the libxml2 library */ -#define HAVE_LIBXML2 -#define HAVE_XMLNEWDOCPI -#define HAVE_XMLREADMEMORY - -/* Define to 1 if you have the <libxml/parser.h> header file. */ -#define HAVE_LIBXML_PARSER_H - -/* Define to 1 if you have the `xpg4' library (-lxpg4). */ -/* #undef HAVE_LIBXPG4 */ - -/* Define if you have the Xrandr library */ -/* #undef HAVE_LIBXRANDR */ - -/* Define if you have the X Shape extension */ -/* #undef HAVE_LIBXSHAPE */ - -/* Define if you have the libxslt library */ -/* #undef HAVE_LIBXSLT */ - -/* Define to 1 if you have the <libxslt/pattern.h> header file. */ -#define HAVE_LIBXSLT_PATTERN_H - -/* Define to 1 if you have the <libxslt/transform.h> header file. */ -#define HAVE_LIBXSLT_TRANSFORM_H - -/* Define if you have the Xxf86dga library version 2 */ -/* #undef HAVE_LIBXXF86DGA2 */ - -/* Define if you have the Xxf86vm library */ -/* #undef HAVE_LIBXXF86VM */ - -/* Define if you have the X Shm extension */ -/* #undef HAVE_LIBXXSHM */ - -/* Define to 1 if you have the <link.h> header file. */ -/* #undef HAVE_LINK_H */ - -/* Define if <linux/joystick.h> defines the Linux 2.2 joystick API */ -/* #undef HAVE_LINUX_22_JOYSTICK_API */ - -/* Define to 1 if you have the <linux/capi.h> header file. */ -/* #undef HAVE_LINUX_CAPI_H */ - -/* Define to 1 if you have the <linux/cdrom.h> header file. */ -/* #undef HAVE_LINUX_CDROM_H */ - -/* Define to 1 if you have the <linux/compiler.h> header file. */ -/* #undef HAVE_LINUX_COMPILER_H */ - -/* Define if Linux-style gethostbyname_r and gethostbyaddr_r are available */ -/* #undef HAVE_LINUX_GETHOSTBYNAME_R_6 */ - -/* Define to 1 if you have the <linux/hdreg.h> header file. */ -/* #undef HAVE_LINUX_HDREG_H */ - -/* Define to 1 if you have the <linux/input.h> header file. */ -/* #undef HAVE_LINUX_INPUT_H */ - -/* Define to 1 if you have the <linux/ioctl.h> header file. */ -/* #undef HAVE_LINUX_IOCTL_H */ - -/* Define to 1 if you have the <linux/ipx.h> header file. */ -/* #undef HAVE_LINUX_IPX_H */ - -/* Define to 1 if you have the <linux/joystick.h> header file. */ -/* #undef HAVE_LINUX_JOYSTICK_H */ - -/* Define to 1 if you have the <linux/major.h> header file. */ -/* #undef HAVE_LINUX_MAJOR_H */ - -/* Define to 1 if you have the <linux/param.h> header file. */ -/* #undef HAVE_LINUX_PARAM_H */ - -/* Define to 1 if you have the <linux/serial.h> header file. */ -/* #undef HAVE_LINUX_SERIAL_H */ - -/* Define to 1 if you have the <linux/ucdrom.h> header file. */ -/* #undef HAVE_LINUX_UCDROM_H */ - -/* Define to 1 if you have the <linux/videodev.h> header file. */ -/* #undef HAVE_LINUX_VIDEODEV_H */ - -/* Define to 1 if the system has the type `long long'. */ -#define HAVE_LONG_LONG 1 - -/* Define to 1 if you have the `lstat' function. */ -/* #undef HAVE_LSTAT */ - -/* Define to 1 if you have the <machine/cpu.h> header file. */ -/* #undef HAVE_MACHINE_CPU_H */ - -/* Define to 1 if you have the <machine/limits.h> header file. */ -/* #undef HAVE_MACHINE_LIMITS_H */ - -/* Define to 1 if you have the <machine/soundcard.h> header file. */ -/* #undef HAVE_MACHINE_SOUNDCARD_H */ - -/* Define to 1 if you have the <mach/machine.h> header file. */ -/* #undef HAVE_MACH_MACHINE_H */ - -/* Define to 1 if you have the `memmove' function. */ -#define HAVE_MEMMOVE 1 - -/* Define to 1 if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `mmap' function. */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if you have the <mntent.h> header file. */ -/* #undef HAVE_MNTENT_H */ - -/* Define to 1 if the system has the type `mode_t'. */ -#define HAVE_MODE_T 1 - /* Define if you have NAS including devel headers */ /* #undef HAVE_NAS */ @@ -418,18 +505,51 @@ /* Define to 1 if you have the <netdb.h> header file. */ /* #undef HAVE_NETDB_H */ +/* Define to 1 if you have the <netinet/icmp_var.h> header file. */ +/* #undef HAVE_NETINET_ICMP_VAR_H */ + +/* Define to 1 if you have the <netinet/if_ether.h> header file. */ +/* #undef HAVE_NETINET_IF_ETHER_H */ + +/* Define to 1 if you have the <netinet/if_inarp.h> header file. */ +/* #undef HAVE_NETINET_IF_INARP_H */ + /* Define to 1 if you have the <netinet/in.h> header file. */ /* #undef HAVE_NETINET_IN_H */ +/* Define to 1 if you have the <netinet/in_pcb.h> header file. */ +/* #undef HAVE_NETINET_IN_PCB_H */ + /* Define to 1 if you have the <netinet/in_systm.h> header file. */ /* #undef HAVE_NETINET_IN_SYSTM_H */ +/* Define to 1 if you have the <netinet/ip.h> header file. */ +/* #undef HAVE_NETINET_IP_H */ + +/* Define to 1 if you have the <netinet/ip_icmp.h> header file. */ +/* #undef HAVE_NETINET_IP_ICMP_H */ + +/* Define to 1 if you have the <netinet/ip_var.h> header file. */ +/* #undef HAVE_NETINET_IP_VAR_H */ + /* Define to 1 if you have the <netinet/tcp_fsm.h> header file. */ /* #undef HAVE_NETINET_TCP_FSM_H */ /* Define to 1 if you have the <netinet/tcp.h> header file. */ /* #undef HAVE_NETINET_TCP_H */ +/* Define to 1 if you have the <netinet/tcp_timer.h> header file. */ +/* #undef HAVE_NETINET_TCP_TIMER_H */ + +/* Define to 1 if you have the <netinet/tcp_var.h> header file. */ +/* #undef HAVE_NETINET_TCP_VAR_H */ + +/* Define to 1 if you have the <netinet/udp.h> header file. */ +/* #undef HAVE_NETINET_UDP_H */ + +/* Define to 1 if you have the <netinet/udp_var.h> header file. */ +/* #undef HAVE_NETINET_UDP_VAR_H */ + /* Define to 1 if you have the <netipx/ipx.h> header file. */ /* #undef HAVE_NETIPX_IPX_H */ @@ -448,35 +568,77 @@ /* Define to 1 if you have the <net/route.h> header file. */ /* #undef HAVE_NET_ROUTE_H */ +/* Define to 1 if `_msg_ptr' is a member of `ns_msg'. */ +/* #undef HAVE_NS_MSG__MSG_PTR */ + /* Define to 1 if the system has the type `off_t'. */ #define HAVE_OFF_T 1 +/* Define if mkdir takes only one argument */ +#define HAVE_ONE_ARG_MKDIR 1 + +/* Define to 1 if OpenAL is available */ +/* #undef HAVE_OPENAL */ + +/* Define to 1 if you have the <OpenAL/al.h> header file. */ +/*#undef HAVE_OPENAL_AL_H */ + /* Define if OpenGL is present on the system */ /* #undef HAVE_OPENGL */ +/* Define to 1 if you have the <openssl/err.h> header file. */ +/* #define HAVE_OPENSSL_ERR_H 1 */ + /* Define to 1 if you have the <openssl/ssl.h> header file. */ /* #undef HAVE_OPENSSL_SSL_H */ +/* Define to 1 if the system has the type `oss_sysinfo'. */ +/* #undef HAVE_OSS_SYSINFO */ + /* Define to 1 if you have the `pclose' function. */ #define HAVE_PCLOSE 1 /* Define to 1 if the system has the type `pid_t'. */ #define HAVE_PID_T 1 +/* Define to 1 if you have the `pipe2' function. */ +/* #undef HAVE_PIPE2 */ + +/* Define to 1 if you have the <png.h> header file. */ +#define HAVE_PNG_H 1 + +/* Define to 1 if libpng has the png_set_expand_gray_1_2_4_to_8 function. */ +#define HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 1 + +/* Define to 1 if you have the `poll' function. */ +/* #undef HAVE_POLL */ + /* Define to 1 if you have the <poll.h> header file. */ /* #undef HAVE_POLL_H */ /* Define to 1 if you have the `popen' function. */ #define HAVE_POPEN 1 +/* Define to 1 if you have the `port_create' function. */ +/* #undef HAVE_PORT_CREATE */ + +/* Define to 1 if you have the <port.h> header file. */ +/* #undef HAVE_PORT_H */ + /* Define if we can use ppdev.h for parallel port access */ /* #undef HAVE_PPDEV */ +/* Define to 1 if you have the `prctl' function. */ +/* #undef HAVE_PRCTL */ + /* Define to 1 if you have the `pread' function. */ /* #undef HAVE_PREAD */ /* Define to 1 if you have the <process.h> header file. */ -// #define HAVE_PROCESS_H 1 +#define HAVE_PROCESS_H 1 + +/* Define to 1 if you have the `pthread_attr_get_np' function. */ +/* #undef HAVE_PTHREAD_ATTR_GET_NP */ /* Define to 1 if you have the `pthread_getattr_np' function. */ /* #undef HAVE_PTHREAD_GETATTR_NP */ @@ -490,11 +652,8 @@ /* Define to 1 if you have the <pthread.h> header file. */ /* #undef HAVE_PTHREAD_H */ -/* Define to 1 if the system has the type `pthread_rwlockattr_t'. */ -/* #undef HAVE_PTHREAD_RWLOCKATTR_T */ - -/* Define to 1 if the system has the type `pthread_rwlock_t'. */ -/* #undef HAVE_PTHREAD_RWLOCK_T */ +/* Define to 1 if you have the <pthread_np.h> header file. */ +/* #undef HAVE_PTHREAD_NP_H */ /* Define to 1 if you have the <pwd.h> header file. */ /* #undef HAVE_PWD_H */ @@ -502,31 +661,37 @@ /* Define to 1 if you have the `pwrite' function. */ /* #undef HAVE_PWRITE */ +/* Define to 1 if you have the <QuickTime/ImageCompression.h> header file. */ +/* #undef HAVE_QUICKTIME_IMAGECOMPRESSION_H */ + +/* Define to 1 if you have the `readdir' function. */ +/* #undef HAVE_READDIR */ + /* Define to 1 if you have the `readlink' function. */ /* #undef HAVE_READLINK */ /* Define to 1 if you have the <regex.h> header file. */ -/* #undef HAVE_REGEX_H */ +#define HAVE_REGEX_H 1 /* Define to 1 if the system has the type `request_sense'. */ /* #undef HAVE_REQUEST_SENSE */ +/* Define if you have the resolver library and header */ +/* #undef HAVE_RESOLV */ + /* Define to 1 if you have the <resolv.h> header file. */ /* #undef HAVE_RESOLV_H */ -/* Define to 1 if you have the `rfork' function. */ -/* #undef HAVE_RFORK */ - -/* Define if we have SANE development environment */ -/* #undef HAVE_SANE */ - /* Define to 1 if you have the <sched.h> header file. */ /* #undef HAVE_SCHED_H */ +/* Define to 1 if you have the `sched_setaffinity' function. */ +/* #undef HAVE_SCHED_SETAFFINITY */ + /* Define to 1 if you have the `sched_yield' function. */ /* #undef HAVE_SCHED_YIELD */ -/* Define to 1 if `cmd' is member of `scsireq_t'. */ +/* Define to 1 if `cmd' is a member of `scsireq_t'. */ /* #undef HAVE_SCSIREQ_T_CMD */ /* Define to 1 if you have the <scsi/scsi.h> header file. */ @@ -538,12 +703,21 @@ /* Define to 1 if you have the <scsi/sg.h> header file. */ /* #undef HAVE_SCSI_SG_H */ +/* Define to 1 if you have the <Security/Security.h> header file. */ +/* #undef HAVE_SECURITY_SECURITY_H */ + /* Define to 1 if you have the `select' function. */ -/* #undef HAVE_SELECT */ +#define HAVE_SELECT 1 /* Define to 1 if you have the `sendmsg' function. */ /* #undef HAVE_SENDMSG */ +/* Define to 1 if you have the `setproctitle' function. */ +/* #undef HAVE_SETPROCTITLE */ + +/* Define to 1 if you have the `setrlimit' function. */ +/* #undef HAVE_SETRLIMIT */ + /* Define to 1 if you have the `settimeofday' function. */ /* #undef HAVE_SETTIMEOFDAY */ @@ -562,9 +736,6 @@ /* Define to 1 if you have the `sigprocmask' function. */ /* #undef HAVE_SIGPROCMASK */ -/* Define to 1 if you have the sigsetjmp (and siglongjmp) function */ -/* #undef HAVE_SIGSETJMP */ - /* Define to 1 if the system has the type `sigset_t'. */ /* #undef HAVE_SIGSET_T */ @@ -574,6 +745,9 @@ /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 +/* Define to 1 if you have the `socketpair' function. */ +/* #undef HAVE_SOCKETPAIR */ + /* Define to 1 if you have the <soundcard.h> header file. */ /* #undef HAVE_SOUNDCARD_H */ @@ -588,6 +762,9 @@ /* Define to 1 if you have the `statvfs' function. */ /* #undef HAVE_STATVFS */ + +/* Define to 1 if you have the <stdbool.h> header file. */ +/* #undef HAVE_STDBOOL_H */ /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 @@ -600,6 +777,9 @@ #define HAVE_STRCASECMP 1 #endif +/* Define to 1 if you have the `strdup' function. */ +/* #undef HAVE_STRDUP */ + /* Define to 1 if you have the `strerror' function. */ #define HAVE_STRERROR 1 @@ -614,59 +794,89 @@ #define HAVE_STRNCASECMP 1 #endif -/* Define to 1 if you have the <tiffio.h> header file. */ -#define HAVE_TIFFIO_H 1 - -/* Define to the soname of the libtiff library. */ -#define SONAME_LIBTIFF "libtiff" - -/* Define to 1 if you have the <png.h> header file. */ -#define HAVE_PNG_H 1 - -/* Define to 1 if libpng has the png_set_expand_gray_1_2_4_to_8 function. */ -#define HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 1 - -/* Define to the soname of the libpng library. */ -#define SONAME_LIBPNG "libpng" - -/* Define to 1 if `direction' is member of `struct ff_effect'. */ +/* Define to 1 if you have the <stropts.h> header file. */ +/* #undef HAVE_STROPTS_H */ + +/* Define to 1 if you have the `strtold' function. */ +/* #undef HAVE_STRTOLD */ + +/* Define to 1 if you have the `strtoll' function. */ +/* #undef HAVE_STRTOLL */ + +/* Define to 1 if you have the `strtoull' function. */ +/* #undef HAVE_STRTOULL */ + +/* Define to 1 if `direction' is a member of `struct ff_effect'. */ /* #undef HAVE_STRUCT_FF_EFFECT_DIRECTION */ -/* Define to 1 if `msg_accrights' is member of `struct msghdr'. */ +/* Define to 1 if `icps_outhist' is a member of `struct icmpstat'. */ +/* #undef HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST */ + +/* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */ +/* #undef HAVE_STRUCT_IFREQ_IFR_HWADDR */ + +/* Define to 1 if `msg_accrights' is a member of `struct msghdr'. */ /* #undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ -/* Define to 1 if `name' is member of `struct option'. */ +/* Define to 1 if `mt_blkno' is a member of `struct mtget'. */ +/* #undef HAVE_STRUCT_MTGET_MT_BLKNO */ + +/* Define to 1 if `mt_blksiz' is a member of `struct mtget'. */ +/* #undef HAVE_STRUCT_MTGET_MT_BLKSIZ */ + +/* Define to 1 if `mt_gstat' is a member of `struct mtget'. */ +/* #undef HAVE_STRUCT_MTGET_MT_GSTAT */ + +/* Define to 1 if `name' is a member of `struct option'. */ #define HAVE_STRUCT_OPTION_NAME 1 -/* Define to 1 if `sa_len' is member of `struct sockaddr'. */ +/* Define to 1 if `sin6_scope_id' is a member of `struct sockaddr_in6'. */ +/* #undef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID */ + +/* Define to 1 if `sa_len' is a member of `struct sockaddr'. */ /* #undef HAVE_STRUCT_SOCKADDR_SA_LEN */ -/* Define to 1 if `sun_len' is member of `struct sockaddr_un'. */ +/* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */ /* #undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN */ -/* Define to 1 if `f_bavail' is member of `struct statfs'. */ +/* Define to 1 if `f_bavail' is a member of `struct statfs'. */ /* #undef HAVE_STRUCT_STATFS_F_BAVAIL */ -/* Define to 1 if `f_bfree' is member of `struct statfs'. */ +/* Define to 1 if `f_bfree' is a member of `struct statfs'. */ /* #undef HAVE_STRUCT_STATFS_F_BFREE */ -/* Define to 1 if `f_favail' is member of `struct statfs'. */ +/* Define to 1 if `f_favail' is a member of `struct statfs'. */ /* #undef HAVE_STRUCT_STATFS_F_FAVAIL */ -/* Define to 1 if `f_ffree' is member of `struct statfs'. */ +/* Define to 1 if `f_ffree' is a member of `struct statfs'. */ /* #undef HAVE_STRUCT_STATFS_F_FFREE */ -/* Define to 1 if `f_frsize' is member of `struct statfs'. */ +/* Define to 1 if `f_frsize' is a member of `struct statfs'. */ /* #undef HAVE_STRUCT_STATFS_F_FRSIZE */ -/* Define to 1 if `f_namelen' is member of `struct statfs'. */ +/* Define to 1 if `f_namelen' is a member of `struct statfs'. */ /* #undef HAVE_STRUCT_STATFS_F_NAMELEN */ -/* Define to 1 if `f_blocks' is member of `struct statvfs'. */ +/* Define to 1 if `f_blocks' is a member of `struct statvfs'. */ /* #undef HAVE_STRUCT_STATVFS_F_BLOCKS */ -/* Define to 1 if `st_blocks' is member of `struct stat'. */ +/* Define to 1 if `st_atim' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_ATIM */ + +/* Define to 1 if `st_blocks' is a member of `struct stat'. */ /* #undef HAVE_STRUCT_STAT_ST_BLOCKS */ + +/* Define to 1 if `st_ctim' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_CTIM */ + +/* Define to 1 if `st_mtim' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_MTIM */ + +/* Define to 1 if the system has the type `struct xinpgen'. */ +/* #undef HAVE_STRUCT_XINPGEN */ + +/* Define to 1 if you have the `symlink' function. */ +/* #undef HAVE_SYMLINK */ /* Define to 1 if you have the <syscall.h> header file. */ /* #undef HAVE_SYSCALL_H */ @@ -686,12 +896,18 @@ /* Define to 1 if you have the <sys/errno.h> header file. */ /* #undef HAVE_SYS_ERRNO_H */ +/* Define to 1 if you have the <sys/event.h> header file. */ +/* #undef HAVE_SYS_EVENT_H */ + /* Define to 1 if you have the <sys/exec_elf.h> header file. */ /* #undef HAVE_SYS_EXEC_ELF_H */ /* Define to 1 if you have the <sys/filio.h> header file. */ /* #undef HAVE_SYS_FILIO_H */ +/* Define to 1 if you have the <sys/inotify.h> header file. */ +/* #undef HAVE_SYS_INOTIFY_H */ + /* Define to 1 if you have the <sys/ioctl.h> header file. */ /* #undef HAVE_SYS_IOCTL_H */ @@ -704,9 +920,6 @@ /* Define to 1 if you have the <sys/link.h> header file. */ /* #undef HAVE_SYS_LINK_H */ -/* Define to 1 if you have the <sys/lwp.h> header file. */ -/* #undef HAVE_SYS_LWP_H */ - /* Define to 1 if you have the <sys/mman.h> header file. */ /* #undef HAVE_SYS_MMAN_H */ @@ -719,16 +932,25 @@ /* Define to 1 if you have the <sys/msg.h> header file. */ /* #undef HAVE_SYS_MSG_H */ +/* Define to 1 if you have the <sys/mtio.h> header file. */ +/* #undef HAVE_SYS_MTIO_H */ + /* Define to 1 if you have the <sys/param.h> header file. */ #define HAVE_SYS_PARAM_H 1 /* Define to 1 if you have the <sys/poll.h> header file. */ /* #undef HAVE_SYS_POLL_H */ +/* Define to 1 if you have the <sys/prctl.h> header file. */ +/* #undef HAVE_SYS_PRCTL_H */ + +/* Define to 1 if you have the <sys/protosw.h> header file. */ +/* #undef HAVE_SYS_PROTOSW_H */ + /* Define to 1 if you have the <sys/ptrace.h> header file. */ /* #undef HAVE_SYS_PTRACE_H */ -/* Define to 1 if you have the <sys/reg.h> header file. */ +/* Define to 1 if you have the <sys/resource.h> header file. */ /* #undef HAVE_SYS_REG_H */ /* Define to 1 if you have the <sys/scsiio.h> header file. */ @@ -740,6 +962,9 @@ /* Define to 1 if you have the <sys/signal.h> header file. */ /* #undef HAVE_SYS_SIGNAL_H */ +/* Define to 1 if you have the <sys/socketvar.h> header file. */ +/* #undef HAVE_SYS_SOCKETVAR_H */ + /* Define to 1 if you have the <sys/socket.h> header file. */ /* #undef HAVE_SYS_SOCKET_H */ @@ -766,6 +991,15 @@ /* Define to 1 if you have the <sys/sysctl.h> header file. */ /* #undef HAVE_SYS_SYSCTL_H */ + +/* Define to 1 if you have the <sys/thr.h> header file. */ +/* #undef HAVE_SYS_THR_H */ + +/* Define to 1 if you have the <sys/tihdr.h> header file. */ +/* #undef HAVE_SYS_TIHDR_H */ + +/* Define to 1 if you have the <sys/timeout.h> header file. */ +/* #undef HAVE_SYS_TIMEOUT_H */ /* Define to 1 if you have the <sys/times.h> header file. */ /* #undef HAVE_SYS_TIMES_H */ @@ -787,6 +1021,9 @@ /* Define to 1 if you have the <sys/user.h> header file. */ /* #undef HAVE_SYS_USER_H */ +/* Define to 1 if you have the <sys/utsname.h> header file. */ +/* #undef HAVE_SYS_UTSNAME_H */ + /* Define to 1 if you have the <sys/vfs.h> header file. */ /* #undef HAVE_SYS_VFS_H */ @@ -802,6 +1039,12 @@ /* Define to 1 if you have the <termios.h> header file. */ /* #undef HAVE_TERMIOS_H */ +/* Define to 1 if you have the `thr_kill2' function. */ +/* #undef HAVE_THR_KILL2 */ + +/* Define to 1 if you have the <tiffio.h> header file. */ +#define HAVE_TIFFIO_H 1 + /* Define to 1 if you have the `timegm' function. */ /* #undef HAVE_TIMEGM */ @@ -811,11 +1054,8 @@ /* Define to 1 if you have the <ucontext.h> header file. */ /* #undef HAVE_UCONTEXT_H */ -/* Define to 1 if you have the <unicode/ubidi.h> header file. */ -/* #undef HAVE_UNICODE_UBIDI_H */ - /* Define to 1 if you have the <unistd.h> header file. */ -#if !defined(_MSC_VER) +#ifndef _MSC_VER #define HAVE_UNISTD_H 1 #endif @@ -828,8 +1068,8 @@ /* Define to 1 if you have the <valgrind/memcheck.h> header file. */ /* #undef HAVE_VALGRIND_MEMCHECK_H */ -/* Define if we have va_copy */ -#define HAVE_VA_COPY 1 +/* Define to 1 if you have the <valgrind/valgrind.h> header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ /* Define to 1 if you have the `vsnprintf' function. */ #define HAVE_VSNPRINTF 1 @@ -843,12 +1083,18 @@ /* Define to 1 if you have the <X11/extensions/shape.h> header file. */ /* #undef HAVE_X11_EXTENSIONS_SHAPE_H */ -/* Define to 1 if you have the <X11/extensions/xf86dga.h> header file. */ +/* Define to 1 if you have the <X11/extensions/Xcomposite.h> header file. */ /* #undef HAVE_X11_EXTENSIONS_XF86DGA_H */ /* Define to 1 if you have the <X11/extensions/xf86vmode.h> header file. */ /* #undef HAVE_X11_EXTENSIONS_XF86VMODE_H */ +/* Define to 1 if you have the <X11/extensions/xf86vmproto.h> header file. */ +/* #undef HAVE_X11_EXTENSIONS_XF86VMPROTO_H */ + +/* Define to 1 if you have the <X11/extensions/Xinerama.h> header file. */ +/* #undef HAVE_X11_EXTENSIONS_XINERAMA_H */ + /* Define to 1 if you have the <X11/extensions/XInput.h> header file. */ /* #undef HAVE_X11_EXTENSIONS_XINPUT_H */ @@ -861,6 +1107,9 @@ /* Define to 1 if you have the <X11/extensions/XShm.h> header file. */ /* #undef HAVE_X11_EXTENSIONS_XSHM_H */ +/* Define to 1 if you have the <X11/Xcursor/Xcursor.h> header file. */ +/* #undef HAVE_X11_XCURSOR_XCURSOR_H */ + /* Define to 1 if you have the <X11/XKBlib.h> header file. */ /* #undef HAVE_X11_XKBLIB_H */ @@ -870,20 +1119,26 @@ /* Define to 1 if you have the <X11/Xutil.h> header file. */ /* #undef HAVE_X11_XUTIL_H */ +/* Define to 1 if `callback' is a member of `XICCallback'. */ +/* #undef HAVE_XICCALLBACK_CALLBACK */ + /* Define if you have the XKB extension */ /* #undef HAVE_XKB */ +/* Define if libxml2 has the xmlNewDocPI function */ +#define HAVE_XMLNEWDOCPI 1 + /* Define if libxml2 has the xmlReadMemory function */ -/* #undef HAVE_XMLREADMEMORY */ +#define HAVE_XMLREADMEMORY 1 /* Define if Xrender has the XRenderSetPictureTransform function */ /* #undef HAVE_XRENDERSETPICTURETRANSFORM */ -/* Define to 1 if you have the `_lwp_create' function. */ -/* #undef HAVE__LWP_CREATE */ - -/* Define to 1 if you have the `_lwp_self' function. */ -/* #undef HAVE__LWP_SELF */ +/* Define to 1 if you have the `z' library (-lz). */ +/* #define HAVE_ZLIB 1 */ + +/* Define to 1 if you have the <zlib.h> header file. */ +/* #define HAVE_ZLIB_H 1 */ /* Define to 1 if you have the `_pclose' function. */ #define HAVE__PCLOSE 1 @@ -896,6 +1151,9 @@ /* Define to 1 if you have the `_spawnvp' function. */ #define HAVE__SPAWNVP 1 + +/* Define to 1 if you have the `_strdup' function. */ +#define HAVE__STRDUP 1 /* Define to 1 if you have the `_stricmp' function. */ #if defined(_WIN32) || defined(_WIN64) @@ -907,27 +1165,33 @@ #define HAVE__STRNICMP 1 #endif +/* Define to 1 if you have the `_strtoi64' function. */ +#define HAVE__STRTOI64 1 + +/* Define to 1 if you have the `_strtoui64' function. */ +#define HAVE__STRTOUI64 1 + /* Define to 1 if you have the `_vsnprintf' function. */ #define HAVE__VSNPRINTF 1 -/* Define if we have __va_copy */ -#define HAVE___VA_COPY 1 - /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "ros-dev(a)reactos.org" /* Define to the full name of this package. */ #define PACKAGE_NAME "ReactOS" +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION + /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ReactOS" +/* Define to the home page for this package. */ +#define PACKAGE_URL "http://www.reactos.org/" + /* Define to the version of this package. */ #define PACKAGE_VERSION KERNEL_VERSION_STR -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION - /* Define to the soname of the libcapi20 library. */ /* #undef SONAME_LIBCAPI20 */ @@ -946,12 +1210,21 @@ /* Define to the soname of the libfreetype library. */ /* #undef SONAME_LIBFREETYPE */ -/* Define to the soname of the libgif library. */ -/* #undef SONAME_LIBGIF */ - /* Define to the soname of the libGL library. */ /* #undef SONAME_LIBGL */ +/* Define to the soname of the libGLU library. */ +/* #undef SONAME_LIBGLU */ + +/* Define to the soname of the libgnutls library. */ +/* #unef SONAME_LIBGNUTLS */ + +/* Define to the soname of the libgsm library. */ +/* #undef SONAME_LIBGSM */ + +/* Define to the soname of the libhal library. */ +/* #undef SONAME_LIBHAL */ + /* Define to the soname of the libjack library. */ /* #undef SONAME_LIBJACK */ @@ -961,24 +1234,45 @@ /* Define to the soname of the libncurses library. */ /* #undef SONAME_LIBNCURSES */ +/* Define to the soname of the libodbc library. */ +/* #undef SONAME_LIBODBC */ + +/* Define to the soname of the libopenal library. */ +/* #undef SONAME_LIBOPENAL */ + +/* Define to the soname of the libpng library. */ +#define SONAME_LIBPNG "libpng" + +/* Define to the soname of the libsane library. */ +/* #undef SONAME_LIBSANE */ + /* Define to the soname of the libssl library. */ /* #undef SONAME_LIBSSL */ -/* Define to the soname of the libtxc_dxtn library. */ -/* #undef SONAME_LIBTXC_DXTN */ - -/* Define to the soname of the libungif library. */ -/* #undef SONAME_LIBUNGIF */ +/* Define to the soname of the libtiff library. */ +#define SONAME_LIBTIFF "libtiff" + +/* Define to the soname of the libv4l1 library. */ +/* #undef SONAME_LIBV4L1 */ /* Define to the soname of the libX11 library. */ /* #undef SONAME_LIBX11 */ +/* Define to the soname of the libXcomposite library. */ +/* #undef SONAME_LIBXCOMPOSITE */ + +/* Define to the soname of the libXcursor library. */ +/* #undef SONAME_LIBXCURSOR */ + /* Define to the soname of the libXext library. */ /* #undef SONAME_LIBXEXT */ /* Define to the soname of the libXi library. */ /* #undef SONAME_LIBXI */ +/* Define to the soname of the libXinerama library. */ +/* #undef SONAME_LIBXINERAMA */ + /* Define to the soname of the libXrandr library. */ /* #undef SONAME_LIBXRANDR */ @@ -988,14 +1282,8 @@ /* Define to the soname of the libxslt library. */ #define SONAME_LIBXSLT "libxslt" -/* Define if the struct statfs is defined by <sys/mount.h> */ -/* #undef STATFS_DEFINED_BY_SYS_MOUNT */ - -/* Define if the struct statfs is defined by <sys/statfs.h> */ -/* #undef STATFS_DEFINED_BY_SYS_STATFS */ - -/* Define if the struct statfs is defined by <sys/vfs.h> */ -/* #undef STATFS_DEFINED_BY_SYS_VFS */ +/* Define to the soname of the libXxf86vm library. */ +/* #undef SONAME_LIBXXF86VM */ /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ /* #undef STAT_MACROS_BROKEN */ @@ -1006,9 +1294,11 @@ /* Define to 1 if the X Window System is missing or not being used. */ #define X_DISPLAY_MISSING 1 -/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a - `char[]'. */ -#define YYTEXT_POINTER 1 +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ /* Define to a macro to output a .cfi assembly pseudo-op */ #define __ASM_CFI(str) str

12 years, 11 months

[tkreuzer] 54145: [ISOBTRT] call it 13h with es set to 0, instead of the transfer buffer segment, that we loaded it with. Fixes KVM boot.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 15 13:42:43 2011 New Revision: 54145 URL: http://svn.reactos.org/svn/reactos?rev=54145&view=rev Log: [ISOBTRT] call it 13h with es set to 0, instead of the transfer buffer segment, that we loaded it with. Fixes KVM boot. Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.S Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] Sat Oct 15 13:42:43 2011 @@ -144,7 +144,11 @@ jc .boot_cdrom // could not read hdd push ax +#ifdef ROS_REGTEST // this change is taken from the original isobtrt.asm + mov ax, word ptr ds:[trackbuf+510] +#else mov ax, word ptr ds:[trackbuf] +#endif cmp ax, 0 je .boot_cdrom // no boot sector found (hopefully there are no weird bootsectors which begin with 0) pop ax @@ -810,10 +814,14 @@ // BP - Sector count // getlinsec: + push es // save es, we reset it later to 0 + mov si, offset dapa // Load up the DAPA mov word ptr ds:[si+4], bx mov bx, es mov word ptr ds:[si+6], bx + xor bx, bx // reset es to 0, some bioses (KVM) require that + mov es, bx mov dword ptr ds:[si+8], eax .loop2: push bp // Sectors left @@ -836,6 +844,8 @@ and bp, bp jnz .loop2 mov eax, dword ptr ds:[si+8] // Next sector + + pop es ret // INT 13h with retry

12 years, 11 months

[akhaldi] 54144: [KERNEL32/LIBWINE/USP10] * Move the wctype table from kernel32 to libwine in preparations for implementing crt locale support. By Samuel Serapion. See issue #6538 for more details.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 15 13:17:52 2011 New Revision: 54144 URL: http://svn.reactos.org/svn/reactos?rev=54144&view=rev Log: [KERNEL32/LIBWINE/USP10] * Move the wctype table from kernel32 to libwine in preparations for implementing crt locale support. By Samuel Serapion. See issue #6538 for more details. Added: trunk/reactos/lib/3rdparty/libwine/wctype.c - copied unchanged from r54120, trunk/reactos/dll/win32/kernel32/winnls/string/chartype.c Removed: trunk/reactos/dll/win32/kernel32/winnls/string/chartype.c Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/kernel32/winnls/string/lang.c trunk/reactos/dll/win32/usp10/bidi.c trunk/reactos/include/reactos/wine/unicode.h trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt trunk/reactos/lib/3rdparty/libwine/libwine.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Removed: trunk/reactos/dll/win32/kernel32/winnls/string/chartype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/usp10/bidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bidi.c?rev… Modified: trunk/reactos/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico… Modified: trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/CMake… Modified: trunk/reactos/lib/3rdparty/libwine/libwine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/libwi…

12 years, 11 months

[akhaldi] 54143: [UNICODE] * Update unicode tool to wine 1.3.29. By Samuel Serapion. See issue #6537 for more details.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 15 12:39:23 2011 New Revision: 54143 URL: http://svn.reactos.org/svn/reactos?rev=54143&view=rev Log: [UNICODE] * Update unicode tool to wine 1.3.29. By Samuel Serapion. See issue #6537 for more details. Removed: trunk/reactos/tools/unicode/Makefile.in Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/unicode/c_037.c trunk/reactos/tools/unicode/c_10000.c trunk/reactos/tools/unicode/c_10006.c trunk/reactos/tools/unicode/c_10007.c trunk/reactos/tools/unicode/c_10029.c trunk/reactos/tools/unicode/c_1006.c trunk/reactos/tools/unicode/c_10079.c trunk/reactos/tools/unicode/c_10081.c trunk/reactos/tools/unicode/c_1026.c trunk/reactos/tools/unicode/c_1361.c trunk/reactos/tools/unicode/c_20127.c trunk/reactos/tools/unicode/c_20866.c trunk/reactos/tools/unicode/c_20932.c trunk/reactos/tools/unicode/c_21866.c trunk/reactos/tools/unicode/c_28591.c trunk/reactos/tools/unicode/c_28592.c trunk/reactos/tools/unicode/c_28593.c trunk/reactos/tools/unicode/c_28594.c trunk/reactos/tools/unicode/c_28595.c trunk/reactos/tools/unicode/c_28596.c trunk/reactos/tools/unicode/c_28597.c trunk/reactos/tools/unicode/c_28598.c trunk/reactos/tools/unicode/c_28599.c trunk/reactos/tools/unicode/c_28600.c trunk/reactos/tools/unicode/c_28603.c trunk/reactos/tools/unicode/c_28604.c trunk/reactos/tools/unicode/c_28605.c trunk/reactos/tools/unicode/c_28606.c trunk/reactos/tools/unicode/c_424.c trunk/reactos/tools/unicode/c_437.c trunk/reactos/tools/unicode/c_500.c trunk/reactos/tools/unicode/c_737.c trunk/reactos/tools/unicode/c_775.c trunk/reactos/tools/unicode/c_850.c trunk/reactos/tools/unicode/c_852.c trunk/reactos/tools/unicode/c_855.c trunk/reactos/tools/unicode/c_856.c trunk/reactos/tools/unicode/c_857.c trunk/reactos/tools/unicode/c_860.c trunk/reactos/tools/unicode/c_861.c trunk/reactos/tools/unicode/c_862.c trunk/reactos/tools/unicode/c_863.c trunk/reactos/tools/unicode/c_864.c trunk/reactos/tools/unicode/c_865.c trunk/reactos/tools/unicode/c_866.c trunk/reactos/tools/unicode/c_869.c trunk/reactos/tools/unicode/c_875.c trunk/reactos/tools/unicode/c_878.c trunk/reactos/tools/unicode/casemap.c trunk/reactos/tools/unicode/mbtowc.c trunk/reactos/tools/unicode/string.c trunk/reactos/tools/unicode/wctype.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Removed: trunk/reactos/tools/unicode/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/Makefile.in?… Modified: trunk/reactos/tools/unicode/c_037.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_037.c?rev=… Modified: trunk/reactos/tools/unicode/c_10000.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10000.c?re… Modified: trunk/reactos/tools/unicode/c_10006.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10006.c?re… Modified: trunk/reactos/tools/unicode/c_10007.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10007.c?re… Modified: trunk/reactos/tools/unicode/c_10029.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10029.c?re… Modified: trunk/reactos/tools/unicode/c_1006.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1006.c?rev… Modified: trunk/reactos/tools/unicode/c_10079.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10079.c?re… Modified: trunk/reactos/tools/unicode/c_10081.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10081.c?re… Modified: trunk/reactos/tools/unicode/c_1026.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1026.c?rev… Modified: trunk/reactos/tools/unicode/c_1361.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1361.c?rev… Modified: trunk/reactos/tools/unicode/c_20127.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_20127.c?re… Modified: trunk/reactos/tools/unicode/c_20866.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_20866.c?re… Modified: trunk/reactos/tools/unicode/c_20932.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_20932.c?re… Modified: trunk/reactos/tools/unicode/c_21866.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_21866.c?re… Modified: trunk/reactos/tools/unicode/c_28591.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28591.c?re… Modified: trunk/reactos/tools/unicode/c_28592.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28592.c?re… Modified: trunk/reactos/tools/unicode/c_28593.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28593.c?re… Modified: trunk/reactos/tools/unicode/c_28594.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28594.c?re… Modified: trunk/reactos/tools/unicode/c_28595.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28595.c?re… Modified: trunk/reactos/tools/unicode/c_28596.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28596.c?re… Modified: trunk/reactos/tools/unicode/c_28597.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28597.c?re… Modified: trunk/reactos/tools/unicode/c_28598.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28598.c?re… Modified: trunk/reactos/tools/unicode/c_28599.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28599.c?re… Modified: trunk/reactos/tools/unicode/c_28600.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28600.c?re… Modified: trunk/reactos/tools/unicode/c_28603.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28603.c?re… Modified: trunk/reactos/tools/unicode/c_28604.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28604.c?re… Modified: trunk/reactos/tools/unicode/c_28605.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28605.c?re… Modified: trunk/reactos/tools/unicode/c_28606.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28606.c?re… Modified: trunk/reactos/tools/unicode/c_424.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_424.c?rev=… Modified: trunk/reactos/tools/unicode/c_437.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_437.c?rev=… Modified: trunk/reactos/tools/unicode/c_500.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_500.c?rev=… Modified: trunk/reactos/tools/unicode/c_737.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_737.c?rev=… Modified: trunk/reactos/tools/unicode/c_775.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_775.c?rev=… Modified: trunk/reactos/tools/unicode/c_850.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_850.c?rev=… Modified: trunk/reactos/tools/unicode/c_852.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_852.c?rev=… Modified: trunk/reactos/tools/unicode/c_855.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_855.c?rev=… Modified: trunk/reactos/tools/unicode/c_856.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_856.c?rev=… Modified: trunk/reactos/tools/unicode/c_857.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_857.c?rev=… Modified: trunk/reactos/tools/unicode/c_860.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_860.c?rev=… Modified: trunk/reactos/tools/unicode/c_861.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_861.c?rev=… Modified: trunk/reactos/tools/unicode/c_862.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_862.c?rev=… Modified: trunk/reactos/tools/unicode/c_863.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_863.c?rev=… Modified: trunk/reactos/tools/unicode/c_864.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_864.c?rev=… Modified: trunk/reactos/tools/unicode/c_865.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_865.c?rev=… Modified: trunk/reactos/tools/unicode/c_866.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_866.c?rev=… Modified: trunk/reactos/tools/unicode/c_869.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_869.c?rev=… Modified: trunk/reactos/tools/unicode/c_875.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_875.c?rev=… Modified: trunk/reactos/tools/unicode/c_878.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_878.c?rev=… Modified: trunk/reactos/tools/unicode/casemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/casemap.c?re… Modified: trunk/reactos/tools/unicode/mbtowc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/mbtowc.c?rev… Modified: trunk/reactos/tools/unicode/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/string.c?rev… Modified: trunk/reactos/tools/unicode/wctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wctype.c?rev…

12 years, 11 months

[jimtabor] 54142: [Win32k] - Properly set the timer event id's to match tests and add one more bit for track. - Restore TME user API (now in mouse.c) and Hover Timer, these are not the Droids you a...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Oct 15 00:38:23 2011 New Revision: 54142 URL: http://svn.reactos.org/svn/reactos?rev=54142&view=rev Log: [Win32k] - Properly set the timer event id's to match tests and add one more bit for track. - Restore TME user API (now in mouse.c) and Hover Timer, these are not the Droids you are looking for. - Restore TME cancellation point in co_MsqInsertMouseMessage and duplicate the the same in co_IntProcessMouseMessage. First thing, pDesk->spwndTrack is never NULL. The Theme TME patch code was setting the wrong QS bit and sending to the wrong queue instead of the pDesk->spwndTrack queue. Surprising this was working at all. - Tested with Themes, passes wine test_TrackMouseEvent and fixes bug (6257 <-- !). Notes: It's all in the sequencing. Locate cancellation points, tracking mouse moves and set the hit test and track window. When the window message queue does not match the current thread, check it again and restore the mouse hover window if it is the same window as the track window and the hover bit set. Track cancellation points and clear the bits at the same time. Not when in WM_MOUSEMOVE. Guess when posting or sending to another thread? co_MsqInsertMouseMessage? Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/timer.h trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Sat Oct 15 00:38:23 2011 @@ -34,10 +34,10 @@ // Desktop flags #define DF_TME_HOVER 0x00000400 #define DF_TME_LEAVE 0x00000800 +#define DF_HOTTRACK 0x00004000 #define DF_DESTROYED 0x00008000 #define DF_DESKWNDDESTROYED 0x00010000 #define DF_DYING 0x00020000 - extern PDESKTOP InputDesktop; extern HDESK InputDesktopHandle; 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] Sat Oct 15 00:38:23 2011 @@ -24,11 +24,11 @@ #define TMRF_WAITING 0x0020 #define TMRF_TIFROMWND 0x0040 -#define ID_EVENT_SYSTIMER_MOUSEHOVER (-6) -#define ID_EVENT_SYSTIMER_FLASHWIN (-8) -#define ID_EVENT_SYSTIMER_TRACKWIN (-9) -#define ID_EVENT_SYSTIMER_ANIMATEDFADE (-10) -#define ID_EVENT_SYSTIMER_INVALIDATEDCES (-11) +#define ID_EVENT_SYSTIMER_MOUSEHOVER ID_TME_TIMER +#define ID_EVENT_SYSTIMER_FLASHWIN (0xFFF8) +#define ID_EVENT_SYSTIMER_TRACKWIN (0xFFF7) +#define ID_EVENT_SYSTIMER_ANIMATEDFADE (0xFFF6) +#define ID_EVENT_SYSTIMER_INVALIDATEDCES (0xFFF5) extern PKTIMER MasterTimer; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c [iso-8859-1] Sat Oct 15 00:38:23 2011 @@ -334,6 +334,19 @@ if (!(pWnd = UserGetWindowObject(lpEventTrack->hwndTrack))) return FALSE; + if ( pDesk->spwndTrack != pWnd || + (pDesk->htEx != HTCLIENT) ^ !!(lpEventTrack->dwFlags & TME_NONCLIENT) ) + { + if ( lpEventTrack->dwFlags & TME_LEAVE && !(lpEventTrack->dwFlags & TME_CANCEL) ) + { + UserPostMessage( lpEventTrack->hwndTrack, + lpEventTrack->dwFlags & TME_NONCLIENT ? WM_NCMOUSELEAVE : WM_MOUSELEAVE, + 0, 0); + } + TRACE("IntTrackMouseEvent spwndTrack 0x%x pwnd 0x%x\n", pDesk->spwndTrack, pWnd); + return TRUE; + } + /* Tracking spwndTrack same as pWnd */ if (lpEventTrack->dwFlags & TME_CANCEL) // Canceled mode. { @@ -351,7 +364,6 @@ } else // Not Canceled. { - pDesk->spwndTrack = pWnd; if (lpEventTrack->dwFlags & TME_LEAVE) pDesk->dwDTFlags |= DF_TME_LEAVE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sat Oct 15 00:38:23 2011 @@ -536,34 +536,22 @@ if (pwnd) { /* If we a re tracking the mouse and it moves to another top level window */ - if(pDesk->spwndTrack && - UserGetAncestor(pDesk->spwndTrack, GA_ROOT) != pwnd) - { - /* Generate a WM_MOUSELEAVE message */ - if ( pDesk->dwDTFlags & DF_TME_LEAVE ) - { - MSG msgMouseLeave; - - TRACE("co_MsqInsertMouseMessage: generating WM_MOUSELEAVE\n"); - - msgMouseLeave.hwnd = UserHMGetHandle(pDesk->spwndTrack); - msgMouseLeave.message = WM_MOUSELEAVE; - msgMouseLeave.pt = Msg->pt; - msgMouseLeave.time = Msg->time; - msgMouseLeave.lParam = msgMouseLeave.wParam = 0; - - MsqPostMessage(pwnd->head.pti->MessageQueue, Msg, TRUE, QS_MOUSE); - } - - /* Stop tracking */ - if ( pDesk->dwDTFlags & DF_TME_HOVER ) - { - IntKillTimer(pDesk->spwndTrack, ID_EVENT_SYSTIMER_MOUSEHOVER, TRUE); - } - - pDesk->spwndTrack = NULL; - pDesk->htEx = 0; - } + PWND pwndTrack = IntChildrenWindowFromPoint(pwnd, Msg->pt.x, Msg->pt.y); + + if ( pDesk->spwndTrack != pwndTrack && pDesk->dwDTFlags & (DF_TME_LEAVE|DF_TME_HOVER) ) + { + if ( pDesk->dwDTFlags & DF_TME_LEAVE ) + UserPostMessage( UserHMGetHandle(pDesk->spwndTrack), + (pDesk->htEx != HTCLIENT) ? WM_NCMOUSELEAVE : WM_MOUSELEAVE, + 0, 0); + + if ( pDesk->dwDTFlags & DF_TME_HOVER ) + IntKillTimer(UserHMGetHandle(pDesk->spwndTrack), ID_EVENT_SYSTIMER_MOUSEHOVER, TRUE); + + pDesk->dwDTFlags &= ~(DF_TME_LEAVE|DF_TME_HOVER); + } + pDesk->spwndTrack = pwndTrack; + pDesk->htEx = GetNCHitEx(pDesk->spwndTrack, Msg->pt); } hdcScreen = IntGetScreenDC(); @@ -1306,42 +1294,21 @@ } /* If we a re tracking the mouse and it moves to another window */ - if(pDesk->spwndTrack && - pDesk->spwndTrack != pwndMsg && - msg->message != WM_MOUSELEAVE) - { - /* Generate a WM_MOUSELEAVE message */ - if ( pDesk->dwDTFlags & DF_TME_LEAVE ) - { - MSG msgMouseLeave; - - TRACE("co_IntProcessMouseMessage: generating WM_MOUSELEAVE\n"); - - msgMouseLeave.hwnd = UserHMGetHandle(pDesk->spwndTrack); - msgMouseLeave.message = WM_MOUSELEAVE; - msgMouseLeave.pt = msg->pt; - msgMouseLeave.time = msg->time; - msgMouseLeave.lParam = msgMouseLeave.wParam = 0; - - MsqPostMessage(pwndMsg->head.pti->MessageQueue, - &msgMouseLeave, - TRUE, - QS_MOUSE); - } - - /* Stop tracking */ - if ( pDesk->dwDTFlags & DF_TME_HOVER ) - { - IntKillTimer(pDesk->spwndTrack, ID_EVENT_SYSTIMER_MOUSEHOVER, TRUE); - } - - pDesk->spwndTrack = NULL; - pDesk->htEx = 0; - } - - if(pDesk->spwndTrack) - { - pDesk->htEx = hittest; + if ( pDesk->spwndTrack != pwndMsg && pDesk->dwDTFlags & (DF_TME_LEAVE|DF_TME_HOVER) && + msg->message != WM_MOUSELEAVE ) + { + if ( pDesk->dwDTFlags & DF_TME_LEAVE ) + UserPostMessage( UserHMGetHandle(pDesk->spwndTrack), + (pDesk->htEx != HTCLIENT) ? WM_NCMOUSELEAVE : WM_MOUSELEAVE, + 0, 0); + + if ( pDesk->dwDTFlags & DF_TME_HOVER ) + IntKillTimer(UserHMGetHandle(pDesk->spwndTrack), ID_EVENT_SYSTIMER_MOUSEHOVER, TRUE); + + pDesk->dwDTFlags &= ~(DF_TME_LEAVE|DF_TME_HOVER); + + pDesk->spwndTrack = pwndMsg; + pDesk->htEx = hittest; } msg->hwnd = UserHMGetHandle(pwndMsg); 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] Sat Oct 15 00:38:23 2011 @@ -344,14 +344,6 @@ UserPostMessage(hwnd, Msg, wParam, MAKELPARAM(Point.x, Point.y)); pDesk->dwDTFlags &= ~DF_TME_HOVER; break; // Kill this timer. - } - else - { - RECTL_vSetRect(&pDesk->rcMouseHover, - Point.x - gspv.iMouseHoverWidth / 2, - Point.y - gspv.iMouseHoverHeight / 2, - Point.x + gspv.iMouseHoverWidth / 2, - Point.y + gspv.iMouseHoverHeight / 2); } } }

12 years, 11 months

[rharabien] 54141: [WIN32K] - Get rid of RETURN macro in input functions - Don't check functions parameters when USER lock is held - Improve formatting

by rharabien＠svn.reactos.org

Author: rharabien Date: Fri Oct 14 19:01:35 2011 New Revision: 54141 URL: http://svn.reactos.org/svn/reactos?rev=54141&view=rev Log: [WIN32K] - Get rid of RETURN macro in input functions - Don't check functions parameters when USER lock is held - Improve formatting Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Fri Oct 14 19:01:35 2011 @@ -475,16 +475,16 @@ if (pti == ptiTo) return FALSE; /* Do not attach to system threads or between different desktops. */ - if ( pti->TIF_flags & TIF_DONTATTACHQUEUE || + if (pti->TIF_flags & TIF_DONTATTACHQUEUE || ptiTo->TIF_flags & TIF_DONTATTACHQUEUE || - pti->rpdesk != ptiTo->rpdesk ) + pti->rpdesk != ptiTo->rpdesk) return FALSE; /* If Attach set, allocate and link. */ - if ( fAttach ) + if (fAttach) { pai = ExAllocatePoolWithTag(PagedPool, sizeof(ATTACHINFO), USERTAG_ATTACHINFO); - if ( !pai ) return FALSE; + if (!pai) return FALSE; pai->paiNext = gpai; pai->pti1 = pti; @@ -495,19 +495,19 @@ { PATTACHINFO paiprev = NULL; - if ( !gpai ) return FALSE; + if (!gpai) return FALSE; pai = gpai; /* Search list and free if found or return false. */ do { - if ( pai->pti2 == ptiTo && pai->pti1 == pti ) break; + if (pai->pti2 == ptiTo && pai->pti1 == pti) break; paiprev = pai; pai = pai->paiNext; } while (pai); - if ( !pai ) return FALSE; + if (!pai) return FALSE; if (paiprev) paiprev->paiNext = pai->paiNext; @@ -525,8 +525,7 @@ INT cbSize) { PTHREADINFO pti; - UINT cnt; - DECLARE_RETURN(UINT); + UINT uRet = 0; TRACE("Enter NtUserSendInput\n"); UserEnterExclusive(); @@ -536,13 +535,13 @@ if (!pti->rpdesk) { - RETURN( 0); + goto cleanup; } if (!nInputs || !pInput || cbSize != sizeof(INPUT)) { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN( 0); + goto cleanup; } /* @@ -553,10 +552,9 @@ !IntIsActiveDesktop(pti->rpdesk)) { EngSetLastError(ERROR_ACCESS_DENIED); - RETURN( 0); - } - - cnt = 0; + goto cleanup; + } + while (nInputs--) { INPUT SafeInput; @@ -566,18 +564,18 @@ if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( cnt); + goto cleanup; } switch (SafeInput.type) { case INPUT_MOUSE: if (IntMouseInput(&SafeInput.mi, TRUE)) - cnt++; + uRet++; break; case INPUT_KEYBOARD: if (UserSendKeyboardInput(&SafeInput.ki, TRUE)) - cnt++; + uRet++; break; case INPUT_HARDWARE: FIXME("INPUT_HARDWARE not supported!"); @@ -588,12 +586,10 @@ } } - RETURN( cnt); - -CLEANUP: - TRACE("Leave NtUserSendInput, ret=%i\n", _ret_); +cleanup: + TRACE("Leave NtUserSendInput, ret=%i\n", uRet); UserLeave(); - END_CLEANUP; + return uRet; } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c [iso-8859-1] Fri Oct 14 19:01:35 2011 @@ -298,17 +298,17 @@ RtlZeroMemory(lpEventTrack , sizeof(TRACKMOUSEEVENT)); lpEventTrack->cbSize = sizeof(TRACKMOUSEEVENT); - if ( pDesk->dwDTFlags & (DF_TME_LEAVE | DF_TME_HOVER) && - pDesk->spwndTrack && - pti->MessageQueue == pDesk->spwndTrack->head.pti->MessageQueue ) - { - if ( pDesk->htEx != HTCLIENT ) + if (pDesk->dwDTFlags & (DF_TME_LEAVE | DF_TME_HOVER) && + pDesk->spwndTrack && + pti->MessageQueue == pDesk->spwndTrack->head.pti->MessageQueue) + { + if (pDesk->htEx != HTCLIENT) lpEventTrack->dwFlags |= TME_NONCLIENT; - if ( pDesk->dwDTFlags & DF_TME_LEAVE ) + if (pDesk->dwDTFlags & DF_TME_LEAVE) lpEventTrack->dwFlags |= TME_LEAVE; - if ( pDesk->dwDTFlags & DF_TME_HOVER ) + if (pDesk->dwDTFlags & DF_TME_HOVER) { lpEventTrack->dwFlags |= TME_HOVER; lpEventTrack->dwHoverTime = pDesk->dwMouseHoverTime; @@ -335,14 +335,14 @@ return FALSE; /* Tracking spwndTrack same as pWnd */ - if ( lpEventTrack->dwFlags & TME_CANCEL ) // Canceled mode. - { - if ( lpEventTrack->dwFlags & TME_LEAVE ) + if (lpEventTrack->dwFlags & TME_CANCEL) // Canceled mode. + { + if (lpEventTrack->dwFlags & TME_LEAVE) pDesk->dwDTFlags &= ~DF_TME_LEAVE; - if ( lpEventTrack->dwFlags & TME_HOVER ) - { - if ( pDesk->dwDTFlags & DF_TME_HOVER ) + if (lpEventTrack->dwFlags & TME_HOVER) + { + if (pDesk->dwDTFlags & DF_TME_HOVER) { // Kill hover timer. IntKillTimer(pWnd, ID_EVENT_SYSTIMER_MOUSEHOVER, TRUE); pDesk->dwDTFlags &= ~DF_TME_HOVER; @@ -351,20 +351,20 @@ } else // Not Canceled. { - pDesk->spwndTrack = pWnd; - if ( lpEventTrack->dwFlags & TME_LEAVE ) + pDesk->spwndTrack = pWnd; + if (lpEventTrack->dwFlags & TME_LEAVE) pDesk->dwDTFlags |= DF_TME_LEAVE; - if ( lpEventTrack->dwFlags & TME_HOVER ) + if (lpEventTrack->dwFlags & TME_HOVER) { pDesk->dwDTFlags |= DF_TME_HOVER; - if ( !lpEventTrack->dwHoverTime || lpEventTrack->dwHoverTime == HOVER_DEFAULT ) + if (!lpEventTrack->dwHoverTime || lpEventTrack->dwHoverTime == HOVER_DEFAULT) pDesk->dwMouseHoverTime = gspv.iMouseHoverTime; // use the system default hover time-out. else pDesk->dwMouseHoverTime = lpEventTrack->dwHoverTime; // Start timer for the hover period. - IntSetTimer( pWnd, ID_EVENT_SYSTIMER_MOUSEHOVER, pDesk->dwMouseHoverTime, SystemTimerProc, TMRF_SYSTEM); + IntSetTimer(pWnd, ID_EVENT_SYSTIMER_MOUSEHOVER, pDesk->dwMouseHoverTime, SystemTimerProc, TMRF_SYSTEM); // Get windows thread message points. point = pWnd->head.pti->ptLast; // Set desktop mouse hover from the system default hover rectangle. @@ -383,60 +383,60 @@ NtUserTrackMouseEvent( LPTRACKMOUSEEVENT lpEventTrack) { - TRACKMOUSEEVENT saveTME; - BOOL Ret = FALSE; + TRACKMOUSEEVENT SafeTME; + BOOL bRet = FALSE; TRACE("Enter NtUserTrackMouseEvent\n"); + + _SEH2_TRY + { + ProbeForRead(lpEventTrack, sizeof(TRACKMOUSEEVENT), 1); + RtlCopyMemory(&SafeTME, lpEventTrack, sizeof(TRACKMOUSEEVENT)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(return FALSE); + } + _SEH2_END; + + if (SafeTME.cbSize != sizeof(TRACKMOUSEEVENT)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (SafeTME.dwFlags & ~(TME_CANCEL | TME_QUERY | TME_NONCLIENT | TME_LEAVE | TME_HOVER) ) + { + EngSetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + UserEnterExclusive(); - _SEH2_TRY - { - ProbeForRead(lpEventTrack, sizeof(TRACKMOUSEEVENT), 1); - RtlCopyMemory(&saveTME, lpEventTrack, sizeof(TRACKMOUSEEVENT)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - _SEH2_YIELD(goto Exit;) - } - _SEH2_END; - - if ( saveTME.cbSize != sizeof(TRACKMOUSEEVENT) ) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - goto Exit; - } - - if (saveTME.dwFlags & ~(TME_CANCEL | TME_QUERY | TME_NONCLIENT | TME_LEAVE | TME_HOVER) ) - { - EngSetLastError(ERROR_INVALID_FLAGS); - goto Exit; - } - - if ( saveTME.dwFlags & TME_QUERY ) - { - Ret = IntQueryTrackMouseEvent(&saveTME); + if (SafeTME.dwFlags & TME_QUERY) + { + bRet = IntQueryTrackMouseEvent(&SafeTME); _SEH2_TRY { ProbeForWrite(lpEventTrack, sizeof(TRACKMOUSEEVENT), 1); - RtlCopyMemory(lpEventTrack, &saveTME, sizeof(TRACKMOUSEEVENT)); + RtlCopyMemory(lpEventTrack, &SafeTME, sizeof(TRACKMOUSEEVENT)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - Ret = FALSE; + bRet = FALSE; } _SEH2_END; } else { - Ret = IntTrackMouseEvent(&saveTME); - } - -Exit: - TRACE("Leave NtUserTrackMouseEvent, ret=%i\n", Ret); + bRet = IntTrackMouseEvent(&SafeTME); + } + + TRACE("Leave NtUserTrackMouseEvent, ret=%i\n", bRet); UserLeave(); - return Ret; + return bRet; } extern MOUSEMOVEPOINT MouseHistoryOfMoves[]; @@ -453,66 +453,66 @@ { MOUSEMOVEPOINT Safeppt; //BOOL Hit; - INT Count = -1; - DECLARE_RETURN(DWORD); + INT iRet = -1; TRACE("Enter NtUserGetMouseMovePointsEx\n"); - UserEnterExclusive(); if ((cbSize != sizeof(MOUSEMOVEPOINT)) || (nBufPoints < 0) || (nBufPoints > 64)) { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN( -1); + return (DWORD)-1; } if (!lpptIn || (!lpptOut && nBufPoints)) { EngSetLastError(ERROR_NOACCESS); - RETURN( -1); + return (DWORD)-1; } _SEH2_TRY { - ProbeForRead( lpptIn, cbSize, 1); + ProbeForRead(lpptIn, cbSize, 1); RtlCopyMemory(&Safeppt, lpptIn, cbSize); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - _SEH2_YIELD(RETURN( -1)) + _SEH2_YIELD(return (DWORD)-1); } _SEH2_END; + + UserEnterShared(); // http://msdn.microsoft.com/en-us/library/ms646259(v=vs.85).aspx // This explains the math issues in transforming points. - Count = gcur_count; // FIFO is forward so retrieve backward. + iRet = gcur_count; // FIFO is forward so retrieve backward. //Hit = FALSE; do { if (Safeppt.x == 0 && Safeppt.y == 0) break; // No test. // Finds the point, it returns the last nBufPoints prior to and including the supplied point. - if (MouseHistoryOfMoves[Count].x == Safeppt.x && MouseHistoryOfMoves[Count].y == Safeppt.y) - { - if ( Safeppt.time ) // Now test time and it seems to be absolute. - { - if (Safeppt.time == MouseHistoryOfMoves[Count].time) + if (MouseHistoryOfMoves[iRet].x == Safeppt.x && MouseHistoryOfMoves[iRet].y == Safeppt.y) + { + if (Safeppt.time) // Now test time and it seems to be absolute. + { + if (Safeppt.time == MouseHistoryOfMoves[iRet].time) { //Hit = TRUE; break; } else { - if (--Count < 0) Count = 63; + if (--iRet < 0) iRet = 63; continue; } } //Hit = TRUE; break; } - if (--Count < 0) Count = 63; - } - while ( Count != gcur_count); + if (--iRet < 0) iRet = 63; + } + while (iRet != gcur_count); switch(resolution) { @@ -526,23 +526,22 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - _SEH2_YIELD(RETURN( -1)) + iRet = -1; + _SEH2_YIELD(goto cleanup); } _SEH2_END; } - Count = nBufPoints; + iRet = nBufPoints; break; case GMMP_USE_HIGH_RESOLUTION_POINTS: break; default: EngSetLastError(ERROR_POINT_NOT_FOUND); - RETURN( -1); - } - - RETURN( Count); - -CLEANUP: - TRACE("Leave NtUserGetMouseMovePointsEx, ret=%i\n", _ret_); + iRet = -1; + } + +cleanup: + TRACE("Leave NtUserGetMouseMovePointsEx, ret=%i\n", iRet); UserLeave(); - END_CLEANUP; + return (DWORD)iRet; }

12 years, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
37
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 October 2011