Jacek Caban : urlmon: Added more mk: combining tests.
Alexandre Julliard
julliard at winehq.org
Thu Feb 9 15:21:49 CST 2012
Module: wine
Branch: master
Commit: 2ce15be5fad42667ed81a02fbf2ba7285050768c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce15be5fad42667ed81a02fbf2ba7285050768c
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Feb 9 15:16:51 2012 +0100
urlmon: Added more mk: combining tests.
---
dlls/urlmon/tests/uri.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 162 insertions(+), 0 deletions(-)
diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c
index 4b0e788..3d140ca 100644
--- a/dlls/urlmon/tests/uri.c
+++ b/dlls/urlmon/tests/uri.c
@@ -6695,6 +6695,168 @@ static const uri_combine_test uri_combine_tests[] = {
{URLZONE_INVALID,E_NOTIMPL}
}
},
+ { "mk:@MSITSTORE:C:\\dir\\file.chm::/subdir/file.txt",0,
+ "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE,
+ 0,S_OK,FALSE,
+ {
+ {"mk:@MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {"mk:@MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {".txt",S_OK},
+ {"",S_FALSE},
+ {"",S_FALSE},
+ {"",S_FALSE},
+ {"@MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK},
+ {"@MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {"mk:@MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK},
+ {"mk",S_OK},
+ {"",S_FALSE},
+ {"",S_FALSE}
+ },
+ {
+ {Uri_HOST_UNKNOWN,S_OK},
+ {0,S_FALSE},
+ {URL_SCHEME_MK,S_OK},
+ {URLZONE_INVALID,E_NOTIMPL}
+ }
+ },
+ { "mk:MSITSTORE:C:\\dir\\file.chm::/subdir/file.txt",0,
+ "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE,
+ 0,S_OK,FALSE,
+ {
+ {"mk:MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {"mk:MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {".txt",S_OK},
+ {"",S_FALSE},
+ {"",S_FALSE},
+ {"",S_FALSE},
+ {"MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK},
+ {"MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {"mk:MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK},
+ {"mk",S_OK},
+ {"",S_FALSE},
+ {"",S_FALSE}
+ },
+ {
+ {Uri_HOST_UNKNOWN,S_OK},
+ {0,S_FALSE},
+ {URL_SCHEME_MK,S_OK},
+ {URLZONE_INVALID,E_NOTIMPL}
+ }
+ },
+ { "mk:@MSITSTORE:C:\\dir\\file.chm::/subdir/../../file.txt",0,
+ "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE,
+ 0,S_OK,FALSE,
+ {
+ {"mk:@MSITSTORE:/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {"mk:@MSITSTORE:/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {".txt",S_OK},
+ {"",S_FALSE},
+ {"",S_FALSE},
+ {"",S_FALSE},
+ {"@MSITSTORE:/relative/path.txt",S_OK},
+ {"@MSITSTORE:/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {"mk:@MSITSTORE:/relative/path.txt",S_OK},
+ {"mk",S_OK},
+ {"",S_FALSE},
+ {"",S_FALSE}
+ },
+ {
+ {Uri_HOST_UNKNOWN,S_OK},
+ {0,S_FALSE},
+ {URL_SCHEME_MK,S_OK},
+ {URLZONE_INVALID,E_NOTIMPL}
+ }
+ },
+ { "mk:@xxx:C:\\dir\\file.chm::/subdir/../../file.txt",0,
+ "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE,
+ 0,S_OK,FALSE,
+ {
+ {"mk:@xxx:/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {"mk:@xxx:/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {".txt",S_OK},
+ {"",S_FALSE},
+ {"",S_FALSE},
+ {"",S_FALSE},
+ {"@xxx:/relative/path.txt",S_OK},
+ {"@xxx:/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {"mk:@xxx:/relative/path.txt",S_OK},
+ {"mk",S_OK},
+ {"",S_FALSE},
+ {"",S_FALSE}
+ },
+ {
+ {Uri_HOST_UNKNOWN,S_OK},
+ {0,S_FALSE},
+ {URL_SCHEME_MK,S_OK},
+ {URLZONE_INVALID,E_NOTIMPL}
+ }
+ },
+ { "mk:xxx:C:\\dir\\file.chm::/subdir/../../file.txt",0,
+ "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE,
+ 0,S_OK,FALSE,
+ {
+ {"mk:/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {"mk:/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {".txt",S_OK},
+ {"",S_FALSE},
+ {"",S_FALSE},
+ {"",S_FALSE},
+ {"/relative/path.txt",S_OK},
+ {"/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {"mk:/relative/path.txt",S_OK},
+ {"mk",S_OK},
+ {"",S_FALSE},
+ {"",S_FALSE}
+ },
+ {
+ {Uri_HOST_UNKNOWN,S_OK},
+ {0,S_FALSE},
+ {URL_SCHEME_MK,S_OK},
+ {URLZONE_INVALID,E_NOTIMPL}
+ }
+ },
+ { "ml:@MSITSTORE:C:\\dir\\file.chm::/subdir/file.txt",0,
+ "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE,
+ 0,S_OK,FALSE,
+ {
+ {"ml:/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {"ml:/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {".txt",S_OK},
+ {"",S_FALSE},
+ {"",S_FALSE},
+ {"",S_FALSE},
+ {"/relative/path.txt",S_OK},
+ {"/relative/path.txt",S_OK},
+ {"",S_FALSE},
+ {"ml:/relative/path.txt",S_OK},
+ {"ml",S_OK},
+ {"",S_FALSE},
+ {"",S_FALSE}
+ },
+ {
+ {Uri_HOST_UNKNOWN,S_OK},
+ {0,S_FALSE},
+ {URL_SCHEME_UNKNOWN,S_OK},
+ {URLZONE_INVALID,E_NOTIMPL}
+ }
+ },
{ "http://winehq.org/dir/test?querystring",0,
"//winehq.com/#hash",Uri_CREATE_ALLOW_RELATIVE,
0,S_OK,FALSE,
More information about the wine-cvs
mailing list