Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 47831: [OSKITTCP] Use RtlUlongByteSwap / RtlUshortByteSwap for byte swapping. They are portable and intrinsics on x86.
by tkreuzer＠svn.reactos.org 23 Jun '10

23 Jun '10

Author: tkreuzer Date: Wed Jun 23 11:37:39 2010 New Revision: 47831 URL: http://svn.reactos.org/svn/reactos?rev=47831&view=rev Log: [OSKITTCP] Use RtlUlongByteSwap / RtlUshortByteSwap for byte swapping. They are portable and intrinsics on x86. Modified: trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/endian.h Modified: trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/endian.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/endian.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/endian.h [iso-8859-1] Wed Jun 23 11:37:39 2010 @@ -56,61 +56,8 @@ #include <sys/cdefs.h> #endif -#ifdef _MSC_VER -static inline unsigned long __byte_swap_long ( unsigned long i ) -{ - char dst[4]; - char* src = (char*)&i; - dst[0] = src[3]; - dst[1] = src[2]; - dst[2] = src[1]; - dst[3] = src[0]; - return *(unsigned long*)&dst[0]; -} - -static inline unsigned short __byte_swap_word ( unsigned short i ) -{ - char dst[2]; - char* src = (char*)&i; - dst[0] = src[1]; - dst[1] = src[0]; - return *(unsigned short*)&dst[0]; -} -#else/*_MSC_VER*/ -#define __word_swap_long(x) \ -({ register u_long __X = (x); \ - __asm ("rorl $16, %1" \ - : "=r" (__X) \ - : "0" (__X)); \ - __X; }) -#if __GNUC__ >= 2 -#define __byte_swap_long(x) \ -__extension__ ({ register u_long __X = (x); \ - __asm ("xchgb %h1, %b1\n\trorl $16, %1\n\txchgb %h1, %b1" \ - : "=q" (__X) \ - : "0" (__X)); \ - __X; }) -#define __byte_swap_word(x) \ -__extension__ ({ register u_short __X = (x); \ - __asm ("xchgb %h1, %b1" \ - : "=q" (__X) \ - : "0" (__X)); \ - __X; }) -#else /* __GNUC__ >= 2 */ -#define __byte_swap_long(x) \ -({ register u_long __X = (x); \ - __asm ("rorw $8, %w1\n\trorl $16, %1\n\trorw $8, %w1" \ - : "=r" (__X) \ - : "0" (__X)); \ - __X; }) -#define __byte_swap_word(x) \ -({ register u_short __X = (x); \ - __asm ("rorw $8, %w1" \ - : "=r" (__X) \ - : "0" (__X)); \ - __X; }) -#endif /* __GNUC__ >= 2 */ -#endif /* _MSC_VER */ +#define __byte_swap_long RtlUlongByteSwap +#define __byte_swap_word RtlUshortByteSwap /* * Macros for network/external number representation conversion.

1 0

[dreimer] 47830: Add Ukrainian Translations to rapps by Igor Paliychuk. Update VLC to 1.1.0
by dreimer＠svn.reactos.org 22 Jun '10

22 Jun '10

Author: dreimer Date: Tue Jun 22 21:02:37 2010 New Revision: 47830 URL: http://svn.reactos.org/svn/reactos?rev=47830&view=rev Log: Add Ukrainian Translations to rapps by Igor Paliychuk. Update VLC to 1.1.0 Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt trunk/reactos/base/applications/rapps/rapps/abiword.txt trunk/reactos/base/applications/rapps/rapps/abiword28x.txt trunk/reactos/base/applications/rapps/rapps/abyss.txt trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt trunk/reactos/base/applications/rapps/rapps/audiograbber.txt trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt trunk/reactos/base/applications/rapps/rapps/diablo2.txt trunk/reactos/base/applications/rapps/rapps/dosblaster.txt trunk/reactos/base/applications/rapps/rapps/dosbox.txt trunk/reactos/base/applications/rapps/rapps/firefox2.txt trunk/reactos/base/applications/rapps/rapps/firefox3.txt trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/freebasic.txt trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt trunk/reactos/base/applications/rapps/rapps/irfanview.txt trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt trunk/reactos/base/applications/rapps/rapps/kdewin.txt trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt trunk/reactos/base/applications/rapps/rapps/lgeneral.txt trunk/reactos/base/applications/rapps/rapps/lmarbles.txt trunk/reactos/base/applications/rapps/rapps/mfc40.txt trunk/reactos/base/applications/rapps/rapps/mingw.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mirc.txt trunk/reactos/base/applications/rapps/rapps/mono2.txt trunk/reactos/base/applications/rapps/rapps/mpc.txt trunk/reactos/base/applications/rapps/rapps/msxml3.txt trunk/reactos/base/applications/rapps/rapps/offbyone.txt trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/opera9.txt trunk/reactos/base/applications/rapps/rapps/putty.txt trunk/reactos/base/applications/rapps/rapps/python.txt trunk/reactos/base/applications/rapps/rapps/remood.txt trunk/reactos/base/applications/rapps/rapps/rosbe.txt trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt trunk/reactos/base/applications/rapps/rapps/rosbearm.txt trunk/reactos/base/applications/rapps/rapps/sambatng.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/scummvm.txt trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/smplayer.txt trunk/reactos/base/applications/rapps/rapps/steam.txt trunk/reactos/base/applications/rapps/rapps/tahoma.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/tileworld.txt trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt trunk/reactos/base/applications/rapps/rapps/ultravnc.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt trunk/reactos/base/applications/rapps/rapps/vb5run.txt trunk/reactos/base/applications/rapps/rapps/vb6run.txt trunk/reactos/base/applications/rapps/rapps/vc2005run.txt trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc2008run.txt trunk/reactos/base/applications/rapps/rapps/vc6run.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt trunk/reactos/base/applications/rapps/rapps/winboard.txt trunk/reactos/base/applications/rapps/rapps/wme9.txt Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -16,3 +16,6 @@ [Section.040a] Description = Utilidad para crear y abrir 7zip, zip, tar, rar y otros archivos comprimidos. + +[Section.0422] +Description = Ð£ÑÐ¸Ð»ÑÑÐ° Ð´Ð»Ñ ÑÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÑÐ° Ð²ÑÐ´ÐºÑÐ¸ÑÑÑ 7zip, zip, tar, rar ÑÐ° ÑÐ½ÑÐ¸Ñ Ð°ÑÑÑÐ²Ð½Ð¸Ñ ÑÐ°Ð¹Ð»ÑÐ². Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Edytor tekstu. + +[Section.0422] +Description = Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ Ð¿ÑÐ¾ÑÐµÑÐ¾Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/abiword28x.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abiword28x.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abiword28x.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Edytor tekstu. + +[Section.0422] +Description = Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ Ð¿ÑÐ¾ÑÐµÑÐ¾Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -13,3 +13,6 @@ [Section.0407] Description = Abyss Web Server ermÃ¶glicht es Webseiten auf Ihrem Computer zu hosten. Er unterstÃ¼tzt sichere SSL/TLS Verbindungen (HTTPS) sowie eine Vielfalt an Web Technologien. Er kann ebenfalls PHP, Perl, Python, ASP, ASP.NET, und Ruby on Rails Web Anwendungen ausfÃ¼hren, welche von Datenbanken, wie MySQL, SQLite, MS SQL Server, MS Access, oder Oracle unterstÃ¼tzt werden kÃ¶nnen. + +[Section.0422] +Description = Abyss Web Server Ð´Ð¾Ð·Ð²Ð¾Ð»Ð¸ÑÑ Ð²Ð°Ð¼ ÑÑÑÐ¸Ð¼ÑÐ²Ð°ÑÐ¸ Ð²ÐµÐ±-ÑÐ°Ð¹ÑÐ¸ Ð½Ð° Ð²Ð°ÑÐ¾Ð¼Ñ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÑ. ÐÑÐ´ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÑ Ð±ÐµÐ·Ð¿ÐµÑÐ½Ñ SSL/TLS Ð·'ÑÐ´Ð½Ð°Ð½Ð½Ñ (HTTPS) ÑÐ° Ð²ÐµÐ»Ð¸ÐºÐ¸Ð¹ ÑÑÐ´ Ð²ÐµÐ±-ÑÐµÑÐ½Ð¾Ð»Ð¾Ð³ÑÐ¹. ÐÑÐ½ ÑÐ°ÐºÐ¾Ð¶ Ð·Ð°Ð¿ÑÑÐºÐ°Ñ PHP, Perl, Python, ASP, ASP.NET, ÑÐ° Ruby on Rails Ð²ÐµÐ±-Ð´Ð¾Ð´Ð°ÑÐºÐ¸, ÑÐºÑ Ð¼Ð¾Ð¶ÑÑÑ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÐ²Ð°ÑÐ¸ÑÑ ÑÐ°ÐºÐ¸Ð¼Ð¸ Ð±Ð°Ð·Ð°Ð¼Ð¸ Ð´Ð°Ð½Ð¸Ñ, ÑÐº MySQL, SQLite, MS SQL Server, MS Access, ÑÐ¸ Oracle. Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -34,3 +34,9 @@ Licence = ÐÐµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Description = Ð Ð°Ð·Ð°ÑÑÐ¸Ð²Ð¸ÑÑÐ¹ÑÐµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ Ð² Ð¿Ð°Ð¿ÐºÑ "ReactOS", Ð·Ð°ÑÐµÐ¼ Ð´Ð²Ð°Ð¶Ð´Ñ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. URLSite = ÐÐµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ + +[Section.0422] +Name = ÐÑÐ°Ð¹Ð²ÐµÑ AC97 Ð´Ð»Ñ VirtualBox +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Description = Ð Ð°Ð·Ð°ÑÑÑÐ²ÑÐ¹ÑÐµ Ð²Ð¼ÑÑÑ Ð² ÑÐµÐºÑ "ReactOS" Ð¿ÑÑÐ»Ñ ÑÐ¾Ð³Ð¾ Ð´Ð²ÑÑÑ Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. +URLSite = ÐÐµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ Modified: trunk/reactos/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/audiograbber.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/audiograbber.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Bardzo dobry CD Ripper/konwerter plikÃ³w audio. + +[Section.0422] +Description = Ð§ÑÐ´Ð¾Ð²Ð¸Ð¹ CD Ð ÑÐ¿Ð¿ÐµÑ/ÐÐ¾Ð½Ð²ÐµÑÑÐµÑ Ð°ÑÐ´ÑÐ¾ ÑÐ°Ð¹Ð»ÑÐ². Modified: trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -22,3 +22,7 @@ [Section.0415] Licence = Nieznana Description = X jest uÅ¼ywana przez czÄÅÄ aplikacji. + +[Section.0422] +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Description = Ð¤Ð°Ð¹Ð» Ð¿Ð¾ÑÑÑÐ±ÐµÐ½ Ð´ÐµÐºÐ¾ÑÑÐ¸Ð¼ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð°Ð¼. Modified: trunk/reactos/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Diablo 2 Shareware. Do poprawnego dziaÅania wymagany jest zainstalowany zeckensacks glide wrapper. + +[Section.0422] +Description = Diablo 2 Shareware. ÐÐ»Ñ Ð·Ð°Ð¿ÑÑÐºÑ Ð¿Ð¾ÑÑÑÐ±ÐµÐ½ zeckensack's glide wrapper. Modified: trunk/reactos/base/applications/rapps/rapps/dosblaster.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dosblaster.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/dosblaster.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -16,3 +16,6 @@ [Section.040a] Description = DosBlaster en una extensiÃ³n Shell que permite abrir cualquier ejecutable DOS en DOSBox desde el botÃ³n derecho del ratÃ³n. Esta versiÃ³n contiene DOSBox 0.70, pero puede ser actualizado facilmente instalando una nueva versiÃ³n de DOSBox en la carpeta de DosBlaster. + +[Section.0422] +Description = DosBlaster ÑÐµ ÑÐ¾Ð·ÑÐ¸ÑÐµÐ½Ð½Ñ Ð¾Ð±Ð¾Ð»Ð¾Ð½ÐºÐ¸, ÑÐºÐµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÐ¸ Ð±ÑÐ´Ñ-ÑÐºÐ¸Ð¹ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð²ÑÐ¸Ð¹ ÑÐ°Ð¹Ð» DOS Ð² DOSBox ÑÐµÑÐµÐ· Ð¿ÑÐ°Ð²Ð¸Ð¹ ÐºÐ»ÑÐº. Ð¦Ñ Ð²ÐµÑÑÑÑ Ð¼ÑÑÑÐ¸ÑÑ DOSBox 0.70, Ð°Ð»Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑÑÐ¸ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð° Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑÐ¼ Ð½Ð¾Ð²ÑÑÐ¾Ñ Ð²ÐµÑÑÑÑ DOSBox Ð² ÑÐµÐºÐ¸ DosBlaster. Modified: trunk/reactos/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = DOSBox - emulator DOSa. + +[Section.0422] +Description = DOSBox - ÐµÐ¼ÑÐ»ÑÑÐ¾Ñ DOSÑ. Modified: trunk/reactos/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -25,3 +25,6 @@ [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². + +[Section.0422] +Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Modified: trunk/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -40,3 +40,9 @@ Size = 7.4M URLSite = http://www.mozilla-europe.org/ru/ URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-re… + +[Section.0422] +Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². +Size = 7.3M +URLSite = http://www.mozilla-europe.org/uk/ +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-re… Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -40,3 +40,9 @@ Size = 8.2M URLSite = http://www.mozilla-europe.org/ru/ URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/ru… + +[Section.0422] +Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². +Size = 8.2M +URLSite = http://www.mozilla-europe.org/uk/ +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/uk… Modified: trunk/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Otwarty kompilator BASIC, ze skÅadniÄ kompatybilnÄ z QBASIC. + +[Section.0422] +Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ ÐºÐ¾Ð¼Ð¿ÑÐ»ÑÑÐ¾Ñ BASIC. Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸Ñ ÑÑÐ¼ÑÑÐ½Ð¸Ð¹ Ð· QBASIC. Modified: trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = glidewrapper jest potrzebny do uruchomienia Diablo2 w ReactOS-ie. + +[Section.0422] +Description = glidewrapper Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ð¸Ð¹ Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÑ Diablo2 Ð² ReactOS. Modified: trunk/reactos/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/irfanview.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/irfanview.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -22,3 +22,7 @@ [Section.0415] Licence = Freeware (dla uÅ¼ytku domowego) Description = PrzeglÄdarka dla bardzo wielu typÃ³w obrazÃ³w, plikÃ³w audio oraz wideo. + +[Section.0422] +Licence = Freeware (Ð´Ð»Ñ Ð´Ð¾Ð¼Ð°ÑÐ½ÑÐ¾Ð³Ð¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð½Ñ) +Description = ÐÐµÑÐµÐ³Ð»ÑÐ´Ð°Ñ Ð´Ð»Ñ Ð²ÑÑÑ Ð²Ð¸Ð´ÑÐ² Ð³ÑÐ°ÑÑÑÐ½Ð¸Ñ ÑÐ° Ð°ÑÐ´ÑÐ¾/Ð²ÑÐ´ÐµÐ¾ ÑÐ°Ð¹Ð»ÑÐ². Modified: trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -22,3 +22,7 @@ [Section.0415] Licence = Freeware (dla uÅ¼ytku domowego) Description = Wtyczki otwierajÄce dodatkowe typy plikÃ³w w Irfanview. + +[Section.0422] +Licence = Freeware (Ð´Ð»Ñ Ð´Ð¾Ð¼Ð°ÑÐ½ÑÐ¾Ð³Ð¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð½Ñ) +Description = ÐÐ¾Ð´Ð°ÑÐºÐ¾Ð²Ñ Ð¿Ð»Ð°Ð³ÑÐ½Ð¸ Ð´Ð»Ñ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÐºÐ¸ Ð±ÑÐ»ÑÑÐ¾Ñ ÐºÑÐ»ÑÐºÐ¾ÑÑÑ ÑÐ°Ð¹Ð»Ð¾Ð²Ð¸Ñ ÑÐ¸Ð¿ÑÐ². Modified: trunk/reactos/base/applications/rapps/rapps/kdewin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/kdewin.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/kdewin.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -13,3 +13,6 @@ [Section.0407] Description = KDE fÃ¼r Windows. + +[Section.0422] +Description = KDE Ð´Ð»Ñ Windows. Modified: trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Klon Breakouta/Arkanoida napisany przy uÅ¼yciu biblioteki SDL. + +[Section.0422] +Description = ÐÐ»Ð¾Ð½ Breakouta/Arkanoida, ÑÐ¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÑ Ð±ÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ SDL. Modified: trunk/reactos/base/applications/rapps/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lgeneral.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lgeneral.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Klon gry Panzer General napisany przy uÅ¼yciu biblioteki SDL. + +[Section.0422] +Description = ÐÐ»Ð¾Ð½ Ð³ÑÐ¸ Panzer General, ÑÐ¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÑ Ð±ÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ SDL. Modified: trunk/reactos/base/applications/rapps/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lmarbles.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lmarbles.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Klon gry Atomix, uÅ¼ywajÄcy biblioteki SDL. + +[Section.0422] +Description = ÐÐ»Ð¾Ð½ Ð³ÑÐ¸ Atomix, ÑÐ¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÑ Ð±ÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ SDL. Modified: trunk/reactos/base/applications/rapps/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mfc40.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mfc40.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -25,3 +25,8 @@ Name = PrzeglÄdarka OLE oraz MFC (Microsoft Foundation Classes) wersja 4 Licence = Nieznana Description = Biblioteka MFC 4 jest uÅ¼ywana przez czÄÅÄ aplikacji. + +[Section.0422] +Name = ÐÐµÑÐµÐ³Ð»ÑÐ´Ð°Ñ OLE ÑÐ° MFC (Microsoft Foundation Classes) Ð²ÐµÑÑÑÑ 4 +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ° MFC 4 Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ð° Ð´ÐµÐºÐ¾ÑÑÐ¸Ð¼ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð°Ð¼. Modified: trunk/reactos/base/applications/rapps/rapps/mingw.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mingw.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mingw.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Kompilator GCC dla platformy Windows wraz z dodatkowymi narzÄdziami (GDB, make, itd.). + +[Section.0422] +Description = ÐÐ¾Ð¼Ð¿ÑÐ»ÑÑÐ¾Ñ GCC Ð´Ð»Ñ Ð¿Ð»Ð°ÑÑÐ¾ÑÐ¼Ð¸ Windows Ð· Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ð¸Ð¼Ð¸ ÑÐ½ÑÑÑÑÐ¼ÐµÐ½ÑÐ°Ð¼Ð¸ GDB, GNU make, ÑÐ° ÑÐ½. Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Otwarty komunikator internetowy, obsÅugujÄcy wiele rÃ³Å¼nych protokoÅÃ³w (m.in. GG, Tlen, Jabber, ICQ, IRC) - moÅ¼e nie dziaÅaÄ prawidÅowo. + +[Section.0422] +Description = ÐÑÐ´ÐºÑÐ¸ÑÐ° Ð¼ÑÐ»ÑÑÐ¸Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»ÑÐ½Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð° Ð¼Ð¸ÑÑÑÐ²Ð¸Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ - Ð¼Ð¾Ð¶Ðµ Ð½Ðµ Ð¿ÑÐ°ÑÑÐ²Ð°ÑÐ¸ Ð¿Ð¾Ð²Ð½ÑÑÑÑ. Modified: trunk/reactos/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Najpopularniejszy klient IRC (Internet Relay Chat). + +[Section.0422] +Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÐºÐ»ÑÑÐ½Ñ IRC (Internet Relay Chat). Modified: trunk/reactos/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mono2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mono2.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -1,7 +1,7 @@ ï»¿; UTF-8 [Section] -Name = Mono .net Development Dramework +Name = Mono .net Development Framework Version = 2.6.4 Licence = Unknown Description = Open Source .net Framework. @@ -10,3 +10,6 @@ URLSite = http://www.mono-project.com/Main_Page URLDownload = http://ftp.novell.com/pub/mono/archive/2.6.4/windows-installer/3/mono-2.6.4… CDPath = none + +[Section.0422] +Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ .net Ð¤ÑÐµÐ¹Ð¼Ð²Ð¾ÑÐº. Modified: trunk/reactos/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0419] Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´Ð¸Ð¹Ð½ÑÐ¹ Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ. + +[Section.0422] +Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´ÑÐ¹Ð½Ð¸Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð²Ð°Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/msxml3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/msxml3.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -22,3 +22,7 @@ [Section.0415] Licence = Nieznana Description = NiektÃ³re spoÅrÃ³d plikÃ³w instalacyjnych MSI potrzebujÄ parsera MSXML3. + +[Section.0422] +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Description = MSXML3 Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ð° Ð´Ð»Ñ Ð´ÐµÐºÐ¾ÑÑÐ¸Ñ MSI ÑÐ½ÑÑÐ°Ð»ÑÑÐ¾ÑÑÐ². Modified: trunk/reactos/base/applications/rapps/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/offbyone.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/offbyone.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Bardzo maÅa i szybka przeglÄdarka internetowa z peÅnÄ obsÅugÄ HTML 3.2. + +[Section.0422] +Description = ÐÑÐ¶Ðµ Ð¼Ð°Ð»Ð¸Ð¹ ÑÐ° ÑÐ²Ð¸Ð´ÐºÐ¸Ð¹ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑ Ð· Ð¿Ð¾Ð²Ð½Ð¾Ñ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÐºÐ¾Ñ HTML 3.2. Modified: trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -28,3 +28,9 @@ Description = Otwarty pakiet biurowy. URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/pl/2… Size = 113.9M + +[Section.0422] +URLSite = http://ua.openoffice.org/ +Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. +URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/ru/2… +Size = 114.8M Modified: trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -28,3 +28,9 @@ URLSite = http://pl.openoffice.org/ Size = 130.0MB URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/pl/3.2.1/OOo_3.2.1_Win_x86_ins… + +[Section.0422] +Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. +URLSite = http://ua.openoffice.org/ +Size = 128.0MB +URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/ru/3.2.1/OOo_3.2.1_Win_x86_ins… Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Otwarty klon silnika gry "Transport Tycoon Deluxe". Do poprawnego dziaÅania potrzebna jest kopia gry Transport Tycoon. + +[Section.0422] +Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ ÐºÐ»Ð¾Ð½ Ð´Ð²Ð¸Ð³ÑÐ½Ð° Ð³ÑÐ¸ "Transport Tycoon Deluxe". ÐÐ°Ð¼ Ð¿Ð¾ÑÑÑÐ±Ð½Ð° ÐºÐ¾Ð¿ÑÑ Ð³ÑÐ¸ Transport Tycoon. Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -22,3 +22,6 @@ [Section.0419] Description = ÐÐ¾Ð¿ÑÐ»ÑÑÐ½ÑÐ¹ Ð±ÑÐ°ÑÐ·ÐµÑ ÑÐ¾ Ð¼Ð½Ð¾Ð³Ð¸Ð¼Ð¸ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐ¼Ð¸ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑÐ¼Ð¸, Ð²ÐºÐ»ÑÑÐ°ÑÑÐ¸Ð¹ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð² Ð¿Ð¾ÑÑÑ Ð¸ BitTorrent. + +[Section.0422] +Description = ÐÐ¾Ð¿ÑÐ»ÑÑÐ½Ð¸Ð¹ Ð±ÑÐ°ÑÐ·ÐµÑ Ð· Ð±Ð°Ð³Ð°ÑÑÐ¼Ð° Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ð¸Ð¼Ð¸ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑÐ¼Ð¸, ÑÐºÐ¸Ð¹ Ð²ÐºÐ»ÑÑÐ°Ñ Ð² ÑÐµÐ±Ðµ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ð¹ ÑÐ° BitTorrent ÐºÐ»ÑÑÐ½ÑÐ¸. Modified: trunk/reactos/base/applications/rapps/rapps/opera9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/opera9.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/opera9.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -22,3 +22,6 @@ [Section.0419] Description = ÐÐ¾Ð¿ÑÐ»ÑÑÐ½ÑÐ¹ Ð±ÑÐ°ÑÐ·ÐµÑ ÑÐ¾ Ð¼Ð½Ð¾Ð³Ð¸Ð¼Ð¸ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐ¼Ð¸ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑÐ¼Ð¸, Ð²ÐºÐ»ÑÑÐ°ÑÑÐ¸Ð¹ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð² Ð¿Ð¾ÑÑÑ Ð¸ BitTorrent. + +[Section.0422] +Description = ÐÐ¾Ð¿ÑÐ»ÑÑÐ½Ð¸Ð¹ Ð±ÑÐ°ÑÐ·ÐµÑ Ð· Ð±Ð°Ð³Ð°ÑÑÐ¼Ð° Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ð¸Ð¼Ð¸ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑÐ¼Ð¸, ÑÐºÐ¸Ð¹ Ð²ÐºÐ»ÑÑÐ°Ñ Ð² ÑÐµÐ±Ðµ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ð¹ ÑÐ° BitTorrent ÐºÐ»ÑÑÐ½ÑÐ¸. Modified: trunk/reactos/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/putty.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/putty.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Darmowy klient obsÅugujÄcy protokoÅy SSH, Telnet, rlogin oraz bezpoÅrednie TCP. + +[Section.0422] +Description = ÐÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ð¹ SSH, Telnet, rlogin ÑÐ° raw TCP ÐºÐ»ÑÑÐ½Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -13,3 +13,6 @@ [Section.0407] Description = Eine sehr mÃ¤chtige, dynamische Programmiersprache. + +[Section.0422] +Description = ÐÑÐ¶Ðµ Ð¿Ð¾ÑÑÐ¶Ð½Ð° Ð´Ð¸Ð½Ð°Ð¼ÑÑÐ½Ð° Ð¼Ð¾Ð²Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ÑÐ²Ð°Ð½Ð½Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/remood.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/remood.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/remood.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -13,3 +13,6 @@ [Section.0407] Description = ReMooD ist ein Port des Doom Legacy Sources. Es versucht das klassische Legacy Erfahrung zusammen mit neuen Features und mehr Stabilität zu bieten. Unterstützt werden Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x und höher; und Linux (x86 und x86_64). + +[Section.0422] +Description = ReMooD Ñ ÐÐ¾ÑÑÐ¾Ð¼ Ð²Ð¸ÑÑÐ´Ð½Ð¸Ñ ÐºÐ¾Ð´ÑÐ² Doom Legacy. ÐÐ¾Ð³Ð¾ Ð¼ÐµÑÐ¾Ñ Ñ Ð´Ð¾Ð´Ð°ÑÐ¸ Ð½Ð¾Ð²Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ ÑÐ° ÑÑÐ°Ð±ÑÐ»ÑÐ½ÑÑÑÑ Ð´Ð¾ Ð´Ð¾ÑÐ²ÑÐ´Ñ ÐºÐ»Ð°ÑÐ¸ÑÐ½Ð¾Ð³Ð¾ Legacy. ÐÑÐ½ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÑ Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x ÑÐ° Ð½Ð¾Ð²ÑÑÑ; Ð° ÑÐ°ÐºÐ¾Ð¶ Linux (x86 ÑÐ° x86_64). Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Pozwala zbudowaÄ obraz pÅyty ReactOS ze ÅºrÃ³deÅ. WiÄcej informacji na Wiki ReactOS. + +[Section.0422] +Description = ÐÐ¾Ð·Ð²Ð¾Ð»ÑÑ Ð·ÑÐ±ÑÐ°ÑÐ¸ ReactOS Ð· Ð²Ð¸ÑÑÐ´Ð½Ð¸Ñ ÐºÐ¾Ð´ÑÐ². ÐÐ° Ð´ÐµÑÐ°Ð»ÑÐ½Ð¾Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑÑ Ð´Ð¸Ð²ÑÑÑÑÑ Ð² ReactOS ÐÑÐºÑ. Modified: trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Pozwala zbudowaÄ obraz pÅyty ReactOS AMD64 ze ÅºrÃ³deÅ. WiÄcej informacji na Wiki ReactOS. + +[Section.0422] +Description = ÐÐ¾Ð·Ð²Ð¾Ð»ÑÑ Ð·ÑÐ±ÑÐ°ÑÐ¸ ReactOS AMD64 Ð· Ð²Ð¸ÑÑÐ´Ð½Ð¸Ñ ÐºÐ¾Ð´ÑÐ². ÐÐ° Ð´ÐµÑÐ°Ð»ÑÐ½Ð¾Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑÑ Ð´Ð¸Ð²ÑÑÑÑÑ Ð² ReactOS ÐÑÐºÑ. Modified: trunk/reactos/base/applications/rapps/rapps/rosbearm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbearm.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbearm.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Pozwala zbudowaÄ obraz pÅyty ReactOS ARM ze ÅºrÃ³deÅ. WiÄcej informacji na Wiki ReactOS. + +[Section.0422] +Description = ÐÐ¾Ð·Ð²Ð¾Ð»ÑÑ Ð·ÑÐ±ÑÐ°ÑÐ¸ ReactOS ARM Ð· Ð²Ð¸ÑÑÐ´Ð½Ð¸Ñ ÐºÐ¾Ð´ÑÐ². ÐÐ° Ð´ÐµÑÐ°Ð»ÑÐ½Ð¾Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑÑ Ð´Ð¸Ð²ÑÑÑÑÑ Ð² ReactOS ÐÑÐºÑ. Modified: trunk/reactos/base/applications/rapps/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sambatng.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sambatng.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = NarzÄdzie pozwalajÄce na dostÄp z poziomu ReactOSa do wspÃ³Ådzielonych folderÃ³w/drukarek Windows. + +[Section.0422] +Description = Ð¦ÐµÐ¹ ÑÐ½ÑÑÑÑÐ¼ÐµÐ½Ñ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑ Ð¾ÑÑÐ¸Ð¼Ð°ÑÐ¸ Ð´Ð¾ÑÑÑÐ¿ Ð´Ð¾ ÑÐ¿ÑÐ»ÑÐ½Ð¸Ñ ÑÐµÐº/Ð¿ÑÐ¸Ð½ÑÐµÑÑÐ² Windows Ð· ReactOSÐ°. Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -16,3 +16,6 @@ [Section.040a] Description = Editor de texto basado en SCIntilla. Originalmente creado para demostrar Scintilla, a crecido para ser un gran editor con capacidad para crear y ejecutar programas. + +[Section.0422] +Description = Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ñ SCIntilla. ÐÑÐ² Ð·ÑÐ±ÑÐ°Ð½Ð¸Ð¹ ÑÐº Ð¿ÑÐµÐ·ÐµÐ½ÑÐ°ÑÑÑ Scintilla, Ð°Ð»Ðµ Ð²Ð¸ÑÑÑ Ð´Ð¾ ÑÐµÐ´Ð°ÐºÑÐ¾ÑÐ° Ð·Ð°Ð³Ð°Ð»ÑÐ½Ð¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð· Ð·Ð°ÑÐ¾Ð±Ð°Ð¼Ð¸ Ð·Ð±Ð¸ÑÐ°Ð½Ð½Ñ ÑÐ° Ð·Ð°Ð¿ÑÑÐºÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼. Modified: trunk/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Program pozwalajÄcy uruchomiÄ stare gry przygodowe (Sam and Max, Day of the Tentacle, Monkey Island) w ReactOS. + +[Section.0422] +Description = ÐÐ¾Ð·Ð²Ð¾Ð»Ð¸ÑÑ Ð³ÑÐ°ÑÐ¸ Sam and Max, Day of the Tentacle ÑÐ° ÑÐ½ÑÑ ÐºÐ»Ð°ÑÐ¸ÑÐ½Ñ ÑÐ³ÑÐ¸ Ð² ReactOS. Modified: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Biblioteka wymagana przez niektÃ³re gry (zwÅaszcza te o otwartym ÅºrÃ³dle). Do jej rozpakowania potrzebny jest 7-Zip lub podobny program. + +[Section.0422] +Description = ÐÐµÐ¾Ð±ÑÑÐ´Ð½Ð¸Ð¹ Ð´Ð»Ñ ÑÐ¾Ð±Ð¾ÑÐ¸ Ð´ÐµÐºÐ¾ÑÑÐ¸Ñ Ð²ÑÐ´ÐºÑÐ¸ÑÐ¸Ñ ÑÐ³Ð¾Ñ. ÐÐ°Ð¼ Ð¿Ð¾ÑÑÑÐ±ÐµÐ½ 7-Zip Ð°Ð±Ð¾ Ð¿Ð¾Ð´ÑÐ±Ð½Ð° ÑÑÐ¸Ð»ÑÑÐ° ÑÐ¾Ð± ÑÐ¾Ð·Ð¿Ð°ÐºÑÐ²Ð°ÑÐ¸ Ð¹Ð¾Ð³Ð¾. Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -22,3 +22,7 @@ [Section.0415] Name = Biblioteka uruchomieniowa Simple Direct Media Layer (SDL) Description = Wymagana przez wiele gier (gÅÃ³wnie o otwartym ÅºrÃ³dle). Do jej rozpakowania potrzebny jest program 7-Zip lub podobny. + +[Section.0415] +Name = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ° Simple Direct Media Layer (SDL) +Description = ÐÐµÐ¾Ð±ÑÑÐ´Ð½Ð° Ð´Ð»Ñ ÑÐ¾Ð±Ð¾ÑÐ¸ Ð±Ð°Ð³Ð°ÑÑÐ¾Ñ Ð²ÑÐ´ÐºÑÐ¸ÑÐ¸Ñ ÑÐ³Ð¾Ñ. ÐÐ°Ð¼ Ð¿Ð¾ÑÑÑÐ±ÐµÐ½ 7-Zip Ð°Ð±Ð¾ Ð¿Ð¾Ð´ÑÐ±Ð½Ð° ÑÑÐ¸Ð»ÑÑÐ° ÑÐ¾Ð± ÑÐ¾Ð·Ð¿Ð°ÐºÑÐ²Ð°ÑÐ¸ ÑÑ. Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -30,3 +30,8 @@ Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 10.4MB URLDownload = http://mozilla.mirror.ac.za/seamonkey/releases/2.0.4/win32/ru/SeaMonkey%20S… + +[Section.0422] +Description = Mozilla Suite Ð¿Ð¾Ð²ÐµÑÐ½ÑÐ²ÑÑ. ÐÐ°ÐºÐµÑ Ð¼ÑÑÑÐ¸ÑÑ Ð² ÑÐ¾Ð±Ñ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ð¹ ÐºÐ»ÑÑÐ½Ñ, IRC-ÐºÐ»ÑÑÐ½Ñ ÑÐ° HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. +Size = 10.4MB +URLDownload = http://mozilla.mirror.ac.za/seamonkey/releases/2.0.4/win32/ru/SeaMonkey%20S… Modified: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -21,3 +21,7 @@ [Section.0415] URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=pl Description = Graficzna nakÅadka na MPlayer, otwarty odtwarzacz filmÃ³w. + +[Section.0422] +URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=uk +Description = ÐÑÐ°ÑÑÑÐ½Ð¸Ð¹ ÑÐ½ÑÐµÑÑÐµÐ¹Ñ Ð´Ð»Ñ MPlayer (Ð¼ÑÐ»ÑÑÐ¸Ð¼ÐµÐ´ÑÐ¹Ð½Ð¸Ð¹ Ð¿Ð»ÐµÑÑ). Modified: trunk/reactos/base/applications/rapps/rapps/steam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/steam.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/steam.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -13,3 +13,6 @@ [Section.0407] Description = Die STEAM Spieleplattform, die von viele Spielen verwendet wird. + +[Section.0422] +Description = ÐÐ³ÑÐ¾Ð²Ð° Ð¿Ð»Ð°ÑÑÐ¾ÑÐ¼Ð°, ÑÐ¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÑÑÑÑÑ Ð±Ð°Ð³Ð°ÑÑÐ¼Ð° ÑÐ³ÑÐ°Ð¼Ð¸. Modified: trunk/reactos/base/applications/rapps/rapps/tahoma.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tahoma.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tahoma.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -15,3 +15,6 @@ Licence = Unbekannt Description = Tahoma Font pack, der von einigen Anwendungen benÃ¶tigt wird (Steam). +[Section.0422] +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Description = ÐÐ°ÐºÐµÑ ÑÑÐ¸ÑÑÑÐ² Tahoma, ÑÐ¾ Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ñ Ð´ÐµÑÐºÐ¸Ð¼ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð°Ð¼ (Steam). Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -34,3 +34,9 @@ Size = 8.8M URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win3… + +[Section.0422] +Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². +Size = 8.8M +URLSite = http://www.mozillamessaging.com/uk/thunderbird/ +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win3… Modified: trunk/reactos/base/applications/rapps/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tileworld.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tileworld.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Udany klon gry Chip's Challenge z Atari Lynx. Zawiera darmowy zestaw grafik CCLP2. + +[Section.0422] +Description = Ð§ÑÐ´Ð¾Ð²Ð¸Ð¹ ÐºÐ»Ð¾Ð½ Ð³ÑÐ¸ Chip's Challenge Ð´Ð»Ñ Atari Lynx. ÐÐºÐ»ÑÑÐµÐ½Ð¾ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ð¹ Ð³ÑÐ°ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ CCLP2, ÑÐ¾Ð¼Ñ Ð²Ð°Ð¼ Ð½Ðµ Ð¿Ð¾ÑÑÑÐ±ÐµÐ½ Ð¾ÑÐ¸Ð³ÑÐ½Ð°Ð»ÑÐ½Ð¸Ð¹. Modified: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Otwarty program graficzny przeznaczony gÅÃ³wnie dla dzieci. + +[Section.0422] +Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð³ÑÐ°ÑÑÑÐ½Ð¸Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ð´Ð»Ñ Ð¼Ð°Ð»Ð¸Ñ Ð´ÑÑÐµÐ¹. Modified: trunk/reactos/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -13,3 +13,6 @@ [Section.040a] Description = Cliente/Servidor VNC de cÃ³digo abierto. + +[Section.0422] +Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ VNC ÐºÐ»ÑÑÐ½Ñ/ÑÐµÑÐ²ÐµÑ. Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -27,3 +27,7 @@ [Section.0419] Licence = ÐÐµÑÐ¿Ð»Ð°ÑÐ½Ð°Ñ Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ð¼Ð¼ÐµÑÑÐµÑÐºÐ¾Ð³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Description = ÐÐ°Ð»ÐµÐ½ÑÐºÐ¸Ð¹ Ð¸ Ð±ÑÑÑÑÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ BitTorrent. + +[Section.0422] +Licence = ÐÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð° Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ð¼ÐµÑÑÑÐ¹Ð½Ð¾Ð³Ð¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð½Ñ +Description = ÐÐ°Ð»ÐµÐ½ÑÐºÐ¸Ð¹ Ñ ÑÐ²Ð¸Ð´ÐºÐ¸Ð¹ ÐºÐ»ÑÑÐ½Ñ BitTorrent. Modified: trunk/reactos/base/applications/rapps/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vb5run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vb5run.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -22,3 +22,7 @@ [Section.0415] Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Basic 5. + +[Section.0422] +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Basic 5. Modified: trunk/reactos/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vb6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vb6run.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -22,3 +22,7 @@ [Section.0415] Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Basic 6. + +[Section.0422] +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Basic 6. Modified: trunk/reactos/base/applications/rapps/rapps/vc2005run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2005run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2005run.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -22,3 +22,7 @@ [Section.0415] Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Studio 2005. + +[Section.0422] +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Studio 2005. Modified: trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -22,3 +22,7 @@ [Section.0415] Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Studio 2005 SP1. + +[Section.0422] +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Studio 2005 SP1. Modified: trunk/reactos/base/applications/rapps/rapps/vc2008run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2008run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2008run.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -22,3 +22,7 @@ [Section.0415] Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Studio 2008. + +[Section.0422] +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Studio 2008. Modified: trunk/reactos/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -22,3 +22,7 @@ [Section.0415] Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Studio 6. + +[Section.0422] +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Studio 6. Modified: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -2,13 +2,13 @@ [Section] Name = VLC media player -Version = 1.0.5 +Version = 1.1.0 Licence = GPL Description = A media player. -Size = 17.2MB +Size = 18.6MB Category = 1 URLSite = http://www.videolan.org/vlc/ -URLDownload = http://mirror.services.wisc.edu/mirrors/videolan/vlc/1.0.5/win32/vlc-1.0.5-… +URLDownload = http://ignum.dl.sourceforge.net/project/vlc/1.1.0/win32/vlc-1.1.0-win32.exe CDPath = none [Section.0407] @@ -19,3 +19,6 @@ [Section.0419] Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´Ð¸Ð¹Ð½ÑÐ¹ Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ. + +[Section.0422] +Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´ÑÐ¹Ð½Ð¸Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð²Ð°Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Description = Graficzna szachownica dla systemu Windows/ReactOS, ktÃ³ra moÅ¼e sÅuÅ¼yÄ jako graficzna nakÅadka dla GNU Chess, Crafty, lub innych programÃ³w szachowych(w tym internetowych serwerÃ³w szachowych) lub szachÃ³w korespondencyjnych. + +[Section.0422] +Description = ÐÑÐ°ÑÑÑÐ½Ð° ÑÐ°ÑÐ¼Ð°ÑÐ½Ð° Ð´Ð¾ÑÐºÐ° Ð´Ð»Ñ Windows/ReactOS, ÑÐ¾ Ð¼Ð¾Ð¶Ðµ ÑÐ»ÑÐ³ÑÐ²Ð°ÑÐ¸ Ð³ÑÐ°ÑÑÑÐ½Ð¸Ð¼ ÑÐ½ÑÐµÑÑÐµÐ¹ÑÐ¾Ð¼ Ð´Ð»Ñ GNU Chess, Crafty, ÑÐ° ÑÐ½ÑÐ¸Ñ ÑÐ°ÑÐ¼Ð°ÑÐ½Ð¸Ñ Ð´Ð²Ð¸Ð³ÑÐ½ÑÐ², Ð´Ð»Ñ ÑÐµÑÐ²ÐµÑÑÐ² ÑÐ½ÑÐµÑÐ½ÐµÑ-ÑÐ°ÑÐ¼Ð°Ñ ÑÐ° Ð´Ð»Ñ ÑÐ°ÑÐ¼Ð°ÑÐ½Ð¾Ñ Ð¿ÐµÑÐµÐ¿Ð¸ÑÐºÐ¸ Ð¿Ð¾ Ðµ-Ð¼ÐµÐ¹Ð». Modified: trunk/reactos/base/applications/rapps/rapps/wme9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/wme9.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/wme9.txt [iso-8859-1] Tue Jun 22 21:02:37 2010 @@ -19,3 +19,6 @@ [Section.0415] Licence = Nieznana + +[Section.0422] +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð°

1 0

[pschweitzer] 47829: [NTOSKRNL] Move the PDO check in IoOpenDeviceRegistryKey() to the function begin. Requested by sir_richard.
by pschweitzer＠svn.reactos.org 22 Jun '10

22 Jun '10

Author: pschweitzer Date: Tue Jun 22 18:51:22 2010 New Revision: 47829 URL: http://svn.reactos.org/svn/reactos?rev=47829&view=rev Log: [NTOSKRNL] Move the PDO check in IoOpenDeviceRegistryKey() to the function begin. Requested by sir_richard. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Tue Jun 22 18:51:22 2010 @@ -3507,6 +3507,10 @@ return STATUS_INVALID_PARAMETER; } + if (!IopIsValidPhysicalDeviceObject(DeviceObject)) + return STATUS_INVALID_DEVICE_REQUEST; + DeviceNode = IopGetDeviceNode(DeviceObject); + /* * Calculate the length of the base key name. This is the full * name for driver key or the name excluding "Device Parameters" @@ -3527,9 +3531,6 @@ } else { - if (!IopIsValidPhysicalDeviceObject(DeviceObject)) - return STATUS_INVALID_DEVICE_REQUEST; - DeviceNode = IopGetDeviceNode(DeviceObject); KeyNameLength += sizeof(EnumKeyName) - sizeof(UNICODE_NULL) + DeviceNode->InstancePath.Length; }

1 0

[pschweitzer] 47828: [NTOSKRNL] Add a macro to check for a valid PDO and use it in IoOpenDeviceRegistryKey(). Requested by sir_richard.
by pschweitzer＠svn.reactos.org 22 Jun '10

22 Jun '10

Author: pschweitzer Date: Tue Jun 22 18:47:22 2010 New Revision: 47828 URL: http://svn.reactos.org/svn/reactos?rev=47828&view=rev Log: [NTOSKRNL] Add a macro to check for a valid PDO and use it in IoOpenDeviceRegistryKey(). Requested by sir_richard. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Tue Jun 22 18:47:22 2010 @@ -207,6 +207,16 @@ (_DeviceNode); \ (_DeviceTreeTraverseContext)->Action = (_Action); \ (_DeviceTreeTraverseContext)->Context = (_Context); } + +/* + * BOOLEAN + * IopIsValidPhysicalDeviceObject( + * IN PDEVICE_OBJECT PhysicalDeviceObject); + */ +#define IopIsValidPhysicalDeviceObject(PhysicalDeviceObject) \ + (((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject) && \ + (((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension)->DeviceNode) && \ + (((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension)->DeviceNode->Flags & DNF_ENUMERATED)) // // Device List Operations Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Tue Jun 22 18:47:22 2010 @@ -3527,9 +3527,9 @@ } else { + if (!IopIsValidPhysicalDeviceObject(DeviceObject)) + return STATUS_INVALID_DEVICE_REQUEST; DeviceNode = IopGetDeviceNode(DeviceObject); - if (!DeviceNode) - return STATUS_INVALID_DEVICE_REQUEST; KeyNameLength += sizeof(EnumKeyName) - sizeof(UNICODE_NULL) + DeviceNode->InstancePath.Length; }

1 0

[cgutman] 47827: [NTOSKRNL] - Check that the caller passed a valid PDO pointer to IoOpenDeviceRegistryKey
by cgutman＠svn.reactos.org 22 Jun '10

22 Jun '10

Author: cgutman Date: Tue Jun 22 15:53:52 2010 New Revision: 47827 URL: http://svn.reactos.org/svn/reactos?rev=47827&view=rev Log: [NTOSKRNL] - Check that the caller passed a valid PDO pointer to IoOpenDeviceRegistryKey Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Tue Jun 22 15:53:52 2010 @@ -3528,6 +3528,8 @@ else { DeviceNode = IopGetDeviceNode(DeviceObject); + if (!DeviceNode) + return STATUS_INVALID_DEVICE_REQUEST; KeyNameLength += sizeof(EnumKeyName) - sizeof(UNICODE_NULL) + DeviceNode->InstancePath.Length; }

1 0

[dreimer] 47826: Added comctl32.ocx, KDEWin, Mono, .net, Media Player Classic, Python, Steam, Tahoma Font and Windows Media Encoder 9 to rapps. Updated VB6, VC2005, VC2008 links according to winetricks.
by dreimer＠svn.reactos.org 22 Jun '10

22 Jun '10

Author: dreimer Date: Tue Jun 22 07:27:43 2010 New Revision: 47826 URL: http://svn.reactos.org/svn/reactos?rev=47826&view=rev Log: Added comctl32.ocx, KDEWin, Mono, .net, Media Player Classic, Python, Steam, Tahoma Font and Windows Media Encoder 9 to rapps. Updated VB6, VC2005, VC2008 links according to winetricks. Added: trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt (with props) trunk/reactos/base/applications/rapps/rapps/kdewin.txt (with props) trunk/reactos/base/applications/rapps/rapps/mono2.txt (with props) trunk/reactos/base/applications/rapps/rapps/mpc.txt (with props) trunk/reactos/base/applications/rapps/rapps/net11.txt (with props) trunk/reactos/base/applications/rapps/rapps/net20.txt (with props) trunk/reactos/base/applications/rapps/rapps/net20sp2.txt (with props) trunk/reactos/base/applications/rapps/rapps/python.txt (with props) trunk/reactos/base/applications/rapps/rapps/steam.txt (with props) trunk/reactos/base/applications/rapps/rapps/tahoma.txt (with props) trunk/reactos/base/applications/rapps/rapps/wme9.txt (with props) Modified: trunk/reactos/base/applications/rapps/rapps/vb6run.txt trunk/reactos/base/applications/rapps/rapps/vc2005run.txt trunk/reactos/base/applications/rapps/rapps/vc2008run.txt Added: trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt [iso-8859-1] Tue Jun 22 07:27:43 2010 @@ -1,0 +1,24 @@ +ï»¿; UTF-8 + +[Section] +Name = Microsoft Visual Basic 6.0 Common Controls +Version = 6.0 +Licence = Unknown +Description = File needed by some applications. +Size = 914kB +Category = 14 +URLSite = http://www.microsoft.com/downloads/details.aspx?FamilyID=25437D98-51D0-41C1… +URLDownload = http://download.microsoft.com/download/3/a/5/3a5925ac-e779-4b1c-bb01-af67dc… +CDPath = none + +[Section.0407] +Licence = Unbekannt +Description = Datei wird von einigen Anwendungen benÃ¶tigt. + +[Section.040a] +Licence = Desconocida +Description = X es necesario para varias aplicaciones. + +[Section.0415] +Licence = Nieznana +Description = X jest uÅ¼ywana przez czÄÅÄ aplikacji. Propchange: trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/kdewin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/kdewin.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/kdewin.txt [iso-8859-1] Tue Jun 22 07:27:43 2010 @@ -1,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = K Desktop Environment +Version = 0.9.6-5 +Licence = GPL +Description = KDE for Windows. +Size = 2.0MB +Category = 15 +URLSite = http://www.winkde.org/ +URLDownload = http://www.winkde.org/pub/kde/ports/win32/installer/kdewin-installer-gui-0.… +CDPath = none + +[Section.0407] +Description = KDE fÃ¼r Windows. Propchange: trunk/reactos/base/applications/rapps/rapps/kdewin.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mono2.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/mono2.txt [iso-8859-1] Tue Jun 22 07:27:43 2010 @@ -1,0 +1,12 @@ +ï»¿; UTF-8 + +[Section] +Name = Mono .net Development Dramework +Version = 2.6.4 +Licence = Unknown +Description = Open Source .net Framework. +Size = 71MB +Category = 14 +URLSite = http://www.mono-project.com/Main_Page +URLDownload = http://ftp.novell.com/pub/mono/archive/2.6.4/windows-installer/3/mono-2.6.4… +CDPath = none Propchange: trunk/reactos/base/applications/rapps/rapps/mono2.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mpc.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] Tue Jun 22 07:27:43 2010 @@ -1,0 +1,21 @@ +ï»¿; UTF-8 + +[Section] +Name = Media Player Classic Home Cinema +Version = 1.3.1249 +Licence = GPL +Description = A media player. +Size = 3.0MB +Category = 1 +URLSite = http://mpc-hc.sourceforge.net/ +URLDownload = http://mesh.dl.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win32/… +CDPath = none + +[Section.0407] +Description = Ein Medienplayer. + +[Section.040a] +Description = Reproductor multimedia. + +[Section.0419] +Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´Ð¸Ð¹Ð½ÑÐ¹ Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ. Propchange: trunk/reactos/base/applications/rapps/rapps/mpc.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/net11.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/net11.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/net11.txt [iso-8859-1] Tue Jun 22 07:27:43 2010 @@ -1,0 +1,12 @@ +ï»¿; UTF-8 + +[Section] +Name = Microsoft .NET Framework Version 1.1 Redistributable Package +Version = 1.1 +Licence = Unknown +Description = Microsoft .NET Framework Version 1.1 Redistributable Package. +Size = 23.1MB +Category = 14 +URLSite = http://www.microsoft.com/downloads/details.aspx?FamilyId=262D25E3-F589-4842… +URLDownload = http://download.microsoft.com/download/a/a/c/aac39226-8825-44ce-90e3-bf8203… +CDPath = none Propchange: trunk/reactos/base/applications/rapps/rapps/net11.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/net20.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/net20.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/net20.txt [iso-8859-1] Tue Jun 22 07:27:43 2010 @@ -1,0 +1,12 @@ +ï»¿; UTF-8 + +[Section] +Name = Microsoft .NET Framework Version 2.0 Redistributable Package +Version = 2.0 +Licence = Unknown +Description = Microsoft .NET Framework Version 2.0 Redistributable Package. +Size = 22.4MB +Category = 14 +URLSite = http://www.microsoft.com/downloads/details.aspx?FamilyID=0856eacb-4362-4b0d… +URLDownload = http://download.microsoft.com/download/5/6/7/567758a3-759e-473e-bf8f-521544… +CDPath = none Propchange: trunk/reactos/base/applications/rapps/rapps/net20.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/net20sp2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/net20sp2.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/net20sp2.txt [iso-8859-1] Tue Jun 22 07:27:43 2010 @@ -1,0 +1,12 @@ +ï»¿; UTF-8 + +[Section] +Name = Microsoft .NET Framework Version 2.0 Service Pack 2 +Version = 2.0SP2 +Licence = Unknown +Description = Microsoft .NET Framework Version 2.0 Service Pack 2 +Size = 23.8MB +Category = 14 +URLSite = http://www.microsoft.com/downloads/details.aspx?familyid=5B2C0358-915B-4EB5… +URLDownload = http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff7… +CDPath = none Propchange: trunk/reactos/base/applications/rapps/rapps/net20sp2.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/python.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] Tue Jun 22 07:27:43 2010 @@ -1,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = Python +Version = 2.6.5 +Licence = GPL/LGPL +Description = A remarkably powerful dynamic programming language. +Size = 14MB +Category = 7 +URLSite = http://www.python.org/ +URLDownload = http://www.python.org/ftp/python/2.6.5/python-2.6.5.msi +CDPath = none + +[Section.0407] +Description = Eine sehr mÃ¤chtige, dynamische Programmiersprache. Propchange: trunk/reactos/base/applications/rapps/rapps/python.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/steam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/steam.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/steam.txt [iso-8859-1] Tue Jun 22 07:27:43 2010 @@ -1,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = STEAM +Version = 1.0 +Licence = Freeware +Description = The STEAM Gaming platform used by many games these days. +Size = 1.5MB +Category = 4 +URLSite = http://steampowered.com/ +URLDownload = http://storefront.steampowered.com/download/SteamInstall.msi +CDPath = none + +[Section.0407] +Description = Die STEAM Spieleplattform, die von viele Spielen verwendet wird. Propchange: trunk/reactos/base/applications/rapps/rapps/steam.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/tahoma.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tahoma.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/tahoma.txt [iso-8859-1] Tue Jun 22 07:27:43 2010 @@ -1,0 +1,17 @@ +ï»¿; UTF-8 + +[Section] +Name = Microsoft Tahoma Font +Version = 1.0 +Licence = Unknown +Description = Tahoma Font pack needed by some apps (Steam). +Size = 305kB +Category = 14 +URLSite = http://support.microsoft.com/ +URLDownload = http://download.microsoft.com/download/office97pro/fonts/1/w95/en-us/tahoma… +CDPath = none + +[Section.0407] +Licence = Unbekannt +Description = Tahoma Font pack, der von einigen Anwendungen benÃ¶tigt wird (Steam). + Propchange: trunk/reactos/base/applications/rapps/rapps/tahoma.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vb6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vb6run.txt [iso-8859-1] Tue Jun 22 07:27:43 2010 @@ -8,7 +8,7 @@ Size = 1.0MB Category = 14 URLSite = http://support.microsoft.com/kb/192461/ -URLDownload = http://download.microsoft.com/download/vb60pro/install/6/win98me/en-us/vbru… +URLDownload = http://download.microsoft.com/download/5/a/d/5ad868a0-8ecd-4bb0-a882-fe53eb… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/vc2005run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2005run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2005run.txt [iso-8859-1] Tue Jun 22 07:27:43 2010 @@ -8,7 +8,7 @@ Size = 2.6MB Category = 14 URLSite = http://www.microsoft.com/Downloads/details.aspx?displaylang=en&FamilyID=32b… -URLDownload = http://download.microsoft.com/download/d/3/4/d342efa6-3266-4157-a2ec-517486… +URLDownload = http://download.microsoft.com/download/6/B/B/6BB661D6-A8AE-4819-B79F-236472… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/vc2008run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2008run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2008run.txt [iso-8859-1] Tue Jun 22 07:27:43 2010 @@ -5,10 +5,10 @@ Version = 8.0 Licence = Unknown Description = Visual Studio 2008 Runtime. -Size = 1.7MB +Size = 4.3MB Category = 14 URLSite = http://www.microsoft.com/DOWNLOADS/details.aspx?FamilyID=9b2da534-3e03-4391… -URLDownload = http://download.microsoft.com/download/1/1/1/1116b75a-9ec3-481a-a3c8-1777b5… +URLDownload = http://download.microsoft.com/download/9/7/7/977B481A-7BA6-4E30-AC40-ED51EB… CDPath = none [Section.0407] Added: trunk/reactos/base/applications/rapps/rapps/wme9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/wme9.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/wme9.txt [iso-8859-1] Tue Jun 22 07:27:43 2010 @@ -1,0 +1,21 @@ +ï»¿; UTF-8 + +[Section] +Name = Windows Media Encoder 9 +Version = 9.0 +Licence = Unknown +Description = Windows Media Encoder 9 +Size = 9.5MB +Category = 14 +URLSite = http://www.microsoft.com/downloads/details.aspx?FamilyID=5691ba02-e496-465a… +URLDownload = http://download.microsoft.com/download/8/1/f/81f9402f-efdd-439d-b2a4-089563… +CDPath = none + +[Section.0407] +Licence = Unbekannt + +[Section.040a] +Licence = Desconocida + +[Section.0415] +Licence = Nieznana Propchange: trunk/reactos/base/applications/rapps/rapps/wme9.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 47825: [NDIS] - Dequeue the timer earlier so the timer queue will be in a valid state if any timers are modified during the miniport's timer callback
by cgutman＠svn.reactos.org 22 Jun '10

22 Jun '10

Author: cgutman Date: Tue Jun 22 05:37:31 2010 New Revision: 47825 URL: http://svn.reactos.org/svn/reactos?rev=47825&view=rev Log: [NDIS] - Dequeue the timer earlier so the timer queue will be in a valid state if any timers are modified during the miniport's timer callback Modified: trunk/reactos/drivers/network/ndis/ndis/time.c Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Tue Jun 22 05:37:31 2010 @@ -170,19 +170,19 @@ { PNDIS_MINIPORT_TIMER Timer = DeferredContext; + /* Only dequeue if the timer has a period of 0 */ + if (!Timer->Timer.Period) + { + KeAcquireSpinLockAtDpcLevel(&Timer->Miniport->Lock); + /* If someone already dequeued it, something is wrong (borked timer implementation?) */ + if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE); + KeReleaseSpinLockFromDpcLevel(&Timer->Miniport->Lock); + } + Timer->MiniportTimerFunction(Dpc, Timer->MiniportTimerContext, SystemArgument1, SystemArgument2); - - /* Only dequeue if the timer has a period of 0 */ - if (!Timer->Timer.Period) - { - KeAcquireSpinLockAtDpcLevel(&Timer->Miniport->Lock); - /* If someone already dequeued it, something is wrong (borked timer implementation?) */ - if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE); - KeReleaseSpinLockFromDpcLevel(&Timer->Miniport->Lock); - } }

1 0

[tkreuzer] 47824: [ODBC32] Merge 41027, 41028, 44611 from amd64 branch Update odbc32 to Wine-1.1.21.
by tkreuzer＠svn.reactos.org 21 Jun '10

21 Jun '10

Author: tkreuzer Date: Mon Jun 21 23:14:01 2010 New Revision: 47824 URL: http://svn.reactos.org/svn/reactos?rev=47824&view=rev Log: [ODBC32] Merge 41027, 41028, 44611 from amd64 branch Update odbc32 to Wine-1.1.21. Added: trunk/reactos/dll/win32/odbc32/odbc32_ros.diff (with props) Modified: trunk/reactos/dll/win32/odbc32/odbc32.rbuild trunk/reactos/dll/win32/odbc32/odbc32.spec trunk/reactos/dll/win32/odbc32/proxyodbc.c trunk/reactos/dll/win32/odbc32/proxyodbc.h Modified: trunk/reactos/dll/win32/odbc32/odbc32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/odbc32.rb… ============================================================================== --- trunk/reactos/dll/win32/odbc32/odbc32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbc32/odbc32.rbuild [iso-8859-1] Mon Jun 21 23:14:01 2010 @@ -7,6 +7,7 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <library>wine</library> + <library>advapi32</library> <file>proxyodbc.c</file> </module> -</group> +</group> Modified: trunk/reactos/dll/win32/odbc32/odbc32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/odbc32.sp… ============================================================================== --- trunk/reactos/dll/win32/odbc32/odbc32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbc32/odbc32.spec [iso-8859-1] Mon Jun 21 23:14:01 2010 @@ -86,43 +86,43 @@ 86 stub ODBSetTryWaitValue 89 stub ODBCSharedPerfMon 90 stub ODBCSharedVSFlag -106 stub SQLColAttributesW -107 stub SQLConnectW -108 stub SQLDescribeColW -110 stub SQLErrorW -111 stub SQLExecDirectW -117 stub SQLGetCursorNameW -119 stub SQLPrepareW -121 stub SQLSetCursorNameW -127 stub SQLColAttributeW -132 stub SQLGetConnectAttrW -133 stub SQLGetDescFieldW -134 stub SQLGetDescRecW -135 stub SQLGetDiagFieldW -136 stub SQLGetDiagRecW -138 stub SQLGetStmtAttrW -139 stub SQLSetConnectAttrW -140 stub SQLColumnsW -141 stub SQLDriverConnectW -142 stub SQLGetConnectOptionW -145 stub SQLGetInfoW -147 stub SQLGetTypeInfoW -150 stub SQLSetConnectOptionW -152 stub SQLSpecialColumnsW -153 stub SQLStatisticsW -154 stub SQLTablesW -155 stub SQLBrowseConnectW -156 stub SQLColumnPrivilegesW -157 stub SQLDataSourcesW -160 stub SQLForeignKeysW -162 stub SQLNativeSqlW -165 stub SQLPrimaryKeysW -166 stub SQLProcedureColumnsW -167 stub SQLProceduresW -170 stub SQLTablePrivilegesW -171 stub SQLDriversW -173 stub SQLSetDescFieldW -176 stub SQLSetStmtAttrW +106 stdcall SQLColAttributesW(long long long ptr long ptr ptr) +107 stdcall SQLConnectW(long wstr long wstr long wstr long) +108 stdcall SQLDescribeColW(long long wstr long ptr ptr ptr ptr ptr) +110 stdcall SQLErrorW(long long long wstr ptr wstr long ptr) +111 stdcall SQLExecDirectW(long wstr long) +117 stdcall SQLGetCursorNameW(long wstr long ptr) +119 stdcall SQLPrepareW(long wstr long) +121 stdcall SQLSetCursorNameW(long wstr long) +127 stdcall SQLColAttributeW(long long long ptr long ptr ptr) +132 stdcall SQLGetConnectAttrW(long long ptr long ptr) +133 stdcall SQLGetDescFieldW(long long long ptr long ptr) +134 stdcall SQLGetDescRecW(long long wstr long ptr ptr ptr ptr ptr ptr ptr) +135 stdcall SQLGetDiagFieldW(long long long long ptr long ptr) +136 stdcall SQLGetDiagRecW(long long long wstr ptr wstr long ptr) +138 stdcall SQLGetStmtAttrW(long long ptr long ptr) +139 stdcall SQLSetConnectAttrW(long long ptr long) +140 stdcall SQLColumnsW(long wstr long wstr long wstr long wstr long) +141 stdcall SQLDriverConnectW(long long wstr long wstr long wstr long) +142 stdcall SQLGetConnectOptionW(long long ptr) +145 stdcall SQLGetInfoW(long long ptr long ptr) +147 stdcall SQLGetTypeInfoW(long long) +150 stdcall SQLSetConnectOptionW(long long long) +152 stdcall SQLSpecialColumnsW(long long wstr long wstr long wstr long long long) +153 stdcall SQLStatisticsW(long wstr long wstr long wstr long long long) +154 stdcall SQLTablesW(long wstr long wstr long wstr long wstr long) +155 stdcall SQLBrowseConnectW(long wstr long wstr long ptr) +156 stdcall SQLColumnPrivilegesW(long wstr long wstr long wstr long wstr long) +157 stdcall SQLDataSourcesW(long long wstr long ptr wstr long ptr) +160 stdcall SQLForeignKeysW(long wstr long wstr long wstr long wstr long wstr long wstr long) +162 stdcall SQLNativeSqlW(long wstr long wstr long ptr) +165 stdcall SQLPrimaryKeysW(long wstr long wstr long wstr long) +166 stdcall SQLProcedureColumnsW(long wstr long wstr long wstr long wstr long) +167 stdcall SQLProceduresW(long wstr long wstr long wstr long) +170 stdcall SQLTablePrivilegesW(long wstr long wstr long wstr long) +171 stdcall SQLDriversW(long long wstr long ptr wstr long ptr) +173 stdcall SQLSetDescFieldW(long long long ptr long) +176 stdcall SQLSetStmtAttrW(long long ptr long) 206 stub SQLColAttributesA 207 stub SQLConnectA 208 stub SQLDescribeColA Added: trunk/reactos/dll/win32/odbc32/odbc32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/odbc32_ro… ============================================================================== --- trunk/reactos/dll/win32/odbc32/odbc32_ros.diff (added) +++ trunk/reactos/dll/win32/odbc32/odbc32_ros.diff [iso-8859-1] Mon Jun 21 23:14:01 2010 @@ -1,0 +1,395 @@ +Index: proxyodbc.c +=================================================================== +--- proxyodbc.c (Revision 41027) ++++ proxyodbc.c (Arbeitskopie) +@@ -733,8 +733,8 @@ + */ + SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, +- SQLPOINTER TargetValue, SQLINTEGER BufferLength, +- SQLINTEGER *StrLen_or_Ind) ++ SQLPOINTER TargetValue, SQLLEN BufferLength, ++ SQLLEN *StrLen_or_Ind) + { + TRACE("\n"); + +@@ -756,9 +756,9 @@ + */ + SQLRETURN WINAPI SQLBindParam(SQLHSTMT StatementHandle, + SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType, +- SQLSMALLINT ParameterType, SQLUINTEGER LengthPrecision, ++ SQLSMALLINT ParameterType, SQLULEN LengthPrecision, + SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue, +- SQLINTEGER *StrLen_or_Ind) ++ SQLLEN *StrLen_or_Ind) + { + TRACE("\n"); + +@@ -926,7 +926,7 @@ + SQLRETURN WINAPI SQLDescribeCol(SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName, + SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, +- SQLSMALLINT *DataType, SQLUINTEGER *ColumnSize, ++ SQLSMALLINT *DataType, SQLULEN *ColumnSize, + SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable) + { + TRACE("\n"); +@@ -1040,7 +1040,7 @@ + /************************************************************************* + * SQLFetchScroll [ODBC32.030] + */ +-SQLRETURN WINAPI SQLFetchScroll(SQLHSTMT StatementHandle, SQLSMALLINT FetchOrientation, SQLINTEGER FetchOffset) ++SQLRETURN WINAPI SQLFetchScroll(SQLHSTMT StatementHandle, SQLSMALLINT FetchOrientation, SQLLEN FetchOffset) + { + TRACE("\n"); + +@@ -1177,8 +1177,8 @@ + */ + SQLRETURN WINAPI SQLGetData(SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, +- SQLPOINTER TargetValue, SQLINTEGER BufferLength, +- SQLINTEGER *StrLen_or_Ind) ++ SQLPOINTER TargetValue, SQLLEN BufferLength, ++ SQLLEN *StrLen_or_Ind) + { + TRACE("\n"); + +@@ -1217,7 +1217,7 @@ + SQLSMALLINT RecNumber, SQLCHAR *Name, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength, + SQLSMALLINT *Type, SQLSMALLINT *SubType, +- SQLINTEGER *Length, SQLSMALLINT *Precision, ++ SQLLEN *Length, SQLSMALLINT *Precision, + SQLSMALLINT *Scale, SQLSMALLINT *Nullable) + { + TRACE("\n"); +@@ -1413,7 +1413,7 @@ + /************************************************************************* + * SQLPutData [ODBC32.049] + */ +-SQLRETURN WINAPI SQLPutData(SQLHSTMT StatementHandle, SQLPOINTER Data, SQLINTEGER StrLen_or_Ind) ++SQLRETURN WINAPI SQLPutData(SQLHSTMT StatementHandle, SQLPOINTER Data, SQLLEN StrLen_or_Ind) + { + TRACE("\n"); + +@@ -1428,7 +1428,7 @@ + /************************************************************************* + * SQLRowCount [ODBC32.020] + */ +-SQLRETURN WINAPI SQLRowCount(SQLHSTMT StatementHandle, SQLINTEGER *RowCount) ++SQLRETURN WINAPI SQLRowCount(SQLHSTMT StatementHandle, SQLLEN *RowCount) + { + TRACE("\n"); + +@@ -1459,7 +1459,7 @@ + /************************************************************************* + * SQLSetConnectOption [ODBC32.050] + */ +-SQLRETURN WINAPI SQLSetConnectOption(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLUINTEGER Value) ++SQLRETURN WINAPI SQLSetConnectOption(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLULEN Value) + { + TRACE("\n"); + +@@ -1508,10 +1508,10 @@ + */ + SQLRETURN WINAPI SQLSetDescRec(SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, SQLSMALLINT Type, +- SQLSMALLINT SubType, SQLINTEGER Length, ++ SQLSMALLINT SubType, SQLLEN Length, + SQLSMALLINT Precision, SQLSMALLINT Scale, +- SQLPOINTER Data, SQLINTEGER *StringLength, +- SQLINTEGER *Indicator) ++ SQLPOINTER Data, SQLLEN *StringLength, ++ SQLLEN *Indicator) + { + TRACE("\n"); + +@@ -1546,9 +1546,9 @@ + */ + SQLRETURN WINAPI SQLSetParam(SQLHSTMT StatementHandle, + SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType, +- SQLSMALLINT ParameterType, SQLUINTEGER LengthPrecision, ++ SQLSMALLINT ParameterType, SQLULEN LengthPrecision, + SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue, +- SQLINTEGER *StrLen_or_Ind) ++ SQLLEN *StrLen_or_Ind) + { + TRACE("\n"); + +@@ -1581,7 +1581,7 @@ + /************************************************************************* + * SQLSetStmtOption [ODBC32.051] + */ +-SQLRETURN WINAPI SQLSetStmtOption(SQLHSTMT StatementHandle, SQLUSMALLINT Option, SQLUINTEGER Value) ++SQLRETURN WINAPI SQLSetStmtOption(SQLHSTMT StatementHandle, SQLUSMALLINT Option, SQLULEN Value) + { + TRACE("\n"); + +@@ -1717,7 +1717,7 @@ + SQLPOINTER rgbDesc, + SQLSMALLINT cbDescMax, + SQLSMALLINT *pcbDesc, +- SQLINTEGER *pfDesc) ++ SQLLEN *pfDesc) + { + TRACE("\n"); + +@@ -1761,7 +1761,7 @@ + SQLHSTMT hstmt, + SQLUSMALLINT ipar, + SQLSMALLINT *pfSqlType, +- SQLUINTEGER *pcbParamDef, ++ SQLULEN *pcbParamDef, + SQLSMALLINT *pibScale, + SQLSMALLINT *pfNullable) + { +@@ -2039,11 +2039,11 @@ + SQLSMALLINT fParamType, + SQLSMALLINT fCType, + SQLSMALLINT fSqlType, +- SQLUINTEGER cbColDef, ++ SQLULEN cbColDef, + SQLSMALLINT ibScale, + SQLPOINTER rgbValue, +- SQLINTEGER cbValueMax, +- SQLINTEGER *pcbValue) ++ SQLLEN cbValueMax, ++ SQLLEN *pcbValue) + { + TRACE("\n"); + +@@ -2086,7 +2086,7 @@ + SQLRETURN WINAPI SQLSetScrollOptions( + SQLHSTMT statement_handle, + SQLUSMALLINT f_concurrency, +- SQLINTEGER crow_keyset, ++ SQLLEN crow_keyset, + SQLUSMALLINT crow_rowset ) + { + TRACE("\n"); +@@ -2138,7 +2138,7 @@ + SQLPOINTER rgbDesc, + SQLSMALLINT cbDescMax, + SQLSMALLINT *pcbDesc, +- SQLINTEGER *pfDesc) ++ SQLLEN *pfDesc) + { + SQLRETURN iResult; + +@@ -2200,9 +2200,9 @@ + * SQLDescribeColW [ODBC32.108] + */ + SQLRETURN WINAPI SQLDescribeColW(SQLHSTMT StatementHandle, +- SQLUSMALLINT ColumnNumber, WCHAR *ColumnName, ++ SQLUSMALLINT ColumnNumber, SQLWCHAR *ColumnName, + SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, +- SQLSMALLINT *DataType, SQLUINTEGER *ColumnSize, ++ SQLSMALLINT *DataType, SQLULEN *ColumnSize, + SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable) + { + SQLRETURN iResult; +@@ -2378,10 +2378,10 @@ + * SQLGetDescRecW [ODBC32.134] + */ + SQLRETURN WINAPI SQLGetDescRecW(SQLHDESC DescriptorHandle, +- SQLSMALLINT RecNumber, WCHAR *Name, ++ SQLSMALLINT RecNumber, SQLWCHAR *Name, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength, + SQLSMALLINT *Type, SQLSMALLINT *SubType, +- SQLINTEGER *Length, SQLSMALLINT *Precision, ++ SQLLEN *Length, SQLSMALLINT *Precision, + SQLSMALLINT *Scale, SQLSMALLINT *Nullable) + { + TRACE("\n"); +@@ -2573,7 +2573,7 @@ + /************************************************************************* + * SQLSetConnectOptionW [ODBC32.150] + */ +-SQLRETURN WINAPI SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLUINTEGER Value) ++SQLRETURN WINAPI SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLULEN Value) + { + TRACE("\n"); + +@@ -2588,9 +2588,9 @@ + * SQLSpecialColumnsW [ODBC32.152] + */ + SQLRETURN WINAPI SQLSpecialColumnsW(SQLHSTMT StatementHandle, +- SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName, +- SQLSMALLINT NameLength1, SQLCHAR *SchemaName, +- SQLSMALLINT NameLength2, SQLCHAR *TableName, ++ SQLUSMALLINT IdentifierType, SQLWCHAR *CatalogName, ++ SQLSMALLINT NameLength1, SQLWCHAR *SchemaName, ++ SQLSMALLINT NameLength2, SQLWCHAR *TableName, + SQLSMALLINT NameLength3, SQLUSMALLINT Scope, + SQLUSMALLINT Nullable) + { +@@ -2607,9 +2607,9 @@ + * SQLStatisticsW [ODBC32.153] + */ + SQLRETURN WINAPI SQLStatisticsW(SQLHSTMT StatementHandle, +- SQLCHAR *CatalogName, SQLSMALLINT NameLength1, +- SQLCHAR *SchemaName, SQLSMALLINT NameLength2, +- SQLCHAR *TableName, SQLSMALLINT NameLength3, ++ SQLWCHAR *CatalogName, SQLSMALLINT NameLength1, ++ SQLWCHAR *SchemaName, SQLSMALLINT NameLength2, ++ SQLWCHAR *TableName, SQLSMALLINT NameLength3, + SQLUSMALLINT Unique, SQLUSMALLINT Reserved) + { + TRACE("\n"); +@@ -2626,10 +2626,10 @@ + * SQLTablesW [ODBC32.154] + */ + SQLRETURN WINAPI SQLTablesW(SQLHSTMT StatementHandle, +- SQLCHAR *CatalogName, SQLSMALLINT NameLength1, +- SQLCHAR *SchemaName, SQLSMALLINT NameLength2, +- SQLCHAR *TableName, SQLSMALLINT NameLength3, +- SQLCHAR *TableType, SQLSMALLINT NameLength4) ++ SQLWCHAR *CatalogName, SQLSMALLINT NameLength1, ++ SQLWCHAR *SchemaName, SQLSMALLINT NameLength2, ++ SQLWCHAR *TableName, SQLSMALLINT NameLength3, ++ SQLWCHAR *TableType, SQLSMALLINT NameLength4) + { + TRACE("\n"); + +@@ -2646,9 +2646,9 @@ + */ + SQLRETURN WINAPI SQLBrowseConnectW( + SQLHDBC hdbc, +- SQLCHAR *szConnStrIn, ++ SQLWCHAR *szConnStrIn, + SQLSMALLINT cbConnStrIn, +- SQLCHAR *szConnStrOut, ++ SQLWCHAR *szConnStrOut, + SQLSMALLINT cbConnStrOutMax, + SQLSMALLINT *pcbConnStrOut) + { +@@ -2666,13 +2666,13 @@ + */ + SQLRETURN WINAPI SQLColumnPrivilegesW( + SQLHSTMT hstmt, +- SQLCHAR *szCatalogName, ++ SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, +- SQLCHAR *szSchemaName, ++ SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, +- SQLCHAR *szTableName, ++ SQLWCHAR *szTableName, + SQLSMALLINT cbTableName, +- SQLCHAR *szColumnName, ++ SQLWCHAR *szColumnName, + SQLSMALLINT cbColumnName) + { + TRACE("\n"); +@@ -2727,17 +2727,17 @@ + */ + SQLRETURN WINAPI SQLForeignKeysW( + SQLHSTMT hstmt, +- SQLCHAR *szPkCatalogName, ++ SQLWCHAR *szPkCatalogName, + SQLSMALLINT cbPkCatalogName, +- SQLCHAR *szPkSchemaName, ++ SQLWCHAR *szPkSchemaName, + SQLSMALLINT cbPkSchemaName, +- SQLCHAR *szPkTableName, ++ SQLWCHAR *szPkTableName, + SQLSMALLINT cbPkTableName, +- SQLCHAR *szFkCatalogName, ++ SQLWCHAR *szFkCatalogName, + SQLSMALLINT cbFkCatalogName, +- SQLCHAR *szFkSchemaName, ++ SQLWCHAR *szFkSchemaName, + SQLSMALLINT cbFkSchemaName, +- SQLCHAR *szFkTableName, ++ SQLWCHAR *szFkTableName, + SQLSMALLINT cbFkTableName) + { + TRACE("\n"); +@@ -2756,9 +2756,9 @@ + */ + SQLRETURN WINAPI SQLNativeSqlW( + SQLHDBC hdbc, +- SQLCHAR *szSqlStrIn, ++ SQLWCHAR *szSqlStrIn, + SQLINTEGER cbSqlStrIn, +- SQLCHAR *szSqlStr, ++ SQLWCHAR *szSqlStr, + SQLINTEGER cbSqlStrMax, + SQLINTEGER *pcbSqlStr) + { +@@ -2776,11 +2776,11 @@ + */ + SQLRETURN WINAPI SQLPrimaryKeysW( + SQLHSTMT hstmt, +- SQLCHAR *szCatalogName, ++ SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, +- SQLCHAR *szSchemaName, ++ SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, +- SQLCHAR *szTableName, ++ SQLWCHAR *szTableName, + SQLSMALLINT cbTableName) + { + TRACE("\n"); +@@ -2798,13 +2798,13 @@ + */ + SQLRETURN WINAPI SQLProcedureColumnsW( + SQLHSTMT hstmt, +- SQLCHAR *szCatalogName, ++ SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, +- SQLCHAR *szSchemaName, ++ SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, +- SQLCHAR *szProcName, ++ SQLWCHAR *szProcName, + SQLSMALLINT cbProcName, +- SQLCHAR *szColumnName, ++ SQLWCHAR *szColumnName, + SQLSMALLINT cbColumnName) + { + TRACE("\n"); +@@ -2822,11 +2822,11 @@ + */ + SQLRETURN WINAPI SQLProceduresW( + SQLHSTMT hstmt, +- SQLCHAR *szCatalogName, ++ SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, +- SQLCHAR *szSchemaName, ++ SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, +- SQLCHAR *szProcName, ++ SQLWCHAR *szProcName, + SQLSMALLINT cbProcName) + { + TRACE("\n"); +@@ -2844,11 +2844,11 @@ + */ + SQLRETURN WINAPI SQLTablePrivilegesW( + SQLHSTMT hstmt, +- SQLCHAR *szCatalogName, ++ SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, +- SQLCHAR *szSchemaName, ++ SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, +- SQLCHAR *szTableName, ++ SQLWCHAR *szTableName, + SQLSMALLINT cbTableName) + { + TRACE("\n"); +@@ -2867,10 +2867,10 @@ + SQLRETURN WINAPI SQLDriversW( + SQLHENV henv, + SQLUSMALLINT fDirection, +- SQLCHAR *szDriverDesc, ++ SQLWCHAR *szDriverDesc, + SQLSMALLINT cbDriverDescMax, + SQLSMALLINT *pcbDriverDesc, +- SQLCHAR *szDriverAttributes, ++ SQLWCHAR *szDriverAttributes, + SQLSMALLINT cbDriverAttrMax, + SQLSMALLINT *pcbDriverAttr) + { Propchange: trunk/reactos/dll/win32/odbc32/odbc32_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/odbc32/proxyodbc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/proxyodbc… ============================================================================== --- trunk/reactos/dll/win32/odbc32/proxyodbc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbc32/proxyodbc.c [iso-8859-1] Mon Jun 21 23:14:01 2010 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * NOTES: - * Proxy ODBC driver manager. This manager delegates all ODBC - * calls to a real ODBC driver manager named by the environment + * Proxy ODBC driver manager. This manager delegates all ODBC + * calls to a real ODBC driver manager named by the environment * variable LIB_ODBC_DRIVER_MANAGER, or to libodbc.so if the * variable is not set. * @@ -36,15 +36,18 @@ #include "windef.h" #include "winbase.h" -#include "wine/debug.h" -//#include "wine/library.h" - -#undef TRACE_ON +#include "winreg.h" #include "sql.h" #include "sqltypes.h" #include "sqlext.h" +#undef TRACE_ON + +#include "wine/debug.h" +#include "wine/library.h" +#include "wine/unicode.h" + #include "proxyodbc.h" static BOOL ODBC_LoadDriverManager(void); @@ -54,84 +57,84 @@ static const DM_FUNC template_func[] = { - /* 00 */ { SQL_API_SQLALLOCCONNECT, "SQLAllocConnect", SQLAllocConnect, NULL }, - /* 01 */ { SQL_API_SQLALLOCENV, "SQLAllocEnv", SQLAllocEnv, NULL }, - /* 02 */ { SQL_API_SQLALLOCHANDLE, "SQLAllocHandle", SQLAllocHandle, NULL }, - /* 03 */ { SQL_API_SQLALLOCSTMT, "SQLAllocStmt", SQLAllocStmt, NULL }, - /* 04 */ { SQL_API_SQLALLOCHANDLESTD, "SQLAllocHandleStd", SQLAllocHandleStd, NULL }, - /* 05 */ { SQL_API_SQLBINDCOL, "SQLBindCol", SQLBindCol, NULL }, - /* 06 */ { SQL_API_SQLBINDPARAM, "SQLBindParam", SQLBindParam, NULL }, - /* 07 */ { SQL_API_SQLBINDPARAMETER, "SQLBindParameter", SQLBindParameter, NULL }, - /* 08 */ { SQL_API_SQLBROWSECONNECT, "SQLBrowseConnect", SQLBrowseConnect, NULL }, - /* 09 */ { SQL_API_SQLBULKOPERATIONS, "SQLBulkOperations", SQLBulkOperations, NULL }, - /* 10 */ { SQL_API_SQLCANCEL, "SQLCancel", SQLCancel, NULL }, - /* 11 */ { SQL_API_SQLCLOSECURSOR, "SQLCloseCursor", SQLCloseCursor, NULL }, - /* 12 */ { SQL_API_SQLCOLATTRIBUTE, "SQLColAttribute", SQLColAttribute, NULL }, - /* 13 */ { SQL_API_SQLCOLATTRIBUTES, "SQLColAttributes", SQLColAttributes, NULL }, - /* 14 */ { SQL_API_SQLCOLUMNPRIVILEGES, "SQLColumnPrivileges", SQLColumnPrivileges, NULL }, - /* 15 */ { SQL_API_SQLCOLUMNS, "SQLColumns", SQLColumns, NULL }, - /* 16 */ { SQL_API_SQLCONNECT, "SQLConnect", SQLConnect, NULL }, - /* 17 */ { SQL_API_SQLCOPYDESC, "SQLCopyDesc", SQLCopyDesc, NULL }, - /* 18 */ { SQL_API_SQLDATASOURCES, "SQLDataSources", SQLDataSources, NULL }, - /* 19 */ { SQL_API_SQLDESCRIBECOL, "SQLDescribeCol", SQLDescribeCol, NULL }, - /* 20 */ { SQL_API_SQLDESCRIBEPARAM, "SQLDescribeParam", SQLDescribeParam, NULL }, - /* 21 */ { SQL_API_SQLDISCONNECT, "SQLDisconnect", SQLDisconnect, NULL }, - /* 22 */ { SQL_API_SQLDRIVERCONNECT, "SQLDriverConnect", SQLDriverConnect, NULL }, - /* 23 */ { SQL_API_SQLDRIVERS, "SQLDrivers", SQLDrivers, NULL }, - /* 24 */ { SQL_API_SQLENDTRAN, "SQLEndTran", SQLEndTran, NULL }, - /* 25 */ { SQL_API_SQLERROR, "SQLError", SQLError, NULL }, - /* 26 */ { SQL_API_SQLEXECDIRECT, "SQLExecDirect", SQLExecDirect, NULL }, - /* 27 */ { SQL_API_SQLEXECUTE, "SQLExecute", SQLExecute, NULL }, - /* 28 */ { SQL_API_SQLEXTENDEDFETCH, "SQLExtendedFetch", SQLExtendedFetch, NULL }, - /* 29 */ { SQL_API_SQLFETCH, "SQLFetch", SQLFetch, NULL }, - /* 30 */ { SQL_API_SQLFETCHSCROLL, "SQLFetchScroll", SQLFetchScroll, NULL }, - /* 31 */ { SQL_API_SQLFOREIGNKEYS, "SQLForeignKeys", SQLForeignKeys, NULL }, - /* 32 */ { SQL_API_SQLFREEENV, "SQLFreeEnv", SQLFreeEnv, NULL }, - /* 33 */ { SQL_API_SQLFREEHANDLE, "SQLFreeHandle", SQLFreeHandle, NULL }, - /* 34 */ { SQL_API_SQLFREESTMT, "SQLFreeStmt", SQLFreeStmt, NULL }, - /* 35 */ { SQL_API_SQLFREECONNECT, "SQLFreeConnect", SQLFreeConnect, NULL }, - /* 36 */ { SQL_API_SQLGETCONNECTATTR, "SQLGetConnectAttr", SQLGetConnectAttr, NULL }, - /* 37 */ { SQL_API_SQLGETCONNECTOPTION, "SQLGetConnectOption", SQLGetConnectOption, NULL }, - /* 38 */ { SQL_API_SQLGETCURSORNAME, "SQLGetCursorName", SQLGetCursorName, NULL }, - /* 39 */ { SQL_API_SQLGETDATA, "SQLGetData", SQLGetData, NULL }, - /* 40 */ { SQL_API_SQLGETDESCFIELD, "SQLGetDescField", SQLGetDescField, NULL }, - /* 41 */ { SQL_API_SQLGETDESCREC, "SQLGetDescRec", SQLGetDescRec, NULL }, - /* 42 */ { SQL_API_SQLGETDIAGFIELD, "SQLGetDiagField", SQLGetDiagField, NULL }, - /* 43 */ { SQL_API_SQLGETENVATTR, "SQLGetEnvAttr", SQLGetEnvAttr, NULL }, - /* 44 */ { SQL_API_SQLGETFUNCTIONS, "SQLGetFunctions", SQLGetFunctions, NULL }, - /* 45 */ { SQL_API_SQLGETINFO, "SQLGetInfo", SQLGetInfo, NULL }, - /* 46 */ { SQL_API_SQLGETSTMTATTR, "SQLGetStmtAttr", SQLGetStmtAttr, NULL }, - /* 47 */ { SQL_API_SQLGETSTMTOPTION, "SQLGetStmtOption", SQLGetStmtOption, NULL }, - /* 48 */ { SQL_API_SQLGETTYPEINFO, "SQLGetTypeInfo", SQLGetTypeInfo, NULL }, - /* 49 */ { SQL_API_SQLMORERESULTS, "SQLMoreResults", SQLMoreResults, NULL }, - /* 50 */ { SQL_API_SQLNATIVESQL, "SQLNativeSql", SQLNativeSql, NULL }, - /* 51 */ { SQL_API_SQLNUMPARAMS, "SQLNumParams", SQLNumParams, NULL }, - /* 52 */ { SQL_API_SQLNUMRESULTCOLS, "SQLNumResultCols", SQLNumResultCols, NULL }, - /* 53 */ { SQL_API_SQLPARAMDATA, "SQLParamData", SQLParamData, NULL }, - /* 54 */ { SQL_API_SQLPARAMOPTIONS, "SQLParamOptions", SQLParamOptions, NULL }, - /* 55 */ { SQL_API_SQLPREPARE, "SQLPrepare", SQLPrepare, NULL }, - /* 56 */ { SQL_API_SQLPRIMARYKEYS, "SQLPrimaryKeys", SQLPrimaryKeys, NULL }, - /* 57 */ { SQL_API_SQLPROCEDURECOLUMNS, "SQLProcedureColumns", SQLProcedureColumns, NULL }, - /* 58 */ { SQL_API_SQLPROCEDURES, "SQLProcedures", SQLProcedures, NULL }, - /* 59 */ { SQL_API_SQLPUTDATA, "SQLPutData", SQLPutData, NULL }, - /* 60 */ { SQL_API_SQLROWCOUNT, "SQLRowCount", SQLRowCount, NULL }, - /* 61 */ { SQL_API_SQLSETCONNECTATTR, "SQLSetConnectAttr", SQLSetConnectAttr, NULL }, - /* 62 */ { SQL_API_SQLSETCONNECTOPTION, "SQLSetConnectOption", SQLSetConnectOption, NULL }, - /* 63 */ { SQL_API_SQLSETCURSORNAME, "SQLSetCursorName", SQLSetCursorName, NULL }, - /* 64 */ { SQL_API_SQLSETDESCFIELD, "SQLSetDescField", SQLSetDescField, NULL }, - /* 65 */ { SQL_API_SQLSETDESCREC, "SQLSetDescRec", SQLSetDescRec, NULL }, - /* 66 */ { SQL_API_SQLSETENVATTR, "SQLSetEnvAttr", SQLSetEnvAttr, NULL }, - /* 67 */ { SQL_API_SQLSETPARAM, "SQLSetParam", SQLSetParam, NULL }, - /* 68 */ { SQL_API_SQLSETPOS, "SQLSetPos", SQLSetPos, NULL }, - /* 69 */ { SQL_API_SQLSETSCROLLOPTIONS, "SQLSetScrollOptions", SQLSetScrollOptions, NULL }, - /* 70 */ { SQL_API_SQLSETSTMTATTR, "SQLSetStmtAttr", SQLSetStmtAttr, NULL }, - /* 71 */ { SQL_API_SQLSETSTMTOPTION, "SQLSetStmtOption", SQLSetStmtOption, NULL }, - /* 72 */ { SQL_API_SQLSPECIALCOLUMNS, "SQLSpecialColumns", SQLSpecialColumns, NULL }, - /* 73 */ { SQL_API_SQLSTATISTICS, "SQLStatistics", SQLStatistics, NULL }, - /* 74 */ { SQL_API_SQLTABLEPRIVILEGES, "SQLTablePrivileges", SQLTablePrivileges, NULL }, - /* 75 */ { SQL_API_SQLTABLES, "SQLTables", SQLTables, NULL }, - /* 76 */ { SQL_API_SQLTRANSACT, "SQLTransact", SQLTransact, NULL }, - /* 77 */ { SQL_API_SQLGETDIAGREC, "SQLGetDiagRec", SQLGetDiagRec, NULL }, + /* 00 */ { SQL_API_SQLALLOCCONNECT, "SQLAllocConnect", SQLAllocConnect, NULL, NULL }, + /* 01 */ { SQL_API_SQLALLOCENV, "SQLAllocEnv", SQLAllocEnv, NULL, NULL }, + /* 02 */ { SQL_API_SQLALLOCHANDLE, "SQLAllocHandle", SQLAllocHandle, NULL, NULL }, + /* 03 */ { SQL_API_SQLALLOCSTMT, "SQLAllocStmt", SQLAllocStmt, NULL, NULL }, + /* 04 */ { SQL_API_SQLALLOCHANDLESTD, "SQLAllocHandleStd", SQLAllocHandleStd, NULL, NULL }, + /* 05 */ { SQL_API_SQLBINDCOL, "SQLBindCol", SQLBindCol, NULL, NULL }, + /* 06 */ { SQL_API_SQLBINDPARAM, "SQLBindParam", SQLBindParam, NULL, NULL }, + /* 07 */ { SQL_API_SQLBINDPARAMETER, "SQLBindParameter", SQLBindParameter, NULL, NULL }, + /* 08 */ { SQL_API_SQLBROWSECONNECT, "SQLBrowseConnect", SQLBrowseConnect, NULL, NULL }, + /* 09 */ { SQL_API_SQLBULKOPERATIONS, "SQLBulkOperations", SQLBulkOperations, NULL, NULL }, + /* 10 */ { SQL_API_SQLCANCEL, "SQLCancel", SQLCancel, NULL, NULL }, + /* 11 */ { SQL_API_SQLCLOSECURSOR, "SQLCloseCursor", SQLCloseCursor, NULL, NULL }, + /* 12 */ { SQL_API_SQLCOLATTRIBUTE, "SQLColAttribute", SQLColAttribute, NULL, NULL }, + /* 13 */ { SQL_API_SQLCOLATTRIBUTES, "SQLColAttributes", SQLColAttributes, NULL, NULL }, + /* 14 */ { SQL_API_SQLCOLUMNPRIVILEGES, "SQLColumnPrivileges", SQLColumnPrivileges, NULL, NULL }, + /* 15 */ { SQL_API_SQLCOLUMNS, "SQLColumns", SQLColumns, NULL, NULL }, + /* 16 */ { SQL_API_SQLCONNECT, "SQLConnect", SQLConnect, NULL, NULL }, + /* 17 */ { SQL_API_SQLCOPYDESC, "SQLCopyDesc", SQLCopyDesc, NULL, NULL }, + /* 18 */ { SQL_API_SQLDATASOURCES, "SQLDataSources", SQLDataSources, NULL, NULL }, + /* 19 */ { SQL_API_SQLDESCRIBECOL, "SQLDescribeCol", SQLDescribeCol, NULL, NULL }, + /* 20 */ { SQL_API_SQLDESCRIBEPARAM, "SQLDescribeParam", SQLDescribeParam, NULL, NULL }, + /* 21 */ { SQL_API_SQLDISCONNECT, "SQLDisconnect", SQLDisconnect, NULL, NULL }, + /* 22 */ { SQL_API_SQLDRIVERCONNECT, "SQLDriverConnect", SQLDriverConnect, NULL, NULL }, + /* 23 */ { SQL_API_SQLDRIVERS, "SQLDrivers", SQLDrivers, NULL, NULL }, + /* 24 */ { SQL_API_SQLENDTRAN, "SQLEndTran", SQLEndTran, NULL, NULL }, + /* 25 */ { SQL_API_SQLERROR, "SQLError", SQLError, NULL, NULL }, + /* 26 */ { SQL_API_SQLEXECDIRECT, "SQLExecDirect", SQLExecDirect, NULL, NULL }, + /* 27 */ { SQL_API_SQLEXECUTE, "SQLExecute", SQLExecute, NULL, NULL }, + /* 28 */ { SQL_API_SQLEXTENDEDFETCH, "SQLExtendedFetch", SQLExtendedFetch, NULL, NULL }, + /* 29 */ { SQL_API_SQLFETCH, "SQLFetch", SQLFetch, NULL, NULL }, + /* 30 */ { SQL_API_SQLFETCHSCROLL, "SQLFetchScroll", SQLFetchScroll, NULL, NULL }, + /* 31 */ { SQL_API_SQLFOREIGNKEYS, "SQLForeignKeys", SQLForeignKeys, NULL, NULL }, + /* 32 */ { SQL_API_SQLFREEENV, "SQLFreeEnv", SQLFreeEnv, NULL, NULL }, + /* 33 */ { SQL_API_SQLFREEHANDLE, "SQLFreeHandle", SQLFreeHandle, NULL, NULL }, + /* 34 */ { SQL_API_SQLFREESTMT, "SQLFreeStmt", SQLFreeStmt, NULL, NULL }, + /* 35 */ { SQL_API_SQLFREECONNECT, "SQLFreeConnect", SQLFreeConnect, NULL, NULL }, + /* 36 */ { SQL_API_SQLGETCONNECTATTR, "SQLGetConnectAttr", SQLGetConnectAttr, NULL, NULL }, + /* 37 */ { SQL_API_SQLGETCONNECTOPTION, "SQLGetConnectOption", SQLGetConnectOption, NULL, NULL }, + /* 38 */ { SQL_API_SQLGETCURSORNAME, "SQLGetCursorName", SQLGetCursorName, NULL, NULL }, + /* 39 */ { SQL_API_SQLGETDATA, "SQLGetData", SQLGetData, NULL, NULL }, + /* 40 */ { SQL_API_SQLGETDESCFIELD, "SQLGetDescField", SQLGetDescField, NULL, NULL }, + /* 41 */ { SQL_API_SQLGETDESCREC, "SQLGetDescRec", SQLGetDescRec, NULL, NULL }, + /* 42 */ { SQL_API_SQLGETDIAGFIELD, "SQLGetDiagField", SQLGetDiagField, NULL, NULL }, + /* 43 */ { SQL_API_SQLGETENVATTR, "SQLGetEnvAttr", SQLGetEnvAttr, NULL, NULL }, + /* 44 */ { SQL_API_SQLGETFUNCTIONS, "SQLGetFunctions", SQLGetFunctions, NULL, NULL }, + /* 45 */ { SQL_API_SQLGETINFO, "SQLGetInfo", SQLGetInfo, NULL, NULL }, + /* 46 */ { SQL_API_SQLGETSTMTATTR, "SQLGetStmtAttr", SQLGetStmtAttr, NULL, NULL }, + /* 47 */ { SQL_API_SQLGETSTMTOPTION, "SQLGetStmtOption", SQLGetStmtOption, NULL, NULL }, + /* 48 */ { SQL_API_SQLGETTYPEINFO, "SQLGetTypeInfo", SQLGetTypeInfo, NULL, NULL }, + /* 49 */ { SQL_API_SQLMORERESULTS, "SQLMoreResults", SQLMoreResults, NULL, NULL }, + /* 50 */ { SQL_API_SQLNATIVESQL, "SQLNativeSql", SQLNativeSql, NULL, NULL }, + /* 51 */ { SQL_API_SQLNUMPARAMS, "SQLNumParams", SQLNumParams, NULL, NULL }, + /* 52 */ { SQL_API_SQLNUMRESULTCOLS, "SQLNumResultCols", SQLNumResultCols, NULL, NULL }, + /* 53 */ { SQL_API_SQLPARAMDATA, "SQLParamData", SQLParamData, NULL, NULL }, + /* 54 */ { SQL_API_SQLPARAMOPTIONS, "SQLParamOptions", SQLParamOptions, NULL, NULL }, + /* 55 */ { SQL_API_SQLPREPARE, "SQLPrepare", SQLPrepare, NULL, NULL }, + /* 56 */ { SQL_API_SQLPRIMARYKEYS, "SQLPrimaryKeys", SQLPrimaryKeys, NULL, NULL }, + /* 57 */ { SQL_API_SQLPROCEDURECOLUMNS, "SQLProcedureColumns", SQLProcedureColumns, NULL, NULL }, + /* 58 */ { SQL_API_SQLPROCEDURES, "SQLProcedures", SQLProcedures, NULL, NULL }, + /* 59 */ { SQL_API_SQLPUTDATA, "SQLPutData", SQLPutData, NULL, NULL }, + /* 60 */ { SQL_API_SQLROWCOUNT, "SQLRowCount", SQLRowCount, NULL, NULL }, + /* 61 */ { SQL_API_SQLSETCONNECTATTR, "SQLSetConnectAttr", SQLSetConnectAttr, NULL, NULL }, + /* 62 */ { SQL_API_SQLSETCONNECTOPTION, "SQLSetConnectOption", SQLSetConnectOption, NULL, NULL }, + /* 63 */ { SQL_API_SQLSETCURSORNAME, "SQLSetCursorName", SQLSetCursorName, NULL, NULL }, + /* 64 */ { SQL_API_SQLSETDESCFIELD, "SQLSetDescField", SQLSetDescField, NULL, NULL }, + /* 65 */ { SQL_API_SQLSETDESCREC, "SQLSetDescRec", SQLSetDescRec, NULL, NULL }, + /* 66 */ { SQL_API_SQLSETENVATTR, "SQLSetEnvAttr", SQLSetEnvAttr, NULL, NULL }, + /* 67 */ { SQL_API_SQLSETPARAM, "SQLSetParam", SQLSetParam, NULL, NULL }, + /* 68 */ { SQL_API_SQLSETPOS, "SQLSetPos", SQLSetPos, NULL, NULL }, + /* 69 */ { SQL_API_SQLSETSCROLLOPTIONS, "SQLSetScrollOptions", SQLSetScrollOptions, NULL, NULL }, + /* 70 */ { SQL_API_SQLSETSTMTATTR, "SQLSetStmtAttr", SQLSetStmtAttr, NULL, NULL }, + /* 71 */ { SQL_API_SQLSETSTMTOPTION, "SQLSetStmtOption", SQLSetStmtOption, NULL, NULL }, + /* 72 */ { SQL_API_SQLSPECIALCOLUMNS, "SQLSpecialColumns", SQLSpecialColumns, NULL, NULL }, + /* 73 */ { SQL_API_SQLSTATISTICS, "SQLStatistics", SQLStatistics, NULL, NULL }, + /* 74 */ { SQL_API_SQLTABLEPRIVILEGES, "SQLTablePrivileges", SQLTablePrivileges, NULL, NULL }, + /* 75 */ { SQL_API_SQLTABLES, "SQLTables", SQLTables, NULL, NULL }, + /* 76 */ { SQL_API_SQLTRANSACT, "SQLTransact", SQLTransact, NULL, NULL }, + /* 77 */ { SQL_API_SQLGETDIAGREC, "SQLGetDiagRec", SQLGetDiagRec, NULL, NULL }, }; static PROXYHANDLE gProxyHandle; @@ -156,10 +159,299 @@ } \ } -SQLRETURN SQLDummyFunc() -{ - TRACE("SQLDummyFunc: \n"); +static SQLRETURN SQLDummyFunc(void) +{ + TRACE("SQLDummyFunc:\n"); return SQL_SUCCESS; +} + +/*********************************************************************** + * ODBC_ReplicateODBCInstToRegistry + * + * PARAMS + * + * RETURNS + * + * Utility to ODBC_ReplicateToRegistry to replicate the drivers of the + * ODBCINST.INI settings + * + * The driver settings are not replicated to the registry. If we were to + * replicate them we would need to decide whether to replicate all settings + * or to do some translation; whether to remove any entries present only in + * the windows registry, etc. + */ + +static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) +{ + HKEY hODBCInst; + LONG reg_ret; + int success; + + success = 0; + TRACE ("Driver settings are not currently replicated to the registry\n"); + if ((reg_ret = RegCreateKeyExA (HKEY_LOCAL_MACHINE, + "Software\\ODBC\\ODBCINST.INI", 0, NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS /* a couple more than we need */, NULL, + &hODBCInst, NULL)) == ERROR_SUCCESS) + { + HKEY hDrivers; + if ((reg_ret = RegCreateKeyExA (hODBCInst, "ODBC Drivers", 0, + NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS /* overkill */, NULL, &hDrivers, NULL)) + == ERROR_SUCCESS) + { + SQLRETURN sql_ret; + SQLUSMALLINT dirn; + CHAR desc [256]; + SQLSMALLINT sizedesc; + + success = 1; + dirn = SQL_FETCH_FIRST; + while ((sql_ret = SQLDrivers (hEnv, dirn, (SQLCHAR*)desc, sizeof(desc), + &sizedesc, NULL, 0, NULL)) == SQL_SUCCESS || + sql_ret == SQL_SUCCESS_WITH_INFO) + { + /* FIXME Do some proper handling of the SUCCESS_WITH_INFO */ + dirn = SQL_FETCH_NEXT; + if (sizedesc == lstrlenA(desc)) + { + HKEY hThis; + if ((reg_ret = RegQueryValueExA (hDrivers, desc, NULL, + NULL, NULL, NULL)) == ERROR_FILE_NOT_FOUND) + { + if ((reg_ret = RegSetValueExA (hDrivers, desc, 0, + REG_SZ, (const BYTE *)"Installed", 10)) != ERROR_SUCCESS) + { + TRACE ("Error %d replicating driver %s\n", + reg_ret, desc); + success = 0; + } + } + else if (reg_ret != ERROR_SUCCESS) + { + TRACE ("Error %d checking for %s in drivers\n", + reg_ret, desc); + success = 0; + } + if ((reg_ret = RegCreateKeyExA (hODBCInst, desc, 0, + NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, NULL, &hThis, NULL)) + == ERROR_SUCCESS) + { + /* FIXME This is where the settings go. + * I suggest that if the disposition says it + * exists then we leave it alone. Alternatively + * include an extra value to flag that it is + * a replication of the unixODBC/iODBC/... + */ + if ((reg_ret = RegCloseKey (hThis)) != + ERROR_SUCCESS) + TRACE ("Error %d closing %s key\n", reg_ret, + desc); + } + else + { + TRACE ("Error %d ensuring driver key %s\n", + reg_ret, desc); + success = 0; + } + } + else + { + WARN ("Unusually long driver name %s not replicated\n", + desc); + success = 0; + } + } + if (sql_ret != SQL_NO_DATA) + { + TRACE ("Error %d enumerating drivers\n", (int)sql_ret); + success = 0; + } + if ((reg_ret = RegCloseKey (hDrivers)) != ERROR_SUCCESS) + { + TRACE ("Error %d closing hDrivers\n", reg_ret); + } + } + else + { + TRACE ("Error %d opening HKLM\\S\\O\\OI\\Drivers\n", reg_ret); + } + if ((reg_ret = RegCloseKey (hODBCInst)) != ERROR_SUCCESS) + { + TRACE ("Error %d closing HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); + } + } + else + { + TRACE ("Error %d opening HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); + } + if (!success) + { + WARN ("May not have replicated all ODBC drivers to the registry\n"); + } +} + +/*********************************************************************** + * ODBC_ReplicateODBCToRegistry + * + * PARAMS + * + * RETURNS + * + * Utility to ODBC_ReplicateToRegistry to replicate either the USER or + * SYSTEM dsns + * + * For now simply place the "Driver description" (as returned by SQLDataSources) + * into the registry as the driver. This is enough to satisfy Crystal's + * requirement that there be a driver entry. (It doesn't seem to care what + * the setting is). + * A slightly more accurate setting would be to access the registry to find + * the actual driver library for the given description (which appears to map + * to one of the HKLM/Software/ODBC/ODBCINST.INI keys). (If you do this note + * that this will add a requirement that this function be called after + * ODBC_ReplicateODBCInstToRegistry) + */ +static void ODBC_ReplicateODBCToRegistry (int is_user, SQLHENV hEnv) +{ + HKEY hODBC; + LONG reg_ret; + SQLRETURN sql_ret; + SQLUSMALLINT dirn; + CHAR dsn [SQL_MAX_DSN_LENGTH + 1]; + SQLSMALLINT sizedsn; + CHAR desc [256]; + SQLSMALLINT sizedesc; + int success; + const char *which = is_user ? "user" : "system"; + + success = 0; + if ((reg_ret = RegCreateKeyExA ( + is_user ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, + "Software\\ODBC\\ODBC.INI", 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS /* a couple more than we need */, NULL, &hODBC, + NULL)) == ERROR_SUCCESS) + { + success = 1; + dirn = is_user ? SQL_FETCH_FIRST_USER : SQL_FETCH_FIRST_SYSTEM; + while ((sql_ret = SQLDataSources (hEnv, dirn, + (SQLCHAR*)dsn, sizeof(dsn), &sizedsn, + (SQLCHAR*)desc, sizeof(desc), &sizedesc)) == SQL_SUCCESS + || sql_ret == SQL_SUCCESS_WITH_INFO) + { + /* FIXME Do some proper handling of the SUCCESS_WITH_INFO */ + dirn = SQL_FETCH_NEXT; + if (sizedsn == lstrlenA(dsn) && sizedesc == lstrlenA(desc)) + { + HKEY hDSN; + if ((reg_ret = RegCreateKeyExA (hODBC, dsn, 0, + NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, NULL, &hDSN, NULL)) + == ERROR_SUCCESS) + { + static const char DRIVERKEY[] = "Driver"; + if ((reg_ret = RegQueryValueExA (hDSN, DRIVERKEY, + NULL, NULL, NULL, NULL)) + == ERROR_FILE_NOT_FOUND) + { + if ((reg_ret = RegSetValueExA (hDSN, DRIVERKEY, 0, + REG_SZ, (LPBYTE)desc, sizedesc)) != ERROR_SUCCESS) + { + TRACE ("Error %d replicating description of " + "%s(%s)\n", reg_ret, dsn, desc); + success = 0; + } + } + else if (reg_ret != ERROR_SUCCESS) + { + TRACE ("Error %d checking for description of %s\n", + reg_ret, dsn); + success = 0; + } + if ((reg_ret = RegCloseKey (hDSN)) != ERROR_SUCCESS) + { + TRACE ("Error %d closing %s DSN key %s\n", + reg_ret, which, dsn); + } + } + else + { + TRACE ("Error %d opening %s DSN key %s\n", + reg_ret, which, dsn); + success = 0; + } + } + else + { + WARN ("Unusually long %s data source name %s (%s) not " + "replicated\n", which, dsn, desc); + success = 0; + } + } + if (sql_ret != SQL_NO_DATA) + { + TRACE ("Error %d enumerating %s datasources\n", + (int)sql_ret, which); + success = 0; + } + if ((reg_ret = RegCloseKey (hODBC)) != ERROR_SUCCESS) + { + TRACE ("Error %d closing %s ODBC.INI registry key\n", reg_ret, + which); + } + } + else + { + TRACE ("Error %d creating/opening %s ODBC.INI registry key\n", + reg_ret, which); + } + if (!success) + { + WARN ("May not have replicated all %s ODBC DSNs to the registry\n", + which); + } +} + +/*********************************************************************** + * ODBC_ReplicateToRegistry + * + * PARAMS + * + * RETURNS + * + * Unfortunately some of the functions that Windows documents as being part + * of the ODBC API it implements directly during compilation or something + * in terms of registry access functions. + * e.g. SQLGetInstalledDrivers queries the list at + * HKEY_LOCAL_MACHINE\Software\ODBC\ODBCINST.INI\ODBC Drivers + * + * This function is called when the driver manager is loaded and is used + * to replicate the appropriate details into the Wine registry + */ + +static void ODBC_ReplicateToRegistry (void) +{ + SQLRETURN sql_ret; + SQLHENV hEnv; + + if ((sql_ret = SQLAllocEnv (&hEnv)) == SQL_SUCCESS) + { + ODBC_ReplicateODBCInstToRegistry (hEnv); + ODBC_ReplicateODBCToRegistry (0 /* system dsns */, hEnv); + ODBC_ReplicateODBCToRegistry (1 /* user dsns */, hEnv); + + if ((sql_ret = SQLFreeEnv (hEnv)) != SQL_SUCCESS) + { + TRACE ("Error %d freeing the SQL environment.\n", (int)sql_ret); + } + } + else + { + TRACE ("Error %d opening an SQL environment.\n", (int)sql_ret); + WARN ("The external ODBC settings have not been replicated to the" + " Wine registry\n"); + } } /*********************************************************************** @@ -178,14 +470,17 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { int i; - TRACE("Initializing or Finalizing proxy ODBC: %p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("Initializing or Finalizing proxy ODBC: %p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); if (fdwReason == DLL_PROCESS_ATTACH) { TRACE("Loading ODBC...\n"); DisableThreadLibraryCalls(hinstDLL); if (ODBC_LoadDriverManager()) + { ODBC_LoadDMFunctions(); + ODBC_ReplicateToRegistry(); + } } else if (fdwReason == DLL_PROCESS_DETACH) { @@ -197,18 +492,16 @@ gProxyHandle.functions[i].func = SQLDummyFunc; } } -#ifndef __REACTOS__ + if (gProxyHandle.dmHandle) { wine_dlclose(gProxyHandle.dmHandle,NULL,0); gProxyHandle.dmHandle = NULL; } -#endif } return TRUE; } - /*********************************************************************** * ODBC_LoadDriverManager [Internal] Load ODBC library. @@ -223,41 +516,28 @@ static BOOL ODBC_LoadDriverManager(void) { const char *s = getenv("LIB_ODBC_DRIVER_MANAGER"); -#ifndef __REACTOS__ char error[256]; + + TRACE("\n"); + + gProxyHandle.bFunctionReady = FALSE; + +#ifdef SONAME_LIBODBC + if (!s || !s[0]) s = SONAME_LIBODBC; #endif - - TRACE("\n"); - - gProxyHandle.bFunctionReady = FALSE; - gProxyHandle.nErrorType = ERROR_LIBRARY_NOT_FOUND; - - if (s!= NULL && strlen (s) >= sizeof(gProxyHandle.dmLibName)) - { - ERR("Driver name too long (%s)\n",s); - return FALSE; - } - if (s == NULL || strlen(s) == 0) - s = "libodbc.so"; - strcpy(gProxyHandle.dmLibName, s); -#ifndef __REACTOS__ - gProxyHandle.dmHandle = wine_dlopen(gProxyHandle.dmLibName, RTLD_LAZY, error, sizeof(error)); - - if (gProxyHandle.dmHandle == NULL) /* fail to load unixODBC driver manager */ - { - WARN("failed to open library %s: %s\n", gProxyHandle.dmLibName, error); - gProxyHandle.dmLibName[0] = '\0'; - gProxyHandle.nErrorType = ERROR_LIBRARY_NOT_FOUND; - return FALSE; - } - else + if (!s || !s[0]) goto failed; + + gProxyHandle.dmHandle = wine_dlopen(s, RTLD_LAZY | RTLD_GLOBAL, error, sizeof(error)); + + if (gProxyHandle.dmHandle != NULL) { gProxyHandle.nErrorType = ERROR_FREE; return TRUE; } -#else +failed: + WARN("failed to open library %s: %s\n", debugstr_a(s), error); + gProxyHandle.nErrorType = ERROR_LIBRARY_NOT_FOUND; return FALSE; -#endif } @@ -273,16 +553,16 @@ static BOOL ODBC_LoadDMFunctions(void) { -#ifndef __REACTOS__ int i; char error[256]; -#endif if (gProxyHandle.dmHandle == NULL) return FALSE; -#ifndef __REACTOS__ + for ( i = 0; i < NUM_SQLFUNC; i ++ ) { + char * pFuncNameW; + gProxyHandle.functions[i] = template_func[i]; gProxyHandle.functions[i].func = wine_dlsym(gProxyHandle.dmHandle, gProxyHandle.functions[i].name, error, sizeof(error)); @@ -292,10 +572,27 @@ ERR("Failed to load function %s\n",gProxyHandle.functions[i].name); gProxyHandle.functions[i].func = SQLDummyFunc; } + else + { + /* Build Unicode function name for this function */ + pFuncNameW = HeapAlloc(GetProcessHeap(), 0, strlen(gProxyHandle.functions[i].name) + 2); + strcpy(pFuncNameW, gProxyHandle.functions[i].name); + pFuncNameW[strlen(gProxyHandle.functions[i].name) + 1] = '\0'; + pFuncNameW[strlen(gProxyHandle.functions[i].name)] = 'W'; + + gProxyHandle.functions[i].funcW = wine_dlsym(gProxyHandle.dmHandle, + pFuncNameW, error, sizeof(error)); + if (error[0]) + { +/* TRACE("Failed to load function %s, possibly no Unicode version is required\n", pFuncNameW); */ + gProxyHandle.functions[i].funcW = NULL; + } + HeapFree(GetProcessHeap(), 0, pFuncNameW); + } } gProxyHandle.bFunctionReady = TRUE; -#endif + return TRUE; } @@ -356,7 +653,7 @@ if (!gProxyHandle.bFunctionReady || gProxyHandle.dmHandle == NULL) { if (gProxyHandle.nErrorType == ERROR_LIBRARY_NOT_FOUND) - WARN("ProxyODBC: Can not load ODBC driver manager library.\n"); + WARN("ProxyODBC: Cannot load ODBC driver manager library.\n"); if (HandleType == SQL_HANDLE_ENV) *OutputHandle = SQL_NULL_HENV; @@ -409,12 +706,12 @@ SQLRETURN WINAPI SQLAllocHandleStd( SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE *OutputHandle) { - TRACE("ProxyODBC: SQLAllocHandelStd.\n"); + TRACE("ProxyODBC: SQLAllocHandleStd.\n"); if (!gProxyHandle.bFunctionReady || gProxyHandle.dmHandle == NULL) { if (gProxyHandle.nErrorType == ERROR_LIBRARY_NOT_FOUND) - WARN("ProxyODBC: Can not load ODBC driver manager library.\n"); + WARN("ProxyODBC: Cannot load ODBC driver manager library.\n"); if (HandleType == SQL_HANDLE_ENV) *OutputHandle = SQL_NULL_HENV; @@ -439,8 +736,8 @@ */ SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, - SQLPOINTER TargetValue, SQLINTEGER BufferLength, - SQLINTEGER *StrLen_or_Ind) + SQLPOINTER TargetValue, SQLLEN BufferLength, + SQLLEN *StrLen_or_Ind) { TRACE("\n"); @@ -462,9 +759,9 @@ */ SQLRETURN WINAPI SQLBindParam(SQLHSTMT StatementHandle, SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType, - SQLSMALLINT ParameterType, SQLUINTEGER LengthPrecision, + SQLSMALLINT ParameterType, SQLULEN LengthPrecision, SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue, - SQLINTEGER *StrLen_or_Ind) + SQLLEN *StrLen_or_Ind) { TRACE("\n"); @@ -560,8 +857,8 @@ CHECK_READY_AND_dmHandle(); - strcpy(gProxyHandle.ServerName, (const char*)ServerName); - strcpy(gProxyHandle.UserName, (const char*)UserName); + strcpy( (LPSTR)gProxyHandle.ServerName, (LPSTR)ServerName ); + strcpy( (LPSTR)gProxyHandle.UserName, (LPSTR)UserName ); assert(gProxyHandle.functions[SQLAPI_INDEX_SQLCONNECT].func); ret=(gProxyHandle.functions[SQLAPI_INDEX_SQLCONNECT].func) @@ -612,7 +909,7 @@ (EnvironmentHandle, Direction, ServerName, BufferLength1, NameLength1, Description, BufferLength2, NameLength2); - if (WINE_TRACE_ON(odbc)) + if (TRACE_ON(odbc)) { TRACE("returns: %d \t", ret); if (*NameLength1 > 0) @@ -632,7 +929,7 @@ SQLRETURN WINAPI SQLDescribeCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName, SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, - SQLSMALLINT *DataType, SQLUINTEGER *ColumnSize, + SQLSMALLINT *DataType, SQLULEN *ColumnSize, SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable) { TRACE("\n"); @@ -746,7 +1043,7 @@ /************************************************************************* * SQLFetchScroll [ODBC32.030] */ -SQLRETURN WINAPI SQLFetchScroll(SQLHSTMT StatementHandle, SQLSMALLINT FetchOrientation, SQLINTEGER FetchOffset) +SQLRETURN WINAPI SQLFetchScroll(SQLHSTMT StatementHandle, SQLSMALLINT FetchOrientation, SQLLEN FetchOffset) { TRACE("\n"); @@ -883,8 +1180,8 @@ */ SQLRETURN WINAPI SQLGetData(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, - SQLPOINTER TargetValue, SQLINTEGER BufferLength, - SQLINTEGER *StrLen_or_Ind) + SQLPOINTER TargetValue, SQLLEN BufferLength, + SQLLEN *StrLen_or_Ind) { TRACE("\n"); @@ -923,7 +1220,7 @@ SQLSMALLINT RecNumber, SQLCHAR *Name, SQLSMALLINT BufferLength, SQLSMALLINT *StringLength, SQLSMALLINT *Type, SQLSMALLINT *SubType, - SQLINTEGER *Length, SQLSMALLINT *Precision, + SQLLEN *Length, SQLSMALLINT *Precision, SQLSMALLINT *Scale, SQLSMALLINT *Nullable) { TRACE("\n"); @@ -1119,7 +1416,7 @@ /************************************************************************* * SQLPutData [ODBC32.049] */ -SQLRETURN WINAPI SQLPutData(SQLHSTMT StatementHandle, SQLPOINTER Data, SQLINTEGER StrLen_or_Ind) +SQLRETURN WINAPI SQLPutData(SQLHSTMT StatementHandle, SQLPOINTER Data, SQLLEN StrLen_or_Ind) { TRACE("\n"); @@ -1134,7 +1431,7 @@ /************************************************************************* * SQLRowCount [ODBC32.020] */ -SQLRETURN WINAPI SQLRowCount(SQLHSTMT StatementHandle, SQLINTEGER *RowCount) +SQLRETURN WINAPI SQLRowCount(SQLHSTMT StatementHandle, SQLLEN *RowCount) { TRACE("\n"); @@ -1165,7 +1462,7 @@ /************************************************************************* * SQLSetConnectOption [ODBC32.050] */ -SQLRETURN WINAPI SQLSetConnectOption(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLUINTEGER Value) +SQLRETURN WINAPI SQLSetConnectOption(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLULEN Value) { TRACE("\n"); @@ -1214,10 +1511,10 @@ */ SQLRETURN WINAPI SQLSetDescRec(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, SQLSMALLINT Type, - SQLSMALLINT SubType, SQLINTEGER Length, + SQLSMALLINT SubType, SQLLEN Length, SQLSMALLINT Precision, SQLSMALLINT Scale, - SQLPOINTER Data, SQLINTEGER *StringLength, - SQLINTEGER *Indicator) + SQLPOINTER Data, SQLLEN *StringLength, + SQLLEN *Indicator) { TRACE("\n"); @@ -1252,9 +1549,9 @@ */ SQLRETURN WINAPI SQLSetParam(SQLHSTMT StatementHandle, SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType, - SQLSMALLINT ParameterType, SQLUINTEGER LengthPrecision, + SQLSMALLINT ParameterType, SQLULEN LengthPrecision, SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue, - SQLINTEGER *StrLen_or_Ind) + SQLLEN *StrLen_or_Ind) { TRACE("\n"); @@ -1287,7 +1584,7 @@ /************************************************************************* * SQLSetStmtOption [ODBC32.051] */ -SQLRETURN WINAPI SQLSetStmtOption(SQLHSTMT StatementHandle, SQLUSMALLINT Option, SQLUINTEGER Value) +SQLRETURN WINAPI SQLSetStmtOption(SQLHSTMT StatementHandle, SQLUSMALLINT Option, SQLULEN Value) { TRACE("\n"); @@ -1423,7 +1720,7 @@ SQLPOINTER rgbDesc, SQLSMALLINT cbDescMax, SQLSMALLINT *pcbDesc, - SQLINTEGER *pfDesc) + SQLLEN *pfDesc) { TRACE("\n"); @@ -1467,7 +1764,7 @@ SQLHSTMT hstmt, SQLUSMALLINT ipar, SQLSMALLINT *pfSqlType, - SQLUINTEGER *pcbParamDef, + SQLULEN *pcbParamDef, SQLSMALLINT *pibScale, SQLSMALLINT *pfNullable) { @@ -1745,11 +2042,11 @@ SQLSMALLINT fParamType, SQLSMALLINT fCType, SQLSMALLINT fSqlType, - SQLUINTEGER cbColDef, + SQLULEN cbColDef, SQLSMALLINT ibScale, SQLPOINTER rgbValue, - SQLINTEGER cbValueMax, - SQLINTEGER *pcbValue) + SQLLEN cbValueMax, + SQLLEN *pcbValue) { TRACE("\n"); @@ -1792,7 +2089,7 @@ SQLRETURN WINAPI SQLSetScrollOptions( SQLHSTMT statement_handle, SQLUSMALLINT f_concurrency, - SQLINTEGER crow_keyset, + SQLLEN crow_keyset, SQLUSMALLINT crow_rowset ) { TRACE("\n"); @@ -1804,4 +2101,832 @@ (statement_handle, f_concurrency, crow_keyset, crow_rowset); } +static int SQLColAttributes_KnownStringAttribute(SQLUSMALLINT fDescType) +{ + static const SQLUSMALLINT attrList[] = + { + SQL_COLUMN_OWNER_NAME, + SQL_COLUMN_QUALIFIER_NAME, + SQL_COLUMN_LABEL, + SQL_COLUMN_NAME, + SQL_COLUMN_TABLE_NAME, + SQL_COLUMN_TYPE_NAME, + SQL_DESC_BASE_COLUMN_NAME, + SQL_DESC_BASE_TABLE_NAME, + SQL_DESC_CATALOG_NAME, + SQL_DESC_LABEL, + SQL_DESC_LITERAL_PREFIX, + SQL_DESC_LITERAL_SUFFIX, + SQL_DESC_LOCAL_TYPE_NAME, + SQL_DESC_NAME, + SQL_DESC_SCHEMA_NAME, + SQL_DESC_TABLE_NAME, + SQL_DESC_TYPE_NAME, + }; + unsigned int i; + + for (i = 0; i < sizeof(attrList) / sizeof(SQLUSMALLINT); i++) { + if (attrList[i] == fDescType) return 1; + } + return 0; +} + +/************************************************************************* + * SQLColAttributesW [ODBC32.106] + */ +SQLRETURN WINAPI SQLColAttributesW( + SQLHSTMT hstmt, + SQLUSMALLINT icol, + SQLUSMALLINT fDescType, + SQLPOINTER rgbDesc, + SQLSMALLINT cbDescMax, + SQLSMALLINT *pcbDesc, + SQLLEN *pfDesc) +{ + SQLRETURN iResult; + + TRACE("hstmt=0x%08lx icol=%d fDescType=%d rgbDesc=%p cbDescMax=%d pcbDesc=%p pfDesc=%p\n", + hstmt, icol, fDescType, rgbDesc, cbDescMax, pcbDesc, pfDesc); + + CHECK_dmHandle(); + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLCOLATTRIBUTES].funcW); + iResult = (gProxyHandle.functions[SQLAPI_INDEX_SQLCOLATTRIBUTES].funcW) + (hstmt, icol, fDescType, rgbDesc, cbDescMax, pcbDesc, pfDesc); + if (iResult == SQL_SUCCESS && rgbDesc != NULL && SQLColAttributes_KnownStringAttribute(fDescType)) { + /* + TRACE("Dumping values fetched via SQLColAttributesW:\n"); + TRACE(" Attribute name : %s\n", debugstr_w(rgbDesc)); + TRACE(" Declared length: %d\n", *pcbDesc); + */ + if (*pcbDesc != lstrlenW(rgbDesc) * 2) { + TRACE("CHEAT: resetting name length for ADO\n"); + *pcbDesc = lstrlenW(rgbDesc) * 2; + } + } + return iResult; +} + +/************************************************************************* + * SQLConnectW [ODBC32.107] + */ +SQLRETURN WINAPI SQLConnectW(SQLHDBC ConnectionHandle, + WCHAR *ServerName, SQLSMALLINT NameLength1, + WCHAR *UserName, SQLSMALLINT NameLength2, + WCHAR *Authentication, SQLSMALLINT NameLength3) +{ + SQLRETURN ret; + TRACE("(Server=%.*s)\n",NameLength1+3, debugstr_w(ServerName)); + + CHECK_READY_AND_dmHandle(); + + WideCharToMultiByte( + CP_UTF8, 0, + ServerName, NameLength1, + gProxyHandle.ServerName, sizeof(gProxyHandle.ServerName), + NULL, NULL); + WideCharToMultiByte( + CP_UTF8, 0, + UserName, NameLength2, + gProxyHandle.UserName, sizeof(gProxyHandle.UserName), + NULL, NULL); + + assert(gProxyHandle.functions[SQLAPI_INDEX_SQLCONNECT].funcW); + ret=(gProxyHandle.functions[SQLAPI_INDEX_SQLCONNECT].funcW) + (ConnectionHandle, ServerName, NameLength1, + UserName, NameLength2, Authentication, NameLength3); + + TRACE("returns %d\n",ret); + return ret; +} + +/************************************************************************* + * SQLDescribeColW [ODBC32.108] + */ +SQLRETURN WINAPI SQLDescribeColW(SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, SQLWCHAR *ColumnName, + SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, + SQLSMALLINT *DataType, SQLULEN *ColumnSize, + SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable) +{ + SQLRETURN iResult; + TRACE("\n"); + + CHECK_READY_AND_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLDESCRIBECOL].funcW); + iResult = (gProxyHandle.functions[SQLAPI_INDEX_SQLDESCRIBECOL].funcW) + (StatementHandle, ColumnNumber, ColumnName, + BufferLength, NameLength, DataType, ColumnSize, DecimalDigits, Nullable); + if (iResult >= 0) { + TRACE("Successfully recovered the following column information:\n"); + TRACE("\tRequested column index: %d\n", ColumnNumber); + TRACE("\tAvailable length for column name: %d\n", BufferLength); + if (NameLength != NULL) + TRACE("\tActual length for column name: %d\n", *NameLength); + else TRACE("\tActual length for column name: (null)\n"); + TRACE("\tReturned column name: %s\n", debugstr_w(ColumnName)); + } + return iResult; +} + +/************************************************************************* + * SQLErrorW [ODBC32.110] + */ +SQLRETURN WINAPI SQLErrorW(SQLHENV EnvironmentHandle, + SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle, + WCHAR *Sqlstate, SQLINTEGER *NativeError, + WCHAR *MessageText, SQLSMALLINT BufferLength, + SQLSMALLINT *TextLength) +{ + TRACE("\n"); + + CHECK_READY_AND_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLERROR].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLERROR].funcW) + (EnvironmentHandle, ConnectionHandle, StatementHandle, + Sqlstate, NativeError, MessageText, BufferLength, TextLength); +} + +/************************************************************************* + * SQLExecDirectW [ODBC32.111] + */ +SQLRETURN WINAPI SQLExecDirectW(SQLHSTMT StatementHandle, + WCHAR *StatementText, SQLINTEGER TextLength) +{ + TRACE("\n"); + + CHECK_READY_AND_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLEXECDIRECT].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLEXECDIRECT].funcW) + (StatementHandle, StatementText, TextLength); +} + +/************************************************************************* + * SQLGetCursorNameW [ODBC32.117] + */ +SQLRETURN WINAPI SQLGetCursorNameW(SQLHSTMT StatementHandle, + WCHAR *CursorName, SQLSMALLINT BufferLength, + SQLSMALLINT *NameLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETCURSORNAME].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLGETCURSORNAME].funcW) + (StatementHandle, CursorName, BufferLength, NameLength); +} + +/************************************************************************* + * SQLPrepareW [ODBC32.119] + */ +SQLRETURN WINAPI SQLPrepareW(SQLHSTMT StatementHandle, + WCHAR *StatementText, SQLINTEGER TextLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLPREPARE].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLPREPARE].funcW) + (StatementHandle, StatementText, TextLength); +} + +/************************************************************************* + * SQLSetCursorNameW [ODBC32.121] + */ +SQLRETURN WINAPI SQLSetCursorNameW(SQLHSTMT StatementHandle, WCHAR *CursorName, SQLSMALLINT NameLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLSETCURSORNAME].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLSETCURSORNAME].funcW) + (StatementHandle, CursorName, NameLength); +} + +/************************************************************************* + * SQLColAttributeW [ODBC32.127] + */ +SQLRETURN WINAPI SQLColAttributeW (SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier, + SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength, + SQLSMALLINT *StringLength, SQLPOINTER NumericAttribute) +{ + SQLRETURN iResult; + + TRACE("StatementHandle=0x%08lx ColumnNumber=%d FieldIdentifier=%d CharacterAttribute=%p BufferLength=%d StringLength=%p NumericAttribute=%p\n", + StatementHandle, ColumnNumber, FieldIdentifier, + CharacterAttribute, BufferLength, StringLength, NumericAttribute); + + CHECK_READY_AND_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLCOLATTRIBUTE].funcW); + iResult = (gProxyHandle.functions[SQLAPI_INDEX_SQLCOLATTRIBUTE].funcW) + (StatementHandle, ColumnNumber, FieldIdentifier, + CharacterAttribute, BufferLength, StringLength, NumericAttribute); + if (iResult == SQL_SUCCESS && CharacterAttribute != NULL && SQLColAttributes_KnownStringAttribute(FieldIdentifier)) { + /* + TRACE("Dumping values fetched via SQLColAttributeW:\n"); + TRACE(" Attribute name : %s\n", debugstr_w(rgbDesc)); + TRACE(" Declared length: %d\n", *pcbDesc); + */ + if (*StringLength != lstrlenW(CharacterAttribute) * 2) { + TRACE("CHEAT: resetting name length for ADO\n"); + *StringLength = lstrlenW(CharacterAttribute) * 2; + } + } + return iResult; +} + +/************************************************************************* + * SQLGetConnectAttrW [ODBC32.132] + */ +SQLRETURN WINAPI SQLGetConnectAttrW(SQLHDBC ConnectionHandle, + SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER BufferLength, SQLINTEGER *StringLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETCONNECTATTR].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLGETCONNECTATTR].funcW) + (ConnectionHandle, Attribute, Value, + BufferLength, StringLength); +} + +/************************************************************************* + * SQLGetDescFieldW [ODBC32.133] + */ +SQLRETURN WINAPI SQLGetDescFieldW(SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, + SQLPOINTER Value, SQLINTEGER BufferLength, + SQLINTEGER *StringLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETDESCFIELD].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLGETDESCFIELD].funcW) + (DescriptorHandle, RecNumber, FieldIdentifier, + Value, BufferLength, StringLength); +} + +/************************************************************************* + * SQLGetDescRecW [ODBC32.134] + */ +SQLRETURN WINAPI SQLGetDescRecW(SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, SQLWCHAR *Name, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength, + SQLSMALLINT *Type, SQLSMALLINT *SubType, + SQLLEN *Length, SQLSMALLINT *Precision, + SQLSMALLINT *Scale, SQLSMALLINT *Nullable) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETDESCREC].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLGETDESCREC].funcW) + (DescriptorHandle, RecNumber, Name, BufferLength, + StringLength, Type, SubType, Length, Precision, Scale, Nullable); +} + +/************************************************************************* + * SQLGetDiagFieldW [ODBC32.135] + */ +SQLRETURN WINAPI SQLGetDiagFieldW(SQLSMALLINT HandleType, SQLHANDLE Handle, + SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier, + SQLPOINTER DiagInfo, SQLSMALLINT BufferLength, + SQLSMALLINT *StringLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETDIAGFIELD].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLGETDIAGFIELD].funcW) + (HandleType, Handle, RecNumber, DiagIdentifier, + DiagInfo, BufferLength, StringLength); +} + +/************************************************************************* + * SQLGetDiagRecW [ODBC32.136] + */ +SQLRETURN WINAPI SQLGetDiagRecW(SQLSMALLINT HandleType, SQLHANDLE Handle, + SQLSMALLINT RecNumber, WCHAR *Sqlstate, + SQLINTEGER *NativeError, WCHAR *MessageText, + SQLSMALLINT BufferLength, SQLSMALLINT *TextLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETDIAGREC].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLGETDIAGREC].funcW) + (HandleType, Handle, RecNumber, Sqlstate, NativeError, + MessageText, BufferLength, TextLength); +} + +/************************************************************************* + * SQLGetStmtAttrW [ODBC32.138] + */ +SQLRETURN WINAPI SQLGetStmtAttrW(SQLHSTMT StatementHandle, + SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER BufferLength, SQLINTEGER *StringLength) +{ + SQLRETURN iResult; + + TRACE("Attribute = (%02ld) Value = %p BufferLength = (%ld) StringLength = %p\n", + Attribute, Value, BufferLength, StringLength); + + if (Value == NULL) { + WARN("Unexpected NULL in Value return address\n"); + iResult = SQL_ERROR; +/* + } else if (StringLength == NULL) { + WARN("Unexpected NULL in StringLength return address\n"); + iResult = SQL_ERROR; +*/ + } else { + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETSTMTATTR].funcW); + iResult = (gProxyHandle.functions[SQLAPI_INDEX_SQLGETSTMTATTR].funcW) + (StatementHandle, Attribute, Value, BufferLength, StringLength); + TRACE("returning %d...\n", iResult); + } + return iResult; +} + +/************************************************************************* + * SQLSetConnectAttrW [ODBC32.139] + */ +SQLRETURN WINAPI SQLSetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribute, + SQLPOINTER Value, SQLINTEGER StringLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLSETCONNECTATTR].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLSETCONNECTATTR].funcW) + (ConnectionHandle, Attribute, Value, StringLength); +} + +/************************************************************************* + * SQLColumnsW [ODBC32.140] + */ +SQLRETURN WINAPI SQLColumnsW(SQLHSTMT StatementHandle, + WCHAR *CatalogName, SQLSMALLINT NameLength1, + WCHAR *SchemaName, SQLSMALLINT NameLength2, + WCHAR *TableName, SQLSMALLINT NameLength3, + WCHAR *ColumnName, SQLSMALLINT NameLength4) +{ + TRACE("\n"); + + CHECK_READY_AND_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLCOLUMNS].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLCOLUMNS].funcW) + (StatementHandle, CatalogName, NameLength1, + SchemaName, NameLength2, TableName, NameLength3, ColumnName, NameLength4); +} + +/************************************************************************* + * SQLDriverConnectW [ODBC32.141] + */ +SQLRETURN WINAPI SQLDriverConnectW( + SQLHDBC hdbc, + SQLHWND hwnd, + WCHAR *conn_str_in, + SQLSMALLINT len_conn_str_in, + WCHAR *conn_str_out, + SQLSMALLINT conn_str_out_max, + SQLSMALLINT *ptr_conn_str_out, + SQLUSMALLINT driver_completion ) +{ + TRACE("ConnStrIn (%d bytes) --> %s\n", len_conn_str_in, debugstr_w(conn_str_in)); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLDRIVERCONNECT].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLDRIVERCONNECT].funcW) + (hdbc, hwnd, conn_str_in, len_conn_str_in, conn_str_out, + conn_str_out_max, ptr_conn_str_out, driver_completion); +} + +/************************************************************************* + * SQLGetConnectOptionW [ODBC32.142] + */ +SQLRETURN WINAPI SQLGetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLPOINTER Value) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETCONNECTOPTION].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLGETCONNECTOPTION].funcW) + (ConnectionHandle, Option, Value); +} + +/************************************************************************* + * SQLGetInfoW [ODBC32.145] + */ +SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, + SQLUSMALLINT InfoType, SQLPOINTER InfoValue, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength) +{ + SQLRETURN iResult; + + TRACE("InfoType = (%02u), InfoValue = %p, BufferLength = %d bytes\n", InfoType, InfoValue, BufferLength); + if (InfoValue == NULL) { + WARN("Unexpected NULL in InfoValue address\n"); + iResult = SQL_ERROR; + } else { + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETINFO].funcW); + iResult = (gProxyHandle.functions[SQLAPI_INDEX_SQLGETINFO].funcW) + (ConnectionHandle, InfoType, InfoValue, BufferLength, StringLength); + TRACE("returning %d...\n", iResult); + } + return iResult; +} + +/************************************************************************* + * SQLGetTypeInfoW [ODBC32.147] + */ +SQLRETURN WINAPI SQLGetTypeInfoW(SQLHSTMT StatementHandle, SQLSMALLINT DataType) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETTYPEINFO].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLGETTYPEINFO].funcW) + (StatementHandle, DataType); +} + +/************************************************************************* + * SQLSetConnectOptionW [ODBC32.150] + */ +SQLRETURN WINAPI SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLULEN Value) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLSETCONNECTOPTION].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLSETCONNECTOPTION].funcW) + (ConnectionHandle, Option, Value); +} + +/************************************************************************* + * SQLSpecialColumnsW [ODBC32.152] + */ +SQLRETURN WINAPI SQLSpecialColumnsW(SQLHSTMT StatementHandle, + SQLUSMALLINT IdentifierType, SQLWCHAR *CatalogName, + SQLSMALLINT NameLength1, SQLWCHAR *SchemaName, + SQLSMALLINT NameLength2, SQLWCHAR *TableName, + SQLSMALLINT NameLength3, SQLUSMALLINT Scope, + SQLUSMALLINT Nullable) +{ + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLSPECIALCOLUMNS].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLSPECIALCOLUMNS].funcW) + (StatementHandle, IdentifierType, CatalogName, NameLength1, SchemaName, + NameLength2, TableName, NameLength3, Scope, Nullable); +} + +/************************************************************************* + * SQLStatisticsW [ODBC32.153] + */ +SQLRETURN WINAPI SQLStatisticsW(SQLHSTMT StatementHandle, + SQLWCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLWCHAR *SchemaName, SQLSMALLINT NameLength2, + SQLWCHAR *TableName, SQLSMALLINT NameLength3, + SQLUSMALLINT Unique, SQLUSMALLINT Reserved) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLSTATISTICS].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLSTATISTICS].funcW) + (StatementHandle, CatalogName, NameLength1, SchemaName, NameLength2, + TableName, NameLength3, Unique, Reserved); +} + +/************************************************************************* + * SQLTablesW [ODBC32.154] + */ +SQLRETURN WINAPI SQLTablesW(SQLHSTMT StatementHandle, + SQLWCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLWCHAR *SchemaName, SQLSMALLINT NameLength2, + SQLWCHAR *TableName, SQLSMALLINT NameLength3, + SQLWCHAR *TableType, SQLSMALLINT NameLength4) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLTABLES].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLTABLES].funcW) + (StatementHandle, CatalogName, NameLength1, + SchemaName, NameLength2, TableName, NameLength3, TableType, NameLength4); +} + +/************************************************************************* + * SQLBrowseConnectW [ODBC32.155] + */ +SQLRETURN WINAPI SQLBrowseConnectW( + SQLHDBC hdbc, + SQLWCHAR *szConnStrIn, + SQLSMALLINT cbConnStrIn, + SQLWCHAR *szConnStrOut, + SQLSMALLINT cbConnStrOutMax, + SQLSMALLINT *pcbConnStrOut) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLBROWSECONNECT].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLBROWSECONNECT].funcW) + (hdbc, szConnStrIn, cbConnStrIn, szConnStrOut, cbConnStrOutMax, pcbConnStrOut); +} + +/************************************************************************* + * SQLColumnPrivilegesW [ODBC32.156] + */ +SQLRETURN WINAPI SQLColumnPrivilegesW( + SQLHSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szTableName, + SQLSMALLINT cbTableName, + SQLWCHAR *szColumnName, + SQLSMALLINT cbColumnName) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLCOLUMNPRIVILEGES].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLCOLUMNPRIVILEGES].funcW) + (hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, + szTableName, cbTableName, szColumnName, cbColumnName); +} + +/************************************************************************* + * SQLDataSourcesW [ODBC32.157] + */ +SQLRETURN WINAPI SQLDataSourcesW(SQLHENV EnvironmentHandle, + SQLUSMALLINT Direction, WCHAR *ServerName, + SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, + WCHAR *Description, SQLSMALLINT BufferLength2, + SQLSMALLINT *NameLength2) +{ + SQLRETURN ret; + + TRACE("EnvironmentHandle = %p\n", (LPVOID)EnvironmentHandle); + + if (!gProxyHandle.bFunctionReady || gProxyHandle.dmHandle == NULL) + { + ERR("Error: empty dm handle (gProxyHandle.dmHandle == NULL)\n"); + return SQL_ERROR; + } + + assert(gProxyHandle.functions[SQLAPI_INDEX_SQLDATASOURCES].funcW); + ret = (gProxyHandle.functions[SQLAPI_INDEX_SQLDATASOURCES].funcW) + (EnvironmentHandle, Direction, ServerName, + BufferLength1, NameLength1, Description, BufferLength2, NameLength2); + + if (TRACE_ON(odbc)) + { + TRACE("returns: %d \t", ret); + if (*NameLength1 > 0) + TRACE("DataSource = %s,", debugstr_w(ServerName)); + if (*NameLength2 > 0) + TRACE(" Description = %s", debugstr_w(Description)); + TRACE("\n"); + } + + return ret; +} + +/************************************************************************* + * SQLForeignKeysW [ODBC32.160] + */ +SQLRETURN WINAPI SQLForeignKeysW( + SQLHSTMT hstmt, + SQLWCHAR *szPkCatalogName, + SQLSMALLINT cbPkCatalogName, + SQLWCHAR *szPkSchemaName, + SQLSMALLINT cbPkSchemaName, + SQLWCHAR *szPkTableName, + SQLSMALLINT cbPkTableName, + SQLWCHAR *szFkCatalogName, + SQLSMALLINT cbFkCatalogName, + SQLWCHAR *szFkSchemaName, + SQLSMALLINT cbFkSchemaName, + SQLWCHAR *szFkTableName, + SQLSMALLINT cbFkTableName) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLFOREIGNKEYS].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLFOREIGNKEYS].funcW) + (hstmt, szPkCatalogName, cbPkCatalogName, szPkSchemaName, cbPkSchemaName, + szPkTableName, cbPkTableName, szFkCatalogName, cbFkCatalogName, szFkSchemaName, + cbFkSchemaName, szFkTableName, cbFkTableName); +} + +/************************************************************************* + * SQLNativeSqlW [ODBC32.162] + */ +SQLRETURN WINAPI SQLNativeSqlW( + SQLHDBC hdbc, + SQLWCHAR *szSqlStrIn, + SQLINTEGER cbSqlStrIn, + SQLWCHAR *szSqlStr, + SQLINTEGER cbSqlStrMax, + SQLINTEGER *pcbSqlStr) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLNATIVESQL].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLNATIVESQL].funcW) + (hdbc, szSqlStrIn, cbSqlStrIn, szSqlStr, cbSqlStrMax, pcbSqlStr); +} + +/************************************************************************* + * SQLPrimaryKeysW [ODBC32.165] + */ +SQLRETURN WINAPI SQLPrimaryKeysW( + SQLHSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szTableName, + SQLSMALLINT cbTableName) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLPRIMARYKEYS].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLPRIMARYKEYS].funcW) + (hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, + szTableName, cbTableName); +} + +/************************************************************************* + * SQLProcedureColumnsW [ODBC32.166] + */ +SQLRETURN WINAPI SQLProcedureColumnsW( + SQLHSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szProcName, + SQLSMALLINT cbProcName, + SQLWCHAR *szColumnName, + SQLSMALLINT cbColumnName) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLPROCEDURECOLUMNS].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLPROCEDURECOLUMNS].funcW) + (hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, + szProcName, cbProcName, szColumnName, cbColumnName); +} + +/************************************************************************* + * SQLProceduresW [ODBC32.167] + */ +SQLRETURN WINAPI SQLProceduresW( + SQLHSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szProcName, + SQLSMALLINT cbProcName) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLPROCEDURES].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLPROCEDURES].funcW) + (hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, + szProcName, cbProcName); +} + +/************************************************************************* + * SQLTablePrivilegesW [ODBC32.170] + */ +SQLRETURN WINAPI SQLTablePrivilegesW( + SQLHSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szTableName, + SQLSMALLINT cbTableName) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLTABLEPRIVILEGES].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLTABLEPRIVILEGES].funcW) + (hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, + szTableName, cbTableName); +} + +/************************************************************************* + * SQLDriversW [ODBC32.171] + */ +SQLRETURN WINAPI SQLDriversW( + SQLHENV henv, + SQLUSMALLINT fDirection, + SQLWCHAR *szDriverDesc, + SQLSMALLINT cbDriverDescMax, + SQLSMALLINT *pcbDriverDesc, + SQLWCHAR *szDriverAttributes, + SQLSMALLINT cbDriverAttrMax, + SQLSMALLINT *pcbDriverAttr) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLDRIVERS].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLDRIVERS].funcW) + (henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, + szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); +} + +/************************************************************************* + * SQLSetDescFieldW [ODBC32.173] + */ +SQLRETURN WINAPI SQLSetDescFieldW(SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, + SQLPOINTER Value, SQLINTEGER BufferLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLSETDESCFIELD].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLSETDESCFIELD].funcW) + (DescriptorHandle, RecNumber, FieldIdentifier, Value, BufferLength); +} + +/************************************************************************* + * SQLSetStmtAttrW [ODBC32.176] + */ +SQLRETURN WINAPI SQLSetStmtAttrW(SQLHSTMT StatementHandle, + SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER StringLength) +{ + SQLRETURN iResult; + TRACE("Attribute = (%02ld) Value = %p StringLength = (%ld)\n", + Attribute, Value, StringLength); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLSETSTMTATTR].funcW); + iResult = (gProxyHandle.functions[SQLAPI_INDEX_SQLSETSTMTATTR].funcW) + (StatementHandle, Attribute, Value, StringLength); + if (iResult == SQL_ERROR && (Attribute == SQL_ROWSET_SIZE || Attribute == SQL_ATTR_ROW_ARRAY_SIZE)) { + TRACE("CHEAT: returning SQL_SUCCESS to ADO...\n"); + iResult = SQL_SUCCESS; + } else { + TRACE("returning %d...\n", iResult); + } + return iResult; +} + + /* End of file */ Modified: trunk/reactos/dll/win32/odbc32/proxyodbc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/proxyodbc… ============================================================================== --- trunk/reactos/dll/win32/odbc32/proxyodbc.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbc32/proxyodbc.h [iso-8859-1] Mon Jun 21 23:14:01 2010 @@ -33,6 +33,7 @@ const char *name; void *d_func; SQLRETURN (*func)(); + SQLRETURN (*funcW)(); } DM_FUNC; typedef struct proxyhandle @@ -44,7 +45,6 @@ int nErrorType; DM_FUNC functions[NUM_SQLFUNC]; /* entry point for driver manager functions */ char driverLibName[200]; /* ODBC driver SO name */ - char dmLibName[200]; /* driver manager library name */ char ServerName[200]; /* keep server name */ char UserName[50]; /* keep username */ } PROXYHANDLE;

1 0

[khornicek] 47823: [NTOSKRNL] Remove a superfluous assert (requested by sir_richard).
by khornicek＠svn.reactos.org 21 Jun '10

21 Jun '10

Author: khornicek Date: Mon Jun 21 21:42:12 2010 New Revision: 47823 URL: http://svn.reactos.org/svn/reactos?rev=47823&view=rev Log: [NTOSKRNL] Remove a superfluous assert (requested by sir_richard). Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Mon Jun 21 21:42:12 2010 @@ -255,7 +255,6 @@ // // Make sure it's really free // - ASSERT(MiIsPfnInUse(Pfn1) == FALSE); ASSERT(Pfn1->u3.e2.ReferenceCount == 0); //

1 0

[tkreuzer] 47822: [CRT] - Stubplement _controlfp_s, rand_s - Implement _invalid_parameter, _get_invalid_parameter_handler, _set_invalid_parameter_handler - Implement memmove_s, strncpy_s - sync heap.c with wine Patch by Samuel Serapion
by tkreuzer＠svn.reactos.org 21 Jun '10

21 Jun '10

Author: tkreuzer Date: Mon Jun 21 19:57:36 2010 New Revision: 47822 URL: http://svn.reactos.org/svn/reactos?rev=47822&view=rev Log: [CRT] - Stubplement _controlfp_s, rand_s - Implement _invalid_parameter, _get_invalid_parameter_handler, _set_invalid_parameter_handler - Implement memmove_s, strncpy_s - sync heap.c with wine Patch by Samuel Serapion Modified: trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c trunk/reactos/lib/sdk/crt/math/rand.c trunk/reactos/lib/sdk/crt/misc/stubs.c trunk/reactos/lib/sdk/crt/stdlib/errno.c trunk/reactos/lib/sdk/crt/wine/heap.c 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] Mon Jun 21 19:57:36 2010 @@ -329,7 +329,6 @@ <file>gcvt.c</file> <file>getenv.c</file> <file>makepath.c</file> - <file>malloc.c</file> <file>mbtowc.c</file> <file>mbstowcs.c</file> <file>obsol.c</file> Modified: trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/cnt… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c [iso-8859-1] Mon Jun 21 19:57:36 2010 @@ -104,3 +104,25 @@ return flags; } + +/********************************************************************* + * _controlfp_s (MSVCRT.@) + */ +int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask) +{ +#ifdef __i386__ + unsigned int flags; + + FIXME("(%p %u %u) semi-stub\n", cur, newval, mask); + + flags = _control87( newval, mask & ~_EM_DENORMAL ); + + if(cur) + *cur = flags; + + return 0; +#else + FIXME(":Not Implemented!\n"); + return 0; +#endif +} Modified: trunk/reactos/lib/sdk/crt/math/rand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/rand.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/rand.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/rand.c [iso-8859-1] Mon Jun 21 19:57:36 2010 @@ -1,6 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <precomp.h> - +//#include <Ntsecapi.h> #include <internal/tls.h> /* @@ -25,3 +25,18 @@ ThreadData->tnext = (ULONGLONG)seed; } + + /********************************************************************* + * rand_s (MSVCRT.@) + */ +int CDECL rand_s(unsigned int *pval) +{ +#if 0 + if (!pval || !RtlGenRandom(pval, sizeof(*pval))) + { + *_errno() = EINVAL; + return EINVAL; + } +#endif + return 0; +} Modified: trunk/reactos/lib/sdk/crt/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/stubs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/stubs.c [iso-8859-1] Mon Jun 21 19:57:36 2010 @@ -15,11 +15,6 @@ /* FIXME: This is probably data, not a function */ } -void __p__amblksiz(void) -{ - FIXME("__p__amblksiz stub\n"); -} - void __fileinfo(void) { FIXME("__fileinfo stub\n"); Modified: trunk/reactos/lib/sdk/crt/stdlib/errno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/errno.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/errno.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/errno.c [iso-8859-1] Mon Jun 21 19:57:36 2010 @@ -8,7 +8,10 @@ */ #include <precomp.h> #include "doserrmap.h" +#include <errno.h> #include <internal/wine/msvcrt.h> + +static _invalid_parameter_handler invalid_parameter_handler = NULL; /* * @implemented @@ -113,4 +116,36 @@ SetErrorMode( mode ); } +/****************************************************************************** + * _invalid_parameter (MSVCRT.@) + */ +void __cdecl _invalid_parameter(const wchar_t *expr, const wchar_t *func, + const wchar_t *file, unsigned int line, uintptr_t arg) +{ + if (invalid_parameter_handler) invalid_parameter_handler( expr, func, file, line, arg ); + else + { + ERR( "%s:%u %s: %s %lx\n", debugstr_w(file), line, debugstr_w(func), debugstr_w(expr), arg ); + RaiseException( STATUS_INVALID_CRUNTIME_PARAMETER, EXCEPTION_NONCONTINUABLE, 0, NULL ); + } +} + +/* _get_invalid_parameter_handler - not exported in native msvcrt, added in msvcr80 */ +_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void) +{ + TRACE("\n"); + return invalid_parameter_handler; +} + +/* _set_invalid_parameter_handler - not exproted in native msvcrt, added in msvcr80 */ +_invalid_parameter_handler CDECL _set_invalid_parameter_handler( + _invalid_parameter_handler handler) +{ + _invalid_parameter_handler old = invalid_parameter_handler; + + TRACE("(%p)\n", handler); + + invalid_parameter_handler = handler; + return old; +} /* EOF */ Modified: trunk/reactos/lib/sdk/crt/wine/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/heap.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/heap.c [iso-8859-1] Mon Jun 21 19:57:36 2010 @@ -15,13 +15,14 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * Note: Win32 heap operations are MT safe. We only lock the new * handler and non atomic heap operations */ #include <precomp.h> +#include <malloc.h> /* MT */ #define LOCK_HEAP _mlock( _HEAP_LOCK ) @@ -29,47 +30,60 @@ /* _aligned */ #define SAVED_PTR(x) ((void *)((DWORD_PTR)((char *)x - sizeof(void *)) & \ - ~(sizeof(void *) - 1))) + ~(sizeof(void *) - 1))) #define ALIGN_PTR(ptr, alignment, offset) ((void *) \ ((((DWORD_PTR)((char *)ptr + alignment + sizeof(void *) + offset)) & \ ~(alignment - 1)) - offset)) -typedef void (*MSVCRT_new_handler_func)(unsigned long size); +typedef void (*MSVCRT_new_handler_func)(size_t size); static MSVCRT_new_handler_func MSVCRT_new_handler; static int MSVCRT_new_mode; +/* FIXME - According to documentation it should be 8*1024, at runtime it returns 16 */ +static unsigned int MSVCRT_amblksiz = 16; /* FIXME - According to documentation it should be 480 bytes, at runtime default is 0 */ static size_t MSVCRT_sbh_threshold = 0; /********************************************************************* * ??2@YAPAXI@Z (MSVCRT.@) */ -void* MSVCRT_operator_new(unsigned long size) -{ - void *retval = malloc(size); +void* CDECL MSVCRT_operator_new(size_t size) +{ + void *retval = HeapAlloc(GetProcessHeap(), 0, size); TRACE("(%ld) returning %p\n", size, retval); + if(retval) return retval; LOCK_HEAP; - if(!retval && MSVCRT_new_handler) + if(MSVCRT_new_handler) (*MSVCRT_new_handler)(size); UNLOCK_HEAP; return retval; } + +/********************************************************************* + * ??2@YAPAXIHPBDH@Z (MSVCRT.@) + */ +void* CDECL MSVCRT_operator_new_dbg(size_t size, int type, const char *file, int line) +{ + return MSVCRT_operator_new( size ); +} + + /********************************************************************* * ??3@YAXPAX@Z (MSVCRT.@) */ -void MSVCRT_operator_delete(void *mem) +void CDECL MSVCRT_operator_delete(void *mem) { TRACE("(%p)\n", mem); - free(mem); + HeapFree(GetProcessHeap(), 0, mem); } /********************************************************************* * ?_query_new_handler@@YAP6AHI@ZXZ (MSVCRT.@) */ -MSVCRT_new_handler_func MSVCRT__query_new_handler(void) +MSVCRT_new_handler_func CDECL MSVCRT__query_new_handler(void) { return MSVCRT_new_handler; } @@ -78,7 +92,7 @@ /********************************************************************* * ?_query_new_mode@@YAHXZ (MSVCRT.@) */ -int MSVCRT__query_new_mode(void) +int CDECL MSVCRT__query_new_mode(void) { return MSVCRT_new_mode; } @@ -86,7 +100,7 @@ /********************************************************************* * ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z (MSVCRT.@) */ -MSVCRT_new_handler_func MSVCRT__set_new_handler(MSVCRT_new_handler_func func) +MSVCRT_new_handler_func CDECL MSVCRT__set_new_handler(MSVCRT_new_handler_func func) { MSVCRT_new_handler_func old_handler; LOCK_HEAP; @@ -99,7 +113,7 @@ /********************************************************************* * ?set_new_handler@@YAP6AXXZP6AXXZ@Z (MSVCRT.@) */ -MSVCRT_new_handler_func MSVCRT_set_new_handler(void *func) +MSVCRT_new_handler_func CDECL MSVCRT_set_new_handler(void *func) { TRACE("(%p)\n",func); MSVCRT__set_new_handler(NULL); @@ -109,7 +123,7 @@ /********************************************************************* * ?_set_new_mode@@YAHH@Z (MSVCRT.@) */ -int MSVCRT__set_new_mode(int mode) +int CDECL MSVCRT__set_new_mode(int mode) { int old_mode; LOCK_HEAP; @@ -119,45 +133,216 @@ return old_mode; } -int CDECL _callnewh(unsigned long size) -{ - if(MSVCRT_new_handler) - (*MSVCRT_new_handler)(size); - return 0; -} - -/********************************************************************* - * _get_sbh_threshold (MSVCRT.@) - */ -size_t CDECL _get_sbh_threshold(void) -{ - return MSVCRT_sbh_threshold; -} - -/********************************************************************* - * _set_sbh_threshold (MSVCRT.@) - */ -int CDECL _set_sbh_threshold(size_t threshold) -{ - if(threshold > 1016) - return 0; - else - MSVCRT_sbh_threshold = threshold; - return 1; -} - -/********************************************************************* - * _heapadd (MSVCRT.@) - */ -int _heapadd(void* mem, size_t size) -{ - TRACE("(%p,%d) unsupported in Win32\n", mem,size); +/********************************************************************* + * _callnewh (MSVCRT.@) + */ +int CDECL _callnewh(size_t size) +{ + if(MSVCRT_new_handler) + (*MSVCRT_new_handler)(size); + return 0; +} + +/********************************************************************* + * _expand (MSVCRT.@) + */ +void* CDECL _expand(void* mem, size_t size) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, mem, size); +} + +/********************************************************************* + * _heapchk (MSVCRT.@) + */ +int CDECL _heapchk(void) +{ + if (!HeapValidate( GetProcessHeap(), 0, NULL)) + { + __set_errno(GetLastError()); + return _HEAPBADNODE; + } + return _HEAPOK; +} + +/********************************************************************* + * _heapmin (MSVCRT.@) + */ +int CDECL _heapmin(void) +{ + if (!HeapCompact( GetProcessHeap(), 0 )) + { + if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + __set_errno(GetLastError()); + return -1; + } + return 0; +} + +/********************************************************************* + * _heapwalk (MSVCRT.@) + */ +int CDECL _heapwalk(_HEAPINFO* next) +{ + PROCESS_HEAP_ENTRY phe; + + LOCK_HEAP; + phe.lpData = next->_pentry; + phe.cbData = next->_size; + phe.wFlags = next->_useflag == _USEDENTRY ? PROCESS_HEAP_ENTRY_BUSY : 0; + + if (phe.lpData && phe.wFlags & PROCESS_HEAP_ENTRY_BUSY && + !HeapValidate( GetProcessHeap(), 0, phe.lpData )) + { + UNLOCK_HEAP; + __set_errno(GetLastError()); + return _HEAPBADNODE; + } + + do + { + if (!HeapWalk( GetProcessHeap(), &phe )) + { + UNLOCK_HEAP; + if (GetLastError() == ERROR_NO_MORE_ITEMS) + return _HEAPEND; + __set_errno(GetLastError()); + if (!phe.lpData) + return _HEAPBADBEGIN; + return _HEAPBADNODE; + } + } while (phe.wFlags & (PROCESS_HEAP_REGION|PROCESS_HEAP_UNCOMMITTED_RANGE)); + + UNLOCK_HEAP; + next->_pentry = phe.lpData; + next->_size = phe.cbData; + next->_useflag = phe.wFlags & PROCESS_HEAP_ENTRY_BUSY ? _USEDENTRY : _FREEENTRY; + return _HEAPOK; +} + +/********************************************************************* + * _heapset (MSVCRT.@) + */ +int CDECL _heapset(unsigned int value) +{ + int retval; + _HEAPINFO heap; + + memset( &heap, 0, sizeof(heap) ); + LOCK_HEAP; + while ((retval = _heapwalk(&heap)) == _HEAPOK) + { + if (heap._useflag == _FREEENTRY) + memset(heap._pentry, value, heap._size); + } + UNLOCK_HEAP; + return retval == _HEAPEND? _HEAPOK : retval; +} + +/********************************************************************* + * _heapadd (MSVCRT.@) + */ +int CDECL _heapadd(void* mem, size_t size) +{ + TRACE("(%p,%ld) unsupported in Win32\n", mem,size); *_errno() = ENOSYS; return -1; } +/********************************************************************* + * _heapadd (MSVCRT.@) + */ +intptr_t CDECL _get_heap_handle(void) +{ + return (intptr_t)GetProcessHeap(); +} + +/********************************************************************* + * _msize (MSVCRT.@) + */ +size_t CDECL _msize(void* mem) +{ + size_t size = HeapSize(GetProcessHeap(),0,mem); + if (size == ~(size_t)0) + { + WARN(":Probably called with non wine-allocated memory, ret = -1\n"); + /* At least the Win32 crtdll/msvcrt also return -1 in this case */ + } + return size; +} + +/********************************************************************* + * calloc (MSVCRT.@) + */ +void* CDECL calloc(size_t size,size_t count) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size * count ); +} + +/********************************************************************* + * free (MSVCRT.@) + */ +void CDECL free(void* ptr) +{ + HeapFree(GetProcessHeap(),0,ptr); +} + +/********************************************************************* + * malloc (MSVCRT.@) + */ +void* CDECL malloc(size_t size) +{ + void *ret = HeapAlloc(GetProcessHeap(),0,size); + if (!ret) + *_errno() = ENOMEM; + return ret; +} + +/********************************************************************* + * realloc (MSVCRT.@) + */ +void* CDECL realloc(void* ptr, size_t size) +{ + if (!ptr) return malloc(size); + if (size) return HeapReAlloc(GetProcessHeap(), 0, ptr, size); + free(ptr); + return NULL; +} + +/********************************************************************* + * __p__amblksiz (MSVCRT.@) + */ +unsigned int* CDECL __p__amblksiz(void) +{ + return &MSVCRT_amblksiz; +} + +/********************************************************************* + * _get_sbh_threshold (MSVCRT.@) + */ +size_t CDECL _get_sbh_threshold(void) +{ + return MSVCRT_sbh_threshold; +} + +/********************************************************************* + * _set_sbh_threshold (MSVCRT.@) + */ +int CDECL _set_sbh_threshold(size_t threshold) +{ + if(threshold > 1016) + return 0; + else + MSVCRT_sbh_threshold = threshold; + return 1; +} + +/********************************************************************* + * _aligned_free (MSVCRT.@) + */ void CDECL _aligned_free(void *memblock) { + TRACE("(%p)\n", memblock); + if (memblock) { void **saved = SAVED_PTR(memblock); @@ -165,9 +350,13 @@ } } +/********************************************************************* + * _aligned_offset_malloc (MSVCRT.@) + */ void * CDECL _aligned_offset_malloc(size_t size, size_t alignment, size_t offset) { void *memblock, *temp, **saved; + TRACE("(%lu, %lu, %lu)\n", size, alignment, offset); /* alignment must be a power of 2 */ if ((alignment & (alignment - 1)) != 0) @@ -204,16 +393,24 @@ return memblock; } +/********************************************************************* + * _aligned_malloc (MSVCRT.@) + */ void * CDECL _aligned_malloc(size_t size, size_t alignment) { + TRACE("(%lu, %lu)\n", size, alignment); return _aligned_offset_malloc(size, alignment, 0); } +/********************************************************************* + * _aligned_offset_realloc (MSVCRT.@) + */ void * CDECL _aligned_offset_realloc(void *memblock, size_t size, size_t alignment, size_t offset) { void * temp, **saved; size_t old_padding, new_padding, old_size; + TRACE("(%p, %lu, %lu, %lu)\n", memblock, size, alignment, offset); if (!memblock) return _aligned_offset_malloc(size, alignment, offset); @@ -244,7 +441,6 @@ /* make sure alignment and offset didn't change */ saved = SAVED_PTR(memblock); - if (memblock != ALIGN_PTR(*saved, alignment, offset)) { *_errno() = EINVAL; @@ -255,7 +451,7 @@ /* Get previous size of block */ old_size = _msize(*saved); - if (old_size == (size_t)-1) + if (old_size == -1) { /* It seems this function was called with an invalid pointer. Bail out. */ return NULL; @@ -283,47 +479,116 @@ new_padding = (char *)memblock - (char *)temp; - /* - Memory layout of old block is as follows: - +-------+---------------------+-+--------------------------+-----------+ - | ... | "old_padding" bytes | | ... "old_size" bytes ... | ... | - +-------+---------------------+-+--------------------------+-----------+ - ^ ^ ^ - | | | - *saved saved memblock - - - Memory layout of new block is as follows: - +-------+-----------------------------+-+----------------------+-------+ - | ... | "new_padding" bytes | | ... "size" bytes ... | ... | - +-------+-----------------------------+-+----------------------+-------+ - ^ ^ ^ - | | | - temp saved memblock - - However, in the new block, actual data is still written as follows - (because it was copied by MSVCRT_realloc): - +-------+---------------------+--------------------------------+-------+ - | ... | "old_padding" bytes | ... "old_size" bytes ... | ... | - +-------+---------------------+--------------------------------+-------+ - ^ ^ ^ - | | | - temp saved memblock - - Therefore, min(old_size,size) bytes of actual data have to be moved - from the offset they were at in the old block (temp + old_padding), - to the offset they have to be in the new block (temp + new_padding == memblock). - */ - +/* + Memory layout of old block is as follows: + +-------+---------------------+-+--------------------------+-----------+ + | ... | "old_padding" bytes | | ... "old_size" bytes ... | ... | + +-------+---------------------+-+--------------------------+-----------+ + ^ ^ ^ + | | | + *saved saved memblock + + Memory layout of new block is as follows: + +-------+-----------------------------+-+----------------------+-------+ + | ... | "new_padding" bytes | | ... "size" bytes ... | ... | + +-------+-----------------------------+-+----------------------+-------+ + ^ ^ ^ + | | | + temp saved memblock + + However, in the new block, actual data is still written as follows + (because it was copied by MSVCRT_realloc): + +-------+---------------------+--------------------------------+-------+ + | ... | "old_padding" bytes | ... "old_size" bytes ... | ... | + +-------+---------------------+--------------------------------+-------+ + ^ ^ ^ + | | | + temp saved memblock + + Therefore, min(old_size,size) bytes of actual data have to be moved + from the offset they were at in the old block (temp + old_padding), + to the offset they have to be in the new block (temp + new_padding == memblock). +*/ if (new_padding != old_padding) memmove((char *)memblock, (char *)temp + old_padding, (old_size < size) ? old_size : size); *saved = temp; return memblock; - } - +} + +/********************************************************************* + * _aligned_realloc (MSVCRT.@) + */ void * CDECL _aligned_realloc(void *memblock, size_t size, size_t alignment) { + TRACE("(%p, %lu, %lu)\n", memblock, size, alignment); return _aligned_offset_realloc(memblock, size, alignment, 0); } + +/********************************************************************* + * memmove_s (MSVCRT.@) + */ +int CDECL memmove_s(void *dest, size_t numberOfElements, const void *src, size_t count) +{ + TRACE("(%p %lu %p %lu)\n", dest, numberOfElements, src, count); + + if(!count) + return 0; + + if(!dest || !src) { + if(dest) + memset(dest, 0, numberOfElements); + + *_errno() = EINVAL; + return EINVAL; + } + + if(count > numberOfElements) { + memset(dest, 0, numberOfElements); + + *_errno() = ERANGE; + return ERANGE; + } + + memmove(dest, src, count); + return 0; +} + +/********************************************************************* + * strncpy_s (MSVCRT.@) + */ +int CDECL strncpy_s(char *dest, size_t numberOfElements, + const char *src, size_t count) +{ + size_t i, end; + + TRACE("(%s %lu %s %lu)\n", dest, numberOfElements, src, count); + + if(!count) + return 0; + + if(!dest || !src || !numberOfElements) { + _invalid_parameter(NULL, NULL, NULL, 0, 0); + *_errno() = EINVAL; + return EINVAL; + } + + if(count!=_TRUNCATE && count<numberOfElements) + end = count; + else + end = numberOfElements-1; + + for(i=0; i<end && src[i]; i++) + dest[i] = src[i]; + + if(!src[i] || end==count || count==_TRUNCATE) { + dest[i] = '\0'; + return 0; + } + + _invalid_parameter(NULL, NULL, NULL, 0, 0); + dest[0] = '\0'; + *_errno() = EINVAL; + return EINVAL; +}

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs