fixed gcc4 warnings

svn path=/trunk/; revision=20560

diff --git a/rosapps/demos/ddraw/ddraw.xml b/rosapps/demos/ddraw/ddraw.xml
index 7d01b2d..98a0fb3 100644 (file)
--- a/rosapps/demos/ddraw/ddraw.xml
+++ b/rosapps/demos/ddraw/ddraw.xml
@@ -1,4 +1,4 @@
-<module name="ddraw_demo" type="win32gui" installbase="system32" installname="ddraw_demo.exe">\r
+<module name="ddraw_demo" type="win32gui" installbase="system32" installname="ddraw_demo.exe" allowwarnings="true">\r
        <define name="_WIN32_IE">0x0501</define>\r
        <define name="_WIN32_WINNT">0x0501</define>\r
        <define name="__USE_W32API" />\r

diff --git a/rosapps/sysutils/regexpl/ShellCommandValue.cpp b/rosapps/sysutils/regexpl/ShellCommandValue.cpp
index 06e180e..4417404 100644 (file)
--- a/rosapps/sysutils/regexpl/ShellCommandValue.cpp
+++ b/rosapps/sysutils/regexpl/ShellCommandValue.cpp
@@ -243,7 +243,7 @@ CheckValueArgument:
       default:
         {
           TCHAR Buffer[256];
-          DWORD i;
+          DWORD i, j;
           for (i = 0 ; i < dwValueSize ; i++)
           {
             if (i%16 == 0)
@@ -266,7 +266,7 @@ CheckValueArgument:
             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 @@ CheckValueArgument:
             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.

diff --git a/rosapps/tests/combotst/combotst.c b/rosapps/tests/combotst/combotst.c
index 27f1cc7..db6effa 100644 (file)
--- a/rosapps/tests/combotst/combotst.c
+++ b/rosapps/tests/combotst/combotst.c
@@ -545,7 +545,7 @@ WndProc ( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam )
                     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;

diff --git a/rosapps/tests/hivetest/hivetest.c b/rosapps/tests/hivetest/hivetest.c
index 8de1b45..5d13432 100644 (file)
--- a/rosapps/tests/hivetest/hivetest.c
+++ b/rosapps/tests/hivetest/hivetest.c
@@ -804,7 +804,7 @@ void test8(void)
  LONG dwError;
  TOKEN_PRIVILEGES NewPrivileges;
  HANDLE Token,hKey;
- LUID Luid;
+ LUID Luid = {0};
  BOOLEAN bRes;
   Status=NtOpenProcessToken(GetCurrentProcess()
        ,TOKEN_ADJUST_PRIVILEGES,&Token);