Changeset 519 for trunk/DirectShowSpy/FilterGraphSpy.h

Timestamp:

Sep 24, 2015, 10:17:45 AM (8 years ago)

Author:

roman

Message:

Fixed problem with RtlCaptureContext? API call possibly crashing hosting process, also stack walk enabled for x64

File:

• trunk/DirectShowSpy/FilterGraphSpy.h (modified) (1 diff)

trunk/DirectShowSpy/FilterGraphSpy.h

@@ -1540 +1540 @@
         {
                 _Z4(atlTraceCOM, 4, _T("nEventCode %s, nParameter1 0x%p, nParameter2 0x%p\n"), _FilterGraphHelper::FormatEventCode(nEventCode), nParameter1, nParameter2);
-                #if defined(_M_IX86)
-                        // WARN: Guarding section around might be preventing from walknig frame up the stack
+                //#if defined(_M_IX86)
+                        // WARN: Guarding section around might be preventing from walking frame up the stack
+                        // WARN: No guarding section however might cause hosting application crash, within RtlCaptureContext API unfortunately
                         if(nEventCode == EC_ERRORABORT) // || nEventCode == EC_VIDEO_SIZE_CHANGED)
-                        {
-                                CONTEXT ThreadContext = { CONTEXT_FULL };
-                                GetCurrentThreadContext(&ThreadContext);
-                                CDebugTraceCallStack::TraceCallStack(ThreadContext, 32); //(nEventCode == EC_ERRORABORT) ? 32 : 8);
-                        }
-                #endif // defined(_M_IX86)
+                                _ATLTRY
+                                {
+                                        CONTEXT ThreadContext = { CONTEXT_FULL };
+                                        GetCurrentThreadContext(&ThreadContext);
+                                        CDebugTraceCallStack::TraceCallStack(ThreadContext, 32); //(nEventCode == EC_ERRORABORT) ? 32 : 8);
+                                }
+                                _ATLCATCHALL()
+                                {
+                                        _Z_EXCEPTION();
+                                }
+                //#endif // defined(_M_IX86)
                 if(!m_pInnerMediaEventSink)
                         return S_FALSE;