Signed-off-by: Esdras Tarsis esdrastarsis@gmail.com ---
v2: Added stubs for HttpCreateUrlGroup and HttpCloseUrlGroup to avoid test failures
dlls/httpapi/httpapi.spec | 17 +++++++++++++++++ dlls/httpapi/httpapi_main.c | 18 ++++++++++++++++++ include/http.h | 2 ++ 3 files changed, 37 insertions(+)
diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index 88bc32488a..7d887f8717 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -1,13 +1,19 @@ @ stub HttpAddFragmentToCache @ stdcall HttpAddUrl(ptr wstr ptr) @ stub HttpAddUrlToConfigGroup +@ stub HttpAddUrlToUrlGroup @ stub HttpCancelHttpRequest @ stub HttpCreateAppPool @ stub HttpCreateConfigGroup @ stub HttpCreateFilter @ stdcall HttpCreateHttpHandle(ptr long) +@ stub HttpCreateRequestQueue @ stdcall HttpCreateServerSession(long ptr long) +@ stdcall HttpCreateUrlGroup(int64 ptr long) +@ stub HttpCloseRequestQueue @ stdcall HttpCloseServerSession(int64) +@ stdcall HttpCloseUrlGroup(int64) +@ stub HttpDeclarePush @ stub HttpDeleteConfigGroup @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) @ stub HttpFilterAccept @@ -25,11 +31,15 @@ @ stub HttpOpenAppPool @ stub HttpOpenControlChannel @ stub HttpOpenFilter +@ stub HttpPrepareUrl @ stub HttpQueryAppPoolInformation @ stub HttpQueryConfigGroupInformation @ stub HttpQueryControlChannelInformation +@ stub HttpQueryRequestQueueProperty @ stub HttpQueryServerContextInformation +@ stub HttpQueryServerSessionProperty @ stdcall HttpQueryServiceConfiguration(ptr long ptr long ptr long ptr ptr) +@ stub HttpQueryUrlGroupProperty @ stub HttpReadFragmentFromCache @ stub HttpReceiveClientCertificate @ stdcall HttpReceiveHttpRequest(ptr int64 long ptr long ptr ptr) @@ -38,6 +48,7 @@ @ stub HttpRemoveAllUrlsFromConfigGroup @ stdcall HttpRemoveUrl(ptr wstr) @ stub HttpRemoveUrlFromConfigGroup +@ stub HttpRemoveUrlFromUrlGroup @ stub HttpSendHttpRequest @ stdcall HttpSendHttpResponse(ptr int64 long ptr ptr ptr ptr long ptr ptr) @ stub HttpSendRequestEntityBody @@ -45,10 +56,16 @@ @ stub HttpSetAppPoolInformation @ stub HttpSetConfigGroupInformation @ stub HttpSetControlChannelInformation +@ stub HttpSetRequestQueueProperty @ stub HttpSetServerContextInformation +@ stub HttpSetServerSessionProperty @ stdcall HttpSetServiceConfiguration(ptr long ptr long ptr) +@ stub HttpSetUrlGroupProperty @ stub HttpShutdownAppPool @ stub HttpShutdownFilter +@ stub HttpShutdownRequestQueue @ stdcall HttpTerminate(long ptr) +@ stub HttpUpdateServiceConfiguration @ stub HttpWaitForDemandStart @ stub HttpWaitForDisconnect +@ stub HttpWaitForDisconnectEx diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 5f2a307934..ad8a015144 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -285,3 +285,21 @@ 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( "(id %s, urlgroupid %p, reserved %d): stub!\n", wine_dbgstr_longlong(id), urlgroupid, reserved ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * HttpCloseUrlGroup (HTTPAPI.@) + */ +ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID urlgroupid) +{ + FIXME( "(urlgroupid %s): stub!\n", wine_dbgstr_longlong(urlgroupid)); + return ERROR_CALL_NOT_IMPLEMENTED; +} \ No newline at end of file diff --git a/include/http.h b/include/http.h index 84d3445b67..fbc353b8de 100644 --- a/include/http.h +++ b/include/http.h @@ -400,7 +400,9 @@ typedef struct _HTTP_LOG_DATA ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); +ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID,PHTTP_URL_GROUP_ID,ULONG); ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID); +ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID); ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved); ULONG WINAPI HttpTerminate(ULONG flags, void *reserved);
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=55779
Your paranoid android.
=== debian10 (32 bit report) ===
httpapi: httpapi.c:951: Test failed: Unexpected return value 120. httpapi.c:958: Test failed: Unexpected return value 5. httpapi.c:962: Test failed: Unexpected return value 120. httpapi.c:963: Test failed: Unexpected group id 0. httpapi.c:966: Test failed: Unexpected return value 87. httpapi.c:970: Test failed: Unexpected return value 120. httpapi.c:974: Test failed: Unexpected return value 5. httpapi.c:978: Test failed: Unexpected return value 120. httpapi.c:979: Test failed: Unexpected group id 0. httpapi.c:982: Test failed: Unexpected return value 120. httpapi.c:985: Test failed: Unexpected return value 87.
=== debian10 (32 bit Chinese:China report) ===
httpapi: httpapi.c:951: Test failed: Unexpected return value 120. httpapi.c:958: Test failed: Unexpected return value 5. httpapi.c:962: Test failed: Unexpected return value 120. httpapi.c:963: Test failed: Unexpected group id 0. httpapi.c:966: Test failed: Unexpected return value 87. httpapi.c:970: Test failed: Unexpected return value 120. httpapi.c:974: Test failed: Unexpected return value 5. httpapi.c:978: Test failed: Unexpected return value 120. httpapi.c:979: Test failed: Unexpected group id 0. httpapi.c:982: Test failed: Unexpected return value 120. httpapi.c:985: Test failed: Unexpected return value 87.
=== debian10 (32 bit WoW report) ===
httpapi: httpapi.c:951: Test failed: Unexpected return value 120. httpapi.c:958: Test failed: Unexpected return value 5. httpapi.c:962: Test failed: Unexpected return value 120. httpapi.c:963: Test failed: Unexpected group id 0. httpapi.c:966: Test failed: Unexpected return value 87. httpapi.c:970: Test failed: Unexpected return value 120. httpapi.c:974: Test failed: Unexpected return value 5. httpapi.c:978: Test failed: Unexpected return value 120. httpapi.c:979: Test failed: Unexpected group id 0. httpapi.c:982: Test failed: Unexpected return value 120. httpapi.c:985: Test failed: Unexpected return value 87.
=== debian10 (64 bit WoW report) ===
httpapi: httpapi.c:951: Test failed: Unexpected return value 120. httpapi.c:958: Test failed: Unexpected return value 5. httpapi.c:962: Test failed: Unexpected return value 120. httpapi.c:963: Test failed: Unexpected group id 0. httpapi.c:966: Test failed: Unexpected return value 87. httpapi.c:970: Test failed: Unexpected return value 120. httpapi.c:974: Test failed: Unexpected return value 5. httpapi.c:978: Test failed: Unexpected return value 120. httpapi.c:979: Test failed: Unexpected group id 0. httpapi.c:982: Test failed: Unexpected return value 120. httpapi.c:985: Test failed: Unexpected return value 87.
Hello Esdras,
I have patches to fully implement these functions in my queue, which ideally should be submitted in a week or so. I appreciate the patch, but it'll make things rather easier for me just to wait for my patches.
ἔρρωσο, Zeb
-
Esdras Tarsis -
Marvin -
Zebediah Figura