Build usetup and ntoskrnl and winmm in gcc 4.0

svn path=/trunk/; revision=15494

diff --git a/reactos/lib/mmdrv/wave.c b/reactos/lib/mmdrv/wave.c
index 5816d24..ed690a2 100644 (file)
--- a/reactos/lib/mmdrv/wave.c
+++ b/reactos/lib/mmdrv/wave.c
@@ -275,7 +275,7 @@ APIENTRY DWORD wodMessage(DWORD dwId, DWORD dwMessage, DWORD dwUser, DWORD dwPar
         case WODM_GETVOLUME:
             DPRINT("WODM_GETVOLUME");
             {
         case WODM_GETVOLUME:
             DPRINT("WODM_GETVOLUME");
             {

-                WAVE_DD_VOLUME Vol;
+                WAVE_DD_VOLUME Vol = {};

                 DWORD res;
 
                 res = soundGetData(WaveOutDevice, dwId, sizeof(Vol),
                 DWORD res;
 
                 res = soundGetData(WaveOutDevice, dwId, sizeof(Vol),

diff --git a/reactos/ntoskrnl/ob/object.c b/reactos/ntoskrnl/ob/object.c
index 758b7ad..29c3c18 100644 (file)
--- a/reactos/ntoskrnl/ob/object.c
+++ b/reactos/ntoskrnl/ob/object.c
@@ -31,7 +31,7 @@ ObpCaptureObjectName(IN OUT PUNICODE_STRING CapturedName,
                      IN KPROCESSOR_MODE AccessMode)
 {
     NTSTATUS Status = STATUS_SUCCESS;
                      IN KPROCESSOR_MODE AccessMode)
 {
     NTSTATUS Status = STATUS_SUCCESS;

-    UNICODE_STRING LocalName;
+    UNICODE_STRING LocalName = {}; /* <= GCC 4.0 + Optimizer */

     
     /* First Probe the String */
     DPRINT("ObpCaptureObjectName: %wZ\n", ObjectName);
     
     /* First Probe the String */
     DPRINT("ObpCaptureObjectName: %wZ\n", ObjectName);

diff --git a/reactos/subsys/system/usetup/cabinet.c b/reactos/subsys/system/usetup/cabinet.c
index 81bdae4..094fc76 100755 (executable)
--- a/reactos/subsys/system/usetup/cabinet.c
+++ b/reactos/subsys/system/usetup/cabinet.c
@@ -599,7 +599,7 @@ CabinetOpen(VOID)
           wcscpy(CabinetPrev, CabinetName);
           RemoveFileName(CabinetPrev);
           CabinetNormalizePath(CabinetPrev, 256);
           wcscpy(CabinetPrev, CabinetName);
           RemoveFileName(CabinetPrev);
           CabinetNormalizePath(CabinetPrev, 256);

-                 RtlInitAnsiString( &astring, Buffer );
+                 RtlInitAnsiString( &astring, (LPSTR)Buffer );

                  ustring.Length = wcslen( CabinetPrev );
                  ustring.Buffer = CabinetPrev + ustring.Length;
                  ustring.MaximumLength = sizeof( CabinetPrev ) - ustring.Length;
                  ustring.Length = wcslen( CabinetPrev );
                  ustring.Buffer = CabinetPrev + ustring.Length;
                  ustring.MaximumLength = sizeof( CabinetPrev ) - ustring.Length;


@@ -607,7 +607,7 @@ CabinetOpen(VOID)
                  Buffer += astring.Length + 1;
 
           /* Read label of prev disk */
                  Buffer += astring.Length + 1;
 
           /* Read label of prev disk */

-                 RtlInitAnsiString( &astring, Buffer );
+                 RtlInitAnsiString( &astring, (LPSTR)Buffer );

                  ustring.Length = 0;
                  ustring.Buffer = DiskPrev;
                  ustring.MaximumLength = sizeof( DiskPrev );
                  ustring.Length = 0;
                  ustring.Buffer = DiskPrev;
                  ustring.MaximumLength = sizeof( DiskPrev );


@@ -626,7 +626,7 @@ CabinetOpen(VOID)
           wcscpy(CabinetNext, CabinetName);
           RemoveFileName(CabinetNext);
           CabinetNormalizePath(CabinetNext, 256);
           wcscpy(CabinetNext, CabinetName);
           RemoveFileName(CabinetNext);
           CabinetNormalizePath(CabinetNext, 256);

-                 RtlInitAnsiString( &astring, Buffer );
+                 RtlInitAnsiString( &astring, (LPSTR)Buffer );

                  ustring.Length = wcslen( CabinetNext );
                  ustring.Buffer = CabinetNext + ustring.Length;
                  ustring.MaximumLength = sizeof( CabinetNext ) - ustring.Length;
                  ustring.Length = wcslen( CabinetNext );
                  ustring.Buffer = CabinetNext + ustring.Length;
                  ustring.MaximumLength = sizeof( CabinetNext ) - ustring.Length;


@@ -634,7 +634,7 @@ CabinetOpen(VOID)
                  Buffer += astring.Length + 1;
 
           /* Read label of next disk */
                  Buffer += astring.Length + 1;
 
           /* Read label of next disk */

-                 RtlInitAnsiString( &astring, Buffer );
+                 RtlInitAnsiString( &astring, (LPSTR)Buffer );

                  ustring.Length = 0;
                  ustring.Buffer = DiskNext;
                  ustring.MaximumLength = sizeof( DiskNext );
                  ustring.Length = 0;
                  ustring.Buffer = DiskNext;
                  ustring.MaximumLength = sizeof( DiskNext );


@@ -999,7 +999,7 @@ ULONG CabinetExtractFile( PCAB_SEARCH Search )
          CFData = (PCFDATA)((char *)(CFData+1) + DataReserved + CFData->CompSize);
        }
   // now decompress and discard any data in the block before the start of the file
          CFData = (PCFDATA)((char *)(CFData+1) + DataReserved + CFData->CompSize);
        }
   // now decompress and discard any data in the block before the start of the file

-  CurrentBuffer = ((char *)(CFData+1)) + DataReserved; // start of comp data
+  CurrentBuffer = ((unsigned char *)(CFData+1)) + DataReserved; // start of comp data

   RemainingBlock = CFData->CompSize;
   InputLength = RemainingBlock;
   while( CurrentOffset < Search->File->FileOffset )
   RemainingBlock = CFData->CompSize;
   InputLength = RemainingBlock;
   while( CurrentOffset < Search->File->FileOffset )


@@ -1047,7 +1047,7 @@ ULONG CabinetExtractFile( PCAB_SEARCH Search )
                  DPRINT( "Out of block data\n" );
                  CFData = (PCFDATA)CurrentBuffer;
                  RemainingBlock = CFData->CompSize;
                  DPRINT( "Out of block data\n" );
                  CFData = (PCFDATA)CurrentBuffer;
                  RemainingBlock = CFData->CompSize;

-                 CurrentBuffer = ((char *)(CFData+1) + DataReserved);
+                 CurrentBuffer = ((unsigned char *)(CFData+1) + DataReserved);

                  InputLength = RemainingBlock;
                }
        }
                  InputLength = RemainingBlock;
                }
        }