Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[gschneider] 38184: - Fix return values for fputc and _flsbuf: return only one char - Fixes three msvcrt file winetests
by gschneider＠svn.reactos.org 19 Dec '08

19 Dec '08

Author: gschneider Date: Fri Dec 19 05:39:04 2008 New Revision: 38184 URL: http://svn.reactos.org/svn/reactos?rev=38184&view=rev Log: - Fix return values for fputc and _flsbuf: return only one char - Fixes three msvcrt file winetests Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Fri Dec 19 05:39:04 2008 @@ -2292,7 +2292,7 @@ return res ? res : c; } else - return c; + return c & 0xff; } else { return _flsbuf(c, file); } @@ -2321,7 +2321,7 @@ unsigned char cc=c; int len; len = _write(file->_file, &cc, 1); - if (len == 1) return c; + if (len == 1) return c & 0xff; file->_flag |= _IOERR; return EOF; }

1 0

[tkreuzer] 38183: Zero the last character in lfFaceName when converting a LOGFONT from A to W or vice versa. Fixes 1 gdi32_winetest font. DPRINT1 -> DPRINT
by tkreuzer＠svn.reactos.org 19 Dec '08

19 Dec '08

Author: tkreuzer Date: Thu Dec 18 18:12:43 2008 New Revision: 38183 URL: http://svn.reactos.org/svn/reactos?rev=38183&view=rev Log: Zero the last character in lfFaceName when converting a LOGFONT from A to W or vice versa. Fixes 1 gdi32_winetest font. DPRINT1 -> DPRINT Modified: trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/dll/win32/gdi32/objects/utils.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Thu Dec 18 18:12:43 2008 @@ -108,7 +108,7 @@ lenW = MultiByteToWideChar(cp, 0, str, count, NULL, 0); strW = HeapAlloc(GetProcessHeap(), 0, lenW*sizeof(WCHAR)); MultiByteToWideChar(cp, 0, str, count, strW, lenW); - DPRINT1("mapped %s -> %S\n", str, strW); + DPRINT("mapped %s -> %S\n", str, strW); if(plenW) *plenW = lenW; if(pCP) *pCP = cp; return strW; Modified: trunk/reactos/dll/win32/gdi32/objects/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/ut… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/utils.c [iso-8859-1] Thu Dec 18 18:12:43 2008 @@ -329,6 +329,7 @@ COPYN(lfQuality); COPYN(lfPitchAndFamily); COPYS(lfFaceName,LF_FACESIZE); + pW->lfFaceName[LF_FACESIZE - 1] = '\0'; #undef COPYN #undef COPYS @@ -355,6 +356,7 @@ COPYN(lfQuality); COPYN(lfPitchAndFamily); COPYS(lfFaceName,LF_FACESIZE); + pA->lfFaceName[LF_FACESIZE - 1] = '\0'; #undef COPYN #undef COPYS

1 0

[gschneider] 38182: - Remove static qualifier from g_mbcp_is_multibyte variable (locale.c) to allow external reference - Update _mbccpy, _mbsncpy and _mbsnbcpy, so that they handle leading bytes correctly - Fixes 6 of 7 failing msvcrt string winetests, the remaining failure is related to memcpy behavior
by gschneider＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: gschneider Date: Thu Dec 18 16:06:07 2008 New Revision: 38182 URL: http://svn.reactos.org/svn/reactos?rev=38182&view=rev Log: - Remove static qualifier from g_mbcp_is_multibyte variable (locale.c) to allow external reference - Update _mbccpy, _mbsncpy and _mbsnbcpy, so that they handle leading bytes correctly - Fixes 6 of 7 failing msvcrt string winetests, the remaining failure is related to memcpy behavior Modified: trunk/reactos/lib/sdk/crt/locale/locale.c trunk/reactos/lib/sdk/crt/mbstring/mbccpy.c trunk/reactos/lib/sdk/crt/mbstring/mbsncpy.c Modified: trunk/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/locale/locale.… ============================================================================== --- trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] Thu Dec 18 16:06:07 2008 @@ -28,7 +28,7 @@ #define MAX_ELEM_LEN 64 /* Max length of country/language/CP string */ unsigned char _mbctype[257] = { 0 }; -static int g_mbcp_is_multibyte = 0; +int g_mbcp_is_multibyte = 0; /* It seems that the data about valid trail bytes is not available from kernel32 * so we have to store is here. The format is the same as for lead bytes in CPINFO */ Modified: trunk/reactos/lib/sdk/crt/mbstring/mbccpy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbccp… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/mbccpy.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/mbccpy.c [iso-8859-1] Thu Dec 18 16:06:07 2008 @@ -1,15 +1,23 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/sdk/crt/mbstring/mbccpy.c + * PURPOSE: Copies a multi byte character + * PROGRAMERS: + * Copyright 1999 Alexandre Julliard + * Copyright 2000 Jon Griffths + * + */ + #include <mbstring.h> #include <string.h> - -size_t _mbclen2(const unsigned int s); /* * @implemented */ void _mbccpy(unsigned char *dst, const unsigned char *src) { - if (!_ismbblead(*src) ) - return; - - memcpy(dst,src,_mbclen2(*src)); + *dst = *src; + if(_ismbblead(*src)) + *++dst = *++src; /* MB char */ } Modified: trunk/reactos/lib/sdk/crt/mbstring/mbsncpy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbsnc… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/mbsncpy.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/mbsncpy.c [iso-8859-1] Thu Dec 18 16:06:07 2008 @@ -3,48 +3,55 @@ * PROJECT: ReactOS system libraries * FILE: lib/msvcrt/mbstring/mbsncpy.c * PURPOSE: Copies a string to a maximum of n bytes or characters - * PROGRAMER: Ariadne - * UPDATE HISTORY: - * 12/04/99: Created + * PROGRAMERS: + * Copyright 1999 Ariadne + * Copyright 1999 Alexandre Julliard + * Copyright 2000 Jon Griffths + * */ #include <mbstring.h> +extern int g_mbcp_is_multibyte; /* * @implemented */ -unsigned char* _mbsncpy(unsigned char *str1, const unsigned char *str2, size_t n) +unsigned char* _mbsncpy(unsigned char *dst, const unsigned char *src, size_t n) { - unsigned char *s1 = (unsigned char *)str1; - unsigned char *s2 = (unsigned char *)str2; + unsigned char* ret = dst; + if(!n) + return dst; + if (g_mbcp_is_multibyte) + { + while (*src && n) + { + n--; + if (_ismbblead(*src)) + { + if (!*(src+1)) + { + *dst++ = 0; + *dst++ = 0; + break; + } - unsigned short *short_s1, *short_s2; + *dst++ = *src++; + } - if (n == 0) - return 0; - do { - - if (*s2 == 0) - break; - - if ( !_ismbblead(*s2) ) { - - *s1 = *s2; - s1 += 1; - s2 += 1; - n--; - } - else { - short_s1 = (unsigned short *)s1; - short_s2 = (unsigned short *)s2; - *short_s1 = *short_s2; - s1 += 2; - s2 += 2; - n--; - } - } while (n > 0); - return str1; + *dst++ = *src++; + } + } + else + { + while (n) + { + n--; + if (!(*dst++ = *src++)) break; + } + } + while (n--) *dst++ = 0; + return ret; } @@ -55,37 +62,32 @@ * * @implemented */ -unsigned char * _mbsnbcpy(unsigned char *str1, const unsigned char *str2, size_t n) +unsigned char * _mbsnbcpy(unsigned char *dst, const unsigned char *src, size_t n) { - unsigned char *s1 = (unsigned char *)str1; - unsigned char *s2 = (unsigned char *)str2; + unsigned char* ret = dst; + if(!n) + return dst; + if(g_mbcp_is_multibyte) + { + int is_lead = 0; + while (*src && n) + { + is_lead = (!is_lead && _ismbblead(*src)); + n--; + *dst++ = *src++; + } - unsigned short *short_s1, *short_s2; - - if (n == 0) - return 0; - do { - - if (*s2 == 0) { - *s1 = *s2; - break; - } - - if ( !_ismbblead(*s2) ) { - - *s1 = *s2; - s1 += 1; - s2 += 1; - n--; - } - else { - short_s1 = (unsigned short *)s1; - short_s2 = (unsigned short *)s2; - *short_s1 = *short_s2; - s1 += 2; - s2 += 2; - n-=2; - } - } while (n > 0); - return str1; + if (is_lead) /* if string ends with a lead, remove it */ + *(dst - 1) = 0; + } + else + { + while (n) + { + n--; + if (!(*dst++ = *src++)) break; + } + } + while (n--) *dst++ = 0; + return ret; }

1 0

[gschneider] 38181: - Update _mbclen, mblen, _mbslen, _mbsnextc and _mbstrlen which should rely on the leadbyte mechanism - Fixes 9 msvcrt string tests, 7 failures tbd - Remove leftover function declaration from ismblead.c
by gschneider＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: gschneider Date: Thu Dec 18 15:17:22 2008 New Revision: 38181 URL: http://svn.reactos.org/svn/reactos?rev=38181&view=rev Log: - Update _mbclen, mblen, _mbslen, _mbsnextc and _mbstrlen which should rely on the leadbyte mechanism - Fixes 9 msvcrt string tests, 7 failures tbd - Remove leftover function declaration from ismblead.c Modified: trunk/reactos/lib/sdk/crt/mbstring/ismblead.c trunk/reactos/lib/sdk/crt/mbstring/mbclen.c trunk/reactos/lib/sdk/crt/mbstring/mbslen.c trunk/reactos/lib/sdk/crt/mbstring/mbsnextc.c trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c Modified: trunk/reactos/lib/sdk/crt/mbstring/ismblead.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/ismbl… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/ismblead.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/ismblead.c [iso-8859-1] Thu Dec 18 15:17:22 2008 @@ -13,8 +13,6 @@ #include <precomp.h> #include <mbctype.h> - -size_t _mbclen2(const unsigned int s); /* * @implemented Modified: trunk/reactos/lib/sdk/crt/mbstring/mbclen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbcle… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/mbclen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/mbclen.c [iso-8859-1] Thu Dec 18 15:17:22 2008 @@ -1,18 +1,30 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/sdk/crt/mbstring/mbclen.c + * PURPOSE: Determines the length of a multi byte character + * PROGRAMERS: + * Copyright 1999 Alexandre Julliard + * Copyright 2000 Jon Griffths + * + */ + #include <mbstring.h> #include <stdlib.h> +int isleadbyte(int byte); /* * @implemented */ size_t _mbclen(const unsigned char *s) { - return (_ismbblead(*s>>8) && _ismbbtrail(*s&0x00FF)) ? 2 : 1; + return _ismbblead(*s) ? 2 : 1; } size_t _mbclen2(const unsigned int s) { - return (_ismbblead(s>>8) && _ismbbtrail(s&0x00FF)) ? 2 : 1; + return (_ismbblead(s>>8) && _ismbbtrail(s&0x00FF)) ? 2 : 1; } /* @@ -20,14 +32,11 @@ * * @implemented */ -int mblen( const char *s, size_t count ) +int mblen( const char *str, size_t size ) { - size_t l; - if ( s == NULL ) - return 0; - - l = _mbclen((const unsigned char *)s); - if ( l < count ) - return -1; - return l; + if (str && *str && size) + { + return !isleadbyte(*str) ? 1 : (size>1 ? 2 : -1); + } + return 0; } Modified: trunk/reactos/lib/sdk/crt/mbstring/mbslen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbsle… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/mbslen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/mbslen.c [iso-8859-1] Thu Dec 18 15:17:22 2008 @@ -1,18 +1,32 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/sdk/crt/mbstring/mbslen.c + * PURPOSE: Determines the length of a multi byte string + * PROGRAMERS: + * Copyright 1999 Alexandre Julliard + * Copyright 2000 Jon Griffths + * + */ + #include <mbstring.h> - -size_t _mbclen2(const unsigned int s); /* * @implemented */ size_t _mbslen(const unsigned char *str) { - int i = 0; - unsigned char *s; - - if (str == 0) - return 0; - - for (s = (unsigned char *)str; *s; s+=_mbclen2(*s),i++); - return i; + size_t len = 0; + while(*str) + { + if (_ismbblead(*str)) + { + str++; + if (!*str) /* count only full chars */ + break; + } + str++; + len++; + } + return len; } Modified: trunk/reactos/lib/sdk/crt/mbstring/mbsnextc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbsne… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/mbsnextc.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/mbsnextc.c [iso-8859-1] Thu Dec 18 15:17:22 2008 @@ -1,20 +1,23 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/sdk/crt/mbstring/mbsnextc.c + * PURPOSE: Finds the next character in a string + * PROGRAMERS: +* Copyright 1999 Alexandre Julliard + * Copyright 2000 Jon Griffths + * + */ + #include <precomp.h> #include <mbstring.h> /* * @implemented */ -unsigned int _mbsnextc (const unsigned char *src) +unsigned int _mbsnextc (const unsigned char *str) { - unsigned char *char_src = (unsigned char *)src; - unsigned short *short_src = (unsigned short *)src; - - if (src == NULL) - return 0; - - if (!_ismbblead(*src)) - return *char_src; - else - return *short_src; - return 0; + if(_ismbblead(*str)) + return *str << 8 | str[1]; + return *str; } Modified: trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbstr… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c [iso-8859-1] Thu Dec 18 15:17:22 2008 @@ -1,19 +1,32 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/sdk/crt/mbstring/mbstrlen.c + * PURPOSE: Determines the length of a multi byte string, current locale + * PROGRAMERS: + * Copyright 1999 Alexandre Julliard + * Copyright 2000 Jon Griffths + * + */ + #include <mbstring.h> #include <stdlib.h> + +int isleadbyte(int byte); /* * @implemented */ -size_t _mbstrlen( const char *string ) +size_t _mbstrlen( const char *str ) { - char *s = (char *)string; - size_t i = 0; - - while ( *s != 0 ) { - if ( _ismbblead(*s) ) - s++; - s++; - i++; - } - return i; + size_t len = 0; + while(*str) + { + /* FIXME: According to the documentation we are supposed to test for + * multi-byte character validity. Whatever that means + */ + str += isleadbyte(*str) ? 2 : 1; + len++; + } + return len; }

1 0

[jimtabor] 38180: - From SDK, LD_ flags.
by jimtabor＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: jimtabor Date: Thu Dec 18 14:59:12 2008 New Revision: 38180 URL: http://svn.reactos.org/svn/reactos?rev=38180&view=rev Log: - From SDK, LD_ flags. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Thu Dec 18 14:59:12 2008 @@ -1072,6 +1072,7 @@ #define LR_LOADTRANSPARENT 32 #define LR_DEFAULTSIZE 64 #define LR_LOADREALSIZE 128 +#define LR_VGACOLOR 128 #define LR_LOADMAP3DCOLORS 4096 #define LR_CREATEDIBSECTION 8192 #define LR_COPYFROMRESOURCE 0x4000

1 0

[jmorlan] 38179: VfatSetAllocationSizeInformation: The fast code for extending the size of a non-empty file did have a bug in that it didn't always set Fcb->LastCluster/Fcb->LastOffset but the OffsetToCluster call was made assuming that it did. However, the code that replaced it had a bug as well, in that it did not set Cluster to the original final cluster like the error handling code expected, so it would crash when out of disk space. Bringing back the fast code, but with its bug fixed.
by jmorlan＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: jmorlan Date: Thu Dec 18 14:47:20 2008 New Revision: 38179 URL: http://svn.reactos.org/svn/reactos?rev=38179&view=rev Log: VfatSetAllocationSizeInformation: The fast code for extending the size of a non-empty file did have a bug in that it didn't always set Fcb->LastCluster/Fcb->LastOffset but the OffsetToCluster call was made assuming that it did. However, the code that replaced it had a bug as well, in that it did not set Cluster to the original final cluster like the error handling code expected, so it would crash when out of disk space. Bringing back the fast code, but with its bug fixed. Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Thu Dec 18 14:47:20 2008 @@ -639,7 +639,6 @@ } else { -#if 0 /* FIXME */ if (Fcb->LastCluster > 0) { if (Fcb->RFCB.AllocationSize.u.LowPart - ClusterSize == Fcb->LastOffset) @@ -665,23 +664,14 @@ return Status; } - if (Fcb->LastCluster == 0) - { - Fcb->LastCluster = Cluster; - Fcb->LastOffset = Fcb->RFCB.AllocationSize.u.LowPart - ClusterSize; - } + Fcb->LastCluster = Cluster; + Fcb->LastOffset = Fcb->RFCB.AllocationSize.u.LowPart - ClusterSize; /* FIXME: Check status */ /* Cluster points now to the last cluster within the chain */ Status = OffsetToCluster(DeviceExt, Cluster, ROUND_DOWN(NewSize - 1, ClusterSize) - Fcb->LastOffset, &NCluster, TRUE); -#else - Status = OffsetToCluster(DeviceExt, FirstCluster, - ROUND_DOWN(NewSize - 1, ClusterSize), - &Cluster, TRUE); - NCluster = Cluster; -#endif if (NCluster == 0xffffffff || !NT_SUCCESS(Status)) { /* disk is full */

1 0

[gschneider] 38178: - Update _mbsbtype and _mbsninc functions - Fixes 17 msvcrt string tests, 16 to go
by gschneider＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: gschneider Date: Thu Dec 18 14:26:57 2008 New Revision: 38178 URL: http://svn.reactos.org/svn/reactos?rev=38178&view=rev Log: - Update _mbsbtype and _mbsninc functions - Fixes 17 msvcrt string tests, 16 to go Modified: trunk/reactos/lib/sdk/crt/mbstring/mbbtype.c trunk/reactos/lib/sdk/crt/mbstring/mbsninc.c Modified: trunk/reactos/lib/sdk/crt/mbstring/mbbtype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbbty… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/mbbtype.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/mbbtype.c [iso-8859-1] Thu Dec 18 14:26:57 2008 @@ -1,11 +1,13 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/msvcrt/mbstring/mbbtype.c + * FILE: lib/sdk/crt/mbstring/mbbtype.c * PURPOSE: Determines the type of a multibyte character - * PROGRAMER: Ariadne - * UPDATE HISTORY: - * 12/04/99: Created + * PROGRAMERS: + * Copyright 1999 Ariadne + * Copyright 1999 Alexandre Julliard + * Copyright 2000 Jon Griffths + * */ #include <precomp.h> @@ -48,7 +50,28 @@ */ int _mbsbtype( const unsigned char *str, size_t n ) { - if ( str == NULL ) - return -1; - return _mbbtype(*(str+n),1); + int lead = 0; + const unsigned char *end = str + n; + + /* Lead bytes can also be trail bytes so we need to analyse the string. + * Also we must return _MBC_ILLEGAL for chars past the end of the string + */ + while (str < end) /* Note: we skip the last byte - will check after the loop */ + { + if (!*str) + return _MBC_ILLEGAL; + lead = !lead && _ismbblead(*str); + str++; + } + + if (lead) + if (_ismbbtrail(*str)) + return _MBC_TRAIL; + else + return _MBC_ILLEGAL; + else + if (_ismbblead(*str)) + return _MBC_LEAD; + else + return _MBC_SINGLE; } Modified: trunk/reactos/lib/sdk/crt/mbstring/mbsninc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbsni… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/mbsninc.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/mbsninc.c [iso-8859-1] Thu Dec 18 14:26:57 2008 @@ -1,3 +1,16 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/sdk/crt/mbstring/mbsninc.c + * PURPOSE: + * PROGRAMERS: + * Copyright 1999 Alexandre Julliard + * Copyright 2000 Jon Griffths + * + */ + +#include <precomp.h> + #include <mbstring.h> /* @@ -5,12 +18,20 @@ */ unsigned char * _mbsninc(const unsigned char *str, size_t n) { - unsigned char *s = (unsigned char *)str; - while(*s != 0 && n > 0) { - if (!_ismbblead(*s) ) - n--; - s++; - } + if(!str) + return NULL; - return s; + while (n > 0 && *str) + { + if (_ismbblead(*str)) + { + if (!*(str+1)) + break; + str++; + } + str++; + n--; + } + + return (unsigned char*)str; }

1 0

[gbrunmar] 38177: Implemented IDirect3DDevice9::GetRasterStatus()
by gbrunmar＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: gbrunmar Date: Thu Dec 18 13:48:17 2008 New Revision: 38177 URL: http://svn.reactos.org/svn/reactos?rev=38177&view=rev Log: Implemented IDirect3DDevice9::GetRasterStatus() Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Thu Dec 18 13:48:17 2008 @@ -486,31 +486,12 @@ return D3D_OK; } -HRESULT WINAPI IDirect3DDevice9Base_GetRasterStatus(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DRASTER_STATUS* pRasterStatus) -{ - UNIMPLEMENTED - - return D3D_OK; -} - -HRESULT WINAPI IDirect3DDevice9Base_SetDialogBoxMode(LPDIRECT3DDEVICE9 iface, BOOL bEnableDialogs) -{ - UNIMPLEMENTED - - return D3D_OK; -} - -VOID WINAPI IDirect3DDevice9Base_SetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp) -{ - UNIMPLEMENTED -} - -/*++ -* @name IDirect3DDevice9::GetGammaRamp -* @implemented -* -* The function IDirect3DDevice9Base_GetGammaRamp retrieves the gamma correction ramp values -* for the specified swap chain. +/*++ +* @name IDirect3DDevice9::GetRasterStatus +* @implemented +* +* The function IDirect3DDevice9Base_GetRasterStatus retrieves raster information +* of the monitor for the specified swap chain. * * @param LPDIRECT3D iface * Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice(). @@ -519,6 +500,64 @@ * Swap chain index to get object for. * The maximum value for this is the value returned by IDirect3DDevice9::GetNumberOfSwapChains() - 1. * +* @param D3DRASTER_STATUS* pRasterStatus +* Pointer to a D3DRASTER_STATUS to receive the raster information +* +*/ +HRESULT WINAPI IDirect3DDevice9Base_GetRasterStatus(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DRASTER_STATUS* pRasterStatus) +{ + HRESULT hResult; + IDirect3DSwapChain9* pSwapChain = NULL; + LPDIRECT3DDEVICE9_INT This = IDirect3DDevice9ToImpl(iface); + LOCK_D3DDEVICE9(); + + IDirect3DDevice9Base_GetSwapChain(iface, iSwapChain, &pSwapChain); + if (NULL == pSwapChain) + { + DPRINT1("Invalid iSwapChain parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + if (NULL == pRasterStatus) + { + DPRINT1("Invalid pRasterStatus parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + hResult = IDirect3DSwapChain9_GetRasterStatus(pSwapChain, pRasterStatus); + + UNLOCK_D3DDEVICE9(); + return hResult; +} + +HRESULT WINAPI IDirect3DDevice9Base_SetDialogBoxMode(LPDIRECT3DDEVICE9 iface, BOOL bEnableDialogs) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +VOID WINAPI IDirect3DDevice9Base_SetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp) +{ + UNIMPLEMENTED +} + +/*++ +* @name IDirect3DDevice9::GetGammaRamp +* @implemented +* +* The function IDirect3DDevice9Base_GetGammaRamp retrieves the gamma correction ramp values +* for the specified swap chain. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice(). +* +* @param UINT iSwapChain +* Swap chain index to get object for. +* The maximum value for this is the value returned by IDirect3DDevice9::GetNumberOfSwapChains() - 1. +* * @param D3DGAMMARAMP* pRamp * Pointer to a D3DGAMMARAMP to receive the gamma correction ramp values. *

1 0

[gschneider] 38176: - Close registry key handle of both RegQueryValueEx calls fail. I don't see anything else leaking.
by gschneider＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: gschneider Date: Thu Dec 18 13:38:01 2008 New Revision: 38176 URL: http://svn.reactos.org/svn/reactos?rev=38176&view=rev Log: - Close registry key handle of both RegQueryValueEx calls fail. I don't see anything else leaking. Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Thu Dec 18 13:38:01 2008 @@ -265,6 +265,8 @@ RegCloseKey(hKey); return TRUE; } + + RegCloseKey(hKey); } return FALSE;

1 0

[gbrunmar] 38175: Implemented IDirect3DDevice9::GetGammaRamp()
by gbrunmar＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: gbrunmar Date: Thu Dec 18 13:29:49 2008 New Revision: 38175 URL: http://svn.reactos.org/svn/reactos?rev=38175&view=rev Log: Implemented IDirect3DDevice9::GetGammaRamp() Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Thu Dec 18 13:29:49 2008 @@ -505,9 +505,50 @@ UNIMPLEMENTED } +/*++ +* @name IDirect3DDevice9::GetGammaRamp +* @implemented +* +* The function IDirect3DDevice9Base_GetGammaRamp retrieves the gamma correction ramp values +* for the specified swap chain. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice(). +* +* @param UINT iSwapChain +* Swap chain index to get object for. +* The maximum value for this is the value returned by IDirect3DDevice9::GetNumberOfSwapChains() - 1. +* +* @param D3DGAMMARAMP* pRamp +* Pointer to a D3DGAMMARAMP to receive the gamma correction ramp values. +* +*/ VOID WINAPI IDirect3DDevice9Base_GetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DGAMMARAMP* pRamp) { - UNIMPLEMENTED + IDirect3DSwapChain9* pSwapChain = NULL; + Direct3DSwapChain9_INT* pSwapChain_INT; + LPDIRECT3DDEVICE9_INT This = IDirect3DDevice9ToImpl(iface); + LOCK_D3DDEVICE9(); + + IDirect3DDevice9Base_GetSwapChain(iface, iSwapChain, &pSwapChain); + if (NULL == pSwapChain) + { + DPRINT1("Invalid iSwapChain parameter specified"); + UNLOCK_D3DDEVICE9(); + return; + } + + if (NULL == pRamp) + { + DPRINT1("Invalid pRamp parameter specified"); + UNLOCK_D3DDEVICE9(); + return; + } + + pSwapChain_INT = IDirect3DSwapChain9ToImpl(pSwapChain); + Direct3DSwapChain9_GetGammaRamp(pSwapChain_INT, pRamp); + + UNLOCK_D3DDEVICE9(); } /*++ Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] Thu Dec 18 13:29:49 2008 @@ -18,7 +18,7 @@ #define UNLOCK_D3DDEVICE9() D3D9BaseObject_UnlockDevice(&This->BaseObject) /* Convert a IDirect3DSwapChain9 pointer safely to the internal implementation struct */ -static LPDIRECT3DSWAPCHAIN9_INT IDirect3DSwapChain9ToImpl(LPDIRECT3DSWAPCHAIN9 iface) +LPDIRECT3DSWAPCHAIN9_INT IDirect3DSwapChain9ToImpl(LPDIRECT3DSWAPCHAIN9 iface) { if (NULL == iface) return NULL; @@ -244,3 +244,8 @@ // TODO: Do all the dirty work... return D3D_OK; } + +VOID Direct3DSwapChain9_GetGammaRamp(Direct3DSwapChain9_INT* pThisSwapChain, D3DGAMMARAMP* pRamp) +{ + memcpy(pRamp, &pThisSwapChain->GammaRamp, sizeof(D3DGAMMARAMP)); +} Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h [iso-8859-1] Thu Dec 18 13:29:49 2008 @@ -68,14 +68,15 @@ /* 0x01f4 */ D3DSWAPEFFECT SwapEffect; /* 0x01f8 */ DWORD dwUnknown01f8; /* 0x01fc */ DWORD dwUnknown01fc; -/* 0x0200 */ DDGAMMARAMP GammaRamp; +/* 0x0200 */ D3DGAMMARAMP GammaRamp; } Direct3DSwapChain9_INT, FAR* LPDIRECT3DSWAPCHAIN9_INT; - +LPDIRECT3DSWAPCHAIN9_INT IDirect3DSwapChain9ToImpl(LPDIRECT3DSWAPCHAIN9 iface); Direct3DSwapChain9_INT* CreateDirect3DSwapChain9(enum REF_TYPE RefType, struct _Direct3DDevice9_INT* pBaseDevice, DWORD ChainIndex); VOID Direct3DSwapChain9_SetDisplayMode(Direct3DSwapChain9_INT* pThisSwapChain, D3DPRESENT_PARAMETERS* pPresentationParameters); HRESULT Direct3DSwapChain9_Init(Direct3DSwapChain9_INT* pThisSwapChain, D3DPRESENT_PARAMETERS* pPresentationParameters); HRESULT Direct3DSwapChain9_Reset(Direct3DSwapChain9_INT* pThisSwapChain, D3DPRESENT_PARAMETERS* pPresentationParameters); +VOID Direct3DSwapChain9_GetGammaRamp(Direct3DSwapChain9_INT* pThisSwapChain, D3DGAMMARAMP* pRamp); #endif // _D3D9_SWAPCHAIN_H_

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008