EventDll sample

jpassing · Apr 17, 2010 · e664594 · e664594
1 parent 48accaa
commit e664594
Show file tree

Hide file tree

Showing 22 changed files with 1,011 additions and 20 deletions.
diff --git a/cdiag/cdiag/cdiag.rc b/cdiag/cdiag/cdiag.rc
@@ -97,7 +97,7 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1, 6, 0, 3752
+ FILEVERSION 1, 7, 0, 3759
  PRODUCTVERSION 1,0,0,1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
@@ -116,7 +116,7 @@ BEGIN
             VALUE "Comments", "Cfix Diagnostics Library"
             VALUE "CompanyName", "Johannes Passing"
             VALUE "FileDescription", "Cfix Diagnostics Library"
-            VALUE "FileVersion", "1, 6, 0, 3752\0"
+            VALUE "FileVersion", "1, 7, 0, 3759\0"
             VALUE "InternalName", "cdiag"
             VALUE "LegalCopyright", "Copyright (C) 2007"
             VALUE "OriginalFilename", "cdiag.dll"
@@ -363,6 +363,8 @@ END
 
 
 
+
+
 
 
 
diff --git a/cfix/cfix/cfix.rc b/cfix/cfix/cfix.rc
@@ -53,7 +53,7 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1, 6, 0, 3752
+ FILEVERSION 1, 7, 0, 3759
  PRODUCTVERSION 1,1,0,1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
@@ -71,7 +71,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Johannes Passing"
             VALUE "FileDescription", "Cfix"
-            VALUE "FileVersion", "1, 6, 0, 3752\0"
+            VALUE "FileVersion", "1, 7, 0, 3759\0"
             VALUE "InternalName", "Cfix"
             VALUE "LegalCopyright", "Copyright (C) 2008 Johannes Passing"
             VALUE "OriginalFilename", "Cfix"
@@ -330,6 +330,8 @@ END
 
 
 
+
+
 
 
 
diff --git a/cfix/cfix/cfixmsg.mc b/cfix/cfix/cfixmsg.mc
@@ -260,3 +260,11 @@ SymbolicName	= CFIX_E_LOADING_EVENTDLL_FAILED
 Language		= English
 Loading Event DLL failed. Make sure that path and CPU architecture are correct.
 .
+
+MessageId		= 0x801d
+Severity		= Warning
+Facility		= Interface
+SymbolicName	= CFIX_E_EVENTDLL_INVALID_OPTIONS
+Language		= English
+Options passed to Event DLL are invalid.
+.
diff --git a/cfix/cfixcmd/runtest.rc b/cfix/cfixcmd/runtest.rc
@@ -53,7 +53,7 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1, 6, 0, 3752
+ FILEVERSION 1, 7, 0, 3759
  PRODUCTVERSION 1,1,0,1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
@@ -71,7 +71,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Johannes Passing"
             VALUE "FileDescription", "Cfix"
-            VALUE "FileVersion", "1, 6, 0, 3752\0"
+            VALUE "FileVersion", "1, 7, 0, 3759\0"
             VALUE "InternalName", "Cfix"
             VALUE "LegalCopyright", "Copyright (C) 2008 Johannes Passing"
             VALUE "OriginalFilename", "Cfix"
@@ -339,6 +339,8 @@ IDI_ICON1               ICON                    "icon.ico"
 
 
 
+
+
 
 
 
diff --git a/cfix/cfixcons/cfixcons.def b/cfix/cfixcons/cfixcons.def
@@ -1,5 +1,5 @@
 ; Copyright:
-;		2008-2009, Johannes Passing (passing at users.sourceforge.net)
+;		2008-2010, Johannes Passing (passing at users.sourceforge.net)
 ;
 ; This file is part of cfix.
 ;

diff --git a/cfix/cfixemb/cfixemb.rc b/cfix/cfixemb/cfixemb.rc
@@ -53,7 +53,7 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1, 6, 0, 3752
+ FILEVERSION 1, 7, 0, 3759
  PRODUCTVERSION 1,1,0,1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
@@ -71,7 +71,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Johannes Passing"
             VALUE "FileDescription", "cfix Embedding Helper Library"
-            VALUE "FileVersion", "1, 6, 0, 3752\0"
+            VALUE "FileVersion", "1, 7, 0, 3759\0"
             VALUE "InternalName", "cfix"
             VALUE "LegalCopyright", "Copyright (C) 2008 Johannes Passing"
             VALUE "OriginalFilename", "cfix"
@@ -329,6 +329,8 @@ END
 
 
 
+
+
 
 
 
diff --git a/cfixkern/cfixkl/cfixkl.rc b/cfixkern/cfixkl/cfixkl.rc
@@ -53,7 +53,7 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1, 6, 0, 3752
+ FILEVERSION 1, 7, 0, 3759
  PRODUCTVERSION 1,1,0,1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
@@ -71,7 +71,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Johannes Passing"
             VALUE "FileDescription", "Cfix Kernel Layer DLL"
-            VALUE "FileVersion", "1, 6, 0, 3752\0"
+            VALUE "FileVersion", "1, 7, 0, 3759\0"
             VALUE "InternalName", "Cfixkl"
             VALUE "LegalCopyright", "Copyright (C) 2008 Johannes Passing"
             VALUE "OriginalFilename", "Cfixkl"
@@ -325,6 +325,8 @@ END
 
 
 
+
+
 
 
 
diff --git a/cfixkern/cfixkr/cfixkr.rc b/cfixkern/cfixkr/cfixkr.rc
@@ -53,7 +53,7 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1, 6, 0, 3752
+ FILEVERSION 1, 7, 0, 3759
  PRODUCTVERSION 1,1,0,1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
@@ -71,7 +71,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Johannes Passing"
             VALUE "FileDescription", "Cfix Kernel Reflector"
-            VALUE "FileVersion", "1, 6, 0, 3752\0"
+            VALUE "FileVersion", "1, 7, 0, 3759\0"
             VALUE "InternalName", "Cfixkr"
             VALUE "LegalCopyright", "Copyright (C) 2008 Johannes Passing"
             VALUE "OriginalFilename", "Cfixkr"
@@ -324,6 +324,8 @@ END
 
 
 
+
+
 
 
 
diff --git a/doc/__buildnum.inc b/doc/__buildnum.inc
@@ -1,3 +1,3 @@
-BUILDNUMBER = 3752
+BUILDNUMBER = 3759
 
 
diff --git a/doc/docbook/book.xml b/doc/docbook/book.xml
@@ -39,7 +39,7 @@
   <title>cfix</title>
 
   <bookinfo>
-    <releaseinfo>Release 1.6</releaseinfo>
+    <releaseinfo>Release 1.7</releaseinfo>
     <author>Johannes Passing</author>
   </bookinfo>
 

diff --git a/include/cfixmsg.h b/include/cfixmsg.h
@@ -301,3 +301,12 @@
 //
 #define CFIX_E_LOADING_EVENTDLL_FAILED   ((HRESULT)0x8004801CL)
 
+//
+// MessageId: CFIX_E_EVENTDLL_INVALID_OPTIONS
+//
+// MessageText:
+//
+// Options passed to Event DLL are invalid.
+//
+#define CFIX_E_EVENTDLL_INVALID_OPTIONS  ((HRESULT)0x8004801DL)
+
diff --git a/include/cfixutil.h b/include/cfixutil.h
@@ -88,11 +88,11 @@ EXTERN_C HRESULT CFIXCALLTYPE CfixutilSearch(
 
 	Parameters:
 		DllPath		- Name/path of DLL.
-		Flags		-  CFIX_EVENT_SINK_FLAG_*.
+		Flags		- CFIX_EVENT_SINK_FLAG_*.
 		Options		- Options to pass to event DLL.
 		Sink		- Result.
 --*/
-HRESULT CfixutilLoadEventSinkFromDll(
+EXTERN_C HRESULT CfixutilLoadEventSinkFromDll(
 	__in PCWSTR DllPath,
 	__in ULONG Flags,
 	__in_opt PCWSTR Options,

diff --git a/installer/cfix.wxs b/installer/cfix.wxs
@@ -360,6 +360,23 @@
                 <?include cfix_samples_usercc.wxs?>
               </Component>
             </Directory>
+            <Directory Id="DirSamplesEventDll" Name="EventDll">
+              <Directory Id="DirSamplesEventDllLogfile" Name="Logfile">
+                <Component Id="CompSamplesEventDllLogfile" DiskId="1" Guid="7aeb80ec-0741-4dab-94c0-7798f4d4753b">
+                  <Registry
+                     Id="CompSamplesEventDllLogfileComponent"
+                     Root="HKCU"
+                     Key="Software\cfix\cfix\1.4\Components"
+                     Name="CompSamplesEventDllLogfileComponent"
+                     Type="integer"
+                     KeyPath="yes"
+                     Value="1" />
+                  <RemoveFolder Id="RemoveDirSamplesEventDllLogfile" On="uninstall"/>
+
+                  <?include cfix_samples_eventdll.wxs?>
+                </Component>
+              </Directory>
+            </Directory>
           </Directory>
          <Directory Id="DirInclude" Name="include">
             <Component Id="CompIncludes" DiskId="1" Guid="c988cb16-f49a-452e-9901-2c660fecd35e">
@@ -456,6 +473,7 @@
         <ComponentRef Id="CompSamplesKernel"/>
         <ComponentRef Id="CompSamplesUser"/>
         <ComponentRef Id="CompSamplesUserCc"/>
+        <ComponentRef Id="CompSamplesEventDllLogfile"/>
       </Feature>
 
       <Feature Id="FeatureWinunit" Title="WinUnit Compatibility" Level="2" AllowAdvertise="no" Description="WinUnit Compatibility">

diff --git a/installer/cfix_samples_eventdll.wxs b/installer/cfix_samples_eventdll.wxs
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Include>
+  <File Id="FileSamplesEventDllLogfileCpp" Name="Logfile.cpp" Source="$(var.CFIX_TREE)\samples\EventDll\Logfile\Logfile.cpp" />
+  <File Id="FileSamplesEventDllLogfileDef" Name="Logfile.def" Source="$(var.CFIX_TREE)\samples\EventDll\Logfile\Logfile.def" />
+  <File Id="FileSamplesEventDllLogfileSln" Name="Logfile.sln" Source="$(var.CFIX_TREE)\samples\EventDll\Logfile\Logfile.sln" />
+  <File Id="FileSamplesEventDllLogfileVcproj" Name="Logfile.vcp" LongName="Logfile.vcproj" Source="$(var.CFIX_TREE)\samples\EventDll\Logfile\Logfile.vcproj" />
+  <File Id="FileSamplesEventDllKtestLogfileSOURCES" Name="SOURCES" Source="$(var.CFIX_TREE)\samples\EventDll\Logfile\SOURCES" />
+</Include>
diff --git a/installer/makefile b/installer/makefile
@@ -4,7 +4,7 @@ WIXBINPATH=D:\prog\wix\wix-2.0.5805.0-binaries
 !ENDIF
 !INCLUDE __buildnum.inc
 
-VERSION = 1.6.0.$(BUILDNUMBER)
+VERSION = 1.7.0.$(BUILDNUMBER)
 
 #----------------------------------------------------------------------
 #

diff --git a/makefile.cfix b/makefile.cfix
@@ -28,7 +28,7 @@
 !ENDIF
 !INCLUDE __buildnum.inc
 
-VERSION=1.6.0.$(BUILDNUMBER)
+VERSION=1.7.0.$(BUILDNUMBER)
 CUSTOMSYMSTORE=D:\XSYMBOLS\Custom
 CFIX_CLAGS=-f -z -kern
 

diff --git a/samples/DIRS b/samples/DIRS
@@ -1 +1 @@
-DIRS=UserCc UserC Kernel
+DIRS=UserCc UserC Kernel EventDll