Sorry, didn't quite mean to send this fifth patch yet; it probably needs some fixing up first.
On 8/21/19 10:53 PM, Zebediah Figura wrote:
Signed-off-by: Zebediah Figura z.figura12@gmail.com
dlls/http.sys/http.c | 112 +++++++++++++++++++++++++++++++++++++++++-- include/wine/http.h | 35 ++++++++++++++ 2 files changed, 144 insertions(+), 3 deletions(-) create mode 100644 include/wine/http.h
diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 5aea6035bd..a155804471 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -18,12 +18,10 @@
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
- #include "ntstatus.h" #define WIN32_NO_STATUS
+#include "wine/http.h" #include "winternl.h" -#include "winioctl.h" #include "ddk/wdm.h" #include "wine/debug.h" #include "wine/heap.h" @@ -46,10 +44,116 @@ DECLARE_CRITICAL_SECTION(http_cs); struct request_queue { struct list entry;
HTTP_URL_CONTEXT context;
char *url; };
static struct list request_queues = LIST_INIT(request_queues);
+static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) +{
- const struct http_add_url_params *params = irp->AssociatedIrp.SystemBuffer;
- unsigned short port;
- char *url, *endptr;
- int count = 0;
- const char *p;
- TRACE("host %s, context %#I64x.\n", debugstr_a(params->url), params->context);
- if (!strncmp(params->url, "https://", 8))
- {
FIXME("HTTPS is not implemented.\n");return STATUS_NOT_IMPLEMENTED;- }
- else if (strncmp(params->url, "http://", 7) || !strchr(params->url + 7, ':')
|| params->url[strlen(params->url) - 1] != '/')return STATUS_INVALID_PARAMETER;- if (!(port = strtol(strchr(params->url + 7, ':') + 1, &endptr, 10)) || *endptr != '/')
return STATUS_INVALID_PARAMETER;- if (!(url = heap_alloc(strlen(params->url))))
return STATUS_NO_MEMORY;- strcpy(url, params->url);
- for (p = url; *p; ++p)
if (*p == '/') ++count;- if (count > 3)
FIXME("Binding to relative URIs is not implemented; binding to all URIs instead.\n");- EnterCriticalSection(&http_cs);
- if (queue->url && !strcmp(queue->url, url))
- {
LeaveCriticalSection(&http_cs);heap_free(url);return STATUS_OBJECT_NAME_COLLISION;- }
- else if (queue->url)
- {
FIXME("Binding to multiple URLs is not implemented.\n");LeaveCriticalSection(&http_cs);heap_free(url);return STATUS_NOT_IMPLEMENTED;- }
- queue->url = url;
- queue->context = params->context;
- LeaveCriticalSection(&http_cs);
- return STATUS_SUCCESS;
+}
+static NTSTATUS http_remove_url(struct request_queue *queue, IRP *irp) +{
- const char *url = irp->AssociatedIrp.SystemBuffer;
- TRACE("host %s.\n", debugstr_a(url));
- EnterCriticalSection(&http_cs);
- if (!queue->url || strcmp(url, queue->url))
- {
LeaveCriticalSection(&http_cs);return STATUS_OBJECT_NAME_NOT_FOUND;- }
- heap_free(queue->url);
- queue->url = NULL;
- LeaveCriticalSection(&http_cs);
- return STATUS_SUCCESS;
+}
+static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) +{
- IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp);
- struct request_queue *queue = stack->FileObject->FsContext;
- NTSTATUS ret;
- switch (stack->Parameters.DeviceIoControl.IoControlCode)
- {
- case IOCTL_HTTP_ADD_URL:
ret = http_add_url(queue, irp);break;- case IOCTL_HTTP_REMOVE_URL:
ret = http_remove_url(queue, irp);break;- default:
FIXME("Unhandled ioctl %#x.\n", stack->Parameters.DeviceIoControl.IoControlCode);ret = STATUS_NOT_IMPLEMENTED;- }
- if (ret != STATUS_PENDING)
- {
irp->IoStatus.Status = ret;IoCompleteRequest(irp, IO_NO_INCREMENT);- }
- else
IoMarkIrpPending(irp);- return ret;
+}
- static NTSTATUS WINAPI dispatch_create(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp);
@@ -76,6 +180,7 @@ static void close_queue(struct request_queue *queue) list_remove(&queue->entry); LeaveCriticalSection(&http_cs);
- heap_free(queue->url); heap_free(queue); }
@@ -127,6 +232,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path)
driver->MajorFunction[IRP_MJ_CREATE] = dispatch_create; driver->MajorFunction[IRP_MJ_CLOSE] = dispatch_close;
driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = dispatch_ioctl; driver->DriverUnload = unload;
return STATUS_SUCCESS;
diff --git a/include/wine/http.h b/include/wine/http.h new file mode 100644 index 0000000000..354c289387 --- /dev/null +++ b/include/wine/http.h @@ -0,0 +1,35 @@ +/*
- Copyright 2019 Zebediah Figura
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
+#ifndef __WINE_WINE_HTTP_H +#define __WINE_WINE_HTTP_H
+#include <windef.h> +#include <http.h> +#include <winioctl.h>
+#define IOCTL_HTTP_ADD_URL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, 0) +#define IOCTL_HTTP_REMOVE_URL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, 0)
+struct http_add_url_params +{
- HTTP_URL_CONTEXT context;
- char url[1];
+};
+#endif