From 85ba5095c8ed4421d9ca209423df0c0e4b9dda49 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Mon, 1 Apr 2019 09:11:24 +1100 Subject: [PATCH] Updated httpapi-HttpCreateServerSession patchset --- ...0002-httpapi-Add-CreateUrlGroup-stub.patch | 59 +++++++++++++++ .../0003-httpapi-Add-CloseUrlGroup-stub.patch | 57 ++++++++++++++ ...-httpapi-Add-CreateRequestQueue-stub.patch | 60 +++++++++++++++ ...httpapi-Add-SetUrlGroupProperty-stub.patch | 75 +++++++++++++++++++ ...06-httpapi-Add-AddUrlToUrlGroup-stub.patch | 62 +++++++++++++++ patches/patchinstall.sh | 12 ++- 6 files changed, 324 insertions(+), 1 deletion(-) create mode 100644 patches/httpapi-HttpCreateServerSession/0002-httpapi-Add-CreateUrlGroup-stub.patch create mode 100644 patches/httpapi-HttpCreateServerSession/0003-httpapi-Add-CloseUrlGroup-stub.patch create mode 100644 patches/httpapi-HttpCreateServerSession/0004-httpapi-Add-CreateRequestQueue-stub.patch create mode 100644 patches/httpapi-HttpCreateServerSession/0005-httpapi-Add-SetUrlGroupProperty-stub.patch create mode 100644 patches/httpapi-HttpCreateServerSession/0006-httpapi-Add-AddUrlToUrlGroup-stub.patch diff --git a/patches/httpapi-HttpCreateServerSession/0002-httpapi-Add-CreateUrlGroup-stub.patch b/patches/httpapi-HttpCreateServerSession/0002-httpapi-Add-CreateUrlGroup-stub.patch new file mode 100644 index 00000000..d4498121 --- /dev/null +++ b/patches/httpapi-HttpCreateServerSession/0002-httpapi-Add-CreateUrlGroup-stub.patch @@ -0,0 +1,59 @@ +From fd6e709fad9b70a8d19ed6521e3375658c2c951f Mon Sep 17 00:00:00 2001 +From: Esdras Tarsis +Date: Sat, 30 Mar 2019 18:59:05 -0300 +Subject: [PATCH] httpapi: Add CreateUrlGroup stub. + +--- + dlls/httpapi/httpapi.spec | 1 + + dlls/httpapi/httpapi_main.c | 12 ++++++++++++ + include/http.h | 1 + + 3 files changed, 14 insertions(+) + +diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec +index 1d8fcd8..bcd09e7 100644 +--- a/dlls/httpapi/httpapi.spec ++++ b/dlls/httpapi/httpapi.spec +@@ -7,6 +7,7 @@ + @ stub HttpCreateFilter + @ stdcall HttpCreateHttpHandle(ptr long) + @ stdcall HttpCreateServerSession(long ptr long) ++@ stdcall HttpCreateUrlGroup(int64 ptr long) + @ stdcall HttpCloseServerSession(int64) + @ stub HttpDeleteConfigGroup + @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) +diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c +index 3ab0399..9280fc1 100644 +--- a/dlls/httpapi/httpapi_main.c ++++ b/dlls/httpapi/httpapi_main.c +@@ -201,3 +201,15 @@ ULONG WINAPI HttpCloseServerSession( HTTP_SERVER_SESSION_ID id ) + FIXME( "(%s): stub!\n", wine_dbgstr_longlong(id)); + return ERROR_INVALID_PARAMETER; + } ++ ++/*********************************************************************** ++ * HttpCreateUrlGroup (HTTPAPI.@) ++ */ ++ULONG WINAPI HttpCreateUrlGroup( HTTP_SERVER_SESSION_ID id, HTTP_URL_GROUP_ID *urlgroupid, ULONG reserved ) ++{ ++ FIXME( "(%s, %p, %d): stub!\n", wine_dbgstr_longlong(id), urlgroupid, reserved ); ++ ++ *urlgroupid = 0xdeadbeef; ++ ++ return NO_ERROR; ++} +\ No newline at end of file +diff --git a/include/http.h b/include/http.h +index 8f284a8..50a10f8 100644 +--- a/include/http.h ++++ b/include/http.h +@@ -59,6 +59,7 @@ ULONG WINAPI HttpTerminate(ULONG,PVOID); + + ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); + ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); ++ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID,PHTTP_URL_GROUP_ID,ULONG); + ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); + ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID); + ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); +-- +1.9.1 + diff --git a/patches/httpapi-HttpCreateServerSession/0003-httpapi-Add-CloseUrlGroup-stub.patch b/patches/httpapi-HttpCreateServerSession/0003-httpapi-Add-CloseUrlGroup-stub.patch new file mode 100644 index 00000000..c7598f14 --- /dev/null +++ b/patches/httpapi-HttpCreateServerSession/0003-httpapi-Add-CloseUrlGroup-stub.patch @@ -0,0 +1,57 @@ +From 1b3f783460eb8aa93e6a8da583dfc8edd3d6de9e Mon Sep 17 00:00:00 2001 +From: Esdras Tarsis +Date: Sat, 30 Mar 2019 19:07:39 -0300 +Subject: [PATCH] httpapi: Add CloseUrlGroup stub. + +--- + dlls/httpapi/httpapi.spec | 1 + + dlls/httpapi/httpapi_main.c | 9 +++++++++ + include/http.h | 1 + + 3 files changed, 11 insertions(+) + +diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec +index bcd09e7..b7d3705 100644 +--- a/dlls/httpapi/httpapi.spec ++++ b/dlls/httpapi/httpapi.spec +@@ -8,6 +8,7 @@ + @ stdcall HttpCreateHttpHandle(ptr long) + @ stdcall HttpCreateServerSession(long ptr long) + @ stdcall HttpCreateUrlGroup(int64 ptr long) ++@ stdcall HttpCloseUrlGroup(int64) + @ stdcall HttpCloseServerSession(int64) + @ stub HttpDeleteConfigGroup + @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) +diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c +index 9280fc1..eca3b00 100644 +--- a/dlls/httpapi/httpapi_main.c ++++ b/dlls/httpapi/httpapi_main.c +@@ -212,4 +212,13 @@ ULONG WINAPI HttpCreateUrlGroup( HTTP_SERVER_SESSION_ID id, HTTP_URL_GROUP_ID *u + *urlgroupid = 0xdeadbeef; + + return NO_ERROR; ++} ++ ++/*********************************************************************** ++ * HttpCloseUrlGroup (HTTPAPI.@) ++ */ ++ULONG WINAPI HttpCloseUrlGroup( HTTP_URL_GROUP_ID urlgroupid ) ++{ ++ FIXME( "(%s): stub!\n", wine_dbgstr_longlong(urlgroupid)); ++ return NO_ERROR; + } +\ No newline at end of file +diff --git a/include/http.h b/include/http.h +index 50a10f8..aa490dc 100644 +--- a/include/http.h ++++ b/include/http.h +@@ -61,6 +61,7 @@ ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); + ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); + ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID,PHTTP_URL_GROUP_ID,ULONG); + ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); ++ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID); + ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID); + ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); + ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); +-- +1.9.1 + diff --git a/patches/httpapi-HttpCreateServerSession/0004-httpapi-Add-CreateRequestQueue-stub.patch b/patches/httpapi-HttpCreateServerSession/0004-httpapi-Add-CreateRequestQueue-stub.patch new file mode 100644 index 00000000..cfdf8c96 --- /dev/null +++ b/patches/httpapi-HttpCreateServerSession/0004-httpapi-Add-CreateRequestQueue-stub.patch @@ -0,0 +1,60 @@ +From 13541d8ff0af57d8b3bc1dfbcb83bbd1020084f9 Mon Sep 17 00:00:00 2001 +From: Esdras Tarsis +Date: Sun, 31 Mar 2019 06:18:21 -0300 +Subject: [PATCH] httpapi: Add CreateRequestQueue stub. + +--- + dlls/httpapi/httpapi.spec | 1 + + dlls/httpapi/httpapi_main.c | 13 ++++++++++++- + include/http.h | 1 + + 3 files changed, 14 insertions(+), 1 deletion(-) + +diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec +index b7d3705..235c4ac 100644 +--- a/dlls/httpapi/httpapi.spec ++++ b/dlls/httpapi/httpapi.spec +@@ -7,6 +7,7 @@ + @ stub HttpCreateFilter + @ stdcall HttpCreateHttpHandle(ptr long) + @ stdcall HttpCreateServerSession(long ptr long) ++@ stdcall HttpCreateRequestQueue(long wstr ptr long ptr) + @ stdcall HttpCreateUrlGroup(int64 ptr long) + @ stdcall HttpCloseUrlGroup(int64) + @ stdcall HttpCloseServerSession(int64) +diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c +index eca3b00..7c83f81 100644 +--- a/dlls/httpapi/httpapi_main.c ++++ b/dlls/httpapi/httpapi_main.c +@@ -221,4 +221,15 @@ ULONG WINAPI HttpCloseUrlGroup( HTTP_URL_GROUP_ID urlgroupid ) + { + FIXME( "(%s): stub!\n", wine_dbgstr_longlong(urlgroupid)); + return NO_ERROR; +-} +\ No newline at end of file ++} ++ ++/*********************************************************************** ++ * HttpCreateRequestQueue (HTTPAPI.@) ++ */ ++ULONG WINAPI HttpCreateRequestQueue( HTTPAPI_VERSION version, PCWSTR name, PSECURITY_ATTRIBUTES security, ULONG flags, PHANDLE request ) ++{ ++ FIXME( "({%d,%d}, %s, %p, 0x%x, %p): stub!\n",version.HttpApiMajorVersion,version.HttpApiMinorVersion,debugstr_w(name),security,flags,request ); ++ ++ *request = (HANDLE)0xbeefdead; ++ return NO_ERROR; ++} +diff --git a/include/http.h b/include/http.h +index aa490dc..9ad7e10 100644 +--- a/include/http.h ++++ b/include/http.h +@@ -60,6 +60,7 @@ ULONG WINAPI HttpTerminate(ULONG,PVOID); + ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); + ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); + ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID,PHTTP_URL_GROUP_ID,ULONG); ++ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION,PCWSTR,PSECURITY_ATTRIBUTES,ULONG,PHANDLE); + ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); + ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID); + ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID); +-- +1.9.1 + diff --git a/patches/httpapi-HttpCreateServerSession/0005-httpapi-Add-SetUrlGroupProperty-stub.patch b/patches/httpapi-HttpCreateServerSession/0005-httpapi-Add-SetUrlGroupProperty-stub.patch new file mode 100644 index 00000000..aa51b923 --- /dev/null +++ b/patches/httpapi-HttpCreateServerSession/0005-httpapi-Add-SetUrlGroupProperty-stub.patch @@ -0,0 +1,75 @@ +From 017787e85014a96f76f0a2a02b577d489e35f08d Mon Sep 17 00:00:00 2001 +From: Esdras Tarsis +Date: Sun, 31 Mar 2019 07:17:26 -0300 +Subject: [PATCH] httpapi: Add SetUrlGroupProperty stub. + +--- + dlls/httpapi/httpapi.spec | 1 + + dlls/httpapi/httpapi_main.c | 10 ++++++++++ + include/http.h | 13 +++++++++++++ + 3 files changed, 24 insertions(+) + +diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec +index 235c4ac..c1d3b6e 100644 +--- a/dlls/httpapi/httpapi.spec ++++ b/dlls/httpapi/httpapi.spec +@@ -50,6 +50,7 @@ + @ stub HttpSetControlChannelInformation + @ stub HttpSetServerContextInformation + @ stdcall HttpSetServiceConfiguration(ptr long ptr long ptr) ++@ stdcall HttpSetUrlGroupProperty(int64 long ptr long) + @ stub HttpShutdownAppPool + @ stub HttpShutdownFilter + @ stdcall HttpTerminate(long ptr) +diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c +index 7c83f81..3cb349f 100644 +--- a/dlls/httpapi/httpapi_main.c ++++ b/dlls/httpapi/httpapi_main.c +@@ -233,3 +233,13 @@ ULONG WINAPI HttpCreateRequestQueue( HTTPAPI_VERSION version, PCWSTR name, PSECU + *request = (HANDLE)0xbeefdead; + return NO_ERROR; + } ++ ++/*********************************************************************** ++ * HttpSetUrlGroupProperty (HTTPAPI.@) ++ */ ++ULONG WINAPI HttpSetUrlGroupProperty( HTTP_URL_GROUP_ID urlgroupid, HTTP_SERVER_PROPERTY property, void *property_info, ULONG property_info_length ) ++{ ++ FIXME( "(%s, %d, %p, %d): stub!\n", wine_dbgstr_longlong(urlgroupid), property, property_info, property_info_length ); ++ return NO_ERROR; ++} ++ +diff --git a/include/http.h b/include/http.h +index 9ad7e10..9ac7309 100644 +--- a/include/http.h ++++ b/include/http.h +@@ -50,6 +50,18 @@ typedef enum _HTTP_SERVICE_CONFIG_ID + HttpServiceConfigMax + } HTTP_SERVICE_CONFIG_ID, *PHTTP_SERVICE_CONFIG_ID; + ++typedef enum _HTTP_SERVER_PROPERTY ++{ ++ HttpServerAuthenticationProperty, ++ HttpServerExtendedAuthenticationProperty, ++ HttpServerQosProperty, ++ HttpServerBindingProperty, ++ HttpServerLoggingProperty, ++ HttpServerStateProperty, ++ HttpServerTimeoutsProperty, ++ HttpServerChannelBindProperty ++} HTTP_SERVER_PROPERTY, *PHTTP_SERVER_PROPERTY; ++ + typedef ULONGLONG HTTP_OPAQUE_ID, *PHTTP_OPAQUE_ID; + typedef HTTP_OPAQUE_ID HTTP_SERVER_SESSION_ID, *PHTTP_SERVER_SESSION_ID; + typedef HTTP_OPAQUE_ID HTTP_URL_GROUP_ID, *PHTTP_URL_GROUP_ID; +@@ -67,6 +79,7 @@ ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID); + ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); + ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); + ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); ++ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID,HTTP_SERVER_PROPERTY,void *,ULONG); + + #ifdef __cplusplus + } +-- +1.9.1 + diff --git a/patches/httpapi-HttpCreateServerSession/0006-httpapi-Add-AddUrlToUrlGroup-stub.patch b/patches/httpapi-HttpCreateServerSession/0006-httpapi-Add-AddUrlToUrlGroup-stub.patch new file mode 100644 index 00000000..19d63b6c --- /dev/null +++ b/patches/httpapi-HttpCreateServerSession/0006-httpapi-Add-AddUrlToUrlGroup-stub.patch @@ -0,0 +1,62 @@ +From 6c61664a2177dcd7ed63d217e9ec6e807d998d3a Mon Sep 17 00:00:00 2001 +From: Esdras Tarsis +Date: Sun, 31 Mar 2019 07:32:57 -0300 +Subject: [PATCH] httpapi: Add AddUrlToUrlGroup stub. + +--- + dlls/httpapi/httpapi.spec | 1 + + dlls/httpapi/httpapi_main.c | 9 +++++++++ + include/http.h | 3 ++- + 3 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec +index c1d3b6e..b337696 100644 +--- a/dlls/httpapi/httpapi.spec ++++ b/dlls/httpapi/httpapi.spec +@@ -1,6 +1,7 @@ + @ stub HttpAddFragmentToCache + @ stdcall HttpAddUrl(ptr wstr ptr) + @ stub HttpAddUrlToConfigGroup ++@ stdcall HttpAddUrlToUrlGroup(int64 wstr int64 long) + @ stub HttpCancelHttpRequest + @ stub HttpCreateAppPool + @ stub HttpCreateConfigGroup +diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c +index 3cb349f..a844139 100644 +--- a/dlls/httpapi/httpapi_main.c ++++ b/dlls/httpapi/httpapi_main.c +@@ -243,3 +243,12 @@ ULONG WINAPI HttpSetUrlGroupProperty( HTTP_URL_GROUP_ID urlgroupid, HTTP_SERVER_ + return NO_ERROR; + } + ++/*********************************************************************** ++ * HttpAddUrlToUrlGroup (HTTPAPI.@) ++ */ ++ULONG WINAPI HttpAddUrlToUrlGroup( HTTP_URL_GROUP_ID urlgroupid, PCWSTR name, HTTP_URL_CONTEXT urlcontext, ULONG reserved ) ++{ ++ FIXME( "(%s, %s, %s, %d): stub!\n", wine_dbgstr_longlong(urlgroupid), debugstr_w(name), wine_dbgstr_longlong(urlcontext), reserved ); ++ return NO_ERROR; ++} ++ +diff --git a/include/http.h b/include/http.h +index 9ac7309..7d86b33 100644 +--- a/include/http.h ++++ b/include/http.h +@@ -64,12 +64,13 @@ typedef enum _HTTP_SERVER_PROPERTY + + typedef ULONGLONG HTTP_OPAQUE_ID, *PHTTP_OPAQUE_ID; + typedef HTTP_OPAQUE_ID HTTP_SERVER_SESSION_ID, *PHTTP_SERVER_SESSION_ID; +-typedef HTTP_OPAQUE_ID HTTP_URL_GROUP_ID, *PHTTP_URL_GROUP_ID; ++typedef HTTP_OPAQUE_ID HTTP_URL_GROUP_ID, *PHTTP_URL_GROUP_ID, HTTP_URL_CONTEXT, *PHTTP_URL_CONTEXT; + + ULONG WINAPI HttpInitialize(HTTPAPI_VERSION,ULONG,PVOID); + ULONG WINAPI HttpTerminate(ULONG,PVOID); + + ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); ++ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID,PCWSTR,HTTP_URL_CONTEXT,ULONG); + ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); + ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID,PHTTP_URL_GROUP_ID,ULONG); + ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION,PCWSTR,PSECURITY_ATTRIBUTES,ULONG,PHANDLE); +-- +1.9.1 + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index b2051786..fb0faa31 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -3562,12 +3562,22 @@ fi # | * [#46549] httpapi: Fake success from HttpCreateServerSession # | # | Modified files: -# | * dlls/httpapi/httpapi_main.c, dlls/httpapi/tests/httpapi.c +# | * dlls/httpapi/httpapi.spec, dlls/httpapi/httpapi_main.c, dlls/httpapi/tests/httpapi.c, include/http.h # | if test "$enable_httpapi_HttpCreateServerSession" -eq 1; then patch_apply httpapi-HttpCreateServerSession/0001-httpapi-Fake-success-from-HttpCreateServerSession.patch + patch_apply httpapi-HttpCreateServerSession/0002-httpapi-Add-CreateUrlGroup-stub.patch + patch_apply httpapi-HttpCreateServerSession/0003-httpapi-Add-CloseUrlGroup-stub.patch + patch_apply httpapi-HttpCreateServerSession/0004-httpapi-Add-CreateRequestQueue-stub.patch + patch_apply httpapi-HttpCreateServerSession/0005-httpapi-Add-SetUrlGroupProperty-stub.patch + patch_apply httpapi-HttpCreateServerSession/0006-httpapi-Add-AddUrlToUrlGroup-stub.patch ( printf '%s\n' '+ { "Alistair Leslie-Hughes", "httpapi: Fake success from HttpCreateServerSession.", 1 },'; + printf '%s\n' '+ { "Esdras Tarsis", "httpapi: Add CreateUrlGroup stub.", 1 },'; + printf '%s\n' '+ { "Esdras Tarsis", "httpapi: Add CloseUrlGroup stub.", 1 },'; + printf '%s\n' '+ { "Esdras Tarsis", "httpapi: Add CreateRequestQueue stub.", 1 },'; + printf '%s\n' '+ { "Esdras Tarsis", "httpapi: Add SetUrlGroupProperty stub.", 1 },'; + printf '%s\n' '+ { "Esdras Tarsis", "httpapi: Add AddUrlToUrlGroup stub.", 1 },'; ) >> "$patchlist" fi