Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 38270: Introduce new config flag BUILD_MP. Compile MP kernel and hal only when this is set to 1 to save us some time and space.
by tkreuzer＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: tkreuzer Date: Mon Dec 22 09:23:08 2008 New Revision: 38270 URL: http://svn.reactos.org/svn/reactos?rev=38270&view=rev Log: Introduce new config flag BUILD_MP. Compile MP kernel and hal only when this is set to 1 to save us some time and space. Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/config.template.rbuild trunk/reactos/hal/hal.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Mon Dec 22 09:23:08 2008 @@ -110,7 +110,9 @@ </directory> <directory name="ntoskrnl"> <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> - <xi:include href="ntoskrnl/ntkrnlmp.rbuild" /> + <if property="BUILD_MP" value="1"> + <xi:include href="ntoskrnl/ntkrnlmp.rbuild" /> + </if> </directory> <directory name="subsystems"> <xi:include href="subsystems/subsystems.rbuild" /> Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config.template.rbuild [iso-8859-1] Mon Dec 22 09:23:08 2008 @@ -85,4 +85,9 @@ --> <property name="_ELF_" value="0" /> + +<property name="BUILD_MP" value="0" /> + </group> Modified: trunk/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.rbuild?rev=38270&r… ============================================================================== --- trunk/reactos/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal.rbuild [iso-8859-1] Mon Dec 22 09:23:08 2008 @@ -10,7 +10,9 @@ <xi:include href="halx86/hal_generic_up.rbuild" /> <xi:include href="halx86/hal_generic_pc.rbuild" /> <xi:include href="halx86/halup.rbuild" /> - <xi:include href="halx86/halmp.rbuild" /> + <if property="BUILD_MP" value="1"> + <xi:include href="halx86/halmp.rbuild" /> + </if> <xi:include href="halx86/halxbox.rbuild" /> </directory> </if>

1 0

[fireball] 38269: - Fix KCB ref leaks in Cm parse routine (thanks Stefan).
by fireball＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: fireball Date: Mon Dec 22 07:35:08 2008 New Revision: 38269 URL: http://svn.reactos.org/svn/reactos?rev=38269&view=rev Log: - Fix KCB ref leaks in Cm parse routine (thanks Stefan). Modified: trunk/reactos/ntoskrnl/config/cmparse.c Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Mon Dec 22 07:35:08 2008 @@ -977,7 +977,13 @@ /* Return hive and cell data */ *Hive = (*Kcb)->KeyHive; *Cell = (*Kcb)->KeyCell; - + + /* Make sure it's not a dead KCB */ + ASSERT((*Kcb)->RefCount > 0); + + /* Reference it */ + (VOID)CmpReferenceKeyControlBlock(*Kcb); + /* Return success for now */ return STATUS_SUCCESS; } @@ -1197,7 +1203,7 @@ if (!Kcb) ASSERT(FALSE); /* Dereference the parent and set the new one */ - //CmpDereferenceKeyControlBlock(ParentKcb); + CmpDereferenceKeyControlBlock(ParentKcb); ParentKcb = Kcb; } else @@ -1336,7 +1342,7 @@ /* Dereference the parent if it exists */ Quickie: - //if (ParentKcb) CmpDereferenceKeyControlBlock(ParentKcb); + if (ParentKcb) CmpDereferenceKeyControlBlock(ParentKcb); /* Unlock the registry */ CmpUnlockRegistry();

1 0

[sserapion] 38268: Repeat after me "typedef INT_PTR(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM); ", sorry.
by sserapion＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: sserapion Date: Mon Dec 22 00:45:49 2008 New Revision: 38268 URL: http://svn.reactos.org/svn/reactos?rev=38268&view=rev Log: Repeat after me "typedef INT_PTR(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);", sorry. Modified: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/processor.c Modified: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/processor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/processor.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/processor.c [iso-8859-1] Mon Dec 22 00:45:49 2008 @@ -14,7 +14,7 @@ #include "resource.h" HINSTANCE g_hInstance = NULL; -LRESULT CALLBACK ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam); BOOL APIENTRY @@ -74,7 +74,7 @@ wcscat(szFeatures, Feature); } -LRESULT +INT_PTR CALLBACK ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam) {

1 0

[tkreuzer] 38267: fix another instance of _STATIC_ASSERT
by tkreuzer＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: tkreuzer Date: Mon Dec 22 00:37:53 2008 New Revision: 38267 URL: http://svn.reactos.org/svn/reactos?rev=38267&view=rev Log: fix another instance of _STATIC_ASSERT Modified: trunk/reactos/include/crt/malloc.h Modified: trunk/reactos/include/crt/malloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/malloc.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/malloc.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/malloc.h [iso-8859-1] Mon Dec 22 00:37:53 2008 @@ -25,7 +25,7 @@ #endif #ifndef _STATIC_ASSERT -#define _STATIC_ASSERT(expr) typedef char __static_assert_t[(expr)?1:-1] +#define _STATIC_ASSERT(expr) typedef char __static_assert_t[(expr)] #endif /* Return codes for _heapwalk() */

1 0

[tkreuzer] 38266: Move all stuff from _mingw.h to crtdefs.h that belongs there. Get rid off MINGW_IMPORT
by tkreuzer＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: tkreuzer Date: Sun Dec 21 23:55:21 2008 New Revision: 38266 URL: http://svn.reactos.org/svn/reactos?rev=38266&view=rev Log: Move all stuff from _mingw.h to crtdefs.h that belongs there. Get rid off MINGW_IMPORT Modified: trunk/reactos/include/crt/_mingw.h trunk/reactos/include/crt/crtdefs.h trunk/reactos/include/crt/time.h Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/_mingw.h [iso-8859-1] Sun Dec 21 23:55:21 2008 @@ -4,11 +4,12 @@ * No warranty is given; refer to the file DISCLAIMER within this package. */ -#ifndef _INC_CRTDEFS -#define _INC_CRTDEFS +#ifndef _INC_MINGW +#define _INC_MINGW #define _INTEGRAL_MAX_BITS 64 +// ROS HACK! #ifndef _WIN64 #ifndef _USE_32BIT_TIME_T #define _USE_32BIT_TIME_T @@ -30,69 +31,14 @@ #define __stdcall #endif -#if defined(_MSC_VER) -# ifdef _DLL -# ifndef __MINGW_IMPORT -# define __MINGW_IMPORT __declspec(dllimport) -# endif -# ifndef _CRTIMP -# define _CRTIMP __declspec(dllimport) -# endif -# else -# ifndef __MINGW_IMPORT -# define __MINGW_IMPORT -# endif -# ifndef _CRTIMP -# define _CRTIMP -# endif -# endif -# define __DECLSPEC_SUPPORTED +#ifdef __GNUC__ + /* These compilers do support __declspec */ +# if !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(__CYGWIN32__) +# define __declspec(x) __attribute__((x)) +# endif +#else # define __attribute__(x) /* nothing */ -# define __restrict__ /* nothing */ -#elif defined(__GNUC__) -# ifdef __declspec -# ifndef __MINGW_IMPORT -# ifdef _DLL -/* Note the extern. This is needed to work around GCC's -limitations in handling dllimport attribute. */ -# define __MINGW_IMPORT extern __attribute__ ((__dllimport__)) -# else -# define __MINGW_IMPORT extern -# endif -# endif -# ifndef _CRTIMP -# undef __USE_CRTIMP -# if !defined (_CRTBLD) && !defined (_SYSCRT) -# define __USE_CRTIMP 1 -# endif -# ifdef __USE_CRTIMP -# ifdef _DLL -# define _CRTIMP __attribute__ ((dllimport)) -# else -# define _CRTIMP -# endif -# else -# define _CRTIMP -# endif -# endif -# define __DECLSPEC_SUPPORTED -# else /* __declspec */ -# undef __DECLSPEC_SUPPORTED -# undef __MINGW_IMPORT -# ifndef _CRTIMP -# define _CRTIMP -# endif -# endif /* __declspec */ -#else -# ifndef __MINGW_IMPORT -# define __MINGW_IMPORT __declspec(dllimport) -# endif -# ifndef _CRTIMP -# define _CRTIMP __declspec(dllimport) -# endif -# define __DECLSPEC_SUPPORTED -# define __attribute__(x) /* nothing */ -#endif /* __GNUC__ */ +#endif #if defined (__GNUC__) && defined (__GNUC_MINOR__) #define __MINGW_GNUC_PREREQ(major, minor) \ @@ -102,22 +48,12 @@ #define __MINGW_GNUC_PREREQ(major, minor) 0 #endif -#if defined (_MSC_VER) -#define __MINGW_MSC_PREREQ(major,minor) \ - ((_MSC_VER /100) > (major) \ - || ((_MSC)VER /100) == (major) && (_MSC_VER) % 100) >=(minor))) -#else -#define __MINGW_MSC_PREREQ(major, minor) 0 -#endif - #define USE___UUIDOF 0 #ifdef __cplusplus # define __CRT_INLINE inline #else -# if defined(_MSC_VER) -# define __CRT_INLINE __inline -# elif __GNUC_STDC_INLINE__ +# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) # define __CRT_INLINE extern inline __attribute__((__gnu_inline__)) # else # define __CRT_INLINE extern __inline__ @@ -129,6 +65,16 @@ #else # ifdef __GNUC__ # define __UNUSED_PARAM(x) x __attribute__ ((__unused__)) +# else +# define __UNUSED_PARAM(x) x +# endif +#endif + +#ifdef __cplusplus +# define __unaligned +#else +# ifdef __GNUC__ +# define __unaligned __attribute((packed)) # else # define __UNUSED_PARAM(x) x # endif @@ -186,48 +132,25 @@ # define __MSVCRT_VERSION__ 0x0700 #endif -#if defined(__GNUC__) -#define __mingw_va_start(v,l) __builtin_va_start(v,l) -#define __mingw_va_end(v) __builtin_va_end(v) -#define __mingw_va_arg(v,l) __builtin_va_arg(v,l) -#define __mingw_va_copy(d,s) __builtin_va_copy(d,s) -#elif defined(_MSC_VER) -#define __mingw_va_start(v,l) __msc_va_start(v,l) -#define __mingw_va_end(v) __msc_va_end(v) -#define __mingw_va_arg(v,l) __msc_va_arg(v,l) -#define __mingw_va_copy(d,s) __msc_va_copy(d,s) -#endif - //#ifndef WINVER //#define WINVER 0x0502 //#endif -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x502 -#endif - -#ifndef _INT128_DEFINED -#define _INT128_DEFINED +//#ifndef _WIN32_WINNT +//#define _WIN32_WINNT 0x502 +//#endif + #ifdef __GNUC__ #define __int8 char #define __int16 short #define __int32 int #define __int64 long long #ifdef _WIN64 - -typedef int __int128 __attribute__ ((mode (TI))); - -#endif - -#define __ptr32 -#define __ptr64 -#define __unaligned __attribute ((packed)) -#define __forceinline extern __inline -#endif -#endif - -#ifndef _WIN32 -#error Only Win32 target is supported! + typedef int __int128 __attribute__ ((mode (TI))); +# endif +# define __ptr32 +# define __ptr64 +# define __forceinline extern __inline __attribute((always_inline)) #endif #ifdef __cplusplus @@ -240,188 +163,13 @@ #endif #endif -#undef _CRT_PACKING -#define _CRT_PACKING 8 - #ifdef _WIN64 #undef USE_MINGW_SETJMP_TWO_ARGS #define USE_MINGW_SETJMP_TWO_ARGS #endif -#pragma pack(push,_CRT_PACKING) - -#include <vadefs.h> - #ifdef __cplusplus extern "C" { -#endif - -#ifndef _CRT_STRINGIZE -#define __CRT_STRINGIZE(_Value) #_Value -#define _CRT_STRINGIZE(_Value) __CRT_STRINGIZE(_Value) -#endif - -#ifndef _CRT_WIDE -#define __CRT_WIDE(_String) L ## _String -#define _CRT_WIDE(_String) __CRT_WIDE(_String) -#endif -#ifndef _W64 -#define _W64 -#endif - -#ifndef _CRTIMP_NOIA64 -#ifdef __ia64__ -#define _CRTIMP_NOIA64 -#else -#define _CRTIMP_NOIA64 _CRTIMP -#endif -#endif - -#ifndef _CRTIMP2 -#define _CRTIMP2 _CRTIMP -#endif - -#ifndef _CRTIMP_ALTERNATIVE -#define _CRTIMP_ALTERNATIVE _CRTIMP -#define _CRT_ALTERNATIVE_IMPORTED -#endif - -#ifndef _MRTIMP2 -#define _MRTIMP2 _CRTIMP -#endif - -#ifndef _DLL -#define _DLL -#endif - -#ifndef _MT -#define _MT -#endif - -#ifndef _MCRTIMP -#define _MCRTIMP _CRTIMP -#endif - -#ifndef _CRTIMP_PURE -#define _CRTIMP_PURE _CRTIMP -#endif - -#ifndef _PGLOBAL -#define _PGLOBAL -#endif - -#ifndef _AGLOBAL -#define _AGLOBAL -#endif - -#define __STDC_SECURE_LIB__ 200411L -#define __GOT_SECURE_LIB__ __STDC_SECURE_LIB__ -#define _SECURECRT_FILL_BUFFER_PATTERN 0xFD -#define _CRT_DEPRECATE_TEXT(_Text) __declspec(deprecated) - -#ifndef _CRT_INSECURE_DEPRECATE_MEMORY -#define _CRT_INSECURE_DEPRECATE_MEMORY(_Replacement) -#endif -#ifndef _CRT_INSECURE_DEPRECATE_GLOBALS -#define _CRT_INSECURE_DEPRECATE_GLOBALS(_Replacement) -#endif -#ifndef _CRT_MANAGED_HEAP_DEPRECATE -#define _CRT_MANAGED_HEAP_DEPRECATE -#endif - -#ifndef _CRT_OBSOLETE -#define _CRT_OBSOLETE(_NewItem) -#endif - -#ifndef _SIZE_T_DEFINED -#define _SIZE_T_DEFINED -#undef size_t -#ifdef _WIN64 -#if defined(__GNUC__) && defined(__STRICT_ANSI__) - typedef unsigned int size_t __attribute__ ((mode (DI))); -#else - typedef unsigned __int64 size_t; -#endif -#else - typedef unsigned int size_t; -#endif -#endif - -#ifndef _SSIZE_T_DEFINED -#define _SSIZE_T_DEFINED -#undef ssize_t -#ifdef _WIN64 -#if defined(__GNUC__) && defined(__STRICT_ANSI__) - typedef int ssize_t __attribute__ ((mode (DI))); -#else - typedef __int64 ssize_t; -#endif -#else - typedef int ssize_t; -#endif -#endif - -#ifndef _INTPTR_T_DEFINED -#define _INTPTR_T_DEFINED -#ifndef __intptr_t_defined -#define __intptr_t_defined -#undef intptr_t -#ifdef _WIN64 -#if defined(__GNUC__) && defined(__STRICT_ANSI__) - typedef int intptr_t __attribute__ ((mode (DI))); -#else - typedef __int64 intptr_t; -#endif -#else - typedef int intptr_t; -#endif -#endif -#endif - -#ifndef _UINTPTR_T_DEFINED -#define _UINTPTR_T_DEFINED -#ifndef __uintptr_t_defined -#define __uintptr_t_defined -#undef uintptr_t -#ifdef _WIN64 -#if defined(__GNUC__) && defined(__STRICT_ANSI__) - typedef unsigned int uintptr_t __attribute__ ((mode (DI))); -#else - typedef unsigned __int64 uintptr_t; -#endif -#else - typedef unsigned int uintptr_t; -#endif -#endif -#endif - -#ifndef _PTRDIFF_T_DEFINED -#define _PTRDIFF_T_DEFINED -#ifndef _PTRDIFF_T_ -#undef ptrdiff_t -#ifdef _WIN64 -#if defined(__GNUC__) && defined(__STRICT_ANSI__) - typedef int ptrdiff_t __attribute__ ((mode (DI))); -#else - typedef __int64 ptrdiff_t; -#endif -#else - typedef int ptrdiff_t; -#endif -#endif -#endif - -#ifndef _WCHAR_T_DEFINED -#define _WCHAR_T_DEFINED -#ifndef __cplusplus - typedef unsigned short wchar_t; -#endif -#endif - -#ifndef _WCTYPE_T_DEFINED -#define _WCTYPE_T_DEFINED - typedef unsigned short wint_t; - typedef unsigned short wctype_t; #endif #ifndef __GNUC_VA_LIST @@ -434,128 +182,15 @@ typedef __gnuc_va_list va_list; #endif -#ifdef _USE_32BIT_TIME_T -#ifdef _WIN64 -#error You cannot use 32-bit time_t (_USE_32BIT_TIME_T) with _WIN64 -#undef _USE_32BIT_TIME_T -#endif -#else -#if _INTEGRAL_MAX_BITS < 64 -#define _USE_32BIT_TIME_T -#endif -#endif - -#ifndef _ERRCODE_DEFINED -#define _ERRCODE_DEFINED - typedef int errcode; - typedef int errno_t; -#endif - -#ifndef _TIME32_T_DEFINED -#define _TIME32_T_DEFINED - typedef long __time32_t; -#endif - -#ifndef _TIME64_T_DEFINED -#define _TIME64_T_DEFINED -//#if _INTEGRAL_MAX_BITS >= 64 - typedef __int64 __time64_t; -#endif -//#endif - -#ifndef _TIME_T_DEFINED -#define _TIME_T_DEFINED -#ifdef _USE_32BIT_TIME_T - typedef __time32_t time_t; -#else - typedef __time64_t time_t; -#endif -#endif - -#ifndef _CONST_RETURN -#define _CONST_RETURN -#endif - -#ifndef __CRT_UNALIGNED -#define __CRT_UNALIGNED -#endif - -#ifndef UNALIGNED -#if defined(__ia64__) || defined(__x86_64) -//#define UNALIGNED __CRT_UNALIGNED -#else -#define UNALIGNED -#endif -#endif - -#ifndef _CRT_ALIGN -#define _CRT_ALIGN(x) __attribute__ ((aligned(x))) -#endif - -#ifndef _CRTNOALIAS -#define _CRTNOALIAS -#endif - -#ifndef _CRTRESTRICT -#define _CRTRESTRICT -#endif - -#ifndef __CRTDECL -#define __CRTDECL __cdecl -#endif - -#define _ARGMAX 100 - -#ifndef _TRUNCATE -#define _TRUNCATE ((size_t)-1) -#endif - struct threadlocaleinfostruct; - struct threadmbcinfostruct; - typedef struct threadlocaleinfostruct *pthreadlocinfo; - typedef struct threadmbcinfostruct *pthreadmbcinfo; - struct __lc_time_data; - - typedef struct localeinfo_struct { - pthreadlocinfo locinfo; - pthreadmbcinfo mbcinfo; - } _locale_tstruct,*_locale_t; - -#ifndef _TAGLC_ID_DEFINED -#define _TAGLC_ID_DEFINED - typedef struct tagLC_ID { - unsigned short wLanguage; - unsigned short wCountry; - unsigned short wCodePage; - } LC_ID,*LPLC_ID; -#endif - -#ifndef _THREADLOCALEINFO -#define _THREADLOCALEINFO - typedef struct threadlocaleinfostruct { - int refcount; - unsigned int lc_codepage; - unsigned int lc_collate_cp; - unsigned long lc_handle[6]; - LC_ID lc_id[6]; - struct { - char *locale; - wchar_t *wlocale; - int *refcount; - int *wrefcount; - } lc_category[6]; - int lc_clike; - int mb_cur_max; - int *lconv_intl_refcount; - int *lconv_num_refcount; - int *lconv_mon_refcount; - struct lconv *lconv; - int *ctype1_refcount; - unsigned short *ctype1; - const unsigned short *pctype; - const unsigned char *pclmap; - const unsigned char *pcumap; - struct __lc_time_data *lc_time_curr; - } threadlocinfo; +/* Diable deprecation for now! */ +#define _CRT_SECURE_NO_DEPRECATE +#define _CRT_SECURE_NO_DEPRECATE_CORE +#ifdef __WINESRC__ +#define _CRT_NONSTDC_NO_DEPRECATE +#endif + +#if (defined(_MSC_VER) && __STDC__)// || !defined(__WINESRC__) +#define NO_OLDNAMES #endif #ifdef __cplusplus @@ -568,9 +203,7 @@ #define _CRT_UNUSED(x) (void)x #endif -#pragma pack(pop) - -/* There are here for intrin.h */ +/* These are here for intrin.h */ #ifndef _SIZE_T_DEFINED #define _SIZE_T_DEFINED #ifdef _WIN64 @@ -591,5 +224,5 @@ #include <mingw32/intrin.h> -#endif - +#endif /* !_INC_MINGW */ + Modified: trunk/reactos/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdefs.h?rev=… ============================================================================== --- trunk/reactos/include/crt/crtdefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/crtdefs.h [iso-8859-1] Sun Dec 21 23:55:21 2008 @@ -4,3 +4,389 @@ * No warranty is given; refer to the file DISCLAIMER within this package. */ #include <_mingw.h> + +#ifndef _INC_CRTDEFS +#define _INC_CRTDEFS + +#ifdef _USE_32BIT_TIME_T +#ifdef _WIN64 +#error You cannot use 32-bit time_t (_USE_32BIT_TIME_T) with _WIN64 +#undef _USE_32BIT_TIME_T +#endif +#else +#if _INTEGRAL_MAX_BITS < 64 +#define _USE_32BIT_TIME_T +#endif +#endif + +/* Compatability definition */ +#if _MSC_VER > 0 && __STDC__ +#define NO_OLDNAMES +#endif + +/** Properties ***************************************************************/ + +#undef _CRT_PACKING +#define _CRT_PACKING 8 +#pragma pack(push,_CRT_PACKING) + +#ifndef _CRT_STRINGIZE +#define __CRT_STRINGIZE(_Value) #_Value +#define _CRT_STRINGIZE(_Value) __CRT_STRINGIZE(_Value) +#endif + +#ifndef _CRT_WIDE +#define __CRT_WIDE(_String) L ## _String +#define _CRT_WIDE(_String) __CRT_WIDE(_String) +#endif + +#ifndef _W64 + #if !defined(_midl) && defined(_X86_) && _MSC_VER >= 1300 + #define _W64 __w64 + #else + #define _W64 + #endif +#endif + +#ifndef _CRTIMP + #ifdef _DLL + #define _CRTIMP __declspec(dllimport) + #else + #define _CRTIMP + #endif +#endif + +//#define _CRT_ALTERNATIVE_INLINES + +#ifndef _CRTIMP_ALT + #ifdef _DLL + #ifdef _CRT_ALTERNATIVE_INLINES + #define _CRTIMP_ALT + #else + #define _CRTIMP_ALT _CRTIMP + #define _CRT_ALTERNATIVE_IMPORTED + #endif + #else + #define _CRTIMP_ALT + #endif +#endif + +#ifndef _CRTDATA + #ifdef _M_CEE_PURE + #define _CRTDATA(x) x + #else + #define _CRTDATA(x) _CRTIMP x + #endif +#endif + +#ifndef _CRTIMP2 + #define _CRTIMP2 _CRTIMP +#endif + +#ifndef _CRTIMP_PURE + #define _CRTIMP_PURE _CRTIMP +#endif + +#ifndef _CRTIMP_ALTERNATIVE + #define _CRTIMP_ALTERNATIVE _CRTIMP + #define _CRT_ALTERNATIVE_IMPORTED +#endif + +#ifndef _CRTIMP_NOIA64 + #ifdef __ia64__ + #define _CRTIMP_NOIA64 + #else + #define _CRTIMP_NOIA64 _CRTIMP + #endif +#endif + +#ifndef _MRTIMP2 + #define _MRTIMP2 _CRTIMP +#endif + +#ifndef _MCRTIMP + #define _MCRTIMP _CRTIMP +#endif + +#ifndef _PGLOBAL + #define _PGLOBAL +#endif + +#ifndef _AGLOBAL + #define _AGLOBAL +#endif + +#ifndef _CONST_RETURN + #define _CONST_RETURN +#endif + +#ifndef UNALIGNED +#if defined(__ia64__) || defined(__x86_64) +#define UNALIGNED __unaligned +#else +#define UNALIGNED +#endif +#endif + +#ifndef _CRT_ALIGN +#define _CRT_ALIGN(x) __attribute__ ((aligned(x))) +#endif + +#ifndef _CRTNOALIAS +#define _CRTNOALIAS +#endif + +#ifndef _CRTRESTRICT +#define _CRTRESTRICT +#endif + +#ifndef __CRTDECL +#define __CRTDECL __cdecl +#endif + +#ifndef _CRT_UNUSED +#define _CRT_UNUSED(x) (void)x +#endif + +#ifndef _CONST_RETURN +#ifdef __cplusplus +#define _CONST_RETURN const +#define _CRT_CONST_CORRECT_OVERLOADS +#else +#define _CONST_RETURN +#endif +#endif + +#define __crt_typefix(ctype) + + +/** Deprecated ***************************************************************/ + +#define _CRT_DEPRECATE_TEXT(_Text) __declspec(deprecated) + +#ifndef _CRT_INSECURE_DEPRECATE +# ifdef _CRT_SECURE_NO_DEPRECATE +# define _CRT_INSECURE_DEPRECATE(_Replacement) +# else +# define _CRT_INSECURE_DEPRECATE(_Replacement) \ + _CRT_DEPRECATE_TEXT("This may be unsafe, Try " #_Replacement " instead!") +# endif +#endif + +#ifndef _CRT_INSECURE_DEPRECATE_CORE +# ifdef _CRT_SECURE_NO_DEPRECATE_CORE +# define _CRT_INSECURE_DEPRECATE_CORE(_Replacement) +# else +# define _CRT_INSECURE_DEPRECATE_CORE(_Replacement) \ + _CRT_DEPRECATE_TEXT("This may be unsafe, Try " #_Replacement " instead! Enable _CRT_SECURE_NO_DEPRECATE to avoid thie warning.") +# endif +#endif + +#ifndef _CRT_NONSTDC_DEPRECATE +# ifdef _CRT_NONSTDC_NO_DEPRECATE +# define _CRT_NONSTDC_DEPRECATE(_Replacement) +# else +# define _CRT_NONSTDC_DEPRECATE(_Replacement) \ + _CRT_DEPRECATE_TEXT("Deprecated POSIX name, Try " #_Replacement " instead!") +# endif +#endif + +#ifndef _CRT_INSECURE_DEPRECATE_MEMORY +#define _CRT_INSECURE_DEPRECATE_MEMORY(_Replacement) +#endif + +#ifndef _CRT_INSECURE_DEPRECATE_GLOBALS +#define _CRT_INSECURE_DEPRECATE_GLOBALS(_Replacement) +#endif + +#ifndef _CRT_MANAGED_HEAP_DEPRECATE +#define _CRT_MANAGED_HEAP_DEPRECATE +#endif + +#ifndef _CRT_OBSOLETE +#define _CRT_OBSOLETE(_NewItem) +#endif + +/** Constants ****************************************************************/ + +#define _ARGMAX 100 + +#ifndef _TRUNCATE +#define _TRUNCATE ((size_t)-1) +#endif + +#define __STDC_SECURE_LIB__ 200411L +#define __GOT_SECURE_LIB__ __STDC_SECURE_LIB__ +#define _SECURECRT_FILL_BUFFER_PATTERN 0xFD + + + +/** Type definitions *********************************************************/ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _SIZE_T_DEFINED +#define _SIZE_T_DEFINED +#undef size_t +#ifdef _WIN64 +#if defined(__GNUC__) && defined(__STRICT_ANSI__) + typedef unsigned int size_t __attribute__ ((mode (DI))); +#else + typedef unsigned __int64 size_t; +#endif +#else + typedef unsigned int size_t; +#endif +#endif + +#ifndef _INTPTR_T_DEFINED +#define _INTPTR_T_DEFINED +#ifndef __intptr_t_defined +#define __intptr_t_defined +#undef intptr_t +#ifdef _WIN64 +#if defined(__GNUC__) && defined(__STRICT_ANSI__) + typedef int intptr_t __attribute__ ((mode (DI))); +#else + typedef __int64 intptr_t; +#endif +#else + typedef int intptr_t; +#endif +#endif +#endif + +#ifndef _UINTPTR_T_DEFINED +#define _UINTPTR_T_DEFINED +#ifndef __uintptr_t_defined +#define __uintptr_t_defined +#undef uintptr_t +#ifdef _WIN64 +#if defined(__GNUC__) && defined(__STRICT_ANSI__) + typedef unsigned int uintptr_t __attribute__ ((mode (DI))); +#else + typedef unsigned __int64 uintptr_t; +#endif +#else + typedef unsigned int uintptr_t; +#endif +#endif +#endif + +#ifndef _PTRDIFF_T_DEFINED +#define _PTRDIFF_T_DEFINED +#ifndef _PTRDIFF_T_ +#undef ptrdiff_t +#ifdef _WIN64 +#if defined(__GNUC__) && defined(__STRICT_ANSI__) + typedef int ptrdiff_t __attribute__ ((mode (DI))); +#else + typedef __int64 ptrdiff_t; +#endif +#else + typedef int ptrdiff_t; +#endif +#endif +#endif + +#ifndef _WCHAR_T_DEFINED +#define _WCHAR_T_DEFINED +#ifndef __cplusplus + typedef unsigned short wchar_t; +#endif +#endif + +#ifndef _WCTYPE_T_DEFINED +#define _WCTYPE_T_DEFINED + typedef unsigned short wint_t; + typedef unsigned short wctype_t; +#endif + +#ifndef _ERRCODE_DEFINED +#define _ERRCODE_DEFINED + typedef int errcode; + typedef int errno_t; +#endif + +#ifndef _TIME32_T_DEFINED +#define _TIME32_T_DEFINED + typedef long __time32_t; +#endif + +#ifndef _TIME64_T_DEFINED +#define _TIME64_T_DEFINED +#if _INTEGRAL_MAX_BITS >= 64 + typedef __int64 __time64_t; +#endif +#endif + +#ifndef _TIME_T_DEFINED +#define _TIME_T_DEFINED +#ifdef _USE_32BIT_TIME_T + typedef __time32_t time_t; +#else + typedef __time64_t time_t; +#endif +#endif + + struct threadlocaleinfostruct; + typedef struct threadlocaleinfostruct *pthreadlocinfo; + + struct threadmbcinfostruct; + typedef struct threadmbcinfostruct *pthreadmbcinfo; + + struct __lc_time_data; + + typedef struct localeinfo_struct { + pthreadlocinfo locinfo; + pthreadmbcinfo mbcinfo; + } _locale_tstruct,*_locale_t; + +#ifndef _TAGLC_ID_DEFINED +#define _TAGLC_ID_DEFINED + typedef struct tagLC_ID { + unsigned short wLanguage; + unsigned short wCountry; + unsigned short wCodePage; + } LC_ID,*LPLC_ID; +#endif + +#ifndef _THREADLOCALEINFO +#define _THREADLOCALEINFO + typedef struct threadlocaleinfostruct { + int refcount; + unsigned int lc_codepage; + unsigned int lc_collate_cp; + unsigned long lc_handle[6]; + LC_ID lc_id[6]; + struct { + char *locale; + wchar_t *wlocale; + int *refcount; + int *wrefcount; + } lc_category[6]; + int lc_clike; + int mb_cur_max; + int *lconv_intl_refcount; + int *lconv_num_refcount; + int *lconv_mon_refcount; + struct lconv *lconv; + int *ctype1_refcount; + unsigned short *ctype1; + const unsigned short *pctype; + const unsigned char *pclmap; + const unsigned char *pcumap; + struct __lc_time_data *lc_time_curr; + } threadlocinfo; +#endif + + +#ifdef __cplusplus +} +#endif + +#pragma pack(pop) + +#endif /* !_INC_CRTDEFS */ Modified: trunk/reactos/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/time.h?rev=382… ============================================================================== --- trunk/reactos/include/crt/time.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/time.h [iso-8859-1] Sun Dec 21 23:55:21 2008 @@ -121,10 +121,10 @@ #define CLOCKS_PER_SEC 1000 - __MINGW_IMPORT int _daylight; - __MINGW_IMPORT long _dstbias; - __MINGW_IMPORT long _timezone; - __MINGW_IMPORT char * _tzname[2]; + _CRTDATA(extern int _daylight); + _CRTDATA(extern long _dstbias); + _CRTDATA(extern long _timezone); + _CRTDATA(extern char * _tzname[2]); _CRTIMP errno_t __cdecl _get_daylight(int *_Daylight); _CRTIMP errno_t __cdecl _get_dstbias(long *_Daylight_savings_bias);

1 0

[sserapion] 38265: devcpux: - Fix ProcessorDlgProc definition - Convert to spec. slayer: - Convert to spec.
by sserapion＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: sserapion Date: Sun Dec 21 23:42:05 2008 New Revision: 38265 URL: http://svn.reactos.org/svn/reactos?rev=38265&view=rev Log: devcpux: - Fix ProcessorDlgProc definition - Convert to spec. slayer: - Convert to spec. Added: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec (contents, props changed) - copied, changed from r38258, branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.def branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec (contents, props changed) - copied, changed from r38258, branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.def Removed: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.def branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.def Modified: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.rbuild branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/processor.c branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.def (removed) @@ -1,7 +1,0 @@ -LIBRARY devcpux.dll - -EXPORTS - -PropSheetExtProc@12 - -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.rbuild [iso-8859-1] Sun Dec 21 23:42:05 2008 @@ -1,5 +1,5 @@ <module name="devcpux" type="win32dll" installbase="system32" installname="devcpux.dll" unicode="yes"> - <importlibrary definition="devcpux.def" /> + <importlibrary definition="devcpux.spec" /> <include base="devcpux">.</include> <include base="ReactOS">include/reactos/wine</include> <library>kernel32</library> Copied: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec (from r38258, branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec [iso-8859-1] Sun Dec 21 23:42:05 2008 @@ -1,7 +1,1 @@ -LIBRARY devcpux.dll - -EXPORTS - -PropSheetExtProc@12 - -; EOF +@ stdcall PropSheetExtProc(ptr ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec ------------------------------------------------------------------------------ svn:mergeinfo = Modified: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/processor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/processor.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/processor.c [iso-8859-1] Sun Dec 21 23:42:05 2008 @@ -14,7 +14,7 @@ #include "resource.h" HINSTANCE g_hInstance = NULL; -int APIENTRY ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam); +LRESULT CALLBACK ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam); BOOL APIENTRY @@ -74,8 +74,8 @@ wcscat(szFeatures, Feature); } -int -APIENTRY +LRESULT +CALLBACK ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam) { switch (uMessage) { Removed: branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.def (removed) @@ -1,9 +1,0 @@ -LIBRARY slayer.dll - -EXPORTS -DllCanUnloadNow@0 -DllGetClassObject@12 -DllRegisterServer@0 -DllUnregisterServer@0 - -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.rbuild [iso-8859-1] Sun Dec 21 23:42:05 2008 @@ -1,5 +1,5 @@ <module name="slayer" type="win32dll" baseaddress="${BASEADDRESS_SLAYER}" installbase="system32" installname="slayer.dll" unicode="yes"> - <importlibrary definition="slayer.def" /> + <importlibrary definition="slayer.spec" /> <include base="slayer">.</include> <library>kernel32</library> <library>user32</library> Copied: branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec (from r38258, branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec [iso-8859-1] Sun Dec 21 23:42:05 2008 @@ -1,9 +1,4 @@ -LIBRARY slayer.dll - -EXPORTS -DllCanUnloadNow@0 -DllGetClassObject@12 -DllRegisterServer@0 -DllUnregisterServer@0 - -; EOF +@ stdcall DllCanUnloadNow() +@ stdcall DllGetClassObject(long long ptr) +@ stdcall DllRegisterServer() +@ stdcall DllUnregisterServer() Propchange: branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ svn:mergeinfo =

1 0

[sserapion] 38264: Fix compilation and some warnings.
by sserapion＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: sserapion Date: Sun Dec 21 22:51:38 2008 New Revision: 38264 URL: http://svn.reactos.org/svn/reactos?rev=38264&view=rev Log: Fix compilation and some warnings. Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/driver.c branches/ros-amd64-bringup/reactos/dll/win32/winmm/joystick.c branches/ros-amd64-bringup/reactos/dll/win32/winmm/mci.c branches/ros-amd64-bringup/reactos/dll/win32/winmm/playsound.c branches/ros-amd64-bringup/reactos/dll/win32/winmm/time.c branches/ros-amd64-bringup/reactos/dll/win32/winmm/winmm.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/driver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winmm/driver.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/driver.c [iso-8859-1] Sun Dec 21 22:51:38 2008 @@ -110,8 +110,8 @@ * SendDriverMessage [WINMM.@] * DrvSendMessage [WINMM.@] */ -LRESULT WINAPI SendDriverMessage(HDRVR hDriver, UINT msg, LPARAM lParam1, - LPARAM lParam2) +LRESULT WINAPI SendDriverMessage(HDRVR hDriver, UINT msg, LONG lParam1, + LONG lParam2) { LPWINE_DRIVER lpDrv; LRESULT retval = 0; @@ -170,7 +170,7 @@ /* first of this driver in list ? */ if (DRIVER_GetNumberOfModuleRefs(lpNewDrv->d.d32.hModule, NULL) == 0) { if (DRIVER_SendMessage(lpNewDrv, DRV_LOAD, 0L, 0L) != DRV_SUCCESS) { - TRACE("DRV_LOAD failed on driver 0x%08lx\n", (DWORD)lpNewDrv); + TRACE("DRV_LOAD failed on driver %p\n", lpNewDrv); return FALSE; } /* returned value is not checked */ @@ -196,7 +196,7 @@ lpNewDrv->d.d32.dwDriverID = DRIVER_SendMessage(lpNewDrv, DRV_OPEN, lParam1, lParam2); if (lpNewDrv->d.d32.dwDriverID == 0) { - TRACE("DRV_OPEN failed on driver 0x%08lx\n", (DWORD)lpNewDrv); + TRACE("DRV_OPEN failed on driver %p\n", lpNewDrv); DRIVER_RemoveFromList(lpNewDrv); return FALSE; } @@ -375,7 +375,7 @@ * OpenDriver [WINMM.@] * DrvOpen [WINMM.@] */ -HDRVR WINAPI OpenDriver(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lParam) +HDRVR WINAPI OpenDriver(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LONG lParam) { LPWINE_DRIVER lpDrv = NULL; WCHAR libName[128]; @@ -427,7 +427,7 @@ return 0; the_end: - if (lpDrv) TRACE("=> %08lx\n", (DWORD)lpDrv); + if (lpDrv) TRACE("=> %p\n", lpDrv); return (HDRVR)lpDrv; } @@ -435,7 +435,7 @@ * CloseDriver [WINMM.@] * DrvClose [WINMM.@] */ -LRESULT WINAPI CloseDriver(HDRVR hDrvr, LPARAM lParam1, LPARAM lParam2) +LRESULT WINAPI CloseDriver(HDRVR hDrvr, LONG lParam1, LONG lParam2) { LPWINE_DRIVER lpDrv; @@ -526,8 +526,8 @@ * DefDriverProc [WINMM.@] * DrvDefDriverProc [WINMM.@] */ -LRESULT WINAPI DefDriverProc(DWORD_PTR dwDriverIdentifier, HDRVR hDrv, - UINT Msg, LPARAM lParam1, LPARAM lParam2) +LONG WINAPI DefDriverProc(DWORD dwDriverIdentifier, HDRVR hDrv, + UINT Msg, LONG lParam1, LONG lParam2) { switch (Msg) { case DRV_LOAD: Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/joystick.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winmm/joystick.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/joystick.c [iso-8859-1] Sun Dec 21 22:51:38 2008 @@ -81,7 +81,7 @@ /************************************************************************** * JOY_Timer [internal] */ -static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT wTimer, DWORD dwTime) +static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTime) { int i; WINE_JOYSTICK* joy; Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winmm/mci.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/mci.c [iso-8859-1] Sun Dec 21 22:51:38 2008 @@ -1298,14 +1298,14 @@ tmp = devType; devType = dev; dev = tmp; dwFlags |= MCI_OPEN_TYPE; - data[2] = (DWORD)devType; + data[2] = (DWORD_PTR)devType; devType = str_dup_upper(devType); dwFlags |= MCI_OPEN_ELEMENT; - data[3] = (DWORD)dev; + data[3] = (DWORD_PTR)dev; } else if (strchrW(dev, '.') == NULL) { tmp = strchrW(dev,' '); if (tmp) *tmp = '\0'; - data[2] = (DWORD)dev; + data[2] = (DWORD_PTR)dev; devType = str_dup_upper(dev); if (tmp) *tmp = ' '; dwFlags |= MCI_OPEN_TYPE; @@ -1326,7 +1326,7 @@ devType = str_dup_upper(buf); } dwFlags |= MCI_OPEN_ELEMENT; - data[3] = (DWORD)dev; + data[3] = (DWORD_PTR)dev; } if ((devAlias = strstrW(args, wszSAliasS))) { WCHAR* tmp2; @@ -1336,7 +1336,7 @@ tmp2 = HeapAlloc(GetProcessHeap(), 0, (tmp - devAlias + 1) * sizeof(WCHAR) ); memcpy( tmp2, devAlias, (tmp - devAlias) * sizeof(WCHAR) ); tmp2[tmp - devAlias] = 0; - data[4] = (DWORD)tmp2; + data[4] = (DWORD_PTR)tmp2; /* should be done in regular options parsing */ /* dwFlags |= MCI_OPEN_ALIAS; */ } @@ -1390,14 +1390,14 @@ /* set up call back */ if (hwndCallback != 0) { dwFlags |= MCI_NOTIFY; - data[0] = (DWORD)hwndCallback; + data[0] = (DWORD_PTR)hwndCallback; } /* set return information */ switch (retType = MCI_GetReturnType(lpCmd)) { case 0: offset = 1; break; case MCI_INTEGER: offset = 2; break; - case MCI_STRING: data[1] = (DWORD)lpstrRet; data[2] = uRetLen; offset = 3; break; + case MCI_STRING: data[1] = (DWORD_PTR)lpstrRet; data[2] = uRetLen; offset = 3; break; case MCI_RECT: offset = 5; break; default: ERR("oops\n"); } @@ -1549,7 +1549,7 @@ /************************************************************************** * MCI_SendCommandFrom32 [internal] */ -DWORD MCI_SendCommandFrom32(MCIDEVICEID wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +DWORD MCI_SendCommandFrom32(MCIDEVICEID wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2) { DWORD dwRet = MCIERR_INVALID_DEVICE_ID; LPWINE_MCIDRIVER wmd = MCI_GetDriver(wDevID); @@ -1584,7 +1584,7 @@ /************************************************************************** * MCI_SendCommandFrom16 [internal] */ -DWORD MCI_SendCommandFrom16(MCIDEVICEID wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +DWORD MCI_SendCommandFrom16(MCIDEVICEID wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2) { DWORD dwRet = MCIERR_INVALID_DEVICE_ID; LPWINE_MCIDRIVER wmd = MCI_GetDriver(wDevID); @@ -1643,7 +1643,7 @@ if (dwParam & MCI_OPEN_TYPE) { if (dwParam & MCI_OPEN_TYPE_ID) { - WORD uDevType = LOWORD((DWORD)lpParms->lpstrDeviceType); + WORD uDevType = LOWORD((DWORD_PTR)lpParms->lpstrDeviceType); if (uDevType < MCI_DEVTYPE_FIRST || uDevType > MCI_DEVTYPE_LAST || @@ -1825,7 +1825,7 @@ if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; TRACE("(%08x, %08lX, %08lX[num=%ld, wDevTyp=%u])\n", - uDevID, dwFlags, (DWORD)lpParms, lpParms->dwNumber, lpParms->wDeviceType); + uDevID, dwFlags, lpParms, lpParms->dwNumber, lpParms->wDeviceType); switch (dwFlags & ~MCI_SYSINFO_OPEN) { case MCI_SYSINFO_QUANTITY: @@ -2214,7 +2214,7 @@ * mciSendCommandW [WINMM.@] * */ -DWORD WINAPI mciSendCommandW(MCIDEVICEID wDevID, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +DWORD WINAPI mciSendCommandW(MCIDEVICEID wDevID, UINT wMsg, DWORD dwParam1, DWORD_PTR dwParam2) { DWORD dwRet; @@ -2230,7 +2230,7 @@ /************************************************************************** * mciSendCommandA [WINMM.@] */ -DWORD WINAPI mciSendCommandA(MCIDEVICEID wDevID, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +DWORD WINAPI mciSendCommandA(MCIDEVICEID wDevID, UINT wMsg, DWORD dwParam1, DWORD_PTR dwParam2) { DWORD ret; int mapped; @@ -2388,12 +2388,12 @@ /************************************************************************** * mciGetCreatorTask [WINMM.@] */ -HTASK WINAPI mciGetCreatorTask(MCIDEVICEID uDeviceID) +HANDLE WINAPI mciGetCreatorTask(MCIDEVICEID uDeviceID) { LPWINE_MCIDRIVER wmd; - HTASK ret = 0; - - if ((wmd = MCI_GetDriver(uDeviceID))) ret = (HTASK)wmd->CreatorThread; + HANDLE ret = 0; + + if ((wmd = MCI_GetDriver(uDeviceID))) ret = wmd->CreatorThread; TRACE("(%u) => %p\n", uDeviceID, ret); return ret; Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/playsound.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winmm/playsound.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/playsound.c [iso-8859-1] Sun Dec 21 22:51:38 2008 @@ -354,8 +354,8 @@ s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD)PlaySound_Callback, - (DWORD)&s, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) + if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback, + (DWORD_PTR)&s, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) goto errCleanUp; /* make it so that 3 buffers per second are needed */ Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/time.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winmm/time.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/time.c [iso-8859-1] Sun Dec 21 22:51:38 2008 @@ -94,7 +94,7 @@ if (lpTimer->wFlags & WINE_TIMER_IS32) (lpTimer->lpFunc)(lpTimer->wTimerID, 0, lpTimer->dwUser, 0, 0); else if (pFnCallMMDrvFunc16) - pFnCallMMDrvFunc16((DWORD)lpTimer->lpFunc, lpTimer->wTimerID, 0, + pFnCallMMDrvFunc16((DWORD_PTR)lpTimer->lpFunc, lpTimer->wTimerID, 0, lpTimer->dwUser, 0, 0); break; case TIME_CALLBACK_EVENT_SET: Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/winmm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winmm/winmm.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/winmm.c [iso-8859-1] Sun Dec 21 22:51:38 2008 @@ -345,7 +345,7 @@ /************************************************************************** * mixerOpen [WINMM.@] */ -UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, +MMRESULT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD fdwOpen) { return MIXER_Open(lphMix, uDeviceID, dwCallback, dwInstance, fdwOpen, TRUE); @@ -687,7 +687,7 @@ /************************************************************************** * auxGetDevCapsW [WINMM.@] */ -UINT WINAPI auxGetDevCapsW(UINT_PTR uDeviceID, LPAUXCAPSW lpCaps, UINT uSize) +MMRESULT WINAPI auxGetDevCapsW(UINT_PTR uDeviceID, LPAUXCAPSW lpCaps, UINT uSize) { LPWINE_MLD wmld; @@ -703,7 +703,7 @@ /************************************************************************** * auxGetDevCapsA [WINMM.@] */ -UINT WINAPI auxGetDevCapsA(UINT_PTR uDeviceID, LPAUXCAPSA lpCaps, UINT uSize) +MMRESULT WINAPI auxGetDevCapsA(UINT_PTR uDeviceID, LPAUXCAPSA lpCaps, UINT uSize) { AUXCAPSW acW; UINT ret; @@ -729,7 +729,7 @@ /************************************************************************** * auxGetVolume [WINMM.@] */ -UINT WINAPI auxGetVolume(UINT uDeviceID, DWORD* lpdwVolume) +MMRESULT WINAPI auxGetVolume(UINT uDeviceID, DWORD* lpdwVolume) { LPWINE_MLD wmld; @@ -757,7 +757,7 @@ /************************************************************************** * auxOutMessage [WINMM.@] */ -UINT WINAPI auxOutMessage(UINT uDeviceID, UINT uMessage, DWORD_PTR dw1, DWORD_PTR dw2) +MMRESULT WINAPI auxOutMessage(UINT uDeviceID, UINT uMessage, DWORD_PTR dw1, DWORD_PTR dw2) { LPWINE_MLD wmld; @@ -938,7 +938,7 @@ /************************************************************************** * midiOutOpen [WINMM.@] */ -UINT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID, +MMRESULT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT_PTR uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags) { return MIDI_OutOpen(lphMidiOut, uDeviceID, dwCallback, dwInstance, dwFlags, TRUE); @@ -1122,7 +1122,7 @@ /************************************************************************** * midiOutMessage [WINMM.@] */ -UINT WINAPI midiOutMessage(HMIDIOUT hMidiOut, UINT uMessage, +DWORD WINAPI midiOutMessage(HMIDIOUT hMidiOut, UINT uMessage, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { LPWINE_MLD wmld; @@ -1161,7 +1161,7 @@ /************************************************************************** * midiInGetDevCapsW [WINMM.@] */ -UINT WINAPI midiInGetDevCapsW(UINT_PTR uDeviceID, LPMIDIINCAPSW lpCaps, UINT uSize) +MMRESULT WINAPI midiInGetDevCapsW(UINT_PTR uDeviceID, LPMIDIINCAPSW lpCaps, UINT uSize) { LPWINE_MLD wmld; @@ -1178,7 +1178,7 @@ /************************************************************************** * midiInGetDevCapsA [WINMM.@] */ -UINT WINAPI midiInGetDevCapsA(UINT_PTR uDeviceID, LPMIDIINCAPSA lpCaps, UINT uSize) +MMRESULT WINAPI midiInGetDevCapsA(UINT_PTR uDeviceID, LPMIDIINCAPSA lpCaps, UINT uSize) { MIDIINCAPSW micW; UINT ret; @@ -1238,7 +1238,7 @@ /************************************************************************** * midiInOpen [WINMM.@] */ -UINT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, +MMRESULT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT_PTR uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags) { return MIDI_InOpen(lphMidiIn, uDeviceID, dwCallback, dwInstance, dwFlags, TRUE); @@ -1387,7 +1387,7 @@ /************************************************************************** * midiInMessage [WINMM.@] */ -UINT WINAPI midiInMessage(HMIDIIN hMidiIn, UINT uMessage, +DWORD WINAPI midiInMessage(HMIDIIN hMidiIn, UINT uMessage, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { LPWINE_MLD wmld; @@ -2090,7 +2090,7 @@ /************************************************************************** * waveOutGetDevCapsA [WINMM.@] */ -UINT WINAPI waveOutGetDevCapsA(UINT_PTR uDeviceID, LPWAVEOUTCAPSA lpCaps, +MMRESULT WINAPI waveOutGetDevCapsA(UINT_PTR uDeviceID, LPWAVEOUTCAPSA lpCaps, UINT uSize) { WAVEOUTCAPSW wocW; @@ -2473,7 +2473,7 @@ /************************************************************************** * waveOutMessage [WINMM.@] */ -UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, +DWORD WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { LPWINE_MLD wmld; @@ -2508,7 +2508,7 @@ /************************************************************************** * waveInGetDevCapsW [WINMM.@] */ -UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSize) +MMRESULT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSize) { LPWINE_MLD wmld; @@ -2741,7 +2741,7 @@ /************************************************************************** * waveInMessage [WINMM.@] */ -UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, +DWORD WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { LPWINE_MLD wmld;

1 0

[sserapion] 38263: Fix definitions of WAVEOPENDESC, WAVEHDR structures. Fix prototypes for DefDriverProc, waveOutMessage, waveOutGetDevCapsA/W, waveInGetDevCapsA/W, waveInMessage, midiStreamOpen, midiOutGetDevCapsA/W, midiOutOpen, midiOutMessage, midiInGetDevCapsA/W, midiInOpen, midiInMessage, auxGetDevCapsA/W, auxOutMessage, mixerGetDevCapsA/W, mixerOpen, timeSetEvent, joyGetDevCapsA/W, mciSendCommandA/W, and mciGetCreatorTask.
by sserapion＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: sserapion Date: Sun Dec 21 22:50:48 2008 New Revision: 38263 URL: http://svn.reactos.org/svn/reactos?rev=38263&view=rev Log: Fix definitions of WAVEOPENDESC, WAVEHDR structures. Fix prototypes for DefDriverProc, waveOutMessage, waveOutGetDevCapsA/W, waveInGetDevCapsA/W, waveInMessage, midiStreamOpen, midiOutGetDevCapsA/W, midiOutOpen, midiOutMessage, midiInGetDevCapsA/W, midiInOpen, midiInMessage, auxGetDevCapsA/W, auxOutMessage, mixerGetDevCapsA/W, mixerOpen, timeSetEvent, joyGetDevCapsA/W, mciSendCommandA/W, and mciGetCreatorTask. Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmddk.h branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h branches/ros-amd64-bringup/reactos/include/psdk/msacm.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/mmddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/mmddk.h [iso-8859-1] Sun Dec 21 22:50:48 2008 @@ -390,10 +390,10 @@ typedef struct { HWAVE hWave; LPWAVEFORMATEX lpFormat; - DWORD dwCallback; - DWORD dwInstance; + DWORD_PTR dwCallback; + DWORD_PTR dwInstance; UINT uMappedDeviceID; - DWORD dnDevNode; + DWORD dnDevNode; } WAVEOPENDESC, *LPWAVEOPENDESC; typedef struct { Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h [iso-8859-1] Sun Dec 21 22:50:48 2008 @@ -951,7 +951,7 @@ DWORD dnDevNode; } DRVCONFIGINFOEX,*PDRVCONFIGINFOEX,*LPDRVCONFIGINFOEX; -typedef LRESULT(CALLBACK* DRIVERPROC)(DWORD,HDRVR,UINT,LPARAM,LPARAM); +typedef LONG(CALLBACK* DRIVERPROC)(DWORD,HDRVR,UINT,LONG,LONG); typedef void (CALLBACK DRVCALLBACK)(HDRVR,UINT,DWORD,DWORD,DWORD); typedef DRVCALLBACK *LPDRVCALLBACK; typedef DRVCALLBACK *PDRVCALLBACK; @@ -967,11 +967,11 @@ LPSTR lpData; DWORD dwBufferLength; DWORD dwBytesRecorded; - DWORD dwUser; + DWORD_PTR dwUser; DWORD dwFlags; DWORD dwLoops; struct wavehdr_tag *lpNext; - DWORD reserved; + DWORD_PTR reserved; } WAVEHDR,*PWAVEHDR,*LPWAVEHDR; typedef struct tagWAVEOUTCAPSA { @@ -1642,7 +1642,7 @@ LRESULT WINAPI SendDriverMessage(HDRVR,UINT,LONG,LONG); HMODULE WINAPI DrvGetModuleHandle(HDRVR); HMODULE WINAPI GetDriverModuleHandle(HDRVR); -LRESULT WINAPI DefDriverProc(DWORD,HDRVR,UINT,LPARAM,LPARAM); +LONG WINAPI DefDriverProc(DWORD,HDRVR,UINT,LONG,LONG); UINT WINAPI mmsystemGetVersion(void); #define OutputDebugStr OutputDebugString BOOL WINAPI sndPlaySoundA(LPCSTR,UINT); @@ -1650,8 +1650,8 @@ BOOL WINAPI PlaySoundA(LPCSTR,HMODULE,DWORD); BOOL WINAPI PlaySoundW(LPCWSTR,HMODULE,DWORD); UINT WINAPI waveOutGetNumDevs(void); -MMRESULT WINAPI waveOutGetDevCapsA(UINT,LPWAVEOUTCAPSA,UINT); -MMRESULT WINAPI waveOutGetDevCapsW(UINT,LPWAVEOUTCAPSW,UINT); +MMRESULT WINAPI waveOutGetDevCapsA(UINT_PTR,LPWAVEOUTCAPSA,UINT); +MMRESULT WINAPI waveOutGetDevCapsW(UINT_PTR,LPWAVEOUTCAPSW,UINT); MMRESULT WINAPI waveOutGetVolume(HWAVEOUT,PDWORD); MMRESULT WINAPI waveOutSetVolume(HWAVEOUT,DWORD); MMRESULT WINAPI waveOutGetErrorTextA(MMRESULT,LPSTR,UINT); @@ -1671,10 +1671,10 @@ MMRESULT WINAPI waveOutGetPlaybackRate(HWAVEOUT,PDWORD); MMRESULT WINAPI waveOutSetPlaybackRate(HWAVEOUT,DWORD); MMRESULT WINAPI waveOutGetID(HWAVEOUT,LPUINT); -MMRESULT WINAPI waveOutMessage(HWAVEOUT,UINT,DWORD,DWORD); +DWORD WINAPI waveOutMessage(HWAVEOUT,UINT,DWORD_PTR,DWORD_PTR); UINT WINAPI waveInGetNumDevs(void); -MMRESULT WINAPI waveInGetDevCapsA(UINT,LPWAVEINCAPSA,UINT); -MMRESULT WINAPI waveInGetDevCapsW(UINT,LPWAVEINCAPSW,UINT); +MMRESULT WINAPI waveInGetDevCapsA(UINT_PTR,LPWAVEINCAPSA,UINT); +MMRESULT WINAPI waveInGetDevCapsW(UINT_PTR,LPWAVEINCAPSW,UINT); MMRESULT WINAPI waveInGetErrorTextA(MMRESULT,LPSTR,UINT); MMRESULT WINAPI waveInGetErrorTextW(MMRESULT,LPWSTR,UINT); MMRESULT WINAPI waveInOpen(LPHWAVEIN,UINT,LPCWAVEFORMATEX,DWORD_PTR,DWORD_PTR,DWORD); @@ -1687,9 +1687,9 @@ MMRESULT WINAPI waveInReset(HWAVEIN); MMRESULT WINAPI waveInGetPosition(HWAVEIN,LPMMTIME,UINT); MMRESULT WINAPI waveInGetID(HWAVEIN,LPUINT); -MMRESULT WINAPI waveInMessage(HWAVEIN,UINT,DWORD,DWORD); +DWORD WINAPI waveInMessage(HWAVEIN,UINT,DWORD_PTR,DWORD_PTR); UINT WINAPI midiOutGetNumDevs(void); -MMRESULT WINAPI midiStreamOpen(LPHMIDISTRM,LPUINT,DWORD,DWORD,DWORD,DWORD); +MMRESULT WINAPI midiStreamOpen(LPHMIDISTRM,LPUINT,DWORD,DWORD_PTR,DWORD_PTR,DWORD); MMRESULT WINAPI midiStreamClose(HMIDISTRM); MMRESULT WINAPI midiStreamProperty(HMIDISTRM,LPBYTE,DWORD); MMRESULT WINAPI midiStreamPosition(HMIDISTRM,LPMMTIME,UINT); @@ -1699,13 +1699,13 @@ MMRESULT WINAPI midiStreamStop(HMIDISTRM); MMRESULT WINAPI midiConnect(HMIDI,HMIDIOUT,PVOID); MMRESULT WINAPI midiDisconnect(HMIDI,HMIDIOUT,PVOID); -MMRESULT WINAPI midiOutGetDevCapsA(UINT,LPMIDIOUTCAPSA,UINT); -MMRESULT WINAPI midiOutGetDevCapsW(UINT,LPMIDIOUTCAPSW,UINT); +MMRESULT WINAPI midiOutGetDevCapsA(UINT_PTR,LPMIDIOUTCAPSA,UINT); +MMRESULT WINAPI midiOutGetDevCapsW(UINT_PTR,LPMIDIOUTCAPSW,UINT); MMRESULT WINAPI midiOutGetVolume(HMIDIOUT,PDWORD); MMRESULT WINAPI midiOutSetVolume(HMIDIOUT,DWORD); MMRESULT WINAPI midiOutGetErrorTextA(MMRESULT,LPSTR,UINT); MMRESULT WINAPI midiOutGetErrorTextW(MMRESULT,LPWSTR,UINT); -MMRESULT WINAPI midiOutOpen(LPHMIDIOUT,UINT,DWORD,DWORD,DWORD); +MMRESULT WINAPI midiOutOpen(LPHMIDIOUT,UINT_PTR,DWORD_PTR,DWORD_PTR,DWORD); MMRESULT WINAPI midiOutClose(HMIDIOUT); MMRESULT WINAPI midiOutPrepareHeader(HMIDIOUT,LPMIDIHDR,UINT); MMRESULT WINAPI midiOutUnprepareHeader(HMIDIOUT,LPMIDIHDR,UINT); @@ -1715,13 +1715,13 @@ MMRESULT WINAPI midiOutCachePatches(HMIDIOUT,UINT,LPWORD,UINT); MMRESULT WINAPI midiOutCacheDrumPatches(HMIDIOUT,UINT,LPWORD,UINT); MMRESULT WINAPI midiOutGetID(HMIDIOUT,LPUINT); -MMRESULT WINAPI midiOutMessage(HMIDIOUT,UINT,DWORD,DWORD); +DWORD WINAPI midiOutMessage(HMIDIOUT,UINT,DWORD_PTR,DWORD_PTR); UINT WINAPI midiInGetNumDevs(void); -MMRESULT WINAPI midiInGetDevCapsA(UINT,LPMIDIINCAPSA,UINT); -MMRESULT WINAPI midiInGetDevCapsW(UINT,LPMIDIINCAPSW,UINT); +MMRESULT WINAPI midiInGetDevCapsA(UINT_PTR,LPMIDIINCAPSA,UINT); +MMRESULT WINAPI midiInGetDevCapsW(UINT_PTR,LPMIDIINCAPSW,UINT); MMRESULT WINAPI midiInGetErrorTextA(MMRESULT,LPSTR,UINT); MMRESULT WINAPI midiInGetErrorTextW(MMRESULT,LPWSTR,UINT); -MMRESULT WINAPI midiInOpen(LPHMIDIIN,UINT,DWORD,DWORD,DWORD); +MMRESULT WINAPI midiInOpen(LPHMIDIIN,UINT_PTR,DWORD_PTR,DWORD_PTR,DWORD); MMRESULT WINAPI midiInClose(HMIDIIN); MMRESULT WINAPI midiInPrepareHeader(HMIDIIN,LPMIDIHDR,UINT); MMRESULT WINAPI midiInUnprepareHeader(HMIDIIN,LPMIDIHDR,UINT); @@ -1730,17 +1730,17 @@ MMRESULT WINAPI midiInStop(HMIDIIN); MMRESULT WINAPI midiInReset(HMIDIIN); MMRESULT WINAPI midiInGetID(HMIDIIN,LPUINT); -MMRESULT WINAPI midiInMessage(HMIDIIN,UINT,DWORD,DWORD); +DWORD WINAPI midiInMessage(HMIDIIN,UINT,DWORD_PTR,DWORD_PTR); UINT WINAPI auxGetNumDevs(void); -MMRESULT WINAPI auxGetDevCapsA(UINT,LPAUXCAPSA,UINT); -MMRESULT WINAPI auxGetDevCapsW(UINT,LPAUXCAPSW,UINT); +MMRESULT WINAPI auxGetDevCapsA(UINT_PTR,LPAUXCAPSA,UINT); +MMRESULT WINAPI auxGetDevCapsW(UINT_PTR,LPAUXCAPSW,UINT); MMRESULT WINAPI auxSetVolume(UINT,DWORD); MMRESULT WINAPI auxGetVolume(UINT,PDWORD); -MMRESULT WINAPI auxOutMessage(UINT,UINT,DWORD,DWORD); +MMRESULT WINAPI auxOutMessage(UINT,UINT,DWORD_PTR,DWORD_PTR); UINT WINAPI mixerGetNumDevs(void); -MMRESULT WINAPI mixerGetDevCapsA(UINT,LPMIXERCAPSA,UINT); -MMRESULT WINAPI mixerGetDevCapsW(UINT,LPMIXERCAPSW,UINT); -MMRESULT WINAPI mixerOpen(LPHMIXER,UINT,DWORD,DWORD,DWORD); +MMRESULT WINAPI mixerGetDevCapsA(UINT_PTR,LPMIXERCAPSA,UINT); +MMRESULT WINAPI mixerGetDevCapsW(UINT_PTR,LPMIXERCAPSW,UINT); +MMRESULT WINAPI mixerOpen(LPHMIXER,UINT,DWORD_PTR,DWORD_PTR,DWORD); MMRESULT WINAPI mixerClose(HMIXER); DWORD WINAPI mixerMessage(HMIXER,UINT,DWORD_PTR,DWORD_PTR); MMRESULT WINAPI mixerGetLineInfoA(HMIXEROBJ,LPMIXERLINEA,DWORD); @@ -1753,14 +1753,14 @@ MMRESULT WINAPI mixerSetControlDetails(HMIXEROBJ,LPMIXERCONTROLDETAILS,DWORD); MMRESULT WINAPI timeGetSystemTime(LPMMTIME,UINT); DWORD WINAPI timeGetTime(void); -MMRESULT WINAPI timeSetEvent(UINT,UINT,LPTIMECALLBACK,DWORD,UINT); +MMRESULT WINAPI timeSetEvent(UINT,UINT,LPTIMECALLBACK,DWORD_PTR,UINT); MMRESULT WINAPI timeKillEvent(UINT); MMRESULT WINAPI timeGetDevCaps(LPTIMECAPS,UINT); MMRESULT WINAPI timeBeginPeriod(UINT); MMRESULT WINAPI timeEndPeriod(UINT); UINT WINAPI joyGetNumDevs(void); -MMRESULT WINAPI joyGetDevCapsA(UINT,LPJOYCAPSA,UINT); -MMRESULT WINAPI joyGetDevCapsW(UINT,LPJOYCAPSW,UINT); +MMRESULT WINAPI joyGetDevCapsA(UINT_PTR,LPJOYCAPSA,UINT); +MMRESULT WINAPI joyGetDevCapsW(UINT_PTR,LPJOYCAPSW,UINT); MMRESULT WINAPI joyGetPos(UINT,LPJOYINFO); MMRESULT WINAPI joyGetPosEx(UINT,LPJOYINFOEX); MMRESULT WINAPI joyGetThreshold(UINT,LPUINT); @@ -1788,8 +1788,8 @@ MMRESULT WINAPI mmioDescend(HMMIO,LPMMCKINFO,const MMCKINFO*,UINT); MMRESULT WINAPI mmioAscend(HMMIO,LPMMCKINFO,UINT); MMRESULT WINAPI mmioCreateChunk(HMMIO,LPMMCKINFO,UINT); -MCIERROR WINAPI mciSendCommandA(MCIDEVICEID,UINT,DWORD,DWORD); -MCIERROR WINAPI mciSendCommandW(MCIDEVICEID,UINT,DWORD,DWORD); +MCIERROR WINAPI mciSendCommandA(MCIDEVICEID,UINT,DWORD,DWORD_PTR); +MCIERROR WINAPI mciSendCommandW(MCIDEVICEID,UINT,DWORD,DWORD_PTR); MCIERROR WINAPI mciSendStringA(LPCSTR,LPSTR,UINT,HWND); MCIERROR WINAPI mciSendStringW(LPCWSTR,LPWSTR,UINT,HWND); MCIDEVICEID WINAPI mciGetDeviceIDA(LPCSTR); @@ -1799,7 +1799,7 @@ BOOL WINAPI mciGetErrorStringA(MCIERROR,LPSTR,UINT); BOOL WINAPI mciGetErrorStringW(MCIERROR,LPWSTR,UINT); BOOL WINAPI mciSetYieldProc(MCIDEVICEID,YIELDPROC,DWORD); -HTASK WINAPI mciGetCreatorTask(MCIDEVICEID); +HANDLE WINAPI mciGetCreatorTask(MCIDEVICEID); YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID,PDWORD); typedef struct tagMCI_SEQ_SET_PARMS { Modified: branches/ros-amd64-bringup/reactos/include/psdk/msacm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/msacm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/msacm.h [iso-8859-1] Sun Dec 21 22:50:48 2008 @@ -541,7 +541,7 @@ { DWORD cbStruct; DWORD fdwStatus; - DWORD dwUser; + DWORD_PTR dwUser; LPBYTE pbSrc; DWORD cbSrcLength; DWORD cbSrcLengthUsed;

1 0

[tkreuzer] 38262: If ETO_PDY is specified, Dx is a pair of INTs, make sure we access the correct index. based on aspotashev's patch. Should fix bug #3958 See issue #3958 for more details.
by tkreuzer＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: tkreuzer Date: Sun Dec 21 22:26:51 2008 New Revision: 38262 URL: http://svn.reactos.org/svn/reactos?rev=38262&view=rev Log: If ETO_PDY is specified, Dx is a pair of INTs, make sure we access the correct index. based on aspotashev's patch. Should fix bug #3958 See issue #3958 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sun Dec 21 22:26:51 2008 @@ -3132,6 +3132,7 @@ POINT Start; BOOL DoBreak = FALSE; HPALETTE hDestPalette; + USHORT DxShift; // TODO: Write test-cases to exactly match real Windows in different // bad parameters (e.g. does Windows check the DC or the RECT first?). @@ -3157,6 +3158,8 @@ SetLastWin32Error(ERROR_INVALID_PARAMETER); goto fail; } + + DxShift = fuOptions & ETO_PDY ? 1 : 0; if (PATH_IsPathOpen(dc->DcLevel)) { @@ -3364,7 +3367,7 @@ if (NULL != Dx) { Start = Count < 2 ? 0 : Count - 2; - TextWidth = Count < 2 ? 0 : (Dx[Count - 2] << 6); + TextWidth = Count < 2 ? 0 : (Dx[(Count-2)<<DxShift] << 6); } else { @@ -3597,7 +3600,7 @@ } else { - TextLeft += Dx[i] << 6; + TextLeft += Dx[i<<DxShift] << 6; // DbgPrint("new TextLeft2: %d\n", TextLeft); } previous = glyph_index;

1 0

[tkreuzer] 38261: Some people were thinking they could use NtGdiExtTextOut from within Win32k and get away with it. Since MmCopyFromCaller is broken, it was actually working. Implement NtGdiExtTextOutW as a wrapper around the real function, that is now called GreExtTextOutW, using the naming style that ms also uses to get some more stucture in here. Also get rid of 2 pool allocations and use only one if a local buffer is not sufficient. Should get us more TextOut performance.
by tkreuzer＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: tkreuzer Date: Sun Dec 21 21:58:04 2008 New Revision: 38261 URL: http://svn.reactos.org/svn/reactos?rev=38261&view=rev Log: Some people were thinking they could use NtGdiExtTextOut from within Win32k and get away with it. Since MmCopyFromCaller is broken, it was actually working. Implement NtGdiExtTextOutW as a wrapper around the real function, that is now called GreExtTextOutW, using the naming style that ms also uses to get some more stucture in here. Also get rid of 2 pool allocations and use only one if a local buffer is not sufficient. Should get us more TextOut performance. Modified: trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Sun Dec 21 21:58:04 2008 @@ -104,6 +104,8 @@ BOOL FASTCALL IntGdiGetFontResourceInfo(PUNICODE_STRING,PVOID,DWORD*,DWORD); BOOL FASTCALL ftGdiRealizationInfo(PFONTGDI,PREALIZATION_INFO); DWORD FASTCALL ftGdiGetKerningPairs(PFONTGDI,DWORD,LPKERNINGPAIR); +BOOL NTAPI GreExtTextOutW(IN HDC,IN INT,IN INT,IN UINT,IN OPTIONAL LPRECT, + IN LPWSTR, IN INT, IN OPTIONAL LPINT, IN DWORD); #define IntLockProcessPrivateFonts(W32Process) \ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&W32Process->PrivateFontListLock) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sun Dec 21 21:58:04 2008 @@ -1536,7 +1536,7 @@ align_old = IntGdiSetTextAlign(hDC, TA_RIGHT); mode_old = IntGdiSetBkMode(hDC, TRANSPARENT); - NtGdiExtTextOutW(hDC, rect.right-16, rect.bottom-48, 0, NULL, s_wszVersion, len, NULL, 0); + GreExtTextOutW(hDC, rect.right-16, rect.bottom-48, 0, NULL, s_wszVersion, len, NULL, 0); IntGdiSetBkMode(hDC, mode_old); IntGdiSetTextAlign(hDC, align_old); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Sun Dec 21 21:58:04 2008 @@ -1594,7 +1594,7 @@ //FIXME: If string doesn't fit to rc, truncate it and add ellipsis. - NtGdiExtTextOutW(hDc, lpRc->left, + GreExtTextOutW(hDc, lpRc->left, lpRc->top, 0, NULL, Text->Buffer, Text->Length/sizeof(WCHAR), NULL, 0); Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sun Dec 21 21:58:04 2008 @@ -3079,15 +3079,15 @@ BOOL APIENTRY -NtGdiExtTextOutW( +GreExtTextOutW( IN HDC hDC, IN INT XStart, IN INT YStart, IN UINT fuOptions, IN OPTIONAL LPRECT lprc, - IN LPWSTR UnsafeString, + IN LPWSTR String, IN INT Count, - IN OPTIONAL LPINT UnsafeDx, + IN OPTIONAL LPINT Dx, IN DWORD dwCodePage) { /* @@ -3108,7 +3108,7 @@ LONGLONG TextLeft, RealXStart; ULONG TextTop, previous, BackgroundLeft; FT_Bool use_kerning; - RECTL DestRect, MaskRect, SpecifiedDestRect; + RECTL DestRect, MaskRect; POINTL SourcePoint, BrushOrigin; HBRUSH hBrushFg = NULL; PGDIBRUSHOBJ BrushFg = NULL; @@ -3129,11 +3129,8 @@ ULONG Mode; FT_Render_Mode RenderMode; BOOLEAN Render; - NTSTATUS Status; - INT *Dx = NULL; POINT Start; BOOL DoBreak = FALSE; - LPCWSTR String, SafeString = NULL; HPALETTE hDestPalette; // TODO: Write test-cases to exactly match real Windows in different @@ -3155,48 +3152,10 @@ if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; /* Check if String is valid */ - if ((Count > 0xFFFF) || (Count > 0 && UnsafeString == NULL)) + if ((Count > 0xFFFF) || (Count > 0 && String == NULL)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); goto fail; - } - if (Count > 0) - { - SafeString = ExAllocatePoolWithTag(PagedPool, Count * sizeof(WCHAR), TAG_GDITEXT); - if (!SafeString) - { - goto fail; - } - Status = MmCopyFromCaller(SafeString, UnsafeString, Count * sizeof(WCHAR)); - if (! NT_SUCCESS(Status)) - { - goto fail; - } - } - String = SafeString; - - if (NULL != UnsafeDx && Count > 0) - { - Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT); - if (NULL == Dx) - { - goto fail; - } - Status = MmCopyFromCaller(Dx, UnsafeDx, Count * sizeof(INT)); - if (!NT_SUCCESS(Status)) - { - goto fail; - } - } - - if (lprc) - { - Status = MmCopyFromCaller(&SpecifiedDestRect, lprc, sizeof(RECT)); - if (!NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - goto fail; - } } if (PATH_IsPathOpen(dc->DcLevel)) @@ -3205,8 +3164,8 @@ XStart, YStart, fuOptions, - (const RECT *)&SpecifiedDestRect, - SafeString, + (const RECT *)lprc, + String, Count, (const INT *)Dx)) goto fail; goto good; @@ -3214,7 +3173,7 @@ if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED))) { - IntLPtoDP(dc, (POINT *) &SpecifiedDestRect, 2); + IntLPtoDP(dc, (POINT *)lprc, 2); } BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); @@ -3288,10 +3247,10 @@ if ((fuOptions & ETO_OPAQUE) && lprc) { - DestRect.left = SpecifiedDestRect.left + dc->ptlDCOrig.x; - DestRect.top = SpecifiedDestRect.top + dc->ptlDCOrig.y; - DestRect.right = SpecifiedDestRect.right + dc->ptlDCOrig.x; - DestRect.bottom = SpecifiedDestRect.bottom + dc->ptlDCOrig.y; + DestRect.left = lprc->left + dc->ptlDCOrig.x; + DestRect.top = lprc->top + dc->ptlDCOrig.y; + DestRect.right = lprc->right + dc->ptlDCOrig.x; + DestRect.bottom = lprc->bottom + dc->ptlDCOrig.y; IntLPtoDP(dc, (LPPOINT)&DestRect, 2); IntEngBitBlt( &BitmapObj->SurfObj, @@ -3602,12 +3561,12 @@ if (lprc && (fuOptions & ETO_CLIPPED) && - DestRect.right >= SpecifiedDestRect.right + dc->ptlDCOrig.x) + DestRect.right >= lprc->right + dc->ptlDCOrig.x) { // We do the check '>=' instead of '>' to possibly save an iteration // through this loop, since it's breaking after the drawing is done, // and x is always incremented. - DestRect.right = SpecifiedDestRect.right + dc->ptlDCOrig.x; + DestRect.right = lprc->right + dc->ptlDCOrig.x; DoBreak = TRUE; } @@ -3661,14 +3620,6 @@ BRUSHOBJ_UnlockBrush(BrushFg); NtGdiDeleteObject(hBrushFg); good: - if (NULL != SafeString) - { - ExFreePoolWithTag((void*)SafeString, TAG_GDITEXT); - } - if (NULL != Dx) - { - ExFreePoolWithTag(Dx, TAG_GDITEXT); - } DC_UnlockDc( dc ); return TRUE; @@ -3692,18 +3643,131 @@ BRUSHOBJ_UnlockBrush(BrushFg); NtGdiDeleteObject(hBrushFg); } - if (NULL != SafeString) - { - ExFreePoolWithTag((void*)SafeString, TAG_GDITEXT); - } - if (NULL != Dx) - { - ExFreePoolWithTag(Dx, TAG_GDITEXT); - } DC_UnlockDc(dc); return FALSE; } + +#define STACK_TEXT_BUFFER_SIZE 50 +BOOL +APIENTRY +NtGdiExtTextOutW( + IN HDC hDC, + IN INT XStart, + IN INT YStart, + IN UINT fuOptions, + IN OPTIONAL LPRECT UnsafeRect, + IN LPWSTR UnsafeString, + IN INT Count, + IN OPTIONAL LPINT UnsafeDx, + IN DWORD dwCodePage) +{ + BOOL Result = FALSE; + NTSTATUS Status = STATUS_SUCCESS; + RECT SafeRect; + BYTE LocalBuffer[STACK_TEXT_BUFFER_SIZE]; + PVOID Buffer = LocalBuffer; + LPWSTR SafeString = NULL; + LPINT SafeDx = NULL; + ULONG BufSize, StringSize, DxSize = 0; + + /* Check if String is valid */ + if ((Count > 0xFFFF) || (Count > 0 && UnsafeString == NULL)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (Count > 0) + { + /* Calculate buffer size for string and Dx values */ + BufSize = StringSize = Count * sizeof(WCHAR); + if (UnsafeDx) + { + /* If ETO_PDY is specified, we have pairs of INTs */ + DxSize = (Count * sizeof(INT)) * (fuOptions & ETO_PDY ? 2 : 1); + BufSize += DxSize; + } + + /* Check if our local buffer is large enough */ + if (BufSize > STACK_TEXT_BUFFER_SIZE) + { + /* It's not, allocate a temp buffer */ + Buffer = ExAllocatePoolWithTag(PagedPool, BufSize, TAG_GDITEXT); + if (!Buffer) + { + return FALSE; + } + } + + /* Probe and copy user mode data to the buffer */ + _SEH2_TRY + { + /* Probe and copy the string */ + ProbeForRead(UnsafeString, StringSize, 1); + SafeString = Buffer; + memcpy((PVOID)SafeString, UnsafeString, StringSize); + + /* If we have Dx values... */ + if (UnsafeDx) + { + /* ... probe and copy them */ + ProbeForRead(UnsafeDx, DxSize, 1); + SafeDx = (LPINT)(((ULONG_PTR)Buffer) + StringSize); + memcpy(SafeDx, UnsafeDx, DxSize); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + if (!NT_SUCCESS(Status)) + { + goto cleanup; + } + } + + /* If we have a rect, copy it */ + if (UnsafeRect) + { + _SEH2_TRY + { + ProbeForRead(UnsafeRect, sizeof(RECT), 1); + SafeRect = *UnsafeRect; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + if (!NT_SUCCESS(Status)) + { + goto cleanup; + } + } + + /* Finally call the internal routine */ + Result = GreExtTextOutW(hDC, + XStart, + YStart, + fuOptions, + &SafeRect, + SafeString, + Count, + SafeDx, + dwCodePage); + +cleanup: + /* If we allocated a buffer, free it */ + if (Buffer != LocalBuffer) + { + ExFreePoolWithTag(Buffer, TAG_GDITEXT); + } + + return Result;; +} + /* * @implemented

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