May 2019 - Wine-devel - list.winehq.org

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_reuse_fbo_entry().
by Henri Verbeet 16 May '19

16 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index db3c4eed963..2670b413cd0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -540,17 +540,16 @@ static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context * } /* Context activation is done by the caller. */ -static void context_reuse_fbo_entry(struct wined3d_context *context, GLenum target, +static void wined3d_context_gl_reuse_fbo_entry(struct wined3d_context_gl *context_gl, GLenum target, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location, struct fbo_entry *entry) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; wined3d_context_gl_bind_fbo(context_gl, target, entry->id); context_clean_fbo_attachments(gl_info, target); - context_generate_fbo_key(context, &entry->key, render_targets, depth_stencil, color_location, ds_location); + context_generate_fbo_key(&context_gl->c, &entry->key, render_targets, depth_stencil, color_location, ds_location); entry->flags = 0; if (depth_stencil->resource) { @@ -579,6 +578,7 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); static const struct wined3d_rendertarget_info ds_null = {{0}}; const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *rt_texture, *ds_texture; @@ -695,7 +695,8 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, else { entry = LIST_ENTRY(list_tail(&context->fbo_list), struct fbo_entry, entry); - context_reuse_fbo_entry(context, target, render_targets, depth_stencil, color_location, ds_location, entry); + wined3d_context_gl_reuse_fbo_entry(context_gl, target, render_targets, + depth_stencil, color_location, ds_location, entry); list_remove(&entry->entry); list_add_head(&context->fbo_list, &entry->entry); } -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to context_destroy_fbo().
by Henri Verbeet 16 May '19

16 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e6d94f2eca8..db3c4eed963 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -99,10 +99,9 @@ static void context_clean_fbo_attachments(const struct wined3d_gl_info *gl_info, } /* Context activation is done by the caller. */ -static void context_destroy_fbo(struct wined3d_context *context, GLuint fbo) +static void wined3d_context_gl_destroy_fbo(struct wined3d_context_gl *context_gl, GLuint fbo) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, fbo); context_clean_fbo_attachments(gl_info, GL_FRAMEBUFFER); @@ -568,7 +567,7 @@ static void context_destroy_fbo_entry(struct wined3d_context *context, struct fb if (entry->id) { TRACE("Destroy FBO %u.\n", entry->id); - context_destroy_fbo(context, entry->id); + wined3d_context_gl_destroy_fbo(wined3d_context_gl(context), entry->id); } --context->fbo_entry_count; list_remove(&entry->entry); -- 2.11.0

1 0

[PATCH] xinput: Don't look for IG_ substring when searching for gamepads.
by Piotr Caban 16 May '19

16 May '19

Only some gamepads have "IG_" substring in DevicePath on Windows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47209 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/xinput1_3/hid.c | 4 ---- 1 file changed, 4 deletions(-)

2 2

[PATCH 1/3] setupapi: Implement SetupDiGetDeviceInstallParams().
by Zebediah Figura 16 May '19

16 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This begins a series of patches which I've been working on as a side project for a while, which seek to improve support for installing and running Plug and Play (PnP) drivers. After this series it is possible to run Microsoft's sample "toaster" WDM driver (taken from the Windows 7 DDK; the purely WDM driver has been removed from the most recent version, and WDF is much harder to compile.) Needless to say, this is a huge step forward for running native PnP drivers. On the other hand, most native PnP drivers are designed to actually access hardware, and need to do things like handle interrupts and write to I/O ports. It is not clear how many native PnP drivers can actually execute in user-mode, and so the utility of this may be somewhat questionable. On the other hand, that missing step could certainly be filled in by a simple proxy kernel module, perhaps even using preëxisting frameworks like UIO. Regardless of whether that would be maintained by the Wine project directly, I imagine it could be hugely beneficial to people who are currently forced to use Windows to interact with various domain-specific hardware. The series also fixes several problems with our current HID drivers, to make them more architecturally correct. Of course, that's less clearly an advantage. The work is already done, because I found it interesting enough to do, but there's still time to warn me not to do such obscure and useless work in the future by rejecting these patches ;-) dlls/setupapi/devinst.c | 62 +++++++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 2640005abf..46aeb5a7d6 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -118,6 +118,7 @@ struct device DEVINST devnode; struct list entry; BOOL removed; + SP_DEVINSTALL_PARAMS_W params; }; struct device_iface @@ -730,7 +731,7 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, TRACE("%p, %s, %s, %d\n", set, debugstr_guid(class), debugstr_w(instanceid), phantom); - if (!(device = heap_alloc(sizeof(*device)))) + if (!(device = heap_alloc_zero(sizeof(*device)))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; @@ -752,6 +753,7 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, device->devnode = alloc_devnode(device); device->removed = FALSE; list_add_tail(&set->devices, &device->entry); + device->params.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); if (phantom) RegSetValueExW(device->key, Phantom, 0, REG_DWORD, (const BYTE *)&one, sizeof(one)); @@ -3542,27 +3544,57 @@ BOOL WINAPI SetupDiCallClassInstaller( } /*********************************************************************** - * SetupDiGetDeviceInstallParamsW (SETUPAPI.@) + * SetupDiGetDeviceInstallParamsW (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInstallParamsW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +BOOL WINAPI SetupDiGetDeviceInstallParamsW(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_W *params) { - FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); - return FALSE; + struct device *device; + + TRACE("devinfo %p, device_data %p, params %p.\n", devinfo, device_data, params); + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_W)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + *params = device->params; + + return TRUE; } /*********************************************************************** - * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) + * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInstallParamsA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) +BOOL WINAPI SetupDiGetDeviceInstallParamsA(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_A *params) { - FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); - return FALSE; + SP_DEVINSTALL_PARAMS_W paramsW; + BOOL ret; + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_A)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + paramsW.cbSize = sizeof(paramsW); + ret = SetupDiGetDeviceInstallParamsW(devinfo, device_data, &paramsW); + params->Flags = paramsW.Flags; + params->FlagsEx = paramsW.FlagsEx; + params->hwndParent = paramsW.hwndParent; + params->InstallMsgHandler = paramsW.InstallMsgHandler; + params->InstallMsgHandlerContext = paramsW.InstallMsgHandlerContext; + params->FileQueue = paramsW.FileQueue; + params->ClassInstallReserved = paramsW.ClassInstallReserved; + params->Reserved = paramsW.Reserved; + WideCharToMultiByte(CP_ACP, 0, paramsW.DriverPath, -1, params->DriverPath, sizeof(params->DriverPath), NULL, NULL); + + return ret; } /*********************************************************************** -- 2.21.0

2 6

[PATCH] winebus.sys: Fix report length calculation
by Andrew Eikum 16 May '19

16 May '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47188 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index cd69f831d76..6a7b8e95ffc 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -553,6 +553,7 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) descript_size += sizeof(CONTROLLER_TRIGGERS); descript_size += sizeof(CONTROLLER_BUTTONS); descript_size += sizeof(REPORT_HATSWITCH); + descript_size += sizeof(REPORT_PADDING); descript_size += test_haptic(ext); ext->axis_start = 0; -- 2.21.0

2 1

[PATCH v3 1/6] winex11.drv: Support multiple display device handlers.
by Zhiyi Zhang 16 May '19

16 May '19

Display device handler will be used to initialize the registry. Different handlers can be implemented according to the interface, for example, via Xinerama or XRandR. With those registry data, EnumDisplayDevices, EnumDisplayMonitors and GetMonitorInfo can be built on top of it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 162308~162314, fix xinerama primary adapter reporting, fix registry data reinit failure. v3: Rebase dlls/winex11.drv/Makefile.in | 1 + dlls/winex11.drv/display.c | 37 ++++++++++++++++++ dlls/winex11.drv/x11drv.h | 76 ++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 dlls/winex11.drv/display.c diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 747f509b44..9ca2fc6efe 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ brush.c \ clipboard.c \ desktop.c \ + display.c \ event.c \ graphics.c \ ime.c \ diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c new file mode 100644 index 0000000000..9b9009c255 --- /dev/null +++ b/dlls/winex11.drv/display.c @@ -0,0 +1,37 @@ +/* + * X11DRV display device functions + * + * Copyright 2019 Zhiyi Zhang for CodeWeavers + * + * 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 + */ + +#include "config.h" + +#include "wine/debug.h" +#include "x11drv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(x11drv); + +static struct x11drv_display_device_handler handler; + +void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) +{ + if (new_handler->priority > handler.priority) + { + handler = *new_handler; + TRACE("Display device functions are now handled by: %s\n", handler.name); + } +} \ No newline at end of file diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c633102a38..6aaea54fab 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -665,6 +665,82 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; +/* X11 display device driver */ + +/* Represent a physical GPU in the PCI slots */ +struct x11drv_gpu +{ + /* ID to uniquely identify a GPU in handler */ + ULONG_PTR id; + /* Name */ + WCHAR name[128]; + /* PCI ID */ + UINT vendor_id; + UINT device_id; + UINT subsys_id; + UINT revision_id; +}; + +/* Represent an adapter in EnumDisplayDevices context */ +struct x11drv_adapter +{ + /* ID to uniquely identify an adapter in handler */ + ULONG_PTR id; + /* as StateFlags in DISPLAY_DEVICE struct */ + DWORD state_flags; +}; + +/* Represent a monitor in EnumDisplayDevices context */ +struct x11drv_monitor +{ + /* Name */ + WCHAR name[128]; + /* as RcMonitor in MONITORINFO struct */ + RECT rc_monitor; + /* as RcWork in MONITORINFO struct */ + RECT rc_work; + /* StateFlags in DISPLAY_DEVICE struct */ + DWORD state_flags; +}; + +/* Required functions for display device registry initialization */ +struct x11drv_display_device_handler +{ + /* A name to tell what host driver is used */ + CHAR name[MAX_PATH]; + + /* Higher priority can override handlers with lower proprity */ + INT priority; + + /* pGetGpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetGpus)(struct x11drv_gpu **gpus, int *count); + + /* pGetAdapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. + * The first adapter has to be primary if GPU is primary. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetAdapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); + + /* pGetMonitors will be called to get a list of monitors in EnumDisplayDevices context under an adapter. + * The first monitor has to be primary if adapter is primary. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetMonitors)(ULONG_PTR adapter_id, struct x11drv_monitor **monitors, int *count); + + /* pFreeGpus will be called to free a GPU list from pGetGpus */ + void (*pFreeGpus)(struct x11drv_gpu *gpus); + + /* pFreeAdapters will be called to free an adapter list from pGetAdapters */ + void (*pFreeAdapters)(struct x11drv_adapter *adapters); + + /* pFreeMonitors will be called to free a monitor list from pGetMonitors */ + void (*pFreeMonitors)(struct x11drv_monitor *monitors); +}; + +extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; + /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; -- 2.20.1

2 2

[PATCH v6 1/2] jscript: implement Enumerator()
by Andreas Maier 16 May '19

16 May '19

Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> --- dlls/jscript/enumerator.c | 212 ++++++++++++++++++++++++++++++++++++++++++---- dlls/jscript/jscript.h | 2 + dlls/jscript/object.c | 2 +- dlls/jscript/resource.h | 1 + 4 files changed, 198 insertions(+), 19 deletions(-) diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index d0502f6afa..e72da78cbb 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -26,6 +26,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { jsdisp_t dispex; + /* IEnumVARIANT returned by _NewEnum */ + IEnumVARIANT *enumvar; + /* current item */ + jsval_t item; + BOOL atend; } EnumeratorInstance; static const WCHAR atEndW[] = {'a','t','E','n','d',0}; @@ -33,43 +38,139 @@ static const WCHAR itemW[] = {'i','t','e','m',0}; static const WCHAR moveFirstW[] = {'m','o','v','e','F','i','r','s','t',0}; static const WCHAR moveNextW[] = {'m','o','v','e','N','e','x','t',0}; +static inline EnumeratorInstance *enumerator_from_jsdisp(jsdisp_t *jsdisp) +{ + return CONTAINING_RECORD(jsdisp, EnumeratorInstance, dispex); +} + +static inline EnumeratorInstance *enumerator_from_vdisp(vdisp_t *vdisp) +{ + return enumerator_from_jsdisp(vdisp->u.jsdisp); +} + +static inline EnumeratorInstance *enumerator_this(vdisp_t *jsthis) +{ + return is_vclass(jsthis, JSCLASS_ENUMERATOR) ? enumerator_from_vdisp(jsthis) : NULL; +} + +static inline HRESULT enumvar_get_next_item(EnumeratorInstance *This) +{ + HRESULT hres; + VARIANT nextitem; + + if (This->atend) + { + This->item = jsval_undefined(); + return S_OK; + } + + /* dont leak pervious value */ + jsval_release(This->item); + + /* not at end ... get next item */ + VariantInit(&nextitem); + hres = IEnumVARIANT_Next(This->enumvar, 1, &nextitem, NULL); + if (hres == S_OK) + { + hres = variant_to_jsval(&nextitem, &This->item); + if (FAILED(hres)) + { + ERR("failed to convert jsval to variant!"); + This->item = jsval_undefined(); + } + } + else + { + This->item = jsval_undefined(); + This->atend = TRUE; + } + VariantClear(&nextitem); + + return S_OK; +} + static void Enumerator_destructor(jsdisp_t *dispex) { - TRACE("Enumerator_destructor\n"); + EnumeratorInstance *This = enumerator_from_jsdisp(dispex); + TRACE("\n"); + + jsval_release(This->item); heap_free(dispex); } static HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_atEnd\n"); + EnumeratorInstance *This; + + if (!(This = enumerator_this(jsthis))) + return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL); + + if (r) + *r = jsval_bool(This->atend); - return E_NOTIMPL; + TRACE("%d\n", This->atend); + + return S_OK; } static HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_item\n"); + EnumeratorInstance *This; + + TRACE("\n"); - return E_NOTIMPL; + if (!(This = enumerator_this(jsthis))) + return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL); + + return r ? jsval_copy(This->item, r) : S_OK; } static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_moveFirst\n"); + EnumeratorInstance *This; + HRESULT hres = S_OK; + + TRACE("\n"); - return E_NOTIMPL; + if (!(This = enumerator_this(jsthis))) + return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL); + + if (This->enumvar) + { + This->atend = FALSE; + hres = IEnumVARIANT_Reset(This->enumvar); + if (!FAILED(hres)) + hres = enumvar_get_next_item(This); + } + + if (r) + *r = jsval_undefined(); + + return hres; } static HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_moveNext\n"); + EnumeratorInstance *This; + HRESULT hres = S_OK; - return E_NOTIMPL; + TRACE("\n"); + + if (!(This = enumerator_this(jsthis))) + return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL); + + if (This->enumvar) + hres = enumvar_get_next_item(This); + + if (r) + *r = jsval_undefined(); + + return hres; } static const builtin_prop_t Enumerator_props[] = { @@ -80,7 +181,7 @@ static const builtin_prop_t Enumerator_props[] = { }; static const builtin_info_t Enumerator_info = { - JSCLASS_OBJECT, + JSCLASS_ENUMERATOR, {NULL, NULL, 0}, ARRAY_SIZE(Enumerator_props), Enumerator_props, @@ -89,7 +190,7 @@ static const builtin_info_t Enumerator_info = { }; static const builtin_info_t EnumeratorInst_info = { - JSCLASS_OBJECT, + JSCLASS_ENUMERATOR, {NULL, NULL, 0, NULL}, 0, NULL, @@ -101,16 +202,18 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD fl jsval_t *r) { jsdisp_t *obj; + jsval_t *arg0; HRESULT hres; - TRACE("EnumeratorConstr_value\n"); + TRACE("\n"); switch(flags) { case DISPATCH_CONSTRUCT: { - if (argc != 1) - return throw_syntax_error(ctx, JS_E_MISSING_ARG, NULL); + if (argc > 1) + return throw_syntax_error(ctx, JS_E_INVALIDARG, NULL); - hres = create_enumerator(ctx, &argv[0], &obj); + arg0 = (argc == 1) ? &argv[0] : 0; + hres = create_enumerator(ctx, arg0, &obj); if(FAILED(hres)) return hres; @@ -118,7 +221,7 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD fl break; } default: - FIXME("unimplemented flags: %x\n", flags); + ERR("unimplemented flags: %x\n", flags); return E_NOTIMPL; } @@ -140,7 +243,8 @@ static HRESULT alloc_enumerator(script_ctx_t *ctx, jsdisp_t *object_prototype, E hres = init_dispex_from_constr(&enumerator->dispex, ctx, &EnumeratorInst_info, ctx->enumerator_constr); - if(FAILED(hres)) { + if(FAILED(hres)) + { heap_free(enumerator); return hres; } @@ -180,11 +284,83 @@ HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **ret) { EnumeratorInstance *enumerator; HRESULT hres; + IDispatch *obj; + DISPPARAMS dispparams = {NULL, NULL, 0, 0}; + VARIANT varresult; + BOOL atend; + + IEnumVARIANT *enumvar; + + memset(&varresult, 0, sizeof(VARIANT)); + VariantInit(&varresult); + + /* new Enumerator() */ + if (argv == NULL) + { + enumvar = NULL; + atend = TRUE; + } + else if (is_object_instance(*argv)) + { + obj = get_object(*argv); + + /* Try to get a IEnumVARIANT by _NewEnum */ + hres = IDispatch_Invoke(obj, + DISPID_NEWENUM, &IID_NULL, LOCALE_NEUTRAL, + DISPATCH_METHOD, &dispparams, &varresult, + NULL, NULL); + if (FAILED(hres)) + { + ERR("Enumerator: no DISPID_NEWENUM.\n"); + hres = E_INVALIDARG; + goto cleanuperr; + } + + if ((V_VT(&varresult) == VT_DISPATCH) || + (V_VT(&varresult) == VT_UNKNOWN)) + { + hres = IUnknown_QueryInterface(V_UNKNOWN(&varresult), + &IID_IEnumVARIANT, (void**)&enumvar); + if (FAILED(hres)) + { + hres = E_INVALIDARG; + goto cleanuperr; + } + } + else + { + ERR("Enumerator: NewEnum unexpected type of varresult (%d).\n", V_VT(&varresult)); + hres = E_INVALIDARG; + goto cleanuperr; + } + VariantClear(&varresult); + + atend = FALSE; + } + else + { + ERR("I don't know how to handle this type!\n"); + hres = E_NOTIMPL; + goto cleanuperr; + } hres = alloc_enumerator(ctx, NULL, &enumerator); if(FAILED(hres)) - return hres; + goto cleanuperr; + + enumerator->atend = atend; + enumerator->enumvar = enumvar; + + hres = enumvar_get_next_item(enumerator); + if (FAILED(hres)) + goto cleanuperr; *ret = &enumerator->dispex; + return S_OK; +cleanuperr: + VariantClear(&varresult); + if (enumerator) + heap_free(enumerator); + return hres; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index baebcc4b6c..879b2b837b 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -116,6 +116,7 @@ typedef enum { JSCLASS_ARRAY, JSCLASS_BOOLEAN, JSCLASS_DATE, + JSCLASS_ENUMERATOR, JSCLASS_ERROR, JSCLASS_FUNCTION, JSCLASS_GLOBAL, @@ -561,6 +562,7 @@ static inline DWORD make_grfdex(script_ctx_t *ctx, DWORD flags) #define JS_E_VBARRAY_EXPECTED MAKE_JSERROR(IDS_NOT_VBARRAY) #define JS_E_INVALID_DELETE MAKE_JSERROR(IDS_INVALID_DELETE) #define JS_E_JSCRIPT_EXPECTED MAKE_JSERROR(IDS_JSCRIPT_EXPECTED) +#define JS_E_ENUMERATOR_EXPECTED MAKE_JSERROR(IDS_NOT_ENUMERATOR) #define JS_E_REGEXP_SYNTAX MAKE_JSERROR(IDS_REGEXP_SYNTAX_ERROR) #define JS_E_INVALID_URI_CODING MAKE_JSERROR(IDS_URI_INVALID_CODING) #define JS_E_INVALID_URI_CHAR MAKE_JSERROR(IDS_URI_INVALID_CHAR) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 19d67b514f..3fa93c7d66 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -69,7 +69,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u static const WCHAR regexpW[] = {'R','e','g','E','x','p',0}; static const WCHAR stringW[] = {'S','t','r','i','n','g',0}; /* Keep in sync with jsclass_t enum */ - static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, errorW, + static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, objectW, errorW, functionW, NULL, mathW, numberW, objectW, regexpW, stringW, objectW, objectW, objectW}; TRACE("\n"); diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index d15dd7a033..d171ce20f8 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -56,6 +56,7 @@ #define IDS_INVALID_DELETE 0x1394 #define IDS_NOT_VBARRAY 0x1395 #define IDS_JSCRIPT_EXPECTED 0x1396 +#define IDS_NOT_ENUMERATOR 0x1397 #define IDS_REGEXP_SYNTAX_ERROR 0x1399 #define IDS_URI_INVALID_CHAR 0x13A0 #define IDS_URI_INVALID_CODING 0x13A1 -- 2.11.0

4 4

[PATCH] KERNEL32.dll: add stub WerUnregisterRuntimeExceptionModule
by Roman Stingler 16 May '19

16 May '19

From: Roman Stingler <roman.stingler(a)gmail.com> Date: Wed, 15 May 2019 10:35:02 +0200 Subject: [PATCH] KERNEL32.dll: add stub WerUnregisterRuntimeExceptionModule From: Roman Stingler <roman.stingler(a)gmail.com> Signed-off-by: Roman Stingler <roman.stingler(a)gmail.com> --- .../api-ms-win-core-windowserrorreporting-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/wer.c | 10 ++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/werapi.h | 3 +++ 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec index 180ffed0eb..0404830f7b 100644 --- a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec +++ b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec @@ -5,6 +5,6 @@ @ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) kernel32.WerRegisterRuntimeExceptionModule @ stub WerUnregisterFile @ stdcall WerUnregisterMemoryBlock(ptr) kernel32.WerUnregisterMemoryBlock -@ stub WerUnregisterRuntimeExceptionModule +@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) kernel32.WerUnregisterRuntimeExceptionModule @ stub WerpNotifyLoadStringResource @ stub WerpNotifyUseStringResource diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8346575ac6..2b7a301819 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1591,7 +1591,7 @@ @ stdcall WerSetFlags(long) # @ stub WerUnregisterFile @ stdcall WerUnregisterMemoryBlock(ptr) -# @ stub WerUnregisterRuntimeExceptionModule +@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) # @ stub WerpCleanupMessageMapping # @ stub WerpInitiateRemoteRecovery # @ stub WerpNotifyLoadStringResource diff --git a/dlls/kernel32/wer.c b/dlls/kernel32/wer.c index 3c517c4474..591e608725 100644 --- a/dlls/kernel32/wer.c +++ b/dlls/kernel32/wer.c @@ -81,3 +81,13 @@ HRESULT WINAPI WerUnregisterMemoryBlock(void *block) FIXME("(%p) stub\n", block); return E_NOTIMPL; } + +/*********************************************************************** + * WerUnregisterRuntimeExceptionModule (KERNEL32.@) + */ +HRESULT WINAPI WerUnregisterRuntimeExceptionModule(PCWSTR callbackdll, PVOID context) +{ + FIXME("(%s, %p) stub!\n", debugstr_w(callbackdll), context); + return S_OK; +} + diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index d1bcea5593..70592100cd 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1709,7 +1709,7 @@ @ stdcall WerSetFlags(long) kernel32.WerSetFlags # @ stub WerUnregisterFile @ stdcall WerUnregisterMemoryBlock(ptr) kernel32.WerUnregisterMemoryBlock -# @ stub WerUnregisterRuntimeExceptionModule +@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) kernel32.WerUnregisterRuntimeExceptionModule # @ stub WerpNotifyLoadStringResource # @ stub WerpNotifyUseStringResource @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) kernel32.WideCharToMultiByte diff --git a/include/werapi.h b/include/werapi.h index c66195f938..78b8de1be8 100644 --- a/include/werapi.h +++ b/include/werapi.h @@ -171,6 +171,7 @@ typedef struct _WER_EXCEPTION_INFORMATION BOOL bClientPointers; } WER_EXCEPTION_INFORMATION, *PWER_EXCEPTION_INFORMATION; + /* #### */ HRESULT WINAPI WerAddExcludedApplication(PCWSTR, BOOL); @@ -186,6 +187,8 @@ HRESULT WINAPI WerReportSetUIOption(HREPORT, WER_REPORT_UI, PCWSTR); HRESULT WINAPI WerReportSubmit(HREPORT, WER_CONSENT, DWORD, PWER_SUBMIT_RESULT); HRESULT WINAPI WerSetFlags(DWORD flags); HRESULT WINAPI WerUnregisterMemoryBlock(void *block); +HRESULT WINAPI WerUnregisterRuntimeExceptionModule(PCWSTR callbackdll, void *context); + #ifdef __cplusplus } -- 2.21.0

3 2

[PATCH 1/2] ntdll: Mark monotonic_counter() as inline.
by Huw Davies 16 May '19

16 May '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 3b28113542..20de627c28 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -103,7 +103,7 @@ static inline BOOL IsLeapYear(int Year) } /* return a monotonic time counter, in Win32 ticks */ -static ULONGLONG monotonic_counter(void) +static inline ULONGLONG monotonic_counter(void) { struct timeval now; -- 2.17.1

1 0

[PATCH 1/6] strmbase: Factor out strmbase_renderer_cleanup().
by Zebediah Figura 16 May '19

16 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/renderer.c | 50 ++++++++++++++++++++++------------------ include/wine/strmbase.h | 1 + 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index c3571029d4..fd6cf523c5 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -275,36 +275,40 @@ HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter* iface, REFIID riid, return BaseFilterImpl_QueryInterface(iface, riid, ppv); } -ULONG WINAPI BaseRendererImpl_Release(IBaseFilter* iface) +void strmbase_renderer_cleanup(BaseRenderer *filter) { - BaseRenderer *This = impl_from_IBaseFilter(iface); - ULONG refCount = InterlockedDecrement(&This->filter.refCount); + IPin *peer; - if (!refCount) + if (SUCCEEDED(IPin_ConnectedTo(&filter->pInputPin->pin.IPin_iface, &peer))) { - IPin *pConnectedTo; + IPin_Disconnect(peer); + IPin_Release(peer); + } + IPin_Disconnect(&filter->pInputPin->pin.IPin_iface); + IPin_Release(&filter->pInputPin->pin.IPin_iface); - if (SUCCEEDED(IPin_ConnectedTo(&This->pInputPin->pin.IPin_iface, &pConnectedTo))) - { - IPin_Disconnect(pConnectedTo); - IPin_Release(pConnectedTo); - } - IPin_Disconnect(&This->pInputPin->pin.IPin_iface); - IPin_Release(&This->pInputPin->pin.IPin_iface); + if (filter->pPosition) + IUnknown_Release(filter->pPosition); + + filter->csRenderLock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&filter->csRenderLock); - if (This->pPosition) - IUnknown_Release(This->pPosition); + BaseRendererImpl_ClearPendingSample(filter); + CloseHandle(filter->evComplete); + CloseHandle(filter->ThreadSignal); + CloseHandle(filter->RenderEvent); + QualityControlImpl_Destroy(filter->qcimpl); + BaseFilter_Destroy(&filter->filter); +} + +ULONG WINAPI BaseRendererImpl_Release(IBaseFilter* iface) +{ + BaseRenderer *This = impl_from_IBaseFilter(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); - This->csRenderLock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->csRenderLock); + if (!refCount) + strmbase_renderer_cleanup(This); - BaseRendererImpl_ClearPendingSample(This); - CloseHandle(This->evComplete); - CloseHandle(This->ThreadSignal); - CloseHandle(This->RenderEvent); - QualityControlImpl_Destroy(This->qcimpl); - BaseFilter_Destroy(&This->filter); - } return refCount; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 1cd002890e..b561c76965 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -623,6 +623,7 @@ HRESULT WINAPI BaseRendererImpl_ClearPendingSample(BaseRenderer *iface); HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, const IBaseFilterVtbl *vtbl, IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name, DWORD_PTR debug_info, const BaseRendererFuncTable *func_table); +void strmbase_renderer_cleanup(BaseRenderer *filter); #ifdef __IBasicAudio_FWD_DEFINED__ typedef struct tagBasicAudio -- 2.21.0

1 5