[ros-diffs] [weiden] 20560: fixed gcc4 warnings

fixed gcc4 warnings
Modified: trunk/rosapps/demos/ddraw/ddraw.xml
Modified: trunk/rosapps/sysutils/regexpl/ShellCommandValue.cpp
Modified: trunk/rosapps/tests/combotst/combotst.c
Modified: trunk/rosapps/tests/hivetest/hivetest.c
  _____  

Modified: trunk/rosapps/demos/ddraw/ddraw.xml
--- trunk/rosapps/demos/ddraw/ddraw.xml	2006-01-04 06:44:52 UTC (rev
20559)
+++ trunk/rosapps/demos/ddraw/ddraw.xml	2006-01-04 14:26:06 UTC (rev
20560)
@@ -1,4 +1,4 @@

-<module name="ddraw_demo" type="win32gui"
installbase="system32"
installname="ddraw_demo.exe">
+<module name="ddraw_demo" type="win32gui"
installbase="system32"
installname="ddraw_demo.exe" allowwarnings="true">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
  _____  

Modified: trunk/rosapps/sysutils/regexpl/ShellCommandValue.cpp
--- trunk/rosapps/sysutils/regexpl/ShellCommandValue.cpp
2006-01-04 06:44:52 UTC (rev 20559)
+++ trunk/rosapps/sysutils/regexpl/ShellCommandValue.cpp
2006-01-04 14:26:06 UTC (rev 20560)
@@ -243,7 +243,7 @@

       default:
         {
           TCHAR Buffer[256];
-          DWORD i;
+          DWORD i, j;
           for (i = 0 ; i < dwValueSize ; i++)
           {
             if (i%16 == 0)
@@ -266,7 +266,7 @@
             if (i && (i%16 == 15))
             {	// if this is the last byte in line
               // Dump text representation
-              for (DWORD j = i-15; j <= i; j += blnUnicodeDump?2:1)\
+              for (j = i-15; j <= i; j += blnUnicodeDump?2:1)\
                   {
                     if ((j%8 == 0)&&(j%16 != 0))
                     {	// this is the additional space between 7th and
8th byte in current line
@@ -321,7 +321,7 @@
             if (k && (k%16 == 15))
             {	// if this is the last byte in line
               ASSERT((k-15)%16 == 0);	// k-15 must point at begin of
last line
-              for (DWORD j = k-15; j < i; j += j += blnUnicodeDump?2:1)
+              for (j = k-15; j < i; j += blnUnicodeDump?2:1)
               {
                 if (blnUnicodeDump&&(j+1 >= i))
                 {	// ok, buffer size is odd number, so we don't
display last byte.
  _____  

Modified: trunk/rosapps/tests/combotst/combotst.c
--- trunk/rosapps/tests/combotst/combotst.c	2006-01-04 06:44:52 UTC
(rev 20559)
+++ trunk/rosapps/tests/combotst/combotst.c	2006-01-04 14:26:06 UTC
(rev 20560)
@@ -545,7 +545,7 @@

                     PrintTextXY("CBN_EDITCHANGE
notification",NOTIFYX,NOTIFYY,27,srect);
                     break;
 
-                case CBN_ERRSPACE:
+                case (WORD)CBN_ERRSPACE:
                     ScrollWindow (hwnd, 0, SCROLLAMOUNT, &srect,
&srect);
                     PrintTextXY("CBN_ERRSPACE
notification",NOTIFYX,NOTIFYY,25,srect);
                     break;
  _____  

Modified: trunk/rosapps/tests/hivetest/hivetest.c
--- trunk/rosapps/tests/hivetest/hivetest.c	2006-01-04 06:44:52 UTC
(rev 20559)
+++ trunk/rosapps/tests/hivetest/hivetest.c	2006-01-04 14:26:06 UTC
(rev 20560)
@@ -804,7 +804,7 @@

  LONG dwError;
  TOKEN_PRIVILEGES NewPrivileges;
  HANDLE Token,hKey;
- LUID Luid;
+ LUID Luid = {0};
  BOOLEAN bRes;
   Status=NtOpenProcessToken(GetCurrentProcess()
 	,TOKEN_ADJUST_PRIVILEGES,&Token);