Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 46536: [CRT] - Implement x86 ceilf, floorf, fmodf (taken from mingw-w64) - Implement cosf, sinf, sqrtf (simply wrappers) - Fix missing definitions
by tkreuzer＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: tkreuzer Date: Mon Mar 29 01:18:31 2010 New Revision: 46536 URL: http://svn.reactos.org/svn/reactos?rev=46536&view=rev Log: [CRT] - Implement x86 ceilf, floorf, fmodf (taken from mingw-w64) - Implement cosf, sinf, sqrtf (simply wrappers) - Fix missing definitions Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/ceilf.S (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/cosf.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/floorf.S (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/fmodf.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/sinf.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/sqrtf.c (with props) Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/fpclass.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Mon Mar 29 01:18:31 2010 @@ -26,6 +26,7 @@ <define name="_MSVCRT_" /> <define name="_MT" /> <define name="_CRTBLD" /> + <define name="__CRT__NO_INLINE" /> <directory name="conio"> <file>cgets.c</file> <file>cprintf.c</file> @@ -140,9 +141,11 @@ <file>aullrem_asm.s</file> <file>aullshr_asm.s</file> <file>ceil_asm.s</file> + <file>ceilf.S</file> <file>cos_asm.s</file> <file>fabs_asm.s</file> <file>floor_asm.s</file> + <file>floorf.S</file> <file>ftol_asm.s</file> <file>log_asm.s</file> <file>log10_asm.s</file> @@ -153,9 +156,13 @@ <file>atan2.c</file> <file>ci.c</file> + <file>cosf.c</file> <file>exp.c</file> <file>fmod.c</file> + <file>fmodf.c</file> <file>ldexp.c</file> + <file>sinf.c</file> + <file>sqrtf.c</file> </directory>  <!--<file>j0_y0.c</file> Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/fpclass.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/fpclass.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/fpclass.c [iso-8859-1] Mon Mar 29 01:18:31 2010 @@ -25,7 +25,7 @@ #define _FPCLASS_PINF 0x0200 /* positive infinity */ -#if __MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 3 +//#if __MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 3 #define FP_SNAN 0x0001 // signaling NaN #define FP_QNAN 0x0002 // quiet NaN @@ -38,7 +38,7 @@ #define FP_NNORM 0x0080 // negative normalized non-zero #define FP_PNORM 0x0100 // positive normalized non-zero -#endif +//#endif typedef int fpclass_t; Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Mon Mar 29 01:18:31 2010 @@ -8,6 +8,7 @@ <define name="_NTDLLBUILD_" /> <define name="_LIBCNT_" /> <define name="_CRTBLD" /> + <define name="__CRT__NO_INLINE" /> <if property="ARCH" value="i386"> <define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define> </if> Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/ceilf.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/ceilf.S (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/ceilf.S [iso-8859-1] Mon Mar 29 01:18:31 2010 @@ -1,0 +1,55 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +#include <_mingw_mac.h> + + .file "ceilf.S" + .text + .align 4 +.globl __MINGW_USYMBOL(ceilf) + .def __MINGW_USYMBOL(ceilf); .scl 2; .type 32; .endef +__MINGW_USYMBOL(ceilf): +#ifdef _WIN64 + subq $24,%rsp + movss %xmm0,8(%rsp) + flds 8(%rsp) + + fstcw 4(%rsp) /* store fpu control word */ + + movl $0x0800,%edx /* round towards +oo */ + orl 4(%rsp),%edx + andl $0xfbff,%edx + movl %edx,(%rsp) + fldcw (%rsp) /* load modified control word */ + + frndint /* round */ + + fldcw 4(%rsp) /* restore original control word */ + fstps 8(%rsp) + movss 8(%rsp),%xmm0 + addq $24,%rsp + ret +#else + flds 4(%esp) + subl $8,%esp + + fstcw 4(%esp) /* store fpu control word */ + + /* We use here %edx although only the low 1 bits are defined. + But none of the operations should care and they are faster + than the 16 bit operations. */ + movl $0x0800,%edx /* round towards +oo */ + orl 4(%esp),%edx + andl $0xfbff,%edx + movl %edx,(%esp) + fldcw (%esp) /* load modified control word */ + + frndint /* round */ + + fldcw 4(%esp) /* restore original control word */ + + addl $8,%esp + ret +#endif Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/ceilf.S ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/cosf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/cosf.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/cosf.c [iso-8859-1] Mon Mar 29 01:18:31 2010 @@ -1,0 +1,11 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +#include <math.h> + +float cosf(float _X) +{ + return ((float)cos((double)_X)); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/cosf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/floorf.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/floorf.S (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/floorf.S [iso-8859-1] Mon Mar 29 01:18:31 2010 @@ -1,0 +1,63 @@ +/* + * Written by J.T. Conklin <jtc(a)netbsd.org>. + * Public domain. + * + * Changes for long double by Ulrich Drepper <drepper(a)cygnus.com> + * + * Removed header file dependency for use in libmingwex.a by + * Danny Smith <dannysmith(a)users.sourceforge.net> + */ +#include <_mingw_mac.h> + + .file "floorf.S" + .text +#ifdef _WIN64 + .align 8 +#else + .align 4 +#endif +.globl __MINGW_USYMBOL(floorf) + .def __MINGW_USYMBOL(floorf); .scl 2; .type 32; .endef +__MINGW_USYMBOL(floorf): +#ifdef _WIN64 + subq $24,%rsp + movss %xmm0,8(%rsp) + flds 8(%rsp) + + fstcw 4(%rsp) /* store fpu control word */ + movl $0x400,%edx /* round towards -oo */ + orl 4(%rsp),%edx + andl $0xf7ff,%edx + movl %edx,(%rsp) + fldcw (%rsp) /* load modified control word */ + + frndint /* round */ + + fldcw 4(%rsp) /* restore original control word */ + + fstps 8(%rsp) + movss 8(%rsp),%xmm0 + addq $24,%rsp + ret +#else + flds 4(%esp) + subl $8,%esp + + fstcw 4(%esp) /* store fpu control word */ + + /* We use here %edx although only the low 1 bits are defined. + But none of the operations should care and they are faster + than the 16 bit operations. */ + movl $0x400,%edx /* round towards -oo */ + orl 4(%esp),%edx + andl $0xf7ff,%edx + movl %edx,(%esp) + fldcw (%esp) /* load modified control word */ + + frndint /* round */ + + fldcw 4(%esp) /* restore original control word */ + + addl $8,%esp + ret +#endif Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/floorf.S ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/fmodf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/fmodf.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/fmodf.c [iso-8859-1] Mon Mar 29 01:18:31 2010 @@ -1,0 +1,28 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +/* + * Written by J.T. Conklin <jtc(a)netbsd.org>. + * Public domain. + * + * Adapted for float type by Danny Smith + * <dannysmith(a)users.sourceforge.net>. + */ + +#include <math.h> + +float +fmodf (float x, float y) +{ + float res = 0.0F; + + asm ("1:\tfprem\n\t" + "fstsw %%ax\n\t" + "sahf\n\t" + "jp 1b\n\t" + "fstp %%st(1)" + : "=t" (res) : "0" (x), "u" (y) : "ax", "st(1)"); + return res; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/fmodf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/sinf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/sinf.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/sinf.c [iso-8859-1] Mon Mar 29 01:18:31 2010 @@ -1,0 +1,11 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +#include <math.h> + +float sinf(float _X) +{ + return ((float) sin ((double) _X)); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/sinf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/sqrtf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/sqrtf.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/sqrtf.c [iso-8859-1] Mon Mar 29 01:18:31 2010 @@ -1,0 +1,12 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +#include <math.h> + +float +sqrtf(float x) +{ + return ((float)sqrt((double)x)); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/sqrtf.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 46535: [CRT HEADERS] - add _mingw_mac.h from ming-w64 and include it into _mingw.h - Update _CRTIMP definition - Fix definition of _wctype - onexit is not _CRTIMP
by tkreuzer＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: tkreuzer Date: Mon Mar 29 01:12:46 2010 New Revision: 46535 URL: http://svn.reactos.org/svn/reactos?rev=46535&view=rev Log: [CRT HEADERS] - add _mingw_mac.h from ming-w64 and include it into _mingw.h - Update _CRTIMP definition - Fix definition of _wctype - onexit is not _CRTIMP Added: branches/ros-amd64-bringup/reactos/include/crt/_mingw_mac.h (with props) Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h branches/ros-amd64-bringup/reactos/include/crt/crtdefs.h branches/ros-amd64-bringup/reactos/include/crt/ctype.h branches/ros-amd64-bringup/reactos/include/crt/stdlib.h Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] Mon Mar 29 01:12:46 2010 @@ -184,7 +184,7 @@ #define USE_MINGW_SETJMP_TWO_ARGS #endif -/* Diable deprecation for now! */ +/* Disable deprecation for now! */ #define _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE_CORE #ifdef __WINESRC__ @@ -197,33 +197,7 @@ #define _CRT_UNUSED(x) (void)x #endif -#if defined(__x86__) -#define __MINGW_USE_UNDERSCORE_PREFIX 1 -#else -#define __MINGW_USE_UNDERSCORE_PREFIX 0 -#endif - -#if __MINGW_USE_UNDERSCORE_PREFIX == 0 -#define __MINGW_IMP_SYMBOL(sym) __imp_##sym -#define __MINGW_USYMBOL(sym) sym -#else -#define __MINGW_IMP_SYMBOL(sym) _imp__##sym -#define __MINGW_USYMBOL(sym) _##sym -#endif - -#if defined(__x86__) -/* Hack, for bug in ld. Will be removed soon. */ -#define __ImageBase _image_base__ -/* This symbol is defined by the linker. */ -extern char __ImageBase; -#elif defined(__x86_64__) -/* Hack, for bug in ld. Will be removed soon. */ -#define __ImageBase __image_base__ -/* This symbol is defined by the linker. */ -extern char __ImageBase; -#else -#error FIXME: Unsupported __ImageBase implementation. -#endif +#include "_mingw_mac.h" #endif /* !_INC_MINGW */ Added: branches/ros-amd64-bringup/reactos/include/crt/_mingw_mac.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/_mingw_mac.h (added) +++ branches/ros-amd64-bringup/reactos/include/crt/_mingw_mac.h [iso-8859-1] Mon Mar 29 01:12:46 2010 @@ -1,0 +1,134 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#ifndef _INC_CRTDEFS_MACRO +#define _INC_CRTDEFS_MACRO + +#define __STRINGIFY(x) #x +#define __MINGW64_STRINGIFY(x) __STRINGIFY(x) + +#define __MINGW64_VERSION_MAJOR 1 +#define __MINGW64_VERSION_MINOR 1 +#define __MINGW64_VERSION_STR __MINGW64_STRINGIFY(__MINGW64_VERSION_MAJOR) "." __MINGW64_STRINGIFY(__MINGW64_VERSION_MINOR) +#define __MINGW64_VERSION_STATE "alpha" + +/* mingw.org's version macros: these make gcc to define + MINGW32_SUPPORTS_MT_EH and to use the _CRT_MT global + and the __mingwthr_key_dtor() function from the MinGW + CRT in its private gthr-win32.h header. */ +#define __MINGW32_MAJOR_VERSION 3 +#define __MINGW32_MINOR_VERSION 11 + +#ifdef _WIN64 +/* MS does not prefix symbols by underscores for 64-bit. */ +#ifndef __MINGW_USE_UNDERSCORE_PREFIX +/* As we have to support older gcc version, which are using underscores + as symbol prefix for x64, we have to check here for the user label + prefix defined by gcc. */ +#ifdef __USER_LABEL_PREFIX__ +#pragma push_macro ("_") +#undef _ +#define _ 1 +#if (__USER_LABEL_PREFIX__ + 0) != 0 +#define __MINGW_USE_UNDERSCORE_PREFIX 1 +#else +#define __MINGW_USE_UNDERSCORE_PREFIX 0 +#endif +#undef _ +#pragma pop_macro ("_") +#else +#define __MINGW_USE_UNDERSCORE_PREFIX 0 +#endif +#endif +#else +/* For 32-bits we have always to prefix by underscore. */ +#undef __MINGW_USE_UNDERSCORE_PREFIX +#define __MINGW_USE_UNDERSCORE_PREFIX 1 +#endif + +#if __MINGW_USE_UNDERSCORE_PREFIX == 0 +#define __MINGW_IMP_SYMBOL(sym) __imp_##sym +#define __MINGW_USYMBOL(sym) sym +#define __MINGW_LSYMBOL(sym) _##sym +#else +#define __MINGW_IMP_SYMBOL(sym) _imp__##sym +#define __MINGW_USYMBOL(sym) _##sym +#define __MINGW_LSYMBOL(sym) sym +#endif + +/* Use alias for msvcr80 export of get/set_output_format. */ +#ifndef __USE_MINGW_OUTPUT_FORMAT_EMU +#define __USE_MINGW_OUTPUT_FORMAT_EMU 1 +#endif + +/* Set VC specific compiler target macros. */ +#if defined(__x86_64) && defined(_X86_) +#undef _X86_ /* _X86_ is not for __x86_64 */ +#endif + +#if defined(_X86_) && !defined(_M_IX86) && !defined(_M_IA64) \ + && !defined(_M_AMD64) && !defined(__x86_64) +#if defined(__i486__) +#define _M_IX86 400 +#elif defined(__i586__) +#define _M_IX86 500 +#else +/* This gives wrong (600 instead of 300) value if -march=i386 is specified + but we cannot check for__i386__ as it is defined for all 32-bit CPUs. */ +#define _M_IX86 600 +#endif +#endif + +#if defined(__x86_64) && !defined(_M_IX86) && !defined(_M_IA64) \ + && !defined(_M_AMD64) +#define _M_AMD64 100 +#define _M_X64 100 +#endif + +#if defined(__ia64__) && !defined(_M_IX86) && !defined(_M_IA64) \ + && !defined(_M_AMD64) && !defined(_X86_) && !defined(__x86_64) +#define _M_IA64 100 +#endif + +#ifndef __PTRDIFF_TYPE__ +#ifdef _WIN64 +#define __PTRDIFF_TYPE__ long long int +#else +#define __PTRDIFF_TYPE__ long int +#endif +#endif + +#ifndef __SIZE_TYPE__ +#ifdef _WIN64 +#define __SIZE_TYPE__ long long unsigned int +#else +#define __SIZE_TYPE__ long unsigned int +#endif +#endif + +#ifndef __WCHAR_TYPE__ +#define __WCHAR_TYPE__ unsigned short +#endif +#ifndef __WINT_TYPE__ +#define __WINT_TYPE__ unsigned short +#endif + +#if defined(__GNUC__) || defined(__GNUG__) +#define __MINGW_EXTENSION __extension__ +#else +#define __MINGW_EXTENSION +#endif + +#ifdef UNICODE +# define __MINGW_NAME_AW(func) func##W +#else +# define __MINGW_NAME_AW(func) func##A +#endif +#define __MINGW_TYPEDEF_AW(type) \ + typedef __MINGW_NAME_AW(type) type; + +#endif /* _INC_CRTDEFS_MACRO */ + Propchange: branches/ros-amd64-bringup/reactos/include/crt/_mingw_mac.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/crtdefs.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/crtdefs.h [iso-8859-1] Mon Mar 29 01:12:46 2010 @@ -25,6 +25,7 @@ //#define NO_OLDNAMES //#endif + /** Properties ***************************************************************/ #undef _CRT_PACKING @@ -50,12 +51,14 @@ #endif #ifndef _CRTIMP - #ifdef _DLL + #ifdef CRTDLL /* Defined for ntdll, crtdll, msvcrt, etc */ + #define _CRTIMP __declspec(dllexport) + #elif defined(_DLL) #define _CRTIMP __declspec(dllimport) - #else - #define _CRTIMP - #endif -#endif + #else /* !CRTDLL && !_DLL */ + #define _CRTIMP + #endif /* CRTDLL || _DLL */ +#endif /* !_CRTIMP */ //#define _CRT_ALTERNATIVE_INLINES @@ -218,6 +221,7 @@ #define _CRT_OBSOLETE(_NewItem) #endif + /** Constants ****************************************************************/ #define _ARGMAX 100 @@ -229,7 +233,6 @@ #define __STDC_SECURE_LIB__ 200411L #define __GOT_SECURE_LIB__ __STDC_SECURE_LIB__ #define _SECURECRT_FILL_BUFFER_PATTERN 0xFD - /** Type definitions *********************************************************/ Modified: branches/ros-amd64-bringup/reactos/include/crt/ctype.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/ctype.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/ctype.h [iso-8859-1] Mon Mar 29 01:12:46 2010 @@ -38,7 +38,7 @@ #ifndef _CRT_WCTYPEDATA_DEFINED #define _CRT_WCTYPEDATA_DEFINED # ifndef _CTYPE_DISABLE_MACROS - _CRTDATA(extern unsigned short *_wctype); + _CRTDATA(extern const unsigned short _wctype[]); _CRTIMP const wctype_t * __cdecl __pwctype_func(void); # ifndef _M_CEE_PURE _CRTDATA(extern const wctype_t *_pwctype); Modified: branches/ros-amd64-bringup/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/stdlib.h [iso-8859-1] Mon Mar 29 01:12:46 2010 @@ -535,7 +535,7 @@ _CRTIMP int __cdecl putenv(const char *_EnvString); _CRTIMP void __cdecl swab(char *_Buf1,char *_Buf2,int _SizeInBytes); _CRTIMP char *__cdecl ultoa(unsigned long _Val,char *_Dstbuf,int _Radix); - _CRTIMP onexit_t __cdecl onexit(onexit_t _Func); + onexit_t __cdecl onexit(onexit_t _Func); #endif #endif

1 0

[tkreuzer] 46534: [CRT] - Set crt="static" in freeldr, rtl, bmfs, ftfd, rtl, mini_hal - define "CRTDLL" in ntdll, crtdll, msvcrt, msvcrt20, msvcrt40
by tkreuzer＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: tkreuzer Date: Mon Mar 29 01:06:36 2010 New Revision: 46534 URL: http://svn.reactos.org/svn/reactos?rev=46534&view=rev Log: [CRT] - Set crt="static" in freeldr, rtl, bmfs, ftfd, rtl, mini_hal - define "CRTDLL" in ntdll, crtdll, msvcrt, msvcrt20, msvcrt40 Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_base.rbuild branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_main.rbuild branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msvcrt20/msvcrt20.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msvcrt40/msvcrt40.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE directory SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="freeldr_arch" type="objectlibrary"> +<module name="freeldr_arch" type="objectlibrary" crt="static"> <include base="freeldr_base">include</include> <include base="freeldr_base">cache</include> <include base="ntoskrnl">include</include> Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="freeldr_base" type="objectlibrary"> +<module name="freeldr_base" type="objectlibrary" crt="static"> <include base="freeldr_base">include</include> <include base="freeldr_base">cache</include> <include base="cmlib">.</include> Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_main.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_main.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="freeldr_main" type="objectlibrary"> +<module name="freeldr_main" type="objectlibrary" crt="static"> <include base="freeldr_main">include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="setupldr_main" type="objectlibrary"> +<module name="setupldr_main" type="objectlibrary" crt="static"> <include base="setupldr_main">include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -12,6 +12,7 @@ <include base="ReactOS">include/reactos/subsys</include> <define name="__NTDLL__" /> <define name="_NTOSKRNL_" /> + <define name="CRTDLL" /> <library>rtl</library> <library>ntdllsys</library> <library>libcntpr</library> Modified: branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -5,6 +5,7 @@ <define name="USE_MSVCRT_PREFIX" /> <define name="_MSVCRT_LIB_" /> <define name="_MSVCRT_" /> + <define name="CRTDLL" /> <define name="_CTYPE_DISABLE_MACROS" /> <define name="_NO_INLINING" /> Modified: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -8,6 +8,7 @@ <define name="_MT" /> <define name="_CTYPE_DISABLE_MACROS" /> <define name="_NO_INLINING" /> + <define name="CRTDLL" /> <linkerflag linkerset="ld">-enable-stdcall-fixup</linkerflag> <!-- __MINGW_IMPORT needs to be defined differently because it's defined Modified: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt20/msvcrt20.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msvcrt20/msvcrt20.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msvcrt20/msvcrt20.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -6,6 +6,7 @@ <include base="msvcrt20">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="CRTDLL" /> <file>msvcrt20.c</file> <library>wine</library> <library>msvcrt</library> Modified: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt40/msvcrt40.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msvcrt40/msvcrt40.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msvcrt40/msvcrt40.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -6,6 +6,7 @@ <include base="msvcrt40">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="CRTDLL" /> <file>msvcrt40.c</file> <library>wine</library> </module> Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -57,7 +57,7 @@ </directory> </module> - <module name="mini_hal" type="objectlibrary"> + <module name="mini_hal" type="objectlibrary" crt="static"> <include>include</include> <include base="ntoskrnl">include</include> <define name="_NTHALDLL_" /> @@ -100,7 +100,7 @@ <file>apic.c</file> <file>systimer.S</file> <file>usage.c</file> - </directory> + </directory> </if> </directory> <directory name="up"> Modified: branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> -<module name="rtl" type="staticlibrary"> +<module name="rtl" type="staticlibrary" crt="static"> <define name="_NTOSKRNL_" /> <define name="NO_RTL_INLINES" /> <define name="_NTSYSTEM_" />

1 0

[cgutman] 46533: [NTOSKRNL] - Fix a nasty bug that discarded any response to IRP_MN_FILTER_RESOURCE_REQUIREMENTS so drivers never got the resources they needed
by cgutman＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: cgutman Date: Mon Mar 29 00:59:38 2010 New Revision: 46533 URL: http://svn.reactos.org/svn/reactos?rev=46533&view=rev Log: [NTOSKRNL] - Fix a nasty bug that discarded any response to IRP_MN_FILTER_RESOURCE_REQUIREMENTS so drivers never got the resources they needed Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon Mar 29 00:59:38 2010 @@ -150,7 +150,7 @@ DPRINT("IopInitiatePnpIrp(IRP_MN_FILTER_RESOURCE_REQUIREMENTS) failed\n"); return Status; } - DeviceNode->ResourceRequirements = Stack.Parameters.FilterResourceRequirements.IoResourceRequirementList; + DeviceNode->ResourceRequirements = (PIO_RESOURCE_REQUIREMENTS_LIST)IoStatusBlock.Information; Status = IopAssignDeviceResources(DeviceNode, &RequiredLength); if (NT_SUCCESS(Status))

1 0

[tkreuzer] 46532: [NTOS] Some freelist.c fixes, to make it compile
by tkreuzer＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: tkreuzer Date: Mon Mar 29 00:51:39 2010 New Revision: 46532 URL: http://svn.reactos.org/svn/reactos?rev=46532&view=rev Log: [NTOS] Some freelist.c fixes, to make it compile Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/freelist.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Mon Mar 29 00:51:39 2010 @@ -56,6 +56,7 @@ C_ASSERT(sizeof(PHYSICAL_PAGE) == sizeof(MMPFN)); +#define MiInsertInListTail(x, y) MiInsertInListTail(x, (PMMPFN)y) //#define MiGetPfnEntry(Pfn) ((PPHYSICAL_PAGE)MiGetPfnEntry(Pfn)) #define MiGetPfnEntryIndex(x) MiGetPfnEntryIndex((struct _MMPFN*)x) #define LockCount Flags.LockCount @@ -797,7 +798,7 @@ return; } - Page = MiGetPfnEntry(Pfn); + Page = (PVOID)MiGetPfnEntry(Pfn); ASSERT(Page); Page->u3.e2.ReferenceCount++; @@ -814,7 +815,7 @@ DPRINT("MmGetReferenceCountPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - Page = MiGetPfnEntry(Pfn); + Page = (PVOID)MiGetPfnEntry(Pfn); ASSERT(Page); RCount = Page->u3.e2.ReferenceCount; @@ -846,7 +847,7 @@ DPRINT("MmDereferencePage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - Page = MiGetPfnEntry(Pfn); + Page = (PVOID)MiGetPfnEntry(Pfn); ASSERT(Page); Page->u3.e2.ReferenceCount--; @@ -885,13 +886,13 @@ DPRINT1("MmAllocPage(): Out of memory\n"); return 0; } - PageDescriptor = MiRemoveHeadList(&MmFreePageListHead); + PageDescriptor = (PVOID)MiRemoveHeadList(&MmFreePageListHead); NeedClear = TRUE; } else { - PageDescriptor = MiRemoveHeadList(&MmZeroedPageListHead); + PageDescriptor = (PVOID)MiRemoveHeadList(&MmZeroedPageListHead); } PageDescriptor->u3.e2.ReferenceCount = 1; @@ -961,7 +962,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); while (MmFreePageListHead.Total) { - PageDescriptor = MiRemoveHeadList(&MmFreePageListHead); + PageDescriptor = (PVOID)MiRemoveHeadList(&MmFreePageListHead); /* We set the page to used, because MmCreateVirtualMapping failed with unused pages */ KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); Pfn = PageDescriptor - MmPfnDatabase[0];

1 0

[tkreuzer] 46531: [HAL] Update from trunk
by tkreuzer＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: tkreuzer Date: Mon Mar 29 00:50:04 2010 New Revision: 46531 URL: http://svn.reactos.org/svn/reactos?rev=46531&view=rev Log: [HAL] Update from trunk Modified: branches/ros-amd64-bringup/reactos/hal/halx86/mp/halinit_mp.c Modified: branches/ros-amd64-bringup/reactos/hal/halx86/mp/halinit_mp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/mp/halinit_mp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/mp/halinit_mp.c [iso-8859-1] Mon Mar 29 00:50:04 2010 @@ -21,6 +21,11 @@ ULONG_PTR KernelBase; /***************************************************************************/ + +VOID NTAPI HalpInitializePICs(IN BOOLEAN EnableInterrupts) +{ + UNIMPLEMENTED; +} VOID HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock)

1 0

[jgardou] 46530: [WIN32K] Close another pair of DC_LockDC/DC_UnlockDC Now gdi32:dc winetests doesn't crash anymore.
by jgardou＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: jgardou Date: Mon Mar 29 00:27:57 2010 New Revision: 46530 URL: http://svn.reactos.org/svn/reactos?rev=46530&view=rev Log: [WIN32K] Close another pair of DC_LockDC/DC_UnlockDC Now gdi32:dc winetests doesn't crash anymore. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dcstate.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dcstate.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] Mon Mar 29 00:27:57 2010 @@ -173,6 +173,8 @@ /* Prevent save dc from being restored */ pdcSave->dclevel.lSaveDepth = 1; + /* Unlock it */ + DC_UnlockDc(pdcSave); /* Delete the saved dc */ GreDeleteObject(hdcSave); }

1 0

[jgardou] 46529: [WIN32K] Forgot this one
by jgardou＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: jgardou Date: Mon Mar 29 00:18:45 2010 New Revision: 46529 URL: http://svn.reactos.org/svn/reactos?rev=46529&view=rev Log: [WIN32K] Forgot this one Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/metric.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] Mon Mar 29 00:18:45 2010 @@ -39,6 +39,7 @@ { Width = ppdev->gdiinfo.ulHorzRes; Height = ppdev->gdiinfo.ulVertRes; + PDEVOBJ_vRelease(ppdev); } piSysMet = gpsi->aiSysMet;

1 0

[jgardou] 46528: [WIN32K] More PDEVOBJ_vRelease fun
by jgardou＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: jgardou Date: Mon Mar 29 00:09:45 2010 New Revision: 46528 URL: http://svn.reactos.org/svn/reactos?rev=46528&view=rev Log: [WIN32K] More PDEVOBJ_vRelease fun Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Mon Mar 29 00:09:45 2010 @@ -176,7 +176,7 @@ QueryTable, NULL, NULL); - + if (!dwVgaCompatible) { /* This driver is not a vga driver */ @@ -243,7 +243,7 @@ UNREFERENCED_PARAMETER(Context); UNREFERENCED_PARAMETER(EntryContext); - DPRINT1("DisplayDriverQueryRoutine(%S, %S);\n", + DPRINT1("DisplayDriverQueryRoutine(%S, %S);\n", ValueName, pwszRegKey); /* Check if we have a correct entry */ @@ -408,7 +408,7 @@ PUNICODE_STRING pustrDevice, DWORD iDevNum, PDISPLAY_DEVICEW pDisplayDevice, - DWORD dwFlags) + DWORD dwFlags) { UNICODE_STRING ustrDevice; WCHAR awcDevice[CCHDEVICENAME]; @@ -511,7 +511,8 @@ } *ppdm = ppdev->pdmwDev; - + PDEVOBJ_vRelease(ppdev); + return STATUS_SUCCESS; } @@ -772,7 +773,7 @@ { DPRINT1("Could not open registry key\n"); lResult = DISP_CHANGE_NOTUPDATED; - } + } } /* Check if DEVMODE matches the current mode */ @@ -788,16 +789,16 @@ if (!PDEVOBJ_bSwitchMode(ppdev, pdm)) { DPRINT1("failed to set mode\n"); - lResult = (lResult == DISP_CHANGE_NOTUPDATED) ? + lResult = (lResult == DISP_CHANGE_NOTUPDATED) ? DISP_CHANGE_FAILED : DISP_CHANGE_RESTART; } - + /* Send message */ - + } leave: -// PDEVOBJ_vReleasePdev(ppdev); + PDEVOBJ_vRelease(ppdev); return lResult; }

1 0

[jgardou] 46527: [WIN32K] Release ppdev when deleting DC
by jgardou＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: jgardou Date: Sun Mar 28 23:45:43 2010 New Revision: 46527 URL: http://svn.reactos.org/svn/reactos?rev=46527&view=rev Log: [WIN32K] Release ppdev when deleting DC Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Sun Mar 28 23:45:43 2010 @@ -374,6 +374,8 @@ PATH_Delete(pdc->dclevel.hPath); + PDEVOBJ_vRelease(pdc->ppdev) ; + return TRUE; } @@ -653,8 +655,6 @@ /* Allocate a dc attribute */ DC_AllocDcAttr(pdcNew); - PDEVOBJ_vRelease(ppdev); - // HACK! DC_vSelectSurface(pdcNew, psurfDefaultBitmap);

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