Changeset 147 for trunk


Ignore:
Timestamp:
Nov 22, 2012, 2:49:34 PM (11 years ago)
Author:
roman
Message:

COM registration UI

Location:
trunk/DirectShowSpy
Files:
9 added
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/DirectShowSpy

    • Property svn:ignore

      •  

        old new  
        33*.user
        44Setup
         5*.aps

  • trunk/DirectShowSpy/BdaHooks/BdaHooks.rc

    r144 r147  
    6363
    6464VS_VERSION_INFO VERSIONINFO
    65  FILEVERSION  1, 0, 0, 119
     65 FILEVERSION  1, 0, 0, 120
    6666 PRODUCTVERSION 1,0,0,1
    6767 FILEFLAGSMASK 0x3fL
    … …  
    8282            VALUE "CompanyName", "Roman Ryltsov"
    8383            VALUE "FileDescription", "Alax.Info DirectShow Filter Graph Spy Module"
    84             VALUE "FileVersion",  "1, 0, 0, 119\0"
     84            VALUE "FileVersion",  "1, 0, 0, 120\0"
    8585            VALUE "LegalCopyright", "Copyright © Alax.Info, Roman Ryltsov, 2008-2009"
    8686            VALUE "OLESelfRegister", "Yes"

  • trunk/DirectShowSpy/DirectShowSpy.rc

    r144 r147  
    6262
    6363VS_VERSION_INFO VERSIONINFO
    64  FILEVERSION  1, 0, 0, 708
     64 FILEVERSION  1, 0, 0, 796
    6565 PRODUCTVERSION 1,0,0,1
    6666 FILEFLAGSMASK 0x3fL
    … …  
    8181            VALUE "CompanyName", "Roman Ryltsov"
    8282            VALUE "FileDescription", "Alax.Info DirectShow Spy Module"
    83             VALUE "FileVersion",  "1, 0, 0, 708\0"
     83            VALUE "FileVersion",  "1, 0, 0, 796\0"
    8484            VALUE "InternalName", "DirectShowSpy.dll"
    8585            VALUE "LegalCopyright", "Copyright © Alax.Info, Roman Ryltsov, 2008-2011"
    … …  
    116116// remains consistent on all systems.
    117117IDI_MODULE              ICON                    "Module.ico"
     118IDI_PRIVATE_INFORMATION ICON                    "Information.ico"
     119IDI_PRIVATE_WARNING     ICON                    "Exclamation.ico"
    118120IDI_LISTVIEW_SUCCESS    ICON                    "Success.ico"
    119121IDI_LISTVIEW_FAILURE    ICON                    "Failure.ico"
    … …  
    160162END
    161163
     164IDD_REGISTRATION_REGISTRATION_PROPERTYPAGE DIALOGEX 0, 0, 227, 200
     165STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
     166EXSTYLE WS_EX_CONTROLPARENT
     167FONT 8, "MS Shell Dlg", 400, 0, 0x0
     168BEGIN
     169    LTEXT           "Use controls below to review current COM registration status of DirectShow Spy, and register or unregister the library.",IDC_STATIC,6,6,215,18
     170    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,6,36,216,20
     171    LTEXT           "System Registration ",IDC_STATIC,12,32,67,8
     172    LTEXT           "Status: ",IDC_STATIC,12,48,26,8
     173    EDITTEXT        IDC_REGISTRATION_REGISTRATION_STATUS,48,48,72,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     174    LTEXT           "Path: ",IDC_STATIC,12,60,20,8
     175    EDITTEXT        IDC_REGISTRATION_REGISTRATION_PATH,48,60,174,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     176    PUSHBUTTON      "&Register",IDC_REGISTRATION_REGISTRATION_REGISTER,48,78,50,14
     177    PUSHBUTTON      "&Unregister",IDC_REGISTRATION_REGISTRATION_UNREGISTER,102,78,50,14
     178    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,6,106,215,1
     179    LTEXT           "Per-User Registration ",IDC_STATIC,12,102,72,8
     180    LTEXT           "Status: ",IDC_STATIC,12,118,26,8
     181    EDITTEXT        IDC_REGISTRATION_REGISTRATION_USERSTATUS,48,118,72,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     182    LTEXT           "Path: ",IDC_STATIC,12,130,20,8
     183    EDITTEXT        IDC_REGISTRATION_REGISTRATION_USERPATH,48,130,174,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     184    PUSHBUTTON      "Register",IDC_REGISTRATION_REGISTRATION_USERREGISTER,48,148,50,14
     185    PUSHBUTTON      "Unregister",IDC_REGISTRATION_REGISTRATION_USERUNREGISTER,102,148,50,14
     186END
     187
     188IDD_REGISTRATION_PROPPAGEREGISTRATION_PROPERTYPAGE DIALOGEX 0, 0, 227, 200
     189STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
     190EXSTYLE WS_EX_CONTROLPARENT
     191FONT 8, "MS Shell Dlg", 400, 0, 0x0
     192BEGIN
     193    LTEXT           "Use controls below to review current COM registration status of Windows SDK proppage.dll, and register or unregister the library.",IDC_STATIC,6,6,215,18
     194    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,6,36,216,20
     195    LTEXT           "System Registration ",IDC_STATIC,12,32,67,8
     196    LTEXT           "Status: ",IDC_STATIC,12,48,26,8
     197    EDITTEXT        IDC_REGISTRATION_PROPPAGEREGISTRATION_STATUS,48,48,72,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     198    LTEXT           "Path: ",IDC_STATIC,12,60,20,8
     199    EDITTEXT        IDC_REGISTRATION_PROPPAGEREGISTRATION_PATH,48,60,174,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     200    PUSHBUTTON      "&Register",IDC_REGISTRATION_PROPPAGEREGISTRATION_REGISTER,48,78,50,14
     201    PUSHBUTTON      "&Unregister",IDC_REGISTRATION_PROPPAGEREGISTRATION_UNREGISTER,102,78,50,14
     202    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ | NOT WS_VISIBLE,6,106,215,1
     203    LTEXT           "Per-User Registration ",IDC_STATIC,12,102,72,8,NOT WS_VISIBLE
     204    LTEXT           "Status: ",IDC_STATIC,12,118,26,8,NOT WS_VISIBLE
     205    EDITTEXT        IDC_REGISTRATION_PROPPAGEREGISTRATION_USERSTATUS,48,118,72,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
     206    LTEXT           "Path: ",IDC_STATIC,12,130,20,8,NOT WS_VISIBLE
     207    EDITTEXT        IDC_REGISTRATION_PROPPAGEREGISTRATION_USERPATH,48,130,174,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
     208    PUSHBUTTON      "Register",IDC_REGISTRATION_PROPPAGEREGISTRATION_USERREGISTER,48,148,50,14,NOT WS_VISIBLE
     209    PUSHBUTTON      "Unregister",IDC_REGISTRATION_PROPPAGEREGISTRATION_USERUNREGISTER,102,148,50,14,NOT WS_VISIBLE
     210END
     211
    162212
    163213/////////////////////////////////////////////////////////////////////////////
    … …  
    176226        BOTTOMMARGIN, 193
    177227    END
     228
     229    IDD_REGISTRATION_REGISTRATION_PROPERTYPAGE, DIALOG
     230    BEGIN
     231        LEFTMARGIN, 6
     232        RIGHTMARGIN, 221
     233        TOPMARGIN, 6
     234        BOTTOMMARGIN, 193
     235    END
    178236END
    179237#endif    // APSTUDIO_INVOKED
    … …  
    192250                            "\n\nAlax.Info DirectShow Filter Graph (No Thread) Spy\n"
    193251    IDR_FILTERMAPPERSPY     "\n\nAlax.Info DirectShow Filter Mapper Spy\n"
    194         IDR_SYSTEMDEVICEENUMERATORSPY "\n\nAlax.Info DirectShow System Device Enumerator Spy\n"
     252    IDR_SYSTEMDEVICEENUMERATORSPY
     253                            "\n\nAlax.Info DirectShow System Device Enumerator Spy\n"
     254END
     255
     256STRINGTABLE
     257BEGIN
     258    IDS_REGISTRATION_PROPERTYSHEETCAPTION "Registration"
     259    IDD_REGISTRATION_REGISTRATION_PROPERTYPAGE "DirectShowSpy.dll"
     260END
     261
     262STRINGTABLE
     263BEGIN
     264    IDD_REGISTRATION_PROPPAGEREGISTRATION_PROPERTYPAGE "proppage.dll"
     265END
     266
     267STRINGTABLE
     268BEGIN
     269    IDC_REGISTRATION_REGISTRATION_STATUS "Not Registered, Registered"
     270END
     271
     272STRINGTABLE
     273BEGIN
     274    IDC_REGISTRATION_PROPPAGEREGISTRATION_STATUS "Not Registered, Registered"
    195275END
    196276

  • trunk/DirectShowSpy/DirectShowSpy.sln

    r95 r147  
    4141                {E0A3323D-478E-4046-909A-AD12AD399A68}.Release|x64.ActiveCfg = Release|Win32
    4242                {42B74EE4-45E2-44E8-B3EE-6061DBCDD86D}.Debug|Win32.ActiveCfg = Debug|Win32
    43                 {42B74EE4-45E2-44E8-B3EE-6061DBCDD86D}.Debug|Win32.Build.0 = Debug|Win32
    4443                {42B74EE4-45E2-44E8-B3EE-6061DBCDD86D}.Debug|x64.ActiveCfg = Debug|x64
    4544                {42B74EE4-45E2-44E8-B3EE-6061DBCDD86D}.Release Trace|Win32.ActiveCfg = Release|Win32

  • trunk/DirectShowSpy/DirectShowSpy.vcproj

    r144 r147  
    603603                        >
    604604                        <File
     605                                RelativePath=".\Configuration.cpp"
     606                                >
     607                        </File>
     608                        <File
    605609                                RelativePath=".\DirectShowSpy.cpp"
    606610                                >
    … …  
    743747                        </File>
    744748                        <File
     749                                RelativePath=".\Configuration.h"
     750                                >
     751                        </File>
     752                        <File
    745753                                RelativePath=".\dllmain.h"
    746754                                >
    … …  
    797805                        </File>
    798806                        <File
     807                                RelativePath=".\Exclamation.ico"
     808                                >
     809                        </File>
     810                        <File
    799811                                RelativePath=".\Failure.ico"
    800812                                >
    … …  
    806818                        <File
    807819                                RelativePath=".\FilterMapperSpy.rgs"
     820                                >
     821                        </File>
     822                        <File
     823                                RelativePath=".\GenericClass.rgs"
     824                                >
     825                        </File>
     826                        <File
     827                                RelativePath=".\Information.ico"
    808828                                >
    809829                        </File>

  • trunk/DirectShowSpy/DirectShowSpy_i.c

    r144 r147  
    77
    88 /* File created by MIDL compiler version 7.00.0500 */
    9 /* at Sat Nov 17 01:35:16 2012
     9/* at Fri Nov 23 00:35:10 2012
    1010 */
    1111/* Compiler settings for .\DirectShowSpy.idl:

  • trunk/DirectShowSpy/DirectShowSpy_i.h

    r144 r147  
    55
    66 /* File created by MIDL compiler version 7.00.0500 */
    7 /* at Sat Nov 17 01:35:16 2012
     7/* at Fri Nov 23 00:35:10 2012
    88 */
    99/* Compiler settings for .\DirectShowSpy.idl:

  • trunk/DirectShowSpy/DirectShowSpy_p.c

    r144 r147  
    55
    66 /* File created by MIDL compiler version 7.00.0500 */
    7 /* at Sat Nov 17 01:35:16 2012
     7/* at Fri Nov 23 00:35:10 2012
    88 */
    99/* Compiler settings for .\DirectShowSpy.idl:

  • trunk/DirectShowSpy/FilterGraphSpy.cpp

    r144 r147  
    1010#include "FilterMapperSpy.h"
    1111#include "GraphBuilderCallbackPropertySheet.h"
    12 #include "SystemDeviceEnumeratorSpy.h"
     12//#include "SystemDeviceEnumeratorSpy.h"
    1313
    1414////////////////////////////////////////////////////////////

  • trunk/DirectShowSpy/GraphBuilderCallbackPropertySheet.h

    r95 r147  
    13311331                        TCHAR pszDirectory[MAX_PATH] = { 0 };
    13321332                        _W(GetWindowsDirectory(pszDirectory, DIM(pszDirectory)));
    1333 #if defined(_TRACE) && _TRACE
    1334                         _W(StripToRoot(pszDirectory));
    1335 #endif // defined(_TRACE) && _TRACE
     1333                        #if defined(_TRACE) && _TRACE
     1334                                _W(StripToRoot(pszDirectory));
     1335                        #endif // defined(_TRACE) && _TRACE
    13361336                        if(GetOsVersion() >= 0x00060000) // Windows Vista+
    13371337                        {
    … …  
    13471347                }
    13481348                #pragma endregion
    1349 #if _DEVELOPMENT && FALSE
    1350                 static LPCTSTR g_pszPath = _T("D:\\Projects\\A&H\\LuxRiot\\_Issues\\45 Sanyo XP Issues\\DirectShowSpy.log");
    1351                 m_sPath = g_pszPath;
    1352 #endif // _DEVELOPMENT
     1349                #if _DEVELOPMENT && FALSE
     1350                        static LPCTSTR g_pszPath = _T("D:\\Projects\\A&H\\LuxRiot\\_Issues\\45 Sanyo XP Issues\\DirectShowSpy.log");
     1351                        m_sPath = g_pszPath;
     1352                #endif // _DEVELOPMENT
    13531353                AddPage(m_GraphPropertyPage);
    13541354        }
    … …  
    13621362                CString sCaption;
    13631363                _W(GetWindowText(sCaption));
    1364 #if defined(_WIN64)
    1365                 sCaption.Append(_T(" (64-bit)"));
    1366 #else
    1367                 if(SafeIsWow64Process())
    1368                         sCaption.Append(_T(" (32-bit)"));
    1369 #endif // defined(_WIN64)
     1364                #if defined(_WIN64)
     1365                        sCaption.Append(_T(" (64-bit)"));
     1366                #else
     1367                        if(SafeIsWow64Process())
     1368                                sCaption.Append(_T(" (32-bit)"));
     1369                #endif // defined(_WIN64)
    13701370                _W(SetWindowText(sCaption));
    13711371                #pragma endregion

  • trunk/DirectShowSpy/dllmain.h

    r144 r147  
    2323        CDirectShowSpyModule() throw()
    2424        {
    25 #if defined(_DEBUG)
    26                 AtlTraceLoadSettings(NULL);
    27 #endif // defined(_DEBUG)
    28                 _W(CExceptionFilter::Initialize());
     25                AtlTraceSetDefaultSettings();
    2926                TraceModuleVersion();
    3027                _Z4(atlTraceRefcount, 4, _T("this 0x%p\n"), this);
     28                _W(CExceptionFilter::Initialize());
    3129        }
    3230        ~CDirectShowSpyModule() throw()

  • trunk/DirectShowSpy/resource.h

    r144 r147  
    55#define IDI_MODULE                      10
    66#define IDR_MODULE                      11
    7 #define IDI_LISTVIEW_SUCCESS            70
    8 #define IDI_LISTVIEW_FAILURE            71
     7#define IDI_PRIVATE_INFORMATION 70
     8#define IDI_PRIVATE_WARNING     71
     9#define IDI_LISTVIEW_SUCCESS            80
     10#define IDI_LISTVIEW_FAILURE            81
    911#define IDS_PROJNAME                    100
    1012#define IDR_FILTERGRAPHSPY              102
    … …  
    1315#define IDR_SYSTEMDEVICEENUMERATORSPY   105
    1416#define IDC_PROGRESS                    202
     17#define IDS_REGISTRATION_PROPERTYSHEETCAPTION 900
     18#define IDD_REGISTRATION_REGISTRATION_PROPERTYPAGE 910
     19#define IDC_REGISTRATION_REGISTRATION_STATUS 920
     20#define IDC_REGISTRATION_REGISTRATION_PATH 921
     21#define IDC_REGISTRATION_REGISTRATION_REGISTER 922
     22#define IDC_REGISTRATION_REGISTRATION_UNREGISTER 923
     23#define IDC_REGISTRATION_REGISTRATION_USERSTATUS 930
     24#define IDC_REGISTRATION_REGISTRATION_USERPATH 931
     25#define IDC_REGISTRATION_REGISTRATION_USERREGISTER 932
     26#define IDC_REGISTRATION_REGISTRATION_USERUNREGISTER 933
     27#define IDC_REGISTRATION_REGISTRATION_USERNOTE 934
    1528#define IDS_GRAPHBUILDERCALLBACK_GRAPH_PROPERTYSHEETCAPTION 1000
    1629#define IDD_GRAPHBUILDERCALLBACK_GRAPH_PROPERTYPAGE 1100
    … …  
    2538#define IDI_GRAPHBUILDERCALLBACK_LISTVIEW_SELECTEDFILTER 1122
    2639#define IDI_GRAPHBUILDERCALLBACK_LISTVIEW_CREATEDFILTER 1123
     40#define IDD_REGISTRATION_PROPPAGEREGISTRATION_PROPERTYPAGE 1210
     41#define IDC_REGISTRATION_PROPPAGEREGISTRATION_STATUS 1220
     42#define IDC_REGISTRATION_PROPPAGEREGISTRATION_PATH 1221
     43#define IDC_REGISTRATION_PROPPAGEREGISTRATION_REGISTER 1222
     44#define IDC_REGISTRATION_PROPPAGEREGISTRATION_UNREGISTER 1223
     45#define IDC_REGISTRATION_PROPPAGEREGISTRATION_USERSTATUS 1230
     46#define IDC_REGISTRATION_PROPPAGEREGISTRATION_USERPATH 1231
     47#define IDC_REGISTRATION_PROPPAGEREGISTRATION_USERREGISTER 1232
     48#define IDC_REGISTRATION_PROPPAGEREGISTRATION_USERUNREGISTER 1233
     49#define IDC_REGISTRATION_PROPPAGEREGISTRATION_USERNOTE 1234
    2750#define IDD_ABOUT                       29900
    2851#define IDC_ABOUT_ICON                  29901
    … …  
    4366#define _APS_NEXT_RESOURCE_VALUE        209
    4467#define _APS_NEXT_COMMAND_VALUE         32768
    45 #define _APS_NEXT_CONTROL_VALUE         203
     68#define _APS_NEXT_CONTROL_VALUE         212
    4669#define _APS_NEXT_SYMED_VALUE           103
    4770#endif
Note: See TracChangeset for help on using the changeset viewer.