Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sserapion] 36503: Remove hack in cstub.c, it was caused by a hack in the rbuild file. Fix fill_table() definition for non i386.
by sserapion＠svn.reactos.org 25 Sep '08

25 Sep '08

Author: sserapion Date: Thu Sep 25 00:13:21 2008 New Revision: 36503 URL: http://svn.reactos.org/svn/reactos?rev=36503&view=rev Log: Remove hack in cstub.c, it was caused by a hack in the rbuild file. Fix fill_table() definition for non i386. Modified: branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cproxy.c branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cstub.c branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/rpcrt4.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cproxy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cproxy.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cproxy.c [iso-8859-1] Thu Sep 25 00:13:21 2008 @@ -56,7 +56,7 @@ static const IRpcProxyBufferVtbl StdProxy_Vtbl; -#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - FIELD_OFFSET(impl,field)) +#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) /* How the Windows stubless proxy thunks work is explained at * http://msdn.microsoft.com/library/en-us/dnmsj99/html/com0199.asp, Modified: branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cstub.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cstub.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cstub.c [iso-8859-1] Thu Sep 25 00:13:21 2008 @@ -194,7 +194,7 @@ #else /* __i386__ */ typedef struct {int dummy;} vtbl_method_t; -static void fill_table(IUnknownVtbl *vtbl, DWORD num) +static void fill_table(IUnknownVtbl *vtbl, void **methods, DWORD num) { ERR("delegated stubs are not supported on this architecture\n"); } Modified: branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] Thu Sep 25 00:13:21 2008 @@ -7,7 +7,6 @@ <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> - <define name="_STDDEF_H" /> <define name="_RPCRT4_" /> <define name="COM_NO_WINDOWS_H" /> <define name="MSWMSG" />

1 0

[sserapion] 36502: - Convert to spec. - No need to assert an offset thats only used in i386 specific code.
by sserapion＠svn.reactos.org 25 Sep '08

25 Sep '08

Author: sserapion Date: Wed Sep 24 23:27:03 2008 New Revision: 36502 URL: http://svn.reactos.org/svn/reactos?rev=36502&view=rev Log: - Convert to spec. - No need to assert an offset thats only used in i386 specific code. Added: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.spec (contents, props changed) - copied, changed from r36479, branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.def Removed: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/gl.c branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/gl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/opengl32/gl.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/opengl32/gl.c [iso-8859-1] Wed Sep 24 23:27:03 2008 @@ -22,7 +22,9 @@ #include "opengl32.h" +#if defined(_M_IX86) C_ASSERT(FIELD_OFFSET(TEB, glTable) == 0xbe8); +#endif int STDCALL glEmptyFunc0() { return 0; } int STDCALL glEmptyFunc4( long l1 ) { return 0; } Removed: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.def (removed) @@ -1,401 +1,0 @@ -; $Id$ -; -; opengl32.def -; -; ReactOS Operating System -; -LIBRARY opengl32.dll -EXPORTS -;DllInitialize - -glAccum@8 -glAlphaFunc@8 -glAreTexturesResident@12 -glArrayElement@4 -glBegin@4 -glBindTexture@8 -glBitmap@28 -glBlendFunc@8 -glCallList@4 -glCallLists@12 -glClear@4 -glClearAccum@16 -glClearColor@16 -glClearDepth@8 -glClearIndex@4 -glClearStencil@4 -glClipPlane@8 - -glColor3b@12 -glColor3bv@4 -glColor3d@24 -glColor3dv@4 -glColor3f@12 -glColor3fv@4 -glColor3i@12 -glColor3iv@4 -glColor3s@12 -glColor3sv@4 -glColor3ub@12 -glColor3ubv@4 -glColor3ui@12 -glColor3uiv@4 -glColor3us@12 -glColor3usv@4 - -glColor4b@16 -glColor4bv@4 -glColor4d@32 -glColor4dv@4 -glColor4f@16 -glColor4fv@4 -glColor4i@16 -glColor4iv@4 -glColor4s@16 -glColor4sv@4 -glColor4ub@16 -glColor4ubv@4 -glColor4ui@16 -glColor4uiv@4 -glColor4us@16 -glColor4usv@4 - -glColorMask@16 -glColorMaterial@8 -glColorPointer@16 -glCopyPixels@20 -glCopyTexImage1D@28 -glCopyTexImage2D@32 -glCopyTexSubImage1D@24 -glCopyTexSubImage2D@32 -glCullFace@4 -;glDebugEntry -glDeleteLists@8 -glDeleteTextures@8 -glDepthFunc@4 -glDepthMask@4 -glDepthRange@16 -glDisable@4 -glDisableClientState@4 -glDrawArrays@12 -glDrawBuffer@4 -glDrawElements@16 -glDrawPixels@20 -glEdgeFlag@4 -glEdgeFlagPointer@8 -glEdgeFlagv@4 -glEnable@4 -glEnableClientState@4 -glEnd@0 -glEndList@0 - -glEvalCoord1d@8 -glEvalCoord1dv@4 -glEvalCoord1f@4 -glEvalCoord1fv@4 -glEvalCoord2d@16 -glEvalCoord2dv@4 -glEvalCoord2f@8 -glEvalCoord2fv@4 - -glEvalMesh1@12 -glEvalMesh2@20 -glEvalPoint1@4 -glEvalPoint2@8 -glFeedbackBuffer@12 -glFinish@0 -glFlush@0 -glFogf@8 -glFogfv@8 -glFogi@8 -glFogiv@8 -glFrontFace@4 -glFrustum@48 -glGenLists@4 -glGenTextures@8 -glGetBooleanv@8 -glGetClipPlane@8 -glGetDoublev@8 -glGetError@0 -glGetFloatv@8 -glGetIntegerv@8 -glGetLightfv@12 -glGetLightiv@12 -glGetMapdv@12 -glGetMapfv@12 -glGetMapiv@12 -glGetMaterialfv@12 -glGetMaterialiv@12 -glGetPixelMapfv@8 -glGetPixelMapuiv@8 -glGetPixelMapusv@8 -glGetPointerv@8 -glGetPolygonStipple@4 -glGetString@4 -glGetTexEnvfv@12 -glGetTexEnviv@12 -glGetTexGendv@12 -glGetTexGenfv@12 -glGetTexGeniv@12 -glGetTexImage@20 -glGetTexLevelParameterfv@16 -glGetTexLevelParameteriv@16 -glGetTexParameterfv@12 -glGetTexParameteriv@12 -glHint@8 -glIndexd@8 -glIndexdv@4 -glIndexf@4 -glIndexfv@4 -glIndexi@4 -glIndexiv@4 -glIndexMask@4 -glIndexPointer@12 -glIndexs@4 -glIndexsv@4 -glIndexub@4 -glIndexubv@4 -glInitNames@0 -glInterleavedArrays@12 -glIsEnabled@4 -glIsList@4 -glIsTexture@4 - -glLightf@12 -glLightfv@12 -glLighti@12 -glLightiv@12 -glLightModelf@8 -glLightModelfv@8 -glLightModeli@8 -glLightModeliv@8 - -glLineStipple@8 -glLineWidth@4 -glListBase@4 -glLoadIdentity@0 -glLoadMatrixd@4 -glLoadMatrixf@4 -glLoadName@4 -glLogicOp@4 - -glMap1d@32 -glMap1f@24 -glMap2d@56 -glMap2f@40 -glMapGrid1d@20 -glMapGrid1f@12 -glMapGrid2d@40 -glMapGrid2f@24 - -glMaterialf@12 -glMaterialfv@12 -glMateriali@12 -glMaterialiv@12 - -glMatrixMode@4 -;GlmfBeginGlsBlock -;GlmfCloseMetaFile -;GlmfEndGlsBlock -;GlmfEndPlayback -;GlmfInitPlayback -;GlmfPlayGlsRecord -glMultMatrixd@4 -glMultMatrixf@4 -glNewList@8 - -glNormal3b@12 -glNormal3bv@4 -glNormal3d@24 -glNormal3dv@4 -glNormal3f@12 -glNormal3fv@4 -glNormal3i@12 -glNormal3iv@4 -glNormal3s@12 -glNormal3sv@4 -glNormalPointer@12 - -glOrtho@48 -glPassThrough@4 -glPixelMapfv@12 -glPixelMapuiv@12 -glPixelMapusv@12 -glPixelStoref@8 -glPixelStorei@8 -glPixelTransferf@8 -glPixelTransferi@8 -glPixelZoom@8 -glPointSize@4 -glPolygonMode@8 -glPolygonOffset@8 -glPolygonStipple@4 -glPopAttrib@0 -glPopClientAttrib@0 -glPopMatrix@0 -glPopName@0 -glPrioritizeTextures@12 -glPushAttrib@4 -glPushClientAttrib@4 -glPushMatrix@0 -glPushName@4 -glRasterPos2d@16 -glRasterPos2dv@4 -glRasterPos2f@8 -glRasterPos2fv@4 -glRasterPos2i@8 -glRasterPos2iv@4 -glRasterPos2s@8 -glRasterPos2sv@4 -glRasterPos3d@24 -glRasterPos3dv@4 -glRasterPos3f@12 -glRasterPos3fv@4 -glRasterPos3i@12 -glRasterPos3iv@4 -glRasterPos3s@12 -glRasterPos3sv@4 -glRasterPos4d@32 -glRasterPos4dv@4 -glRasterPos4f@16 -glRasterPos4fv@4 -glRasterPos4i@16 -glRasterPos4iv@4 -glRasterPos4s@16 -glRasterPos4sv@4 -glReadBuffer@4 -glReadPixels@28 -glRectd@32 -glRectdv@8 -glRectf@16 -glRectfv@8 -glRecti@16 -glRectiv@8 -glRects@16 -glRectsv@8 -glRenderMode@4 -glRotated@32 -glRotatef@16 -glScaled@24 -glScalef@12 -glScissor@16 -glSelectBuffer@8 -glShadeModel@4 -glStencilFunc@12 -glStencilMask@4 -glStencilOp@12 - -glTexCoord1d@8 -glTexCoord1dv@4 -glTexCoord1f@4 -glTexCoord1fv@4 -glTexCoord1i@4 -glTexCoord1iv@4 -glTexCoord1s@4 -glTexCoord1sv@4 - -glTexCoord2d@16 -glTexCoord2dv@4 -glTexCoord2f@8 -glTexCoord2fv@4 -glTexCoord2i@8 -glTexCoord2iv@4 -glTexCoord2s@8 -glTexCoord2sv@4 - -glTexCoord3d@24 -glTexCoord3dv@4 -glTexCoord3f@12 -glTexCoord3fv@4 -glTexCoord3i@12 -glTexCoord3iv@4 -glTexCoord3s@12 -glTexCoord3sv@4 - -glTexCoord4d@32 -glTexCoord4dv@4 -glTexCoord4f@16 -glTexCoord4fv@4 -glTexCoord4i@16 -glTexCoord4iv@4 -glTexCoord4s@16 -glTexCoord4sv@4 - -glTexCoordPointer@16 -glTexEnvf@12 -glTexEnvfv@12 -glTexEnvi@12 -glTexEnviv@12 -glTexGend@16 -glTexGendv@12 -glTexGenf@12 -glTexGenfv@12 -glTexGeni@12 -glTexGeniv@12 -glTexImage1D@32 -glTexImage2D@36 -glTexParameterf@12 -glTexParameterfv@12 -glTexParameteri@12 -glTexParameteriv@12 -glTexSubImage1D@28 -glTexSubImage2D@36 - -glTranslated@24 -glTranslatef@12 - -glVertex2d@16 -glVertex2dv@4 -glVertex2f@8 -glVertex2fv@4 -glVertex2i@8 -glVertex2iv@4 -glVertex2s@8 -glVertex2sv@4 - -glVertex3d@24 -glVertex3dv@4 -glVertex3f@12 -glVertex3fv@4 -glVertex3i@12 -glVertex3iv@4 -glVertex3s@12 -glVertex3sv@4 - -glVertex4d@32 -glVertex4dv@4 -glVertex4f@16 -glVertex4fv@4 -glVertex4i@16 -glVertex4iv@4 -glVertex4s@16 -glVertex4sv@4 - -glVertexPointer@16 -glViewport@16 - -wglChoosePixelFormat@8=rosglChoosePixelFormat@8 -wglCopyContext@12=rosglCopyContext@12 -wglCreateContext@4=rosglCreateContext@4 -wglCreateLayerContext@8=rosglCreateLayerContext@8 -wglDeleteContext@4=rosglDeleteContext@4 -wglDescribeLayerPlane@20=rosglDescribeLayerPlane@20 -wglDescribePixelFormat@16=rosglDescribePixelFormat@16 -wglGetCurrentContext@0=rosglGetCurrentContext@0 -wglGetCurrentDC@0=rosglGetCurrentDC@0 -wglGetDefaultProcAddress@4=rosglGetDefaultProcAddress@4 -wglGetLayerPaletteEntries@20=rosglGetLayerPaletteEntries@20 -wglGetPixelFormat@4=rosglGetPixelFormat@4 -wglGetProcAddress@4=rosglGetProcAddress@4 -wglMakeCurrent@8=rosglMakeCurrent@8 -wglRealizeLayerPalette@12=rosglRealizeLayerPalette@12 -wglSetLayerPaletteEntries@20=rosglSetLayerPaletteEntries@20 -wglSetPixelFormat@12=rosglSetPixelFormat@12 -wglShareLists@8=rosglShareLists@8 -wglSwapBuffers@4=rosglSwapBuffers@4 -wglSwapLayerBuffers@8=rosglSwapLayerBuffers@8 -;wglSwapMultipleBuffers=rosglSwapMultipleBuffers@ -wglUseFontBitmapsA@16=rosglUseFontBitmapsA@16 -wglUseFontBitmapsW@16=rosglUseFontBitmapsW@16 -wglUseFontOutlinesA@32=rosglUseFontOutlinesA@32 -wglUseFontOutlinesW@32=rosglUseFontOutlinesW@32 Modified: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.rbuild [iso-8859-1] Wed Sep 24 23:27:03 2008 @@ -1,5 +1,5 @@ <module name="opengl32" type="win32dll" baseaddress="${BASEADDRESS_OPENGL32}" installbase="system32" installname="opengl32.dll" unicode="yes"> - <importlibrary definition="opengl32.def" /> + <importlibrary definition="opengl32.spec.def" /> <define name="_DISABLE_TIDENTS" /> <library>ntdll</library> <library>kernel32</library> @@ -10,4 +10,5 @@ <file>gl.c</file> <file>opengl32.c</file> <file>wgl.c</file> + <file>opengl32.spec</file> </module> Copied: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.spec (from r36479, branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.spec [iso-8859-1] Wed Sep 24 23:27:03 2008 @@ -1,401 +1,401 @@ -; $Id$ -; -; opengl32.def -; -; ReactOS Operating System -; -LIBRARY opengl32.dll -EXPORTS -;DllInitialize +@ stdcall glAccum( long long ) +@ stdcall glAlphaFunc( long long ) +@ stdcall glAreTexturesResident( long ptr ptr ) +@ stdcall glArrayElement( long ) +@ stdcall glBegin( long ) +@ stdcall glBindTexture( long long ) +@ stdcall glBitmap( long long long long long long ptr ) +#@ stdcall glBlendColor( long long long long ) +#@ stdcall glBlendEquation( long ) +@ stdcall glBlendFunc( long long ) +@ stdcall glCallList( long ) +@ stdcall glCallLists( long long ptr ) +@ stdcall glClear( long ) +@ stdcall glClearAccum( long long long long ) +@ stdcall glClearColor( long long long long ) +@ stdcall glClearDepth( double ) +@ stdcall glClearIndex( long ) +@ stdcall glClearStencil( long ) +@ stdcall glClipPlane( long ptr ) +@ stdcall glColor3b( long long long ) +@ stdcall glColor3bv( ptr ) +@ stdcall glColor3d( double double double ) +@ stdcall glColor3dv( ptr ) +@ stdcall glColor3f( long long long ) +@ stdcall glColor3fv( ptr ) +@ stdcall glColor3i( long long long ) +@ stdcall glColor3iv( ptr ) +@ stdcall glColor3s( long long long ) +@ stdcall glColor3sv( ptr ) +@ stdcall glColor3ub( long long long ) +@ stdcall glColor3ubv( ptr ) +@ stdcall glColor3ui( long long long ) +@ stdcall glColor3uiv( ptr ) +@ stdcall glColor3us( long long long ) +@ stdcall glColor3usv( ptr ) +@ stdcall glColor4b( long long long long ) +@ stdcall glColor4bv( ptr ) +@ stdcall glColor4d( double double double double ) +@ stdcall glColor4dv( ptr ) +@ stdcall glColor4f( long long long long ) +@ stdcall glColor4fv( ptr ) +@ stdcall glColor4i( long long long long ) +@ stdcall glColor4iv( ptr ) +@ stdcall glColor4s( long long long long ) +@ stdcall glColor4sv( ptr ) +@ stdcall glColor4ub( long long long long ) +@ stdcall glColor4ubv( ptr ) +@ stdcall glColor4ui( long long long long ) +@ stdcall glColor4uiv( ptr ) +@ stdcall glColor4us( long long long long ) +@ stdcall glColor4usv( ptr ) +@ stdcall glColorMask( long long long long ) +@ stdcall glColorMaterial( long long ) +@ stdcall glColorPointer( long long long ptr ) +#@ stdcall glColorSubTable( long long long long long ptr ) +#@ stdcall glColorTable( long long long long long ptr ) +#@ stdcall glColorTableParameterfv( long long ptr ) +#@ stdcall glColorTableParameteriv( long long ptr ) +#@ stdcall glConvolutionFilter1D( long long long long long ptr ) +#@ stdcall glConvolutionFilter2D( long long long long long long ptr ) +#@ stdcall glConvolutionParameterf( long long long ) +#@ stdcall glConvolutionParameterfv( long long ptr ) +#@ stdcall glConvolutionParameteri( long long long ) +#@ stdcall glConvolutionParameteriv( long long ptr ) +#@ stdcall glCopyColorSubTable( long long long long long ) +#@ stdcall glCopyColorTable( long long long long long ) +#@ stdcall glCopyConvolutionFilter1D( long long long long long ) +#@ stdcall glCopyConvolutionFilter2D( long long long long long long ) +@ stdcall glCopyPixels( long long long long long ) +@ stdcall glCopyTexImage1D( long long long long long long long ) +@ stdcall glCopyTexImage2D( long long long long long long long long ) +@ stdcall glCopyTexSubImage1D( long long long long long long ) +@ stdcall glCopyTexSubImage2D( long long long long long long long long ) +#@ stdcall glCopyTexSubImage3D( long long long long long long long long long ) +@ stdcall glCullFace( long ) +@ stdcall glDeleteLists( long long ) +@ stdcall glDeleteTextures( long ptr ) +@ stdcall glDepthFunc( long ) +@ stdcall glDepthMask( long ) +@ stdcall glDepthRange( double double ) +@ stdcall glDisable( long ) +@ stdcall glDisableClientState( long ) +@ stdcall glDrawArrays( long long long ) +@ stdcall glDrawBuffer( long ) +@ stdcall glDrawElements( long long long ptr ) +@ stdcall glDrawPixels( long long long long ptr ) +#@ stdcall glDrawRangeElements( long long long long long ptr ) +@ stdcall glEdgeFlag( long ) +@ stdcall glEdgeFlagPointer( long ptr ) +@ stdcall glEdgeFlagv( ptr ) +@ stdcall glEnable( long ) +@ stdcall glEnableClientState( long ) +@ stdcall glEnd( ) +@ stdcall glEndList( ) +@ stdcall glEvalCoord1d( double ) +@ stdcall glEvalCoord1dv( ptr ) +@ stdcall glEvalCoord1f( long ) +@ stdcall glEvalCoord1fv( ptr ) +@ stdcall glEvalCoord2d( double double ) +@ stdcall glEvalCoord2dv( ptr ) +@ stdcall glEvalCoord2f( long long ) +@ stdcall glEvalCoord2fv( ptr ) +@ stdcall glEvalMesh1( long long long ) +@ stdcall glEvalMesh2( long long long long long ) +@ stdcall glEvalPoint1( long ) +@ stdcall glEvalPoint2( long long ) +@ stdcall glFeedbackBuffer( long long ptr ) +@ stdcall glFinish( ) +@ stdcall glFlush( ) +@ stdcall glFogf( long long ) +@ stdcall glFogfv( long ptr ) +@ stdcall glFogi( long long ) +@ stdcall glFogiv( long ptr ) +@ stdcall glFrontFace( long ) +@ stdcall glFrustum( double double double double double double ) +@ stdcall glGenLists( long ) +@ stdcall glGenTextures( long ptr ) +@ stdcall glGetBooleanv( long ptr ) +@ stdcall glGetClipPlane( long ptr ) +#@ stdcall glGetColorTable( long long long ptr ) +#@ stdcall glGetColorTableParameterfv( long long ptr ) +#@ stdcall glGetColorTableParameteriv( long long ptr ) +#@ stdcall glGetConvolutionFilter( long long long ptr ) +#@ stdcall glGetConvolutionParameterfv( long long ptr ) +#@ stdcall glGetConvolutionParameteriv( long long ptr ) +@ stdcall glGetDoublev( long ptr ) +@ stdcall glGetError( ) +@ stdcall glGetFloatv( long ptr ) +#@ stdcall glGetHistogram( long long long long ptr ) +#@ stdcall glGetHistogramParameterfv( long long ptr ) +#@ stdcall glGetHistogramParameteriv( long long ptr ) +@ stdcall glGetIntegerv( long ptr ) +@ stub glGetLevelParameterfv +@ stub glGetLevelParameteriv +@ stdcall glGetLightfv( long long ptr ) +@ stdcall glGetLightiv( long long ptr ) +@ stdcall glGetMapdv( long long ptr ) +@ stdcall glGetMapfv( long long ptr ) +@ stdcall glGetMapiv( long long ptr ) +@ stdcall glGetMaterialfv( long long ptr ) +@ stdcall glGetMaterialiv( long long ptr ) +#@ stdcall glGetMinmax( long long long long ptr ) +#@ stdcall glGetMinmaxParameterfv( long long ptr ) +#@ stdcall glGetMinmaxParameteriv( long long ptr ) +@ stdcall glGetPixelMapfv( long ptr ) +@ stdcall glGetPixelMapuiv( long ptr ) +@ stdcall glGetPixelMapusv( long ptr ) +@ stdcall glGetPointerv( long ptr ) +@ stdcall glGetPolygonStipple( ptr ) +#@ stdcall glGetSeparableFilter( long long long ptr ptr ptr ) +@ stdcall glGetString( long ) +@ stdcall glGetTexEnvfv( long long ptr ) +@ stdcall glGetTexEnviv( long long ptr ) +@ stdcall glGetTexGendv( long long ptr ) +@ stdcall glGetTexGenfv( long long ptr ) +@ stdcall glGetTexGeniv( long long ptr ) +@ stdcall glGetTexImage( long long long long ptr ) +@ stdcall glGetTexLevelParameterfv( long long long ptr ) +@ stdcall glGetTexLevelParameteriv( long long long ptr ) +@ stdcall glGetTexParameterfv( long long ptr ) +@ stdcall glGetTexParameteriv( long long ptr ) +@ stdcall glHint( long long ) +#@ stdcall glHistogram( long long long long ) +@ stdcall glIndexMask( long ) +@ stdcall glIndexPointer( long long ptr ) +@ stdcall glIndexd( double ) +@ stdcall glIndexdv( ptr ) +@ stdcall glIndexf( long ) +@ stdcall glIndexfv( ptr ) +@ stdcall glIndexi( long ) +@ stdcall glIndexiv( ptr ) +@ stdcall glIndexs( long ) +@ stdcall glIndexsv( ptr ) +@ stdcall glIndexub( long ) +@ stdcall glIndexubv( ptr ) +@ stdcall glInitNames( ) +@ stdcall glInterleavedArrays( long long ptr ) +@ stdcall glIsEnabled( long ) +@ stdcall glIsList( long ) +@ stdcall glIsTexture( long ) +@ stdcall glLightModelf( long long ) +@ stdcall glLightModelfv( long ptr ) +@ stdcall glLightModeli( long long ) +@ stdcall glLightModeliv( long ptr ) +@ stdcall glLightf( long long long ) +@ stdcall glLightfv( long long ptr ) +@ stdcall glLighti( long long long ) +@ stdcall glLightiv( long long ptr ) +@ stdcall glLineStipple( long long ) +@ stdcall glLineWidth( long ) +@ stdcall glListBase( long ) +@ stdcall glLoadIdentity( ) +@ stdcall glLoadMatrixd( ptr ) +@ stdcall glLoadMatrixf( ptr ) +@ stdcall glLoadName( long ) +@ stdcall glLogicOp( long ) +@ stdcall glMap1d( long double double long long ptr ) +@ stdcall glMap1f( long long long long long ptr ) +@ stdcall glMap2d( long double double long long double double long long ptr ) +@ stdcall glMap2f( long long long long long long long long long ptr ) +@ stdcall glMapGrid1d( long double double ) +@ stdcall glMapGrid1f( long long long ) +@ stdcall glMapGrid2d( long double double long double double ) +@ stdcall glMapGrid2f( long long long long long long ) +@ stdcall glMaterialf( long long long ) +@ stdcall glMaterialfv( long long ptr ) +@ stdcall glMateriali( long long long ) +@ stdcall glMaterialiv( long long ptr ) +@ stdcall glMatrixMode( long ) +#@ stdcall glMinmax( long long long ) +@ stdcall glMultMatrixd( ptr ) +@ stdcall glMultMatrixf( ptr ) +@ stdcall glNewList( long long ) +@ stdcall glNormal3b( long long long ) +@ stdcall glNormal3bv( ptr ) +@ stdcall glNormal3d( double double double ) +@ stdcall glNormal3dv( ptr ) +@ stdcall glNormal3f( long long long ) +@ stdcall glNormal3fv( ptr ) +@ stdcall glNormal3i( long long long ) +@ stdcall glNormal3iv( ptr ) +@ stdcall glNormal3s( long long long ) +@ stdcall glNormal3sv( ptr ) +@ stdcall glNormalPointer( long long ptr ) +@ stdcall glOrtho( double double double double double double ) +@ stdcall glPassThrough( long ) +@ stdcall glPixelMapfv( long long ptr ) +@ stdcall glPixelMapuiv( long long ptr ) +@ stdcall glPixelMapusv( long long ptr ) +@ stdcall glPixelStoref( long long ) +@ stdcall glPixelStorei( long long ) +@ stdcall glPixelTransferf( long long ) +@ stdcall glPixelTransferi( long long ) +@ stdcall glPixelZoom( long long ) +@ stdcall glPointSize( long ) +@ stdcall glPolygonMode( long long ) +@ stdcall glPolygonOffset( long long ) +@ stdcall glPolygonStipple( ptr ) +@ stdcall glPopAttrib( ) +@ stdcall glPopClientAttrib( ) +@ stdcall glPopMatrix( ) +@ stdcall glPopName( ) +@ stdcall glPrioritizeTextures( long ptr ptr ) +@ stdcall glPushAttrib( long ) +@ stdcall glPushClientAttrib( long ) +@ stdcall glPushMatrix( ) +@ stdcall glPushName( long ) +@ stdcall glRasterPos2d( double double ) +@ stdcall glRasterPos2dv( ptr ) +@ stdcall glRasterPos2f( long long ) +@ stdcall glRasterPos2fv( ptr ) +@ stdcall glRasterPos2i( long long ) +@ stdcall glRasterPos2iv( ptr ) +@ stdcall glRasterPos2s( long long ) +@ stdcall glRasterPos2sv( ptr ) +@ stdcall glRasterPos3d( double double double ) +@ stdcall glRasterPos3dv( ptr ) +@ stdcall glRasterPos3f( long long long ) +@ stdcall glRasterPos3fv( ptr ) +@ stdcall glRasterPos3i( long long long ) +@ stdcall glRasterPos3iv( ptr ) +@ stdcall glRasterPos3s( long long long ) +@ stdcall glRasterPos3sv( ptr ) +@ stdcall glRasterPos4d( double double double double ) +@ stdcall glRasterPos4dv( ptr ) +@ stdcall glRasterPos4f( long long long long ) +@ stdcall glRasterPos4fv( ptr ) +@ stdcall glRasterPos4i( long long long long ) +@ stdcall glRasterPos4iv( ptr ) +@ stdcall glRasterPos4s( long long long long ) +@ stdcall glRasterPos4sv( ptr ) +@ stdcall glReadBuffer( long ) +@ stdcall glReadPixels( long long long long long long ptr ) +@ stdcall glRectd( double double double double ) +@ stdcall glRectdv( ptr ptr ) +@ stdcall glRectf( long long long long ) +@ stdcall glRectfv( ptr ptr ) +@ stdcall glRecti( long long long long ) +@ stdcall glRectiv( ptr ptr ) +@ stdcall glRects( long long long long ) +@ stdcall glRectsv( ptr ptr ) +@ stdcall glRenderMode( long ) +#@ stdcall glResetHistogram( long ) +#@ stdcall glResetMinmax( long ) +@ stdcall glRotated( double double double double ) +@ stdcall glRotatef( long long long long ) +@ stdcall glScaled( double double double ) +@ stdcall glScalef( long long long ) +@ stdcall glScissor( long long long long ) +@ stdcall glSelectBuffer( long ptr ) +#@ stdcall glSeparableFilter2D( long long long long long long ptr ptr ) +@ stdcall glShadeModel( long ) +@ stdcall glStencilFunc( long long long ) +@ stdcall glStencilMask( long ) +@ stdcall glStencilOp( long long long ) +@ stdcall glTexCoord1d( double ) +@ stdcall glTexCoord1dv( ptr ) +@ stdcall glTexCoord1f( long ) +@ stdcall glTexCoord1fv( ptr ) +@ stdcall glTexCoord1i( long ) +@ stdcall glTexCoord1iv( ptr ) +@ stdcall glTexCoord1s( long ) +@ stdcall glTexCoord1sv( ptr ) +@ stdcall glTexCoord2d( double double ) +@ stdcall glTexCoord2dv( ptr ) +@ stdcall glTexCoord2f( long long ) +@ stdcall glTexCoord2fv( ptr ) +@ stdcall glTexCoord2i( long long ) +@ stdcall glTexCoord2iv( ptr ) +@ stdcall glTexCoord2s( long long ) +@ stdcall glTexCoord2sv( ptr ) +@ stdcall glTexCoord3d( double double double ) +@ stdcall glTexCoord3dv( ptr ) +@ stdcall glTexCoord3f( long long long ) +@ stdcall glTexCoord3fv( ptr ) +@ stdcall glTexCoord3i( long long long ) +@ stdcall glTexCoord3iv( ptr ) +@ stdcall glTexCoord3s( long long long ) +@ stdcall glTexCoord3sv( ptr ) +@ stdcall glTexCoord4d( double double double double ) +@ stdcall glTexCoord4dv( ptr ) +@ stdcall glTexCoord4f( long long long long ) +@ stdcall glTexCoord4fv( ptr ) +@ stdcall glTexCoord4i( long long long long ) +@ stdcall glTexCoord4iv( ptr ) +@ stdcall glTexCoord4s( long long long long ) +@ stdcall glTexCoord4sv( ptr ) +@ stdcall glTexCoordPointer( long long long ptr ) +@ stdcall glTexEnvf( long long long ) +@ stdcall glTexEnvfv( long long ptr ) +@ stdcall glTexEnvi( long long long ) +@ stdcall glTexEnviv( long long ptr ) +@ stdcall glTexGend( long long double ) +@ stdcall glTexGendv( long long ptr ) +@ stdcall glTexGenf( long long long ) +@ stdcall glTexGenfv( long long ptr ) +@ stdcall glTexGeni( long long long ) +@ stdcall glTexGeniv( long long ptr ) +@ stdcall glTexImage1D( long long long long long long long ptr ) +@ stdcall glTexImage2D( long long long long long long long long ptr ) +#@ stdcall glTexImage3D( long long long long long long long long long ptr ) +@ stdcall glTexParameterf( long long long ) +@ stdcall glTexParameterfv( long long ptr ) +@ stdcall glTexParameteri( long long long ) +@ stdcall glTexParameteriv( long long ptr ) +@ stdcall glTexSubImage1D( long long long long long long ptr ) +@ stdcall glTexSubImage2D( long long long long long long long long ptr ) +#@ stdcall glTexSubImage3D( long long long long long long long long long long ptr ) +@ stdcall glTranslated( double double double ) +@ stdcall glTranslatef( long long long ) +@ stdcall glVertex2d( double double ) +@ stdcall glVertex2dv( ptr ) +@ stdcall glVertex2f( long long ) +@ stdcall glVertex2fv( ptr ) +@ stdcall glVertex2i( long long ) +@ stdcall glVertex2iv( ptr ) +@ stdcall glVertex2s( long long ) +@ stdcall glVertex2sv( ptr ) +@ stdcall glVertex3d( double double double ) +@ stdcall glVertex3dv( ptr ) +@ stdcall glVertex3f( long long long ) +@ stdcall glVertex3fv( ptr ) +@ stdcall glVertex3i( long long long ) +@ stdcall glVertex3iv( ptr ) +@ stdcall glVertex3s( long long long ) +@ stdcall glVertex3sv( ptr ) +@ stdcall glVertex4d( double double double double ) +@ stdcall glVertex4dv( ptr ) +@ stdcall glVertex4f( long long long long ) +@ stdcall glVertex4fv( ptr ) +@ stdcall glVertex4i( long long long long ) +@ stdcall glVertex4iv( ptr ) +@ stdcall glVertex4s( long long long long ) +@ stdcall glVertex4sv( ptr ) +@ stdcall glVertexPointer( long long long ptr ) +@ stdcall glViewport( long long long long ) -glAccum@8 -glAlphaFunc@8 -glAreTexturesResident@12 -glArrayElement@4 -glBegin@4 -glBindTexture@8 -glBitmap@28 -glBlendFunc@8 -glCallList@4 -glCallLists@12 -glClear@4 -glClearAccum@16 -glClearColor@16 -glClearDepth@8 -glClearIndex@4 -glClearStencil@4 -glClipPlane@8 - -glColor3b@12 -glColor3bv@4 -glColor3d@24 -glColor3dv@4 -glColor3f@12 -glColor3fv@4 -glColor3i@12 -glColor3iv@4 -glColor3s@12 -glColor3sv@4 -glColor3ub@12 -glColor3ubv@4 -glColor3ui@12 -glColor3uiv@4 -glColor3us@12 -glColor3usv@4 - -glColor4b@16 -glColor4bv@4 -glColor4d@32 -glColor4dv@4 -glColor4f@16 -glColor4fv@4 -glColor4i@16 -glColor4iv@4 -glColor4s@16 -glColor4sv@4 -glColor4ub@16 -glColor4ubv@4 -glColor4ui@16 -glColor4uiv@4 -glColor4us@16 -glColor4usv@4 - -glColorMask@16 -glColorMaterial@8 -glColorPointer@16 -glCopyPixels@20 -glCopyTexImage1D@28 -glCopyTexImage2D@32 -glCopyTexSubImage1D@24 -glCopyTexSubImage2D@32 -glCullFace@4 -;glDebugEntry -glDeleteLists@8 -glDeleteTextures@8 -glDepthFunc@4 -glDepthMask@4 -glDepthRange@16 -glDisable@4 -glDisableClientState@4 -glDrawArrays@12 -glDrawBuffer@4 -glDrawElements@16 -glDrawPixels@20 -glEdgeFlag@4 -glEdgeFlagPointer@8 -glEdgeFlagv@4 -glEnable@4 -glEnableClientState@4 -glEnd@0 -glEndList@0 - -glEvalCoord1d@8 -glEvalCoord1dv@4 -glEvalCoord1f@4 -glEvalCoord1fv@4 -glEvalCoord2d@16 -glEvalCoord2dv@4 -glEvalCoord2f@8 -glEvalCoord2fv@4 - -glEvalMesh1@12 -glEvalMesh2@20 -glEvalPoint1@4 -glEvalPoint2@8 -glFeedbackBuffer@12 -glFinish@0 -glFlush@0 -glFogf@8 -glFogfv@8 -glFogi@8 -glFogiv@8 -glFrontFace@4 -glFrustum@48 -glGenLists@4 -glGenTextures@8 -glGetBooleanv@8 -glGetClipPlane@8 -glGetDoublev@8 -glGetError@0 -glGetFloatv@8 -glGetIntegerv@8 -glGetLightfv@12 -glGetLightiv@12 -glGetMapdv@12 -glGetMapfv@12 -glGetMapiv@12 -glGetMaterialfv@12 -glGetMaterialiv@12 -glGetPixelMapfv@8 -glGetPixelMapuiv@8 -glGetPixelMapusv@8 -glGetPointerv@8 -glGetPolygonStipple@4 -glGetString@4 -glGetTexEnvfv@12 -glGetTexEnviv@12 -glGetTexGendv@12 -glGetTexGenfv@12 -glGetTexGeniv@12 -glGetTexImage@20 -glGetTexLevelParameterfv@16 -glGetTexLevelParameteriv@16 -glGetTexParameterfv@12 -glGetTexParameteriv@12 -glHint@8 -glIndexd@8 -glIndexdv@4 -glIndexf@4 -glIndexfv@4 -glIndexi@4 -glIndexiv@4 -glIndexMask@4 -glIndexPointer@12 -glIndexs@4 -glIndexsv@4 -glIndexub@4 -glIndexubv@4 -glInitNames@0 -glInterleavedArrays@12 -glIsEnabled@4 -glIsList@4 -glIsTexture@4 - -glLightf@12 -glLightfv@12 -glLighti@12 -glLightiv@12 -glLightModelf@8 -glLightModelfv@8 -glLightModeli@8 -glLightModeliv@8 - -glLineStipple@8 -glLineWidth@4 -glListBase@4 -glLoadIdentity@0 -glLoadMatrixd@4 -glLoadMatrixf@4 -glLoadName@4 -glLogicOp@4 - -glMap1d@32 -glMap1f@24 -glMap2d@56 -glMap2f@40 -glMapGrid1d@20 -glMapGrid1f@12 -glMapGrid2d@40 -glMapGrid2f@24 - -glMaterialf@12 -glMaterialfv@12 -glMateriali@12 -glMaterialiv@12 - -glMatrixMode@4 -;GlmfBeginGlsBlock -;GlmfCloseMetaFile -;GlmfEndGlsBlock -;GlmfEndPlayback -;GlmfInitPlayback -;GlmfPlayGlsRecord -glMultMatrixd@4 -glMultMatrixf@4 -glNewList@8 - -glNormal3b@12 -glNormal3bv@4 -glNormal3d@24 -glNormal3dv@4 -glNormal3f@12 -glNormal3fv@4 -glNormal3i@12 -glNormal3iv@4 -glNormal3s@12 -glNormal3sv@4 -glNormalPointer@12 - -glOrtho@48 -glPassThrough@4 -glPixelMapfv@12 -glPixelMapuiv@12 -glPixelMapusv@12 -glPixelStoref@8 -glPixelStorei@8 -glPixelTransferf@8 -glPixelTransferi@8 -glPixelZoom@8 -glPointSize@4 -glPolygonMode@8 -glPolygonOffset@8 -glPolygonStipple@4 -glPopAttrib@0 -glPopClientAttrib@0 -glPopMatrix@0 -glPopName@0 -glPrioritizeTextures@12 -glPushAttrib@4 -glPushClientAttrib@4 -glPushMatrix@0 -glPushName@4 -glRasterPos2d@16 -glRasterPos2dv@4 -glRasterPos2f@8 -glRasterPos2fv@4 -glRasterPos2i@8 -glRasterPos2iv@4 -glRasterPos2s@8 -glRasterPos2sv@4 -glRasterPos3d@24 -glRasterPos3dv@4 -glRasterPos3f@12 -glRasterPos3fv@4 -glRasterPos3i@12 -glRasterPos3iv@4 -glRasterPos3s@12 -glRasterPos3sv@4 -glRasterPos4d@32 -glRasterPos4dv@4 -glRasterPos4f@16 -glRasterPos4fv@4 -glRasterPos4i@16 -glRasterPos4iv@4 -glRasterPos4s@16 -glRasterPos4sv@4 -glReadBuffer@4 -glReadPixels@28 -glRectd@32 -glRectdv@8 -glRectf@16 -glRectfv@8 -glRecti@16 -glRectiv@8 -glRects@16 -glRectsv@8 -glRenderMode@4 -glRotated@32 -glRotatef@16 -glScaled@24 -glScalef@12 -glScissor@16 -glSelectBuffer@8 -glShadeModel@4 -glStencilFunc@12 -glStencilMask@4 -glStencilOp@12 - -glTexCoord1d@8 -glTexCoord1dv@4 -glTexCoord1f@4 -glTexCoord1fv@4 -glTexCoord1i@4 -glTexCoord1iv@4 -glTexCoord1s@4 -glTexCoord1sv@4 - -glTexCoord2d@16 -glTexCoord2dv@4 -glTexCoord2f@8 -glTexCoord2fv@4 -glTexCoord2i@8 -glTexCoord2iv@4 -glTexCoord2s@8 -glTexCoord2sv@4 - -glTexCoord3d@24 -glTexCoord3dv@4 -glTexCoord3f@12 -glTexCoord3fv@4 -glTexCoord3i@12 -glTexCoord3iv@4 -glTexCoord3s@12 -glTexCoord3sv@4 - -glTexCoord4d@32 -glTexCoord4dv@4 -glTexCoord4f@16 -glTexCoord4fv@4 -glTexCoord4i@16 -glTexCoord4iv@4 -glTexCoord4s@16 -glTexCoord4sv@4 - -glTexCoordPointer@16 -glTexEnvf@12 -glTexEnvfv@12 -glTexEnvi@12 -glTexEnviv@12 -glTexGend@16 -glTexGendv@12 -glTexGenf@12 -glTexGenfv@12 -glTexGeni@12 -glTexGeniv@12 -glTexImage1D@32 -glTexImage2D@36 -glTexParameterf@12 -glTexParameterfv@12 -glTexParameteri@12 -glTexParameteriv@12 -glTexSubImage1D@28 -glTexSubImage2D@36 - -glTranslated@24 -glTranslatef@12 - -glVertex2d@16 -glVertex2dv@4 -glVertex2f@8 -glVertex2fv@4 -glVertex2i@8 -glVertex2iv@4 -glVertex2s@8 -glVertex2sv@4 - -glVertex3d@24 -glVertex3dv@4 -glVertex3f@12 -glVertex3fv@4 -glVertex3i@12 -glVertex3iv@4 -glVertex3s@12 -glVertex3sv@4 - -glVertex4d@32 -glVertex4dv@4 -glVertex4f@16 -glVertex4fv@4 -glVertex4i@16 -glVertex4iv@4 -glVertex4s@16 -glVertex4sv@4 - -glVertexPointer@16 -glViewport@16 - -wglChoosePixelFormat@8=rosglChoosePixelFormat@8 -wglCopyContext@12=rosglCopyContext@12 -wglCreateContext@4=rosglCreateContext@4 -wglCreateLayerContext@8=rosglCreateLayerContext@8 -wglDeleteContext@4=rosglDeleteContext@4 -wglDescribeLayerPlane@20=rosglDescribeLayerPlane@20 -wglDescribePixelFormat@16=rosglDescribePixelFormat@16 -wglGetCurrentContext@0=rosglGetCurrentContext@0 -wglGetCurrentDC@0=rosglGetCurrentDC@0 -wglGetDefaultProcAddress@4=rosglGetDefaultProcAddress@4 -wglGetLayerPaletteEntries@20=rosglGetLayerPaletteEntries@20 -wglGetPixelFormat@4=rosglGetPixelFormat@4 -wglGetProcAddress@4=rosglGetProcAddress@4 -wglMakeCurrent@8=rosglMakeCurrent@8 -wglRealizeLayerPalette@12=rosglRealizeLayerPalette@12 -wglSetLayerPaletteEntries@20=rosglSetLayerPaletteEntries@20 -wglSetPixelFormat@12=rosglSetPixelFormat@12 -wglShareLists@8=rosglShareLists@8 -wglSwapBuffers@4=rosglSwapBuffers@4 -wglSwapLayerBuffers@8=rosglSwapLayerBuffers@8 -;wglSwapMultipleBuffers=rosglSwapMultipleBuffers@ -wglUseFontBitmapsA@16=rosglUseFontBitmapsA@16 -wglUseFontBitmapsW@16=rosglUseFontBitmapsW@16 -wglUseFontOutlinesA@32=rosglUseFontOutlinesA@32 -wglUseFontOutlinesW@32=rosglUseFontOutlinesW@32 +@ stdcall wglChoosePixelFormat(long ptr) rosglChoosePixelFormat +@ stdcall wglCopyContext(long long long) rosglCopyContext +@ stdcall wglCreateContext(long) rosglCreateContext +@ stdcall wglCreateLayerContext(long long) rosglCreateLayerContext +@ stdcall wglDeleteContext(long) rosglDeleteContext +@ stdcall wglDescribeLayerPlane(long long long long ptr) rosglDescribeLayerPlane +@ stdcall wglDescribePixelFormat(long long long ptr) rosglDescribePixelFormat +@ stdcall wglGetCurrentContext() rosglGetCurrentContext +@ stdcall wglGetCurrentDC() rosglGetCurrentDC +@ stdcall wglGetDefaultProcAddress(ptr) rosglGetDefaultProcAddress +@ stdcall wglGetLayerPaletteEntries(long long long long ptr) rosglGetLayerPaletteEntries +@ stdcall wglGetPixelFormat(long) rosglGetPixelFormat +@ stdcall wglGetProcAddress(str) rosglGetProcAddress +@ stdcall wglMakeCurrent(long long) rosglMakeCurrent +@ stdcall wglRealizeLayerPalette(long long long) rosglRealizeLayerPalette +@ stdcall wglSetLayerPaletteEntries(long long long long ptr) rosglSetLayerPaletteEntries +@ stdcall wglSetPixelFormat(long long ptr) rosglSetPixelFormat +@ stdcall wglShareLists(long long) rosglShareLists +@ stdcall wglSwapBuffers(long) rosglSwapBuffers +@ stdcall wglSwapLayerBuffers(long long) rosglSwapLayerBuffers +@ stdcall wglUseFontBitmapsA(long long long long) rosglUseFontBitmapsA +@ stdcall wglUseFontBitmapsW(long long long long) rosglUseFontBitmapsW +@ stdcall wglUseFontOutlinesA(long long long long long long long ptr) rosglUseFontOutlinesA +@ stdcall wglUseFontOutlinesW(long long long long long long long ptr) rosglUseFontOutlinesW Propchange: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.spec ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.spec ------------------------------------------------------------------------------ svn:mergeinfo =

1 0

[cgutman] 36501: - Don't call NdisMSendComplete in MiniportSend
by cgutman＠svn.reactos.org 25 Sep '08

25 Sep '08

Author: cgutman Date: Wed Sep 24 22:23:15 2008 New Revision: 36501 URL: http://svn.reactos.org/svn/reactos?rev=36501&view=rev Log: - Don't call NdisMSendComplete in MiniportSend Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Wed Sep 24 22:23:15 2008 @@ -672,13 +672,9 @@ ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); +#ifndef NOCARD NDIS_DbgPrint(MID_TRACE, ("Queueing packet.\n")); -#ifdef NOCARD - NdisMSendComplete(Adapter->MiniportAdapterHandle, - Packet, - NDIS_STATUS_SUCCESS); -#else /* Queue the packet on the transmit queue */ RESERVED(Packet)->Next = NULL; if (Adapter->TXQueueHead == NULL) { @@ -691,8 +687,11 @@ /* Transmit the packet */ NICTransmit(Adapter); + + return NDIS_STATUS_PENDING; +#else + return NDIS_STATUS_SUCCESS; #endif - return NDIS_STATUS_PENDING; }

1 0

[cgutman] 36500: - Created a dummy nic driver for testing purposes - Still a work in progress
by cgutman＠svn.reactos.org 25 Sep '08

25 Sep '08

Author: cgutman Date: Wed Sep 24 20:02:08 2008 New Revision: 36500 URL: http://svn.reactos.org/svn/reactos?rev=36500&view=rev Log: - Created a dummy nic driver for testing purposes - Still a work in progress Added: branches/aicom-network-fixes/drivers/network/dd/dummynic/ (with props) branches/aicom-network-fixes/drivers/network/dd/dummynic/debug.h (with props) branches/aicom-network-fixes/drivers/network/dd/dummynic/dummynic.rbuild (with props) branches/aicom-network-fixes/drivers/network/dd/dummynic/main.c (with props) Modified: branches/aicom-network-fixes/drivers/network/dd/directory.rbuild Modified: branches/aicom-network-fixes/drivers/network/dd/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/directory.rbuild [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/dd/directory.rbuild [iso-8859-1] Wed Sep 24 20:02:08 2008 @@ -7,4 +7,7 @@ <directory name="pcnet"> <xi:include href="pcnet/pcnet.rbuild" /> </directory> + <directory name="dummynic"> + <xi:include href="dummynic/dummynic.rbuild" /> + </directory> </group> Propchange: branches/aicom-network-fixes/drivers/network/dd/dummynic/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Sep 24 20:02:08 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/aicom-network-fixes/drivers/network/dd/dummynic/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/aicom-network-fixes/drivers/network/dd/dummynic/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/aicom-network-fixes/drivers/network/dd/dummynic/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/aicom-network-fixes/drivers/network/dd/dummynic/debug.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/dummynic/debug.h (added) +++ branches/aicom-network-fixes/drivers/network/dd/dummynic/debug.h [iso-8859-1] Wed Sep 24 20:02:08 2008 @@ -1,0 +1,22 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Dummy NIC Driver + * FILE: debug.h + * PURPOSE: Debugging support macros + */ +#ifndef __DEBUG_H +#define __DEBUG_H + +#ifdef DBG + +#define ASSERT_IRQL_EQUAL(x) ASSERT(KeGetCurrentIrql() == (x)) + +#else /* DBG */ + +#define ASSERT_IRQL_EQUAL(x) + +#endif /* DBG */ + +#endif /* __DEBUG_H */ + +/* EOF */ Propchange: branches/aicom-network-fixes/drivers/network/dd/dummynic/debug.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/aicom-network-fixes/drivers/network/dd/dummynic/dummynic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/dummynic/dummynic.rbuild (added) +++ branches/aicom-network-fixes/drivers/network/dd/dummynic/dummynic.rbuild [iso-8859-1] Wed Sep 24 20:02:08 2008 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="dummynic" type="kernelmodedriver" installbase="system32/drivers" installname="dummynic.sys"> + <include base="dummynic">.</include> + <define name="NDIS50_MINIPORT" /> + <define name="NDIS_MINIPORT_DRIVER" /> + <define name="NDIS_LEGACY_MINIPORT" /> + <define name="NDIS51_MINIPORT" /> + <library>ndis</library> + <library>ntoskrnl</library> + <library>hal</library> + <file>main.c</file> +</module> Propchange: branches/aicom-network-fixes/drivers/network/dd/dummynic/dummynic.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/aicom-network-fixes/drivers/network/dd/dummynic/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/dummynic/main.c (added) +++ branches/aicom-network-fixes/drivers/network/dd/dummynic/main.c [iso-8859-1] Wed Sep 24 20:02:08 2008 @@ -1,0 +1,161 @@ +/* + * Dummy NIC Driver + * + * Copyright (C) 2008 Cameron Gutman <cgutman(a)reactos.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + +#include <ndis.h> + +#define NDEBUG +#include <debug.h> +#include "debug.h" + +static VOID +STDCALL +MiniportHandleInterrupt( + IN NDIS_HANDLE MiniportAdapterContext) +{ + DbgPrint("MiniportHandleInterrupt Called\n"); + + ASSERT(MiniportAdapterContext); + ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); +} + + + +static VOID +STDCALL +MiniportHalt( + IN NDIS_HANDLE MiniportAdapterContext) +{ + DbgPrint("MiniportHalt Called\n"); + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + ASSERT(MiniportAdapterContext); +} + +static NDIS_STATUS +STDCALL +MiniportInitialize( + OUT PNDIS_STATUS OpenErrorStatus, + OUT PUINT SelectedMediumIndex, + IN PNDIS_MEDIUM MediumArray, + IN UINT MediumArraySize, + IN NDIS_HANDLE MiniportAdapterHandle, + IN NDIS_HANDLE WrapperConfigurationContext) +{ + UINT i = 0; + NDIS_STATUS Status = NDIS_STATUS_SUCCESS; + + DbgPrint("MiniportInitialize Called\n"); + + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + ASSERT(MiniportAdapterHandle); + ASSERT(WrapperConfigurationContext); + + for(i = 0; i < MediumArraySize; i++) + if(MediumArray[i] == NdisMedium802_3) + break; + + if(i == MediumArraySize) + Status = NDIS_STATUS_UNSUPPORTED_MEDIA; + else + *SelectedMediumIndex = i; + + *OpenErrorStatus = Status; + + return Status; +} + +static VOID +STDCALL +MiniportISR( + OUT PBOOLEAN InterruptRecognized, + OUT PBOOLEAN QueueMiniportHandleInterrupt, + IN NDIS_HANDLE MiniportAdapterContext) +{ + DbgPrint("MiniportISR Called\n"); + ASSERT(MiniportAdapterContext); +} + +static NDIS_STATUS +STDCALL +MiniportReset( + OUT PBOOLEAN AddressingReset, + IN NDIS_HANDLE MiniportAdapterContext) +{ + DbgPrint("MiniportReset Called\n"); + + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + ASSERT(MiniportAdapterContext); + + *AddressingReset = FALSE; + + return NDIS_STATUS_SUCCESS; +} + +static NDIS_STATUS +STDCALL +MiniportSend( + IN NDIS_HANDLE MiniportAdapterContext, + IN PNDIS_PACKET Packet, + IN UINT Flags) +{ + DbgPrint("MiniportSend Called\n"); + + ASSERT(MiniportAdapterContext); + ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); + + return NDIS_STATUS_SUCCESS; +} + +NTSTATUS +STDCALL +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + NDIS_HANDLE WrapperHandle; + NDIS_MINIPORT_CHARACTERISTICS Characteristics; + NDIS_STATUS Status; + + RtlZeroMemory(&Characteristics, sizeof(NDIS_MINIPORT_CHARACTERISTICS)); + Characteristics.MajorNdisVersion = NDIS_MINIPORT_MAJOR_VERSION; + Characteristics.MinorNdisVersion = NDIS_MINIPORT_MINOR_VERSION; + Characteristics.HaltHandler = MiniportHalt; + Characteristics.HandleInterruptHandler = MiniportHandleInterrupt; + Characteristics.InitializeHandler = MiniportInitialize; + Characteristics.ISRHandler = MiniportISR; + //Characteristics.QueryInformationHandler = MiniportQueryInformation; + Characteristics.ResetHandler = MiniportReset; + //Characteristics.SetInformationHandler = MiniportSetInformation; + Characteristics.SendHandler = MiniportSend; + + NdisMInitializeWrapper(&WrapperHandle, DriverObject, RegistryPath, 0); + + if (!WrapperHandle) + return NDIS_STATUS_FAILURE; + + Status = NdisMRegisterMiniport(WrapperHandle, &Characteristics, sizeof(NDIS_MINIPORT_CHARACTERISTICS)); + if (Status != NDIS_STATUS_SUCCESS) { + NdisTerminateWrapper(WrapperHandle, 0); + return NDIS_STATUS_FAILURE; + } + + return NDIS_STATUS_SUCCESS; +} + Propchange: branches/aicom-network-fixes/drivers/network/dd/dummynic/main.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 36499: - Try again to fix build
by cgutman＠svn.reactos.org 25 Sep '08

25 Sep '08

Author: cgutman Date: Wed Sep 24 19:01:39 2008 New Revision: 36499 URL: http://svn.reactos.org/svn/reactos?rev=36499&view=rev Log: - Try again to fix build Modified: trunk/reactos/drivers/network/dd/ne2000/include/debug.h Modified: trunk/reactos/drivers/network/dd/ne2000/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/include/debug.h [iso-8859-1] Wed Sep 24 19:01:39 2008 @@ -56,12 +56,14 @@ #endif /* NASSERT */ #endif #define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x)) +#define ASSERT_IRQL_EQUAL(x) ASSERT(KeGetCurrentIrql() == (x)) #else /* DBG */ #define NDIS_DbgPrint(_t_, _x_) #define ASSERT_IRQL(x) +#define ASSERT_IRQL_EQUAL(x) /* #define ASSERT(x) */ /* ndis.h */ #endif /* DBG */

1 0

[cgutman] 36498: - Fix build
by cgutman＠svn.reactos.org 24 Sep '08

24 Sep '08

Author: cgutman Date: Wed Sep 24 18:48:28 2008 New Revision: 36498 URL: http://svn.reactos.org/svn/reactos?rev=36498&view=rev Log: - Fix build Modified: trunk/reactos/drivers/network/dd/ne2000/include/debug.h trunk/reactos/drivers/network/dd/pcnet/pcnet.h Modified: trunk/reactos/drivers/network/dd/ne2000/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/include/debug.h [iso-8859-1] Wed Sep 24 18:48:28 2008 @@ -56,14 +56,12 @@ #endif /* NASSERT */ #endif #define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x)) -#define ASSERT_IRQL_EQUAL(x) ASSERT(KeGetCurrentIrql() == (x)) #else /* DBG */ #define NDIS_DbgPrint(_t_, _x_) #define ASSERT_IRQL(x) -#define ASSERT_IRQL_EQUAL(x) /* #define ASSERT(x) */ /* ndis.h */ #endif /* DBG */ Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] Wed Sep 24 18:48:28 2008 @@ -141,10 +141,8 @@ #if DBG #define BREAKPOINT DbgBreakPoint(); -#define ASSERT_IRQL_EQUAL(x) ASSERT(KeGetCurrentIrql() == x) #else #define BREAKPOINT -#define ASSERT_IRQL_EQUAL(x) #endif #ifndef TAG

1 0

[cgutman] 36497: Merge aicom-network-fixes up to r36496 - We now call the MiniportCheckForHang handler every two seconds - We reset the miniport if it has detected a hang - Added some IRQL checks
by cgutman＠svn.reactos.org 24 Sep '08

24 Sep '08

Author: cgutman Date: Wed Sep 24 18:39:17 2008 New Revision: 36497 URL: http://svn.reactos.org/svn/reactos?rev=36497&view=rev Log: Merge aicom-network-fixes up to r36496 - We now call the MiniportCheckForHang handler every two seconds - We reset the miniport if it has detected a hang - Added some IRQL checks Modified: trunk/reactos/drivers/network/dd/ne2000/include/debug.h trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c trunk/reactos/drivers/network/dd/pcnet/pcnet.c trunk/reactos/drivers/network/dd/pcnet/pcnet.h trunk/reactos/drivers/network/dd/pcnet/requests.c trunk/reactos/drivers/network/ndis/ndis/io.c trunk/reactos/drivers/network/ndis/ndis/memory.c trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/dd/ne2000/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/include/debug.h [iso-8859-1] Wed Sep 24 18:39:17 2008 @@ -56,12 +56,14 @@ #endif /* NASSERT */ #endif #define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x)) +#define ASSERT_IRQL_EQUAL(x) ASSERT(KeGetCurrentIrql() == (x)) #else /* DBG */ #define NDIS_DbgPrint(_t_, _x_) #define ASSERT_IRQL(x) +#define ASSERT_IRQL_EQUAL(x) /* #define ASSERT(x) */ /* ndis.h */ #endif /* DBG */ Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Wed Sep 24 18:39:17 2008 @@ -62,8 +62,7 @@ NDIS_PHYSICAL_ADDRESS HighestAcceptableMax = NDIS_PHYSICAL_ADDRESS_CONST(-1, -1); -#if 0 -static BOOLEAN MiniportCheckForHang( +static BOOLEAN STDCALL MiniportCheckForHang( IN NDIS_HANDLE MiniportAdapterContext) /* * FUNCTION: Examines if an adapter has hung @@ -77,7 +76,6 @@ return FALSE; } -#endif static VOID STDCALL MiniportDisableInterrupt( @@ -119,6 +117,8 @@ */ { PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; + + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); #ifndef NOCARD @@ -224,6 +224,8 @@ UINT i; NDIS_STATUS Status; PNIC_ADAPTER Adapter; + + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); NDIS_DbgPrint(MAX_TRACE, ("Called (Adapter %X).\n", MiniportAdapterHandle)); @@ -472,6 +474,8 @@ NDIS_MEDIUM Medium = NdisMedium802_3; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; + ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); + NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid)); Status = NDIS_STATUS_SUCCESS; @@ -638,6 +642,8 @@ * Status of operation */ { + ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); return NDIS_STATUS_FAILURE; @@ -660,6 +666,8 @@ */ { PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; + + ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); NDIS_DbgPrint(MID_TRACE, ("Queueing packet.\n")); @@ -709,6 +717,8 @@ ULONG GenericULONG; NDIS_STATUS Status = NDIS_STATUS_SUCCESS; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; + + ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid)); @@ -819,6 +829,8 @@ UINT RecvStop; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; + ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); + NDIS_DbgPrint(MAX_TRACE, ("Called. Packet (0x%X) ByteOffset (0x%X) BytesToTransfer (%d).\n", Packet, ByteOffset, BytesToTransfer)); @@ -903,7 +915,7 @@ NdisZeroMemory(&Miniport, sizeof(Miniport)); Miniport.MajorNdisVersion = DRIVER_NDIS_MAJOR_VERSION; Miniport.MinorNdisVersion = DRIVER_NDIS_MINOR_VERSION; - Miniport.CheckForHangHandler = NULL; //MiniportCheckForHang; + Miniport.CheckForHangHandler = MiniportCheckForHang; Miniport.DisableInterruptHandler = MiniportDisableInterrupt; Miniport.EnableInterruptHandler = MiniportEnableInterrupt; Miniport.HaltHandler = MiniportHalt; @@ -922,6 +934,11 @@ RegistryPath, NULL); + if (!NdisWrapperHandle) { + NDIS_DbgPrint(MIN_TRACE, ("NdisMInitializeWrapper() failed\n")); + return STATUS_UNSUCCESSFUL; + } + DriverInfo.NdisWrapperHandle = NdisWrapperHandle; DriverInfo.NdisMacHandle = NULL; InitializeListHead(&DriverInfo.AdapterListHead); Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Wed Sep 24 18:39:17 2008 @@ -69,6 +69,8 @@ DPRINT("Called\n"); + ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); + NdisDprAcquireSpinLock(&Adapter->Lock); NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR0); @@ -624,6 +626,8 @@ { PADAPTER Adapter = (PADAPTER)FunctionContext; + ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); + if (NdisMSynchronizeWithInterrupt(&Adapter->InterruptObject, MiSyncMediaDetection, FunctionContext)) @@ -812,6 +816,8 @@ NDIS_STATUS Status = NDIS_STATUS_FAILURE; BOOLEAN InterruptRegistered = FALSE; + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + /* Pick a medium */ for(i = 0; i < MediumArraySize; i++) if(MediumArray[i] == NdisMedium802_3) @@ -1023,6 +1029,8 @@ { DPRINT("Called\n"); + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + /* MiniportReset doesn't do anything at the moment... perhaps this should be fixed. */ *AddressingReset = FALSE; @@ -1071,6 +1079,8 @@ UINT TotalPacketLength, SourceLength, Position = 0; DPRINT("Called\n"); + + ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); NdisDprAcquireSpinLock(&Adapter->Lock); Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] Wed Sep 24 18:39:17 2008 @@ -141,8 +141,10 @@ #if DBG #define BREAKPOINT DbgBreakPoint(); +#define ASSERT_IRQL_EQUAL(x) ASSERT(KeGetCurrentIrql() == x) #else #define BREAKPOINT +#define ASSERT_IRQL_EQUAL(x) #endif #ifndef TAG Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/r… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] Wed Sep 24 18:39:17 2008 @@ -103,7 +103,7 @@ * RETURNS: * NDIS_STATUS_SUCCESS on all queries * NOTES: - * - Called by NDIS at PASSIVE_LEVEL + * - Called by NDIS at DISPATCH_LEVEL * - If InformationBufferLength is insufficient to store the results, return the amount * needed in BytesNeeded and return NDIS_STATUS_INVALID_LENGTH * TODO: @@ -118,9 +118,11 @@ DPRINT("Called. OID 0x%x\n", Oid); + ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); + ASSERT(Adapter); - NdisAcquireSpinLock(&Adapter->Lock); + NdisDprAcquireSpinLock(&Adapter->Lock); Status = NDIS_STATUS_SUCCESS; CopyFrom = (PVOID)&GenericULONG; @@ -361,7 +363,7 @@ } } - NdisReleaseSpinLock(&Adapter->Lock); + NdisDprReleaseSpinLock(&Adapter->Lock); DPRINT("Leaving. Status is 0x%x\n", Status); @@ -390,7 +392,7 @@ * RETURNS: * NDIS_STATUS_SUCCESS on all requests * NOTES: - * - Called by NDIS at PASSIVE_LEVEL + * - Called by NDIS at DISPATCH_LEVEL * - verify buffer space as mentioned in previous function notes */ { @@ -400,9 +402,11 @@ ASSERT(Adapter); + ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); + DPRINT("Called, OID 0x%x\n", Oid); - NdisAcquireSpinLock(&Adapter->Lock); + NdisDprAcquireSpinLock(&Adapter->Lock); switch (Oid) { @@ -501,7 +505,7 @@ *BytesNeeded = 0; } - NdisReleaseSpinLock(&Adapter->Lock); + NdisDprReleaseSpinLock(&Adapter->Lock); DPRINT("Leaving. Status (0x%X).\n", Status); Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Wed Sep 24 18:39:17 2008 @@ -268,7 +268,7 @@ UINT MapRegistersPerBaseRegister = 0; ULONG AvailableMapRegisters; NTSTATUS NtStatus; - PNDIS_MINIPORT_BLOCK Adapter = 0; + PLOGICAL_ADAPTER Adapter; PDEVICE_OBJECT DeviceObject = 0; KEVENT AllocationEvent; KIRQL OldIrql; @@ -278,19 +278,19 @@ memset(&Description,0,sizeof(Description)); - Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; ASSERT(Adapter); /* only bus masters may call this routine */ - ASSERT(Adapter->Flags & NDIS_ATTRIBUTE_BUS_MASTER); - if(!(Adapter->Flags & NDIS_ATTRIBUTE_BUS_MASTER)) + ASSERT(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER); + if(!(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER)) return NDIS_STATUS_SUCCESS; - DeviceObject = Adapter->DeviceObject; + DeviceObject = Adapter->NdisMiniportBlock.DeviceObject; KeInitializeEvent(&AllocationEvent, NotificationEvent, FALSE); - Adapter->AllocationEvent = &AllocationEvent; + Adapter->NdisMiniportBlock.AllocationEvent = &AllocationEvent; /* * map registers correlate to physical pages. ndis documents a @@ -310,12 +310,12 @@ Description.Master = TRUE; /* implied by calling this function */ Description.ScatterGather = TRUE; /* XXX UNTRUE: All BM DMA are S/G (ms seems to do this) */ Description.Dma32BitAddresses = DmaSize; - Description.BusNumber = Adapter->BusNumber; - Description.InterfaceType = Adapter->BusType; + Description.BusNumber = Adapter->NdisMiniportBlock.BusNumber; + Description.InterfaceType = Adapter->NdisMiniportBlock.BusType; Description.DmaChannel = DmaChannel; Description.MaximumLength = MaximumBufferSize; - if(Adapter->AdapterType == Isa) + if(Adapter->NdisMiniportBlock.AdapterType == Isa) { /* system dma */ if(DmaChannel < 4) @@ -325,7 +325,7 @@ Description.DmaSpeed = Compatible; } - else if(Adapter->AdapterType == PCIBus) + else if(Adapter->NdisMiniportBlock.AdapterType == PCIBus) { if(DmaSize == NDIS_DMA_64BITS) Description.Dma64BitAddresses = TRUE; @@ -339,7 +339,7 @@ } AdapterObject = IoGetDmaAdapter( - Adapter->PhysicalDeviceObject, &Description, &AvailableMapRegisters); + Adapter->NdisMiniportBlock.PhysicalDeviceObject, &Description, &AvailableMapRegisters); if(!AdapterObject) { @@ -347,7 +347,7 @@ return NDIS_STATUS_RESOURCES; } - Adapter->SystemAdapterObject = AdapterObject; + Adapter->NdisMiniportBlock.SystemAdapterObject = AdapterObject; if(AvailableMapRegisters < MapRegistersPerBaseRegister) { @@ -358,22 +358,22 @@ } /* allocate & zero space in the miniport block for the registers */ - Adapter->MapRegisters = ExAllocatePool(NonPagedPool, BaseMapRegistersNeeded * sizeof(MAP_REGISTER_ENTRY)); - if(!Adapter->MapRegisters) + Adapter->NdisMiniportBlock.MapRegisters = ExAllocatePool(NonPagedPool, BaseMapRegistersNeeded * sizeof(MAP_REGISTER_ENTRY)); + if(!Adapter->NdisMiniportBlock.MapRegisters) { NDIS_DbgPrint(MIN_TRACE, ("insufficient resources.\n")); return NDIS_STATUS_RESOURCES; } - memset(Adapter->MapRegisters, 0, BaseMapRegistersNeeded * sizeof(MAP_REGISTER_ENTRY)); - Adapter->BaseMapRegistersNeeded = (USHORT)BaseMapRegistersNeeded; + memset(Adapter->NdisMiniportBlock.MapRegisters, 0, BaseMapRegistersNeeded * sizeof(MAP_REGISTER_ENTRY)); + Adapter->NdisMiniportBlock.BaseMapRegistersNeeded = (USHORT)BaseMapRegistersNeeded; while(BaseMapRegistersNeeded) { NDIS_DbgPrint(MAX_TRACE, ("iterating, basemapregistersneeded = %d\n", BaseMapRegistersNeeded)); BaseMapRegistersNeeded--; - Adapter->CurrentMapRegister = (USHORT)BaseMapRegistersNeeded; + Adapter->NdisMiniportBlock.CurrentMapRegister = (USHORT)BaseMapRegistersNeeded; KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); { NtStatus = AdapterObject->DmaOperations->AllocateAdapterChannel( @@ -385,7 +385,7 @@ if(!NT_SUCCESS(NtStatus)) { NDIS_DbgPrint(MIN_TRACE, ("IoAllocateAdapterChannel failed: 0x%x\n", NtStatus)); - ExFreePool(Adapter->MapRegisters); + ExFreePool(Adapter->NdisMiniportBlock.MapRegisters); return NDIS_STATUS_RESOURCES; } @@ -396,7 +396,7 @@ if(!NT_SUCCESS(NtStatus)) { NDIS_DbgPrint(MIN_TRACE, ("KeWaitForSingleObject failed: 0x%x\n", NtStatus)); - ExFreePool(Adapter->MapRegisters); + ExFreePool(Adapter->NdisMiniportBlock.MapRegisters); return NDIS_STATUS_RESOURCES; } @@ -439,7 +439,7 @@ * - The caller supplies storage for the physical address array. */ { - PNDIS_MINIPORT_BLOCK Adapter; + PLOGICAL_ADAPTER Adapter; PVOID CurrentVa; ULONG TotalLength; PHYSICAL_ADDRESS ReturnedAddress; @@ -448,7 +448,7 @@ ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); ASSERT(MiniportAdapterHandle && Buffer && PhysicalAddressArray && ArraySize); - Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; CurrentVa = MmGetMdlVirtualAddress(Buffer); TotalLength = MmGetMdlByteCount(Buffer); @@ -456,12 +456,12 @@ { ULONG Length = TotalLength; - ReturnedAddress = Adapter->SystemAdapterObject->DmaOperations->MapTransfer( - Adapter->SystemAdapterObject, Buffer, - Adapter->MapRegisters[PhysicalMapRegister].MapRegister, + ReturnedAddress = Adapter->NdisMiniportBlock.SystemAdapterObject->DmaOperations->MapTransfer( + Adapter->NdisMiniportBlock.SystemAdapterObject, Buffer, + Adapter->NdisMiniportBlock.MapRegisters[PhysicalMapRegister].MapRegister, CurrentVa, &Length, WriteToDevice); - Adapter->MapRegisters[PhysicalMapRegister].WriteToDevice = WriteToDevice; + Adapter->NdisMiniportBlock.MapRegisters[PhysicalMapRegister].WriteToDevice = WriteToDevice; PhysicalAddressArray[LoopCount].PhysicalAddress = ReturnedAddress; PhysicalAddressArray[LoopCount].Length = Length; @@ -495,22 +495,22 @@ * - May be called at IRQL <= DISPATCH_LEVEL */ { - PNDIS_MINIPORT_BLOCK Adapter; + PLOGICAL_ADAPTER Adapter; VOID *CurrentVa; ULONG Length; ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); ASSERT(MiniportAdapterHandle && Buffer); - Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; CurrentVa = MmGetMdlVirtualAddress(Buffer); Length = MmGetMdlByteCount(Buffer); - Adapter->SystemAdapterObject->DmaOperations->FlushAdapterBuffers( - Adapter->SystemAdapterObject, Buffer, - Adapter->MapRegisters[PhysicalMapRegister].MapRegister, + Adapter->NdisMiniportBlock.SystemAdapterObject->DmaOperations->FlushAdapterBuffers( + Adapter->NdisMiniportBlock.SystemAdapterObject, Buffer, + Adapter->NdisMiniportBlock.MapRegisters[PhysicalMapRegister].MapRegister, CurrentVa, Length, - Adapter->MapRegisters[PhysicalMapRegister].WriteToDevice); + Adapter->NdisMiniportBlock.MapRegisters[PhysicalMapRegister].WriteToDevice); } @@ -582,7 +582,7 @@ */ { KIRQL OldIrql; - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; PDMA_ADAPTER AdapterObject; UINT MapRegistersPerBaseRegister; UINT i; @@ -592,31 +592,31 @@ ASSERT(Adapter); /* only bus masters may call this routine */ - ASSERT(Adapter->Flags & NDIS_ATTRIBUTE_BUS_MASTER); - if(!(Adapter->Flags & NDIS_ATTRIBUTE_BUS_MASTER) || - Adapter->SystemAdapterObject == NULL) + ASSERT(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER); + if(!(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER) || + Adapter->NdisMiniportBlock.SystemAdapterObject == NULL) return; - MapRegistersPerBaseRegister = ((Adapter->MaximumPhysicalMapping - 2) / PAGE_SIZE) + 2; - - AdapterObject = Adapter->SystemAdapterObject; + MapRegistersPerBaseRegister = ((Adapter->NdisMiniportBlock.MaximumPhysicalMapping - 2) / PAGE_SIZE) + 2; + + AdapterObject = Adapter->NdisMiniportBlock.SystemAdapterObject; KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); { - for(i = 0; i < Adapter->BaseMapRegistersNeeded; i++) + for(i = 0; i < Adapter->NdisMiniportBlock.BaseMapRegistersNeeded; i++) { AdapterObject->DmaOperations->FreeMapRegisters( - Adapter->SystemAdapterObject, - Adapter->MapRegisters[i].MapRegister, + Adapter->NdisMiniportBlock.SystemAdapterObject, + Adapter->NdisMiniportBlock.MapRegisters[i].MapRegister, MapRegistersPerBaseRegister); } } KeLowerIrql(OldIrql); AdapterObject->DmaOperations->PutDmaAdapter(AdapterObject); - Adapter->SystemAdapterObject = NULL; - - ExFreePool(Adapter->MapRegisters); + Adapter->NdisMiniportBlock.SystemAdapterObject = NULL; + + ExFreePool(Adapter->NdisMiniportBlock.MapRegisters); } @@ -752,7 +752,7 @@ ULONG MappedIRQ; KIRQL DIrql; KAFFINITY Affinity; - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; NDIS_DbgPrint(MAX_TRACE, ("Called. InterruptVector (0x%X) InterruptLevel (0x%X) " "SharedInterrupt (%d) InterruptMode (0x%X)\n", @@ -768,9 +768,9 @@ Interrupt->SharedInterrupt = SharedInterrupt; - Adapter->Interrupt = Interrupt; - - MappedIRQ = HalGetInterruptVector(Adapter->BusType, Adapter->BusNumber, + Adapter->NdisMiniportBlock.Interrupt = Interrupt; + + MappedIRQ = HalGetInterruptVector(Adapter->NdisMiniportBlock.BusType, Adapter->NdisMiniportBlock.BusNumber, InterruptLevel, InterruptVector, &DIrql, &Affinity); @@ -818,7 +818,7 @@ */ { PHYSICAL_ADDRESS PortAddress, TranslatedAddress; - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; ULONG AddressSpace = 1; /* FIXME The HAL handles this wrong atm */ *PortOffset = 0; @@ -840,7 +840,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Translating address 0x%x 0x%x\n", PortAddress.u.HighPart, PortAddress.u.LowPart)); - if(!HalTranslateBusAddress(Adapter->BusType, Adapter->BusNumber, + if(!HalTranslateBusAddress(Adapter->NdisMiniportBlock.BusType, Adapter->NdisMiniportBlock.BusNumber, PortAddress, &AddressSpace, &TranslatedAddress)) { NDIS_DbgPrint(MIN_TRACE, ("Unable to translate address\n")); Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] Wed Sep 24 18:39:17 2008 @@ -189,12 +189,12 @@ * - Cached is ignored; we always allocate non-cached */ { - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; NDIS_DbgPrint(MAX_TRACE,("Called.\n")); - *VirtualAddress = Adapter->SystemAdapterObject->DmaOperations->AllocateCommonBuffer( - Adapter->SystemAdapterObject, Length, PhysicalAddress, Cached); + *VirtualAddress = Adapter->NdisMiniportBlock.SystemAdapterObject->DmaOperations->AllocateCommonBuffer( + Adapter->NdisMiniportBlock.SystemAdapterObject, Length, PhysicalAddress, Cached); } @@ -267,7 +267,7 @@ */ { HANDLE ThreadHandle; - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; PMINIPORT_SHARED_MEMORY Memory; NDIS_DbgPrint(MAX_TRACE,("Called.\n")); @@ -283,7 +283,7 @@ return; } - Memory->AdapterObject = Adapter->SystemAdapterObject; + Memory->AdapterObject = Adapter->NdisMiniportBlock.SystemAdapterObject; Memory->Length = Length; Memory->PhysicalAddress = PhysicalAddress; Memory->VirtualAddress = VirtualAddress; Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Wed Sep 24 18:39:17 2008 @@ -581,6 +581,76 @@ /* FIXME: Wait in pending case! */ return NdisStatus; +} + +BOOLEAN +MiniCheckForHang( PLOGICAL_ADAPTER Adapter ) +/* + * FUNCTION: Checks to see if the miniport is hung + * ARGUMENTS: + * Adapter = Pointer to the logical adapter object + * RETURNS: + * TRUE if the miniport is hung + * FALSE if the miniport is not hung + */ +{ + BOOLEAN Ret = FALSE; + KIRQL OldIrql; + + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + if (Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.CheckForHangHandler) + Ret = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.CheckForHangHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext); + KeLowerIrql(OldIrql); + + return Ret; +} + +NDIS_STATUS +MiniReset( + PLOGICAL_ADAPTER Adapter, + PBOOLEAN AddressingReset) +/* + * FUNCTION: Resets the miniport + * ARGUMENTS: + * Adapter = Pointer to the logical adapter object + * AddressingReset = Set to TRUE if we need to call MiniportSetInformation later + * RETURNS: + * Status of the operation + */ +{ + NDIS_STATUS Status = NDIS_STATUS_FAILURE; + KIRQL OldIrql; + + /* FIXME: What should we return if there isn't a reset handler? */ + + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + if (Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler) + Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, + AddressingReset); + KeLowerIrql(OldIrql); + + return Status; +} + +VOID STDCALL +MiniportHangDpc( + PKDPC Dpc, + PVOID DeferredContext, + PVOID SystemArgument1, + PVOID SystemArgument2) +{ + PLOGICAL_ADAPTER Adapter = DeferredContext; + BOOLEAN AddressingReset = FALSE; + + + if (MiniCheckForHang(Adapter)) { + NDIS_DbgPrint(MIN_TRACE, ("Miniport detected adapter hang\n")); + MiniReset(Adapter, &AddressingReset); + } + + /* FIXME: We should call MiniportSetInformation if AddressingReset is TRUE */ } @@ -1370,7 +1440,8 @@ PNDIS_CONFIGURATION_PARAMETER ConfigParam; NDIS_HANDLE ConfigHandle; ULONG Size; -/* FIXME - KIRQL OldIrql; */ + LARGE_INTEGER Timeout; + /* FIXME - KIRQL OldIrql; */ /* * Prepare wrapper context used by HW and configuration routines. @@ -1582,8 +1653,17 @@ return (NTSTATUS)NdisStatus; } + /* Check for a hang every two seconds if it wasn't set in MiniportInitialize */ + if (Adapter->NdisMiniportBlock.CheckForHangSeconds == 0) + Adapter->NdisMiniportBlock.CheckForHangSeconds = 2; + Adapter->NdisMiniportBlock.OldPnPDeviceState = Adapter->NdisMiniportBlock.PnPDeviceState; Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceStarted; + + Timeout.QuadPart = (LONGLONG)Adapter->NdisMiniportBlock.CheckForHangSeconds * -1000000; + KeSetTimerEx(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Timer, Timeout, + Adapter->NdisMiniportBlock.CheckForHangSeconds * 1000, + &Adapter->NdisMiniportBlock.WakeUpDpcTimer.Dpc); /* Put adapter in adapter list for this miniport */ ExInterlockedInsertTailList(&Adapter->NdisMiniportBlock.DriverHandle->DeviceList, &Adapter->MiniportListEntry, &Adapter->NdisMiniportBlock.DriverHandle->Lock); @@ -1639,6 +1719,8 @@ Adapter->NdisMiniportBlock.OldPnPDeviceState = Adapter->NdisMiniportBlock.PnPDeviceState; Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceStopped; + + KeCancelTimer(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Timer); return STATUS_SUCCESS; } @@ -1826,7 +1908,9 @@ Adapter->NdisMiniportBlock.OldPnPDeviceState = 0; Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceAdded; - KeInitializeDpc(&Adapter->NdisMiniportBlock.DeferredDpc, MiniportDpc, (PVOID)Adapter); + KeInitializeTimer(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Timer); + KeInitializeDpc(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Dpc, MiniportHangDpc, Adapter); + KeInitializeDpc(&Adapter->NdisMiniportBlock.DeferredDpc, MiniportDpc, Adapter); DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; @@ -2078,8 +2162,6 @@ * AdapterType = Specifies the I/O bus interface of the caller's NIC */ { - /* TODO: Take CheckForHandTimeInSeconds into account! */ - PLOGICAL_ADAPTER Adapter = GET_LOGICAL_ADAPTER(MiniportAdapterHandle); NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -2087,6 +2169,8 @@ Adapter->NdisMiniportBlock.MiniportAdapterContext = MiniportAdapterContext; Adapter->NdisMiniportBlock.Flags = AttributeFlags; Adapter->NdisMiniportBlock.AdapterType = AdapterType; + if (CheckForHangTimeInSeconds > 0) + Adapter->NdisMiniportBlock.CheckForHangSeconds = CheckForHangTimeInSeconds; if (AttributeFlags & NDIS_ATTRIBUTE_INTERMEDIATE_DRIVER) NDIS_DbgPrint(MAX_TRACE, ("Intermediate drivers not supported yet.\n")); }

1 0

[cgutman] 36496: - Add a debug print
by cgutman＠svn.reactos.org 24 Sep '08

24 Sep '08

Author: cgutman Date: Wed Sep 24 17:00:02 2008 New Revision: 36496 URL: http://svn.reactos.org/svn/reactos?rev=36496&view=rev Log: - Add a debug print Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Wed Sep 24 17:00:02 2008 @@ -645,8 +645,10 @@ BOOLEAN AddressingReset = FALSE; - if (MiniCheckForHang(Adapter)) + if (MiniCheckForHang(Adapter)) { + NDIS_DbgPrint(MIN_TRACE, ("Miniport detected adapter hang\n")); MiniReset(Adapter, &AddressingReset); + } /* FIXME: We should call MiniportSetInformation if AddressingReset is TRUE */ }

1 0

[cgutman] 36495: - MiniportAdapterHandle is PLOGICAL_ADAPTER not PNDIS_MINIPORT_BLOCK
by cgutman＠svn.reactos.org 24 Sep '08

24 Sep '08

Author: cgutman Date: Wed Sep 24 16:56:07 2008 New Revision: 36495 URL: http://svn.reactos.org/svn/reactos?rev=36495&view=rev Log: - MiniportAdapterHandle is PLOGICAL_ADAPTER not PNDIS_MINIPORT_BLOCK Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c branches/aicom-network-fixes/drivers/network/ndis/ndis/memory.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] Wed Sep 24 16:56:07 2008 @@ -268,7 +268,7 @@ UINT MapRegistersPerBaseRegister = 0; ULONG AvailableMapRegisters; NTSTATUS NtStatus; - PNDIS_MINIPORT_BLOCK Adapter = 0; + PLOGICAL_ADAPTER Adapter; PDEVICE_OBJECT DeviceObject = 0; KEVENT AllocationEvent; KIRQL OldIrql; @@ -278,19 +278,19 @@ memset(&Description,0,sizeof(Description)); - Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; ASSERT(Adapter); /* only bus masters may call this routine */ - ASSERT(Adapter->Flags & NDIS_ATTRIBUTE_BUS_MASTER); - if(!(Adapter->Flags & NDIS_ATTRIBUTE_BUS_MASTER)) + ASSERT(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER); + if(!(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER)) return NDIS_STATUS_SUCCESS; - DeviceObject = Adapter->DeviceObject; + DeviceObject = Adapter->NdisMiniportBlock.DeviceObject; KeInitializeEvent(&AllocationEvent, NotificationEvent, FALSE); - Adapter->AllocationEvent = &AllocationEvent; + Adapter->NdisMiniportBlock.AllocationEvent = &AllocationEvent; /* * map registers correlate to physical pages. ndis documents a @@ -310,12 +310,12 @@ Description.Master = TRUE; /* implied by calling this function */ Description.ScatterGather = TRUE; /* XXX UNTRUE: All BM DMA are S/G (ms seems to do this) */ Description.Dma32BitAddresses = DmaSize; - Description.BusNumber = Adapter->BusNumber; - Description.InterfaceType = Adapter->BusType; + Description.BusNumber = Adapter->NdisMiniportBlock.BusNumber; + Description.InterfaceType = Adapter->NdisMiniportBlock.BusType; Description.DmaChannel = DmaChannel; Description.MaximumLength = MaximumBufferSize; - if(Adapter->AdapterType == Isa) + if(Adapter->NdisMiniportBlock.AdapterType == Isa) { /* system dma */ if(DmaChannel < 4) @@ -325,7 +325,7 @@ Description.DmaSpeed = Compatible; } - else if(Adapter->AdapterType == PCIBus) + else if(Adapter->NdisMiniportBlock.AdapterType == PCIBus) { if(DmaSize == NDIS_DMA_64BITS) Description.Dma64BitAddresses = TRUE; @@ -339,7 +339,7 @@ } AdapterObject = IoGetDmaAdapter( - Adapter->PhysicalDeviceObject, &Description, &AvailableMapRegisters); + Adapter->NdisMiniportBlock.PhysicalDeviceObject, &Description, &AvailableMapRegisters); if(!AdapterObject) { @@ -347,7 +347,7 @@ return NDIS_STATUS_RESOURCES; } - Adapter->SystemAdapterObject = AdapterObject; + Adapter->NdisMiniportBlock.SystemAdapterObject = AdapterObject; if(AvailableMapRegisters < MapRegistersPerBaseRegister) { @@ -358,22 +358,22 @@ } /* allocate & zero space in the miniport block for the registers */ - Adapter->MapRegisters = ExAllocatePool(NonPagedPool, BaseMapRegistersNeeded * sizeof(MAP_REGISTER_ENTRY)); - if(!Adapter->MapRegisters) + Adapter->NdisMiniportBlock.MapRegisters = ExAllocatePool(NonPagedPool, BaseMapRegistersNeeded * sizeof(MAP_REGISTER_ENTRY)); + if(!Adapter->NdisMiniportBlock.MapRegisters) { NDIS_DbgPrint(MIN_TRACE, ("insufficient resources.\n")); return NDIS_STATUS_RESOURCES; } - memset(Adapter->MapRegisters, 0, BaseMapRegistersNeeded * sizeof(MAP_REGISTER_ENTRY)); - Adapter->BaseMapRegistersNeeded = (USHORT)BaseMapRegistersNeeded; + memset(Adapter->NdisMiniportBlock.MapRegisters, 0, BaseMapRegistersNeeded * sizeof(MAP_REGISTER_ENTRY)); + Adapter->NdisMiniportBlock.BaseMapRegistersNeeded = (USHORT)BaseMapRegistersNeeded; while(BaseMapRegistersNeeded) { NDIS_DbgPrint(MAX_TRACE, ("iterating, basemapregistersneeded = %d\n", BaseMapRegistersNeeded)); BaseMapRegistersNeeded--; - Adapter->CurrentMapRegister = (USHORT)BaseMapRegistersNeeded; + Adapter->NdisMiniportBlock.CurrentMapRegister = (USHORT)BaseMapRegistersNeeded; KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); { NtStatus = AdapterObject->DmaOperations->AllocateAdapterChannel( @@ -385,7 +385,7 @@ if(!NT_SUCCESS(NtStatus)) { NDIS_DbgPrint(MIN_TRACE, ("IoAllocateAdapterChannel failed: 0x%x\n", NtStatus)); - ExFreePool(Adapter->MapRegisters); + ExFreePool(Adapter->NdisMiniportBlock.MapRegisters); return NDIS_STATUS_RESOURCES; } @@ -396,7 +396,7 @@ if(!NT_SUCCESS(NtStatus)) { NDIS_DbgPrint(MIN_TRACE, ("KeWaitForSingleObject failed: 0x%x\n", NtStatus)); - ExFreePool(Adapter->MapRegisters); + ExFreePool(Adapter->NdisMiniportBlock.MapRegisters); return NDIS_STATUS_RESOURCES; } @@ -439,7 +439,7 @@ * - The caller supplies storage for the physical address array. */ { - PNDIS_MINIPORT_BLOCK Adapter; + PLOGICAL_ADAPTER Adapter; PVOID CurrentVa; ULONG TotalLength; PHYSICAL_ADDRESS ReturnedAddress; @@ -448,7 +448,7 @@ ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); ASSERT(MiniportAdapterHandle && Buffer && PhysicalAddressArray && ArraySize); - Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; CurrentVa = MmGetMdlVirtualAddress(Buffer); TotalLength = MmGetMdlByteCount(Buffer); @@ -456,12 +456,12 @@ { ULONG Length = TotalLength; - ReturnedAddress = Adapter->SystemAdapterObject->DmaOperations->MapTransfer( - Adapter->SystemAdapterObject, Buffer, - Adapter->MapRegisters[PhysicalMapRegister].MapRegister, + ReturnedAddress = Adapter->NdisMiniportBlock.SystemAdapterObject->DmaOperations->MapTransfer( + Adapter->NdisMiniportBlock.SystemAdapterObject, Buffer, + Adapter->NdisMiniportBlock.MapRegisters[PhysicalMapRegister].MapRegister, CurrentVa, &Length, WriteToDevice); - Adapter->MapRegisters[PhysicalMapRegister].WriteToDevice = WriteToDevice; + Adapter->NdisMiniportBlock.MapRegisters[PhysicalMapRegister].WriteToDevice = WriteToDevice; PhysicalAddressArray[LoopCount].PhysicalAddress = ReturnedAddress; PhysicalAddressArray[LoopCount].Length = Length; @@ -495,22 +495,22 @@ * - May be called at IRQL <= DISPATCH_LEVEL */ { - PNDIS_MINIPORT_BLOCK Adapter; + PLOGICAL_ADAPTER Adapter; VOID *CurrentVa; ULONG Length; ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); ASSERT(MiniportAdapterHandle && Buffer); - Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; CurrentVa = MmGetMdlVirtualAddress(Buffer); Length = MmGetMdlByteCount(Buffer); - Adapter->SystemAdapterObject->DmaOperations->FlushAdapterBuffers( - Adapter->SystemAdapterObject, Buffer, - Adapter->MapRegisters[PhysicalMapRegister].MapRegister, + Adapter->NdisMiniportBlock.SystemAdapterObject->DmaOperations->FlushAdapterBuffers( + Adapter->NdisMiniportBlock.SystemAdapterObject, Buffer, + Adapter->NdisMiniportBlock.MapRegisters[PhysicalMapRegister].MapRegister, CurrentVa, Length, - Adapter->MapRegisters[PhysicalMapRegister].WriteToDevice); + Adapter->NdisMiniportBlock.MapRegisters[PhysicalMapRegister].WriteToDevice); } @@ -582,7 +582,7 @@ */ { KIRQL OldIrql; - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; PDMA_ADAPTER AdapterObject; UINT MapRegistersPerBaseRegister; UINT i; @@ -592,31 +592,31 @@ ASSERT(Adapter); /* only bus masters may call this routine */ - ASSERT(Adapter->Flags & NDIS_ATTRIBUTE_BUS_MASTER); - if(!(Adapter->Flags & NDIS_ATTRIBUTE_BUS_MASTER) || - Adapter->SystemAdapterObject == NULL) + ASSERT(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER); + if(!(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER) || + Adapter->NdisMiniportBlock.SystemAdapterObject == NULL) return; - MapRegistersPerBaseRegister = ((Adapter->MaximumPhysicalMapping - 2) / PAGE_SIZE) + 2; - - AdapterObject = Adapter->SystemAdapterObject; + MapRegistersPerBaseRegister = ((Adapter->NdisMiniportBlock.MaximumPhysicalMapping - 2) / PAGE_SIZE) + 2; + + AdapterObject = Adapter->NdisMiniportBlock.SystemAdapterObject; KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); { - for(i = 0; i < Adapter->BaseMapRegistersNeeded; i++) + for(i = 0; i < Adapter->NdisMiniportBlock.BaseMapRegistersNeeded; i++) { AdapterObject->DmaOperations->FreeMapRegisters( - Adapter->SystemAdapterObject, - Adapter->MapRegisters[i].MapRegister, + Adapter->NdisMiniportBlock.SystemAdapterObject, + Adapter->NdisMiniportBlock.MapRegisters[i].MapRegister, MapRegistersPerBaseRegister); } } KeLowerIrql(OldIrql); AdapterObject->DmaOperations->PutDmaAdapter(AdapterObject); - Adapter->SystemAdapterObject = NULL; - - ExFreePool(Adapter->MapRegisters); + Adapter->NdisMiniportBlock.SystemAdapterObject = NULL; + + ExFreePool(Adapter->NdisMiniportBlock.MapRegisters); } @@ -752,7 +752,7 @@ ULONG MappedIRQ; KIRQL DIrql; KAFFINITY Affinity; - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; NDIS_DbgPrint(MAX_TRACE, ("Called. InterruptVector (0x%X) InterruptLevel (0x%X) " "SharedInterrupt (%d) InterruptMode (0x%X)\n", @@ -768,9 +768,9 @@ Interrupt->SharedInterrupt = SharedInterrupt; - Adapter->Interrupt = Interrupt; - - MappedIRQ = HalGetInterruptVector(Adapter->BusType, Adapter->BusNumber, + Adapter->NdisMiniportBlock.Interrupt = Interrupt; + + MappedIRQ = HalGetInterruptVector(Adapter->NdisMiniportBlock.BusType, Adapter->NdisMiniportBlock.BusNumber, InterruptLevel, InterruptVector, &DIrql, &Affinity); @@ -818,7 +818,7 @@ */ { PHYSICAL_ADDRESS PortAddress, TranslatedAddress; - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; ULONG AddressSpace = 1; /* FIXME The HAL handles this wrong atm */ *PortOffset = 0; @@ -840,7 +840,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Translating address 0x%x 0x%x\n", PortAddress.u.HighPart, PortAddress.u.LowPart)); - if(!HalTranslateBusAddress(Adapter->BusType, Adapter->BusNumber, + if(!HalTranslateBusAddress(Adapter->NdisMiniportBlock.BusType, Adapter->NdisMiniportBlock.BusNumber, PortAddress, &AddressSpace, &TranslatedAddress)) { NDIS_DbgPrint(MIN_TRACE, ("Unable to translate address\n")); Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/memory.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/memory.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/memory.c [iso-8859-1] Wed Sep 24 16:56:07 2008 @@ -189,12 +189,12 @@ * - Cached is ignored; we always allocate non-cached */ { - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; NDIS_DbgPrint(MAX_TRACE,("Called.\n")); - *VirtualAddress = Adapter->SystemAdapterObject->DmaOperations->AllocateCommonBuffer( - Adapter->SystemAdapterObject, Length, PhysicalAddress, Cached); + *VirtualAddress = Adapter->NdisMiniportBlock.SystemAdapterObject->DmaOperations->AllocateCommonBuffer( + Adapter->NdisMiniportBlock.SystemAdapterObject, Length, PhysicalAddress, Cached); } @@ -267,7 +267,7 @@ */ { HANDLE ThreadHandle; - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; PMINIPORT_SHARED_MEMORY Memory; NDIS_DbgPrint(MAX_TRACE,("Called.\n")); @@ -283,7 +283,7 @@ return; } - Memory->AdapterObject = Adapter->SystemAdapterObject; + Memory->AdapterObject = Adapter->NdisMiniportBlock.SystemAdapterObject; Memory->Length = Length; Memory->PhysicalAddress = PhysicalAddress; Memory->VirtualAddress = VirtualAddress;

1 0

[sginsberg] 36494: - MiQueryVirtualMemory shouldn't be called for kernel memory, so remove the special case code for a kernel address space. Also fixes a case where we would dereference an uninitialized pointer. - Fix for Coverity Error CID: 773
by sginsberg＠svn.reactos.org 24 Sep '08

24 Sep '08

Author: sginsberg Date: Wed Sep 24 14:13:08 2008 New Revision: 36494 URL: http://svn.reactos.org/svn/reactos?rev=36494&view=rev Log: - MiQueryVirtualMemory shouldn't be called for kernel memory, so remove the special case code for a kernel address space. Also fixes a case where we would dereference an uninitialized pointer. - Fix for Coverity Error CID: 773 Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Wed Sep 24 14:13:08 2008 @@ -427,26 +427,21 @@ MEMORY_AREA* MemoryArea; PMM_AVL_TABLE AddressSpace; - if (Address < MmSystemRangeStart) - { - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_QUERY_INFORMATION, - NULL, - UserMode, - (PVOID*)(&Process), - NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT("NtQueryVirtualMemory() = %x\n",Status); - return(Status); - } - AddressSpace = &Process->VadRoot; - } - else - { - AddressSpace = MmGetKernelAddressSpace(); - } + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_QUERY_INFORMATION, + NULL, + UserMode, + (PVOID*)(&Process), + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT("NtQueryVirtualMemory() = %x\n",Status); + return(Status); + } + + AddressSpace = &Process->VadRoot; + MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); switch(VirtualMemoryInformationClass) @@ -572,11 +567,7 @@ } MmUnlockAddressSpace(AddressSpace); - if (Address < MmSystemRangeStart) - { - ASSERT(Process); - ObDereferenceObject(Process); - } + ObDereferenceObject(Process); return Status; }

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