Ros-diffs May 2014

ros-diffs@reactos.org

14 participants
437 discussions

[akhaldi] 63443: [CRT] * Partial update of scanf routines. Focus was on the case of reading a float. * Don't inline float processing, introduce _internal_handle_float() and co to take care of this....

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun May 25 14:30:54 2014 New Revision: 63443 URL: http://svn.reactos.org/svn/reactos?rev=63443&view=rev Log: [CRT] * Partial update of scanf routines. Focus was on the case of reading a float. * Don't inline float processing, introduce _internal_handle_float() and co to take care of this. Brought to you by Timo. * Msvcrt scanf tests are now green. CORE-7005 #resolve #comment Should be fixed in r63443. Thanks Dmitry ;) CORE-8080 Added: trunk/reactos/lib/sdk/crt/string/winesup.c (with props) trunk/reactos/lib/sdk/crt/string/winesup.h (with props) Modified: trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/libcntpr.cmake trunk/reactos/lib/sdk/crt/string/scanf.c trunk/reactos/lib/sdk/crt/string/scanf.h Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Sun May 25 14:30:54 2014 @@ -306,6 +306,7 @@ string/wtoi.c string/wtoi64.c string/wtol.c + string/winesup.c sys_stat/systime.c time/asctime.c time/clock.c Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Sun May 25 14:30:54 2014 @@ -59,6 +59,7 @@ string/wtoi64.c string/wtoi.c string/wtol.c + string/winesup.c wstring/wcsicmp.c wstring/wcslwr.c wstring/wcsnicmp.c Modified: trunk/reactos/lib/sdk/crt/string/scanf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.c [iso-8859-1] Sun May 25 14:30:54 2014 @@ -23,13 +23,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <precomp.h> -#include <ctype.h> - -// HACK for LIBCNT -#ifndef debugstr_a -#define debugstr_a -#endif +#include <stdarg.h> +#include <limits.h> + +#include <winternl.h> +#include <wine/debug.h> + +#include "winesup.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); //extern FILE _iob[]; @@ -56,49 +58,54 @@ } #ifndef _LIBCNT_ -/* vfscanf */ +/* vfscanf_l */ #undef WIDE_SCANF #undef CONSOLE #undef STRING -#include "scanf.h" - -/* vfwscanf */ +#undef SECURE +#include "scanf.h" + +/* vfwscanf_l */ #define WIDE_SCANF 1 #undef CONSOLE #undef STRING -#include "scanf.h" -#endif - -/* vsscanf */ +#undef SECURE +#include "scanf.h" +#endif /* !_LIBCNT_ */ + +/* vsscanf_l */ #undef WIDE_SCANF #undef CONSOLE #define STRING 1 -#include "scanf.h" - -/* vswscanf */ +#undef SECURE +#include "scanf.h" + +/* vswscanf_l */ #define WIDE_SCANF 1 #undef CONSOLE #define STRING 1 +#undef SECURE #include "scanf.h" #ifndef _LIBCNT_ -/* vcscanf */ +/* vcscanf_l */ #undef WIDE_SCANF #define CONSOLE 1 #undef STRING +#undef SECURE #include "scanf.h" /********************************************************************* * fscanf (MSVCRT.@) */ -int fscanf(FILE *file, const char *format, ...) -{ - va_list valist; - int res; - - va_start(valist, format); - res = vfscanf(file, format, valist); +int CDECL fscanf(FILE *file, const char *format, ...) +{ + va_list valist; + int res; + + va_start(valist, format); + res = vfscanf_l(file, format, NULL, valist); va_end(valist); return res; } @@ -106,13 +113,13 @@ /********************************************************************* * scanf (MSVCRT.@) */ -int scanf(const char *format, ...) -{ - va_list valist; - int res; - - va_start(valist, format); - res = vfscanf(stdin, format, valist); +int CDECL scanf(const char *format, ...) +{ + va_list valist; + int res; + + va_start(valist, format); + res = vfscanf_l(stdin, format, NULL, valist); va_end(valist); return res; } @@ -120,13 +127,13 @@ /********************************************************************* * fwscanf (MSVCRT.@) */ -int fwscanf(FILE *file, const wchar_t *format, ...) -{ - va_list valist; - int res; - - va_start(valist, format); - res = vfwscanf(file, format, valist); +int CDECL fwscanf(FILE *file, const wchar_t *format, ...) +{ + va_list valist; + int res; + + va_start(valist, format); + res = vfwscanf_l(file, format, NULL, valist); va_end(valist); return res; } @@ -135,60 +142,60 @@ /********************************************************************* * wscanf (MSVCRT.@) */ -int wscanf(const wchar_t *format, ...) -{ - va_list valist; - int res; - - va_start(valist, format); - res = vfwscanf(stdin, format, valist); +int CDECL wscanf(const wchar_t *format, ...) +{ + va_list valist; + int res; + + va_start(valist, format); + res = vfwscanf_l(stdin, format, NULL, valist); + va_end(valist); + return res; +} +#endif /* !_LIBCNT_ */ + + +/********************************************************************* + * sscanf (MSVCRT.@) + */ +int CDECL sscanf(const char *str, const char *format, ...) +{ + va_list valist; + int res; + + va_start(valist, format); + res = vsscanf_l(str, format, NULL, valist); + va_end(valist); + return res; +} + + +/********************************************************************* + * swscanf (MSVCRT.@) + */ +int CDECL swscanf(const wchar_t *str, const wchar_t *format, ...) +{ + va_list valist; + int res; + + va_start(valist, format); + res = vswscanf_l(str, format, NULL, valist); + va_end(valist); + return res; +} + +#ifndef _LIBCNT_ +/********************************************************************* + * _cscanf (MSVCRT.@) + */ +int CDECL _cscanf(const char *format, ...) +{ + va_list valist; + int res; + + va_start(valist, format); + res = vcscanf_l(format, NULL, valist); va_end(valist); return res; } #endif - - -/********************************************************************* - * sscanf (MSVCRT.@) - */ -int sscanf(const char *str, const char *format, ...) -{ - va_list valist; - int res; - - va_start(valist, format); - res = vsscanf(str, format, valist); - va_end(valist); - return res; -} - - -/********************************************************************* - * swscanf (MSVCRT.@) - */ -int CDECL swscanf(const wchar_t *str, const wchar_t *format, ...) -{ - va_list valist; - int res; - - va_start(valist, format); - res = vswscanf(str, format, valist); - va_end(valist); - return res; -} - -#ifndef _LIBCNT_ -/********************************************************************* - * _cscanf (MSVCRT.@) - */ -int CDECL _cscanf(const char *format, ...) -{ - va_list valist; - int res; - - va_start(valist, format); - res = vcscanf(format, valist); - va_end(valist); - return res; -} -#endif Modified: trunk/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.h… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] Sun May 25 14:30:54 2014 @@ -48,7 +48,11 @@ #ifdef CONSOLE #define _GETC_(file) (consumed++, _getch()) #define _UNGETC_(nch, file) do { _ungetch(nch); consumed--; } while(0) -#define _FUNCTION_ int vcscanf(const char *format, va_list ap) +#ifdef SECURE +#define _FUNCTION_ static int vcscanf_s_l(const char *format, _locale_t locale, __ms_va_list ap) +#else /* SECURE */ +#define _FUNCTION_ static int vcscanf_l(const char *format, _locale_t locale, __ms_va_list ap) +#endif /* SECURE */ #else #ifdef STRING #undef _EOF_ @@ -56,24 +60,41 @@ #define _GETC_(file) (consumed++, *file++) #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) #ifdef WIDE_SCANF -#define _FUNCTION_ int vswscanf(const wchar_t *file, const wchar_t *format, va_list ap) +#ifdef SECURE +#define _FUNCTION_ static int vswscanf_s_l(const wchar_t *file, const wchar_t *format, _locale_t locale, __ms_va_list ap) +#else /* SECURE */ +#define _FUNCTION_ static int vswscanf_l(const wchar_t *file, const wchar_t *format, _locale_t locale, __ms_va_list ap) +#endif /* SECURE */ #else /* WIDE_SCANF */ -#define _FUNCTION_ int vsscanf(const char *file, const char *format, va_list ap) +#ifdef SECURE +#define _FUNCTION_ static int vsscanf_s_l(const char *file, const char *format, _locale_t locale, __ms_va_list ap) +#else /* SECURE */ +#define _FUNCTION_ static int vsscanf_l(const char *file, const char *format, _locale_t locale, __ms_va_list ap) +#endif /* SECURE */ #endif /* WIDE_SCANF */ #else /* STRING */ #ifdef WIDE_SCANF #define _GETC_(file) (consumed++, fgetwc(file)) #define _UNGETC_(nch, file) do { ungetwc(nch, file); consumed--; } while(0) -#define _FUNCTION_ int vfwscanf(FILE* file, const wchar_t *format, va_list ap) +#ifdef SECURE +#define _FUNCTION_ static int vfwscanf_s_l(FILE* file, const wchar_t *format, _locale_t locale, __ms_va_list ap) +#else /* SECURE */ +#define _FUNCTION_ static int vfwscanf_l(FILE* file, const wchar_t *format, _locale_t locale, __ms_va_list ap) +#endif /* SECURE */ #else /* WIDE_SCANF */ #define _GETC_(file) (consumed++, fgetc(file)) #define _UNGETC_(nch, file) do { ungetc(nch, file); consumed--; } while(0) -#define _FUNCTION_ int vfscanf(FILE* file, const char *format, va_list ap) +#ifdef SECURE +#define _FUNCTION_ static int vfscanf_s_l(FILE* file, const char *format, _locale_t locale, __ms_va_list ap) +#else /* SECURE */ +#define _FUNCTION_ static int vfscanf_l(FILE* file, const char *format, _locale_t locale, __ms_va_list ap) +#endif /* SECURE */ #endif /* WIDE_SCANF */ #endif /* STRING */ #endif /* CONSOLE */ _FUNCTION_ { + pthreadlocinfo locinfo; int rd = 0, consumed = 0; int nch; if (!*format) return 0; @@ -93,6 +114,11 @@ if (nch == _EOF_) { return _EOF_RET; } + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; while (*format) { /* a whitespace character in the format string causes scanf to read, @@ -246,8 +272,12 @@ case 'f': case 'g': case 'G': { /* read a float */ - long double cur = 0; - int negative = 0; + //long double cur = 1, expcnt = 10; + ULONGLONG d, hlp; + int exp = 0, negative = 0; + //unsigned fpcontrol; + //BOOL negexp; + /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); @@ -259,69 +289,112 @@ if (width==0) break; nch = _GETC_(file); } - /* get first digit. */ - if ('.' != nch) { - if (!_ISDIGIT_(nch)) break; - cur = (nch - '0'); - nch = _GETC_(file); - if (width>0) width--; - /* read until no more digits */ - while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { - cur = cur*10 + (nch - '0'); - nch = _GETC_(file); - if (width>0) width--; - } - } else { - cur = 0; /* MaxPayneDemo Fix: .8 -> 0.8 */ - } - /* handle decimals */ - if (width!=0 && nch == '.') { - long double dec = 1; + + /* get first digit. */ + if (*locinfo->lconv->decimal_point != nch) { + if (!_ISDIGIT_(nch)) break; + d = nch - '0'; nch = _GETC_(file); if (width>0) width--; + /* read until no more digits */ while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { - dec /= 10; - cur += dec * (nch - '0'); + hlp = d*10 + nch - '0'; + nch = _GETC_(file); + if (width>0) width--; + if(d > (ULONGLONG)-1/10 || hlp<d) { + exp++; + break; + } + else + d = hlp; + } + while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { + exp++; nch = _GETC_(file); if (width>0) width--; } - } - /* handle exponent */ - if (width!=0 && (nch == 'e' || nch == 'E')) { - int exponent = 0, negexp = 0; - double expcnt, shift; + } else { + d = 0; /* Fix: .8 -> 0.8 */ + } + + /* handle decimals */ + if (width!=0 && nch == *locinfo->lconv->decimal_point) { nch = _GETC_(file); if (width>0) width--; - /* possible sign on the exponent */ - if (width!=0 && (nch=='+' || nch=='-')) { - negexp = (nch=='-'); + + while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { + hlp = d*10 + nch - '0'; nch = _GETC_(file); if (width>0) width--; - } - /* exponent digits */ - while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { - exponent *= 10; - exponent += (nch - '0'); + if(d > (ULONGLONG)-1/10 || hlp<d) + break; + + d = hlp; + exp--; + } + while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { nch = _GETC_(file); if (width>0) width--; } - /* update 'cur' with this exponent. */ - expcnt = 10; - shift = 1.0; - while (exponent!=0) { - if (exponent&1) - shift *= expcnt; - exponent/=2; - expcnt=expcnt*expcnt; - } - cur = (negexp ? cur / shift : cur * shift); - } + } + + /* handle exponent */ + if (width!=0 && (nch == 'e' || nch == 'E')) { + int sign = 1, e = 0; + + nch = _GETC_(file); + if (width>0) width--; + if (width!=0 && (nch=='+' || nch=='-')) { + if(nch == '-') + sign = -1; + nch = _GETC_(file); + if (width>0) width--; + } + + /* exponent digits */ + while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { + if(e > INT_MAX/10 || (e = e*10 + nch - '0')<0) + e = INT_MAX; + nch = _GETC_(file); + if (width>0) width--; + } + e *= sign; + + if(exp<0 && e<0 && e+exp>0) exp = INT_MIN; + else if(exp>0 && e>0 && e+exp<0) exp = INT_MAX; + else exp += e; + } + +#ifdef __REACTOS__ + /* ReactOS: don't inline float processing (kernel/freeldr don't like that! */ + _internal_handle_float(negative, exp, suppress, d, l_prefix || L_prefix, &ap); + st = 1; +#else + fpcontrol = _control87(0, 0); + _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE + |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT, 0xffffffff); + + negexp = (exp < 0); + if(negexp) + exp = -exp; + /* update 'cur' with this exponent. */ + while(exp) { + if(exp & 1) + cur *= expcnt; + exp /= 2; + expcnt = expcnt*expcnt; + } + cur = (negexp ? d/cur : d*cur); + + _control87(fpcontrol, 0xffffffff); + st = 1; if (!suppress) { - if (L_prefix) _SET_NUMBER_(long double); + if (L_prefix) _SET_NUMBER_(double); else if (l_prefix) _SET_NUMBER_(double); else _SET_NUMBER_(float); } +#endif /* __REACTOS__ */ } break; /* According to msdn, @@ -448,11 +521,7 @@ int invert = 0; /* Set if we are NOT to find the chars */ /* Init our bitmap */ -#ifdef _LIBCNT_ - Mask = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, _BITMAPSIZE_/8); -#else Mask = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _BITMAPSIZE_/8); -#endif RtlInitializeBitMap(&bitMask, Mask, _BITMAPSIZE_); /* Read the format */ @@ -497,11 +566,7 @@ } /* terminate */ if (!suppress) *sptr = 0; -#ifdef _LIBCNT_ - RtlFreeHeap(RtlGetProcessHeap(), 0, Mask); -#else HeapFree(GetProcessHeap(), 0, Mask); -#endif } break; default: Added: trunk/reactos/lib/sdk/crt/string/winesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/winesup… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/winesup.c (added) +++ trunk/reactos/lib/sdk/crt/string/winesup.c [iso-8859-1] Sun May 25 14:30:54 2014 @@ -0,0 +1,102 @@ + +#include "precomp.h" +#include "winesup.h" + +#ifdef _LIBCNT_ + +static struct lconv _LIBCNT_lconv = +{ + ".", // char* decimal_point; + ",", // char* thousands_sep; + " ", // char* grouping; + "$", // char* int_curr_symbol; + "$", // char* currency_symbol; + ".", // char* mon_decimal_point; + "?", // char* mon_thousands_sep; + "/", // char* mon_grouping; + "+", // char* positive_sign; + "-", // char* negative_sign; + 4, // char int_frac_digits; + 4, // char frac_digits; + 4, // char p_cs_precedes; + 1, // char p_sep_by_space; + 0, // char n_cs_precedes; + 1, // char n_sep_by_space; + 1, // char p_sign_posn; + 1, // char n_sign_posn; +}; + +threadlocinfo _LIBCNT_locinfo = +{ + 2, // LONG refcount; + 0, // CP_ACP, // unsigned int lc_codepage; + 0, // unsigned int lc_collate_cp; + {0}, // unsigned long lc_handle[6]; + {{0}}, // LC_ID lc_id[6]; + + // struct { + // char *locale; + // wchar_t *wlocale; + // int *refcount; + // int *wrefcount; + // } lc_category[6]; + {{0}}, + + 0, // int lc_clike; + 2, // int mb_cur_max; + 0, // int *lconv_intl_refcount; + 0, // int *lconv_num_refcount; + 0, // int *lconv_mon_refcount; + &_LIBCNT_lconv, // struct MSVCRT_lconv *lconv; + 0, // int *ctype1_refcount; + 0, // unsigned short *ctype1; + 0, // const unsigned short *pctype; + 0, // unsigned char *pclmap; + 0, // unsigned char *pcumap; + 0, // struct __lc_time_data *lc_time_curr; +}; + +#define get_locinfo() (&_LIBCNT_locinfo) + +#endif + +#define _SET_NUMBER_(type) *va_arg((*ap), type*) = negative ? -cur : cur + +void +__declspec(noinline) +_internal_handle_float( + int negative, + int exp, + int suppress, + ULONGLONG d, + int l_or_L_prefix, + va_list *ap) +{ + long double cur = 1, expcnt = 10; + unsigned fpcontrol; + BOOL negexp; + + fpcontrol = _control87(0, 0); + _control87(_EM_DENORMAL|_EM_INVALID|_EM_ZERODIVIDE + |_EM_OVERFLOW|_EM_UNDERFLOW|_EM_INEXACT, 0xffffffff); + + negexp = (exp < 0); + if(negexp) + exp = -exp; + /* update 'cur' with this exponent. */ + while(exp) { + if(exp & 1) + cur *= expcnt; + exp /= 2; + expcnt = expcnt*expcnt; + } + cur = (negexp ? d/cur : d*cur); + + _control87(fpcontrol, 0xffffffff); + + if (!suppress) { + if (l_or_L_prefix) _SET_NUMBER_(double); + else _SET_NUMBER_(float); + } +} +#undef _SET_NUMBER_ Propchange: trunk/reactos/lib/sdk/crt/string/winesup.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/string/winesup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/winesup… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/winesup.h (added) +++ trunk/reactos/lib/sdk/crt/string/winesup.h [iso-8859-1] Sun May 25 14:30:54 2014 @@ -0,0 +1,45 @@ +#pragma once + +#include <stdio.h> +#include <conio.h> +#include <float.h> +#include <locale.h> +#include <internal/locale.h> + +#undef NtCurrentPeb +#define NtCurrentPeb() (NtCurrentTeb()->Peb) +#define GetProcessHeap() (NtCurrentPeb()->ProcessHeap) + +#define HeapAlloc(_Heap, _Flags, _Size) RtlAllocateHeap(_Heap, _Flags, _Size) +#define HeapFree(_Heap, _Flags, _Ptr) RtlFreeHeap(_Heap, _Flags, _Ptr) + +#ifdef _LIBCNT_ +static inline unsigned int __control87(unsigned int new, unsigned int mask) +{ + return 0; +} +#define _control87 __control87 +extern threadlocinfo _LIBCNT_locinfo; +#define get_locinfo() (&_LIBCNT_locinfo) +#else +#define get_locinfo() ((pthreadlocinfo)get_locinfo()) +#endif + +void +__declspec(noinline) +_internal_handle_float( + int negative, + int exp, + int suppress, + ULONGLONG d, + int l_or_L_prefix, + va_list *ap); + +//#include <debug.h> + +#define __WINE_DEBUG_H +#undef WINE_DEFAULT_DEBUG_CHANNEL +#define WINE_DEFAULT_DEBUG_CHANNEL(_Ch) +#undef TRACE +#define TRACE(...) /* DPRINT(__VA_ARGS__) */ +#define debugstr_a(format) format Propchange: trunk/reactos/lib/sdk/crt/string/winesup.h ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 7 months

[tkreuzer] 63442: [WIN32K] Make sure to check for invalid NULL handles before passing them to GDIOBJ_bLockMultipleObjects, which skips NULL handles. This is a design limitation, since otherwise we ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 25 12:59:17 2014 New Revision: 63442 URL: http://svn.reactos.org/svn/reactos?rev=63442&view=rev Log: [WIN32K] Make sure to check for invalid NULL handles before passing them to GDIOBJ_bLockMultipleObjects, which skips NULL handles. This is a design limitation, since otherwise we either need to pass a bitfield of valid handles, or duplicate code in certain functions, where different combinations of dest, source and mask dc are allowed. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Sun May 25 12:59:17 2014 @@ -47,6 +47,12 @@ return FALSE; } + if ((hDCDest == NULL) || (hDCSrc == NULL)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + TRACE("Locking DCs\n"); ahDC[0] = hDCDest; ahDC[1] = hDCSrc ; @@ -161,14 +167,14 @@ return NtGdiStretchBlt(hDCDest, XDest, YDest, - Width, + Width, Height, hDCSrc, XSrc, YSrc, Width, Height, - ROP, + ROP, crBackColor); dwTRop = ROP & ~(NOMIRRORBITMAP|CAPTUREBLT); @@ -212,6 +218,12 @@ ULONG TransparentColor = 0; BOOL Ret = FALSE; EXLATEOBJ exlo; + + if ((hdcDst == NULL) || (hdcSrc == NULL)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } TRACE("Locking DCs\n"); ahDC[0] = hdcDst;

10 years, 7 months

[akhaldi] 63441: [CMAKE] * Force the C++ compiler in the ARM case.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun May 25 12:29:49 2014 New Revision: 63441 URL: http://svn.reactos.org/svn/reactos?rev=63441&view=rev Log: [CMAKE] * Force the C++ compiler in the ARM case. Modified: trunk/reactos/toolchain-msvc.cmake Modified: trunk/reactos/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-msvc.cmake?rev=6… ============================================================================== --- trunk/reactos/toolchain-msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-msvc.cmake [iso-8859-1] Sun May 25 12:29:49 2014 @@ -9,7 +9,14 @@ # which compilers to use for C and C++ set(CMAKE_C_COMPILER cl) + +if(ARCH STREQUAL "arm") + include(CMakeForceCompiler) + CMAKE_FORCE_CXX_COMPILER(cl MSVC) +else() set(CMAKE_CXX_COMPILER cl) +endif() + set(CMAKE_MC_COMPILER mc) set(CMAKE_RC_COMPILER rc) if(ARCH STREQUAL "amd64")

10 years, 7 months

[dreimer] 63440: [LAUTUS] Change the used font from Segoe UI (MS ONLY) to the very close looking OpenSans family. Same parameters though.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun May 25 11:40:30 2014 New Revision: 63440 URL: http://svn.reactos.org/svn/reactos?rev=63440&view=rev Log: [LAUTUS] Change the used font from Segoe UI (MS ONLY) to the very close looking OpenSans family. Same parameters though. Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available.

10 years, 7 months

[dreimer] 63439: [FONTS] Add Open Sans Font Family as Segoe UI like font for Lautus. Add Ubuntu Font Family which is used by Lautus.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun May 25 11:39:12 2014 New Revision: 63439 URL: http://svn.reactos.org/svn/reactos?rev=63439&view=rev Log: [FONTS] Add Open Sans Font Family as Segoe UI like font for Lautus. Add Ubuntu Font Family which is used by Lautus. Added: trunk/reactos/media/fonts/OpenSans-Bold.ttf (with props) trunk/reactos/media/fonts/OpenSans-BoldItalic.ttf (with props) trunk/reactos/media/fonts/OpenSans-CondBold.ttf (with props) trunk/reactos/media/fonts/OpenSans-CondLight.ttf (with props) trunk/reactos/media/fonts/OpenSans-CondLightItalic.ttf (with props) trunk/reactos/media/fonts/OpenSans-ExtraBold.ttf (with props) trunk/reactos/media/fonts/OpenSans-ExtraBoldItalic.ttf (with props) trunk/reactos/media/fonts/OpenSans-Italic.ttf (with props) trunk/reactos/media/fonts/OpenSans-Light.ttf (with props) trunk/reactos/media/fonts/OpenSans-LightItalic.ttf (with props) trunk/reactos/media/fonts/OpenSans-Regular.ttf (with props) trunk/reactos/media/fonts/OpenSans-Semibold.ttf (with props) trunk/reactos/media/fonts/OpenSans-SemiboldItalic.ttf (with props) trunk/reactos/media/fonts/Ubuntu-B.ttf (with props) trunk/reactos/media/fonts/Ubuntu-BI.ttf (with props) trunk/reactos/media/fonts/Ubuntu-C.ttf (with props) trunk/reactos/media/fonts/Ubuntu-L.ttf (with props) trunk/reactos/media/fonts/Ubuntu-LI.ttf (with props) trunk/reactos/media/fonts/Ubuntu-M.ttf (with props) trunk/reactos/media/fonts/Ubuntu-MI.ttf (with props) trunk/reactos/media/fonts/Ubuntu-R.ttf (with props) trunk/reactos/media/fonts/Ubuntu-RI.ttf (with props) trunk/reactos/media/fonts/UbuntuMono-B.ttf (with props) trunk/reactos/media/fonts/UbuntuMono-BI.ttf (with props) trunk/reactos/media/fonts/UbuntuMono-R.ttf (with props) trunk/reactos/media/fonts/UbuntuMono-RI.ttf (with props) trunk/reactos/media/fonts/doc/OpenSans/ (with props) trunk/reactos/media/fonts/doc/OpenSans/Apache License.txt (with props) trunk/reactos/media/fonts/doc/Ubuntu/ (with props) trunk/reactos/media/fonts/doc/Ubuntu/CONTRIBUTING.txt (with props) trunk/reactos/media/fonts/doc/Ubuntu/FONTLOG.txt (with props) trunk/reactos/media/fonts/doc/Ubuntu/LICENCE-FAQ.txt (with props) trunk/reactos/media/fonts/doc/Ubuntu/LICENCE.txt (with props) trunk/reactos/media/fonts/doc/Ubuntu/README.txt (with props) trunk/reactos/media/fonts/doc/Ubuntu/TRADEMARKS.txt (with props) trunk/reactos/media/fonts/doc/Ubuntu/copyright.txt (with props) Modified: trunk/reactos/media/doc/3rd Party Files.txt trunk/reactos/media/fonts/CMakeLists.txt Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… ============================================================================== --- trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] Sun May 25 11:39:12 2014 @@ -9,6 +9,14 @@ Title: DejaVu Fonts Used Version: 2.34 Website: http://dejavu.sourceforge.net + +Title: Ubuntu Fonts +Used Version: 0.80 +Website: http://font.ubuntu.com + +Title: Open Sans Fonts +Used Version: 1.10 +Website: http://www.google.com/fonts/specimen/Open+Sans Title: DXTN OpenGL Compression Libs Used Version: 1.1 Modified: trunk/reactos/media/fonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/CMakeLists.txt… ============================================================================== --- trunk/reactos/media/fonts/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/fonts/CMakeLists.txt [iso-8859-1] Sun May 25 11:39:12 2014 @@ -47,9 +47,35 @@ LiberationSerif-Italic.ttf LiberationSerif-Regular.ttf Marlett.ttf + OpenSans-Bold.ttf + OpenSans-BoldItalic.ttf + OpenSans-CondBold.ttf + OpenSans-CondLight.ttf + OpenSans-CondLightItalic.ttf + OpenSans-ExtraBold.ttf + OpenSans-ExtraBoldItalic.ttf + OpenSans-Italic.ttf + OpenSans-Light.ttf + OpenSans-LightItalic.ttf + OpenSans-Regular.ttf + OpenSans-Semibold.ttf + OpenSans-SemiboldItalic.ttf symbol.ttf tahoma.ttf tahomabd.ttf + Ubuntu-B.ttf + Ubuntu-BI.ttf + Ubuntu-C.ttf + Ubuntu-L.ttf + Ubuntu-LI.ttf + Ubuntu-M.ttf + Ubuntu-MI.ttf + UbuntuMono-B.ttf + UbuntuMono-BI.ttf + UbuntuMono-R.ttf + UbuntuMono-RI.ttf + Ubuntu-R.ttf + Ubuntu-RI.ttf UniVGA16.ttf ) Added: trunk/reactos/media/fonts/OpenSans-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/OpenSans-Bold.… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/OpenSans-Bold.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/OpenSans-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/OpenSans-BoldI… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/OpenSans-BoldItalic.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/OpenSans-CondBold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/OpenSans-CondB… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/OpenSans-CondBold.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/OpenSans-CondLight.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/OpenSans-CondL… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/OpenSans-CondLight.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/OpenSans-CondLightItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/OpenSans-CondL… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/OpenSans-CondLightItalic.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/OpenSans-ExtraBold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/OpenSans-Extra… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/OpenSans-ExtraBold.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/OpenSans-ExtraBoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/OpenSans-Extra… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/OpenSans-ExtraBoldItalic.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/OpenSans-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/OpenSans-Itali… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/OpenSans-Italic.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/OpenSans-Light.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/OpenSans-Light… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/OpenSans-Light.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/OpenSans-LightItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/OpenSans-Light… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/OpenSans-LightItalic.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/OpenSans-Regular.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/OpenSans-Regul… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/OpenSans-Regular.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/OpenSans-Semibold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/OpenSans-Semib… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/OpenSans-Semibold.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/OpenSans-SemiboldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/OpenSans-Semib… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/OpenSans-SemiboldItalic.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/Ubuntu-B.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/Ubuntu-B.ttf?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/Ubuntu-B.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/Ubuntu-BI.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/Ubuntu-BI.ttf?… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/Ubuntu-BI.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/Ubuntu-C.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/Ubuntu-C.ttf?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/Ubuntu-C.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/Ubuntu-L.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/Ubuntu-L.ttf?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/Ubuntu-L.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/Ubuntu-LI.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/Ubuntu-LI.ttf?… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/Ubuntu-LI.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/Ubuntu-M.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/Ubuntu-M.ttf?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/Ubuntu-M.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/Ubuntu-MI.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/Ubuntu-MI.ttf?… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/Ubuntu-MI.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/Ubuntu-R.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/Ubuntu-R.ttf?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/Ubuntu-R.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/Ubuntu-RI.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/Ubuntu-RI.ttf?… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/Ubuntu-RI.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/UbuntuMono-B.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/UbuntuMono-B.t… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/UbuntuMono-B.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/UbuntuMono-BI.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/UbuntuMono-BI.… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/UbuntuMono-BI.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/UbuntuMono-R.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/UbuntuMono-R.t… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/UbuntuMono-R.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/UbuntuMono-RI.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/UbuntuMono-RI.… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/UbuntuMono-RI.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Propchange: trunk/reactos/media/fonts/doc/OpenSans/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun May 25 11:39:12 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/media/fonts/doc/OpenSans/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/media/fonts/doc/OpenSans/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/media/fonts/doc/OpenSans/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/media/fonts/doc/OpenSans/Apache License.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/OpenSans/A… ============================================================================== --- trunk/reactos/media/fonts/doc/OpenSans/Apache License.txt (added) +++ trunk/reactos/media/fonts/doc/OpenSans/Apache License.txt [iso-8859-1] Sun May 25 11:39:12 2014 @@ -0,0 +1,201 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. Propchange: trunk/reactos/media/fonts/doc/OpenSans/Apache License.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/media/fonts/doc/Ubuntu/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun May 25 11:39:12 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/media/fonts/doc/Ubuntu/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/media/fonts/doc/Ubuntu/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/media/fonts/doc/Ubuntu/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/media/fonts/doc/Ubuntu/CONTRIBUTING.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/Ubuntu/CON… ============================================================================== --- trunk/reactos/media/fonts/doc/Ubuntu/CONTRIBUTING.txt (added) +++ trunk/reactos/media/fonts/doc/Ubuntu/CONTRIBUTING.txt [iso-8859-1] Sun May 25 11:39:12 2014 @@ -0,0 +1,21 @@ +The Ubuntu Font Family is very long-term endeavour, and the first time +that a professionally-designed font has been funded specifically with +the intent of being an on-going community expanded project: + + http://font.ubuntu.com/ + +Development of the Ubuntu Font Family is undertaken on Launchpad: + + http://launchpad.net/ubuntu-font-family/ + +and this is where milestones, bug management and releases are handled. + +Contributions are welcomed. Your work will be used on millions of +computers every single day! Following the initial bootstrapping of +Latin, Cyrillic, Greek, Arabic and Hebrew expansion will be undertaken +by font designers from the font design and Ubuntu communities. + +To ensure that the Ubuntu Font Family can be re-licensed to future +widely-used libre font licences, copyright assignment is being required: + + https://launchpad.net/~uff-contributors Propchange: trunk/reactos/media/fonts/doc/Ubuntu/CONTRIBUTING.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/media/fonts/doc/Ubuntu/FONTLOG.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/Ubuntu/FON… ============================================================================== --- trunk/reactos/media/fonts/doc/Ubuntu/FONTLOG.txt (added) +++ trunk/reactos/media/fonts/doc/Ubuntu/FONTLOG.txt [iso-8859-1] Sun May 25 11:39:12 2014 @@ -0,0 +1,274 @@ +This is the FONTLOG file for the Ubuntu Font Family and attempts to follow +the recommendations at: http://scripts.sil.org/OFL-FAQ_web#43cecb44 + + +Overview + +The new Ubuntu Font Family was started to enable the personality of +Ubuntu to be seen and felt in every menu, button and dialog. +The typeface is sans-serif, uses OpenType features and is manually +hinted for clarity on desktop and mobile computing screens. + +The scope of the Ubuntu Font Family includes all the languages used by +the various Ubuntu users around the world in tune with Ubuntu's +philosophy which states that every user should be able to use their +software in the language of their choice. So the Ubuntu Font Family +project will be extended to cover many more written languages. + + +History + +The Ubuntu Font Family has been creating during 2010 and 2011. As of +September 2011 coverage is provided for Latin, Cyrillic and Greek across +Regular, Italic, Bold and Bold-Italic. + + +ChangeLog + +2011-09-22 (Paul Sladen) Ubuntu Font Family version 0.80 + + [Vincent Connare/Dalton Maag] + * Wish for addition of a monospaced member to the family (LP: #640382) + * Mono: No hinting yet - Ubuntu Beta Mono font looks jagged in + Netbeans and terrible with ClearType (LP: #820493) + * Emacs: choosing normal monospace font in Emacs but gives bold-italic + (LP: #791076) + * PUA: ensure that Ubuntu Circle of Friends logo is full size: (LP: #853855) + + U+E0FF becomes large size in proportionals, remains small width in + monospaces + + U+F0FF becomes small size (proportionals only) + + U+F200 is full ubuntu logomark (proportionals only) + + [Paul Sladen] + * Monospace: Patch Family Name to be "Ubuntu Mono" + * Monospace: Patch U+EFFD version debugging glyph to be '0.8' + + [Cody Boisclair] + * Monospace: Force .null HDMX advance to 500 + * Monospace: Remap ASCII box-drawing characters (LP: #788757) + + [JÃºlio Reis] + * Date corrections to 'FONTLOG' (LP: #836595) + +2011-03-08 (Paul Sladen) Ubuntu Font Family version 0.71.2 + + * (Production) Adjust Medium WeightClass to 500 (Md, MdIt) (LP: #730912) + +2011-03-07 (Paul Sladen) Ubuntu Font Family version 0.71.1 + + * (Design) Add Capitalised version of glyphs and kern. (Lt, LtIt, + Md, MdIt) DM (LP: #677446) + * (Design) Re-space and tighen Regular and Italic by amount specified + by Mark Shuttleworth (minus 4 FUnits). (Rg, It) (LP: #677149) + * (Design) Design: Latin (U+0192) made straight more like l/c f with + tail (LP: #670768) + * (Design) (U+01B3) should have hook on right, as the lowercase + (U+01B4) (LP: #681026) + * (Design) Tail of Light Italic germandbls, longs and lowercase 'f' + to match Italic/BoldItalic (LP: #623925) + * (Production) Update <case> feature (Lt, LtIt, Md, MdIt). DM + (LP: #676538, #676539) + * (Production) Remove Bulgarian locl feature for Italics. (LP: #708578) + * (Production) Update Description information with new string: + "The Ubuntu Font Family are libre fonts funded by Canonical Ltd + on behalf of the Ubuntu project. The font design work and + technical implementation is being undertaken by Dalton Maag. The + typeface is sans-serif, uses OpenType features and is manually + hinted for clarity on desktop and mobile computing screens. The + scope of the Ubuntu Font Family includes all the languages used + by the various Ubuntu users around the world in tune with + Ubuntu's philosophy which states that every user should be able + to use their software in the language of their choice. The + project is ongoing, and we expect the family will be extended to + cover many written languages in the coming years." + (Rg, It, Bd, BdIt, Lt, LtIt, Md, MdIt) (LP: #690590) + * (Production) Pixel per em indicator added at U+F000 (Lt, LtIt, Md, + MdIt) (LP: #615787) + * (Production) Version number indicator added at U+EFFD (Lt, LtIt, Md, + MdIt) (LP: #640623) + * (Production) fstype bit set to 0 - Editable (Lt, LtIt, Md, MdIt) + (LP: #648406) + * (Production) Localisation of name table has been removed because + of problems with Mac OS/X interpretation of localisation. DM + (LP: #730785) + * (Hinting) Regular '?' dot non-circular (has incorrect control + value). (LP: #654336) + * (Hinting) Too much space after latin capital 'G' in 13pt + regular. Now reduced. (LP: #683437) + * (Hinting) Balance Indian Rupee at 18,19pt (LP: #662177) + * (Hinting) Make Regular 'Â£' less ambiguous at 13-15 ppm (LP: #685562) + * (Hinting) Regular capital 'W' made symmetrical at 31 ppem (LP: #686168) + +2010-12-14 (Paul Sladen) Ubuntu Font Family version 0.70.1 + + Packaging, rebuilt from '2010-12-08 UbuntuFontsSourceFiles_070.zip': + * (Midstream) Fstype bit != 0 (LP: #648406) + * (Midstream) Add unit test to validate fstype bits (LP: #648406) + * (Midstream) Add unit test to validate licence + +2010-12-14 (Paul Sladen) Ubuntu Font Family version 0.70 + + Release notes 0.70: + * (Design) Add Capitalised version of glyphs and kern. (Rg, It, Bd, + BdIt) DM (LP: #676538, #677446) + * (Design) Give acute and grave a slight upright move to more match + the Hungarian double acute angle. (Rg, It, Bd, BdIt) (LP: #656647) + * (Design) Shift Bold Italic accent glyphs to be consistent with the + Italic. (BdIt only) DM (LP: #677449) + * (Design) Check spacing and kerning of dcaron, lcaron and + tcaron. (Rg, It, Bd, BdIt) (LP: #664722) + * (Design) Add positive kerning to () {} [] to open out the + combinations so they are less like a closed box. (Rg, It, Bd, + BdIt) (LP: #671228) + * (Design) Change design of acute.asc and check highest points (Bd + and BdIt only) DM + * (Production) Update <case> feature. DM (LP: #676538, #676539) + * (Production) Remove Romanian locl feature. (Rg, It, Bd, BdIt) + (LP: #635615) + * (Production) Update Copyright information with new + strings. "Copyright 2010 Canonical Ltd. Licensed under the Ubuntu + Font Licence 1.0" Trademark string "Ubuntu and Canonical are + registered trademarks of Canonical Ltd." (Rg, It, Bd, BdIt) DM + (LP: #677450) + * (Design) Check aligning of hyphen, math signs em, en, check braces + and other brackets. 16/11 (LP: #676465) + * (Production) Pixel per em indicator added at U+F000 (Rg, It, Bd, + BdIt) (LP: #615787) + * (Production) Version number indicator added at U+EFFD (Rg, It, Bd, + BdIt) (LP: #640623) + * (Production) fstype bit set to 0 - Editable (Rg, It, Bd, BdIt) + (LP: #648406) + +2010-10-05 (Paul Sladen) Ubuntu Font Family version 0.69 + + [Dalton Maag] + * Italic, + - Hinting on lowercase Italic l amended 19ppm (LP: #632451) + - Hinting on lowercase Italic u amended 12ppm (LP: #626376) + + * Regular, Italic, Bold, BoldItalic + - New Rupee Sign added @ U+20B9 (LP: #645987) + - Ubuntu Roundel added @ U+E0FF (LP: #651606) + + [Paul Sladen] + * All + - Removed "!ubu" GSUB.calt ligature for U+E0FF (LP: #651606) + + +Acknowledgements + +If you make modifications be sure to add your name (N), email (E), +web-address (if you have one) (W) and description (D). This list is in +alphabetical order. + +N: Ryan Abdullah +W: http://www.rayan.de/ +D: Arabic calligraphy and design in collaboration with Dalton Maag +D: Arabic testing + +N: Cody Boisclair +D: Monospace low-level debugging and patching ('fixboxdrawing-ft.py') + +N: AmÃ©lie Bonet +W: http://ameliebonet.com/ +D: Type design with Dalton Maag, particularly Ubuntu Mono and Ubuntu Condensed + +N: Jason Campbell +W: http://www.campbellgraphics.com/design/fonts.shtml +D: Monospace hinting (first phase) at Dalton Maag + +N: Pilar Cano +W: http://www.pilarcano.com/ +D: Hebrew realisation with Dalton Maag + +N: Fernando Caro +D: Type design with Dalton Maag, particularly Ubuntu Condensed + +N: Ron Carpenter +W: http://www.daltonmaag.com/ +D: Type design with Dalton Maag +D: Arabic realisation in collaboration with Ryan Abdullah + +N: Vincent Connare +W: http://www.connare.com/ +D: Type design, and engineering with Dalton Maag +D: Monospace hinting (second phase) at Dalton Maag + +N: Dave Crossland +E: dave(a)understandingfonts.com +W: http://understandingfonts.com/ +D: Documentation and libre licensing guidance +D: Google Webfont integration at Google + +N: Steve Edwards +W: http://www.madebymake.com/ +D: font.ubuntu.com revamp implementation with Canonical Web Team + +N: Iain Farrell +W: http://www.flickr.com/photos/iain +D: Ubuntu Font Family delivery for the Ubuntu UX team at Canonical + +N: Shiraaz Gabru +W: http://www.daltonmaag.com/ +D: Ubuntu Font Family project management at Dalton Maag + +N: Marcus Haslam +W: http://design.canonical.com/author/marcus-haslam/ +D: Creative inspiration + +N: Ben Laenen +D: Inspiration behind the pixels-per-em (PPEM) readout debugging glyph at U+F000 + (for this font the concept was re-implemented from scratch by Dalton-Maag) + +N: Bruno Maag +W: http://www.daltonmaag.com/ +D: Stylistic direction of the Ubuntu Font Family, as head of Dalton Maag + +N: Ivanka Majic +W: http://www.ivankamajic.com/ +D: Guiding the UX team and Cyrillic feedback + +N: David Marshall +W: http://www.daltonmaag.com/ +D: Technical guidance and administration at Dalton Maag + +N: Malcolm Wooden +W: http://www.daltonmaag.com/ +D: Font Engineering at Dalton Maag + +N: Lukas Paltram +W: http://www.daltonmaag.com/ +D: Type design with Dalton Maag + +N: JÃºlio Reis +D: Date fixes to the documentation + +N: Rodrigo Rivas +D: Indian Rupee Sign glyph + +N: Mark Shuttleworth +E: mark(a)ubuntu.com +W: http://www.markshuttleworth.com/ +D: Executive quality-control and funding + +N: Paul Sladen +E: ubuntu(a)paul.sladen.org +W: http://www.paul.sladen.org/ +D: Bug triaging, packaging at Ubuntu and Canonical + +N: Nicolas Spalinger +W: http://planet.open-fonts.org +D: Continuous guidance on libre/open font licensing, best practises in source + tree layout, release and packaging (pkg-fonts Debian team) + +N: Kenneth Wimer +D: Initial PPA packaging + +* Canonical Ltd is the primary commercial sponsor of the Ubuntu and + Kubuntu operating systems +* Dalton Maag are a custom type foundry headed by Bruno Maag + +For further documentation, information on contributors, source code +downloads and those involved with the Ubuntu Font Family, visit: + + http://font.ubuntu.com/ Propchange: trunk/reactos/media/fonts/doc/Ubuntu/FONTLOG.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/media/fonts/doc/Ubuntu/LICENCE-FAQ.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/Ubuntu/LIC… ============================================================================== --- trunk/reactos/media/fonts/doc/Ubuntu/LICENCE-FAQ.txt (added) +++ trunk/reactos/media/fonts/doc/Ubuntu/LICENCE-FAQ.txt [iso-8859-1] Sun May 25 11:39:12 2014 @@ -0,0 +1,177 @@ + Ubuntu Font Family Licensing FAQ + + Stylistic Foundations + + The Ubuntu Font Family is the first time that a libre typeface has been + designed professionally and explicitly with the intent of developing a + public and long-term community-based development process. + + When developing an open project, it is generally necessary to have firm + foundations: a font needs to maintain harmony within itself even across + many type designers and writing systems. For the [1]Ubuntu Font Family, + the process has been guided with the type foundry Dalton Maag setting + the project up with firm stylistic foundation covering several + left-to-right scripts: Latin, Greek and Cyrillic; and right-to-left + scripts: Arabic and Hebrew (due in 2011). + + With this starting point the community will, under the supervision of + [2]Canonical and [3]Dalton Maag, be able to build on the existing font + sources to expand their character coverage. Ultimately everybody will + be able to use the Ubuntu Font Family in their own written languages + across the whole of Unicode (and this will take some time!). + + Licensing + + The licence chosen by any free software project is one of the + foundational decisions that sets out how derivatives and contributions + can occur, and in turn what kind of community will form around the + project. + + Using a licence that is compatible with other popular licences is a + powerful constraint because of the [4]network effects: the freedom to + share improvements between projects allows free software to reach + high-quality over time. Licence-proliferation leads to many + incompatible licences, undermining the network effect, the freedom to + share and ultimately making the libre movement that Ubuntu is a part of + less effective. For all kinds of software, writing a new licence is not + to be taken lightly and is a choice that needs to be thoroughly + justified if this path is taken. + + Today it is not clear to Canonical what the best licence for a font + project like the Ubuntu Font Family is: one that starts life designed + by professionals and continues with the full range of community + development, from highly commercial work in new directions to curious + beginners' experimental contributions. The fast and steady pace of the + Ubuntu release cycle means that an interim libre licence has been + necessary to enable the consideration of the font family as part of + Ubuntu 10.10 operating system release. + + Before taking any decision on licensing, Canonical as sponsor and + backer of the project has reviewed the many existing licenses used for + libre/open fonts and engaged the stewards of the most popular licenses + in detailed discussions. The current interim licence is the first step + in progressing the state-of-the-art in licensing for libre/open font + development. + + The public discussion must now involve everyone in the (comparatively + new) area of the libre/open font community; including font users, + software freedom advocates, open source supporters and existing libre + font developers. Most importantly, the minds and wishes of professional + type designers considering entering the free software business + community must be taken on board. + + Conversations and discussion has taken place, privately, with + individuals from the following groups (generally speaking personally on + behalf of themselves, rather than their affiliations): + * [5]SIL International + * [6]Open Font Library + * [7]Software Freedom Law Center + * [8]Google Font API + + Document embedding + + One issue highlighted early on in the survey of existing font licences + is that of document embedding. Almost all font licences, both free and + unfree, permit embedding a font into a document to a certain degree. + Embedding a font with other works that make up a document creates a + "combined work" and copyleft would normally require the whole document + to be distributed under the terms of the font licence. As beautiful as + the font might be, such a licence makes a font too restrictive for + useful general purpose digital publishing. + + The situation is not entirely unique to fonts and is encountered also + with tools such as GNU Bison: a vanilla GNU GPL licence would require + anything generated with Bison to be made available under the terms of + the GPL as well. To avoid this, Bison is [9]published with an + additional permission to the GPL which allows the output of Bison to be + made available under any licence. + + The conflict between licensing of fonts and licensing of documents, is + addressed in two popular libre font licences, the SIL OFL and GNU GPL: + * [10]SIL Open Font Licence: When OFL fonts are embedded in a + document, the OFL's terms do not apply to that document. (See + [11]OFL-FAQ for details. + * [12]GPL Font Exception: The situation is resolved by granting an + additional permission to allow documents to not be covered by the + GPL. (The exception is being reviewed). + + The Ubuntu Font Family must also resolve this conflict, ensuring that + if the font is embedded and then extracted it is once again clearly + under the terms of its libre licence. + + Long-term licensing + + Those individuals involved, especially from Ubuntu and Canonical, are + interested in finding a long-term libre licence that finds broad favour + across the whole libre/open font community. The deliberation during the + past months has been on how to licence the Ubuntu Font Family in the + short-term, while knowingly encouraging everyone to pursue a long-term + goal. + * [13]Copyright assignment will be required so that the Ubuntu Font + Family's licensing can be progressively expanded to one (or more) + licences, as best practice continues to evolve within the + libre/open font community. + * Canonical will support and fund legal work on libre font licensing. + It is recognised that the cost and time commitments required are + likely to be significant. We invite other capable parties to join + in supporting this activity. + + The GPL version 3 (GPLv3) will be used for Ubuntu Font Family build + scripts and the CC-BY-SA for associated documentation and non-font + content: all items which do not end up embedded in general works and + documents. + +Ubuntu Font Licence + + For the short-term only, the initial licence is the [14]Ubuntu Font + License (UFL). This is loosely inspired from the work on the SIL + OFL 1.1, and seeks to clarify the issues that arose during discussions + and legal review, from the perspective of the backers, Canonical Ltd. + Those already using established licensing models such as the GPL, OFL + or Creative Commons licensing should have no worries about continuing + to use them. The Ubuntu Font Licence (UFL) and the SIL Open Font + Licence (SIL OFL) are not identical and should not be confused with + each other. Please read the terms precisely. The UFL is only intended + as an interim license, and the overriding aim is to support the + creation of a more suitable and generic libre font licence. As soon as + such a licence is developed, the Ubuntu Font Family will migrate to + itâmade possible by copyright assignment in the interium. Between the + OFL 1.1, and the UFL 1.0, the following changes are made to produce the + Ubuntu Font Licence: + * Clarification: + + 1. Document embedding (see [15]embedding section above). + 2. Apply at point of distribution, instead of receipt + 3. Author vs. copyright holder disambiguation (type designers are + authors, with the copyright holder normally being the funder) + 4. Define "Propagate" (for internationalisation, similar to the GPLv3) + 5. Define "Substantially Changed" + 6. Trademarks are explicitly not transferred + 7. Refine renaming requirement + + Streamlining: + 8. Remove "not to be sold separately" clause + 9. Remove "Reserved Font Name(s)" declaration + + A visual demonstration of how these points were implemented can be + found in the accompanying coloured diff between SIL OFL 1.1 and the + Ubuntu Font Licence 1.0: [16]ofl-1.1-ufl-1.0.diff.html + +References + + 1. http://font.ubuntu.com/ + 2. http://www.canonical.com/ + 3. http://www.daltonmaag.com/ + 4. http://en.wikipedia.org/wiki/Network_effect + 5. http://scripts.sil.org/ + 6. http://openfontlibrary.org/ + 7. http://www.softwarefreedom.org/ + 8. http://code.google.com/webfonts + 9. http://www.gnu.org/licenses/gpl-faq.html#CanIUseGPLToolsForNF + 10. http://scripts.sil.org/OFL_web + 11. http://scripts.sil.org/OFL-FAQ_web + 12. http://www.gnu.org/licenses/gpl-faq.html#FontException + 13. https://launchpad.net/~uff-contributors + 14. http://font.ubuntu.com/ufl/ubuntu-font-licence-1.0.txt + 15. http://font.ubuntu.com/ufl/FAQ.html#embedding + 16. http://font.ubuntu.com/ufl/ofl-1.1-ufl-1.0.diff.html Propchange: trunk/reactos/media/fonts/doc/Ubuntu/LICENCE-FAQ.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/media/fonts/doc/Ubuntu/LICENCE.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/Ubuntu/LIC… ============================================================================== --- trunk/reactos/media/fonts/doc/Ubuntu/LICENCE.txt (added) +++ trunk/reactos/media/fonts/doc/Ubuntu/LICENCE.txt [iso-8859-1] Sun May 25 11:39:12 2014 @@ -0,0 +1,96 @@ +------------------------------- +UBUNTU FONT LICENCE Version 1.0 +------------------------------- + +PREAMBLE +This licence allows the licensed fonts to be used, studied, modified and +redistributed freely. The fonts, including any derivative works, can be +bundled, embedded, and redistributed provided the terms of this licence +are met. The fonts and derivatives, however, cannot be released under +any other licence. The requirement for fonts to remain under this +licence does not require any document created using the fonts or their +derivatives to be published under this licence, as long as the primary +purpose of the document is not to be a vehicle for the distribution of +the fonts. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this licence and clearly marked as such. This may +include source files, build scripts and documentation. + +"Original Version" refers to the collection of Font Software components +as received under this licence. + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to +a new environment. + +"Copyright Holder(s)" refers to all individuals and companies who have a +copyright ownership of the Font Software. + +"Substantially Changed" refers to Modified Versions which can be easily +identified as dissimilar to the Font Software by users of the Font +Software comparing the Original Version with the Modified Version. + +To "Propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification and with or without charging +a redistribution fee), making available to the public, and in some +countries other activities as well. + +PERMISSION & CONDITIONS +This licence does not grant any rights under trademark law and all such +rights are reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of the Font Software, to propagate the Font Software, subject to +the below conditions: + +1) Each copy of the Font Software must contain the above copyright +notice and this licence. These can be included either as stand-alone +text files, human-readable headers or in the appropriate machine- +readable metadata fields within text or binary files as long as those +fields can be easily viewed by the user. + +2) The font name complies with the following: +(a) The Original Version must retain its name, unmodified. +(b) Modified Versions which are Substantially Changed must be renamed to +avoid use of the name of the Original Version or similar names entirely. +(c) Modified Versions which are not Substantially Changed must be +renamed to both (i) retain the name of the Original Version and (ii) add +additional naming elements to distinguish the Modified Version from the +Original Version. The name of such Modified Versions must be the name of +the Original Version, with "derivative X" where X represents the name of +the new work, appended to that name. + +3) The name(s) of the Copyright Holder(s) and any contributor to the +Font Software shall not be used to promote, endorse or advertise any +Modified Version, except (i) as required by this licence, (ii) to +acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with +their explicit written permission. + +4) The Font Software, modified or unmodified, in part or in whole, must +be distributed entirely under this licence, and must not be distributed +under any other licence. The requirement for fonts to remain under this +licence does not affect any document created using the Font Software, +except any version of the Font Software extracted from a document +created using the Font Software may only be distributed under this +licence. + +TERMINATION +This licence becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF +COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER +DEALINGS IN THE FONT SOFTWARE. Propchange: trunk/reactos/media/fonts/doc/Ubuntu/LICENCE.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/media/fonts/doc/Ubuntu/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/Ubuntu/REA… ============================================================================== --- trunk/reactos/media/fonts/doc/Ubuntu/README.txt (added) +++ trunk/reactos/media/fonts/doc/Ubuntu/README.txt [iso-8859-1] Sun May 25 11:39:12 2014 @@ -0,0 +1,15 @@ + ---------------------- + Ubuntu Font Family + ====================== + +The Ubuntu Font Family are a set of matching new libre/open fonts in +development during 2010--2011. The development is being funded by +Canonical Ltd on behalf the wider Free Software community and the +Ubuntu project. The technical font design work and implementation is +being undertaken by Dalton Maag. + +Both the final font Truetype/OpenType files and the design files used +to produce the font family are distributed under an open licence and +you are expressly encouraged to experiment, modify, share and improve. + + http://font.ubuntu.com/ Propchange: trunk/reactos/media/fonts/doc/Ubuntu/README.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/media/fonts/doc/Ubuntu/TRADEMARKS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/Ubuntu/TRA… ============================================================================== --- trunk/reactos/media/fonts/doc/Ubuntu/TRADEMARKS.txt (added) +++ trunk/reactos/media/fonts/doc/Ubuntu/TRADEMARKS.txt [iso-8859-1] Sun May 25 11:39:12 2014 @@ -0,0 +1,4 @@ +Ubuntu and Canonical are registered trademarks of Canonical Ltd. + +The licence accompanying these works does not grant any rights +under trademark law and all such rights are reserved. Propchange: trunk/reactos/media/fonts/doc/Ubuntu/TRADEMARKS.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/media/fonts/doc/Ubuntu/copyright.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/Ubuntu/cop… ============================================================================== --- trunk/reactos/media/fonts/doc/Ubuntu/copyright.txt (added) +++ trunk/reactos/media/fonts/doc/Ubuntu/copyright.txt [iso-8859-1] Sun May 25 11:39:12 2014 @@ -0,0 +1,5 @@ +Copyright 2010,2011 Canonical Ltd. + +This Font Software is licensed under the Ubuntu Font Licence, Version +1.0. https://launchpad.net/ubuntu-font-licence + Propchange: trunk/reactos/media/fonts/doc/Ubuntu/copyright.txt ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 7 months

[akhaldi] 63438: [CRT] * Use lconv and define MSVCRT_lconv to it.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun May 25 10:47:48 2014 New Revision: 63438 URL: http://svn.reactos.org/svn/reactos?rev=63438&view=rev Log: [CRT] * Use lconv and define MSVCRT_lconv to it. Modified: trunk/reactos/lib/sdk/crt/include/internal/locale.h Modified: trunk/reactos/lib/sdk/crt/include/internal/locale.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/locale.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/locale.h [iso-8859-1] Sun May 25 10:47:48 2014 @@ -18,7 +18,7 @@ int *lconv_intl_refcount; int *lconv_num_refcount; int *lconv_mon_refcount; - struct MSVCRT_lconv *lconv; + struct lconv *lconv; int *ctype1_refcount; unsigned short *ctype1; const unsigned short *pctype; @@ -37,26 +37,7 @@ char mbcasemap[256]; } MSVCRT_threadmbcinfo; -struct MSVCRT_lconv { - char* decimal_point; - char* thousands_sep; - char* grouping; - char* int_curr_symbol; - char* currency_symbol; - char* mon_decimal_point; - char* mon_thousands_sep; - char* mon_grouping; - char* positive_sign; - char* negative_sign; - char int_frac_digits; - char frac_digits; - char p_cs_precedes; - char p_sep_by_space; - char n_cs_precedes; - char n_sep_by_space; - char p_sign_posn; - char n_sign_posn; -}; +#define MSVCRT_lconv lconv typedef struct MSVCRT_threadlocaleinfostruct *MSVCRT_pthreadlocinfo; typedef struct MSVCRT_threadmbcinfostruct *MSVCRT_pthreadmbcinfo;

10 years, 7 months

[tkreuzer] 63437: [RTL] Fix warnings and a bug in 64bit bitmap code

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 25 10:36:47 2014 New Revision: 63437 URL: http://svn.reactos.org/svn/reactos?rev=63437&view=rev Log: [RTL] Fix warnings and a bug in 64bit bitmap code Modified: trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=63437… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] Sun May 25 10:36:47 2014 @@ -30,6 +30,9 @@ #undef BitScanForward #define BitScanForward(Index, Mask) \ do { unsigned long tmp; BitScanForward64(&tmp, Mask); *Index = tmp; } while (0) +#undef BitScanReverse +#define BitScanReverse(Index, Mask) \ + do { unsigned long tmp; BitScanReverse64(&tmp, Mask); *Index = tmp; } while (0) #define RtlFillMemoryUlong RtlFillMemoryUlonglong #define RtlInitializeBitMap RtlInitializeBitMap64 @@ -734,7 +737,7 @@ return RtlFindNextForwardRunClear(BitMapHeader, 0, StartingIndex); } -ULONG +BITMAP_INDEX NTAPI RtlFindLastBackwardRunClear( _In_ PRTL_BITMAP BitMapHeader, @@ -771,7 +774,7 @@ BitScanReverse(&BitPos, InvValue); /* Calculate last bit position */ - FromIndex = (Buffer + 1 - BitMapHeader->Buffer) * _BITCOUNT + BitPos; + FromIndex = (BITMAP_INDEX)((Buffer + 1 - BitMapHeader->Buffer) * _BITCOUNT + BitPos); Value = ~InvValue << ((_BITCOUNT - 1) - BitPos) >> ((_BITCOUNT - 1) - BitPos); @@ -787,7 +790,7 @@ BitScanReverse(&BitPos, Value); /* Calculate Starting Index */ - *StartingRunIndex = (Buffer + 1 - BitMapHeader->Buffer) * _BITCOUNT + BitPos + 1; + *StartingRunIndex = (BITMAP_INDEX)((Buffer + 1 - BitMapHeader->Buffer) * _BITCOUNT + BitPos + 1); } else { @@ -796,7 +799,7 @@ } /* Return length of the run */ - return FromIndex - *StartingRunIndex; + return (FromIndex - *StartingRunIndex); }

10 years, 7 months

[tkreuzer] 63436: [NTOSKRNL] Add SEH to LpcpCreatePort and NtAcceptConnectPort. Based on patches by Aleksander Andrejevic ([TheFlash]) CORE-7156 #resolve CORE-7371 #comment SEH still missing in NtS...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 25 10:21:08 2014 New Revision: 63436 URL: http://svn.reactos.org/svn/reactos?rev=63436&view=rev Log: [NTOSKRNL] Add SEH to LpcpCreatePort and NtAcceptConnectPort. Based on patches by Aleksander Andrejevic ([TheFlash]) CORE-7156 #resolve CORE-7371 #comment SEH still missing in NtSecureConnectPort, NtReplyPort, NtReplyWaitReceivePortEx, NtRequestPort Modified: trunk/reactos/ntoskrnl/lpc/complete.c trunk/reactos/ntoskrnl/lpc/create.c Modified: trunk/reactos/ntoskrnl/lpc/complete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/complete.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/complete.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/complete.c [iso-8859-1] Sun May 25 10:21:08 2014 @@ -55,6 +55,8 @@ PEPROCESS ClientProcess; PETHREAD ClientThread; LARGE_INTEGER SectionOffset; + CLIENT_ID ClientId; + ULONG MessageId; PAGED_CODE(); LPCTRACE(LPC_COMPLETE_DEBUG, "Context: %p. Message: %p. Accept: %lx. Views: %p/%p\n", @@ -64,22 +66,81 @@ ClientView, ServerView); - /* Validate the size of the server view */ - if ((ServerView) && (ServerView->Length != sizeof(PORT_VIEW))) - { - /* Invalid size */ - return STATUS_INVALID_PARAMETER; - } - - /* Validate the size of the client view */ - if ((ClientView) && (ClientView->Length != sizeof(REMOTE_PORT_VIEW))) - { - /* Invalid size */ - return STATUS_INVALID_PARAMETER; + /* Check if the call comes from user mode */ + if (PreviousMode != KernelMode) + { + /* Enter SEH for probing the parameters */ + _SEH2_TRY + { + ProbeForWriteHandle(PortHandle); + + /* Probe the basic ReplyMessage structure */ + ProbeForRead(ReplyMessage, sizeof(PORT_MESSAGE), sizeof(ULONG)); + + /* Grab some values */ + ClientId = ReplyMessage->ClientId; + MessageId = ReplyMessage->MessageId; + ConnectionInfoLength = ReplyMessage->u1.s1.DataLength; + + /* Probe the connection info */ + ProbeForRead(ReplyMessage + 1, ConnectionInfoLength, 1); + + /* The following parameters are optional */ + if (ServerView != NULL) + { + ProbeForWrite(ServerView, sizeof(PORT_VIEW), sizeof(ULONG)); + + /* Validate the size of the server view */ + if (ServerView->Length != sizeof(PORT_VIEW)) + { + /* Invalid size */ + _SEH2_YIELD(return STATUS_INVALID_PARAMETER); + } + } + + if (ClientView != NULL) + { + ProbeForWrite(ClientView, sizeof(REMOTE_PORT_VIEW), sizeof(ULONG)); + + /* Validate the size of the client view */ + if (ClientView->Length != sizeof(REMOTE_PORT_VIEW)) + { + /* Invalid size */ + _SEH2_YIELD(return STATUS_INVALID_PARAMETER); + } + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* There was an exception, return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + /* Grab some values */ + ClientId = ReplyMessage->ClientId; + MessageId = ReplyMessage->MessageId; + ConnectionInfoLength = ReplyMessage->u1.s1.DataLength; + + /* Validate the size of the server view */ + if ((ServerView) && (ServerView->Length != sizeof(PORT_VIEW))) + { + /* Invalid size */ + return STATUS_INVALID_PARAMETER; + } + + /* Validate the size of the client view */ + if ((ClientView) && (ClientView->Length != sizeof(REMOTE_PORT_VIEW))) + { + /* Invalid size */ + return STATUS_INVALID_PARAMETER; + } } /* Get the client process and thread */ - Status = PsLookupProcessThreadByCid(&ReplyMessage->ClientId, + Status = PsLookupProcessThreadByCid(&ClientId, &ClientProcess, &ClientThread); if (!NT_SUCCESS(Status)) return Status; @@ -89,8 +150,8 @@ /* Make sure that the client wants a reply, and this is the right one */ if (!(LpcpGetMessageFromThread(ClientThread)) || - !(ReplyMessage->MessageId) || - (ClientThread->LpcReplyMessageId != ReplyMessage->MessageId)) + !(MessageId) || + (ClientThread->LpcReplyMessageId != MessageId)) { /* Not the reply asked for, or no reply wanted, fail */ KeReleaseGuardedMutex(&LpcpLock); @@ -125,8 +186,7 @@ ConnectMessage->ClientPort = NULL; KeReleaseGuardedMutex(&LpcpLock); - /* Get the connection information length */ - ConnectionInfoLength = ReplyMessage->u1.s1.DataLength; + /* Check the connection information length */ if (ConnectionInfoLength > ConnectionPort->MaxConnectionInfoLength) { /* Normalize it since it's too large */ @@ -142,16 +202,26 @@ /* Setup the reply message */ Message->Request.u2.s2.Type = LPC_REPLY; Message->Request.u2.s2.DataInfoOffset = 0; - Message->Request.ClientId = ReplyMessage->ClientId; - Message->Request.MessageId = ReplyMessage->MessageId; + Message->Request.ClientId = ClientId; + Message->Request.MessageId = MessageId; Message->Request.ClientViewSize = 0; - RtlCopyMemory(ConnectMessage + 1, ReplyMessage + 1, ConnectionInfoLength); + + _SEH2_TRY + { + RtlCopyMemory(ConnectMessage + 1, ReplyMessage + 1, ConnectionInfoLength); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(goto Cleanup); + } + _SEH2_END; /* At this point, if the caller refused the connection, go to cleanup */ if (!AcceptConnection) { DPRINT1("LPC connection was refused\n"); - goto Cleanup; + goto Cleanup; } /* Otherwise, create the actual port */ @@ -259,16 +329,30 @@ goto Cleanup; } - /* Check if the caller gave a client view */ - if (ClientView) - { - /* Fill it out */ - ClientView->ViewBase = ConnectMessage->ClientView.ViewRemoteBase; - ClientView->ViewSize = ConnectMessage->ClientView.ViewSize; - } - - /* Return the handle to user mode */ - *PortHandle = Handle; + /* Enter SEH to write back the results */ + _SEH2_TRY + { + /* Check if the caller gave a client view */ + if (ClientView) + { + /* Fill it out */ + ClientView->ViewBase = ConnectMessage->ClientView.ViewRemoteBase; + ClientView->ViewSize = ConnectMessage->ClientView.ViewSize; + } + + /* Return the handle to user mode */ + *PortHandle = Handle; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Cleanup and return the exception code */ + ObCloseHandle(Handle, UserMode); + ObDereferenceObject(ServerPort); + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(goto Cleanup); + } + _SEH2_END; + LPCTRACE(LPC_COMPLETE_DEBUG, "Handle: %p. Messages: %p/%p. Ports: %p/%p/%p\n", Handle, Modified: trunk/reactos/ntoskrnl/lpc/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/create.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/create.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/create.c [iso-8859-1] Sun May 25 10:21:08 2014 @@ -49,8 +49,43 @@ KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); NTSTATUS Status; PLPCP_PORT_OBJECT Port; + HANDLE Handle; + PUNICODE_STRING ObjectName; + BOOLEAN NoName; PAGED_CODE(); LPCTRACE(LPC_CREATE_DEBUG, "Name: %wZ\n", ObjectAttributes->ObjectName); + + /* Check if the call comes from user mode */ + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + /* Probe the PortHandle */ + ProbeForWriteHandle(PortHandle); + + /* Probe the ObjectAttributes */ + ProbeForRead(ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), sizeof(ULONG)); + + /* Get the object name and probe the unicode string */ + ObjectName = ObjectAttributes->ObjectName; + ProbeForRead(ObjectName, sizeof(UNICODE_STRING), 1); + + /* Check if we have no name */ + NoName = (ObjectName->Buffer == NULL) || (ObjectName->Length == 0); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + /* Check if we have no name */ + NoName = (ObjectAttributes->ObjectName->Buffer == NULL) || + (ObjectAttributes->ObjectName->Length == 0); + } /* Create the Object */ Status = ObCreateObject(PreviousMode, @@ -72,7 +107,7 @@ InitializeListHead(&Port->LpcReplyChainHead); /* Check if we don't have a name */ - if (!ObjectAttributes->ObjectName->Buffer) + if (NoName) { /* Set up for an unconnected port */ Port->Flags = LPCP_UNCONNECTED_PORT; @@ -140,10 +175,24 @@ PORT_ALL_ACCESS, 0, NULL, - PortHandle); + &Handle); + if (NT_SUCCESS(Status)) + { + _SEH2_TRY + { + /* Write back the handle, pointer was already probed */ + *PortHandle = Handle; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ObCloseHandle(Handle, UserMode); + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } /* Return success or the error */ - LPCTRACE(LPC_CREATE_DEBUG, "Port: %p. Handle: %p\n", Port, *PortHandle); + LPCTRACE(LPC_CREATE_DEBUG, "Port: %p. Handle: %p\n", Port, Handle); return Status; }

10 years, 7 months

[cwittich] 63435: [powerprof] fix some typos in comments

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun May 25 08:28:51 2014 New Revision: 63435 URL: http://svn.reactos.org/svn/reactos?rev=63435&view=rev Log: [powerprof] fix some typos in comments Modified: trunk/reactos/dll/win32/powrprof/powrprof.c Modified: trunk/reactos/dll/win32/powrprof/powrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] Sun May 25 08:28:51 2014 @@ -64,7 +64,7 @@ { BOOLEAN old; - //Lohnegrim: In order to get the right results, we have to ajust our Privilegs + //Lohnegrim: In order to get the right results, we have to adjust our Privileges RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &old); RtlAdjustPrivilege(SE_CREATE_PAGEFILE_PRIVILEGE, TRUE, FALSE, &old); @@ -332,7 +332,7 @@ return FALSE; */ /* - Lohnegrim: I dont know why this Function shoud call NtPowerInformation, becouse as far as i know, + Lohnegrim: I don't know why this Function should call NtPowerInformation, because as far as I know, it simply returns the GlobalPowerPolicy and the AktivPowerScheme! */ UINT uiID; @@ -793,8 +793,8 @@ CheckPowerActionPolicy(PPOWER_ACTION_POLICY pPAP, SYSTEM_POWER_CAPABILITIES PowerCaps) { /* - Lohnegrim: this is an Helperfunction, it checks if the POWERACTIONPOLICY is valid - Also, if the System dosn't support Hipernation, then change the PowerAction + Lohnegrim: this is an Helper function, it checks if the POWERACTIONPOLICY is valid + Also, if the System doesn't support Hibernation, then change the PowerAction */ switch (pPAP->Action) { @@ -829,7 +829,7 @@ static VOID FixSystemPowerState(PSYSTEM_POWER_STATE Psps, SYSTEM_POWER_CAPABILITIES PowerCaps) { - //Lohnegrim: If the System dosn't support the Powerstates, then we have to change them + //Lohnegrim: If the System doesn't support the Powerstates, then we have to change them if (!PowerCaps.SystemS1 && *Psps == PowerSystemSleeping1) *Psps = PowerSystemSleeping2; if (!PowerCaps.SystemS2 && *Psps == PowerSystemSleeping2) @@ -923,7 +923,7 @@ if (pGPP->mach.BroadcastCapacityResolution > 100) pGPP->mach.BroadcastCapacityResolution = 100; - //Lohnegrim: I have no idear, if they are realy needed, or if they are spezific for my System, or what they mean, so i removed them + //Lohnegrim: I have no idea, if they are really needed, or if they are specific for my System, or what they mean, so I removed them //pGPP->user.DischargePolicy[1].PowerPolicy.EventCode = pGPP->user.DischargePolicy[1].PowerPolicy.EventCode | 0x010000; //pGPP->user.DischargePolicy[2].PowerPolicy.EventCode = pGPP->user.DischargePolicy[2].PowerPolicy.EventCode | 0x020000; //pGPP->user.DischargePolicy[3].PowerPolicy.EventCode = pGPP->user.DischargePolicy[3].PowerPolicy.EventCode | 0x030000; @@ -1053,7 +1053,7 @@ pPP->user.MaxSleepAc=PowerSystemSleeping1; pPP->user.MaxSleepDc=PowerSystemSleeping1; } - //Lohnegrim: I dont know where to get this info from, so i removed it + //Lohnegrim: I don't know where to get this info from, so I removed it //pPP->user.OptimizeForPowerAc=TRUE; //pPP->user.OptimizeForPowerDc=TRUE;

10 years, 7 months

[dquintana] 63434: These files were on my "ignore-on-commit" list.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat May 24 20:58:13 2014 New Revision: 63434 URL: http://svn.reactos.org/svn/reactos?rev=63434&view=rev Log: These files were on my "ignore-on-commit" list. Modified: branches/shell-experiments/CMakeLists.txt branches/shell-experiments/ntoskrnl/ke/i386/cpu.c Modified: branches/shell-experiments/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/CMakeLists.tx… ============================================================================== --- branches/shell-experiments/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/CMakeLists.txt [iso-8859-1] Sat May 24 20:58:13 2014 @@ -62,6 +62,9 @@ if(MSVC) if(ARCH STREQUAL "i386") add_definitions(/D_X86_ /DWIN32 /D_WINDOWS) + endif() + if(MSVC_VERSION GREATER 1699) + add_definitions(/D_ALLOW_KEYWORD_MACROS) endif() add_definitions(/Dinline=__inline) else() Modified: branches/shell-experiments/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/ke/i… ============================================================================== --- branches/shell-experiments/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ branches/shell-experiments/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Sat May 24 20:58:13 2014 @@ -1432,7 +1432,8 @@ #else __asm { - fnsave [FpState] + mov eax, [FpState] + fnsave [eax] }; #endif @@ -1458,7 +1459,8 @@ __asm { fnclex - frstor [FpState] + mov eax, [FpState] + frstor [eax] }; #endif

10 years, 7 months

← Newer
1
...
6
7
8
9
10
11
12
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2014