Author: sginsberg
Date: Sun Aug 30 17:53:16 2009
New Revision: 42970
URL: http://svn.reactos.org/svn/reactos?rev=42970&view=rev
Log:
- gcc 4.4.0 bringup 1 of ?:
- servman: Disable unused, static function
- explorer, mpu401: Fix "deprecated conversion from string constant to 'xxx'"
under
- ws2_32_new, portcls: Hack around bogus uninitialized variable usage warning
for
- glu32: Fix various warnings and errors
Modified:
trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c
trunk/reactos/base/shell/explorer/shell/mainframe.cpp
trunk/reactos/base/shell/explorer/shell/pane.cpp
trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.cc
trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.h
trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.cc
trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.h
trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.cc
trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.h
trunk/reactos/dll/win32/glu32/libnurbs/internals/intersect.cc
trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.cc
trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.h
trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.cc
trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.h
trunk/reactos/dll/win32/glu32/libnurbs/internals/subdivider.cc
trunk/reactos/dll/win32/glu32/libnurbs/nurbtess/partitionY.cc
trunk/reactos/dll/win32/ws2_32_new/src/select.c
trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c
trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp
Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c
[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c
[iso-8859-1] Sun Aug 30 17:53:16 2009
@@ -50,6 +50,7 @@
return TreeView_InsertItem(hTreeView, &tvins);
}
+#if 0
static VOID
AddServiceDependency(PSERVICEPROPSHEET dlgInfo,
HWND hTreeView,
@@ -123,6 +124,7 @@
}
}
+#endif
static VOID
AddServiceDependent(HWND hTreeView,
Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/mainframe.cpp?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1]
(original)
+++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] Sun Aug
30 17:53:16 2009
@@ -153,6 +153,11 @@
: super(hwnd)
{
HDC hDC = GetDC(NULL);
+#ifndef _NO_REBAR
+ //static WCHAR Title1[] = TEXT("Toolbar");
+ static WCHAR Title2[] = TEXT("Address :");
+#endif
+
if (hDC)
{
DWORD ilMask;
@@ -264,7 +269,7 @@
rbBand.cyMaxChild = 0;
rbBand.cyIntegral = btn_hgt;
- rbBand.lpText = NULL;//TEXT("Toolbar");
+ rbBand.lpText = NULL;//Title1
rbBand.hwndChild = _htoolbar;
rbBand.cxMinChild = 0;
rbBand.cyMinChild = btn_hgt;
@@ -273,7 +278,7 @@
rbBand.fStyle &= ~RBBS_HIDETITLE;
rbBand.fStyle |= RBBS_BREAK;
- rbBand.lpText = TEXT("Address :");
+ rbBand.lpText = Title2;
rbBand.hwndChild = _haddrcombo;
rbBand.cxMinChild = 0;
rbBand.cyMinChild = btn_hgt;
Modified: trunk/reactos/base/shell/explorer/shell/pane.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/pane.cpp?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer/shell/pane.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/shell/pane.cpp [iso-8859-1] Sun Aug 30
17:53:16 2009
@@ -42,7 +42,7 @@
#define IMAGE_HEIGHT 13
-static const LPTSTR g_pos_names[COLUMNS] = {
+static const TCHAR* g_pos_names[COLUMNS] = {
TEXT(""), /* symbol */
TEXT("Name"),
TEXT("Type"),
@@ -141,7 +141,7 @@
hdi.mask = HDI_TEXT|HDI_WIDTH|HDI_FORMAT;
for(int idx=0; idx<COLUMNS; idx++) {
- hdi.pszText = g_pos_names[idx];
+ hdi.pszText = (TCHAR*)g_pos_names[idx];
hdi.fmt = HDF_STRING | g_pos_align[idx];
hdi.cxy = _widths[idx];
Header_InsertItem(hwnd, idx, &hdi);
Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.cc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.cc?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.cc [iso-8859-1]
(original)
+++ trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.cc [iso-8859-1]
Sun Aug 30 17:53:16 2009
@@ -246,7 +246,7 @@
*-------------------------------------------------------------------------
*/
void
-Backend::bgntmesh( char * )
+Backend::bgntmesh( const char * )
{
#ifndef NOWIREFRAME
Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.h?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.h [iso-8859-1]
(original)
+++ trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.h [iso-8859-1] Sun
Aug 30 17:53:16 2009
@@ -65,7 +65,7 @@
void surfbbox( long, REAL *, REAL * );
void surfgrid( REAL, REAL, long, REAL, REAL, long );
void surfmesh( long, long, long, long );
- void bgntmesh( char * );
+ void bgntmesh( const char * );
void endtmesh( void );
void swaptmesh( void );
void tmeshvert( GridTrimVertex * );
Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.cc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.cc?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.cc [iso-8859-1]
(original)
+++ trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.cc [iso-8859-1] Sun
Aug 30 17:53:16 2009
@@ -120,7 +120,7 @@
*/
void
-Bin::show( char *name )
+Bin::show( const char *name )
{
#ifndef NDEBUG
dprintf( "%s\n", name );
Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.h?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.h [iso-8859-1]
(original)
+++ trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.h [iso-8859-1] Sun Aug
30 17:53:16 2009
@@ -63,7 +63,7 @@
int numarcs( void );
void adopt( void );
void markall( void );
- void show( char * );
+ void show( const char * );
void listBezier( void );
};
Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.cc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.cc?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.cc [iso-8859-1]
(original)
+++ trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.cc [iso-8859-1]
Sun Aug 30 17:53:16 2009
@@ -48,7 +48,7 @@
* Pool - allocate a new pool of buffers
*-----------------------------------------------------------------------------
*/
-Pool::Pool( int _buffersize, int initpoolsize, char *n )
+Pool::Pool( int _buffersize, int initpoolsize, const char *n )
{
buffersize= (_buffersize < (int)sizeof(Buffer)) ? sizeof(Buffer) :
_buffersize;
initsize = initpoolsize * buffersize;
Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.h?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.h [iso-8859-1]
(original)
+++ trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.h [iso-8859-1] Sun
Aug 30 17:53:16 2009
@@ -55,7 +55,7 @@
class Pool {
public:
- Pool( int, int, char * );
+ Pool( int, int, const char * );
~Pool( void );
inline void* new_buffer( void );
inline void free_buffer( void * );
@@ -74,7 +74,7 @@
int nextfree; /* byte offset past
next free buffer */
int initsize;
enum Magic { is_allocated = 0xf3a1, is_free = 0xf1a2 };
- char *name; /* name of the pool */
+ const char *name; /* name of the pool */
Magic magic; /* marker for valid pool */
};
Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/intersect.cc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/internals/intersect.cc?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/dll/win32/glu32/libnurbs/internals/intersect.cc [iso-8859-1]
(original)
+++ trunk/reactos/dll/win32/glu32/libnurbs/internals/intersect.cc [iso-8859-1]
Sun Aug 30 17:53:16 2009
@@ -179,6 +179,13 @@
TrimVertex* v = jarc->pwlArc->pts;
int loc[3];
+
+#if defined(__GNUC__) && \
+ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ == 40400)
+ /* Silence incorrect GCC 4.4.0 warnings */
+ loc[0] = loc[1] = loc[2] = 0;
+#endif
+
switch( pwlarc_intersect( jarc->pwlArc, param, value, dir, loc ) ) {
// When the parameter value lands on a vertex, life is sweet
Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.cc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.cc?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.cc [iso-8859-1]
(original)
+++ trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.cc [iso-8859-1]
Sun Aug 30 17:53:16 2009
@@ -126,7 +126,7 @@
return 0;
}
-void Knotvector::show( char *msg )
+void Knotvector::show( const char *msg )
{
#ifndef NDEBUG
dprintf( "%s\n", msg );
Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.h?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.h [iso-8859-1]
(original)
+++ trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.h [iso-8859-1]
Sun Aug 30 17:53:16 2009
@@ -49,7 +49,7 @@
~Knotvector( void );
void init( long, long, long, INREAL * );
int validate( void );
- void show( char * );
+ void show( const char * );
long order; /* order of spline */
long knotcount; /* number of knots */
Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.cc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.cc?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.cc [iso-8859-1]
(original)
+++ trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.cc [iso-8859-1]
Sun Aug 30 17:53:16 2009
@@ -677,7 +677,7 @@
}
int
-NurbsTessellator::do_check_knots( Knotvector *knots, char *msg )
+NurbsTessellator::do_check_knots( Knotvector *knots, const char *msg )
{
int status = knots->validate();
if( status ) {
Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.h?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.h [iso-8859-1]
(original)
+++ trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.h [iso-8859-1]
Sun Aug 30 17:53:16 2009
@@ -112,7 +112,7 @@
private:
void resetObjects( void );
- int do_check_knots( Knotvector *, char * );
+ int do_check_knots( Knotvector *, const char * );
void do_nurbserror( int );
void do_bgncurve( O_curve * );
void do_endcurve( void );
Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/subdivider.cc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/internals/subdivider.cc?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/dll/win32/glu32/libnurbs/internals/subdivider.cc [iso-8859-1]
(original)
+++ trunk/reactos/dll/win32/glu32/libnurbs/internals/subdivider.cc [iso-8859-1]
Sun Aug 30 17:53:16 2009
@@ -531,16 +531,18 @@
patchlist.pspec[param].range[1] ) * 0.5;
split( source, left, right, param, mid );
Patchlist subpatchlist( patchlist, param, mid );
- if( left.isnonempty() )
+ if( left.isnonempty() ) {
if( subpatchlist.cullCheck() == CULL_TRIVIAL_REJECT )
freejarcs( left );
else
nonSamplingSplit( left, subpatchlist, subdivisions-1, param );
- if( right.isnonempty() )
+ }
+ if( right.isnonempty() ) {
if( patchlist.cullCheck() == CULL_TRIVIAL_REJECT )
freejarcs( right );
else
nonSamplingSplit( right, patchlist, subdivisions-1, param );
+ }
} else {
// make bbox calls
Modified: trunk/reactos/dll/win32/glu32/libnurbs/nurbtess/partitionY.cc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/nurbtess/partitionY.cc?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/dll/win32/glu32/libnurbs/nurbtess/partitionY.cc [iso-8859-1]
(original)
+++ trunk/reactos/dll/win32/glu32/libnurbs/nurbtess/partitionY.cc [iso-8859-1]
Sun Aug 30 17:53:16 2009
@@ -113,8 +113,8 @@
else if(A[1] > B[1] && C[1] > B[1])
return 1;
- if(isAbove(v, v) && isAbove(v, v->getPrev()) ||
- isBelow(v, v) && isBelow(v, v->getPrev()))
+ if((isAbove(v, v) && isAbove(v, v->getPrev())) ||
+ (isBelow(v, v) && isBelow(v, v->getPrev())))
return 1;
else
return 0;
Modified: trunk/reactos/dll/win32/ws2_32_new/src/select.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/select.c?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] Sun Aug 30
17:53:16 2009
@@ -51,6 +51,12 @@
BOOL Found = FALSE;
SOCKET Handle;
DPRINT("select: %lx %p %p %p %p\n", s, readfds, writefds, exceptfds,
timeout);
+
+#if defined(__GNUC__) && \
+ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ == 40400)
+ /* Silence incorrect GCC 4.4.0 warning */
+ Handle = 0;
+#endif
/* Check for WSAStartup */
if ((ErrorCode = WsQuickProlog()) == ERROR_SUCCESS)
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c [iso-8859-1]
(original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c [iso-8859-1]
Sun Aug 30 17:53:16 2009
@@ -79,6 +79,12 @@
NTSTATUS Status;
ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
+
+#if defined(__GNUC__) && \
+ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ == 40400)
+ /* Silence incorrect GCC 4.4.0 warning */
+ SubDeviceEntry = NULL;
+#endif
DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
ASSERT(DeviceExtension);
Modified: trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp?rev=42970&r1=42969&r2=42970&view=diff
==============================================================================
--- trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp [iso-8859-1]
(original)
+++ trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp [iso-8859-1] Sun
Aug 30 17:53:16 2009
@@ -17,6 +17,8 @@
#include <ntddk.h>
#include <portcls.h>
#include <debug.h>
+
+WCHAR DeviceName[] = L"Uart";
NTSTATUS
NTAPI
@@ -68,7 +70,7 @@
}
DPRINT1("Registering subdevice via PcRegisterSubdevice\n");
- Status = PcRegisterSubdevice(pDeviceObject, L"Uart", port);
+ Status = PcRegisterSubdevice(pDeviceObject, DeviceName, port);
if (!NT_SUCCESS(Status))
{
