wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 5ea3a044b83c4cd55a3c647f5e80511a85b9f536

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-08-20 08:39:18 +10:00
parent fb4fcb4da6
commit 2007f010ac
8 changed files with 105 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
patches/httpapi-HttpCreateServerSession/0003-httpapi-Add-CloseUrlGroup-stub.patch
View File

@ -1,4 +1,4 @@
From 1b3f783460eb8aa93e6a8da583dfc8edd3d6de9e Mon Sep 17 00:00:00 2001
From 79377cfe32f7b5570e34fa47a5c318f8cb166b4b Mon Sep 17 00:00:00 2001
From: Esdras Tarsis <esdrastarsis@gmail.com>
Date: Sat, 30 Mar 2019 19:07:39 -0300
Subject: [PATCH] httpapi: Add CloseUrlGroup stub.
@ -10,7 +10,7 @@ Subject: [PATCH] httpapi: Add CloseUrlGroup stub.
3 files changed, 11 insertions(+)
diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec
index bcd09e7..b7d3705 100644
index f7c7167dae3..07d378e3199 100644
--- a/dlls/httpapi/httpapi.spec
+++ b/dlls/httpapi/httpapi.spec
@@ -8,6 +8,7 @@
@ -22,13 +22,14 @@ index bcd09e7..b7d3705 100644
@ 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
index b011131aebe..557a496748a 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
@@ -250,5 +250,14 @@ ULONG WINAPI HttpCreateUrlGroup( HTTP_SERVER_SESSION_ID id, HTTP_URL_GROUP_ID *u
*urlgroupid = 0xdeadbeef;
return NO_ERROR;
+ return NO_ERROR;
+}
+
+/***********************************************************************
@ -37,21 +38,21 @@ index 9280fc1..eca3b00 100644
+ULONG WINAPI HttpCloseUrlGroup( HTTP_URL_GROUP_ID urlgroupid )
+{
+ FIXME( "(%s): stub!\n", wine_dbgstr_longlong(urlgroupid));
+ return NO_ERROR;
return NO_ERROR;
}
\ No newline at end of file
diff --git a/include/http.h b/include/http.h
index 50a10f8..aa490dc 100644
index e12f0aa2e72..ff0dcaed5c7 100644
--- a/include/http.h
+++ b/include/http.h
@@ -61,6 +61,7 @@ ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID);
@@ -401,6 +401,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);
ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved);
--
1.9.1
2.17.1

31
patches/httpapi-HttpCreateServerSession/0005-httpapi-Add-SetUrlGroupProperty-stub.patch
View File

@ -1,4 +1,4 @@
From 017787e85014a96f76f0a2a02b577d489e35f08d Mon Sep 17 00:00:00 2001
From 164adf140bfabc0b7dcdbf8524feef82fbedb4cf Mon Sep 17 00:00:00 2001
From: Esdras Tarsis <esdrastarsis@gmail.com>
Date: Sun, 31 Mar 2019 07:17:26 -0300
Subject: [PATCH] httpapi: Add SetUrlGroupProperty stub.
@ -6,11 +6,11 @@ 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(+)
include/http.h | 14 ++++++++++++++
3 files changed, 25 insertions(+)
diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec
index 235c4ac..c1d3b6e 100644
index c94cca893ad..ee1619fed04 100644
--- a/dlls/httpapi/httpapi.spec
+++ b/dlls/httpapi/httpapi.spec
@@ -50,6 +50,7 @@
@ -22,10 +22,10 @@ index 235c4ac..c1d3b6e 100644
@ stub HttpShutdownFilter
@ stdcall HttpTerminate(long ptr)
diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
index 7c83f81..3cb349f 100644
index bde01450017..cc7c0fe066e 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
@@ -272,3 +272,13 @@ ULONG WINAPI HttpCreateRequestQueue( HTTPAPI_VERSION version, PCWSTR name, PSECU
*request = (HANDLE)0xbeefdead;
return NO_ERROR;
}
@ -40,13 +40,16 @@ index 7c83f81..3cb349f 100644
+}
+
diff --git a/include/http.h b/include/http.h
index 9ad7e10..9ac7309 100644
index 71dca3df754..1696d787e65 100644
--- a/include/http.h
+++ b/include/http.h
@@ -50,6 +50,18 @@ typedef enum _HTTP_SERVICE_CONFIG_ID
@@ -65,8 +65,21 @@ typedef enum _HTTP_SERVICE_CONFIG_ID
HttpServiceConfigMax
} HTTP_SERVICE_CONFIG_ID, *PHTTP_SERVICE_CONFIG_ID;
+
#define HTTP_NULL_ID ((ULONGLONG)0)
+typedef enum _HTTP_SERVER_PROPERTY
+{
+ HttpServerAuthenticationProperty,
@ -60,16 +63,16 @@ index 9ad7e10..9ac7309 100644
+} 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);
typedef HTTP_OPAQUE_ID HTTP_CONNECTION_ID, *PHTTP_CONNECTION_ID;
typedef HTTP_OPAQUE_ID HTTP_RAW_CONNECTION_ID, *PHTTP_RAW_CONNECTION_ID;
@@ -412,6 +425,7 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag
ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url);
ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data);
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
2.17.1

27
patches/httpapi-HttpCreateServerSession/0006-httpapi-Add-AddUrlToUrlGroup-stub.patch
View File

@ -1,4 +1,4 @@
From 6c61664a2177dcd7ed63d217e9ec6e807d998d3a Mon Sep 17 00:00:00 2001
From 77f59623245af789b1eb36eb6b09973141b01019 Mon Sep 17 00:00:00 2001
From: Esdras Tarsis <esdrastarsis@gmail.com>
Date: Sun, 31 Mar 2019 07:32:57 -0300
Subject: [PATCH] httpapi: Add AddUrlToUrlGroup stub.
@ -6,11 +6,11 @@ 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(-)
include/http.h | 1 +
3 files changed, 11 insertions(+)
diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec
index c1d3b6e..b337696 100644
index ee1619fed04..d93f4015605 100644
--- a/dlls/httpapi/httpapi.spec
+++ b/dlls/httpapi/httpapi.spec
@@ -1,6 +1,7 @@
@ -22,10 +22,10 @@ index c1d3b6e..b337696 100644
@ stub HttpCreateAppPool
@ stub HttpCreateConfigGroup
diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
index 3cb349f..a844139 100644
index cc7c0fe066e..3913709259e 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_
@@ -282,3 +282,12 @@ ULONG WINAPI HttpSetUrlGroupProperty( HTTP_URL_GROUP_ID urlgroupid, HTTP_SERVER_
return NO_ERROR;
}
@ -39,18 +39,11 @@ index 3cb349f..a844139 100644
+}
+
diff --git a/include/http.h b/include/http.h
index 9ac7309..7d86b33 100644
index 1696d787e65..71c366c7371 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);
@@ -411,6 +411,7 @@ typedef struct _HTTP_LOG_DATA
} HTTP_LOG_DATA, *PHTTP_LOG_DATA;
ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID);
+ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID,PCWSTR,HTTP_URL_CONTEXT,ULONG);
@ -58,5 +51,5 @@ index 9ac7309..7d86b33 100644
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
2.17.1