Ros-diffs May 2006

ros-diffs@reactos.org

19 participants
377 discussions

[hpoussin] 22086: Search driver files in the same directory as the .inf file

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun May 28 16:35:20 2006 New Revision: 22086 URL: http://svn.reactos.ru/svn/reactos?rev=22086&view=rev Log: Search driver files in the same directory as the .inf file Modified: trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/install.c trunk/reactos/dll/win32/setupapi/setupapi_private.h Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Sun May 28 16:35:20 2006 @@ -3287,7 +3287,7 @@ SectionName, SPINST_REGISTRY | SPINST_FILES | SPINST_BITREG | SPINST_INIFILES | SPINST_INI2REG, hRootKey, - NULL, /* SourceRootPath */ + NULL, /* FIXME: SourceRootPath */ !(Flags & DI_NOVCP) && (Flags & DI_FORCECOPY) ? SP_COPY_FORCE_IN_USE : 0, /* CopyFlags */ SetupDefaultQueueCallbackW, callback_context, @@ -5639,6 +5639,49 @@ return Result; } +static struct InfFileDetails * +CreateInfFileDetails( + IN LPCWSTR InfFileName) +{ + struct InfFileDetails *details; + PWCHAR last; + DWORD Needed; + + last = strrchrW(InfFileName, '\\'); + Needed = FIELD_OFFSET(struct InfFileDetails, szData) + + strlenW(InfFileName) * sizeof(WCHAR) + sizeof(UNICODE_NULL); + if (last != NULL) + Needed += (last - InfFileName) * sizeof(WCHAR) + sizeof(UNICODE_NULL); + + details = HeapAlloc(GetProcessHeap(), 0, Needed); + if (!details) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + memset(details, 0, Needed); + if (last) + { + details->DirectoryName = details->szData; + details->FullInfFileName = &details->szData[last - InfFileName + 1]; + strncpyW(details->DirectoryName, InfFileName, last - InfFileName); + } + else + details->FullInfFileName = details->szData; + strcpyW(details->FullInfFileName, InfFileName); + ReferenceInfFile(details); + details->hInf = SetupOpenInfFileW(InfFileName, NULL, INF_STYLE_WIN4, NULL); + if (details->hInf == INVALID_HANDLE_VALUE) + { + HeapFree(GetProcessHeap(), 0, details); + return NULL; + } + DPRINT1("FullInfFileName %S\n", details->FullInfFileName); + DPRINT1("DirectoryName %S\n", details->DirectoryName); + return details; +} + /*********************************************************************** * SetupDiBuildDriverInfoList (SETUPAPI.@) */ @@ -5803,23 +5846,9 @@ strcpyW(pFullFilename, filename); TRACE("Opening file %s\n", debugstr_w(FullInfFileName)); - currentInfFileDetails = HeapAlloc( - GetProcessHeap(), - 0, - FIELD_OFFSET(struct InfFileDetails, FullInfFileName) + strlenW(FullInfFileName) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + currentInfFileDetails = CreateInfFileDetails(FullInfFileName); if (!currentInfFileDetails) continue; - memset(currentInfFileDetails, 0, sizeof(struct InfFileDetails)); - strcpyW(currentInfFileDetails->FullInfFileName, FullInfFileName); - - currentInfFileDetails->hInf = SetupOpenInfFileW(FullInfFileName, NULL, INF_STYLE_WIN4, NULL); - ReferenceInfFile(currentInfFileDetails); - if (currentInfFileDetails->hInf == INVALID_HANDLE_VALUE) - { - HeapFree(GetProcessHeap(), 0, currentInfFileDetails); - currentInfFileDetails = NULL; - continue; - } if (!GetVersionInformationFromInfFile( currentInfFileDetails->hInf, @@ -5828,8 +5857,7 @@ &DriverDate, &DriverVersion)) { - SetupCloseInfFile(currentInfFileDetails->hInf); - HeapFree(GetProcessHeap(), 0, currentInfFileDetails->hInf); + DereferenceInfFile(currentInfFileDetails); currentInfFileDetails = NULL; continue; } @@ -7378,7 +7406,7 @@ } ret = SetupInstallFromInfSectionW(InstallParams.hwndParent, SelectedDriver->InfFileDetails->hInf, SectionName, - SPINST_FILES, NULL, NULL, SP_COPY_NEWER, + SPINST_FILES, NULL, SelectedDriver->InfFileDetails->DirectoryName, SP_COPY_NEWER, InstallMsgHandler, InstallMsgHandlerContext, DeviceInfoSet, DeviceInfoData); if (!ret) @@ -7388,7 +7416,7 @@ lstrcatW(SectionName, DotCoInstallers); ret = SetupInstallFromInfSectionW(InstallParams.hwndParent, SelectedDriver->InfFileDetails->hInf, SectionName, - SPINST_FILES, NULL, NULL, SP_COPY_NEWER, + SPINST_FILES, NULL, SelectedDriver->InfFileDetails->DirectoryName, SP_COPY_NEWER, InstallMsgHandler, InstallMsgHandlerContext, DeviceInfoSet, DeviceInfoData); if (!ret) @@ -7485,7 +7513,7 @@ } Result = SetupInstallFromInfSectionW(InstallParams.hwndParent, SelectedDriver->InfFileDetails->hInf, SectionName, - DoAction, hKey, NULL, SP_COPY_NEWER, + DoAction, hKey, SelectedDriver->InfFileDetails->DirectoryName, SP_COPY_NEWER, SetupDefaultQueueCallback, Context, DeviceInfoSet, DeviceInfoData); if (!Result) @@ -7792,7 +7820,7 @@ pSectionName = &SectionName[strlenW(SectionName)]; /* Get information from [Version] section */ - if (!SetupDiGetINFClassW(SelectedDriver->Details.InfFileName, &ClassGuid, ClassName, MAX_CLASS_NAME_LEN, &RequiredSize)) + if (!SetupDiGetINFClassW(SelectedDriver->InfFileDetails->FullInfFileName, &ClassGuid, ClassName, MAX_CLASS_NAME_LEN, &RequiredSize)) goto cleanup; /* Format ClassGuid to a string */ if (UuidToStringW((UUID*)&ClassGuid, &lpGuidString) != RPC_S_OK) @@ -7834,7 +7862,7 @@ *pSectionName = '\0'; Result = SetupInstallFromInfSectionW(InstallParams.hwndParent, SelectedDriver->InfFileDetails->hInf, SectionName, - DoAction, hKey, NULL, SP_COPY_NEWER, + DoAction, hKey, SelectedDriver->InfFileDetails->DirectoryName, SP_COPY_NEWER, SetupDefaultQueueCallback, Context, DeviceInfoSet, DeviceInfoData); if (!Result) Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/install.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c (original) +++ trunk/reactos/dll/win32/setupapi/install.c Sun May 28 16:35:20 2006 @@ -121,7 +121,7 @@ struct files_callback_info *info = arg; if (field[0] == '@') /* special case: copy single file */ - SetupQueueDefaultCopyW( info->queue, info->layout, info->src_root, NULL, field, info->copy_flags ); + SetupQueueDefaultCopyW( info->queue, info->layout, info->src_root, NULL, &field[1], info->copy_flags ); else SetupQueueCopySectionW( info->queue, info->src_root, info->layout, hinf, field, info->copy_flags ); return TRUE; Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/setupapi… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h Sun May 28 16:35:20 2006 @@ -72,8 +72,16 @@ HINF hInf; LONG References; - /* May contain no directory if the file is already in %SYSTEMROOT%\Inf */ - WCHAR FullInfFileName[ANYSIZE_ARRAY]; + /* Contains the directory name of the .inf file. This field may + * be NULL if the file is already in %SYSTEMROOT%\Inf. + * Points into szData at then end of the structure */ + PCWSTR DirectoryName; + /* Contains the full file name of the .inf file. However, the directory + * part may be missing if the file is already in %SYSTEMROOT%\Inf. + * Points into szData at then end of the structure */ + PCWSTR FullInfFileName; + + WCHAR szData[ANYSIZE_ARRAY]; }; struct DriverInfoElement /* Element of DeviceInfoSet.DriverListHead and DeviceInfoElement.DriverListHead */

18 years, 7 months

[greatlrd] 22085: copy number to numberf so people can bugfix it/rewrite it

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 28 09:59:33 2006 New Revision: 22085 URL: http://svn.reactos.ru/svn/reactos?rev=22085&view=rev Log: copy number to numberf so people can bugfix it/rewrite it Modified: trunk/reactos/lib/rtl/sprintf.c trunk/reactos/lib/rtl/swprintf.c Modified: trunk/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/sprintf.c?rev=22085… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c (original) +++ trunk/reactos/lib/rtl/sprintf.c Sun May 28 09:59:33 2006 @@ -126,6 +126,109 @@ tmp[i++] = '0'; else while (num != 0) tmp[i++] = digits[do_div(&num,base)]; + if (i > precision) + precision = i; + size -= precision; + if (!(type&(ZEROPAD+LEFT))) { + while(size-->0) { + if (buf <= end) + *buf = ' '; + ++buf; + } + } + if (sign) { + if (buf <= end) + *buf = sign; + ++buf; + } + if (type & SPECIAL) { + if (base==8) { + if (buf <= end) + *buf = '0'; + ++buf; + } else if (base==16) { + if (buf <= end) + *buf = '0'; + ++buf; + if (buf <= end) + *buf = digits[33]; + ++buf; + } + } + if (!(type & LEFT)) { + while (size-- > 0) { + if (buf <= end) + *buf = c; + ++buf; + } + } + while (i < precision--) { + if (buf <= end) + *buf = '0'; + ++buf; + } + while (i-- > 0) { + if (buf <= end) + *buf = tmp[i]; + ++buf; + } + while (size-- > 0) { + if (buf <= end) + *buf = ' '; + ++buf; + } + return buf; +} + +static char * +numberf(char * buf, char * end, double num, int base, int size, int precision, int type) +{ + char c,sign,tmp[66]; + const char *digits; + const char *small_digits = "0123456789abcdefghijklmnopqrstuvwxyz"; + const char *large_digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + int i; + long long x; + + /* FIXME + the float version of number is direcly copy of number + */ + + digits = (type & LARGE) ? large_digits : small_digits; + if (type & LEFT) + type &= ~ZEROPAD; + if (base < 2 || base > 36) + return 0; + c = (type & ZEROPAD) ? '0' : ' '; + sign = 0; + if (type & SIGN) { + if (num < 0) { + sign = '-'; + num = -num; + size--; + } else if (type & PLUS) { + sign = '+'; + size--; + } else if (type & SPACE) { + sign = ' '; + size--; + } + } + if (type & SPECIAL) { + if (base == 16) + size -= 2; + else if (base == 8) + size--; + } + i = 0; + if (num == 0) + tmp[i++] = '0'; + else while (num != 0) + { + x = num; + tmp[i++] = digits[do_div(&x,base)]; + num=x; + } if (i > precision) precision = i; size -= precision; @@ -516,9 +619,8 @@ } } else { if ( precision == -1 ) - precision = 6; - /* FIXME the float version of number */ - str = number(str, end, (int)_double, base, field_width, precision, flags); + precision = 6; + str = numberf(str, end, (int)_double, base, field_width, precision, flags); } continue; Modified: trunk/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/swprintf.c?rev=2208… ============================================================================== --- trunk/reactos/lib/rtl/swprintf.c (original) +++ trunk/reactos/lib/rtl/swprintf.c Sun May 28 09:59:33 2006 @@ -126,6 +126,110 @@ tmp[i++] = L'0'; else while (num != 0) tmp[i++] = digits[do_div(&num,base)]; + if (i > precision) + precision = i; + size -= precision; + if (!(type&(ZEROPAD+LEFT))) { + while(size-->0) { + if (buf <= end) + *buf = L' '; + ++buf; + } + } + if (sign) { + if (buf <= end) + *buf = sign; + ++buf; + } + if (type & SPECIAL) { + if (base==8) { + if (buf <= end) + *buf = L'0'; + ++buf; + } else if (base==16) { + if (buf <= end) + *buf = L'0'; + ++buf; + if (buf <= end) + *buf = digits[33]; + ++buf; + } + } + if (!(type & LEFT)) { + while (size-- > 0) { + if (buf <= end) + *buf = c; + ++buf; + } + } + while (i < precision--) { + if (buf <= end) + *buf = L'0'; + ++buf; + } + while (i-- > 0) { + if (buf <= end) + *buf = tmp[i]; + ++buf; + } + while (size-- > 0) { + if (buf <= end) + *buf = L' '; + ++buf; + } + return buf; +} + +static wchar_t * +numberf(wchar_t * buf, wchar_t * end, double num, int base, int size, int precision, int type) +{ + wchar_t c, sign, tmp[66]; + const wchar_t *digits; + const wchar_t *small_digits = L"0123456789abcdefghijklmnopqrstuvwxyz"; + const wchar_t *large_digits = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + int i; + long long x; + + /* FIXME + the float version of number is direcly copy of number + */ + + + digits = (type & LARGE) ? large_digits : small_digits; + if (type & LEFT) + type &= ~ZEROPAD; + if (base < 2 || base > 36) + return 0; + c = (type & ZEROPAD) ? L'0' : L' '; + sign = 0; + if (type & SIGN) { + if (num < 0) { + sign = L'-'; + num = -num; + size--; + } else if (type & PLUS) { + sign = L'+'; + size--; + } else if (type & SPACE) { + sign = ' '; + size--; + } + } + if (type & SPECIAL) { + if (base == 16) + size -= 2; + else if (base == 8) + size--; + } + i = 0; + if (num == 0) + tmp[i++] = L'0'; + else while (num != 0) + { + x = num; + tmp[i++] = digits[do_div(&x,base)]; + num = x; + } if (i > precision) precision = i; size -= precision; @@ -514,9 +618,8 @@ } } else { if ( precision == -1 ) - precision = 6; - /* FIXME the float version of number */ - str = number(str, end, (int)_double, base, field_width, precision, flags); + precision = 6; + str = numberf(str, end, _double, base, field_width, precision, flags); } continue;

18 years, 7 months

[greatlrd] 22084: almost last commit for full support of %e %E %f %g %G, left todo is write the numberf function

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 28 09:17:19 2006 New Revision: 22084 URL: http://svn.reactos.ru/svn/reactos?rev=22084&view=rev Log: almost last commit for full support of %e %E %f %g %G, left todo is write the numberf function Modified: trunk/reactos/lib/rtl/sprintf.c trunk/reactos/lib/rtl/swprintf.c Modified: trunk/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/sprintf.c?rev=22084… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c (original) +++ trunk/reactos/lib/rtl/sprintf.c Sun May 28 09:17:19 2006 @@ -26,6 +26,42 @@ #define LEFT 16 /* left justified */ #define SPECIAL 32 /* 0x */ #define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ + +typedef struct { + unsigned int mantissal:32; + unsigned int mantissah:20; + unsigned int exponent:11; + unsigned int sign:1; +} double_t; + +static +__inline +int +_isinf(double __x) +{ + union + { + double* __x; + double_t* x; + } x; + + x.__x = &__x; + return ( x.x->exponent == 0x7ff && ( x.x->mantissah == 0 && x.x->mantissal == 0 )); +} + +static +__inline +int +_isnan(double __x) +{ + union + { + double* __x; + double_t* x; + } x; + x.__x = &__x; + return ( x.x->exponent == 0x7ff && ( x.x->mantissah != 0 || x.x->mantissal != 0 )); +} static @@ -450,9 +486,42 @@ case 'f': case 'g': case 'G': - _double = (double)va_arg(args, double); - str = number(str, end, (int)_double, base, field_width, precision, flags); - continue; + _double = (double)va_arg(args, double); + if ( _isnan(_double) ) { + s = "Nan"; + len = 3; + while ( len > 0 ) { + if (str <= end) + *str = *s++; + ++str; + len --; + } + } else if ( _isinf(_double) < 0 ) { + s = "-Inf"; + len = 4; + while ( len > 0 ) { + if (str <= end) + *str = *s++; + ++str; + len --; + } + } else if ( _isinf(_double) > 0 ) { + s = "+Inf"; + len = 4; + while ( len > 0 ) { + if (str <= end) + *str = *s++; + ++str; + len --; + } + } else { + if ( precision == -1 ) + precision = 6; + /* FIXME the float version of number */ + str = number(str, end, (int)_double, base, field_width, precision, flags); + } + + continue; /* integer number formats - set up the flags and "break" */ Modified: trunk/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/swprintf.c?rev=2208… ============================================================================== --- trunk/reactos/lib/rtl/swprintf.c (original) +++ trunk/reactos/lib/rtl/swprintf.c Sun May 28 09:17:19 2006 @@ -26,6 +26,42 @@ #define LEFT 16 /* left justified */ #define SPECIAL 32 /* 0x */ #define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ + +typedef struct { + unsigned int mantissal:32; + unsigned int mantissah:20; + unsigned int exponent:11; + unsigned int sign:1; +} double_t; + +static +__inline +int +_isinf(double __x) +{ + union + { + double* __x; + double_t* x; + } x; + + x.__x = &__x; + return ( x.x->exponent == 0x7ff && ( x.x->mantissah == 0 && x.x->mantissal == 0 )); +} + +static +__inline +int +_isnan(double __x) +{ + union + { + double* __x; + double_t* x; + } x; + x.__x = &__x; + return ( x.x->exponent == 0x7ff && ( x.x->mantissah != 0 || x.x->mantissal != 0 )); +} static @@ -245,6 +281,7 @@ wchar_t * str, * end; const char *s; const wchar_t *sw; + const wchar_t *ss; double _double; int flags; /* flags to number() */ @@ -446,9 +483,44 @@ case 'f': case 'g': case 'G': - _double = (double)va_arg(args, double); - str = number(str, end, (int)_double, base, field_width, precision, flags); - continue; + _double = (double)va_arg(args, double); + + if ( _isnan(_double) ) { + ss = L"Nan"; + len = 3; + while ( len > 0 ) { + if (str <= end) + *str = *ss++; + ++str; + len --; + } + } else if ( _isinf(_double) < 0 ) { + ss = L"-Inf"; + len = 4; + while ( len > 0 ) { + if (str <= end) + *str = *ss++; + ++str; + len --; + } + } else if ( _isinf(_double) > 0 ) { + ss = L"+Inf"; + len = 4; + while ( len > 0 ) { + if (str <= end) + *str = *ss++; + ++str; + len --; + } + } else { + if ( precision == -1 ) + precision = 6; + /* FIXME the float version of number */ + str = number(str, end, (int)_double, base, field_width, precision, flags); + } + + continue; + /* integer number formats - set up the flags and "break" */

18 years, 7 months

[greatlrd] 22083: starteted implement float into sprintf, snprintf and alot other printf api. this is more like a start how to implement it. This commit is more market for me. so I do not forget where string functions of *printf api (the main api functions) are. One more thing if u change on sprintf.c same change must be done in swprintf.c or changes into swprintf.c same changes must be done in swprintf.c, other wise the efect of bugfix or change will not be excutected in reactos, for u do not k

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 28 08:58:27 2006 New Revision: 22083 URL: http://svn.reactos.ru/svn/reactos?rev=22083&view=rev Log: starteted implement float into sprintf, snprintf and alot other printf api. this is more like a start how to implement it. This commit is more market for me. so I do not forget where string functions of *printf api (the main api functions) are. One more thing if u change on sprintf.c same change must be done in swprintf.c or changes into swprintf.c same changes must be done in swprintf.c, other wise the efect of bugfix or change will not be excutected in reactos, for u do not know if program pic the ansi or unicode version. Modified: trunk/reactos/lib/rtl/sprintf.c trunk/reactos/lib/rtl/swprintf.c Modified: trunk/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/sprintf.c?rev=22083… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c (original) +++ trunk/reactos/lib/rtl/sprintf.c Sun May 28 08:58:27 2006 @@ -241,6 +241,8 @@ { int len; unsigned long long num; + double _double; + int base; char *str, *end; const char *s; @@ -258,7 +260,7 @@ str = buf; end = buf + cnt - 1; if (end < buf - 1) { - end = ((void *) -1); + end = ((char *) -1); cnt = end - buf + 1; } @@ -441,6 +443,17 @@ *ip = (str - buf); } continue; + + /* float number formats - set up the flags and "break" */ + case 'e': + case 'E': + case 'f': + case 'g': + case 'G': + _double = (double)va_arg(args, double); + str = number(str, end, (int)_double, base, field_width, precision, flags); + continue; + /* integer number formats - set up the flags and "break" */ case 'o': Modified: trunk/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/swprintf.c?rev=2208… ============================================================================== --- trunk/reactos/lib/rtl/swprintf.c (original) +++ trunk/reactos/lib/rtl/swprintf.c Sun May 28 08:58:27 2006 @@ -245,6 +245,7 @@ wchar_t * str, * end; const char *s; const wchar_t *sw; + double _double; int flags; /* flags to number() */ @@ -256,7 +257,7 @@ str = buf; end = buf + cnt - 1; if (end < buf - 1) { - end = ((void *) -1); + end = ((wchar_t *) -1); cnt = end - buf + 1; } @@ -439,6 +440,16 @@ *ip = (str - buf); } continue; + /* float number formats - set up the flags and "break" */ + case 'e': + case 'E': + case 'f': + case 'g': + case 'G': + _double = (double)va_arg(args, double); + str = number(str, end, (int)_double, base, field_width, precision, flags); + continue; + /* integer number formats - set up the flags and "break" */ case L'o':

18 years, 7 months

[greatlrd] 22082: making one more wine msvcrt printf test pass now it is 62 fails instead of 63 fails

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 28 05:32:32 2006 New Revision: 22082 URL: http://svn.reactos.ru/svn/reactos?rev=22082&view=rev Log: making one more wine msvcrt printf test pass now it is 62 fails instead of 63 fails Modified: trunk/reactos/lib/rtl/sprintf.c trunk/reactos/lib/rtl/swprintf.c Modified: trunk/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/sprintf.c?rev=22082… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c (original) +++ trunk/reactos/lib/rtl/sprintf.c Sun May 28 05:32:32 2006 @@ -506,7 +506,7 @@ { /* don't write out a null byte if the buf size is zero */ //*end = '\0'; - if (str-buf >=cnt ) + if (str-buf >cnt ) { *end = '\0'; } Modified: trunk/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/swprintf.c?rev=2208… ============================================================================== --- trunk/reactos/lib/rtl/swprintf.c (original) +++ trunk/reactos/lib/rtl/swprintf.c Sun May 28 05:32:32 2006 @@ -504,7 +504,7 @@ { /* don't write out a null byte if the buf size is zero */ //*end = '\0'; - if (str-buf >=cnt ) + if (str-buf >cnt ) { *end = L'\0'; }

18 years, 7 months

[greatlrd] 22081: fixing two hiden bug in reactos, null termante the string right at end, code tested in vs, but it seam no affact on wine test mscvrt printf test. What hell is the snprintf function call to ??

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 28 04:51:16 2006 New Revision: 22081 URL: http://svn.reactos.ru/svn/reactos?rev=22081&view=rev Log: fixing two hiden bug in reactos, null termante the string right at end, code tested in vs, but it seam no affact on wine test mscvrt printf test. What hell is the snprintf function call to ?? Modified: trunk/reactos/lib/rtl/sprintf.c trunk/reactos/lib/rtl/swprintf.c Modified: trunk/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/sprintf.c?rev=22081… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c (original) +++ trunk/reactos/lib/rtl/sprintf.c Sun May 28 04:51:16 2006 @@ -253,6 +253,8 @@ number of chars for from string */ int qualifier; /* 'h', 'l', 'L', 'I' or 'w' for integer fields */ + /* clear the string buffer with zero so we do not need NULL terment it at end */ + str = buf; end = buf + cnt - 1; if (end < buf - 1) { @@ -501,8 +503,20 @@ if (str <= end) *str = '\0'; else if (cnt > 0) + { /* don't write out a null byte if the buf size is zero */ - *end = '\0'; + //*end = '\0'; + if (str-buf >=cnt ) + { + *end = '\0'; + } + else + { + end++; + *end = '\0'; + } + + } return str-buf; } Modified: trunk/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/swprintf.c?rev=2208… ============================================================================== --- trunk/reactos/lib/rtl/swprintf.c (original) +++ trunk/reactos/lib/rtl/swprintf.c Sun May 28 04:51:16 2006 @@ -500,9 +500,21 @@ } if (str <= end) *str = L'\0'; - else if (cnt > 0) + else if (cnt > 0) + { /* don't write out a null byte if the buf size is zero */ - *end = L'\0'; + //*end = '\0'; + if (str-buf >=cnt ) + { + *end = L'\0'; + } + else + { + end++; + *end = L'\0'; + } + + } return str-buf; }

18 years, 7 months

[fireball] 22080: Fix an incorrect HalBeginSystemInterrupt() prototype

by fireball＠svn.reactos.org

Author: fireball Date: Sat May 27 19:38:37 2006 New Revision: 22080 URL: http://svn.reactos.ru/svn/reactos?rev=22080&view=rev Log: Fix an incorrect HalBeginSystemInterrupt() prototype Modified: trunk/reactos/hal/hal/hal.c trunk/reactos/hal/halx86/generic/irql.c trunk/reactos/hal/halx86/mp/apic.c trunk/reactos/hal/halx86/mp/mpsirql.c trunk/reactos/include/ndk/halfuncs.h trunk/reactos/ntoskrnl/ke/i386/irq.c Modified: trunk/reactos/hal/hal/hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/hal/hal/hal.c?rev=22080&r1=… ============================================================================== --- trunk/reactos/hal/hal/hal.c (original) +++ trunk/reactos/hal/hal/hal.c Sat May 27 19:38:37 2006 @@ -159,8 +159,8 @@ BOOLEAN NTAPI -HalBeginSystemInterrupt (ULONG Vector, - KIRQL Irql, +HalBeginSystemInterrupt (KIRQL Irql, + ULONG Vector, PKIRQL OldIrql) { UNIMPLEMENTED; Modified: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (original) +++ trunk/reactos/hal/halx86/generic/irql.c Sat May 27 19:38:37 2006 @@ -355,8 +355,8 @@ BOOLEAN STDCALL -HalBeginSystemInterrupt (ULONG Vector, - KIRQL Irql, +HalBeginSystemInterrupt (KIRQL Irql, + ULONG Vector, PKIRQL OldIrql) { ULONG irq; Modified: trunk/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=22… ============================================================================== --- trunk/reactos/hal/halx86/mp/apic.c (original) +++ trunk/reactos/hal/halx86/mp/apic.c Sat May 27 19:38:37 2006 @@ -751,8 +751,8 @@ { KIRQL oldIrql; - HalBeginSystemInterrupt(IPI_VECTOR, - IPI_LEVEL, + HalBeginSystemInterrupt(IPI_LEVEL, + IPI_VECTOR, &oldIrql); Ki386EnableInterrupts(); #if 0 Modified: trunk/reactos/hal/halx86/mp/mpsirql.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/hal/halx86/mp/mpsirql.c?rev… ============================================================================== --- trunk/reactos/hal/halx86/mp/mpsirql.c (original) +++ trunk/reactos/hal/halx86/mp/mpsirql.c Sat May 27 19:38:37 2006 @@ -291,8 +291,8 @@ BOOLEAN STDCALL -HalBeginSystemInterrupt (ULONG Vector, - KIRQL Irql, +HalBeginSystemInterrupt (KIRQL Irql, + ULONG Vector, PKIRQL OldIrql) { ULONG Flags; Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h (original) +++ trunk/reactos/include/ndk/halfuncs.h Sat May 27 19:38:37 2006 @@ -95,8 +95,8 @@ BOOLEAN NTAPI HalBeginSystemInterrupt( + KIRQL Irql, ULONG Vector, - KIRQL Irql, PKIRQL OldIrql ); Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irq.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irq.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c Sat May 27 19:38:37 2006 @@ -275,8 +275,8 @@ * Notify the rest of the kernel of the raised irq level. For the * default HAL this will send an EOI to the PIC and alter the IRQL. */ - if (!HalBeginSystemInterrupt (vector, - VECTOR2IRQL(vector), + if (!HalBeginSystemInterrupt (VECTOR2IRQL(vector), + vector, &old_level)) { return;

18 years, 7 months

[greatlrd] 22079: [AUDIT] this file is clean, and well document where it comes from, so no sign of trace was notice in this file

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat May 27 19:32:22 2006 New Revision: 22079 URL: http://svn.reactos.ru/svn/reactos?rev=22079&view=rev Log: [AUDIT] this file is clean, and well document where it comes from, so no sign of trace was notice in this file Modified: trunk/reactos/lib/crt/io/open.c (props changed) Propchange: trunk/reactos/lib/crt/io/open.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 7 months

[gedmurphy] 22078: Fix possible memory leak in ProbeAndCaptureUnicodeString Patch from Thomas Weidenmueller

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sat May 27 19:06:51 2006 New Revision: 22078 URL: http://svn.reactos.ru/svn/reactos?rev=22078&view=rev Log: Fix possible memory leak in ProbeAndCaptureUnicodeString Patch from Thomas Weidenmueller Modified: trunk/reactos/include/reactos/probe.h Modified: trunk/reactos/include/reactos/probe.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/reactos/probe.h?rev… ============================================================================== --- trunk/reactos/include/reactos/probe.h (original) +++ trunk/reactos/include/reactos/probe.h Sat May 27 19:06:51 2006 @@ -31,7 +31,7 @@ #define ProbeForWriteBoolean(Ptr) ProbeForWriteGenericType(Ptr, BOOLEAN) #define ProbeForWriteUchar(Ptr) ProbeForWriteGenericType(Ptr, UCHAR) -#define ProbeForWriteChar(Ptr) ProbeForWriteGenericType(Ptr, Char) +#define ProbeForWriteChar(Ptr) ProbeForWriteGenericType(Ptr, CHAR) #define ProbeForWriteUshort(Ptr) ProbeForWriteGenericType(Ptr, USHORT) #define ProbeForWriteShort(Ptr) ProbeForWriteGenericType(Ptr, SHORT) #define ProbeForWriteUlong(Ptr) ProbeForWriteGenericType(Ptr, ULONG) @@ -85,7 +85,7 @@ IN PUNICODE_STRING UnsafeSrc) { NTSTATUS Status = STATUS_SUCCESS; - WCHAR *Buffer; + WCHAR *Buffer = NULL; ASSERT(Dest != NULL); /* Probe the structure and buffer*/ @@ -136,6 +136,16 @@ } _SEH_HANDLE { + /* Free allocated resources and zero the destination string */ + if (Buffer != NULL) + { + ExFreePool(Buffer); + } + Dest->Length = 0; + Dest->MaximumLength = 0; + Dest->Buffer = NULL; + + /* Return the error code */ Status = _SEH_GetExceptionCode(); } _SEH_END;

18 years, 7 months

[greatlrd] 22077: patch from w3seek : <w3seek> btw here's a (temporary) fix for the missing buttons bug: because it's not entirely thread-safe. filip will take care of it (i think)

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat May 27 18:15:04 2006 New Revision: 22077 URL: http://svn.reactos.ru/svn/reactos?rev=22077&view=rev Log: patch from w3seek : <w3seek> btw here's a (temporary) fix for the missing buttons bug: because it's not entirely thread-safe. filip will take care of it (i think) Modified: trunk/reactos/dll/win32/user32/windows/class.c Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/cl… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c (original) +++ trunk/reactos/dll/win32/user32/windows/class.c Sat May 27 18:15:04 2006 @@ -11,6 +11,7 @@ #include <user32.h> +extern BOOL ControlsInitialized; /* * @implemented @@ -45,6 +46,12 @@ } } + /* Register built-in controls if not already done */ + if (! ControlsInitialized) + { + ControlsInitialized = ControlsInit(ClassName.Buffer); + } + Ret = NtUserGetClassInfo(hinst, &ClassName, (LPWNDCLASSEXW)lpwcx, @@ -85,6 +92,12 @@ { RtlInitUnicodeString(&ClassName, lpszClass); + } + + /* Register built-in controls if not already done */ + if (! ControlsInitialized) + { + ControlsInitialized = ControlsInit(ClassName.Buffer); } return NtUserGetClassInfo(hinst,

18 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
...
38
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 2006