Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[fireball] 34026: - Remove all string msvcrt->ntdll forwards: let's be consistent, either forward everything, or forward only something. I left assembly math functions though, since they are standalone and 100% identical. - As a result, fixed a couple of incorrect functions linkage. - Fixed a name of vsnprintf, so really msvcrt's version is used now, not RTL's one.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jun 19 08:08:46 2008 New Revision: 34026 URL: http://svn.reactos.org/svn/reactos?rev=34026&view=rev Log: - Remove all string msvcrt->ntdll forwards: let's be consistent, either forward everything, or forward only something. I left assembly math functions though, since they are standalone and 100% identical. - As a result, fixed a couple of incorrect functions linkage. - Fixed a name of vsnprintf, so really msvcrt's version is used now, not RTL's one. Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/libcntpr.rbuild trunk/reactos/lib/sdk/crt/string/wcs.c Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] Thu Jun 19 08:08:46 2008 @@ -121,9 +121,9 @@ __getmainargs @114 __initenv @115 ; __iob_func @116 - __isascii=ntdll.__isascii @117 - __iscsym=ntdll.__iscsym @118 - __iscsymf=ntdll.__iscsymf @119 + __isascii @117 + __iscsym @118 + __iscsymf @119 __lc_codepage @120 DATA __lc_collate_cp @121 DATA __lc_handle @122 DATA @@ -167,7 +167,7 @@ __setusermatherr @160 __threadhandle @161 __threadid @162 - __toascii=ntdll.__toascii @163 + __toascii @163 __unDName @164 __unDNameEx @165 ; __uncaught_exception @166 @@ -203,7 +203,7 @@ _amsg_exit @196 _assert @197 ; _atodbl @198 - _atoi64=ntdll._atoi64 @199 + _atoi64 @199 _atoldbl @200 _beep @201 _beginthread @202 @@ -291,7 +291,7 @@ _fstati64 @284 _ftime @285 ; _ftime64 @286 - _ftol=ntdll._ftol @287 + _ftol @287 _fullpath @288 _futime @289 ; _futime64 @290 @@ -324,8 +324,8 @@ ; _heapused @317 _heapwalk @318 _hypot @319 - _i64toa=ntdll._i64toa @320 - _i64tow=ntdll._i64tow @321 + _i64toa @320 + _i64tow @321 _initterm @322 ; _inp @323 ; _inpd @324 @@ -363,8 +363,8 @@ _ismbslead @356 _ismbstrail @357 _isnan @358 - _itoa=ntdll._itoa @359 - _itow=ntdll._itow @360 + _itoa @359 + _itow @360 _j0 @361 _j1 @362 _jn @363 @@ -382,8 +382,8 @@ _lsearch @375 _lseek @376 _lseeki64 @377 - _ltoa=ntdll._ltoa @378 - _ltow=ntdll._ltow @379 + _ltoa @378 + _ltow @379 _makepath @380 _mbbtombc @381 _mbbtype @382 @@ -440,8 +440,8 @@ _mbstok @433 _mbstrlen @434 _mbsupr @435 - _memccpy=ntdll._memccpy @436 - _memicmp=ntdll._memicmp @437 + _memccpy @436 + _memicmp @437 _mkdir @438 ; _mkgmtime @439 ; _mkgmtime64 @440 @@ -510,20 +510,20 @@ _spawnve @503 _spawnvp @504 _spawnvpe @505 - _splitpath=ntdll._splitpath @506 + _splitpath @506 _stat @507 _stat64 @508 _stati64 @509 _statusfp @510 - _strcmpi=ntdll._strcmpi @511 + _strcmpi @511 _strdate @512 _strdup @513 _strerror @514 - _stricmp=ntdll._stricmp @515 + _stricmp @515 _stricoll @516 - _strlwr=ntdll._strlwr @517 + _strlwr @517 _strncoll @518 - _strnicmp=ntdll._strnicmp @519 + _strnicmp @519 _strnicoll @520 _strnset @521 _strrev @522 @@ -531,7 +531,7 @@ _strtime @524 ; _strtoi64 @525 _strtoui64=strtoull @526 - _strupr=ntdll._strupr @527 + _strupr @527 _swab @528 _sys_errlist @529 DATA _sys_nerr @530 DATA @@ -540,14 +540,14 @@ _tempnam @533 ; _time64 @534 _timezone @535 DATA - _tolower=ntdll._tolower @536 - _toupper=ntdll._toupper @537 + _tolower @536 + _toupper @537 _tzname @538 DATA _tzset @539 - _ui64toa=ntdll._ui64toa @540 - _ui64tow=ntdll._ui64tow @541 - _ultoa=ntdll._ultoa @542 - _ultow=ntdll._ultow @543 + _ui64toa @540 + _ui64tow @541 + _ultoa @542 + _ultow @543 _umask @544 _ungetch @545 ; _ungetwch @546 @@ -568,18 +568,18 @@ _wcreat @561 _wcsdup @562 ; _wcserror @563 - _wcsicmp=ntdll._wcsicmp @564 + _wcsicmp @564 _wcsicoll @565 - _wcslwr=ntdll._wcslwr @566 + _wcslwr @566 _wcsncoll @567 - _wcsnicmp=ntdll._wcsnicmp @568 + _wcsnicmp @568 _wcsnicoll @569 _wcsnset @570 _wcsrev @571 _wcsset @572 ; _wcstoi64 @573 ; _wcstoui64 @574 - _wcsupr=ntdll._wcsupr @575 + _wcsupr @575 _wctime @576 ; _wctime64 @577 ; _wctype @578 @@ -642,9 +642,9 @@ _wtempnam @635 _wtmpnam @636 ; _wtof @637 - _wtoi=ntdll._wtoi @638 - _wtoi64=ntdll._wtoi64 @639 - _wtol=ntdll._wtol @640 + _wtoi @638 + _wtoi64 @639 + _wtol @640 _wunlink @641 _wutime @642 ; _wutime64 @643 @@ -652,29 +652,29 @@ _y1 @645 _yn @646 abort @647 - abs=ntdll.abs @648 + abs @648 acos @649 asctime @650 asin @651 - atan=ntdll.atan @652 + atan @652 atan2 @653 atexit @654 atof @655 - atoi=ntdll.atoi @656 - atol=ntdll.atol @657 - bsearch=ntdll.bsearch @658 + atoi @656 + atol @657 + bsearch @658 calloc @659 - ceil=ntdll.ceil @660 + ceil @660 clearerr @661 clock @662 - cos=ntdll.cos @663 + cos @663 cosh @664 ctime @665 difftime @666 div @667 exit @668 exp @669 - fabs=ntdll.fabs @670 + fabs @670 fclose @671 feof @672 ferror @673 @@ -684,7 +684,7 @@ fgets @677 fgetwc @678 fgetws @679 - floor=ntdll.floor @680 + floor @680 fmod @681 fopen @682 fprintf @683 @@ -710,60 +710,60 @@ getwc @703 getwchar @704 gmtime @705 - is_wctype=ntdll.iswctype @706 - isalnum=ntdll.isalnum @707 - isalpha=ntdll.isalpha @708 - iscntrl=ntdll.iscntrl @709 - isdigit=ntdll.isdigit @710 - isgraph=ntdll.isgraph @711 + is_wctype @706 + isalnum @707 + isalpha @708 + iscntrl @709 + isdigit @710 + isgraph @711 isleadbyte @712 - islower=ntdll.islower @713 - isprint=ntdll.isprint @714 - ispunct=ntdll.ispunct @715 - isspace=ntdll.isspace @716 - isupper=ntdll.isupper @717 + islower @713 + isprint @714 + ispunct @715 + isspace @716 + isupper @717 iswalnum @718 - iswalpha=ntdll.iswalpha @719 + iswalpha @719 iswascii @720 iswcntrl @721 - iswctype=ntdll.iswctype @722 - iswdigit=ntdll.iswdigit @723 + iswctype @722 + iswdigit @723 iswgraph @724 - iswlower=ntdll.iswlower @725 + iswlower @725 iswprint @726 iswpunct @727 - iswspace=ntdll.iswspace @728 + iswspace @728 iswupper @729 - iswxdigit=ntdll.iswxdigit @730 - isxdigit=ntdll.isxdigit @731 - labs=ntdll.labs @732 + iswxdigit @730 + isxdigit @731 + labs @732 ldexp @733 ldiv @734 localeconv @735 localtime @736 - log=ntdll.log @737 + log @737 log10 @738 longjmp @739 malloc @740 mblen @741 - mbstowcs=ntdll.mbstowcs @742 + mbstowcs @742 mbtowc @743 - memchr=ntdll.memchr @744 - memcmp=ntdll.memcmp @745 - memcpy=ntdll.memcpy @746 - memmove=ntdll.memmove @747 - memset=ntdll.memset @748 + memchr @744 + memcmp @745 + memcpy @746 + memmove @747 + memset @748 mktime @749 modf @750 perror @751 - pow=ntdll.pow @752 + pow @752 printf @753 putc @754 putchar @755 puts @756 putwc=fputwc @757 putwchar=_fputwchar @758 - qsort=ntdll.qsort @759 + qsort @759 raise @760 rand @761 realloc @762 @@ -775,45 +775,45 @@ setlocale @768 setvbuf @769 signal @770 - sin=ntdll.sin @771 + sin @771 sinh @772 sprintf @773 - sqrt=ntdll.sqrt @774 + sqrt @774 srand @775 sscanf @776 - strcat=ntdll.strcat @777 - strchr=ntdll.strchr @778 - strcmp=ntdll.strcmp @779 + strcat @777 + strchr @778 + strcmp @779 strcoll @780 - strcpy=ntdll.strcpy @781 - strcspn=ntdll.strcspn @782 + strcpy @781 + strcspn @782 strerror @783 strftime @784 - strlen=ntdll.strlen @785 - strncat=ntdll.strncat @786 - strncmp=ntdll.strncmp @787 - strncpy=ntdll.strncpy @788 - strpbrk=ntdll.strpbrk @789 - strrchr=ntdll.strrchr @790 - strspn=ntdll.strspn @791 - strstr=ntdll.strstr @792 + strlen @785 + strncat @786 + strncmp @787 + strncpy @788 + strpbrk @789 + strrchr @790 + strspn @791 + strstr @792 strtod @793 strtok @794 - strtol=ntdll.strtol @795 - strtoul=ntdll.strtoul @796 + strtol @795 + strtoul @796 strxfrm @797 swprintf @798 swscanf @799 system @800 - tan=ntdll.tan @801 + tan @801 tanh @802 time @803 tmpfile @804 tmpnam @805 - tolower=ntdll.tolower @806 - toupper=ntdll.toupper @807 - towlower=ntdll.towlower @808 - towupper=ntdll.towupper @809 + tolower @806 + toupper @807 + towlower @808 + towupper @809 ungetc @810 ungetwc @811 vfprintf @812 @@ -822,26 +822,26 @@ vsprintf @815 vswprintf @816 vwprintf @817 - wcscat=ntdll.wcscat @818 - wcschr=ntdll.wcschr @819 - wcscmp=ntdll.wcscmp @820 + wcscat @818 + wcschr @819 + wcscmp @820 wcscoll @821 - wcscpy=ntdll.wcscpy @822 - wcscspn=ntdll.wcscspn @823 + wcscpy @822 + wcscspn @823 wcsftime @824 - wcslen=ntdll.wcslen @825 - wcsncat=ntdll.wcsncat @826 - wcsncmp=ntdll.wcsncmp @827 - wcsncpy=ntdll.wcsncpy @828 + wcslen @825 + wcsncat @826 + wcsncmp @827 + wcsncpy @828 wcspbrk @829 - wcsrchr=ntdll.wcsrchr @830 - wcsspn=ntdll.wcsspn @831 - wcsstr=ntdll.wcsstr @832 + wcsrchr @830 + wcsspn @831 + wcsstr @832 wcstod @833 wcstok @834 - wcstol=ntdll.wcstol @835 - wcstombs=ntdll.wcstombs @836 - wcstoul=ntdll.wcstoul @837 + wcstol @835 + wcstombs @836 + wcstoul @837 wcsxfrm @838 wctomb @839 wprintf @840 Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Thu Jun 19 08:08:46 2008 @@ -190,6 +190,7 @@ <file>memset.c</file> </ifnot> <file>memcmp.c</file> + <file>memccpy.c</file> <file>memicmp.c</file> </directory> @@ -217,6 +218,7 @@ <file>wprocess.c</file> </directory> <directory name="search"> + <file>bsearch.c</file> <file>lfind.c</file> <file>lsearch.c</file> </directory> @@ -262,6 +264,7 @@ <file>makepath.c</file> <file>malloc.c</file> <file>mbtowc.c</file> + <file>mbstowcs.c</file> <file>obsol.c</file> <file>putenv.c</file> <file>rot.c</file> @@ -319,12 +322,18 @@ <file>wcsnlen.c</file> <file>wcsrchr.c</file> </ifnot> + <file>atof.c</file> + <file>atoi.c</file> + <file>atoi64.c</file> <file>atol.c</file> - <file>atof.c</file> <file>ctype.c</file> + <file>itoa.c</file> + <file>itow.c</file> <file>lasttok.c</file> <file>scanf.c</file> + <file>splitp.c</file> <file>strcoll.c</file> + <file>strcspn.c</file> <file>strdup.c</file> <file>strerror.c</file> <file>stricmp.c</file> @@ -334,17 +343,24 @@ <file>strpbrk.c</file> <file>strrev.c</file> <file>strset.c</file> + <file>strspn.c</file> <file>strstr.c</file> <file>strtod.c</file> <file>strtok.c</file> + <file>strtol.c</file> <file>strtoul.c</file> <file>strtoull.c</file> <file>strupr.c</file> <file>strxfrm.c</file> + <file>wcs.c</file> + <file>wcstol.c</file> <file>wcstombs.c</file> + <file>wcstoul.c</file> <file>wctomb.c</file> <file>wsplitp.c</file> - <file>wcs.c</file> + <file>wtoi.c</file> + <file>wtoi64.c</file> + <file>wtol.c</file> </directory> <directory name="sys_stat"> <file>systime.c</file> Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuil… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Thu Jun 19 08:08:46 2008 @@ -156,6 +156,7 @@ <file>wcstol.c</file> <file>wcstombs_nt.c</file> <file>wcstoul.c</file> + <file>wsplitp.c</file> <file>wtoi64.c</file> <file>wtoi.c</file> <file>wtol.c</file> Modified: trunk/reactos/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Thu Jun 19 08:08:46 2008 @@ -742,7 +742,7 @@ /********************************************************************* * _vsnprintf (MSVCRT.@) */ -int CDECL vsnprintf( char *str, unsigned int len, +int CDECL _vsnprintf( char *str, unsigned int len, const char *format, va_list valist ) { DWORD sz; @@ -793,7 +793,7 @@ /********************************************************************* * _vsnwsprintf (MSVCRT.@) */ -int CDECL vsnwprintf( wchar_t *str, unsigned int len, +int CDECL _vsnwprintf( wchar_t *str, unsigned int len, const wchar_t *format, va_list valist ) { pf_output out;

16 years, 6 months

[fireball] 34025: - Restored ACP/OEMCP/MACCP static entries (removed in 34010) - they are needed for LiveCD boot process.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jun 19 07:11:32 2008 New Revision: 34025 URL: http://svn.reactos.org/svn/reactos?rev=34025&view=rev Log: - Restored ACP/OEMCP/MACCP static entries (removed in 34010) - they are needed for LiveCD boot process. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Thu Jun 19 07:11:32 2008 @@ -393,6 +393,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","28597",0x00000000,"c_28597.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","28598",0x00000000,"c_28598.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","28599",0x00000000,"c_28599.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","ACP",0x00000000,"1252" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","OEMCP",0x00000000,"437" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","MACCP",0x00000000,"10000" ; NLS Language settings HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0402",0x00000000,"l_intl.nls"

16 years, 6 months

[gedmurphy] 34024: Add all modules within a test to the treeview

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jun 19 06:57:14 2008 New Revision: 34024 URL: http://svn.reactos.org/svn/reactos?rev=34024&view=rev Log: Add all modules within a test to the treeview Modified: trunk/rostests/winetests/GUI/browsewnd.c trunk/rostests/winetests/GUI/misc.c trunk/rostests/winetests/GUI/precomp.h Modified: trunk/rostests/winetests/GUI/browsewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/browsewnd.c… ============================================================================== --- trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] Thu Jun 19 06:57:14 2008 @@ -14,6 +14,7 @@ #define IL_TEST 1 typedef wchar_t *(__cdecl *DLLNAME)(); +typedef int (_cdecl *MODULES)(char **); static INT GetNumberOfDllsInFolder(LPWSTR lpFolder) @@ -135,6 +136,7 @@ HTREEITEM hRoot; HIMAGELIST hImgList; DLLNAME GetTestName; + MODULES GetModulesInTest; HMODULE hDll; LPWSTR lpDllPath; LPWSTR lpTestName; @@ -171,16 +173,47 @@ GetTestName = (DLLNAME)GetProcAddress(hDll, "GetTestName"); if (GetTestName) { + HTREEITEM hParent; + LPSTR lpModules, ptr; + LPWSTR lpModW; + INT numMods; + lpTestName = GetTestName(); - InsertIntoTreeView(pInfo->hBrowseTV, - hRoot, - lpTestName, - lpDllPath, - IL_TEST); - - // add individual tests as children - + hParent = InsertIntoTreeView(pInfo->hBrowseTV, + hRoot, + lpTestName, + lpDllPath, + IL_TEST); + + if (hParent) + { + GetModulesInTest = (MODULES)GetProcAddress(hDll, "GetModulesInTest"); + if ((numMods = GetModulesInTest(&lpModules))) + { + ptr = lpModules; + while (numMods && *ptr != '\0') + { + if (AnsiToUnicode(ptr, &lpModW)) + { + InsertIntoTreeView(pInfo->hBrowseTV, + hParent, + lpModW, + lpModW, + IL_TEST); + + HeapFree(GetProcessHeap(), 0, lpModW); + } + + while (*(ptr++) != '\0') + ; + + numMods--; + } + + HeapFree(GetProcessHeap(), 0, lpModules); + } + } } FreeLibrary(hDll); Modified: trunk/rostests/winetests/GUI/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/misc.c?rev=… ============================================================================== --- trunk/rostests/winetests/GUI/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/misc.c [iso-8859-1] Thu Jun 19 06:57:14 2008 @@ -24,7 +24,7 @@ } /* There are always blocks of 16 strings */ - lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1); + lpName = (LPWSTR)MAKEINTRESOURCEW((uID >> 4) + 1); /* Find the string table block */ if ((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) && @@ -238,12 +238,12 @@ /* Add all icons to the image list */ for (i = StartResource; i <= EndResource; i++) { - hIcon = (HBITMAP)LoadImage(hInstance, - MAKEINTRESOURCE(i), - IMAGE_ICON, - Width, - Height, - LR_DEFAULTCOLOR); + hIcon = (HBITMAP)LoadImageW(hInstance, + MAKEINTRESOURCEW(i), + IMAGE_ICON, + Width, + Height, + LR_DEFAULTCOLOR); if (hIcon == NULL) goto fail; @@ -261,3 +261,21 @@ ImageList_Destroy(hImageList); return NULL; } + +DWORD +AnsiToUnicode(LPCSTR lpSrcStr, + LPWSTR *lpDstStr) +{ + INT length; + INT ret = 0; + + length = strlen(lpSrcStr) + 1; + + *lpDstStr = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, length * sizeof(WCHAR)); + if (*lpDstStr) + { + ret = MultiByteToWideChar(CP_ACP, 0, lpSrcStr, -1, *lpDstStr, length); + } + + return ret; +} Modified: trunk/rostests/winetests/GUI/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/precomp.h?r… ============================================================================== --- trunk/rostests/winetests/GUI/precomp.h [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/precomp.h [iso-8859-1] Thu Jun 19 06:57:14 2008 @@ -32,6 +32,7 @@ /* dll exports */ wchar_t *GetTestName(); +int GetModulesInTest(char **modules); /* browsewnd.c */ @@ -41,5 +42,6 @@ HIMAGELIST InitImageList(UINT StartResource, UINT EndResource, UINT Width, UINT Height); VOID DisplayString(LPWSTR lpMsg); VOID DisplayError(INT err); +DWORD AnsiToUnicode(LPCSTR lpSrcStr, LPWSTR *lpDstStr); #endif /* __WINETESTGUI_PRECOMP_H */

16 years, 6 months

[fireball] 34023: - Revert 34010 completely, too much breakages. "Don't fix what's not broken".

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jun 19 03:41:31 2008 New Revision: 34023 URL: http://svn.reactos.org/svn/reactos?rev=34023&view=rev Log: - Revert 34010 completely, too much breakages. "Don't fix what's not broken". Removed: trunk/reactos/dll/win32/kernel32/misc/lang.h Modified: trunk/reactos/dll/win32/kernel32/file/file.c trunk/reactos/dll/win32/kernel32/k32.h trunk/reactos/dll/win32/kernel32/misc/computername.c trunk/reactos/dll/win32/kernel32/misc/lang.c trunk/reactos/dll/win32/kernel32/misc/nls.c trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/dll/win32/kernel32/misc/time.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… Modified: trunk/reactos/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/k32.h?r… Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… Removed: trunk/reactos/dll/win32/kernel32/misc/lang.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… Modified: trunk/reactos/dll/win32/kernel32/misc/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ti…

16 years, 6 months

[gedmurphy] 34022: add all test dlls into the treeview

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jun 19 03:36:17 2008 New Revision: 34022 URL: http://svn.reactos.org/svn/reactos?rev=34022&view=rev Log: add all test dlls into the treeview Added: trunk/rostests/winetests/GUI/res/main.ico (with props) trunk/rostests/winetests/GUI/res/tests.ico (with props) Modified: trunk/rostests/winetests/GUI/WinetestsGUI.rc trunk/rostests/winetests/GUI/browsewnd.c trunk/rostests/winetests/GUI/mainwnd.c trunk/rostests/winetests/GUI/misc.c trunk/rostests/winetests/GUI/precomp.h trunk/rostests/winetests/GUI/resource.h trunk/rostests/winetests/GUI/rsrc.rc Modified: trunk/rostests/winetests/GUI/WinetestsGUI.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/WinetestsGU… ============================================================================== --- trunk/rostests/winetests/GUI/WinetestsGUI.rc [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/WinetestsGUI.rc [iso-8859-1] Thu Jun 19 03:36:17 2008 @@ -3,9 +3,9 @@ #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Character Map\0" -#define REACTOS_STR_INTERNAL_NAME "charmap\0" -#define REACTOS_STR_ORIGINAL_FILENAME "charmap.exe\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS API test GUI\0" +#define REACTOS_STR_INTERNAL_NAME "WinetestsGUI\0" +#define REACTOS_STR_ORIGINAL_FILENAME "WinetestsGUI.exe\0" //#include <reactos/version.rc> #include "rsrc.rc" Modified: trunk/rostests/winetests/GUI/browsewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/browsewnd.c… ============================================================================== --- trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] Thu Jun 19 03:36:17 2008 @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Character Map + * PROJECT: ReactOS API Test GUI * LICENSE: GPL - See COPYING in the top level directory * FILE: * PURPOSE: browse dialog implementation @@ -10,6 +10,10 @@ #include <precomp.h> #define DLL_SEARCH_DIR L"\\Debug\\testlibs\\*" +#define IL_MAIN 0 +#define IL_TEST 1 + +typedef wchar_t *(__cdecl *DLLNAME)(); static INT GetNumberOfDllsInFolder(LPWSTR lpFolder) @@ -128,31 +132,67 @@ static VOID PopulateTreeView(PMAIN_WND_INFO pInfo) { - HWND hTreeView; HTREEITEM hRoot; - HBITMAP hComp; - TCHAR ComputerName[MAX_PATH]; - DWORD dwSize = MAX_PATH; - INT RootImage; - - hTreeView = GetDlgItem(pInfo->hBrowseDlg, IDC_TREEVIEW); - - (void)TreeView_DeleteAllItems(hTreeView); - - /* insert the root item into the tree */ - hRoot = InsertIntoTreeView(hTreeView, + HIMAGELIST hImgList; + DLLNAME GetTestName; + HMODULE hDll; + LPWSTR lpDllPath; + LPWSTR lpTestName; + INT RootImage, i; + + pInfo->hBrowseTV = GetDlgItem(pInfo->hBrowseDlg, IDC_TREEVIEW); + + (void)TreeView_DeleteAllItems(pInfo->hBrowseTV); + + hImgList = InitImageList(IDI_ICON, + IDI_TESTS, + 16, + 16); + if (!hImgList) return; + + (void)TreeView_SetImageList(pInfo->hBrowseTV, + hImgList, + TVSIL_NORMAL); + + /* insert the root item into the tree */ + hRoot = InsertIntoTreeView(pInfo->hBrowseTV, NULL, - ComputerName, + L"Full", NULL, - 0);//RootImage); + IL_MAIN); + + for (i = 0; i < pInfo->numDlls; i++) + { + lpDllPath = pInfo->lpDllList + (MAX_PATH * i); + + hDll = LoadLibraryW(lpDllPath); + if (hDll) + { + GetTestName = (DLLNAME)GetProcAddress(hDll, "GetTestName"); + if (GetTestName) + { + lpTestName = GetTestName(); + + InsertIntoTreeView(pInfo->hBrowseTV, + hRoot, + lpTestName, + lpDllPath, + IL_TEST); + + // add individual tests as children + + } + + FreeLibrary(hDll); + } + } } static VOID PopulateTestList(PMAIN_WND_INFO pInfo) { - INT numFiles; - - if ((numFiles = GetListOfTestDlls(pInfo))) + pInfo->numDlls = GetListOfTestDlls(pInfo); + if (pInfo->numDlls) { PopulateTreeView(pInfo); } Modified: trunk/rostests/winetests/GUI/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/mainwnd.c?r… ============================================================================== --- trunk/rostests/winetests/GUI/mainwnd.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/mainwnd.c [iso-8859-1] Thu Jun 19 03:36:17 2008 @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Character Map + * PROJECT: ReactOS API Test GUI * LICENSE: GPL - See COPYING in the top level directory * FILE: * PURPOSE: main dialog implementation Modified: trunk/rostests/winetests/GUI/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/misc.c?rev=… ============================================================================== --- trunk/rostests/winetests/GUI/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/misc.c [iso-8859-1] Thu Jun 19 03:36:17 2008 @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Services + * PROJECT: ReactOS API Test GUI * LICENSE: GPL - See COPYING in the top level directory * FILE: * PURPOSE: miscallanous functions @@ -221,15 +221,15 @@ UINT Width, UINT Height) { - HBITMAP hBitmap; + HICON hIcon; HIMAGELIST hImageList; UINT i; - INT Ret; + INT Ret; /* Create the toolbar icon image list */ hImageList = ImageList_Create(Width, Height, - ILC_MASK | ILC_COLOR24, + ILC_MASK | ILC_COLOR32, EndResource - StartResource, 0); if (hImageList == NULL) @@ -238,23 +238,26 @@ /* Add all icons to the image list */ for (i = StartResource; i <= EndResource; i++) { - hBitmap = (HBITMAP)LoadImage(hInstance, - MAKEINTRESOURCE(i), - IMAGE_BITMAP, - Width, - Height, - LR_LOADTRANSPARENT); - if (hBitmap == NULL) - return NULL; - - Ret = ImageList_AddMasked(hImageList, - hBitmap, - RGB(255, 0, 128)); + hIcon = (HBITMAP)LoadImage(hInstance, + MAKEINTRESOURCE(i), + IMAGE_ICON, + Width, + Height, + LR_DEFAULTCOLOR); + if (hIcon == NULL) + goto fail; + + Ret = ImageList_AddIcon(hImageList, + hIcon); if (Ret == -1) - return NULL; - - DeleteObject(hBitmap); + goto fail; + + DestroyIcon(hIcon); } return hImageList; -} + +fail: + ImageList_Destroy(hImageList); + return NULL; +} Modified: trunk/rostests/winetests/GUI/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/precomp.h?r… ============================================================================== --- trunk/rostests/winetests/GUI/precomp.h [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/precomp.h [iso-8859-1] Thu Jun 19 03:36:17 2008 @@ -11,10 +11,11 @@ typedef struct _MAIN_WND_INFO { - HWND hMainWnd; - HWND hBrowseDlg; - HWND hStatus; - int nCmdShow; + HWND hMainWnd; + HWND hBrowseDlg; + HWND hBrowseTV; + HWND hStatus; + int nCmdShow; HICON hSmIcon; HICON hBgIcon; @@ -25,14 +26,19 @@ BOOL bIsUserAnAdmin; LPWSTR lpDllList; + INT numDlls; } MAIN_WND_INFO, *PMAIN_WND_INFO; + +/* dll exports */ +wchar_t *GetTestName(); /* browsewnd.c */ BOOL CALLBACK BrowseDlgProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam); /* misc.c */ +HIMAGELIST InitImageList(UINT StartResource, UINT EndResource, UINT Width, UINT Height); VOID DisplayString(LPWSTR lpMsg); VOID DisplayError(INT err); Added: trunk/rostests/winetests/GUI/res/main.ico URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/res/main.ic… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/winetests/GUI/res/main.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/winetests/GUI/res/tests.ico URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/res/tests.i… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/winetests/GUI/res/tests.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/rostests/winetests/GUI/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/resource.h?… ============================================================================== --- trunk/rostests/winetests/GUI/resource.h [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/resource.h [iso-8859-1] Thu Jun 19 03:36:17 2008 @@ -3,7 +3,7 @@ #define IDM_ABOUT 104 #define IDM_EXIT 105 #define IDI_ICON 107 -#define IDI_SMALL 108 +#define IDI_TESTS 108 #define IDC_DELETE 109 #define IDR_MAINFRAME 128 #define IDC_LIST 1000 Modified: trunk/rostests/winetests/GUI/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/rsrc.rc?rev… ============================================================================== --- trunk/rostests/winetests/GUI/rsrc.rc [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/rsrc.rc [iso-8859-1] Thu Jun 19 03:36:17 2008 @@ -3,7 +3,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -IDI_ICON ICON "res/charmap.ico" +IDI_ICON ICON "res/main.ico" +IDI_TESTS ICON "res/tests.ico" //#include "lang/bg-BG.rc" //#include "lang/ca-ES.rc"

16 years, 6 months

[dreimer] 34021: Bug 3362: Italian translation update by Paolo Devoti (devotip@tiscali.it)

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jun 19 01:15:59 2008 New Revision: 34021 URL: http://svn.reactos.org/svn/reactos?rev=34021&view=rev Log: Bug 3362: Italian translation update by Paolo Devoti (devotip(a)tiscali.it) Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/vmwinst/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Thu Jun 19 01:15:59 2008 @@ -381,9 +381,9 @@ TEXT_STYLE_NORMAL }, { - 8, + 3, 14, - "Layout tastiera:", + "Nazionalit tastiera:", TEXT_STYLE_NORMAL }, { @@ -573,7 +573,7 @@ { 10, 8, - "Questo potrebbe impiegare un minuto", + "Questo potrebbe impiegare qualche minuto", TEXT_STYLE_NORMAL }, { @@ -809,7 +809,7 @@ { 8, 11, - "\x07 Premere SU o GIU' per per selezionare un elemento della lista.", + "\x07 Premere SU o GIë per selezionare un elemento della lista.", TEXT_STYLE_NORMAL }, { @@ -827,7 +827,7 @@ { 8, 17, - "\x07 Premere D per cancellare una nuova partizione.", + "\x07 Premere D per cancellare una partizione esistente.", TEXT_STYLE_NORMAL }, { @@ -861,7 +861,7 @@ { 6, 10, - "Setup formattera la partizione. Premere INVIO per continuare.", + "Setup formatter la partizione. Premere INVIO per continuare.", TEXT_STYLE_NORMAL }, { @@ -895,7 +895,7 @@ { 6, 9, - "Scegliere una cartella dove volete che ReactOS verr installato:", + "Scegliere una cartella dove volete che ReactOS sia installato:", TEXT_STYLE_NORMAL }, { @@ -1033,7 +1033,7 @@ { 8, 10, - "\x07 Premere SU o GIU' per per selezionare il tipo di tastiera desiderato.", + "\x07 Premere SU o GIë per selezionare il tipo di tastiera desiderato.", TEXT_STYLE_NORMAL }, { @@ -1079,13 +1079,13 @@ { 6, 8, - "Please select a layout to be installed by default.", + "Selezionare la nazionalit predefinita della tastiera.", TEXT_STYLE_NORMAL }, { 8, 10, - "\x07 Premere SU o GIU' per per selezionare il tipo di layout di tastiera", + "\x07 Premere SU o GIë per selezionare il tipo di tastiera", TEXT_STYLE_NORMAL }, { @@ -1097,13 +1097,13 @@ { 8, 13, - "\x07 Premere ESC per tornare allapagina precedente senza modificare", + "\x07 Premere ESC per tornare alla pagina precedente senza modificare", TEXT_STYLE_NORMAL }, { 8, 14, - " il layout di tastiera.", + " la nazionalit della tastiera.", TEXT_STYLE_NORMAL }, { @@ -1132,7 +1132,7 @@ { 6, 8, - "Setup prepara il computer per la copia dei file di ReactOS. ", + "Setup sta preparando il computer per la copia dei file di ReactOS. ", TEXT_STYLE_NORMAL }, { @@ -1167,7 +1167,7 @@ { 8, 19, - "\x07 Premere SU o GIU' per selezionare un filesystem.", + "\x07 Premere SU o GIë per selezionare un filesystem.", 0 }, { @@ -1336,12 +1336,12 @@ }, { //ERROR_LOAD_KBLAYOUT, - "Setup non ha potuto caricare l'elenco di tipi di layout di tastiera.\n", + "Setup non ha potuto caricare l'elenco delle nazionalit di tastiera.\n", "INVIO = Riavviare il computer" }, { //ERROR_WARN_PARTITION, - "Setup ha trovato che al meno un disco fisso contiene una tabella delle\n" + "Setup ha trovato che almeno un disco fisso contiene una tabella delle\n" "partizioni incompatibile che non pu essere gestita correttamente!\n" "\n" "Il creare o cancellare partizioni pu distruggere la tabella delle partizioni.\n" @@ -1360,7 +1360,7 @@ }, { //ERROR_DELETE_SPACE, - "Non si pu cancellare spazio di disco non partizionato!\n" + "Non si pu cancellare spazio in un disco non partizionato!\n" "\n" " * Premere un tasto qualsiasi per continuare.", NULL @@ -1377,7 +1377,7 @@ }, { //ERROR_UPDATE_KBSETTINGS, - "Setup non ha potuto aggiornare la configurazione di layout di tastiera.", + "Setup non ha potuto aggiornare la nazionalit della tastiera.", "INVIO = Riavviare il computer" }, { @@ -1460,7 +1460,7 @@ }, { //ERROR_ADDING_CODEPAGE, - "Setup non ha potuto aggiungere la codepage al registry.\n" + "Setup non ha potuto aggiungere la codepage al registro.\n" "INVIO = Riavviare il computer" }, { @@ -1470,7 +1470,7 @@ }, { //ERROR_ADDING_KBLAYOUTS, - "Impossibile aggiungere le disposizioni di tastiera al registry.\n" + "Impossibile aggiungere le nazionalit di tastiera al registro.\n" "INVIO = Riavviare il computer" }, { @@ -1597,11 +1597,11 @@ {STRING_CREATEPARTITION, " INVIO = Creare la partizione ESC = Annulla F3 = Esci"}, {STRING_PARTFORMAT, - "Questa partizione verrà formattata successivamente."}, + "Questa partizione sar formattata successivamente."}, {STRING_NONFORMATTEDPART, "Avete scelto di installare ReactOS su una partizione nuova o non formattata."}, {STRING_INSTALLONPART, - "Setup installerà ReactOS sulla partitione"}, + "Setup installer ReactOS sulla partitione"}, {STRING_CHECKINGPART, "Setup sta controllando la partizione selezionata."}, {STRING_QUITCONTINUE, @@ -1621,11 +1621,11 @@ {STRING_FREEMEM, "Memoria libera"}, {STRING_REGHIVEUPDATE, - " Aggiornamento del registry hives..."}, + " Aggiornamento degli hives del registro..."}, {STRING_IMPORTFILE, " Importazione di %S..."}, {STRING_DISPLAYETTINGSUPDATE, - " Aggiornamento delle impostazioni del display nel registry..."}, + " Aggiornamento delle impostazioni dello schermo nel registro..."}, {STRING_LOCALESETTINGSUPDATE, " Aggiornamento delle impostazioni di regionalizzazione..."}, {STRING_KEYBOARDSETTINGSUPDATE, @@ -1639,9 +1639,9 @@ {STRING_CONSOLEFAIL1, "Impossibile aprire la console\n\n"}, {STRING_CONSOLEFAIL2, - "La causa piu' frequente di questo e' l'uso di una tastiera USB\n"}, + "La causa pi frequente di questo l'uso di una tastiera USB\n"}, {STRING_CONSOLEFAIL3, - "le tastiere USB non sono ancora supportate per intero\n"}, + "le tastiere USB non sono ancora completamente supportate\n"}, {STRING_FORMATTINGDISK, "Setup sta formattando il disco"}, {STRING_CHECKINGDISK, @@ -1693,7 +1693,7 @@ {STRING_GB, "GB"}, {STRING_ADDKBLAYOUTS, - "Aggiunta delle disposizioni di tastiera"}, + "Aggiunta delle nazionalit di tastiera"}, {0, 0} }; Modified: trunk/reactos/base/setup/vmwinst/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/it… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/it-IT.rc [iso-8859-1] Thu Jun 19 01:15:59 2008 @@ -31,7 +31,7 @@ CAPTION "Installazione Video Driver" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "The VMware(r) SVGA driver has been successfully installed. Please choose your favorite screen resolution:",-1,25,5,225,20 + LTEXT "Il driver SVGA di VMware(r) è stato installato con successo, ora scegliere la risoluzione desiderata:",-1,25,5,225,20 PUSHBUTTON "640x480", 1120, 25, 30, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] Thu Jun 19 01:15:59 2008 @@ -10,7 +10,7 @@ CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 122, 174, 78 - LTEXT "Selezionare un immagine da usare come sfondo per il tuo desktop:", + LTEXT "Selezionare un'immagine da usare come sfondo per il desktop:", IDC_STATIC, 8, 103, 174, 17 PUSHBUTTON "&Esplora...", IDC_BROWSE_BUTTON, 188, 122, 50, 15 PUSHBUTTON "&Colore...", IDC_COLOR_BUTTON, 188, 185, 50, 15 @@ -118,7 +118,7 @@ IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Generale" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP @@ -126,7 +126,7 @@ COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 GROUPBOX "Compatibilità", -1, 7, 67, 237, 97 - LTEXT "Alcuni programmi funzionano in modo irregolare se non riavviate il computer dopo una modifica delle impostazioni dei colori.\r\n\nDopo la modifica delle impostazioni dei colori:", -1, 12, 78, 228, 34 + LTEXT "Alcuni programmi potrebbero funzionare in modo irregolare se non riavviate il computer dopo una modifica delle impostazioni dei colori.\r\n\nDopo la modifica delle impostazioni dei colori:", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&Riavviare il computer prima di applicare le nuove impostazioni.", IDC_RESTART_RB, 14, 116, 224, 10 AUTORADIOBUTTON "Applicare le nuove impostazioni dei colori senza riavviare.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 AUTORADIOBUTTON "Chiedere prima di applicare le nuove impostazioni dei colori.", IDC_ASKME_RB, 14, 146, 224, 10 Modified: trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc [iso-8859-1] Thu Jun 19 01:15:59 2008 @@ -233,7 +233,7 @@ BEGIN IDS_CPLNAME "Suoni e Dispositivi audio" IDS_CPLDESCRIPTION "Cambia lo schema dei suoni per il tuo computer o configura le impostazioni per gli altoparlanti e i dispositivi di registrazione." - IDS_NO_SOUND "(None)" + IDS_NO_SOUND "(nessuno)" 5825 "Errore del programma" 5826 "Chiudere il programma" @@ -248,9 +248,9 @@ 5835 "Menu popup" 5836 "Minimizzare" 5837 "Notifica nuova email" - 5838 "Iniziare avigazione" + 5838 "Iniziare navigazione" 5839 "Aprire programma" - 5840 "Stama completata" + 5840 "Stampa completata" 5841 "Ripristinare giù" 5842 "Ripristinare su" 5843 "Asterisco" Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Thu Jun 19 01:15:59 2008 @@ -51,7 +51,7 @@ BEGIN LTEXT "I privilegi di amministrazione sono necessari per la maggior parte delle impostazioni seguenti.", IDC_STATIC, 12, 5, 236, 8 GROUPBOX "Prestazioni", IDC_STATIC, 6, 18, 244, 50 - LTEXT "Le opzioni di controllo delle prestazioni definiscono come è usata lamemoria dalle applicazioni, ha un effetto sulla velocità del computer.", IDC_STATIC, 16, 29, 210, 17 + LTEXT "Queste opzioni definiscono come è usata la memoria dalle applicazioni, ha un effetto sulla velocità del computer.", IDC_STATIC, 16, 29, 210, 17 PUSHBUTTON "Impostazioni", IDC_PERFOR, 194, 48, 50, 14 GROUPBOX "Profili utente", IDC_STATIC, 6,75,244,48

16 years, 6 months

[jimtabor] 34020: Path does not work and it locks up the system with out any debug information. I will try to have it ready before 0.3.5 is release.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Jun 18 20:47:57 2008 New Revision: 34020 URL: http://svn.reactos.org/svn/reactos?rev=34020&view=rev Log: Path does not work and it locks up the system with out any debug information. I will try to have it ready before 0.3.5 is release. Modified: trunk/reactos/subsystems/win32/win32k/include/path.h trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/path.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/path.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/path.h [iso-8859-1] Wed Jun 18 20:47:57 2008 @@ -1,5 +1,35 @@ #ifndef _WIN32K_PATH_H #define _WIN32K_PATH_H + +typedef struct _PATH +{ + BASEOBJECT BaseObject; + + RECTFX rcfxBoundBox; + POINTFX ptfxSubPathStart; + + // Things to convert from: + DWORD state; + POINT *pPoints; + BYTE *pFlags; + int numEntriesUsed; + int numEntriesAllocated; + BOOL newStroke; +} PATH, *PPATH; + +typedef struct _EPATHOBJ +{ + PATHOBJ po; + PPATH pPath; +} EPATHOBJ, *PEPATHOBJ; + +#define PATH_AllocPath() ((PPATH) GDIOBJ_AllocObj(GDIObjType_PATH_TYPE)) +#define PATH_AllocPathWithHandle() ((PPATH) GDIOBJ_AllocObjWithHandle (GDI_OBJECT_TYPE_PATH)) +#define PATH_FreePath(pPath) GDIOBJ_FreeObj((POBJ)pPath, GDIObjType_PATH_TYPE) +#define PATH_FreePathByHandle(hPath) GDIOBJ_FreeObjbyHandle((HGDIOBJ)hPath, GDI_OBJECT_TYPE_PATH) +#define PATH_LockPath(hPath) ((PROSRGNDATA)GDIOBJ_LockObj((HGDIOBJ)hPath, GDI_OBJECT_TYPE_PATH)) +#define PATH_UnlockPath(pPath) GDIOBJ_UnlockObjByPtr((POBJ)pPath) + #define PATH_IsPathOpen(path) ((path).state==PATH_Open) Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Wed Jun 18 20:47:57 2008 @@ -46,7 +46,7 @@ {1, sizeof(ROSRGNDATA), TAG_REGION, REGION_Cleanup}, /* 04 RGN */ {1, sizeof(BITMAPOBJ), TAG_SURFACE, BITMAP_Cleanup}, /* 05 SURFACE */ {1, sizeof(CLIENTOBJ), TAG_CLIENTOBJ, GDI_CleanupDummy}, /* 06 CLIENTOBJ: METADC,... */ - {0, 0, TAG_PATH, NULL}, /* 07 PATH, unused */ + {1, sizeof(PATH), TAG_PATH, GDI_CleanupDummy}, /* 07 PATH */ {1, sizeof(PALGDI), TAG_PALETTE, PALETTE_Cleanup}, /* 08 PAL */ {1, sizeof(COLORSPACE), TAG_ICMLCS, GDI_CleanupDummy}, /* 09 ICMLCS, */ {1, sizeof(TEXTOBJ), TAG_LFONT, GDI_CleanupDummy}, /* 0a LFONT */

16 years, 6 months

[jimtabor] 34019: Set default miter limit.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Jun 18 20:29:01 2008 New Revision: 34019 URL: http://svn.reactos.org/svn/reactos?rev=34019&view=rev Log: Set default miter limit. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Wed Jun 18 20:29:01 2008 @@ -2515,6 +2515,7 @@ TextIntRealizeFont(Dc_Attr->hlfntNew); NewDC->DcLevel.hpal = NtGdiGetStockObject(DEFAULT_PALETTE); + NewDC->DcLevel.laPath.eMiterLimit = 10.0; DC_UnlockDc(NewDC);

16 years, 6 months

[dchapyshev] 34018: - Fix typos

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Jun 18 14:33:55 2008 New Revision: 34018 URL: http://svn.reactos.org/svn/reactos?rev=34018&view=rev Log: - Fix typos Modified: trunk/reactos/drivers/network/acd/include/acdapi.h trunk/reactos/drivers/network/acd/rasacd.rc Modified: trunk/reactos/drivers/network/acd/include/acdapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/acd/includ… ============================================================================== --- trunk/reactos/drivers/network/acd/include/acdapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/acd/include/acdapi.h [iso-8859-1] Wed Jun 18 14:33:55 2008 @@ -8,4 +8,9 @@ * 25/05/2008 Created */ +#ifndef _ACDAPI_H +#define _ACDAPI_H + #define FILE_DEVICE_RASACD 0xf1 + +#endif /* _ACDAPI_H */ Modified: trunk/reactos/drivers/network/acd/rasacd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/acd/rasacd… ============================================================================== --- trunk/reactos/drivers/network/acd/rasacd.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/network/acd/rasacd.rc [iso-8859-1] Wed Jun 18 14:33:55 2008 @@ -1,5 +1,3 @@ -/* $Id: ndis.rc 21293 2006-03-11 23:55:37Z jimtabor $ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "NDIS Library\0" #define REACTOS_STR_INTERNAL_NAME "ndis\0"

16 years, 6 months

[mkupfer] 34017: Jeffrey Morlan <mrnobo1024 AT yahoo DOT com> - Patch for Optimizations of TextIntGetTextExtentPoint - See issue #3366 for more details.

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Wed Jun 18 14:15:37 2008 New Revision: 34017 URL: http://svn.reactos.org/svn/reactos?rev=34017&view=rev Log: Jeffrey Morlan <mrnobo1024 AT yahoo DOT com> - Patch for Optimizations of TextIntGetTextExtentPoint - See issue #3366 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Wed Jun 18 14:15:37 2008 @@ -3452,10 +3452,13 @@ PFONTGDI FontGDI; FT_Face face; FT_GlyphSlot glyph; + FT_Glyph realglyph; INT error, n, glyph_index, i, previous; ULONGLONG TotalWidth = 0; FT_CharMap charmap, found = NULL; BOOL use_kerning; + FT_Render_Mode RenderMode; + BOOLEAN Render; FontGDI = ObjToGDI(TextObj->Font, FONT); @@ -3465,6 +3468,7 @@ *Fit = 0; } + IntLockFreeType; if (face->charmap == NULL) { DPRINT("WARNING: No charmap selected!\n"); @@ -3486,23 +3490,25 @@ DPRINT1("WARNING: Could not find desired charmap!\n"); } - IntLockFreeType; error = FT_Set_Charmap(face, found); - IntUnLockFreeType; if (error) { DPRINT1("WARNING: Could not set the charmap!\n"); } } - IntLockFreeType; + Render = IntIsFontRenderingEnabled(); + if (Render) + RenderMode = IntGetFontRenderMode(&TextObj->logfont.elfEnumLogfontEx.elfLogFont); + else + RenderMode = FT_RENDER_MODE_MONO; + error = FT_Set_Pixel_Sizes(face, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, /* FIXME should set character height if neg */ (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); - IntUnLockFreeType; if (error) { DPRINT1("Error in setting pixel sizes: %u\n", error); @@ -3513,27 +3519,36 @@ for (i = 0; i < Count; i++) { - IntLockFreeType; glyph_index = FT_Get_Char_Index(face, *String); - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - IntUnLockFreeType; - if (error) - { - DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); - } - glyph = face->glyph; + if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) + { + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); + if (error) + { + DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); + break; + } + + glyph = face->glyph; + realglyph = NtGdiGlyphCacheSet(face, glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); + if (!realglyph) + { + DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); + break; + } + } /* retrieve kerning distance */ if (use_kerning && previous && glyph_index) { FT_Vector delta; - IntLockFreeType; FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - IntUnLockFreeType; TotalWidth += delta.x; } - TotalWidth += glyph->advance.x; + TotalWidth += realglyph->advance.x >> 10; if (((TotalWidth + 32) >> 6) <= MaxExtent && NULL != Fit) { @@ -3547,6 +3562,7 @@ previous = glyph_index; String++; } + IntUnLockFreeType; Size->cx = (TotalWidth + 32) >> 6; Size->cy = (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight);

16 years, 6 months

← Newer
1
...
18
19
20
21
22
23
24
...
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 June 2008