wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against e54f1cf9fba1ae8748e8e5c577530138baaf9e3d

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2019-08-30 08:34:27 +10:00
parent 4aa460b8cd
commit 841e2a8cda
7 changed files with 37 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
patches/httpapi-HttpCreateServerSession/0001-httpapi-Fake-success-from-HttpCreateServerSession.patch
View File

@ -1,78 +0,0 @@
From 81d946aef87b60fa5a013eda5656c10726c5bd0a Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 30 Jan 2019 16:23:25 +1100
Subject: [PATCH] httpapi: Fake success from HttpCreateServerSession
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46549
---
dlls/httpapi/httpapi_main.c | 10 +++++++++-
dlls/httpapi/tests/httpapi.c | 10 +++++-----
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
index 3ab03995e4..44e72c6f41 100644
--- a/dlls/httpapi/httpapi_main.c
+++ b/dlls/httpapi/httpapi_main.c
@@ -190,7 +190,15 @@ ULONG WINAPI HttpAddUrl( HANDLE handle, PCWSTR url, PVOID reserved )
ULONG WINAPI HttpCreateServerSession( HTTPAPI_VERSION version, HTTP_SERVER_SESSION_ID *id, ULONG reserved )
{
FIXME( "({%d,%d}, %p, %d): stub!\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, id, reserved );
- return ERROR_ACCESS_DENIED;
+
+ if(!id || reserved)
+ return ERROR_INVALID_PARAMETER;
+ if((version.HttpApiMajorVersion != 1 && version.HttpApiMajorVersion != 2) || version.HttpApiMinorVersion != 0)
+ return ERROR_REVISION_MISMATCH;
+
+ *id = 0xabcdefff;
+
+ return NO_ERROR;
}
/***********************************************************************
diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c
index e1437552a8..e090390b89 100644
--- a/dlls/httpapi/tests/httpapi.c
+++ b/dlls/httpapi/tests/httpapi.c
@@ -92,25 +92,26 @@ static void test_HttpCreateServerSession(void)
version.HttpApiMajorVersion = 1;
version.HttpApiMinorVersion = 0;
ret = pHttpCreateServerSession(version, NULL, 0);
-todo_wine
+ ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret);
+
+ version.HttpApiMajorVersion = 1;
+ version.HttpApiMinorVersion = 0;
+ ret = pHttpCreateServerSession(version, &session, 1);
ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret);
version.HttpApiMajorVersion = 1;
version.HttpApiMinorVersion = 1;
ret = pHttpCreateServerSession(version, &session, 0);
-todo_wine
ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret);
version.HttpApiMajorVersion = 3;
version.HttpApiMinorVersion = 0;
ret = pHttpCreateServerSession(version, &session, 0);
-todo_wine
ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret);
version.HttpApiMajorVersion = 2;
version.HttpApiMinorVersion = 0;
ret = pHttpCreateServerSession(version, &session, 0);
-todo_wine
ok(!ret, "Unexpected return value %u.\n", ret);
ret = pHttpCloseServerSession(session);
todo_wine
@@ -119,7 +120,6 @@ todo_wine
version.HttpApiMajorVersion = 1;
version.HttpApiMinorVersion = 0;
ret = pHttpCreateServerSession(version, &session, 0);
-todo_wine
ok(!ret, "Unexpected return value %u.\n", ret);
ret = pHttpCloseServerSession(session);
todo_wine
--
2.20.1

59
patches/httpapi-HttpCreateServerSession/0002-httpapi-Add-CreateUrlGroup-stub.patch
View File

@ -1,59 +0,0 @@
From fd6e709fad9b70a8d19ed6521e3375658c2c951f Mon Sep 17 00:00:00 2001
From: Esdras Tarsis <esdrastarsis@gmail.com>
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

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

@ -1,58 +0,0 @@
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.
---
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 f7c7167dae3..07d378e3199 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 b011131aebe..557a496748a 100644
--- a/dlls/httpapi/httpapi_main.c
+++ b/dlls/httpapi/httpapi_main.c
@@ -250,5 +250,14 @@ 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 e12f0aa2e72..ff0dcaed5c7 100644
--- a/include/http.h
+++ b/include/http.h
@@ -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 HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved);
--
2.17.1

42
patches/httpapi-HttpCreateServerSession/0004-httpapi-Add-CreateRequestQueue-stub.patch
View File

@ -1,16 +1,16 @@
From 13541d8ff0af57d8b3bc1dfbcb83bbd1020084f9 Mon Sep 17 00:00:00 2001
From d7e73fff448bdb04e986eeb5c4613aa393c0ef49 Mon Sep 17 00:00:00 2001
From: Esdras Tarsis <esdrastarsis@gmail.com>
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 ++++++++++++-
dlls/httpapi/httpapi_main.c | 11 +++++++++++
include/http.h | 1 +
3 files changed, 14 insertions(+), 1 deletion(-)
3 files changed, 13 insertions(+)
diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec
index b7d3705..235c4ac 100644
index aad5d58437c..9e2f151be93 100644
--- a/dlls/httpapi/httpapi.spec
+++ b/dlls/httpapi/httpapi.spec
@@ -7,6 +7,7 @@
@ -19,20 +19,16 @@ index b7d3705..235c4ac 100644
@ stdcall HttpCreateServerSession(long ptr long)
+@ stdcall HttpCreateRequestQueue(long wstr ptr long ptr)
@ stdcall HttpCreateUrlGroup(int64 ptr long)
@ stdcall HttpCloseUrlGroup(int64)
@ stdcall HttpCloseServerSession(int64)
@ stdcall HttpCloseUrlGroup(int64)
diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
index eca3b00..7c83f81 100644
index c7d95c9fbad..93822cf8c76 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
+}
+
@@ -557,6 +557,17 @@ ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id)
return ERROR_SUCCESS;
}
+/***********************************************************************
+ * HttpCreateRequestQueue (HTTPAPI.@)
+ */
@ -43,18 +39,22 @@ index eca3b00..7c83f81 100644
+ *request = (HANDLE)0xbeefdead;
+ return NO_ERROR;
+}
+
/***********************************************************************
* HttpCreateUrlGroup (HTTPAPI.@)
*/
diff --git a/include/http.h b/include/http.h
index aa490dc..9ad7e10 100644
index b07c3b03f93..d2f45497fc4 100644
--- a/include/http.h
+++ b/include/http.h
@@ -60,6 +60,7 @@ ULONG WINAPI HttpTerminate(ULONG,PVOID);
ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID);
@@ -401,6 +401,7 @@ ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID);
ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id);
ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id);
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);
ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROUP_ID *group_id, ULONG reserved);
ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED);
--
1.9.1
2.17.1

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

@ -1,4 +1,4 @@
From 164adf140bfabc0b7dcdbf8524feef82fbedb4cf Mon Sep 17 00:00:00 2001
From e562c6f0cc0548bcccf7eeb5f805467905dafecb 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.
@ -10,7 +10,7 @@ Subject: [PATCH] httpapi: Add SetUrlGroupProperty stub.
3 files changed, 25 insertions(+)
diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec
index c94cca893ad..ee1619fed04 100644
index 9e2f151be93..53c993d2161 100644
--- a/dlls/httpapi/httpapi.spec
+++ b/dlls/httpapi/httpapi.spec
@@ -50,6 +50,7 @@
@ -22,12 +22,12 @@ index c94cca893ad..ee1619fed04 100644
@ stub HttpShutdownFilter
@ stdcall HttpTerminate(long ptr)
diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
index bde01450017..cc7c0fe066e 100644
index 93822cf8c76..171c950696f 100644
--- a/dlls/httpapi/httpapi_main.c
+++ b/dlls/httpapi/httpapi_main.c
@@ -272,3 +272,13 @@ ULONG WINAPI HttpCreateRequestQueue( HTTPAPI_VERSION version, PCWSTR name, PSECU
*request = (HANDLE)0xbeefdead;
return NO_ERROR;
@@ -609,3 +609,13 @@ ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id)
return ERROR_SUCCESS;
}
+
+/***********************************************************************
@ -40,7 +40,7 @@ index bde01450017..cc7c0fe066e 100644
+}
+
diff --git a/include/http.h b/include/http.h
index 71dca3df754..1696d787e65 100644
index d2f45497fc4..186d6cb5015 100644
--- a/include/http.h
+++ b/include/http.h
@@ -65,8 +65,21 @@ typedef enum _HTTP_SERVICE_CONFIG_ID

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

@ -1,4 +1,4 @@
From 77f59623245af789b1eb36eb6b09973141b01019 Mon Sep 17 00:00:00 2001
From f1be93e6d88e4bb92b9ba335f5b6d5ca1aa0caa9 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.
@ -10,7 +10,7 @@ Subject: [PATCH] httpapi: Add AddUrlToUrlGroup stub.
3 files changed, 11 insertions(+)
diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec
index ee1619fed04..d93f4015605 100644
index 53c993d2161..886ccb4ce6c 100644
--- a/dlls/httpapi/httpapi.spec
+++ b/dlls/httpapi/httpapi.spec
@@ -1,6 +1,7 @@
@ -22,10 +22,10 @@ index ee1619fed04..d93f4015605 100644
@ stub HttpCreateAppPool
@ stub HttpCreateConfigGroup
diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
index cc7c0fe066e..3913709259e 100644
index 171c950696f..ad7ef1d9bb1 100644
--- a/dlls/httpapi/httpapi_main.c
+++ b/dlls/httpapi/httpapi_main.c
@@ -282,3 +282,12 @@ ULONG WINAPI HttpSetUrlGroupProperty( HTTP_URL_GROUP_ID urlgroupid, HTTP_SERVER_
@@ -619,3 +619,12 @@ ULONG WINAPI HttpSetUrlGroupProperty( HTTP_URL_GROUP_ID urlgroupid, HTTP_SERVER_
return NO_ERROR;
}
@ -39,7 +39,7 @@ index cc7c0fe066e..3913709259e 100644
+}
+
diff --git a/include/http.h b/include/http.h
index 1696d787e65..71c366c7371 100644
index 186d6cb5015..9d0498f8019 100644
--- a/include/http.h
+++ b/include/http.h
@@ -411,6 +411,7 @@ typedef struct _HTTP_LOG_DATA
@ -47,9 +47,9 @@ index 1696d787e65..71c366c7371 100644
ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID);
+ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID,PCWSTR,HTTP_URL_CONTEXT,ULONG);
ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id);
ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id);
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);
--
2.17.1

10
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "124f48d3114fe86f5feda2ce200d87b97c4009de"
echo "e54f1cf9fba1ae8748e8e5c577530138baaf9e3d"
}
# Show version information
@ -4041,19 +4041,13 @@ fi
# | * [#46549] httpapi: Fake success from HttpCreateServerSession
# |
# | Modified files:
# | * dlls/httpapi/httpapi.spec, dlls/httpapi/httpapi_main.c, dlls/httpapi/tests/httpapi.c, include/http.h
# | * dlls/httpapi/httpapi.spec, dlls/httpapi/httpapi_main.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 },';