[tkreuzer] 46419: Merge from amd64-branch: 44036 (sserapion) Seems that windows cares about manifests and a mismatched processor architecture is not good. Fix amd64 paint in windows. 44772 (sserapion) Fix warning cast to 'unsigned int' loses precision.

Author: tkreuzer
Date: Thu Mar 25 02:59:02 2010
New Revision: 46419

URL: http://svn.reactos.org/svn/reactos?rev=46419&view=rev
Log:
Merge from amd64-branch:

44036 (sserapion)
Seems that windows cares about manifests and a mismatched processor architecture is not good. Fix amd64 paint in windows.

44772 (sserapion)
Fix warning cast to 'unsigned int' loses precision.

Added:
    trunk/reactos/base/applications/paint/paint.exe.amd64.manifest
      - copied unchanged from r44036, branches/ros-amd64-bringup/reactos/base/applications/paint/paint.exe.amd64.manifest
Modified:
    trunk/reactos/base/applications/paint/rsrc.rc
    trunk/reactos/base/applications/sndrec32/audio_wavein.hpp
    trunk/reactos/base/applications/sndrec32/audio_waveout.hpp

Modified: trunk/reactos/base/applications/paint/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/rsr...
==============================================================================
--- trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] Thu Mar 25 02:59:02 2010
@@ -42,4 +42,9 @@
 // THIS WILL MAKE THE PROGRAM USE THE COMMON CONTROLS
 // LIBRARY VERSION 6.0 (IF IT IS AVAILABLE)
 //
+#ifdef _AMD64_
+1 24 "paint.exe.amd64.manifest"
+#elif _X86_
 1 24 "paint.exe.manifest"
+#endif
+

Modified: trunk/reactos/base/applications/sndrec32/audio_wavein.hpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32/...
==============================================================================
--- trunk/reactos/base/applications/sndrec32/audio_wavein.hpp [iso-8859-1] (original)
+++ trunk/reactos/base/applications/sndrec32/audio_wavein.hpp [iso-8859-1] Thu Mar 25 02:59:02 2010
@@ -305,7 +305,7 @@
             if ( aud_info.bits() == 16 )
                 svalue = ( unsigned int )  abs( *(( short * ) (main_buffer + aud_info.bytes_in_samples( nsamp ))));
             else if ( aud_info.bits() == 8 )
-               svalue = (unsigned int)(( unsigned char * ) *(main_buffer + aud_info.bytes_in_samples( nsamp )));
+               svalue = (unsigned int)(( ptrdiff_t ) *(main_buffer + aud_info.bytes_in_samples( nsamp )));

else 
                 svalue = 0;

Modified: trunk/reactos/base/applications/sndrec32/audio_waveout.hpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32/...
==============================================================================
--- trunk/reactos/base/applications/sndrec32/audio_waveout.hpp [iso-8859-1] (original)
+++ trunk/reactos/base/applications/sndrec32/audio_waveout.hpp [iso-8859-1] Thu Mar 25 02:59:02 2010
@@ -229,7 +229,7 @@
             if ( aud_info.bits() == 16 )
                 svalue = ( unsigned int )  abs( *(( short * ) (main_buffer + aud_info.bytes_in_samples( nsamp ))));
             else if ( aud_info.bits() == 8 )
-               svalue = (unsigned int)(( unsigned char * ) *(main_buffer + aud_info.bytes_in_samples( nsamp )));
+               svalue = (unsigned int)(( ptrdiff_t ) *(main_buffer + aud_info.bytes_in_samples( nsamp )));

else 
                 svalue = 0;