cryptnet: Add tests for CryptGetObjectUrl.

.gitignore

@@ -72,6 +72,10 @@ dlls/crypt32/tests/*.ok
 dlls/crypt32/tests/crypt32_crosstest.exe
 dlls/crypt32/tests/testlist.c
 dlls/cryptdll/libcryptdll.def
+dlls/cryptnet/libcryptnet.def
+dlls/cryptnet/tests/*.ok
+dlls/cryptnet/tests/cryptnet_crosstest.exe
+dlls/cryptnet/tests/testlist.c
 dlls/ctl3d.dll16
 dlls/ctl3d32/libctl3d32.def
 dlls/ctl3dv2.dll16
@@ -688,6 +692,7 @@ programs/winetest/comcat_test.exe
 programs/winetest/comctl32_test.exe
 programs/winetest/comdlg32_test.exe
 programs/winetest/crypt32_test.exe
+programs/winetest/cryptnet_test.exe
 programs/winetest/d3d8_test.exe
 programs/winetest/d3d9_test.exe
 programs/winetest/d3drm_test.exe

Makefile.in

@@ -188,6 +188,7 @@ ALL_MAKEFILES = \
 	dlls/crypt32/tests/Makefile \
 	dlls/cryptdll/Makefile \
 	dlls/cryptnet/Makefile \
+	dlls/cryptnet/tests/Makefile \
 	dlls/ctl3d32/Makefile \
 	dlls/d3d10/Makefile \
 	dlls/d3d8/Makefile \
@@ -561,6 +562,7 @@ dlls/crypt32/Makefile: dlls/crypt32/Makefile.in dlls/Makedll.rules
 dlls/crypt32/tests/Makefile: dlls/crypt32/tests/Makefile.in dlls/Maketest.rules
 dlls/cryptdll/Makefile: dlls/cryptdll/Makefile.in dlls/Makedll.rules
 dlls/cryptnet/Makefile: dlls/cryptnet/Makefile.in dlls/Makedll.rules
+dlls/cryptnet/tests/Makefile: dlls/cryptnet/tests/Makefile.in dlls/Maketest.rules
 dlls/ctl3d32/Makefile: dlls/ctl3d32/Makefile.in dlls/Makedll.rules
 dlls/d3d10/Makefile: dlls/d3d10/Makefile.in dlls/Makedll.rules
 dlls/d3d8/Makefile: dlls/d3d8/Makefile.in dlls/Makedll.rules

configure

@@ -20571,6 +20571,8 @@ ac_config_files="$ac_config_files dlls/cryptdll/Makefile"
 
 ac_config_files="$ac_config_files dlls/cryptnet/Makefile"
 
+ac_config_files="$ac_config_files dlls/cryptnet/tests/Makefile"
+
 ac_config_files="$ac_config_files dlls/ctl3d32/Makefile"
 
 ac_config_files="$ac_config_files dlls/d3d10/Makefile"
@@ -21823,6 +21825,7 @@ do
     "dlls/crypt32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/crypt32/tests/Makefile" ;;
     "dlls/cryptdll/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptdll/Makefile" ;;
     "dlls/cryptnet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptnet/Makefile" ;;
+    "dlls/cryptnet/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptnet/tests/Makefile" ;;
     "dlls/ctl3d32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ctl3d32/Makefile" ;;
     "dlls/d3d10/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10/Makefile" ;;
     "dlls/d3d8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d8/Makefile" ;;

configure.ac

@@ -1601,6 +1601,7 @@ AC_CONFIG_FILES([dlls/crypt32/Makefile])
 AC_CONFIG_FILES([dlls/crypt32/tests/Makefile])
 AC_CONFIG_FILES([dlls/cryptdll/Makefile])
 AC_CONFIG_FILES([dlls/cryptnet/Makefile])
+AC_CONFIG_FILES([dlls/cryptnet/tests/Makefile])
 AC_CONFIG_FILES([dlls/ctl3d32/Makefile])
 AC_CONFIG_FILES([dlls/d3d10/Makefile])
 AC_CONFIG_FILES([dlls/d3d8/Makefile])

dlls/Makefile.in

@@ -252,6 +252,7 @@ TESTSUBDIRS = \
 	comctl32/tests \
 	comdlg32/tests \
 	crypt32/tests \
+	cryptnet/tests \
 	d3d8/tests \
 	d3d9/tests \
 	d3drm/tests \
@@ -501,6 +502,7 @@ IMPORT_LIBS = \
 	crtdll/libcrtdll.$(IMPLIBEXT) \
 	crypt32/libcrypt32.$(IMPLIBEXT) \
 	cryptdll/libcryptdll.$(IMPLIBEXT) \
+	cryptnet/libcryptnet.$(IMPLIBEXT) \
 	ctl3d32/libctl3d32.$(IMPLIBEXT) \
 	d3d8/libd3d8.$(IMPLIBEXT) \
 	d3d9/libd3d9.$(IMPLIBEXT) \
@@ -666,6 +668,9 @@ crypt32/libcrypt32.$(IMPLIBEXT): crypt32/crypt32.spec $(WINEBUILD)
 cryptdll/libcryptdll.$(IMPLIBEXT): cryptdll/cryptdll.spec $(WINEBUILD)
 	@cd cryptdll && $(MAKE) libcryptdll.$(IMPLIBEXT)
 
+cryptnet/libcryptnet.$(IMPLIBEXT): cryptnet/cryptnet.spec $(WINEBUILD)
+	@cd cryptnet && $(MAKE) libcryptnet.$(IMPLIBEXT)
+
 ctl3d32/libctl3d32.$(IMPLIBEXT): ctl3d32/ctl3d32.spec $(WINEBUILD)
 	@cd ctl3d32 && $(MAKE) libctl3d32.$(IMPLIBEXT)
 

dlls/cryptnet/Makefile.in

@@ -3,6 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cryptnet.dll
+IMPORTLIB = libcryptnet.$(IMPLIBEXT)
 IMPORTS   = crypt32 kernel32
 
 C_SRCS = \

dlls/cryptnet/tests/Makefile.in

+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+TESTDLL   = cryptnet.dll
+IMPORTS   = cryptnet crypt32 kernel32
+
+CTESTS = \
+	cryptnet.c
+
+@MAKE_TEST_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend

programs/winetest/Makefile.in

@@ -28,6 +28,7 @@ TESTBINS = \
 	comctl32_test.exe \
 	comdlg32_test.exe \
 	crypt32_test.exe \
+	cryptnet_test.exe \
 	d3d8_test.exe \
 	d3d9_test.exe \
 	d3drm_test.exe \
@@ -106,6 +107,8 @@ comdlg32_test.exe: $(DLLDIR)/comdlg32/tests/comdlg32_test.exe$(DLLEXT)
 	cp $(DLLDIR)/comdlg32/tests/comdlg32_test.exe$(DLLEXT) $@ && $(STRIP) $@
 crypt32_test.exe: $(DLLDIR)/crypt32/tests/crypt32_test.exe$(DLLEXT)
 	cp $(DLLDIR)/crypt32/tests/crypt32_test.exe$(DLLEXT) $@ && $(STRIP) $@
+cryptnet_test.exe: $(DLLDIR)/cryptnet/tests/cryptnet_test.exe$(DLLEXT)
+	cp $(DLLDIR)/cryptnet/tests/cryptnet_test.exe$(DLLEXT) $@ && $(STRIP) $@
 d3d8_test.exe: $(DLLDIR)/d3d8/tests/d3d8_test.exe$(DLLEXT)
 	cp $(DLLDIR)/d3d8/tests/d3d8_test.exe$(DLLEXT) $@ && $(STRIP) $@
 d3d9_test.exe: $(DLLDIR)/d3d9/tests/d3d9_test.exe$(DLLEXT)

programs/winetest/winetest.rc

@@ -86,6 +86,7 @@ comcat_test.exe TESTRES "comcat_test.exe"
 comctl32_test.exe TESTRES "comctl32_test.exe"
 comdlg32_test.exe TESTRES "comdlg32_test.exe"
 crypt32_test.exe TESTRES "crypt32_test.exe"
+cryptnet_test.exe TESTRES "cryptnet_test.exe"
 d3d8_test.exe TESTRES "d3d8_test.exe"
 d3d9_test.exe TESTRES "d3d9_test.exe"
 d3drm_test.exe TESTRES "d3drm_test.exe"