Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 42971: - Fix some inflib warnings
by sginsberg＠svn.reactos.org 30 Aug '09

30 Aug '09

Author: sginsberg Date: Sun Aug 30 20:11:09 2009 New Revision: 42971 URL: http://svn.reactos.org/svn/reactos?rev=42971&view=rev Log: - Fix some inflib warnings Modified: trunk/reactos/lib/inflib/infcore.c trunk/reactos/lib/inflib/infget.c trunk/reactos/lib/inflib/infhostgen.c trunk/reactos/lib/inflib/infpriv.h Modified: trunk/reactos/lib/inflib/infcore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infcore.c?rev=4… ============================================================================== --- trunk/reactos/lib/inflib/infcore.c [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/infcore.c [iso-8859-1] Sun Aug 30 20:11:09 2009 @@ -181,8 +181,8 @@ } /* Allocate and initialize the new section */ - Size = FIELD_OFFSET(INFCACHESECTION, - Name[_tcslen (Name) + 1]); + Size = (ULONG)FIELD_OFFSET(INFCACHESECTION, + Name[_tcslen (Name) + 1]); Section = (PINFCACHESECTION)MALLOC (Size); if (Section == NULL) { @@ -286,8 +286,8 @@ PINFCACHEFIELD Field; ULONG Size; - Size = FIELD_OFFSET(INFCACHEFIELD, - Data[_tcslen(Data) + 1]); + Size = (ULONG)FIELD_OFFSET(INFCACHEFIELD, + Data[_tcslen(Data) + 1]); Field = (PINFCACHEFIELD)MALLOC(Size); if (Field == NULL) { @@ -382,7 +382,7 @@ /* push data from current token start up to pos into the current token */ static int push_token( struct parser *parser, const CHAR *pos ) { - unsigned int len = pos - parser->start; + UINT len = (UINT)(pos - parser->start); const CHAR *src = parser->start; TCHAR *dst = parser->token + parser->token_len; @@ -808,7 +808,7 @@ { if (error_line) *error_line = parser.line_pos; - return parser.error; + return (INFSTATUS)parser.error; } /* find the [strings] section */ Modified: trunk/reactos/lib/inflib/infget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infget.c?rev=42… ============================================================================== --- trunk/reactos/lib/inflib/infget.c [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/infget.c [iso-8859-1] Sun Aug 30 20:11:09 2009 @@ -243,7 +243,7 @@ for (Index = 1; Index < FieldIndex; Index++) CacheField = CacheField->Next; - Size = CacheLine->FieldCount - FieldIndex + 1; + Size = (ULONG)CacheLine->FieldCount - FieldIndex + 1; if (RequiredSize != NULL) *RequiredSize = Size; Modified: trunk/reactos/lib/inflib/infhostgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostgen.c?re… ============================================================================== --- trunk/reactos/lib/inflib/infhostgen.c [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/infhostgen.c [iso-8859-1] Sun Aug 30 20:11:09 2009 @@ -107,7 +107,7 @@ return -1; } - FileLength = ftell(File); + FileLength = (ULONG)ftell(File); if ((ULONG) -1 == FileLength) { DPRINT1("ftell() failed (errno %d)\n", errno); Modified: trunk/reactos/lib/inflib/infpriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infpriv.h?rev=4… ============================================================================== --- trunk/reactos/lib/inflib/infpriv.h [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/infpriv.h [iso-8859-1] Sun Aug 30 20:11:09 2009 @@ -69,7 +69,7 @@ PINFCACHELINE Line; } INFCONTEXT; -typedef long INFSTATUS; +typedef int INFSTATUS; /* FUNCTIONS ****************************************************************/

1 0

[sginsberg] 42970: - 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
by sginsberg＠svn.reactos.org 30 Aug '09

30 Aug '09

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… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/i… ============================================================================== --- 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/i… ============================================================================== --- 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/i… ============================================================================== --- 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/i… ============================================================================== --- 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/i… ============================================================================== --- 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/i… ============================================================================== --- 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/i… ============================================================================== --- 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/i… ============================================================================== --- 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/i… ============================================================================== --- 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/i… ============================================================================== --- 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/i… ============================================================================== --- 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/i… ============================================================================== --- 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/n… ============================================================================== --- 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/s… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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)) {

1 0

[sginsberg] 42969: - Make ddraw test compile warning free under gcc 4.4.0
by sginsberg＠svn.reactos.org 30 Aug '09

30 Aug '09

Author: sginsberg Date: Sun Aug 30 17:36:37 2009 New Revision: 42969 URL: http://svn.reactos.org/svn/reactos?rev=42969&view=rev Log: - Make ddraw test compile warning free under gcc 4.4.0 Modified: trunk/rostests/dxtest/ddraw/debug.cpp Modified: trunk/rostests/dxtest/ddraw/debug.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/debug.cpp?re… ============================================================================== --- trunk/rostests/dxtest/ddraw/debug.cpp [iso-8859-1] (original) +++ trunk/rostests/dxtest/ddraw/debug.cpp [iso-8859-1] Sun Aug 30 17:36:37 2009 @@ -1,7 +1,7 @@ #define GetCode(X) printf("%s\n", DDErrorString(X)); -const PCHAR DDErrorString (HRESULT hResult) +const CHAR* DDErrorString (HRESULT hResult) { switch (hResult) {

1 0

[sginsberg] 42968: - Fix gdb2 and regexpl warnings under gcc 4.4.0
by sginsberg＠svn.reactos.org 30 Aug '09

30 Aug '09

Author: sginsberg Date: Sun Aug 30 17:35:14 2009 New Revision: 42968 URL: http://svn.reactos.org/svn/reactos?rev=42968&view=rev Log: - Fix gdb2 and regexpl warnings under gcc 4.4.0 Modified: trunk/rosapps/applications/devutils/gdb2/gdb2.cpp trunk/rosapps/applications/sysutils/regexpl/Console.cpp trunk/rosapps/applications/sysutils/regexpl/Console.h trunk/rosapps/applications/sysutils/regexpl/RegistryKey.cpp trunk/rosapps/applications/sysutils/regexpl/RegistryTree.cpp trunk/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp trunk/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp trunk/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp Modified: trunk/rosapps/applications/devutils/gdb2/gdb2.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/gdb2… ============================================================================== --- trunk/rosapps/applications/devutils/gdb2/gdb2.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/gdb2/gdb2.cpp [iso-8859-1] Sun Aug 30 17:35:14 2009 @@ -177,6 +177,7 @@ { PROCESS_INFORMATION pi; STARTUPINFO si; + static CHAR Title[] = "debugged program console"; // Set up the start up info struct. ZeroMemory(&si,sizeof(STARTUPINFO)); @@ -185,7 +186,7 @@ si.hStdOutput = hChildStdOut; si.hStdInput = hChildStdIn; si.hStdError = hChildStdErr; - si.lpTitle = "debugged program console"; + si.lpTitle = Title; // Use this if you want to hide the child: // si.wShowWindow = SW_HIDE; // Note that dwFlags must include STARTF_USESHOWWINDOW if you want to Modified: trunk/rosapps/applications/sysutils/regexpl/Console.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/Console.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/Console.cpp [iso-8859-1] Sun Aug 30 17:35:14 2009 @@ -220,7 +220,7 @@ return TAB_WIDTH; } -BOOL CConsole::SetTitle(TCHAR *p) +BOOL CConsole::SetTitle(const TCHAR *p) { return SetConsoleTitle(p); } @@ -640,7 +640,7 @@ m_pchBuffer[dwLastCharOffset] = 0; // terminate string in buffer ret = Write(m_pchBuffer); m_History.AddHistoryLine(m_pchBuffer); - TCHAR *strLF = _T("\n"); + static TCHAR strLF[] = _T("\n"); ret = Write(strLF); break; } @@ -1008,7 +1008,7 @@ m_Lines = 0; } -BOOL CConsole::WriteString(TCHAR *pchString, COORD Position) +BOOL CConsole::WriteString(const TCHAR *pchString, COORD Position) { CHAR_INFO ciBuffer[256]; int nSize = _tcslen(pchString); Modified: trunk/rosapps/applications/sysutils/regexpl/Console.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/Console.h [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/Console.h [iso-8859-1] Sun Aug 30 17:35:14 2009 @@ -25,7 +25,7 @@ // BOOL SetInputMode(DWORD dwMode); BOOL SetTextAttribute(WORD wAttributes); BOOL GetTextAttribute(WORD& rwAttributes); - BOOL SetTitle(TCHAR *p); + BOOL SetTitle(const TCHAR *p); BOOL Write(const TCHAR *p, DWORD dwChars = 0); CConsole(); virtual ~CConsole(); @@ -38,7 +38,7 @@ COORD m_BufferSize; WORD m_wAttributes; SHORT m_Lines; - BOOL WriteString(TCHAR *pchString, COORD Position); + BOOL WriteString(const TCHAR *pchString, COORD Position); BOOL WriteChar(TCHAR ch); BOOL m_blnInsetMode; // TRUE - insert, FALSE - overwrite DWORD m_dwInsertModeCursorHeight; Modified: trunk/rosapps/applications/sysutils/regexpl/RegistryKey.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/RegistryKey.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/RegistryKey.cpp [iso-8859-1] Sun Aug 30 17:35:14 2009 @@ -27,7 +27,7 @@ #include "ph.h" #include "RegistryKey.h" -static TCHAR *g_ppszHiveNames[] = +static const TCHAR *g_ppszHiveNames[] = { _T("HKEY_CLASSES_ROOT"), _T("HKEY_CURRENT_USER"), Modified: trunk/rosapps/applications/sysutils/regexpl/RegistryTree.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/RegistryTree.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/RegistryTree.cpp [iso-8859-1] Sun Aug 30 17:35:14 2009 @@ -95,7 +95,7 @@ GotoRoot(); // This is full absolute path. // split path to key names. - TCHAR *pszSeps = _T("\\"); + const TCHAR *pszSeps = _T("\\"); // Make buffer and copy relative path into it. TCHAR *pszBuffer = new TCHAR[_tcslen(pszRelativePath)+1]; @@ -124,7 +124,7 @@ } } - TCHAR *pszNewKey = _tcstok(pszBuffer,pszSeps); + const TCHAR *pszNewKey = _tcstok(pszBuffer,pszSeps); if ((!pszNewKey)&&((*pszRelativePath != _T('\\'))||(*(pszRelativePath+1) != 0))) { Modified: trunk/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp [iso-8859-1] Sun Aug 30 17:35:14 2009 @@ -93,6 +93,7 @@ CRegistryKey Key; TCHAR *pszValueNamePattern; + const TCHAR *pszEmpty = _T(""); const TCHAR *pszPath; if (blnHelp) @@ -115,7 +116,7 @@ } else { - pszValueNamePattern = _T(""); + pszValueNamePattern = (TCHAR*)pszEmpty; pszPath = _T("."); } Modified: trunk/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp [iso-8859-1] Sun Aug 30 17:35:14 2009 @@ -209,6 +209,7 @@ CRegistryKey Key; TCHAR *pszValueName; + const TCHAR *pszEmpty = _T(""); const TCHAR *pszPath; if (blnHelp) @@ -241,7 +242,7 @@ } else { - pszValueName = _T(""); + pszValueName = (TCHAR*)pszEmpty; pszPath = _T("."); } Modified: trunk/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp [iso-8859-1] Sun Aug 30 17:35:14 2009 @@ -122,6 +122,7 @@ CRegistryKey Key; TCHAR *pchValueName; + const TCHAR *pszEmpty = _T(""); const TCHAR *pszPath; if (blnHelp) @@ -154,7 +155,7 @@ } else { - pchValueName = _T(""); + pchValueName = (TCHAR*)pszEmpty; pszPath = _T("."); }

1 0

[dreimer] 42967: OK, I give up. Pigglesworth, HAALP. What do I do wrong??!
by dreimer＠svn.reactos.org 30 Aug '09

30 Aug '09

Author: dreimer Date: Sun Aug 30 13:35:28 2009 New Revision: 42967 URL: http://svn.reactos.org/svn/reactos?rev=42967&view=rev Log: OK, I give up. Pigglesworth, HAALP. What do I do wrong??! Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c trunk/reactos/dll/directx/wine/d3d8/pixelshader.c trunk/reactos/dll/directx/wine/d3d8/stateblock.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/vertexshader.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d8/volumetexture.c trunk/reactos/dll/directx/wine/d3d9/cubetexture.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c trunk/reactos/dll/directx/wine/d3d9/pixelshader.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/vertexshader.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/d3d9/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/baseshader.c trunk/reactos/dll/directx/wine/wined3d/basetexture.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/gl_compat.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/pixelshader.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexshader.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/wined3d.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/cube… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/inde… Modified: trunk/reactos/dll/directx/wine/d3d8/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/pixe… Modified: trunk/reactos/dll/directx/wine/d3d8/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/stat… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d8/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/cube… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/inde… Modified: trunk/reactos/dll/directx/wine/d3d9/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/pixe… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined…

1 0

[dreimer] 42966: Next try. This time I reverted most of my header changes and just needed to add some and edit two of them.
by dreimer＠svn.reactos.org 30 Aug '09

30 Aug '09

Author: dreimer Date: Sun Aug 30 02:12:52 2009 New Revision: 42966 URL: http://svn.reactos.org/svn/reactos?rev=42966&view=rev Log: Next try. This time I reverted most of my header changes and just needed to add some and edit two of them. Added: trunk/reactos/dll/directx/wine/d3dx9_24/ (with props) trunk/reactos/dll/directx/wine/d3dx9_24/d3dx9_24.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_24/d3dx9_24.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_24/d3dx9_24_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_24/version.rc (with props) trunk/reactos/dll/directx/wine/d3dx9_25/ (with props) trunk/reactos/dll/directx/wine/d3dx9_25/d3dx9_25.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_25/d3dx9_25.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_25/d3dx9_25_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_25/version.rc (with props) trunk/reactos/dll/directx/wine/d3dx9_26/ (with props) trunk/reactos/dll/directx/wine/d3dx9_26/d3dx9_26.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_26/d3dx9_26.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_26/d3dx9_26_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_26/version.rc (with props) trunk/reactos/dll/directx/wine/d3dx9_27/ (with props) trunk/reactos/dll/directx/wine/d3dx9_27/d3dx9_27.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_27/d3dx9_27.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_27/d3dx9_27_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_27/version.rc (with props) trunk/reactos/dll/directx/wine/d3dx9_28/ (with props) trunk/reactos/dll/directx/wine/d3dx9_28/d3dx9_28.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_28/d3dx9_28.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_28/d3dx9_28_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_28/version.rc (with props) trunk/reactos/dll/directx/wine/d3dx9_29/ (with props) trunk/reactos/dll/directx/wine/d3dx9_29/d3dx9_29.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_29/d3dx9_29.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_29/d3dx9_29_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_29/version.rc (with props) trunk/reactos/dll/directx/wine/d3dx9_30/ (with props) trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_30/version.rc (with props) trunk/reactos/dll/directx/wine/d3dx9_31/ (with props) trunk/reactos/dll/directx/wine/d3dx9_31/d3dx9_31.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_31/d3dx9_31.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_31/d3dx9_31_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_31/version.rc (with props) trunk/reactos/dll/directx/wine/d3dx9_32/ (with props) trunk/reactos/dll/directx/wine/d3dx9_32/d3dx9_32.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_32/d3dx9_32.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_32/d3dx9_32_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_32/version.rc (with props) trunk/reactos/dll/directx/wine/d3dx9_33/ (with props) trunk/reactos/dll/directx/wine/d3dx9_33/d3dx9_33.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_33/d3dx9_33.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_33/d3dx9_33_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_33/version.rc (with props) trunk/reactos/dll/directx/wine/d3dx9_34/ (with props) trunk/reactos/dll/directx/wine/d3dx9_34/d3dx9_34.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_34/d3dx9_34.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_34/d3dx9_34_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_34/version.rc (with props) trunk/reactos/dll/directx/wine/d3dx9_35/ (with props) trunk/reactos/dll/directx/wine/d3dx9_35/d3dx9_35.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_35/d3dx9_35.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_35/d3dx9_35_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_35/version.rc (with props) trunk/reactos/dll/directx/wine/d3dx9_36/ (with props) trunk/reactos/dll/directx/wine/d3dx9_36/core.c (with props) trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h (with props) trunk/reactos/dll/directx/wine/d3dx9_36/font.c (with props) trunk/reactos/dll/directx/wine/d3dx9_36/math.c (with props) trunk/reactos/dll/directx/wine/d3dx9_36/mesh.c (with props) trunk/reactos/dll/directx/wine/d3dx9_36/shader.c (with props) trunk/reactos/dll/directx/wine/d3dx9_36/sprite.c (with props) trunk/reactos/dll/directx/wine/d3dx9_36/surface.c (with props) trunk/reactos/dll/directx/wine/d3dx9_36/util.c (with props) trunk/reactos/dll/directx/wine/d3dx9_36/version.rc (with props) trunk/reactos/dll/directx/wine/d3dx9_37/ (with props) trunk/reactos/dll/directx/wine/d3dx9_37/d3dx9_37.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_37/d3dx9_37.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_37/d3dx9_37_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_37/version.rc (with props) trunk/reactos/dll/directx/wine/d3dx9_38/ (with props) trunk/reactos/dll/directx/wine/d3dx9_38/d3dx9_38.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_38/d3dx9_38.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_38/d3dx9_38_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_38/version.rc (with props) trunk/reactos/dll/directx/wine/d3dx9_39/ (with props) trunk/reactos/dll/directx/wine/d3dx9_39/d3dx9_39.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_39/d3dx9_39.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_39/d3dx9_39_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_39/version.rc (with props) trunk/reactos/dll/directx/wine/d3dx9_40/ (with props) trunk/reactos/dll/directx/wine/d3dx9_40/d3dx9_40.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_40/d3dx9_40.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_40/d3dx9_40_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_40/version.rc (with props) trunk/reactos/dll/directx/wine/d3dx9_41/ (with props) trunk/reactos/dll/directx/wine/d3dx9_41/d3dx9_41.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_41/d3dx9_41.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_41/d3dx9_41_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_41/version.rc (with props) trunk/reactos/include/dxsdk/d3dx9core.h (with props) trunk/reactos/include/dxsdk/d3dx9math.h (with props) trunk/reactos/include/dxsdk/d3dx9math.inl (with props) trunk/reactos/include/dxsdk/d3dx9mesh.h (with props) trunk/reactos/include/dxsdk/d3dx9shader.h (with props) trunk/reactos/include/dxsdk/d3dx9tex.h (with props) trunk/reactos/include/reactos/wine/rbtree.h (with props) Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c trunk/reactos/dll/directx/wine/d3d8/pixelshader.c trunk/reactos/dll/directx/wine/d3d8/stateblock.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/vertexshader.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d8/volumetexture.c trunk/reactos/dll/directx/wine/d3d9/cubetexture.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c trunk/reactos/dll/directx/wine/d3d9/pixelshader.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/vertexshader.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/d3d9/volumetexture.c trunk/reactos/dll/directx/wine/wine.rbuild trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/baseshader.c trunk/reactos/dll/directx/wine/wined3d/basetexture.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/gl_compat.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/pixelshader.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexshader.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/dxsdk/d3dx9.h trunk/reactos/include/reactos/wine/wined3d.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/cube… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/inde… Modified: trunk/reactos/dll/directx/wine/d3d8/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/pixe… Modified: trunk/reactos/dll/directx/wine/d3d8/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/stat… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d8/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/cube… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/inde… Modified: trunk/reactos/dll/directx/wine/d3d9/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/pixe… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Added: trunk/reactos/dll/directx/wine/d3dx9_24/d3dx9_24.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_24/… Added: trunk/reactos/dll/directx/wine/d3dx9_24/d3dx9_24.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_24/… Added: trunk/reactos/dll/directx/wine/d3dx9_24/d3dx9_24_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_24/… Added: trunk/reactos/dll/directx/wine/d3dx9_24/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_24/… Added: trunk/reactos/dll/directx/wine/d3dx9_25/d3dx9_25.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_25/… Added: trunk/reactos/dll/directx/wine/d3dx9_25/d3dx9_25.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_25/… Added: trunk/reactos/dll/directx/wine/d3dx9_25/d3dx9_25_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_25/… Added: trunk/reactos/dll/directx/wine/d3dx9_25/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_25/… Added: trunk/reactos/dll/directx/wine/d3dx9_26/d3dx9_26.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_26/… Added: trunk/reactos/dll/directx/wine/d3dx9_26/d3dx9_26.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_26/… Added: trunk/reactos/dll/directx/wine/d3dx9_26/d3dx9_26_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_26/… Added: trunk/reactos/dll/directx/wine/d3dx9_26/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_26/… Added: trunk/reactos/dll/directx/wine/d3dx9_27/d3dx9_27.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_27/… Added: trunk/reactos/dll/directx/wine/d3dx9_27/d3dx9_27.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_27/… Added: trunk/reactos/dll/directx/wine/d3dx9_27/d3dx9_27_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_27/… Added: trunk/reactos/dll/directx/wine/d3dx9_27/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_27/… Added: trunk/reactos/dll/directx/wine/d3dx9_28/d3dx9_28.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_28/… Added: trunk/reactos/dll/directx/wine/d3dx9_28/d3dx9_28.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_28/… Added: trunk/reactos/dll/directx/wine/d3dx9_28/d3dx9_28_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_28/… Added: trunk/reactos/dll/directx/wine/d3dx9_28/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_28/… Added: trunk/reactos/dll/directx/wine/d3dx9_29/d3dx9_29.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_29/… Added: trunk/reactos/dll/directx/wine/d3dx9_29/d3dx9_29.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_29/… Added: trunk/reactos/dll/directx/wine/d3dx9_29/d3dx9_29_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_29/… Added: trunk/reactos/dll/directx/wine/d3dx9_29/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_29/… Added: trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_30/… Added: trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_30/… Added: trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_30/… Added: trunk/reactos/dll/directx/wine/d3dx9_30/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_30/… Added: trunk/reactos/dll/directx/wine/d3dx9_31/d3dx9_31.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_31/… Added: trunk/reactos/dll/directx/wine/d3dx9_31/d3dx9_31.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_31/… Added: trunk/reactos/dll/directx/wine/d3dx9_31/d3dx9_31_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_31/… Added: trunk/reactos/dll/directx/wine/d3dx9_31/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_31/… Added: trunk/reactos/dll/directx/wine/d3dx9_32/d3dx9_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_32/… Added: trunk/reactos/dll/directx/wine/d3dx9_32/d3dx9_32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_32/… Added: trunk/reactos/dll/directx/wine/d3dx9_32/d3dx9_32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_32/… Added: trunk/reactos/dll/directx/wine/d3dx9_32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_32/… Added: trunk/reactos/dll/directx/wine/d3dx9_33/d3dx9_33.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_33/… Added: trunk/reactos/dll/directx/wine/d3dx9_33/d3dx9_33.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_33/… Added: trunk/reactos/dll/directx/wine/d3dx9_33/d3dx9_33_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_33/… Added: trunk/reactos/dll/directx/wine/d3dx9_33/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_33/… Added: trunk/reactos/dll/directx/wine/d3dx9_34/d3dx9_34.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_34/… Added: trunk/reactos/dll/directx/wine/d3dx9_34/d3dx9_34.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_34/… Added: trunk/reactos/dll/directx/wine/d3dx9_34/d3dx9_34_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_34/… Added: trunk/reactos/dll/directx/wine/d3dx9_34/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_34/… Added: trunk/reactos/dll/directx/wine/d3dx9_35/d3dx9_35.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_35/… Added: trunk/reactos/dll/directx/wine/d3dx9_35/d3dx9_35.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_35/… Added: trunk/reactos/dll/directx/wine/d3dx9_35/d3dx9_35_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_35/… Added: trunk/reactos/dll/directx/wine/d3dx9_35/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_35/… Added: trunk/reactos/dll/directx/wine/d3dx9_36/core.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Added: trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Added: trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Added: trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Added: trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Added: trunk/reactos/dll/directx/wine/d3dx9_36/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Added: trunk/reactos/dll/directx/wine/d3dx9_36/math.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Added: trunk/reactos/dll/directx/wine/d3dx9_36/mesh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Added: trunk/reactos/dll/directx/wine/d3dx9_36/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Added: trunk/reactos/dll/directx/wine/d3dx9_36/sprite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Added: trunk/reactos/dll/directx/wine/d3dx9_36/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Added: trunk/reactos/dll/directx/wine/d3dx9_36/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Added: trunk/reactos/dll/directx/wine/d3dx9_36/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Added: trunk/reactos/dll/directx/wine/d3dx9_37/d3dx9_37.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_37/… Added: trunk/reactos/dll/directx/wine/d3dx9_37/d3dx9_37.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_37/… Added: trunk/reactos/dll/directx/wine/d3dx9_37/d3dx9_37_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_37/… Added: trunk/reactos/dll/directx/wine/d3dx9_37/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_37/… Added: trunk/reactos/dll/directx/wine/d3dx9_38/d3dx9_38.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_38/… Added: trunk/reactos/dll/directx/wine/d3dx9_38/d3dx9_38.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_38/… Added: trunk/reactos/dll/directx/wine/d3dx9_38/d3dx9_38_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_38/… Added: trunk/reactos/dll/directx/wine/d3dx9_38/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_38/… Added: trunk/reactos/dll/directx/wine/d3dx9_39/d3dx9_39.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_39/… Added: trunk/reactos/dll/directx/wine/d3dx9_39/d3dx9_39.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_39/… Added: trunk/reactos/dll/directx/wine/d3dx9_39/d3dx9_39_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_39/… Added: trunk/reactos/dll/directx/wine/d3dx9_39/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_39/… Added: trunk/reactos/dll/directx/wine/d3dx9_40/d3dx9_40.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_40/… Added: trunk/reactos/dll/directx/wine/d3dx9_40/d3dx9_40.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_40/… Added: trunk/reactos/dll/directx/wine/d3dx9_40/d3dx9_40_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_40/… Added: trunk/reactos/dll/directx/wine/d3dx9_40/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_40/… Added: trunk/reactos/dll/directx/wine/d3dx9_41/d3dx9_41.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_41/… Added: trunk/reactos/dll/directx/wine/d3dx9_41/d3dx9_41.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_41/… Added: trunk/reactos/dll/directx/wine/d3dx9_41/d3dx9_41_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_41/… Added: trunk/reactos/dll/directx/wine/d3dx9_41/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_41/… Modified: trunk/reactos/dll/directx/wine/wine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wine.rbui… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/dxsdk/d3dx9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9.h?rev=… Added: trunk/reactos/include/dxsdk/d3dx9core.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9core.h?… Added: trunk/reactos/include/dxsdk/d3dx9math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9math.h?… Added: trunk/reactos/include/dxsdk/d3dx9math.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9math.in… Added: trunk/reactos/include/dxsdk/d3dx9mesh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9mesh.h?… Added: trunk/reactos/include/dxsdk/d3dx9shader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9shader.… Added: trunk/reactos/include/dxsdk/d3dx9tex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9tex.h?r… Added: trunk/reactos/include/reactos/wine/rbtree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/rbtre… Modified: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined…

1 0

[tkreuzer] 42965: Update DM_XXX constants and move some from winuser.h to wingdi.h where they belong, sort COLOR_XXX constants by number
by tkreuzer＠svn.reactos.org 30 Aug '09

30 Aug '09

Author: tkreuzer Date: Sun Aug 30 02:08:21 2009 New Revision: 42965 URL: http://svn.reactos.org/svn/reactos?rev=42965&view=rev Log: Update DM_XXX constants and move some from winuser.h to wingdi.h where they belong, sort COLOR_XXX constants by number Modified: trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sun Aug 30 02:08:21 2009 @@ -1144,31 +1144,40 @@ #define DM_IN_PROMPT DM_PROMPT #define DM_OUT_BUFFER DM_COPY #define DM_OUT_DEFAULT DM_UPDATE -#define DM_ORIENTATION 1 -#define DM_PAPERSIZE 2 -#define DM_PAPERLENGTH 4 -#define DM_PAPERWIDTH 8 -#define DM_POSITION 32 -#define DM_SCALE 16 -#define DM_COPIES 256 -#define DM_DEFAULTSOURCE 512 -#define DM_PRINTQUALITY 1024 -#define DM_COLOR 2048 -#define DM_DUPLEX 4096 -#define DM_YRESOLUTION 8192 -#define DM_TTOPTION 16384 -#define DM_COLLATE 32768 -#define DM_FORMNAME 65536 -#define DM_LOGPIXELS 0x20000 -#define DM_BITSPERPEL 0x40000 -#define DM_PELSWIDTH 0x80000 -#define DM_PELSHEIGHT 0x100000 -#define DM_DISPLAYFLAGS 0x200000 -#define DM_DISPLAYFREQUENCY 0x400000 -#define DM_ICMMETHOD 0x800000 -#define DM_ICMINTENT 0x1000000 -#define DM_MEDIATYPE 0x2000000 -#define DM_DITHERTYPE 0x4000000 + +#define DM_ORIENTATION 0x00000001 +#define DM_PAPERSIZE 0x00000002 +#define DM_PAPERLENGTH 0x00000004 +#define DM_PAPERWIDTH 0x00000008 +#define DM_SCALE 0x00000010 +#define DM_POSITION 0x00000020 +#define DM_NUP 0x00000040 +#define DM_DISPLAYORIENTATION 0x00000080 +#define DM_COPIES 0x00000100 +#define DM_DEFAULTSOURCE 0x00000200 +#define DM_PRINTQUALITY 0x00000400 +#define DM_COLOR 0x00000800 +#define DM_DUPLEX 0x00001000 +#define DM_YRESOLUTION 0x00002000 +#define DM_TTOPTION 0x00004000 +#define DM_COLLATE 0x00008000 +#define DM_FORMNAME 0x00010000 +#define DM_LOGPIXELS 0x00020000 +#define DM_BITSPERPEL 0x00040000 +#define DM_PELSWIDTH 0x00080000 +#define DM_PELSHEIGHT 0x00100000 +#define DM_DISPLAYFLAGS 0x00200000 +#define DM_DISPLAYFREQUENCY 0x00400000 +#define DM_ICMMETHOD 0x00800000 +#define DM_ICMINTENT 0x01000000 +#define DM_MEDIATYPE 0x02000000 +#define DM_DITHERTYPE 0x04000000 +#define DM_PANNINGWIDTH 0x08000000 +#define DM_PANNINGHEIGHT 0x10000000 +#if (WINVER >= 0x0501) +#define DM_DISPLAYFIXEDOUTPUT 0x20000000 +#endif + #define DMICMMETHOD_NONE 1 #define DMICMMETHOD_SYSTEM 2 #define DMICMMETHOD_DRIVER 3 Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Aug 30 02:08:21 2009 @@ -180,11 +180,6 @@ #define BROADCAST_QUERY_DENY 1112363332 #define ENUM_CURRENT_SETTINGS ((DWORD)-1) #define ENUM_REGISTRY_SETTINGS ((DWORD)-2) -#define DM_BITSPERPEL 0x40000 -#define DM_PELSWIDTH 0x80000 -#define DM_PELSHEIGHT 0x100000 -#define DM_DISPLAYFLAGS 0x200000 -#define DM_DISPLAYFREQUENCY 0x400000 #define CDS_UPDATEREGISTRY 1 #define CDS_TEST 2 #define CDS_FULLSCREEN 4 @@ -876,37 +871,38 @@ #define MWMO_WAITALL 1 #define MWMO_ALERTABLE 2 #define MWMO_INPUTAVAILABLE 4 -#define COLOR_3DDKSHADOW 21 -#define COLOR_3DFACE 15 -#define COLOR_3DHILIGHT 20 -#define COLOR_3DHIGHLIGHT 20 -#define COLOR_3DLIGHT 22 -#define COLOR_BTNHILIGHT 20 -#define COLOR_3DSHADOW 16 + +#define COLOR_SCROLLBAR 0 +#define COLOR_BACKGROUND 1 +#define COLOR_DESKTOP COLOR_BACKGROUND +#define COLOR_ACTIVECAPTION 2 +#define COLOR_INACTIVECAPTION 3 +#define COLOR_MENU 4 +#define COLOR_WINDOW 5 +#define COLOR_WINDOWFRAME 6 +#define COLOR_MENUTEXT 7 +#define COLOR_WINDOWTEXT 8 +#define COLOR_CAPTIONTEXT 9 #define COLOR_ACTIVEBORDER 10 -#define COLOR_ACTIVECAPTION 2 +#define COLOR_INACTIVEBORDER 11 #define COLOR_APPWORKSPACE 12 -#define COLOR_BACKGROUND 1 -#define COLOR_DESKTOP 1 -#define COLOR_BTNFACE 15 -#define COLOR_BTNHIGHLIGHT 20 -#define COLOR_BTNSHADOW 16 -#define COLOR_BTNTEXT 18 -#define COLOR_CAPTIONTEXT 9 -#define COLOR_GRAYTEXT 17 #define COLOR_HIGHLIGHT 13 #define COLOR_HIGHLIGHTTEXT 14 -#define COLOR_INACTIVEBORDER 11 -#define COLOR_INACTIVECAPTION 3 +#define COLOR_BTNFACE 15 +#define COLOR_3DFACE COLOR_BTNFACE +#define COLOR_BTNSHADOW 16 +#define COLOR_3DSHADOW COLOR_BTNSHADOW +#define COLOR_GRAYTEXT 17 +#define COLOR_BTNTEXT 18 #define COLOR_INACTIVECAPTIONTEXT 19 +#define COLOR_BTNHIGHLIGHT 20 +#define COLOR_3DHIGHLIGHT COLOR_BTNHIGHLIGHT +#define COLOR_3DHILIGHT COLOR_BTNHIGHLIGHT +#define COLOR_BTNHILIGHT COLOR_BTNHIGHLIGHT +#define COLOR_3DDKSHADOW 21 +#define COLOR_3DLIGHT 22 +#define COLOR_INFOTEXT 23 #define COLOR_INFOBK 24 -#define COLOR_INFOTEXT 23 -#define COLOR_MENU 4 -#define COLOR_MENUTEXT 7 -#define COLOR_SCROLLBAR 0 -#define COLOR_WINDOW 5 -#define COLOR_WINDOWFRAME 6 -#define COLOR_WINDOWTEXT 8 #define COLOR_HOTLIGHT 26 #define COLOR_GRADIENTACTIVECAPTION 27 #define COLOR_GRADIENTINACTIVECAPTION 28 @@ -914,6 +910,7 @@ #define COLOR_MENUHILIGHT 29 #define COLOR_MENUBAR 30 #endif + #define CTLCOLOR_MSGBOX 0 #define CTLCOLOR_EDIT 1 #define CTLCOLOR_LISTBOX 2

1 0

[cgutman] 42964: - Implement AFD_INFO_GROUP_ID_TYPE
by cgutman＠svn.reactos.org 29 Aug '09

29 Aug '09

Author: cgutman Date: Sat Aug 29 19:53:45 2009 New Revision: 42964 URL: http://svn.reactos.org/svn/reactos?rev=42964&view=rev Log: - Implement AFD_INFO_GROUP_ID_TYPE Modified: trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/include/afd.h Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sat Aug 29 19:53:45 2009 @@ -39,7 +39,9 @@ break; case AFD_INFO_GROUP_ID_TYPE: - InfoReq->Information.Ulong = 0; /* What is group id */ + InfoReq->Information.LargeInteger.u.HighPart = FCB->GroupType; + InfoReq->Information.LargeInteger.u.LowPart = FCB->GroupID; + AFD_DbgPrint(MID_TRACE, ("Group ID: %d Group Type: %d\n", FCB->GroupID, FCB->GroupType)); break; case AFD_INFO_BLOCKING_MODE: Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sat Aug 29 19:53:45 2009 @@ -91,6 +91,8 @@ RtlZeroMemory( FCB, sizeof( *FCB ) ); FCB->Flags = ConnectInfo ? ConnectInfo->EndpointFlags : 0; + FCB->GroupID = ConnectInfo ? ConnectInfo->GroupID : 0; + FCB->GroupType = 0; /* FIXME */ FCB->State = SOCKET_STATE_CREATED; FCB->FileObject = FileObject; FCB->DeviceExt = DeviceExt; Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Sat Aug 29 19:53:45 2009 @@ -178,7 +178,7 @@ typedef struct _AFD_FCB { BOOLEAN Locked, Critical, Overread; - UINT State, Flags, BlockingMode; + UINT State, Flags, BlockingMode, GroupID, GroupType; KIRQL OldIrql; UINT LockCount; PVOID CurrentThread;

1 0

[dreimer] 42963: Revert my recent changes.
by dreimer＠svn.reactos.org 29 Aug '09

29 Aug '09

Author: dreimer Date: Sat Aug 29 19:01:29 2009 New Revision: 42963 URL: http://svn.reactos.org/svn/reactos?rev=42963&view=rev Log: Revert my recent changes. Removed: trunk/reactos/include/reactos/wine/rbtree.h Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c trunk/reactos/dll/directx/wine/d3d8/pixelshader.c trunk/reactos/dll/directx/wine/d3d8/stateblock.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/vertexshader.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d8/volumetexture.c trunk/reactos/dll/directx/wine/d3d9/cubetexture.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c trunk/reactos/dll/directx/wine/d3d9/pixelshader.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/vertexshader.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/d3d9/volumetexture.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw.spec trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/ddraw_thunks.c trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/direct3d.c trunk/reactos/dll/directx/wine/ddraw/executebuffer.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/ddraw/texture.c trunk/reactos/dll/directx/wine/ddraw/utils.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/baseshader.c trunk/reactos/dll/directx/wine/wined3d/basetexture.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/gl_compat.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/pixelshader.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexshader.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/ddk/d3dhal.h trunk/reactos/include/ddk/ddrawi.h trunk/reactos/include/dxsdk/amstream.idl trunk/reactos/include/dxsdk/d3d8caps.h trunk/reactos/include/dxsdk/d3d9caps.h trunk/reactos/include/dxsdk/d3dcaps.h trunk/reactos/include/dxsdk/d3dvec.inl trunk/reactos/include/dxsdk/d3dx9.h trunk/reactos/include/dxsdk/ddraw.h trunk/reactos/include/dxsdk/ddstream.idl trunk/reactos/include/dxsdk/dshow.h trunk/reactos/include/dxsdk/rmxfguid.h trunk/reactos/include/dxsdk/vmrender.idl trunk/reactos/include/psdk/d3d.h trunk/reactos/include/psdk/d3d8types.h trunk/reactos/include/psdk/d3d9.h trunk/reactos/include/psdk/d3d9types.h trunk/reactos/include/psdk/d3drm.h trunk/reactos/include/psdk/d3dtypes.h trunk/reactos/include/psdk/ddrawgdi.h trunk/reactos/include/reactos/wine/wined3d.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/cube… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/inde… Modified: trunk/reactos/dll/directx/wine/d3d8/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/pixe… Modified: trunk/reactos/dll/directx/wine/d3d8/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/stat… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d8/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/cube… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/inde… Modified: trunk/reactos/dll/directx/wine/d3d9/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/pixe… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_thunks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/direct3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dir… Modified: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe… Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/ddraw/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/tex… Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/ddk/d3dhal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d3dhal.h?rev=4… Modified: trunk/reactos/include/ddk/ddrawi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawi.h?rev=4… Modified: trunk/reactos/include/dxsdk/amstream.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/amstream.idl… Modified: trunk/reactos/include/dxsdk/d3d8caps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3d8caps.h?r… Modified: trunk/reactos/include/dxsdk/d3d9caps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3d9caps.h?r… Modified: trunk/reactos/include/dxsdk/d3dcaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dcaps.h?re… Modified: trunk/reactos/include/dxsdk/d3dvec.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dvec.inl?r… Modified: trunk/reactos/include/dxsdk/d3dx9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9.h?rev=… Modified: trunk/reactos/include/dxsdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddraw.h?rev=… Modified: trunk/reactos/include/dxsdk/ddstream.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddstream.idl… Modified: trunk/reactos/include/dxsdk/dshow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dshow.h?rev=… Modified: trunk/reactos/include/dxsdk/rmxfguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/rmxfguid.h?r… Modified: trunk/reactos/include/dxsdk/vmrender.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/vmrender.idl… Modified: trunk/reactos/include/psdk/d3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d.h?rev=429… Modified: trunk/reactos/include/psdk/d3d8types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d8types.h?r… Modified: trunk/reactos/include/psdk/d3d9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9.h?rev=42… Modified: trunk/reactos/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9types.h?r… Modified: trunk/reactos/include/psdk/d3drm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3drm.h?rev=4… Modified: trunk/reactos/include/psdk/d3dtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dtypes.h?re… Modified: trunk/reactos/include/psdk/ddrawgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddrawgdi.h?re… Removed: trunk/reactos/include/reactos/wine/rbtree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/rbtre… Modified: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined…

1 0

[gschneider] 42962: - Differentiate between immediate commands and queued commands, remove command queue shortcut, reorder functions accordingly - Do not duplicate register and process updates upon breaking into kdbg, fixes multiple thread lists - Remove end line hack from named pipe implementation - Handle all exception types for sockets, fixes a crash when disconnecting while receiving data
by gschneider＠svn.reactos.org 29 Aug '09

29 Aug '09

Author: gschneider Date: Sat Aug 29 18:03:13 2009 New Revision: 42962 URL: http://svn.reactos.org/svn/reactos?rev=42962&view=rev Log: - Differentiate between immediate commands and queued commands, remove command queue shortcut, reorder functions accordingly - Do not duplicate register and process updates upon breaking into kdbg, fixes multiple thread lists - Remove end line hack from named pipe implementation - Handle all exception types for sockets, fixes a crash when disconnecting while receiving data Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs trunk/tools/reactosdbg/Pipe/namedpipe.cs trunk/tools/reactosdbg/Pipe/socketpipe.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/KDB… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] Sat Aug 29 18:03:13 2009 @@ -78,8 +78,6 @@ if (mRunning) { mRunning = false; - GetRegisterUpdate(); - GetProcesses(); } tookText = true; } @@ -334,22 +332,6 @@ public event ProcessListEventHandler ProcessListEvent; public event ThreadListEventHandler ThreadListEvent; - public void GetRegisterUpdate() - { - QueueCommand("regs"); - QueueCommand("sregs"); - } - - public void GetModuleUpdate() - { - QueueCommand("mod"); - } - - public void GetMemoryUpdate(ulong address, int len) - { - QueueCommand(string.Format("x 0x{0:X} L {1}", address, len)); - } - public void WriteMemory(ulong address, byte[] buf) { } @@ -359,70 +341,10 @@ lock (mCommandBuffer) { mCommandBuffer.Add(command); - if (mCommandBuffer.Count == 1) - { - mConnection.Write(command + "\r"); - /* remove the command after sending */ - mCommandBuffer.RemoveAt(0); - } } } - public void Step() - { - QueueCommand("step"); - GetRegisterUpdate(); - GetModuleUpdate(); - GetProcesses(); - } - - public void Next() - { - QueueCommand("next"); - Thread.Sleep(100); - GetRegisterUpdate(); - GetModuleUpdate(); - GetProcesses(); - } - - public void Break() - { - mConnection.Write("\r"); - GetRegisterUpdate(); - GetModuleUpdate(); - } - - public void Go(ulong address) - { - mRunning = true; - mFirstModuleUpdate = false; - QueueCommand("cont"); - } - - public void GetProcesses() - { - QueueCommand("proc list"); - } - - public void GetThreads(ulong pid) - { - if (pid != 0) - QueueCommand(string.Format("thread list 0x{0:X8}", pid)); - } - - public void SetProcess(ulong pid) - { - QueueCommand(string.Format("proc attach 0x{0:X8}", pid)); - GetRegisterUpdate(); - } - - public void SetThread(ulong tid) - { - QueueCommand(string.Format("thread attach 0x{0:X8}", tid)); - GetRegisterUpdate(); - } - - public void Write(string wr) + public void Write(string wr) { /* Forward user input from RawTraffic if connected to kdbg */ if (!mRunning) @@ -434,5 +356,77 @@ public void Close() { } + + /* Immediately executed commands */ + public void Step() + { + Write("step"); + GetRegisterUpdate(); + GetModuleUpdate(); + GetProcesses(); + } + + public void Next() + { + Write("next"); + Thread.Sleep(100); + GetRegisterUpdate(); + GetModuleUpdate(); + GetProcesses(); + } + + public void Break() + { + Write(""); + GetRegisterUpdate(); + GetModuleUpdate(); + } + + public void Go(ulong address) + { + Write("cont"); + mRunning = true; + mFirstModuleUpdate = false; + } + + public void GetMemoryUpdate(ulong address, int len) + { + Write(string.Format("x 0x{0:X} L {1}", address, len)); + } + + /* Commands placed into the cmd queue */ + public void GetProcesses() + { + QueueCommand("proc list"); + } + + public void GetThreads(ulong pid) + { + if (pid != 0) + QueueCommand(string.Format("thread list 0x{0:X8}", pid)); + } + + public void SetProcess(ulong pid) + { + QueueCommand(string.Format("proc attach 0x{0:X8}", pid)); + GetRegisterUpdate(); + } + + public void SetThread(ulong tid) + { + QueueCommand(string.Format("thread attach 0x{0:X8}", tid)); + GetRegisterUpdate(); + } + + public void GetRegisterUpdate() + { + QueueCommand("regs"); + QueueCommand("sregs"); + } + + public void GetModuleUpdate() + { + QueueCommand("mod"); + } } } Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/namedpipe.cs… ============================================================================== --- trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] Sat Aug 29 18:03:13 2009 @@ -264,14 +264,11 @@ /* only forward a complete line */ wCommand += str; - if (str[str.Length-1] == '\r') //FIXME: remove this - { - cmdList.Add(wCommand); - wCommand = null; - - /* wake up the write thread */ - newWriteData.Set(); - } + cmdList.Add(wCommand); + wCommand = null; + + /* wake up the write thread */ + newWriteData.Set(); return true; } } Modified: trunk/tools/reactosdbg/Pipe/socketpipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/socketpipe.c… ============================================================================== --- trunk/tools/reactosdbg/Pipe/socketpipe.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/socketpipe.cs [iso-8859-1] Sat Aug 29 18:03:13 2009 @@ -57,11 +57,11 @@ } while (mResult.CompletedSynchronously); } - catch (System.Net.Sockets.SocketException se) + catch (Exception e) { mSocket.Close(); if (PipeErrorEvent != null) - PipeErrorEvent.Invoke(this, new PipeErrorEventArgs(se.Message)); + PipeErrorEvent.Invoke(this, new PipeErrorEventArgs(e.Message)); } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Sat Aug 29 18:03:13 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.81")] -[assembly: AssemblyFileVersion("1.0.2.81")] +[assembly: AssemblyVersion("1.0.2.84")] +[assembly: AssemblyFileVersion("1.0.2.84")]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs