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

Zhiyi Zhang : winemac.drv: Support GPU initialization via Metal.
by Alexandre Julliard Aug. 30, 2019

Aug. 30, 2019

Module: wine Branch: master Commit: 0699089f0ea65c8d66b2cdcdb0731c432720969e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0699089f0ea65c8d66b2cdcd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 29 16:11:38 2019 -0500 winemac.drv: Support GPU initialization via Metal. 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 | 117 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index b8f2730..68ea897 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -18,7 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #import <AppKit/AppKit.h> +#ifdef HAVE_METAL_METAL_H +#import <Metal/Metal.h> +#endif #include "macdrv_cocoa.h" @@ -227,6 +232,113 @@ done: return ret; } +#ifdef HAVE_METAL_METAL_H + +/*********************************************************************** + * macdrv_get_gpu_info_from_registry_id + * + * Get GPU information from a Metal device registry id. + * + * Returns non-zero value on failure. + */ +static int macdrv_get_gpu_info_from_registry_id(struct macdrv_gpu* gpu, uint64_t registry_id) +{ + int ret; + io_registry_entry_t entry; + + entry = IOServiceGetMatchingService(kIOMasterPortDefault, IORegistryEntryIDMatching(registry_id)); + ret = macdrv_get_gpu_info_from_entry(gpu, entry); + IOObjectRelease(entry); + return ret; +} + +/*********************************************************************** + * macdrv_get_gpus_from_metal + * + * Get a list of GPUs from Metal. + * + * Returns non-zero value on failure with parameters unchanged and zero on success. + */ +static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) +{ + struct macdrv_gpu* gpus = NULL; + struct macdrv_gpu primary_gpu; + id<MTLDevice> primary_device; + BOOL hide_integrated = FALSE; + int primary_index = 0, i; + int gpu_count = 0; + int ret = -1; + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + + /* Test if Metal is available */ + if (&MTLCopyAllDevices == NULL) + goto done; + NSArray<id<MTLDevice>>* devices = [MTLCopyAllDevices() autorelease]; + if (!devices.count || ![devices[0] respondsToSelector:@selector(registryID)]) + goto done; + + gpus = calloc(devices.count, sizeof(*gpus)); + if (!gpus) + goto done; + + /* Use MTLCreateSystemDefaultDevice instead of CGDirectDisplayCopyCurrentMetalDevice(CGMainDisplayID()) to get + * the primary GPU because we need to hide the integrated GPU for an automatic graphic switching pair to avoid apps + * using the integrated GPU. This is the behavior of Windows on a Mac. */ + primary_device = [MTLCreateSystemDefaultDevice() autorelease]; + if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, primary_device.registryID)) + goto done; + + /* Hide the integrated GPU if the system default device is a dedicated GPU */ + if (!primary_device.isLowPower) + { + hide_integrated = TRUE; + } + + for (i = 0; i < devices.count; i++) + { + if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], devices[i].registryID)) + goto done; + + if (hide_integrated && devices[i].isLowPower) + { + continue; + } + + if (gpus[gpu_count].id == primary_gpu.id) + primary_index = gpu_count; + + gpu_count++; + } + + /* Make sure the first GPU is primary */ + if (primary_index) + { + struct macdrv_gpu tmp; + tmp = gpus[0]; + gpus[0] = gpus[primary_index]; + gpus[primary_index] = tmp; + } + + *new_gpus = gpus; + *count = gpu_count; + ret = 0; +done: + if (ret) + macdrv_free_gpus(gpus); + [pool release]; + return ret; +} + +#else + +static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) +{ + TRACE("Metal support not compiled in\n"); + return -1; +} + +#endif + /*********************************************************************** * macdrv_get_gpu_info_from_display_id * @@ -348,7 +460,10 @@ done: */ int macdrv_get_gpus(struct macdrv_gpu** new_gpus, int* count) { - return macdrv_get_gpus_from_iokit(new_gpus, count); + if (!macdrv_get_gpus_from_metal(new_gpus, count)) + return 0; + else + return macdrv_get_gpus_from_iokit(new_gpus, count); } /***********************************************************************

1 0

Jactry Zeng : mfplat: Implement MFCreateDXGIDeviceManager().
by Alexandre Julliard Aug. 30, 2019

Aug. 30, 2019

Module: wine Branch: master Commit: 645cf84677428fd4541387eed79ae7dbdedb5a4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=645cf84677428fd4541387ee… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Aug 29 23:49:17 2019 +0800 mfplat: Implement MFCreateDXGIDeviceManager(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 144 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 41 +++++++++++++ include/mfapi.h | 1 + include/mfobjects.idl | 17 ++++++ 5 files changed, 204 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index f8f4b50..706251b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -7617,3 +7617,147 @@ HRESULT WINAPI CreatePropertyStore(IPropertyStore **store) return S_OK; } + +struct dxgi_device_manager +{ + IMFDXGIDeviceManager IMFDXGIDeviceManager_iface; + LONG refcount; + UINT token; +}; + +static struct dxgi_device_manager *impl_from_IMFDXGIDeviceManager(IMFDXGIDeviceManager *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_device_manager, IMFDXGIDeviceManager_iface); +} + +static HRESULT WINAPI dxgi_device_manager_QueryInterface(IMFDXGIDeviceManager *iface, REFIID riid, void **obj) +{ + TRACE("(%p, %s, %p).\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFDXGIDeviceManager) || + IsEqualGUID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFDXGIDeviceManager_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dxgi_device_manager_AddRef(IMFDXGIDeviceManager *iface) +{ + struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); + ULONG refcount = InterlockedIncrement(&manager->refcount); + + TRACE("(%p) ref=%u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI dxgi_device_manager_Release(IMFDXGIDeviceManager *iface) +{ + struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); + ULONG refcount = InterlockedDecrement(&manager->refcount); + + TRACE("(%p) ref=%u.\n", iface, refcount); + + if (!refcount) + { + heap_free(manager); + } + + return refcount; +} + +static HRESULT WINAPI dxgi_device_manager_CloseDeviceHandle(IMFDXGIDeviceManager *iface, HANDLE device) +{ + FIXME("(%p, %p): stub.\n", iface, device); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dxgi_device_manager_GetVideoService(IMFDXGIDeviceManager *iface, HANDLE device, + REFIID riid, void **service) +{ + FIXME("(%p, %p, %s, %p): stub.\n", iface, device, debugstr_guid(riid), service); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dxgi_device_manager_LockDevice(IMFDXGIDeviceManager *iface, HANDLE device, + REFIID riid, void **ppv, BOOL block) +{ + FIXME("(%p, %p, %s, %p, %d): stub.\n", iface, device, wine_dbgstr_guid(riid), ppv, block); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dxgi_device_manager_OpenDeviceHandle(IMFDXGIDeviceManager *iface, HANDLE *device) +{ + FIXME("(%p, %p): stub.\n", iface, device); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dxgi_device_manager_ResetDevice(IMFDXGIDeviceManager *iface, IUnknown *device, UINT token) +{ + FIXME("(%p, %p, %u): stub.\n", iface, device, token); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dxgi_device_manager_TestDevice(IMFDXGIDeviceManager *iface, HANDLE device) +{ + FIXME("(%p, %p): stub.\n", iface, device); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dxgi_device_manager_UnlockDevice(IMFDXGIDeviceManager *iface, HANDLE device, BOOL state) +{ + FIXME("(%p, %p, %d): stub.\n", iface, device, state); + + return E_NOTIMPL; +} + +static const IMFDXGIDeviceManagerVtbl dxgi_device_manager_vtbl = +{ + dxgi_device_manager_QueryInterface, + dxgi_device_manager_AddRef, + dxgi_device_manager_Release, + dxgi_device_manager_CloseDeviceHandle, + dxgi_device_manager_GetVideoService, + dxgi_device_manager_LockDevice, + dxgi_device_manager_OpenDeviceHandle, + dxgi_device_manager_ResetDevice, + dxgi_device_manager_TestDevice, + dxgi_device_manager_UnlockDevice, +}; + +HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager) +{ + struct dxgi_device_manager *object; + + TRACE("(%p, %p).\n", token, manager); + + if (!token || !manager) + return E_POINTER; + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFDXGIDeviceManager_iface.lpVtbl = &dxgi_device_manager_vtbl; + object->refcount = 1; + object->token = GetTickCount(); + + TRACE("Created device manager: %p, token: %u.\n", object, object->token); + + *token = object->token; + *manager = &object->IMFDXGIDeviceManager_iface; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 2f16bbd..cc440c5 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -42,6 +42,7 @@ @ stdcall MFCreateAttributes(ptr long) @ stub MFCreateAudioMediaType @ stdcall MFCreateCollection(ptr) +@ stdcall MFCreateDXGIDeviceManager(ptr ptr) @ stdcall MFCreateEventQueue(ptr) @ stdcall MFCreateFile(long long long wstr ptr) @ stub MFCreateLegacyMediaBufferOnMFMediaBuffer diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index b4ba6b6..e0029ab 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -58,6 +58,7 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) static HRESULT (WINAPI *pMFCopyImage)(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); +static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); static void* (WINAPI *pMFHeapAlloc)(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); @@ -510,6 +511,7 @@ static void init_functions(void) X(MFAddPeriodicCallback); X(MFAllocateSerialWorkQueue); X(MFCopyImage); + X(MFCreateDXGIDeviceManager); X(MFCreateSourceResolver); X(MFCreateMFByteStreamOnStream); X(MFHeapAlloc); @@ -3704,6 +3706,44 @@ if (0) ok(!refcount, "Unexpected refcount %u.\n", refcount); } +static void test_dxgi_device_manager(void) +{ + IMFDXGIDeviceManager *manager, *manager2; + UINT token, token2; + HRESULT hr; + + if (!pMFCreateDXGIDeviceManager) + { + win_skip("MFCreateDXGIDeviceManager not found.\n"); + return; + } + + hr = pMFCreateDXGIDeviceManager(NULL, &manager); + ok(hr == E_POINTER, "MFCreateDXGIDeviceManager should failed: %#x.\n", hr); + + token = 0; + hr = pMFCreateDXGIDeviceManager(&token, NULL); + ok(hr == E_POINTER, "MFCreateDXGIDeviceManager should failed: %#x.\n", hr); + ok(!token, "got wrong token: %u.\n", token); + + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); + EXPECT_REF(manager, 1); + ok(!!token, "got wrong token: %u.\n", token); + + Sleep(50); + token2 = 0; + hr = pMFCreateDXGIDeviceManager(&token2, &manager2); + ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); + EXPECT_REF(manager2, 1); + ok(token2 && token2 != token, "got wrong token: %u, %u.\n", token2, token); + ok(manager != manager2, "got wrong pointer: %p.\n", manager2); + EXPECT_REF(manager, 1); + + IMFDXGIDeviceManager_Release(manager); + IMFDXGIDeviceManager_Release(manager2); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -3741,6 +3781,7 @@ START_TEST(mfplat) test_async_create_file(); test_local_handlers(); test_create_property_store(); + test_dxgi_device_manager(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 957fb0d..f84c051 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -384,6 +384,7 @@ HRESULT WINAPI MFCreateAlignedMemoryBuffer(DWORD max_length, DWORD alignment, IM HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, IUnknown *state, IMFAsyncResult **result); HRESULT WINAPI MFCreateCollection(IMFCollection **collection); +HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, LPCWSTR url, IMFByteStream **bytestream); diff --git a/include/mfobjects.idl b/include/mfobjects.idl index 0cc8f42..203acc7 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -727,3 +727,20 @@ interface IMFMediaEventQueue : IUnknown [in] HRESULT status, [in, unique] IUnknown *unk); HRESULT Shutdown(); } + +[ + object, + uuid(eb533d5d-2db6-40f8-97a9-494692014f07), + local, + pointer_default(unique) +] +interface IMFDXGIDeviceManager : IUnknown +{ + HRESULT CloseDeviceHandle([in] HANDLE device); + HRESULT GetVideoService([in] HANDLE device, [in] REFIID riid, [out] void **service); + HRESULT LockDevice([in] HANDLE device, [in] REFIID riid, [out] void **ppv, [in] BOOL block); + HRESULT OpenDeviceHandle([out] HANDLE *device); + HRESULT ResetDevice([in] IUnknown *device, [in] UINT token); + HRESULT TestDevice([in] HANDLE device); + HRESULT UnlockDevice([in] HANDLE device, [in] BOOL state); +}

1 0

Naveen Narayanan : wineoss: Fix the -lossaudio check.
by Alexandre Julliard Aug. 29, 2019

Aug. 29, 2019

Module: wine Branch: master Commit: 557c4334a5cb05b47825dc89210669207d4dabf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=557c4334a5cb05b47825dc89… Author: Naveen Narayanan <zerous(a)nocebo.space> Date: Thu Aug 29 02:54:53 2019 +0200 wineoss: Fix the -lossaudio check. Only check for libossaudio if compiling wineoss.drv and the headers are recent enough. Also only wineoss.drv needs to be linked with libossaudio so put the link options in OSS4_LIBS. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 88 ++++++++++++++++++++++---------------------- configure.ac | 8 ++-- dlls/wineoss.drv/Makefile.in | 1 + include/config.h.in | 3 -- 4 files changed, 48 insertions(+), 52 deletions(-) diff --git a/configure b/configure index f3c5f92..d04e493 100755 --- a/configure +++ b/configure @@ -666,6 +666,7 @@ UNWIND_LIBS UNWIND_CFLAGS UDEV_LIBS UDEV_CFLAGS +OSS4_LIBS OSS4_CFLAGS ALSA_LIBS GSTREAMER_LIBS @@ -6863,51 +6864,6 @@ _ACEOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _oss_ioctl in -lossaudio" >&5 -$as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; } -if ${ac_cv_lib_ossaudio__oss_ioctl+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lossaudio $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char _oss_ioctl (); -int -main () -{ -return _oss_ioctl (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ossaudio__oss_ioctl=yes -else - ac_cv_lib_ossaudio__oss_ioctl=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5 -$as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; } -if test "x$ac_cv_lib_ossaudio__oss_ioctl" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBOSSAUDIO 1 -_ACEOF - - LIBS="-lossaudio $LIBS" - -fi - OPENGL_LIBS="" @@ -14721,6 +14677,47 @@ _ACEOF OSS4_CFLAGS="$ac_oss_incl" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _oss_ioctl in -lossaudio" >&5 +$as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; } +if ${ac_cv_lib_ossaudio__oss_ioctl+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lossaudio $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char _oss_ioctl (); +int +main () +{ +return _oss_ioctl (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ossaudio__oss_ioctl=yes +else + ac_cv_lib_ossaudio__oss_ioctl=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5 +$as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; } +if test "x$ac_cv_lib_ossaudio__oss_ioctl" = xyes; then : + OSS4_LIBS="-lossaudio" + +fi + fi fi @@ -19825,6 +19822,7 @@ GSTREAMER_CFLAGS = $GSTREAMER_CFLAGS GSTREAMER_LIBS = $GSTREAMER_LIBS ALSA_LIBS = $ALSA_LIBS OSS4_CFLAGS = $OSS4_CFLAGS +OSS4_LIBS = $OSS4_LIBS UDEV_CFLAGS = $UDEV_CFLAGS UDEV_LIBS = $UDEV_LIBS UNWIND_CFLAGS = $UNWIND_CFLAGS diff --git a/configure.ac b/configure.ac index 091d831..f1dedf2 100644 --- a/configure.ac +++ b/configure.ac @@ -410,8 +410,6 @@ dnl **** Check for some libraries **** dnl Check for -li386 for NetBSD and OpenBSD AC_CHECK_LIB(i386,i386_set_ldt) -dnl Check for -lossaudio for NetBSD -AC_CHECK_LIB(ossaudio,_oss_ioctl) AC_SUBST(OPENGL_LIBS,"") @@ -1657,8 +1655,10 @@ then CPPFLAGS="$CPPFLAGS $ac_oss_incl" AC_CHECK_HEADER([sys/soundcard.h], [AC_CHECK_MEMBERS([oss_sysinfo.numaudioengines], - [AC_SUBST(OSS4_CFLAGS,"$ac_oss_incl")],, - [#include <sys/soundcard.h>])]) + [AC_SUBST(OSS4_CFLAGS,"$ac_oss_incl") + AC_CHECK_LIB(ossaudio,_oss_ioctl, + [AC_SUBST(OSS4_LIBS,"-lossaudio")])],, + [#include <sys/soundcard.h>])]) CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(oss,[test "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes], diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in index d129f13..a2ae5f5 100644 --- a/dlls/wineoss.drv/Makefile.in +++ b/dlls/wineoss.drv/Makefile.in @@ -1,6 +1,7 @@ MODULE = wineoss.drv IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm +EXTRALIBS = $(OSS4_LIBS) EXTRAINCL = $(OSS4_CFLAGS) C_SRCS = \ diff --git a/include/config.h.in b/include/config.h.in index 29d34c2..791e3a6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -404,9 +404,6 @@ /* Define to 1 if you have the `kstat' library (-lkstat). */ #undef HAVE_LIBKSTAT -/* Define to 1 if you have the `ossaudio' library (-lossaudio). */ -#undef HAVE_LIBOSSAUDIO - /* Define to 1 if you have the `procstat' library (-lprocstat). */ #undef HAVE_LIBPROCSTAT

1 0

Zebediah Figura : httpapi: Start the http service in HttpInitialize().
by Alexandre Julliard Aug. 29, 2019

Aug. 29, 2019

Module: wine Branch: master Commit: efacf6f455b42721c2edb15a06ef57755342fb0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=efacf6f455b42721c2edb15a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 28 20:45:29 2019 -0500 httpapi: Start the http service in HttpInitialize(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38245 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/Makefile.in | 1 + dlls/httpapi/httpapi_main.c | 39 +++++++++++++++++++++++++++++++++++---- dlls/httpapi/tests/httpapi.c | 24 ++++++++---------------- 3 files changed, 44 insertions(+), 20 deletions(-) diff --git a/dlls/httpapi/Makefile.in b/dlls/httpapi/Makefile.in index b3af7da..6a55f84 100644 --- a/dlls/httpapi/Makefile.in +++ b/dlls/httpapi/Makefile.in @@ -1,5 +1,6 @@ MODULE = httpapi.dll IMPORTLIB = httpapi +IMPORTS = advapi32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 8a970a0..c970c68 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -19,6 +19,7 @@ */ #include "wine/http.h" +#include "winsvc.h" #include "winternl.h" #include "wine/debug.h" #include "wine/heap.h" @@ -52,11 +53,41 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) * NO_ERROR if function succeeds, or error code if function fails * */ -ULONG WINAPI HttpInitialize( HTTPAPI_VERSION version, ULONG flags, PVOID reserved ) +ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved) { - FIXME( "({%d,%d}, 0x%x, %p): stub!\n", version.HttpApiMajorVersion, - version.HttpApiMinorVersion, flags, reserved ); - return NO_ERROR; + static const WCHAR httpW[] = {'h','t','t','p',0}; + SC_HANDLE manager, service; + + TRACE("version %u.%u, flags %#x, reserved %p.\n", version.HttpApiMajorVersion, + version.HttpApiMinorVersion, flags, reserved); + + if (flags & ~HTTP_INITIALIZE_SERVER) + { + FIXME("Unhandled flags %#x.\n", flags); + return ERROR_CALL_NOT_IMPLEMENTED; + } + + if (!(manager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT))) + return GetLastError(); + + if (!(service = OpenServiceW(manager, httpW, SERVICE_START))) + { + ERR("Failed to open HTTP service, error %u.\n", GetLastError()); + CloseServiceHandle(manager); + return GetLastError(); + } + + if (!StartServiceW(service, 0, NULL) && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) + { + ERR("Failed to start HTTP service, error %u.\n", GetLastError()); + CloseServiceHandle(service); + CloseServiceHandle(manager); + return GetLastError(); + } + + CloseServiceHandle(service); + CloseServiceHandle(manager); + return ERROR_SUCCESS; } /*********************************************************************** diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index c30c380..94804a9 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -122,8 +122,7 @@ static void test_v1_server(void) /* Non-zero reserved parameter is accepted on XP/2k3. */ queue = NULL; ret = HttpCreateHttpHandle(&queue, 0); - todo_wine ok(!ret, "Unexpected ret value %u.\n", ret); - if (ret) return; + ok(!ret, "Unexpected ret value %u.\n", ret); ok(!!queue, "Unexpected handle value %p.\n", queue); queue2 = NULL; @@ -314,8 +313,7 @@ static void test_v1_completion_port(void) ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); ret = HttpCreateHttpHandle(&queue, 0); - todo_wine ok(!ret, "Got error %u.\n", ret); - if (ret) return; + ok(!ret, "Got error %u.\n", ret); port = CreateIoCompletionPort(queue, NULL, 123, 0); ok(!!port, "Failed to create completion port, error %u.\n", GetLastError()); @@ -391,8 +389,7 @@ static void test_v1_multiple_requests(void) ovl2.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); ret = HttpCreateHttpHandle(&queue, 0); - todo_wine ok(!ret, "Got error %u.\n", ret); - if (ret) return; + ok(!ret, "Got error %u.\n", ret); ret = HttpAddUrl(queue, localhost_urlW, NULL); ok(!ret, "Got error %u.\n", ret); @@ -493,8 +490,7 @@ static void test_v1_short_buffer(void) ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); ret = HttpCreateHttpHandle(&queue, 0); - todo_wine ok(!ret, "Got error %u.\n", ret); - if (ret) return; + ok(!ret, "Got error %u.\n", ret); ret = HttpAddUrl(queue, localhost_urlW, NULL); ok(!ret, "Got error %u.\n", ret); @@ -569,8 +565,7 @@ static void test_v1_entity_body(void) req_body[i] = i / 111; ret = HttpCreateHttpHandle(&queue, 0); - todo_wine ok(!ret, "Got error %u.\n", ret); - if (ret) return; + ok(!ret, "Got error %u.\n", ret); ret = HttpAddUrl(queue, localhost_urlW, NULL); ok(!ret, "Got error %u.\n", ret); @@ -716,8 +711,7 @@ static void test_v1_bad_request(void) SOCKET s; ret = HttpCreateHttpHandle(&queue, 0); - todo_wine ok(!ret, "Got error %u.\n", ret); - if (ret) return; + ok(!ret, "Got error %u.\n", ret); ret = HttpAddUrl(queue, localhost_urlW, NULL); ok(!ret, "Got error %u.\n", ret); @@ -774,8 +768,7 @@ static void test_v1_cooked_url(void) "\r\n"; ret = HttpCreateHttpHandle(&queue, 0); - todo_wine ok(!ret, "Got error %u.\n", ret); - if (ret) return; + ok(!ret, "Got error %u.\n", ret); ret = HttpAddUrl(queue, localhost_urlW, NULL); ok(!ret, "Got error %u.\n", ret); @@ -849,8 +842,7 @@ static void test_v1_unknown_tokens(void) "\r\n"; ret = HttpCreateHttpHandle(&queue, 0); - todo_wine ok(!ret, "Got error %u.\n", ret); - if (ret) return; + ok(!ret, "Got error %u.\n", ret); ret = HttpAddUrl(queue, localhost_urlW, NULL); ok(!ret, "Got error %u.\n", ret);

1 0

Zebediah Figura : httpapi: Implement HttpSendHttpResponse().
by Alexandre Julliard Aug. 29, 2019

Aug. 29, 2019

Module: wine Branch: master Commit: d73fc3e82af5279f7631cff134c764ba47fb1a08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d73fc3e82af5279f7631cff1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 28 20:45:28 2019 -0500 httpapi: Implement HttpSendHttpResponse(). While it's a little architecturally weird to have this part uniquely implemented in httpapi, it's far easier to handle building the response string here than having to marshal everything into an ioctl buffer first. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 145 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 141 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 08fbe4d..8a970a0 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -289,6 +289,18 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag return ret; } +static void format_date(char *buffer) +{ + static const char day_names[7][4] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; + static const char month_names[12][4] = + {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; + SYSTEMTIME date; + GetSystemTime(&date); + sprintf(buffer + strlen(buffer), "Date: %s, %02u %s %u %02u:%02u:%02u GMT\r\n", + day_names[date.wDayOfWeek], date.wDay, month_names[date.wMonth - 1], + date.wYear, date.wHour, date.wMinute, date.wSecond); +} + /*********************************************************************** * HttpSendHttpResponse (HTTPAPI.@) */ @@ -296,10 +308,135 @@ 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) { - FIXME("queue %p, id %s, flags %#x, response %p, cache_policy %p, " - "ret_size %p, reserved1 %p, reserved2 %#x, ovl %p, log_data %p, stub!\n", - queue, wine_dbgstr_longlong(id), flags, response, cache_policy, ret_size, reserved1, reserved2, ovl, log_data); - return ERROR_CALL_NOT_IMPLEMENTED; + static const char *const header_names[] = + { + "Cache-Control", + "Connection", + "Date", + "Keep-Alive", + "Pragma", + "Trailer", + "Transfer-Encoding", + "Upgrade", + "Via", + "Warning", + "Allow", + "Content-Length", + "Content-Type", + "Content-Encoding", + "Content-Language", + "Content-Location", + "Content-MD5", + "Content-Range", + "Expires", + "Last-Modified", + "Accept-Ranges", + "Age", + "ETag", + "Location", + "Proxy-Authenticate", + "Retry-After", + "Server", + "Set-Cookie", + "Vary", + "WWW-Authenticate", + }; + + struct http_response *buffer; + OVERLAPPED dummy_ovl = {}; + ULONG ret = ERROR_SUCCESS; + int len, body_len = 0; + char *p, dummy[12]; + USHORT i; + + TRACE("queue %p, id %s, flags %#x, response %p, cache_policy %p, " + "ret_size %p, reserved1 %p, reserved2 %#x, ovl %p, log_data %p.\n", + queue, wine_dbgstr_longlong(id), flags, response, cache_policy, + ret_size, reserved1, reserved2, ovl, log_data); + + if (flags) + FIXME("Unhandled flags %#x.\n", flags); + if (response->s.Flags) + FIXME("Unhandled response flags %#x.\n", response->s.Flags); + if (cache_policy) + WARN("Ignoring cache_policy.\n"); + if (log_data) + WARN("Ignoring log_data.\n"); + + len = 12 + sprintf(dummy, "%hu", response->s.StatusCode) + response->s.ReasonLength; + for (i = 0; i < response->s.EntityChunkCount; ++i) + { + if (response->s.pEntityChunks[i].DataChunkType != HttpDataChunkFromMemory) + { + FIXME("Unhandled data chunk type %u.\n", response->s.pEntityChunks[i].DataChunkType); + return ERROR_CALL_NOT_IMPLEMENTED; + } + body_len += response->s.pEntityChunks[i].FromMemory.BufferLength; + } + len += body_len; + for (i = 0; i < HttpHeaderResponseMaximum; ++i) + { + if (i == HttpHeaderDate) + len += 37; + else if (response->s.Headers.KnownHeaders[i].RawValueLength) + len += strlen(header_names[i]) + 2 + response->s.Headers.KnownHeaders[i].RawValueLength + 2; + else if (i == HttpHeaderContentLength) + { + char dummy[12]; + len += strlen(header_names[i]) + 2 + sprintf(dummy, "%d", body_len) + 2; + } + } + for (i = 0; i < response->s.Headers.UnknownHeaderCount; ++i) + { + len += response->s.Headers.pUnknownHeaders[i].NameLength + 2; + len += response->s.Headers.pUnknownHeaders[i].RawValueLength + 2; + } + len += 2; + + if (!(buffer = heap_alloc(offsetof(struct http_response, buffer[len])))) + return ERROR_OUTOFMEMORY; + buffer->id = id; + buffer->len = len; + sprintf(buffer->buffer, "HTTP/1.1 %u %.*s\r\n", response->s.StatusCode, + response->s.ReasonLength, response->s.pReason); + + for (i = 0; i < HttpHeaderResponseMaximum; ++i) + { + const HTTP_KNOWN_HEADER *header = &response->s.Headers.KnownHeaders[i]; + if (i == HttpHeaderDate) + format_date(buffer->buffer); + else if (header->RawValueLength) + sprintf(buffer->buffer + strlen(buffer->buffer), "%s: %.*s\r\n", + header_names[i], header->RawValueLength, header->pRawValue); + else if (i == HttpHeaderContentLength) + sprintf(buffer->buffer + strlen(buffer->buffer), "Content-Length: %d\r\n", body_len); + } + for (i = 0; i < response->s.Headers.UnknownHeaderCount; ++i) + { + const HTTP_UNKNOWN_HEADER *header = &response->s.Headers.pUnknownHeaders[i]; + sprintf(buffer->buffer + strlen(buffer->buffer), "%.*s: %.*s\r\n", header->NameLength, + header->pName, header->RawValueLength, header->pRawValue); + } + p = buffer->buffer + strlen(buffer->buffer); + /* Don't use strcat, because this might be the end of the buffer. */ + memcpy(p, "\r\n", 2); + p += 2; + for (i = 0; i < response->s.EntityChunkCount; ++i) + { + const HTTP_DATA_CHUNK *chunk = &response->s.pEntityChunks[i]; + memcpy(p, chunk->FromMemory.pBuffer, chunk->FromMemory.BufferLength); + p += chunk->FromMemory.BufferLength; + } + + if (!ovl) + ovl = &dummy_ovl; + + if (!DeviceIoControl(queue, IOCTL_HTTP_SEND_RESPONSE, buffer, + offsetof(struct http_response, buffer[len]), NULL, 0, NULL, ovl)) + ret = GetLastError(); + + heap_free(buffer); + return ret; } /***********************************************************************

1 0

Zebediah Figura : http.sys: Allow sending response data.
by Alexandre Julliard Aug. 29, 2019

Aug. 29, 2019

Module: wine Branch: master Commit: 5b6cee0dbd82fac1e8809352151ba8332c299cd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b6cee0dbd82fac1e8809352… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 28 20:45:27 2019 -0500 http.sys: Allow sending response data. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/wine/http.h | 8 ++++++++ 2 files changed, 53 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 4115afc..b2400a2 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1193,6 +1193,48 @@ static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) return ret; } +static NTSTATUS http_send_response(struct request_queue *queue, IRP *irp) +{ + const struct http_response *response = irp->AssociatedIrp.SystemBuffer; + struct connection *conn; + + TRACE("id %s, len %d.\n", wine_dbgstr_longlong(response->id), response->len); + + EnterCriticalSection(&http_cs); + + LIST_FOR_EACH_ENTRY(conn, &connections, struct connection, entry) + { + if (conn->req_id == response->id) + { + if (send(conn->socket, response->buffer, response->len, 0) >= 0) + { + conn->queue = NULL; + conn->req_id = HTTP_NULL_ID; + WSAEventSelect(conn->socket, request_event, FD_READ | FD_CLOSE); + irp->IoStatus.Information = response->len; + /* We might have another request already in the buffer. */ + if (parse_request(conn) < 0) + { + WARN("Failed to parse request; shutting down connection.\n"); + send_400(conn); + close_connection(conn); + } + } + else + { + ERR("Got error %u; shutting down connection.\n", WSAGetLastError()); + close_connection(conn); + } + + LeaveCriticalSection(&http_cs); + return STATUS_SUCCESS; + } + } + + LeaveCriticalSection(&http_cs); + return STATUS_CONNECTION_INVALID; +} + static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -1210,6 +1252,9 @@ static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HTTP_RECEIVE_REQUEST: ret = http_receive_request(queue, irp); break; + case IOCTL_HTTP_SEND_RESPONSE: + ret = http_send_response(queue, irp); + break; default: FIXME("Unhandled ioctl %#x.\n", stack->Parameters.DeviceIoControl.IoControlCode); ret = STATUS_NOT_IMPLEMENTED; diff --git a/include/wine/http.h b/include/wine/http.h index 1145cab..eb75d8f 100644 --- a/include/wine/http.h +++ b/include/wine/http.h @@ -26,6 +26,7 @@ #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) #define IOCTL_HTTP_RECEIVE_REQUEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x802, METHOD_BUFFERED, 0) +#define IOCTL_HTTP_SEND_RESPONSE CTL_CODE(FILE_DEVICE_UNKNOWN, 0x803, METHOD_BUFFERED, 0) struct http_add_url_params { @@ -41,4 +42,11 @@ struct http_receive_request_params ULONG bits; }; +struct http_response +{ + HTTP_REQUEST_ID id; + int len; + char buffer[1]; +}; + #endif

1 0

Rémi Bernon : dbghelp: Prevent an invalid memory access when the search path element is empty.
by Alexandre Julliard Aug. 29, 2019

Aug. 29, 2019

Module: wine Branch: master Commit: d263ba97fb7c9ada7ae847909f35cbf5db671216 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d263ba97fb7c9ada7ae84790… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 29 12:36:58 2019 +0200 dbghelp: Prevent an invalid memory access when the search path element is empty. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index a0fc0cf..f8a7f3d 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -229,6 +229,7 @@ static BOOL do_searchW(PCWSTR file, PWSTR buffer, BOOL recurse, static const WCHAR S_DotDotW[] = {'.','.','\0'}; pos = strlenW(buffer); + if (pos == 0) return FALSE; if (buffer[pos - 1] != '\\') buffer[pos++] = '\\'; strcpyW(buffer + pos, S_AllW); if ((h = FindFirstFileW(buffer, &fd)) == INVALID_HANDLE_VALUE)

1 0

Akihiro Sagawa : winemac.drv: Translate the WM_DROPFILES point into client coordinates whenever possible.
by Alexandre Julliard Aug. 29, 2019

Aug. 29, 2019

Module: wine Branch: master Commit: ea287aefedd3e960788a2700272255c943af2b51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea287aefedd3e960788a2700… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Aug 29 13:25:26 2019 -0500 winemac.drv: Translate the WM_DROPFILES point into client coordinates whenever possible. This is winemac.drv port of 846a8f6c8dcf7ad0bc72437d7ea79cc9e00c8ab7. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/dragdrop.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index 788cb00..7de50e5 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -455,9 +455,10 @@ BOOL query_drag_drop(macdrv_query* query) { dropfiles->pt.x = pt.x; dropfiles->pt.y = pt.y; - dropfiles->fNC = FALSE; + dropfiles->fNC = !ScreenToClient(hwnd, &dropfiles->pt); - TRACE("sending WM_DROPFILES: hwnd %p pt %s %s\n", hwnd, wine_dbgstr_point(&pt), + TRACE("sending WM_DROPFILES: hwnd %p nc %d pt %s %s\n", hwnd, + dropfiles->fNC, wine_dbgstr_point(&dropfiles->pt), debugstr_w((WCHAR*)((char*)dropfiles + dropfiles->pFiles))); GlobalUnlock(hdrop);

1 0

Zebediah Figura : httpapi: Implement HttpCreateUrlGroup() and HttpCloseUrlGroup().
by Alexandre Julliard Aug. 29, 2019

Aug. 29, 2019

Module: wine Branch: master Commit: e3a7c603e14429416582e74f6568c87a69d06d77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3a7c603e14429416582e74f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 28 20:45:31 2019 -0500 httpapi: Implement HttpCreateUrlGroup() and HttpCloseUrlGroup(). 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 | 67 +++++++++++++++++++++++++++++++++++++++++++++ include/http.h | 2 ++ 3 files changed, 71 insertions(+) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index 88bc324..aad5d58 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -7,7 +7,9 @@ @ stub HttpCreateFilter @ stdcall HttpCreateHttpHandle(ptr long) @ stdcall HttpCreateServerSession(long ptr long) +@ stdcall HttpCreateUrlGroup(int64 ptr long) @ stdcall HttpCloseServerSession(int64) +@ stdcall HttpCloseUrlGroup(int64) @ stub HttpDeleteConfigGroup @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) @ stub HttpFilterAccept diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index a71dcc5..c7d95c9 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -471,9 +471,28 @@ ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, return ret; } +struct url_group +{ + struct list entry, session_entry; +}; + +static struct list url_groups = LIST_INIT(url_groups); + +static struct url_group *get_url_group(HTTP_URL_GROUP_ID id) +{ + struct url_group *group; + LIST_FOR_EACH_ENTRY(group, &url_groups, struct url_group, entry) + { + if ((HTTP_URL_GROUP_ID)(ULONG_PTR)group == id) + return group; + } + return NULL; +} + struct server_session { struct list entry; + struct list groups; }; static struct list server_sessions = LIST_INIT(server_sessions); @@ -510,6 +529,7 @@ ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION version, HTTP_SERVER_SESSIO return ERROR_OUTOFMEMORY; list_add_tail(&server_sessions, &session->entry); + list_init(&session->groups); *id = (ULONG_PTR)session; return ERROR_SUCCESS; @@ -520,6 +540,7 @@ ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION version, HTTP_SERVER_SESSIO */ ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id) { + struct url_group *group, *group_next; struct server_session *session; TRACE("id %s.\n", wine_dbgstr_longlong(id)); @@ -527,7 +548,53 @@ ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id) if (!(session = get_server_session(id))) return ERROR_INVALID_PARAMETER; + LIST_FOR_EACH_ENTRY_SAFE(group, group_next, &session->groups, struct url_group, session_entry) + { + HttpCloseUrlGroup((ULONG_PTR)group); + } list_remove(&session->entry); heap_free(session); return ERROR_SUCCESS; } + +/*********************************************************************** + * HttpCreateUrlGroup (HTTPAPI.@) + */ +ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROUP_ID *group_id, ULONG reserved) +{ + struct server_session *session; + struct url_group *group; + + TRACE("session_id %#I64x, group_id %p, reserved %#x.\n", session_id, group_id, reserved); + + if (!(session = get_server_session(session_id))) + return ERROR_INVALID_PARAMETER; + + if (!(group = heap_alloc_zero(sizeof(*group)))) + return ERROR_OUTOFMEMORY; + list_add_tail(&url_groups, &group->entry); + list_add_tail(&session->groups, &group->session_entry); + + *group_id = (ULONG_PTR)group; + + return ERROR_SUCCESS; +} + +/*********************************************************************** + * HttpCloseUrlGroup (HTTPAPI.@) + */ +ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id) +{ + struct url_group *group; + + TRACE("id %#I64x.\n", id); + + if (!(group = get_url_group(id))) + return ERROR_INVALID_PARAMETER; + + list_remove(&group->session_entry); + list_remove(&group->entry); + heap_free(group); + + return ERROR_SUCCESS; +} diff --git a/include/http.h b/include/http.h index dc4af74..b07c3b0 100644 --- a/include/http.h +++ b/include/http.h @@ -399,8 +399,10 @@ typedef struct _HTTP_LOG_DATA 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 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); ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved); ULONG WINAPI HttpTerminate(ULONG flags, void *reserved);

1 0

Zebediah Figura : httpapi: Implement HttpCreateServerSession() and HttpCloseServerSession().
by Alexandre Julliard Aug. 29, 2019

Aug. 29, 2019

Module: wine Branch: master Commit: 76eb42a76068f976477753b7e138e0b1cb60bd44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76eb42a76068f976477753b7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 28 20:45:30 2019 -0500 httpapi: Implement HttpCreateServerSession() and HttpCloseServerSession(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 56 +++++++++++++++++++++++++++++++++++++++----- dlls/httpapi/tests/httpapi.c | 7 ------ include/http.h | 2 +- 3 files changed, 51 insertions(+), 14 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index c970c68..a71dcc5 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -23,6 +23,7 @@ #include "winternl.h" #include "wine/debug.h" #include "wine/heap.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(httpapi); @@ -470,20 +471,63 @@ ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, return ret; } +struct server_session +{ + struct list entry; +}; + +static struct list server_sessions = LIST_INIT(server_sessions); + +static struct server_session *get_server_session(HTTP_SERVER_SESSION_ID id) +{ + struct server_session *session; + LIST_FOR_EACH_ENTRY(session, &server_sessions, struct server_session, entry) + { + if ((HTTP_SERVER_SESSION_ID)(ULONG_PTR)session == id) + return session; + } + return NULL; +} + /*********************************************************************** * HttpCreateServerSession (HTTPAPI.@) */ -ULONG WINAPI HttpCreateServerSession( HTTPAPI_VERSION version, HTTP_SERVER_SESSION_ID *id, ULONG 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; + struct server_session *session; + + TRACE("version %u.%u, id %p, reserved %u.\n", version.HttpApiMajorVersion, + version.HttpApiMinorVersion, id, reserved); + + if (!id) + return ERROR_INVALID_PARAMETER; + + if ((version.HttpApiMajorVersion != 1 && version.HttpApiMajorVersion != 2) + || version.HttpApiMinorVersion) + return ERROR_REVISION_MISMATCH; + + if (!(session = heap_alloc(sizeof(*session)))) + return ERROR_OUTOFMEMORY; + + list_add_tail(&server_sessions, &session->entry); + + *id = (ULONG_PTR)session; + return ERROR_SUCCESS; } /*********************************************************************** * HttpCloseServerSession (HTTPAPI.@) */ -ULONG WINAPI HttpCloseServerSession( HTTP_SERVER_SESSION_ID id ) +ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id) { - FIXME( "(%s): stub!\n", wine_dbgstr_longlong(id)); - return ERROR_INVALID_PARAMETER; + struct server_session *session; + + TRACE("id %s.\n", wine_dbgstr_longlong(id)); + + if (!(session = get_server_session(id))) + return ERROR_INVALID_PARAMETER; + + list_remove(&session->entry); + heap_free(session); + return ERROR_SUCCESS; } diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 94804a9..2153361 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -888,37 +888,30 @@ 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 = 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 ok(!ret, "Unexpected return value %u.\n", ret); 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 ok(!ret, "Unexpected return value %u.\n", ret); ret = pHttpCloseServerSession(0xdead); diff --git a/include/http.h b/include/http.h index 84d3445..dc4af74 100644 --- a/include/http.h +++ b/include/http.h @@ -398,9 +398,9 @@ typedef struct _HTTP_LOG_DATA } HTTP_LOG_DATA, *PHTTP_LOG_DATA; ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); +ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id); ULONG WINAPI HttpCreateHttpHandle(PHANDLE,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); ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved); ULONG WINAPI HttpTerminate(ULONG flags, void *reserved);

1 0