August 2019 - Wine-commits - list.winehq.org

Zhiyi Zhang : winemac.drv: Add adapter initialization functions.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 039a7715f30ecc892f80df9c7aae24aa2530a877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=039a7715f30ecc892f80df9c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 29 16:11:39 2019 -0500 winemac.drv: Add adapter initialization functions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 99 +++++++++++++++++++++++++++++ dlls/winemac.drv/display.c | 134 +++++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/macdrv_cocoa.h | 15 +++++ 3 files changed, 241 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=039a7715f30ecc892f80…

1 0

Zhiyi Zhang : winemac.drv: Add monitor initialization functions.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 83a2ff33b316fa3a5751e706996dac25cd602b66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83a2ff33b316fa3a5751e706… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 29 16:11:40 2019 -0500 winemac.drv: Add monitor initialization functions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 109 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/display.c | 103 ++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/macdrv_cocoa.h | 14 +++++ dlls/winemac.drv/macdrv_main.c | 2 + 4 files changed, 223 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=83a2ff33b316fa3a5751…

1 0

Zhiyi Zhang : winemac.drv: Handle display device change events.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: b8415e0310595d239b5bcef4e74efd1f0972fac0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8415e0310595d239b5bcef4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 29 16:11:41 2019 -0500 winemac.drv: Handle display device change events. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 8 ++++++-- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_main.c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index a953e0c..236f63d 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -946,6 +946,8 @@ better: SendMessageW(GetDesktopWindow(), WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, MAKELPARAM(width, height)); ret = DISP_CHANGE_SUCCESSFUL; + + macdrv_init_display_devices(TRUE); } else { @@ -1452,6 +1454,8 @@ void macdrv_displays_changed(const macdrv_event *event) free_display_mode_descriptor(desc); CGDisplayModeRelease(mode); + macdrv_init_display_devices(TRUE); + if (is_original && retina_enabled) { width *= 2; @@ -1728,7 +1732,7 @@ static void cleanup_devices(void) * * Initialize display device registry data. */ -void macdrv_init_display_devices(void) +void macdrv_init_display_devices(BOOL force) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; @@ -1755,7 +1759,7 @@ void macdrv_init_display_devices(void) } /* Avoid unnecessary reinit */ - if (disposition != REG_CREATED_NEW_KEY) + if (!force && disposition != REG_CREATED_NEW_KEY) goto done; TRACE("\n"); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index b9f58b9..a7c0b4c 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -223,7 +223,7 @@ extern void macdrv_status_item_mouse_button(const macdrv_event *event) DECLSPEC_ extern void macdrv_status_item_mouse_move(const macdrv_event *event) DECLSPEC_HIDDEN; extern void check_retina_status(void) DECLSPEC_HIDDEN; -extern void macdrv_init_display_devices(void) DECLSPEC_HIDDEN; +extern void macdrv_init_display_devices(BOOL force) DECLSPEC_HIDDEN; /************************************************************************** * Mac IME driver diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 0385784..694a46b 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -299,7 +299,7 @@ static BOOL process_attach(void) return FALSE; } - macdrv_init_display_devices(); + macdrv_init_display_devices(FALSE); return TRUE; }

1 0

Zhiyi Zhang : winemac.drv: Use generic EnumDisplayMonitors and GetMonitorInfo.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 792521f33b2786cb100cb202dcb4181a579ef3b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=792521f33b2786cb100cb202… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 29 16:11:42 2019 -0500 winemac.drv: Use generic EnumDisplayMonitors and GetMonitorInfo. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 2 + dlls/winemac.drv/display.c | 154 +++++--------------------------------- dlls/winemac.drv/macdrv_cocoa.h | 4 + dlls/winemac.drv/winemac.drv.spec | 2 - 4 files changed, 26 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=792521f33b2786cb100c…

1 0

Zebediah Figura : httpapi: Partially implement HttpSetUrlGroupProperty().
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: f0458b214878fe92148b92080efdee1f1876907e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0458b214878fe92148b9208… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 29 19:58:04 2019 -0500 httpapi: Partially implement HttpSetUrlGroupProperty(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi.spec | 1 + dlls/httpapi/httpapi_main.c | 30 ++++++++++++++++++++++++++++-- include/http.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index aad5d58..b3f3148 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -49,6 +49,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 c7d95c9..19049c6 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -474,6 +474,7 @@ ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, struct url_group { struct list entry, session_entry; + HANDLE queue; }; static struct list url_groups = LIST_INIT(url_groups); @@ -565,7 +566,8 @@ ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROU struct server_session *session; struct url_group *group; - TRACE("session_id %#I64x, group_id %p, reserved %#x.\n", session_id, group_id, reserved); + TRACE("session_id %s, group_id %p, reserved %#x.\n", + wine_dbgstr_longlong(session_id), group_id, reserved); if (!(session = get_server_session(session_id))) return ERROR_INVALID_PARAMETER; @@ -587,7 +589,7 @@ ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id) { struct url_group *group; - TRACE("id %#I64x.\n", id); + TRACE("id %s.\n", wine_dbgstr_longlong(id)); if (!(group = get_url_group(id))) return ERROR_INVALID_PARAMETER; @@ -598,3 +600,27 @@ ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id) return ERROR_SUCCESS; } + +/*********************************************************************** + * HttpSetUrlGroupProperty (HTTPAPI.@) + */ +ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG length) +{ + struct url_group *group = get_url_group(id); + const HTTP_BINDING_INFO *info = value; + + TRACE("id %s, property %u, value %p, length %u.\n", + wine_dbgstr_longlong(id), property, value, length); + + if (property != HttpServerBindingProperty) + { + FIXME("Unhandled property %u.\n", property); + return ERROR_CALL_NOT_IMPLEMENTED; + } + + TRACE("Binding to queue %p.\n", info->RequestQueueHandle); + + group->queue = info->RequestQueueHandle; + + return ERROR_SUCCESS; +} diff --git a/include/http.h b/include/http.h index b07c3b0..60494a1 100644 --- a/include/http.h +++ b/include/http.h @@ -397,6 +397,33 @@ typedef struct _HTTP_LOG_DATA HTTP_LOG_DATA_TYPE Type; } HTTP_LOG_DATA, *PHTTP_LOG_DATA; +typedef enum _HTTP_SERVER_PROPERTY +{ + HttpServerAuthenticationProperty, + HttpServerLoggingProperty, + HttpServerQosProperty, + HttpServerTimeoutsProperty, + HttpServerQueueLengthProperty, + HttpServerStateProperty, + HttpServer503VerbosityProperty, + HttpServerBindingProperty, + HttpServerExtendedAuthenticationProperty, + HttpServerListenEndpointProperty, + HttpServerChannelBindProperty, + HttpServerProtectionLevelProperty, +} HTTP_SERVER_PROPERTY, *PHTTP_SERVER_PROPERTY; + +typedef struct _HTTP_PROPERTY_FLAGS +{ + ULONG Present : 1; +} HTTP_PROPERTY_FLAGS, *PHTTP_PROPERTY_FLAGS; + +typedef struct _HTTP_BINDING_INFO +{ + HTTP_PROPERTY_FLAGS Flags; + HANDLE RequestQueueHandle; +} HTTP_BINDING_INFO, *PHTTP_BINDING_INFO; + ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id); ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id); @@ -411,6 +438,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 id, HTTP_SERVER_PROPERTY property, void *value, ULONG length); #ifdef __cplusplus }

1 0

Zebediah Figura : httpapi: Implement HttpAddUrlToUrlGroup() and HttpRemoveUrlFromUrlGroup().
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: f18e026e51062035642e930a1e325839ff02c281 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f18e026e51062035642e930a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 29 19:58:05 2019 -0500 httpapi: Implement HttpAddUrlToUrlGroup() and HttpRemoveUrlFromUrlGroup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi.spec | 2 ++ dlls/httpapi/httpapi_main.c | 87 ++++++++++++++++++++++++++++++++++++++++----- include/http.h | 2 ++ 3 files changed, 82 insertions(+), 9 deletions(-) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index b3f3148..ae3406f 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 @@ -40,6 +41,7 @@ @ stub HttpRemoveAllUrlsFromConfigGroup @ stdcall HttpRemoveUrl(ptr wstr) @ stub HttpRemoveUrlFromConfigGroup +@ stdcall HttpRemoveUrlFromUrlGroup(int64 wstr long) @ stub HttpSendHttpRequest @ stdcall HttpSendHttpResponse(ptr int64 long ptr ptr ptr ptr long ptr ptr) @ stub HttpSendRequestEntityBody diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 19049c6..353632e 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -27,6 +27,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(httpapi); +static WCHAR *heap_strdupW(const WCHAR *str) +{ + int len = wcslen(str) + 1; + WCHAR *ret = heap_alloc(len * sizeof(WCHAR)); + wcscpy(ret, str); + return ret; +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) { switch(reason) @@ -247,21 +255,13 @@ ULONG WINAPI HttpAddUrl(HANDLE queue, const WCHAR *url, void *reserved) return add_url(queue, url, 0); } -/*********************************************************************** - * HttpRemoveUrl (HTTPAPI.@) - */ -ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *urlW) +static ULONG remove_url(HANDLE queue, const WCHAR *urlW) { ULONG ret = ERROR_SUCCESS; OVERLAPPED ovl = {}; char *url; int len; - TRACE("queue %p, url %s.\n", queue, debugstr_w(urlW)); - - if (!queue) - return ERROR_INVALID_PARAMETER; - len = WideCharToMultiByte(CP_ACP, 0, urlW, -1, NULL, 0, NULL, NULL); if (!(url = heap_alloc(len))) return ERROR_OUTOFMEMORY; @@ -277,6 +277,19 @@ ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *urlW) } /*********************************************************************** + * HttpRemoveUrl (HTTPAPI.@) + */ +ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url) +{ + TRACE("queue %p, url %s.\n", queue, debugstr_w(url)); + + if (!queue) + return ERROR_INVALID_PARAMETER; + + return remove_url(queue, url); +} + +/*********************************************************************** * HttpReceiveHttpRequest (HTTPAPI.@) */ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, @@ -475,6 +488,8 @@ struct url_group { struct list entry, session_entry; HANDLE queue; + WCHAR *url; + HTTP_URL_CONTEXT context; }; static struct list url_groups = LIST_INIT(url_groups); @@ -622,5 +637,59 @@ ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY group->queue = info->RequestQueueHandle; + if (group->url) + add_url(group->queue, group->url, group->context); + + return ERROR_SUCCESS; +} + +/*********************************************************************** + * HttpAddUrlToUrlGroup (HTTPAPI.@) + */ +ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, + HTTP_URL_CONTEXT context, ULONG reserved) +{ + struct url_group *group = get_url_group(id); + + TRACE("id %s, url %s, context %s, reserved %#x.\n", wine_dbgstr_longlong(id), + debugstr_w(url), wine_dbgstr_longlong(context), reserved); + + if (group->url) + { + FIXME("Multiple URLs are not handled!\n"); + return ERROR_CALL_NOT_IMPLEMENTED; + } + + if (!(group->url = heap_strdupW(url))) + return ERROR_OUTOFMEMORY; + group->context = context; + + if (group->queue) + return add_url(group->queue, url, context); + + return ERROR_SUCCESS; +} + +/*********************************************************************** + * HttpRemoveUrlFromUrlGroup (HTTPAPI.@) + */ +ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, ULONG flags) +{ + struct url_group *group = get_url_group(id); + + TRACE("id %s, url %s, flags %#x.\n", wine_dbgstr_longlong(id), debugstr_w(url), flags); + + if (!group->url) + return ERROR_FILE_NOT_FOUND; + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + heap_free(group->url); + group->url = NULL; + + if (group->queue) + return remove_url(group->queue, url); + return ERROR_SUCCESS; } diff --git a/include/http.h b/include/http.h index 60494a1..c4bb107 100644 --- a/include/http.h +++ b/include/http.h @@ -425,6 +425,7 @@ typedef struct _HTTP_BINDING_INFO } HTTP_BINDING_INFO, *PHTTP_BINDING_INFO; ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); +ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, HTTP_URL_CONTEXT context, ULONG reserved); ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id); ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id); ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); @@ -436,6 +437,7 @@ ULONG WINAPI HttpTerminate(ULONG flags, void *reserved); ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_REQUEST *request, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url); +ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, ULONG flags); 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 id, HTTP_SERVER_PROPERTY property, void *value, ULONG length);

1 0

Zebediah Figura : httpapi: Implement HttpCreateRequestQueue() and HttpCloseRequestQueue().
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: b19f4488f6d73e5c4ebdeee44845c54832477ecb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b19f4488f6d73e5c4ebdeee4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 29 19:58:06 2019 -0500 httpapi: Implement HttpCreateRequestQueue() and HttpCloseRequestQueue(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47476 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46549 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi.spec | 2 ++ dlls/httpapi/httpapi_main.c | 42 +++++++++++++++++++++++++++++++++++++++++- include/http.h | 5 +++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index ae3406f..e2f165c 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -7,8 +7,10 @@ @ stub HttpCreateConfigGroup @ stub HttpCreateFilter @ stdcall HttpCreateHttpHandle(ptr long) +@ stdcall HttpCreateRequestQueue(long wstr ptr long ptr) @ stdcall HttpCreateServerSession(long ptr long) @ stdcall HttpCreateUrlGroup(int64 ptr long) +@ stdcall HttpCloseRequestQueue(ptr) @ stdcall HttpCloseServerSession(int64) @ stdcall HttpCloseUrlGroup(int64) @ stub HttpDeleteConfigGroup diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 353632e..3b0b86f 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(httpapi); +static const WCHAR device_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p','\\','R','e','q','Q','u','e','u','e',0}; + static WCHAR *heap_strdupW(const WCHAR *str) { int len = wcslen(str) + 1; @@ -207,7 +209,6 @@ ULONG WINAPI HttpSetServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID */ ULONG WINAPI HttpCreateHttpHandle(HANDLE *handle, ULONG reserved) { - static const WCHAR device_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p','\\','R','e','q','Q','u','e','u','e',0}; OBJECT_ATTRIBUTES attr = {sizeof(attr)}; UNICODE_STRING string; IO_STATUS_BLOCK iosb; @@ -693,3 +694,42 @@ ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, U return ERROR_SUCCESS; } + +/*********************************************************************** + * HttpCreateRequestQueue (HTTPAPI.@) + */ +ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, + SECURITY_ATTRIBUTES *sa, ULONG flags, HANDLE *handle) +{ + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + UNICODE_STRING string; + IO_STATUS_BLOCK iosb; + + TRACE("version %u.%u, name %s, sa %p, flags %#x, handle %p.\n", + version.HttpApiMajorVersion, version.HttpApiMinorVersion, + debugstr_w(name), sa, flags, handle); + + if (name) + FIXME("Unhandled name %s.\n", debugstr_w(name)); + if (flags) + FIXME("Unhandled flags %#x.\n", flags); + + RtlInitUnicodeString(&string, device_nameW); + attr.ObjectName = &string; + if (sa && sa->bInheritHandle) + attr.Attributes |= OBJ_INHERIT; + attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; + return RtlNtStatusToDosError(NtCreateFile(handle, 0, &attr, &iosb, NULL, + FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0)); +} + +/*********************************************************************** + * HttpCloseRequestQueue (HTTPAPI.@) + */ +ULONG WINAPI HttpCloseRequestQueue(HANDLE handle) +{ + TRACE("handle %p.\n", handle); + if (!CloseHandle(handle)) + return GetLastError(); + return ERROR_SUCCESS; +} diff --git a/include/http.h b/include/http.h index c4bb107..7586d0c 100644 --- a/include/http.h +++ b/include/http.h @@ -37,6 +37,9 @@ typedef struct _HTTPAPI_VERSION #define HTTPAPI_VERSION_1 {1,0} #define HTTPAPI_VERSION_2 {2,0} +#define HTTP_CREATE_REQUEST_QUEUE_FLAG_OPEN_EXISTING 0x00000001 +#define HTTP_CREATE_REQUEST_QUEUE_FLAG_CONTROLLER 0x00000002 + #define HTTP_INITIALIZE_SERVER 0x00000001 #define HTTP_INITIALIZE_CONFIG 0x00000002 @@ -426,9 +429,11 @@ typedef struct _HTTP_BINDING_INFO ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, HTTP_URL_CONTEXT context, ULONG reserved); +ULONG WINAPI HttpCloseRequestQueue(HANDLE handle); ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id); ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id); ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); +ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, SECURITY_ATTRIBUTES *sa, ULONG flags, HANDLE *handle); ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); 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 0

Zebediah Figura : httpapi/tests: Add some tests for version 2 request queues.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 12f1c2de1c6f5ba7a850d68c6ef2b43510a65be8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12f1c2de1c6f5ba7a850d68c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 29 19:58:07 2019 -0500 httpapi/tests: Add some tests for version 2 request queues. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 343 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 317 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12f1c2de1c6f5ba7a850…

1 0

Zebediah Figura : httpapi: Prefer the builtin version.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 44a136cf9d9ecebd69305569641ebedc72d5aa48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44a136cf9d9ecebd69305569… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 29 19:58:08 2019 -0500 httpapi: Prefer the builtin version. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 3b0b86f..0d6895b 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -37,19 +37,6 @@ static WCHAR *heap_strdupW(const WCHAR *str) return ret; } -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -} - /*********************************************************************** * HttpInitialize (HTTPAPI.@) *

1 0

Zebediah Figura : amstream/tests: Separate and expand tests for IAMMultiMediaStream::AddMediaStream().
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 6fc75827132146515bc4a10cb37a31f1c5cad768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fc75827132146515bc4a10c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 29 22:49:24 2019 -0500 amstream/tests: Separate and expand tests for IAMMultiMediaStream::AddMediaStream(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 626 +++++++++++++++++++++++++++++++++++------ 1 file changed, 547 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6fc75827132146515bc4…

1 0