Changeset 193


Ignore:
Timestamp:
Jul 6, 2013, 1:05:31 PM (8 years ago)
Author:
roman
Message:

Cosmetic, moved binaries, added graph list and clipboard copy property sheet

Location:
trunk/DirectShowSpy
Files:
22 added
2 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/DirectShowSpy

    • Property svn:ignore
      •  

        old new  
        44Setup
        55*.aps
         6*.sdf
    • Property svn:global-ignores set to
      ipch
  • trunk/DirectShowSpy/Configuration.cpp

    r147 r193  
    11////////////////////////////////////////////////////////////
    2 // Copyright (C) Roman Ryltsov, 2008-2011
     2// Copyright (C) Roman Ryltsov, 2008-2013
    33// Created by Roman Ryltsov roman@alax.info
    4 //
    5 // $Id$
    64
    75#include "stdafx.h"
     
    1311
    1412#if defined(_WIN64)
    15 extern "C" __declspec(dllexport)
     13        extern "C" __declspec(dllexport)
    1614#else
    17 #pragma comment(linker, "/EXPORT:DoRegistrationPropertySheetModal=_DoRegistrationPropertySheetModal@0,PRIVATE")
    18 extern "C" // __declspec(dllexport)
     15        #pragma comment(linker, "/EXPORT:DoRegistrationPropertySheetModal=_DoRegistrationPropertySheetModal@0,PRIVATE")
     16        extern "C" // __declspec(dllexport)
    1917#endif // defined(_WIN64)
    2018
  • trunk/DirectShowSpy/DirectShowSpy.idl

    r144 r193  
    11////////////////////////////////////////////////////////////
    2 // Copyright (C) Roman Ryltsov, 2008-2011
     2// Copyright (C) Roman Ryltsov, 2008-2013
    33// Created by Roman Ryltsov roman@alax.info
    4 //
    5 // $Id$
    64
    75import "oaidl.idl";
  • trunk/DirectShowSpy/DirectShowSpy.rc

    r171 r193  
    1919
    2020/////////////////////////////////////////////////////////////////////////////
    21 // English (U.S.) resources
     21// English (United States) resources
    2222
    2323#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
    24 #ifdef _WIN32
    2524LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
    2625#pragma code_page(1252)
    27 #endif //_WIN32
    2826
    2927#ifdef APSTUDIO_INVOKED
     
    35331 TEXTINCLUDE
    3634BEGIN
    37     "resource.h\0"
     35    "resource.h\r\n"
    3836END
    3937
     
    4543    "#include ""winres.h""\r\n"
    4644    "#include ""atlres.h""\r\n"
    47     "#include ""rores.rc""\r\0"
     45    "#include ""rores.rc""\r\n"
    4846END
    4947
    50483 TEXTINCLUDE
    5149BEGIN
    52     "1 TYPELIB ""DirectShowSpy.tlb""\r\0"
     50    "1 TYPELIB ""DirectShowSpy.tlb""\r\n"
    5351END
    5452
     
    6260
    6361VS_VERSION_INFO VERSIONINFO
    64  FILEVERSION  1, 0, 0, 831
     62 FILEVERSION  1, 0, 0, 941
    6563 PRODUCTVERSION 1,0,0,1
    6664 FILEFLAGSMASK 0x3fL
     
    8179            VALUE "CompanyName", "Roman Ryltsov"
    8280            VALUE "FileDescription", "Alax.Info DirectShow Spy Module"
    83             VALUE "FileVersion",  "1, 0, 0, 831\0"
     81            VALUE "FileVersion",  "1, 0, 0, 941\0"
    8482            VALUE "InternalName", "DirectShowSpy.dll"
    85             VALUE "LegalCopyright", "Copyright © Alax.Info, Roman Ryltsov, 2008-2011"
     83            VALUE "LegalCopyright", "Copyright © Alax.Info, Roman Ryltsov, 2008-2013"
    8684            VALUE "OLESelfRegister", "Yes"
    8785            VALUE "OriginalFilename", "DirectShowSpy.dll"
     
    143141    LTEXT           "Email:",IDC_ABOUT_EMAILTITLE,60,72,20,8
    144142    LTEXT           "<A HREF=""mailto:support@alax.info"">support@alax.info</A>",IDC_ABOUT_EMAIL,108,72,162,8,NOT WS_GROUP | WS_TABSTOP
    145     LTEXT           "Copyright © Alax.Info, Roman Ryltsov, 2008-2011",IDC_ABOUT_COPYRIGHT,60,84,210,8,SS_NOPREFIX
     143    LTEXT           "Copyright © Alax.Info, Roman Ryltsov, 2008-2013",IDC_ABOUT_COPYRIGHT,60,84,210,8,SS_NOPREFIX
    146144    DEFPUSHBUTTON   "OK",1,220,102,50,14
    147145    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,6,122,267,1
     
    234232END
    235233
     234IDD_FILTERGRAPHLIST_LIST_PROPERTYPAGE DIALOGEX 0, 0, 227, 200
     235STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
     236EXSTYLE WS_EX_CONTROLPARENT
     237FONT 8, "MS Shell Dlg", 400, 0, 0x0
     238BEGIN
     239    CONTROL         "",IDC_FILTERGRAPHLIST_LIST_GRAPH,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_EDITLABELS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,6,6,215,168
     240    PUSHBUTTON      "&Refresh",IDC_FILTERGRAPHLIST_LIST_REFRESH,6,180,50,14
     241    PUSHBUTTON      "C&heck",IDC_FILTERGRAPHLIST_LIST_CHECK,60,180,50,14
     242    PUSHBUTTON      "&Copy",IDC_FILTERGRAPHLIST_LIST_COPYTOCLIPBOARD,114,180,50,14
     243END
     244
    236245
    237246/////////////////////////////////////////////////////////////////////////////
     
    241250
    242251#ifdef APSTUDIO_INVOKED
    243 GUIDELINES DESIGNINFO
    244 BEGIN
     252GUIDELINES DESIGNINFO
     253BEGIN
     254    IDD_ABOUT, DIALOG
     255    BEGIN
     256    END
     257
    245258    IDD_GRAPHBUILDERCALLBACK_GRAPH_PROPERTYPAGE, DIALOG
    246259    BEGIN
     
    258271        BOTTOMMARGIN, 193
    259272    END
     273
     274    IDD_FILTERGRAPHLIST_LIST_PROPERTYPAGE, DIALOG
     275    BEGIN
     276        LEFTMARGIN, 6
     277        RIGHTMARGIN, 221
     278        TOPMARGIN, 6
     279        BOTTOMMARGIN, 193
     280    END
    260281END
    261282#endif    // APSTUDIO_INVOKED
     
    267288//
    268289
    269 STRINGTABLE 
     290STRINGTABLE
    270291BEGIN
    271292    IDS_PROJNAME            "Alax.Info DirectShow Spy"
     293END
     294
     295STRINGTABLE
     296BEGIN
    272297    IDR_FILTERGRAPHSPY      "\n\nAlax.Info DirectShow Filter Graph Spy\n"
    273298    IDR_NOTHREADFILTERGRAPHSPY
     
    278303END
    279304
    280 STRINGTABLE 
     305STRINGTABLE
    281306BEGIN
    282307    IDS_REGISTRATION_PROPERTYSHEETCAPTION "Registration"
     
    284309END
    285310
    286 STRINGTABLE 
     311STRINGTABLE
    287312BEGIN
    288313    IDD_REGISTRATION_PROPPAGEREGISTRATION_PROPERTYPAGE "proppage.dll"
     314END
     315
     316STRINGTABLE
     317BEGIN
    289318    IDD_REGISTRATION_EVRPROPREGISTRATION_PROPERTYPAGE "evrprop.dll"
    290319END
    291320
    292 STRINGTABLE 
     321STRINGTABLE
    293322BEGIN
    294323    IDC_REGISTRATION_REGISTRATION_STATUS "Not Registered, Registered"
    295324END
    296325
    297 STRINGTABLE 
     326STRINGTABLE
    298327BEGIN
    299328    IDC_REGISTRATION_PROPPAGEREGISTRATION_STATUS "Not Registered, Registered"
     329END
     330
     331STRINGTABLE
     332BEGIN
    300333    IDC_REGISTRATION_EVRPROPREGISTRATION_STATUS "Not Registered, Registered"
    301334END
    302335
    303 STRINGTABLE
    304 BEGIN
     336STRINGTABLE
     337BEGIN
     338    IDS_GRAPHBUILDERCALLBACK_GRAPH_PROPERTYSHEETCAPTION
     339                            "Intelligent Connect Log"
    305340    IDD_GRAPHBUILDERCALLBACK_GRAPH_PROPERTYPAGE "Filter Graphs"
     341END
     342
     343STRINGTABLE
     344BEGIN
    306345    IDC_GRAPHBUILDERCALLBACK_GRAPH_GRAPH
    307346                            "v, 1\nx, 0x420, 0x420\nc, Time, 150, -1\nc, Process, 90, 1\nc, Name, 120, 2\nc, Directory, 360, 3\n"
    308 END
    309 
    310 STRINGTABLE
    311 BEGIN
    312     IDS_GRAPHBUILDERCALLBACK_GRAPH_PROPERTYSHEETCAPTION
    313                             "Intelligent Connect Log"
    314 END
    315 
    316 STRINGTABLE
     347    IDC_GRAPHBUILDERCALLBACK_GRAPH_LOG
     348                            "v, 1\nx, 0x420, 0x420\nc, Time, 150, -1\nc, Event, 120, 1\nc, Moniker Name, 210, 2\nc, Filter Name, 210, 3\nc, Application Result, 150, 4\n"
     349END
     350
     351STRINGTABLE
     352BEGIN
     353    IDS_FILTERGRAPHLIST_LIST_PROPERTYSHEETCAPTION "Running Filter Graph List"
     354    IDD_FILTERGRAPHLIST_LIST_PROPERTYPAGE "Filter Graphs"
     355    IDC_FILTERGRAPHLIST_LIST_GRAPH
     356                            "v, 1\nx, 0x420, 0x420\nc, ""Process, Instance"", 150, -1\nc, Process Name, 120, 1\nc, Creation Time, 90, 2\nc, Filters, 60, 3\nc, State, 60, 4\nc, Process Image Directory, 420, 5\n"
     357END
     358
     359STRINGTABLE
    317360BEGIN
    318361    IDC_ABOUT_COPYRIGHTWARNING
     
    320363END
    321364
    322 STRINGTABLE
    323 BEGIN
    324     IDC_GRAPHBUILDERCALLBACK_GRAPH_LOG
    325                             "v, 1\nx, 0x420, 0x420\nc, Time, 150, -1\nc, Event, 120, 1\nc, Moniker Name, 210, 2\nc, Filter Name, 210, 3\nc, Application Result, 150, 4\n"
    326 END
    327 
    328 #endif    // English (U.S.) resources
     365#endif    // English (United States) resources
    329366/////////////////////////////////////////////////////////////////////////////
    330367
  • trunk/DirectShowSpy/DirectShowSpy.sln

    r147 r193  
    11
    2 Microsoft Visual Studio Solution File, Format Version 10.00
    3 # Visual Studio 2008
    4 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectShowSpy", "DirectShowSpy.vcproj", "{1A5DA4E5-ED09-476A-9A42-538D0DDA3FB9}"
     2Microsoft Visual Studio Solution File, Format Version 12.00
     3# Visual Studio 2012
     4Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectShowSpy", "DirectShowSpy.vcxproj", "{1A5DA4E5-ED09-476A-9A42-538D0DDA3FB9}"
    55EndProject
    66Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectShowSpyPS", "DirectShowSpyPS.vcproj", "{E0A3323D-478E-4046-909A-AD12AD399A68}"
     
    99        EndProjectSection
    1010EndProject
    11 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BdaHooks", "BdaHooks\BdaHooks.vcproj", "{42B74EE4-45E2-44E8-B3EE-6061DBCDD86D}"
    12         ProjectSection(ProjectDependencies) = postProject
    13                 {1A5DA4E5-ED09-476A-9A42-538D0DDA3FB9} = {1A5DA4E5-ED09-476A-9A42-538D0DDA3FB9}
    14         EndProjectSection
     11Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BdaHooks", "BdaHooks\BdaHooks.vcxproj", "{42B74EE4-45E2-44E8-B3EE-6061DBCDD86D}"
    1512EndProject
    1613Global
  • trunk/DirectShowSpy/DirectShowSpy_i.c

    r171 r193  
    66
    77
    8  /* File created by MIDL compiler version 7.00.0500 */
    9 /* at Thu Feb 28 12:49:34 2013
     8 /* File created by MIDL compiler version 7.00.0555 */
     9/* at Sat Jul 06 22:59:33 2013
    1010 */
    11 /* Compiler settings for .\DirectShowSpy.idl:
    12     Oicf, W1, Zp8, env=Win32 (32b run)
     11/* Compiler settings for DirectShowSpy.idl:
     12    Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555
    1313    protocol : dce , ms_ext, c_ext, robust
    14     error checks: stub_data
     14    error checks: allocation ref bounds_check enum stub_data
    1515    VC __declspec() decoration level:
    1616         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
    1717         DECLSPEC_UUID(), MIDL_INTERFACE()
    1818*/
    19 //@@MIDL_FILE_HEADING(  )
     19/* @@MIDL_FILE_HEADING(  ) */
    2020
    2121#pragma warning( disable: 4049 )  /* more than 64k source lines */
  • trunk/DirectShowSpy/DirectShowSpy_i.h

    r171 r193  
    44
    55
    6  /* File created by MIDL compiler version 7.00.0500 */
    7 /* at Thu Feb 28 12:49:34 2013
     6 /* File created by MIDL compiler version 7.00.0555 */
     7/* at Sat Jul 06 22:59:33 2013
    88 */
    9 /* Compiler settings for .\DirectShowSpy.idl:
    10     Oicf, W1, Zp8, env=Win32 (32b run)
     9/* Compiler settings for DirectShowSpy.idl:
     10    Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555
    1111    protocol : dce , ms_ext, c_ext, robust
    12     error checks: stub_data
     12    error checks: allocation ref bounds_check enum stub_data
    1313    VC __declspec() decoration level:
    1414         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
    1515         DECLSPEC_UUID(), MIDL_INTERFACE()
    1616*/
    17 //@@MIDL_FILE_HEADING(  )
     17/* @@MIDL_FILE_HEADING(  ) */
    1818
    1919#pragma warning( disable: 4049 )  /* more than 64k source lines */
     
    165165            ISpy * This,
    166166            /* [in] */ REFIID riid,
    167             /* [iid_is][out] */
     167            /* [annotation][iid_is][out] */
    168168            __RPC__deref_out  void **ppvObject);
    169169       
     
    276276            IFilterMapperSpy * This,
    277277            /* [in] */ REFIID riid,
    278             /* [iid_is][out] */
     278            /* [annotation][iid_is][out] */
    279279            __RPC__deref_out  void **ppvObject);
    280280       
     
    387387            ISystemDeviceEnumeratorSpy * This,
    388388            /* [in] */ REFIID riid,
    389             /* [iid_is][out] */
     389            /* [annotation][iid_is][out] */
    390390            __RPC__deref_out  void **ppvObject);
    391391       
     
    534534            IFilterGraphAddRemoveHook * This,
    535535            /* [in] */ REFIID riid,
    536             /* [iid_is][out] */
     536            /* [annotation][iid_is][out] */
    537537            __RPC__deref_out  void **ppvObject);
    538538       
     
    674674            IFilterGraphConnectHook * This,
    675675            /* [in] */ REFIID riid,
    676             /* [iid_is][out] */
     676            /* [annotation][iid_is][out] */
    677677            __RPC__deref_out  void **ppvObject);
    678678       
     
    804804            IFilterGraphStateControlHook * This,
    805805            /* [in] */ REFIID riid,
    806             /* [iid_is][out] */
     806            /* [annotation][iid_is][out] */
    807807            __RPC__deref_out  void **ppvObject);
    808808       
  • trunk/DirectShowSpy/DirectShowSpy_p.c

    r171 r193  
    44
    55
    6  /* File created by MIDL compiler version 7.00.0500 */
    7 /* at Thu Feb 28 12:49:34 2013
     6 /* File created by MIDL compiler version 7.00.0555 */
     7/* at Sat Jul 06 22:59:33 2013
    88 */
    9 /* Compiler settings for .\DirectShowSpy.idl:
    10     Oicf, W1, Zp8, env=Win32 (32b run)
     9/* Compiler settings for DirectShowSpy.idl:
     10    Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555
    1111    protocol : dce , ms_ext, c_ext, robust
    12     error checks: stub_data
     12    error checks: allocation ref bounds_check enum stub_data
    1313    VC __declspec() decoration level:
    1414         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
    1515         DECLSPEC_UUID(), MIDL_INTERFACE()
    1616*/
    17 //@@MIDL_FILE_HEADING(  )
     17/* @@MIDL_FILE_HEADING(  ) */
    1818
    1919#if !defined(_M_IA64) && !defined(_M_AMD64)
     
    4545#ifndef __RPCPROXY_H_VERSION__
    4646#error this stub requires an updated version of <rpcproxy.h>
    47 #endif // __RPCPROXY_H_VERSION__
     47#endif /* __RPCPROXY_H_VERSION__ */
    4848
    4949
     
    7575
    7676
    77 static RPC_SYNTAX_IDENTIFIER  _RpcTransferSyntax =
     77static const RPC_SYNTAX_IDENTIFIER  _RpcTransferSyntax =
    7878{{0x8A885D04,0x1CEB,0x11C9,{0x9F,0xE8,0x08,0x00,0x2B,0x10,0x48,0x60}},{2,0}};
    7979
     
    111111
    112112#if !(TARGET_IS_NT50_OR_LATER)
    113 #error You need a Windows 2000 or later to run this stub because it uses these features:
     113#error You need Windows 2000 or later to run this stub because it uses these features:
    114114#error   /robust command line switch.
    115115#error However, your C/C++ compilation flags indicate you intend to run this app on earlier systems.
     
    187187    IUnknown_AddRef_Proxy,
    188188    IUnknown_Release_Proxy ,
    189     0 /* (void *) (INT_PTR) -1 /* IDispatch::GetTypeInfoCount */ ,
    190     0 /* (void *) (INT_PTR) -1 /* IDispatch::GetTypeInfo */ ,
    191     0 /* (void *) (INT_PTR) -1 /* IDispatch::GetIDsOfNames */ ,
     189    0 /* IDispatch::GetTypeInfoCount */ ,
     190    0 /* IDispatch::GetTypeInfo */ ,
     191    0 /* IDispatch::GetIDsOfNames */ ,
    192192    0 /* IDispatch_Invoke_Proxy */
    193193};
     
    253253    IUnknown_AddRef_Proxy,
    254254    IUnknown_Release_Proxy ,
    255     0 /* (void *) (INT_PTR) -1 /* IDispatch::GetTypeInfoCount */ ,
    256     0 /* (void *) (INT_PTR) -1 /* IDispatch::GetTypeInfo */ ,
    257     0 /* (void *) (INT_PTR) -1 /* IDispatch::GetIDsOfNames */ ,
     255    0 /* IDispatch::GetTypeInfoCount */ ,
     256    0 /* IDispatch::GetTypeInfo */ ,
     257    0 /* IDispatch::GetIDsOfNames */ ,
    258258    0 /* IDispatch_Invoke_Proxy */
    259259};
     
    319319    IUnknown_AddRef_Proxy,
    320320    IUnknown_Release_Proxy ,
    321     0 /* (void *) (INT_PTR) -1 /* IDispatch::GetTypeInfoCount */ ,
    322     0 /* (void *) (INT_PTR) -1 /* IDispatch::GetTypeInfo */ ,
    323     0 /* (void *) (INT_PTR) -1 /* IDispatch::GetIDsOfNames */ ,
     321    0 /* IDispatch::GetTypeInfoCount */ ,
     322    0 /* IDispatch::GetTypeInfo */ ,
     323    0 /* IDispatch::GetIDsOfNames */ ,
    324324    0 /* IDispatch_Invoke_Proxy */
    325325};
     
    354354    0,
    355355    DirectShowSpy__MIDL_TypeFormatString.Format,
    356     0, /* -error bounds_check flag */
     356    1, /* -error bounds_check flag */
    357357    0x50002, /* Ndr library version */
    358358    0,
    359     0x70001f4, /* MIDL Version 7.0.500 */
     359    0x700022b, /* MIDL Version 7.0.555 */
    360360    0,
    361361    0,
     
    367367    };
    368368
    369 const CInterfaceProxyVtbl * _DirectShowSpy_ProxyVtblList[] =
     369const CInterfaceProxyVtbl * const _DirectShowSpy_ProxyVtblList[] =
    370370{
    371371    ( CInterfaceProxyVtbl *) &_ISpyProxyVtbl,
     
    375375};
    376376
    377 const CInterfaceStubVtbl * _DirectShowSpy_StubVtblList[] =
     377const CInterfaceStubVtbl * const _DirectShowSpy_StubVtblList[] =
    378378{
    379379    ( CInterfaceStubVtbl *) &_ISpyStubVtbl,
     
    391391};
    392392
    393 const IID *  _DirectShowSpy_BaseIIDList[] =
     393const IID *  const _DirectShowSpy_BaseIIDList[] =
    394394{
    395395    &IID_IDispatch,
  • trunk/DirectShowSpy/FilterGraphSpy.cpp

    r147 r193  
    11////////////////////////////////////////////////////////////
    2 // Copyright (C) Roman Ryltsov, 2008-2011
     2// Copyright (C) Roman Ryltsov, 2008-2013
    33// Created by Roman Ryltsov roman@alax.info
    4 //
    5 // $Id$
    64
    75#include "stdafx.h"
    86#include "resource.h"
    9 #include "FilterGraphSpy.h"
    10 #include "FilterMapperSpy.h"
    11 #include "GraphBuilderCallbackPropertySheet.h"
    12 //#include "SystemDeviceEnumeratorSpy.h"
    137
    148////////////////////////////////////////////////////////////
    15 // CGraphBuilderCallbackPropertySheet
     9// DoGraphBuilderCallbackPropertySheetModal
     10
     11#include "GraphBuilderCallbackPropertySheet.h"
    1612
    1713#if defined(_WIN64)
    18 extern "C" __declspec(dllexport)
     14        extern "C" __declspec(dllexport)
    1915#else
    20 #pragma comment(linker, "/EXPORT:DoGraphBuilderCallbackPropertySheetModal=_DoGraphBuilderCallbackPropertySheetModal@0,PRIVATE")
    21 extern "C" // __declspec(dllexport)
     16        #pragma comment(linker, "/EXPORT:DoGraphBuilderCallbackPropertySheetModal=_DoGraphBuilderCallbackPropertySheetModal@0,PRIVATE")
     17        extern "C" // __declspec(dllexport)
    2218#endif // defined(_WIN64)
    2319
     
    3733        return S_OK;
    3834}
     35
     36////////////////////////////////////////////////////////////
     37// DoFilterGraphListPropertySheetModal
     38
     39#include "FilterGraphList.h"
     40
     41#if defined(_WIN64)
     42        extern "C" __declspec(dllexport)
     43#else
     44        #pragma comment(linker, "/EXPORT:DoFilterGraphListPropertySheetModal=_DoFilterGraphListPropertySheetModal@0,PRIVATE")
     45        extern "C" // __declspec(dllexport)
     46#endif // defined(_WIN64)
     47
     48HRESULT STDMETHODCALLTYPE DoFilterGraphListPropertySheetModal() throw()
     49{
     50        _ATLTRY
     51        {
     52                CSingleThreadedApartment SingleThreadedApartment;
     53                _W(AtlInitCommonControls(ICC_WIN95_CLASSES | ICC_COOL_CLASSES | ICC_STANDARD_CLASSES));
     54                CFilterGraphListPropertySheet PropertySheet;
     55                PropertySheet.DoModal(GetActiveWindow());
     56        }
     57        _ATLCATCH(Exception)
     58        {
     59                _C(Exception);
     60        }
     61        return S_OK;
     62}
     63
  • trunk/DirectShowSpy/GraphBuilderCallbackPropertySheet.h

    r147 r193  
    11////////////////////////////////////////////////////////////
    2 // Copyright (C) Roman Ryltsov, 2008-2011
     2// Copyright (C) Roman Ryltsov, 2008-2013
    33// Created by Roman Ryltsov roman@alax.info
    4 //
    5 // $Id$
    64
    75#pragma once
     
    108#include <atlsplit.h>
    119#include "rofiles.h"
     10#include "FilterGraphSpy.h"
    1211#include "AboutDialog.h"
    1312
     
    13261325                m_GraphPropertyPage(this)
    13271326        {
    1328                 #pragma region Default Path
    13291327                if(!_tcslen(m_sPath))
    1330                 {
    1331                         TCHAR pszDirectory[MAX_PATH] = { 0 };
    1332                         _W(GetWindowsDirectory(pszDirectory, DIM(pszDirectory)));
    1333                         #if defined(_TRACE) && _TRACE
    1334                                 _W(StripToRoot(pszDirectory));
    1335                         #endif // defined(_TRACE) && _TRACE
    1336                         if(GetOsVersion() >= 0x00060000) // Windows Vista+
    1337                         {
    1338                                 _W(SHGetSpecialFolderPath(m_hWnd, pszDirectory, CSIDL_COMMON_APPDATA, FALSE));
    1339                                 AddBackslash(pszDirectory);
    1340                         }
    1341                         TCHAR pszPath[MAX_PATH] = { 0 };
    1342                         _W(GetModuleFileName(_AtlBaseModule.GetModuleInstance(), pszPath, DIM(pszPath)));
    1343                         LPTSTR pszFileName = FindFileName(pszPath);
    1344                         _W(RenameExtension(pszFileName, _T(".log")));
    1345                         m_sPath.Combine(pszDirectory, pszFileName);
    1346                         _Z5(atlTraceGeneral, 5, _T("m_sPath \"%s\"\n"), m_sPath);
    1347                 }
    1348                 #pragma endregion
     1328                        m_sPath = CDebugTraceBase::GetFilePath();
    13491329                #if _DEVELOPMENT && FALSE
    13501330                        static LPCTSTR g_pszPath = _T("D:\\Projects\\A&H\\LuxRiot\\_Issues\\45 Sanyo XP Issues\\DirectShowSpy.log");
     
    13591339                SetIcon(AtlLoadIconImage(IDI_MODULE, LR_DEFAULTCOLOR, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON)), TRUE);
    13601340                SetIcon(AtlLoadIconImage(IDI_MODULE, LR_DEFAULTCOLOR, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON)), FALSE);
    1361                 #pragma region Indication of Bitness
     1341                #pragma region Bitness Indication
    13621342                CString sCaption;
    13631343                _W(GetWindowText(sCaption));
  • trunk/DirectShowSpy/resource.h

    r155 r193  
    55#define IDI_MODULE                      10
    66#define IDR_MODULE                      11
    7 #define IDI_PRIVATE_INFORMATION 70
    8 #define IDI_PRIVATE_WARNING     71
     7#define IDI_PRIVATE_INFORMATION         70
     8#define IDI_PRIVATE_WARNING             71
    99#define IDI_LISTVIEW_SUCCESS            80
    1010#define IDI_LISTVIEW_FAILURE            81
    1111#define IDS_PROJNAME                    100
    12 #define IDR_FILTERGRAPHSPY              102
    13 #define IDR_NOTHREADFILTERGRAPHSPY      103
    14 #define IDR_FILTERMAPPERSPY             104
    15 #define IDR_SYSTEMDEVICEENUMERATORSPY   105
    16 #define IDC_PROGRESS                    202
     12#define IDR_FILTERGRAPHSPY              200
     13#define IDR_NOTHREADFILTERGRAPHSPY      201
     14#define IDR_FILTERMAPPERSPY             202
     15#define IDR_SYSTEMDEVICEENUMERATORSPY   203
     16#define IDC_BUTTON1                     217
    1717#define IDS_REGISTRATION_PROPERTYSHEETCAPTION 900
    1818#define IDD_REGISTRATION_REGISTRATION_PROPERTYPAGE 910
     
    2626#define IDC_REGISTRATION_REGISTRATION_USERUNREGISTER 933
    2727#define IDC_REGISTRATION_REGISTRATION_USERNOTE 934
    28 #define IDS_GRAPHBUILDERCALLBACK_GRAPH_PROPERTYSHEETCAPTION 1000
    29 #define IDD_GRAPHBUILDERCALLBACK_GRAPH_PROPERTYPAGE 1100
    30 #define IDC_GRAPHBUILDERCALLBACK_GRAPH_INTRODUCTION 1101
    31 #define IDC_GRAPHBUILDERCALLBACK_GRAPH_SPLITTER 1102
    32 #define IDC_GRAPHBUILDERCALLBACK_GRAPH_GRAPH 1103
    33 #define IDC_GRAPHBUILDERCALLBACK_GRAPH_LOG 1104
    34 #define IDC_GRAPHBUILDERCALLBACK_GRAPH_COPYTOCLIPBOARD 1105
    35 #define IDC_GRAPHBUILDERCALLBACK_GRAPH_PROGRESS 1106
     28#define IDS_GRAPHBUILDERCALLBACK_GRAPH_PROPERTYSHEETCAPTION 1100
     29#define IDD_GRAPHBUILDERCALLBACK_GRAPH_PROPERTYPAGE 1101
     30#define IDC_GRAPHBUILDERCALLBACK_GRAPH_INTRODUCTION 1110
     31#define IDC_GRAPHBUILDERCALLBACK_GRAPH_SPLITTER 1111
     32#define IDC_GRAPHBUILDERCALLBACK_GRAPH_GRAPH 1112
     33#define IDC_GRAPHBUILDERCALLBACK_GRAPH_LOG 1113
     34#define IDC_GRAPHBUILDERCALLBACK_GRAPH_COPYTOCLIPBOARD 1114
     35#define IDC_GRAPHBUILDERCALLBACK_GRAPH_PROGRESS 1115
    3636#define IDI_GRAPHBUILDERCALLBACK_LISTVIEW_ADDFILTER 1120
    3737#define IDI_GRAPHBUILDERCALLBACK_LISTVIEW_REMOVEFILTER 1121
     
    5858#define IDC_REGISTRATION_EVRPROPREGISTRATION_USERUNREGISTER 1333
    5959#define IDC_REGISTRATION_EVRPROPREGISTRATION_USERNOTE 1334
     60#define IDS_FILTERGRAPHLIST_LIST_PROPERTYSHEETCAPTION 1400
     61#define IDD_FILTERGRAPHLIST_LIST_PROPERTYPAGE 1401
     62#define IDC_FILTERGRAPHLIST_LIST_GRAPH  1405
     63#define IDC_FILTERGRAPHLIST_LIST_REFRESH 1410
     64#define IDC_FILTERGRAPHLIST_LIST_CHECK  1411
     65#define IDC_FILTERGRAPHLIST_LIST_COPYTOCLIPBOARD 1412
    6066#define IDD_ABOUT                       29900
    6167#define IDC_ABOUT_ICON                  29901
     
    7682#define _APS_NEXT_RESOURCE_VALUE        209
    7783#define _APS_NEXT_COMMAND_VALUE         32768
    78 #define _APS_NEXT_CONTROL_VALUE         212
     84#define _APS_NEXT_CONTROL_VALUE         218
    7985#define _APS_NEXT_SYMED_VALUE           103
    8086#endif
Note: See TracChangeset for help on using the changeset viewer.