Permalink
Browse files

Integrated jpht (r720) into source tree

  • Loading branch information...
(no author)
(no author) committed Dec 30, 2009
1 parent 08fd135 commit 80d3562834399704d0e49e378e731ca4b6726f04
Showing with 39 additions and 45 deletions.
  1. +1 −1 DIRS
  2. +2 −2 cdiag/cdiag/SOURCES
  3. +2 −2 cfixkern/cfixkr/SOURCES
  4. BIN jpht/Jpht.suo
  5. +8 −0 jpht/Jpht.vcproj
  6. +1 −1 jpht/jpht/SOURCES
  7. +7 −5 jpht/test/SOURCES
  8. +8 −21 jpht/test/test.c
  9. +1 −0 jpht/test/testjpht.def
  10. +4 −9 makefile.cfix
  11. +5 −4 srcrel-readme.txt
2 DIRS
@@ -1 +1 @@
DIRS=cdiag cfix cfixkern compat samples
DIRS=jpht cdiag cfix cfixkern compat samples
@@ -21,7 +21,7 @@ BSCMAKE_FLAGS=$(BSCMAKE_FLAGS) /n
MSC_WARNING_LEVEL=/W4 /Wp64
INCLUDES=..\..\include;..\..\..\Jpht\Include;$(SDK_INC_PATH)\..\mfc42
INCLUDES=..\..\include;..\..\Jpht\Include;$(SDK_INC_PATH)\..\mfc42
!if "$(TARGET_DIRECTORY)"=="i386"
USER_C_FLAGS=/D_UNICODE /DUNICODE /analyze
@@ -42,7 +42,7 @@ TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib \
$(SDK_LIB_PATH)\advapi32.lib \
$(SDK_LIB_PATH)\shlwapi.lib \
$(SDK_LIB_PATH)\version.lib \
$(MAKEDIR)\..\..\..\Jpht\bin\$(DDKBUILDENV)\$(TARGET_DIRECTORY)\jpht.lib
$(TARGETPATH)\$(TARGET_DIRECTORY)\jpht.lib
TARGETNAME=cdiag
TARGETPATH=..\..\bin\$(DDKBUILDENV)
@@ -18,7 +18,7 @@
# along with cfix. If not, see <http://www.gnu.org/licenses/>.
#
INCLUDES=..\..\include;..\..\..\Jpht\Include;$(SDK_INC_PATH)\..\mfc42
INCLUDES=..\..\include;..\..\Jpht\Include;$(SDK_INC_PATH)\..\mfc42
MSC_WARNING_LEVEL=/W4 /WX /Wp64
@@ -32,7 +32,7 @@ TARGETNAME=cfixkr64
TARGETLIBS=$(DDK_LIB_PATH)\aux_klib.lib \
$(DDK_LIB_PATH)\ntstrsafe.lib \
$(MAKEDIR)\..\..\..\Jpht\bin\$(DDKBUILDENV)\$(TARGET_DIRECTORY)\jpht.lib
$(TARGETPATH)\$(TARGET_DIRECTORY)\jpht.lib
TARGETPATH=..\..\bin\$(DDKBUILDENV)
TARGETTYPE=DRIVER
BIN +0 Bytes (100%) jpht/Jpht.suo
Binary file not shown.
@@ -114,6 +114,10 @@
RelativePath=".\jpht\hashtable.c"
>
</File>
<File
RelativePath=".\jpht\SOURCES"
>
</File>
<File
RelativePath=".\jpht\stdafx.h"
>
@@ -122,6 +126,10 @@
<Filter
Name="test"
>
<File
RelativePath=".\test\SOURCES"
>
</File>
<File
RelativePath=".\test\test.c"
>
@@ -9,6 +9,6 @@ MSC_WARNING_LEVEL=/W4 /WX /Wp64
INCLUDES=..\include
TARGETNAME=jpht
TARGETPATH=..\bin\$(DDKBUILDENV)
TARGETPATH=..\..\bin\$(DDKBUILDENV)
TARGETTYPE=LIBRARY
SOURCES=hashtable.c
@@ -6,17 +6,19 @@ BSCMAKE_FLAGS=$(BSCMAKE_FLAGS) /n
MSC_WARNING_LEVEL=/W4 /WX /Wp64
INCLUDES=..\include
INCLUDES=..\include;..\..\include
USER_C_FLAGS=/D_UNICODE /DUNICODE
UMTYPE=console
UMENTRY=wmain
USE_MSVCRT=1
TARGETLIBS=$(MAKEDIR)\..\bin\$(DDKBUILDENV)\$(TARGET_DIRECTORY)\jpht.lib
TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib \
$(TARGETPATH)\$(TARGET_DIRECTORY)\cfix.lib \
$(TARGETPATH)\$(TARGET_DIRECTORY)\jpht.lib
TARGETNAME=jphttest
TARGETPATH=..\bin\$(DDKBUILDENV)
TARGETTYPE=PROGRAM
TARGETNAME=testjpht
TARGETPATH=..\..\bin\$(DDKBUILDENV)
TARGETTYPE=DYNLINK
SOURCES=test.c
@@ -1,20 +1,8 @@
#include <stdio.h>
#include <tchar.h>
#include <windows.h>
#include <crtdbg.h>
#include <cfix.h>
#include <stdlib.h>
#include "hashtable.h"
#define ASSERT _ASSERTE
#ifdef _DEBUG
#define TEST( expr ) _ASSERTE( expr )
#else
#define TEST( expr ) ( ( !! ( expr ) ) || ( \
OutputDebugString( \
L"Test failed: " _CRT_WIDE( __FILE__ ) L" - " \
_CRT_WIDE( __FUNCTION__ ) L": " _CRT_WIDE( #expr ) L"\n" ), 0 ) )
#endif
#define TEST CFIX_ASSERT
static VOID EnumCallback(
__in PJPHT_HASHTABLE Hashtable,
@@ -38,7 +26,7 @@ static VOID EnumRemoveCallback(
PJPHT_HASHTABLE_ENTRY OldEntry;
UNREFERENCED_PARAMETER( Context );
JphtRemoveEntryHashtable( Hashtable, Entry->Key, &OldEntry );
ASSERT( OldEntry == Entry );
CFIX_ASSERT( OldEntry == Entry );
}
@@ -74,7 +62,7 @@ static BOOLEAN EqualsString (
return ( BOOLEAN ) ( 0 == wcscmp( Lhs, Rhs ) );
}
PVOID Allocate(
static PVOID Allocate(
__in SIZE_T Size
)
{
@@ -98,17 +86,14 @@ typedef struct _TEST_ENTRY
PCWSTR Value;
} TEST_ENTRY, *PTEST_ENTRY;
int __cdecl wmain()
static void TestHashtable()
{
JPHT_HASHTABLE Ht;
PTEST_ENTRY Old;
TEST_ENTRY Foo;
TEST_ENTRY Bar;
ULONG HtSize;
_CrtSetDbgFlag(
_CrtSetDbgFlag( _CRTDBG_REPORT_FLAG ) | _CRTDBG_LEAK_CHECK_DF );
Foo.Base.Key = ( ULONG_PTR ) L"Foo";
Foo.Value = L"Val(Foo)";
@@ -201,6 +186,8 @@ int __cdecl wmain()
JphtDeleteHashtable( &Ht );
}
return 0;
}
CFIX_BEGIN_FIXTURE( Hashtable )
CFIX_FIXTURE_ENTRY( TestHashtable )
CFIX_END_FIXTURE()
@@ -0,0 +1 @@
EXPORTS
@@ -47,9 +47,9 @@ CFIX_CLAGS=-f -z -kern
#
#----------------------------------------------------------------------
build: chk fre symadd
build: clean chk fre symadd
ci: chk fre
ci: clean chk fre
symadd:
symstore add /r /f bin\chk\i386\c*.pdb /s "$(CUSTOMSYMSTORE)" /t cfix /v $(VERSION)
@@ -196,6 +196,7 @@ __cfixtests:
-1100 sc delete testklib2
-1100 sc delete testklib7
$(CFIX_CMD) $(CFIX_FLAGS) testjpht.dll
$(CFIX_CMD) $(CFIX_FLAGS) testapi.dll
$(CFIX_CMD) $(CFIX_FLAGS) testcpp.dll
$(CFIX_CMD) $(CFIX_FLAGS) testtsx.dll
@@ -333,7 +334,7 @@ srcrelease: cleantemps
xcopy /S /Y /I cfixkern rtm\cfix-src-$(VERSION)\cfix\cfixkern
xcopy /S /Y /I cdiag rtm\cfix-src-$(VERSION)\cfix\cdiag
xcopy /S /Y /I compat rtm\cfix-src-$(VERSION)\cfix\compat
xcopy /S /Y /I ..\jpht rtm\cfix-src-$(VERSION)\jpht
xcopy /S /Y /I jpht rtm\cfix-src-$(VERSION)\cfix\jpht
copy /Y DIRS rtm\cfix-src-$(VERSION)\cfix
# copy /Y makefile.cfix rtm\cfix-src-$(VERSION)\cfix
@@ -352,12 +353,6 @@ srcrelease: cleantemps
rd /S /Q rtm\cfix-src-$(VERSION)\samples\UserCc\Release
rd /S /Q rtm\cfix-src-$(VERSION)\samples\UserCc\x64
cd rtm\cfix-src-$(VERSION)\jpht
cmd.exe /C clean.cmd
del /S *.ncb
del /S *.user
cd ..\..\..
cd rtm\cfix-src-$(VERSION)
-1 for /f "delims=" %%i in ('dir /s/b __*.txt') do @del %%i
-1 for /f "delims=" %%i in ('dir /s/b *.cmd') do @del %%i
@@ -1,7 +1,8 @@
CFIX SOURCE RELEASE README
--------------------------
N.B. The cfix source release is intended for debugging and reference purposes
only. If, for any reason, the official builds should be insufficient for your
purposes and you intend to create a custom build of cfix, please perform a
checkout of the respective SVN branch.
N.B. The cfix source release is intended for debugging and reference purposes only.
If, for any reason, the official builds should be insufficient for your
purposes and you intend to create a custom build of cfix, use the WDK
build utility to perform a build.

0 comments on commit 80d3562

Please sign in to comment.